Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/api/ruzhang/scmapplyinbound.js

@@ -28,6 +28,15 @@ export default {
       headers: { 'Content-Type': 'application/json' }
     })
   },
+  // 确认（暂时取消流程审批，直接推送数据）
+  confirmRZ: function(params) {
+    return request({
+      url: '/scm/v1/scmapplyinbound/confirmRZ',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
   // 通过sid查询一条记录
   fetchBySid: function(sid) {
     return request({

anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue

@@ -5,7 +5,7 @@
         <div>{{ viewTitle }}</div>
         <div>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveEdit()">保存</el-button>
-          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submitVehicleApply()">提交</el-button>
+            <el-button type="primary" size="small" :disabled="submitdisabled" @click="submitVehicleApply()">确认</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
@@ -887,7 +887,7 @@ export default {
           this.$refs['form_obj'].validate(valid => {
             if (valid) {
               this.submitdisabled = true
-              req.submitVehicleApply(this.formobj).then((res) => {
+              req.confirmRZ(this.formobj).then((res) => {
                 if (res.success) {
                   this.$message({
                     showClose: true,
@@ -911,7 +911,7 @@ export default {
         this.$refs['form_obj'].validate(valid => {
           if (valid) {
             this.submitdisabled = true
-            req.submitVehicleApply(this.formobj).then((res) => {
+            req.confirmRZ(this.formobj).then((res) => {
               if (res.success) {
                 this.$message({
                   showClose: true,

anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue

@@ -50,8 +50,9 @@
             </el-table-column>
             <el-table-column label="状态" header-align="center" width="100">
               <template slot-scope="scope">
-                <span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>
-                <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
+<!--                <span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>-->
+<!--                <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>-->
+                <span>{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="applicationDate" label="发起日期" align="center" width="100"/>