修改委外发货单退货审批和受托收货单退货审批

src/views/bpm/handleTask/components/purchaseOrder/outsourceSendReturnGoods/detailDialog.vue

@@ -433,7 +433,7 @@
     },
     created() {
       this.getDetailData(this.businessId);
-      if (this.taskDefinitionKey == 'storemanApprove') {
+      if (this.taskDefinitionKey == 'storeman') {
         this.tabOptions.push({ key: 'inoutBound', name: '入库单' });
       }
       if (this.taskDefinitionKey == 'purchaserUploadReceipt') {
@@ -444,10 +444,7 @@
       changeActive(item) {
         this.activeComp = item.key;
         this.$emit('activeCompChange', item.key);
-        if (
-          this.taskDefinitionKey == 'storemanApprove' &&
-          item.key == 'inoutBound'
-        ) {
+        if (this.taskDefinitionKey == 'storeman' && item.key == 'inoutBound') {
           this.$nextTick(() => {
             this.$refs.add.pickerSuccess(this.form);
           });

src/views/bpm/handleTask/components/purchaseOrder/outsourceSendReturnGoods/submit.vue

@@ -23,11 +23,7 @@
         icon="el-icon-edit-outline"
         type="success"
         size="mini"
-        v-if="
-          taskDefinitionKey != 'storemanApprove' ||
-          (taskDefinitionKey == 'storemanApprove' &&
-            outInData.verifyStatus == 2)
-        "
+        v-if="taskDefinitionKey != 'storeman'"
         @click="handleAudit(1)"
         >通过
       </el-button>
@@ -37,10 +33,7 @@
         size="mini"
         :loading="isSaveLoading"
         @click="storemanApprove"
-        v-if="
-          ['storemanApprove'].includes(taskDefinitionKey) &&  activeComp == 'inoutBound' &&
-          [0, 3].includes(outInData.verifyStatus)
-        "
+        v-else
         >申请入库
       </el-button>
       <el-button
@@ -48,7 +41,8 @@
         type="danger"
         size="mini"
         @click="handleAudit(0)"
-        v-if="!['starter'].includes(taskDefinitionKey)">驳回
+        v-if="!['starter'].includes(taskDefinitionKey)"
+        >驳回
       </el-button>
 
       <el-dropdown
@@ -137,16 +131,6 @@
         }
       };
     },
-    async created() {
-      if (this.taskDefinitionKey == 'storemanApprove') {
-        let data = await getReturnSaleOrderrecordDetail(this.businessId);
-        try {
-          this.outInData = await getOutInBySourceBizNo(data.returnNo);
-        } catch (error) {
-          this.outInData.verifyStatus = 0;
-        }
-      }
-    },
     methods: {
       async storemanApprove() {
         let res = await this.getTableValue();
@@ -195,17 +179,8 @@
           if (!arr) {
             return;
           }
-
           await UpdateReturnInformation(arr);
         }
-        if (this.taskDefinitionKey === 'purchaserUploadReceipt') {
-          let data = await this.getTableValue();
-          if (data.repliedFiles.length == 0) {
-            this.$message.error('回执附件不能为空');
-            return;
-          }
-          await uploadReceipt(data);
-        }
         this._approveTaskWithVariables(status);
       },
       async _approveTaskWithVariables(status) {

src/views/bpm/handleTask/components/saleOrder/entrustedReceiveReturnGoods/consignmentReturnsOutbound.vue

@@ -345,7 +345,7 @@
   import { deepClone } from '@/components/FormGenerator/utils/index';
   import {
     getTreeByPid,
-    getTreeByGroup,
+    allCategoryLevel,
     getOutInBySourceBizNoOrError
   } from '@/api/classifyManage';
   import pickOrder from '@/views/bpm/outgoingManagement/components/pickOrder.vue';
@@ -777,7 +777,7 @@
       },
       // 获取物品类型列表
       async getAssetTypeOptions() {
-        const { data } = await getTreeByGroup({ type: 1 });
+        const { data } = await allCategoryLevel();
         this.codeList = data;
         let obj = {};
         data.forEach((item) => {