bug

src/views/bpm/handleTask/components/saleOrder/exceptionManagement/addOrEditDialog.vue

@@ -78,6 +78,17 @@
           </el-option>
         </el-select>
       </template>
+      <template v-slot:exceptionDetermine="scope">
+        <el-select v-model="scope.row.exceptionDetermine" placeholder="请选择">
+          <el-option
+            v-for="item in options1"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </template>
     </ele-pro-table>
   </div>
 </template>
@@ -106,6 +117,13 @@
           { label: '报损', value: 3 },
           { label: '报废', value: 4 }
         ],
+        options1: [
+          { label: '多发', value: 1 },
+          { label: '少发', value: 2 },
+          { label: '错发', value: 3 },
+          { label: '损坏', value: 4 }
+        ],
+
         form: {},
         columns: [
           {
@@ -115,6 +133,16 @@
             align: 'center',
             fixed: 'left'
           },
+
+          {
+            width: 220,
+            prop: 'exceptionDetermine',
+            label: '异常类型',
+            slot: 'exceptionDetermine',
+            fixed: 'left',
+            align: 'center',
+            headerSlot: 'headerExceptionDispose'
+          },
           {
             width: 220,
             prop: 'exceptionDispose',
@@ -138,7 +166,36 @@
             showOverflowTooltip: true,
             align: 'center'
           },
+          {
+            width: 120,
+            prop: 'specification',
+            label: '规格',
+            slot: 'specification',
+            align: 'center'
+          },
+          {
+            width: 120,
+            prop: 'modelType',
+            label: '型号',
+            slot: 'modelType',
+            align: 'center'
+          },
 
+          // {
+          //   minWidth: 100,
+          //   prop: 'saleCount',
+          //   label: '发货数量',
+          //   showOverflowTooltip: true,
+          //   align: 'center'
+          // },
+          {
+            minWidth: 100,
+            prop: 'totalCount',
+            slot: 'totalCount',
+            label: '异常数量',
+            showOverflowTooltip: true,
+            align: 'center'
+          },
           {
             minWidth: 160,
             prop: 'batchNo',
@@ -176,34 +233,28 @@
             showOverflowTooltip: true,
             align: 'center'
           },
-          {
-            minWidth: 160,
-            prop: 'packageNo',
-            align: 'center',
-            label: '包装编码',
-            showOverflowTooltip: true
-          },
-          {
-            minWidth: 100,
-            prop: 'packingQuantity',
-            align: 'center',
-            label: '包装数量',
-            showOverflowTooltip: true
-          },
-          {
-            minWidth: 120,
-            prop: 'packingUnit',
-            align: 'center',
-            label: '包装单位',
-            showOverflowTooltip: true
-          },
-          {
-            minWidth: 100,
-            prop: 'totalCount',
-            label: '计量数量',
-            showOverflowTooltip: true,
-            align: 'center'
-          },
+          // {
+          //   minWidth: 160,
+          //   prop: 'packageNo',
+          //   align: 'center',
+          //   label: '包装编码',
+          //   showOverflowTooltip: true
+          // },
+          // {
+          //   minWidth: 100,
+          //   prop: 'packingQuantity',
+          //   align: 'center',
+          //   label: '包装数量',
+          //   showOverflowTooltip: true
+          // },
+          // {
+          //   minWidth: 120,
+          //   prop: 'packingUnit',
+          //   align: 'center',
+          //   label: '包装单位',
+          //   showOverflowTooltip: true
+          // },
+
           {
             minWidth: 150,
             prop: 'measuringUnit',
@@ -225,35 +276,35 @@
           //       : '';
           //   }
           // },
-          {
-            width: 100,
-            prop: 'singlePrice',
-            label: '单价',
-            slot: 'singlePrice',
-            align: 'center'
-          },
+          // {
+          //   width: 100,
+          //   prop: 'singlePrice',
+          //   label: '单价',
+          //   slot: 'singlePrice',
+          //   align: 'center'
+          // },
 
-          {
-            width: 100,
-            prop: 'totalPrice',
-            label: '合计',
-            align: 'center'
-          },
+          // {
+          //   width: 100,
+          //   prop: 'totalPrice',
+          //   label: '合计',
+          //   align: 'center'
+          // },
 
-          {
-            minWidth: 80,
-            prop: 'receiveTotalWeight',
-            label: '重量',
-            showOverflowTooltip: true,
-            align: 'center'
-          },
-          {
-            minWidth: 100,
-            prop: 'weightUnit',
-            label: '重量单位',
-            showOverflowTooltip: true,
-            align: 'center'
-          },
+          // {
+          //   minWidth: 80,
+          //   prop: 'receiveTotalWeight',
+          //   label: '重量',
+          //   showOverflowTooltip: true,
+          //   align: 'center'
+          // },
+          // {
+          //   minWidth: 100,
+          //   prop: 'weightUnit',
+          //   label: '重量单位',
+          //   showOverflowTooltip: true,
+          //   align: 'center'
+          // },
 
           {
             width: 220,

src/views/bpm/handleTask/components/saleOrder/exceptionManagement/submit.vue

@@ -29,7 +29,7 @@
         icon="el-icon-circle-close"
         type="danger"
         size="mini"
-        @click="handleAudit(0)"
+        @click="rejectTask(0)"
         >驳回
       </el-button>
     </div>
@@ -37,7 +37,7 @@
 </template>
 
 <script>
-  import { approveTaskWithVariables, rejectTask } from '@/api/bpm/task';
+  import { approveTaskWithVariables, rejectTask,cancelTask } from '@/api/bpm/task';
   import {
     update
   } from '@/api/bpm/components/saleManage/exceptionManagement.js';
@@ -80,7 +80,23 @@
       handleBackList() {
         this.$emit('handleBackList');
       },
-
+      rejectTask(status){
+        let variables = {
+          pass: !!status
+        };
+        rejectTask({
+          id: this.taskId,
+          reason: this.form.reason,
+          variables
+        }).then((res) => {
+          if (res.data.code != '-1') {
+            this.$emit('handleAudit', {
+              status,
+              title: status === 0 ? '驳回' : ''
+            });
+          }
+        });
+      },
       async handleAudit(status) {
         const data = await this.getTableValue();
         if (!data && !!status) {
@@ -124,8 +140,9 @@
             confirmButtonText: '确定'
           })
             .then(() => {
-              saleSendProcessCancel({
-                id: this.taskId,
+              cancelTask({
+                id: this.id,
+                taskId: this.taskId,
                 reason: this.form.reason,
                 businessId: this.businessId
               })