From 1f6bae128ee6d15df51d0921b93f56179a860ef9 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 19 Jun 2023 17:29:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=A5=E5=BA=93--=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=8D=A2=E4=B8=BA=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui-scm-ui/src/api/ruzhang/scmapplyinbound.js      | 9 +++++++++
 .../src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue       | 6 +++---
 .../src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue    | 5 +++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/api/ruzhang/scmapplyinbound.js b/anrui-scm/anrui-scm-ui/src/api/ruzhang/scmapplyinbound.js
index 918307f58e..8794d601e8 100644
--- a/anrui-scm/anrui-scm-ui/src/api/ruzhang/scmapplyinbound.js
+++ b/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({
diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
index 019c358da0..8323174780 100644
--- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
+++ b/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,
diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue
index 1785d7350c..4549253c07 100644
--- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue
+++ b/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"/>