bug

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

@@ -36,7 +36,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="审批建议"  style="margin-bottom: 20px">
+      <el-form-item label="审批建议" style="margin-bottom: 20px">
         <el-input
           type="textarea"
           v-model="form.reason"
@@ -59,7 +59,7 @@
         type="danger"
         size="mini"
         v-if="taskDefinitionKey !== 'stater'"
-        @click="handleAudit(0)"
+        @click="rejectTask(0)"
         >驳回
       </el-button>
 
@@ -86,6 +86,8 @@
     updateReceiptAPI,
     returnHandleProcessCancel
   } from '@/api/bpm/components/saleManage/saleorder';
+  import {rejectTask} from '@/api/bpm/task';
+
   import { listAllUserBind } from '@/api/system/organization';
   import { EventBus } from './eventBus.js';
   import outin from '@/api/warehouseManagement/outin';
@@ -273,7 +275,7 @@
         let storageData = data.returnStorageData;
         // 入库来源isSkip 0-正常  1-外部(外部跳过内部审核流程)
         storageData.isSkip = 1;
-        console.log(storageData,'dasdsa');
+        console.log(storageData, 'dasdsa');
         try {
           this.isLoading = true;
           const res = await outin.saveNew(storageData);
@@ -377,12 +379,13 @@
         // 获取销售退货入库信息
 
         let storageData = data.returnStorageData;
-        data.detailList.forEach((val,index)=>{
-            val.weight=storageData._packingList[index].weight
-            val.materielDesignation=storageData._packingList[index].materielDesignation
-            val.clientCode=storageData._packingList[index].clientCode
-            val.engrave=storageData._packingList[index].engrave
-          })
+        data.detailList.forEach((val, index) => {
+          val.weight = storageData._packingList[index].weight;
+          val.materielDesignation =
+            storageData._packingList[index].materielDesignation;
+          val.clientCode = storageData._packingList[index].clientCode;
+          val.engrave = storageData._packingList[index].engrave;
+        });
         // 是否已经入库
         // if (storageData.isStorage) {
         //   try {
@@ -417,9 +420,7 @@
         try {
           this.isLoading = true;
           const res = await storageApi.storage(storageData);
-          
-        
-          
+
           data.returnInReceiptId = res.data.toString();
           await saleReturnUpdateAPI(data);
           approveTaskWithVariablesAPI({
@@ -503,6 +504,23 @@
           }
         });
       },
+      //驳回
+      rejectTask() {
+        rejectTask({
+          id: this.taskId,
+          reason: this.form.reason,
+          variables: {
+            pass: false
+          }
+        }).then((res) => {
+          if (res.code != '-1') {
+            this.$emit('handleAudit', {
+              status: false,
+              title: '驳回'
+            });
+          }
+        });
+      },
       getTableValue() {
         return new Promise((resolve, reject) => {
           this.$emit('getTableValue', async (data) => {

src/views/bpm/handleTask/components/saleOrder/returnGoods/addReturnGoodsDialog.vue

@@ -425,11 +425,7 @@
             prop: 'technicalDrawings',
             label: '技术图纸',
             slot: 'technicalDrawings',
-            formatter: (_row, _column, cellValue) => {
-              return (
-                (_row.guaranteePeriod || '') + _row.guaranteePeriodUnitName
-              );
-            },
+
             align: 'center'
           },
           {
@@ -498,7 +494,7 @@
             allcountAmount =
               (this.$refs.inventoryTableref &&
                 this.$refs.inventoryTableref.totalAmount) +
-              Number(this.form.redressAmount);
+              Number(this.form.redressAmount||0);
           }
           if (this.form.type === '40') {
             allcountAmount =
@@ -506,7 +502,7 @@
               this.$refs.inventoryTableref1.getPrice()[0];
           }
           if (this.form.type === '50') {
-            allcountAmount = Number(this.form.redressAmount);
+            allcountAmount = Number(this.form.redressAmount||0);
           }
         } else {
           allcountAmount =

src/views/bpm/handleTask/components/saleOrder/returnGoods/detailDialog.vue

@@ -419,11 +419,7 @@
             prop: 'technicalDrawings',
             label: '技术图纸',
             slot: 'technicalDrawings',
-            formatter: (_row, _column, cellValue) => {
-              return (
-                (_row.guaranteePeriod || '') + _row.guaranteePeriodUnitName
-              );
-            },
+          
             align: 'center'
           },
           {