add

src/api/warehouseManagement/outin.js

@@ -115,8 +115,8 @@ export default {
       return res.data.data;
     }
   },
-  outinApprove: async (params) => {
-    const res = await request.post(`/bpm/outinApprove/submit`, params);
+  outApprove: async (params) => {
+    const res = await request.post(`/bpm/outApprove/submit`, params);
     if (res.data.code == 0) {
       return res.data.data;
     }

src/views/warehouseManagement/outgoingManagement/details.vue

@@ -230,7 +230,7 @@
                   <!-- {{ row.measurementUnit }}{{ row.measuringUnit }}/{{
                     row.packingUnit
                   }} -->
-                  <span>{{ row.minPackingCount }}/{{ row.packingUnit }}</span>
+                  <span>{{ row.measuringUnit }}/{{ row.packingUnit }}</span>
                 </template>
               </template>
             </el-table-column>
@@ -323,15 +323,19 @@
         handler(val) {
           if (val == 0) {
             this.active = 1;
-            this.stepsTitle = '已完成';
-            this.stepsStatus = '';
+            this.stepsTitle = '未审核';
+            this.stepsStatus = 'wait';
           } else if (val == 1) {
-            this.active = 3;
-            this.stepsTitle = '已完成';
-            this.stepsStatus = 'success';
+            this.active = 2;
+            this.stepsTitle = '审核中';
+            this.stepsStatus = 'process';
           } else if (val == 2) {
-            this.active = 3;
-            this.stepsTitle = '已驳回';
+            this.active = 2;
+            this.stepsTitle = '审核通过';
+            this.stepsStatus = 'success';
+          } else if (val == 3) {
+            this.active = 2;
+            this.stepsTitle = '驳回';
             this.stepsStatus = 'error';
           }
         }

src/views/warehouseManagement/outgoingManagement/index.vue

@@ -109,14 +109,8 @@
         </template>
         <!-- 工作流审批状态 -->
         <template v-slot:flowableStatus="{ row }">
-          <span v-if="row.flowableStatus == 1" class="ele-text-primary">
-            审批中
-          </span>
-          <span v-if="row.flowableStatus == 2" class="ele-text-success">
-            通过
-          </span>
-          <span v-if="row.flowableStatus == 3" class="ele-text-danger">
-            拒绝
+          <span :class="status[row.flowableStatus].class">
+            {{ status[row.flowableStatus].label }}
           </span>
         </template>
 
@@ -181,8 +175,9 @@
         },
         total: 0,
         status: [
-          { label: '待审核', class: 'ele-text-primary' },
-          { label: '已审核', class: 'ele-text-success' }, // 审核状态  1未审核  2
+          { label: '未审核', class: 'ele-text-info' },
+          { label: '审核中', class: 'ele-text-primary' },
+          { label: '审核通过', class: 'ele-text-success' },
           { label: '驳回', class: 'ele-text-danger' }
         ],
         columns: [
@@ -224,14 +219,7 @@
             align: 'center',
             showOverflowTooltip: true
           },
-          {
-            prop: 'flowableStatus',
-            slot: 'flowableStatus',
-            label: '工作流审批状态',
-            align: 'center',
-            showOverflowTooltip: true,
-            width: 120
-          },
+
           {
             prop: 'createUserName',
             label: '领料人',
@@ -247,6 +235,14 @@
             showOverflowTooltip: true,
             width: 200
           },
+          {
+            prop: 'verifyStatus',
+            slot: 'verifyStatus',
+            label: '状态',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 120
+          },
           {
             columnKey: 'action',
             label: '操作',
@@ -269,7 +265,7 @@
           type: 'warning'
         })
           .then(async () => {
-            const data = await outin.outinApprove({ outInId: row.id });
+            const data = await outin.outApprove({ outInId: row.id });
             if (data) {
               this.$message.success('流程发起成功！');
               this.getList();