解决销售退货入库审批BUG

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

@@ -41,9 +41,7 @@
             >
               {{ form.totalAmount }}元
             </el-form-item>
-            <el-form-item
-              label="计价方式："
-              style="margin-bottom: 22px">
+            <el-form-item label="计价方式：" style="margin-bottom: 22px">
               {{ form.pricingWay == 1 ? '按数量计费' : '按重量计费' }}
             </el-form-item>
             <el-form-item
@@ -103,8 +101,7 @@
                   @click="downloadFile(link)"
                 >
                   {{ link.name }}
-                </el-link
-                >
+                </el-link>
               </div>
             </el-form-item>
             <el-form-item
@@ -113,18 +110,24 @@
               style="margin-bottom: 16px"
             >
               <fileUpload
-                v-if="taskDefinitionKey=='salesmanUploadReceipt'"
+                v-if="taskDefinitionKey == 'salesmanUploadReceipt'"
                 v-model="form.repliedFiles"
                 module="main"
                 :showLib="false"
-                :limit="10"/>
-              <div v-else-if="detailData.repliedFiles && detailData.repliedFiles?.length">
+                :limit="10"
+              />
+              <div
+                v-else-if="
+                  detailData.repliedFiles && detailData.repliedFiles?.length
+                "
+              >
                 <el-link
                   v-for="link in detailData.repliedFiles"
                   :key="link.id"
                   type="primary"
                   :underline="false"
-                  @click="downloadFile(link)">
+                  @click="downloadFile(link)"
+                >
                   {{ link.name }}
                 </el-link>
               </div>
@@ -173,21 +176,22 @@
 </template>
 
 <script>
-import {getReturnSaleOrderrecordDetail} from '@/api/bpm/components/saleManage/saleorder';
-import {getFile} from '@/api/system/file';
-import dictMixins from '@/mixins/dictMixins';
-import {reviewStatusEnum} from '@/enum/dict';
-import inventoryTabledetail from './inventoryTabledetail.vue';
-import inventoryTable from './inventoryTable.vue';
-import add from "@/views/bpm/handleTask/components/purchaseOrder/outsourceSendReturnGoods/entrustedStorage.vue";
-import detailDialog from "@/views/bpm/handleTask/components/inoutBound/detailDialog.vue";
-import fileUpload from "@/components/upload/fileUpload.vue";
+  import { getReturnSaleOrderrecordDetail } from '@/api/bpm/components/saleManage/saleorder';
+  import { getFile } from '@/api/system/file';
+  import dictMixins from '@/mixins/dictMixins';
+  import { reviewStatusEnum } from '@/enum/dict';
+  import inventoryTabledetail from './inventoryTabledetail.vue';
+  import inventoryTable from './inventoryTable.vue';
+  import add from './salesReturnReceipt.vue';
+  import detailDialog from '@/views/bpm/handleTask/components/inoutBound/detailDialog.vue';
+  import fileUpload from '@/components/upload/fileUpload.vue';
 
-export default {
+  export default {
     mixins: [dictMixins],
     components: {
       fileUpload,
-      detailDialog, add,
+      detailDialog,
+      add,
       inventoryTabledetail,
       inventoryTable
     },
@@ -196,7 +200,7 @@ export default {
         codeData: [],
         tabOptions: [{ key: 'main', name: '退货单详情' }],
         reviewStatusEnum,
-        activeComp:'main',
+        activeComp: 'main',
         visible: false,
         detailId: '',
         title: '详情',
@@ -282,14 +286,14 @@ export default {
             prop: 'singleWeight',
             label: '单重',
             slot: 'singleWeight',
-            align: "center"
+            align: 'center'
           },
           {
             width: 200,
             prop: 'receiveTotalWeight',
             label: '收货总重',
             slot: 'receiveTotalWeight',
-            align: "center",
+            align: 'center',
             headerSlot: 'headerSendTotalWeight'
           },
           {
@@ -297,14 +301,14 @@ export default {
             prop: 'sendTotalWeight',
             label: '发货总重',
             slot: 'sendTotalWeight',
-            align: "center"
+            align: 'center'
           },
           {
             width: 100,
             prop: 'increaseTotalWeight',
             label: '增重重量',
             slot: 'increaseTotalWeight',
-            align: "center"
+            align: 'center'
           },
           {
             width: 160,
@@ -394,7 +398,10 @@ export default {
       changeActive(item) {
         this.activeComp = item.key;
         this.$emit('activeCompChange', item.key);
-        if (this.taskDefinitionKey == 'storemanApprove' && item.key == 'inoutBound') {
+        if (
+          this.taskDefinitionKey == 'storemanApprove' &&
+          item.key == 'inoutBound'
+        ) {
           this.$nextTick(() => {
             this.$refs.add.pickerSuccess(this.form);
           });
@@ -410,10 +417,11 @@ export default {
           this.loading = true;
           this.form.repliedFiles = this.form.repliedFiles || [];
           this.form.replied = this.form.repliedFiles.length > 0 ? 1 : 0;
-          return Object.assign({}, this.form,)
+          this.form.returnStorageData = await this.$refs.add.getReturnStorage();
+          return Object.assign({}, this.form);
         } catch (error) {
           console.log(error);
-          return ''
+          return '';
           // 表单验证未通过，不执行保存操作
         }
       },