销售退货

src/api/warehouseManagement/outin.js

@@ -25,7 +25,7 @@ export default {
   },
   //新保存
   saveNew: async (data) => {
-    const res = await request.post('/wms/outin/saveNew', data);
+    const res = await request.post('/wms/outintwo/outStorage', data);
     if (res.data.code == 0) {
       return res.data;
     }

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

@@ -255,6 +255,14 @@
                 <div v-else>{{ row.unqualifiedReasonAnalysis }}</div>
               </el-form-item>
             </template>
+            <template v-slot:unqualifiedReasonAnalysisView="{ row, $index }">
+              <el-form-item
+              
+              >
+        
+                <div >{{ row.unqualifiedReasonAnalysis }}</div>
+              </el-form-item>
+            </template>
             <template v-slot:headerUnqualifiedReasonAnalysis="{ column }">
               <span class="is-required">{{ column.label }}</span>
             </template>
@@ -291,6 +299,14 @@
                 <div v-else>{{ row.unqualifiedTypeName }}</div>
               </el-form-item>
             </template>
+            <template v-slot:unqualifiedTypeView="{ row, $index }">
+              <el-form-item
+              
+              >
+               
+                <div>{{ row.unqualifiedTypeName }}</div>
+              </el-form-item>
+            </template>
             <template v-slot:headerUnqualifiedType="{ column }">
               <span class="is-required">{{ column.label }}</span>
             </template>
@@ -318,6 +334,17 @@
             <template v-slot:headerHandleOpinion="{ column }">
               <span class="is-required">{{ column.label }}</span>
             </template>
+            <template v-slot:handleOpinionView="{ row, $index }">
+              <el-form-item
+               
+              >
+               
+                <div>{{ row.handleOpinion }}</div>
+              </el-form-item>
+            </template>
+            <template v-slot:headerHandleOpinion="{ column }">
+              <span class="is-required">{{ column.label }}</span>
+            </template>
             <!--////-->
             <!--  ///  生产员审核 -->
             <template v-slot:inOrOut="{ row, $index }">
@@ -350,7 +377,9 @@
                 <el-input
                   v-if="isTrue && row.inOrOut == 2"
                   v-model="row.outerInfo"
+
                 ></el-input>
+                
                 <div v-else>{{ row.outerInfo }}</div>
               </el-form-item>
             </template>
@@ -392,11 +421,13 @@
         <add
         ref="add"
         :form="form"
-
+        v-if="isShowReturnOrder&&taskDefinitionKey=='storeman'"
         :bizType="6"
         :sourceBizNo="form.returnHandleNo"
         :detailList="detailList"
       ></add>
+  
+      <inboundDetails :businessId="form.outinCode"      v-if="isShowReturnOrder&&taskDefinitionKey!='storeman'" ></inboundDetails>
       </el-tab-pane>
     </el-tabs>
 
@@ -412,9 +443,10 @@
 </template>
 
 <script>
-  import inboundDetails from './inboundDetails.vue';
+  // import inboundDetails from './inboundDetails.vue';
   import outboundDetailsDialog from './outboundDetailsDialog.vue';
   import add from '@/views/bpm/stockManagement/storage.vue';
+  import inboundDetails from '@/views/bpm/stockManagement/details.vue';
 
   import headList from '@/components/headList';
   import {
@@ -800,6 +832,27 @@
               label: '外协单位',
               align: 'center',
               slot: 'outerInfo'
+            },
+            {
+              minWidth: 250,
+              prop: 'unqualifiedReasonAnalysis',
+              label: '不合格原因分析',
+              align: 'center',
+              slot: 'unqualifiedReasonAnalysisView',
+            },
+            {
+              minWidth: 250,
+              prop: 'unqualifiedTypeName',
+              label: '不合格类型',
+              align: 'center',
+            
+            },
+            {
+              minWidth: 250,
+              prop: 'handleOpinion',
+              label: '对不合格品的处理意见',
+              align: 'center',
+              slot: 'handleOpinionView',
             }
           ],
           //质检员反馈
@@ -918,19 +971,23 @@
               });
             }
           }
+          let totalCount=0
           this.detailList=this.form.detailList.map(item=>{
-            item['outType']=item.outboundType
+          item['outType']=item.outboundType
           item['categoryName']=item.productName
           item['categoryCode']=item.productCode
           item['packingQuantity']=item.packageCount
-          item['measureQuantity']=item.measurementCount
-          item['measureUnit']=item.measurementUnit
+          item['quantity']=item.measurementCount
+          item['measuringUnit']=item.measurementUnit
           item['categoryId']=item.productCategoryId
           item['engrave']=item.carveCode
           item['categoryName']=item.productCategoryName
+          totalCount+=item.measurementCount
           return item
           })
-
+          this.form.totalCount=totalCount
+          this.form['warehouseId']=this.detailList[0].warehouseId
+          this.form['warehouseName']= this.detailList[0].warehouseName
          
           // this.form.detailList.forEach((item) => {
           //   if (item.outboundType == 1) {
@@ -1010,46 +1067,11 @@
               resolve(false);
             } else {
               let params = {
-                detailList: this.form.detailList.map((i) => {
-                  return {
-                    outInId: i.outInId,
-                    outInCode: i.outInCode,
-                    measurementCount: i.measurementCount,
-                    outboundDetailId: i.outboundDetailId,
-                    outboundType: i.outboundType,
-                    productName: i.name,
-                    productCode: i.categoryCode,
-                    packageCount: i.packageCount,
-                    packingUnit: i.packingUnit,
-                    weight: i.weight,
-                    weightUtil: i.weightUtil,
-                    specification: i.specification,
-                    modelType: i.modelType,
-                    carveCode: i.carveCode,
-                    reason: i.reason,
-                    sendDate: i.sendDate,
-                    feedbackDate: i.feedbackDate,
-                    id: i.id,
-                    handleOpinion: i.handleOpinion,
-                    handleWay: i.handleWay,
-                    ifPackageOk: i.ifPackageOk,
-                    ifReasonMatch: i.ifReasonMatch,
-                    improveCorrect: i.improveCorrect,
-                    improveOpinion: i.improveOpinion,
-                    outerInfo: i.outerInfo,
-                    inOrOut: i.inOrOut,
-                    remark: i.remark,
-                    unpackUserId: i.unpackUserId,
-                    unpackUserName: i.unpackUserName,
-                    unqualifiedReasonAnalysis: i.unqualifiedReasonAnalysis,
-                    unqualifiedType: i.unqualifiedType,
-                    unqualifiedTypeName: i.unqualifiedTypeName
-                  };
-                }),
+                detailList: this.form.detailList,
                 returnRecordId: this.form.returnRecordId,
                 id: this.form.id,
                 returnStorageData:
-                  await this.$refs.inboundDetails?.getReturnStorage()
+                  await this.$refs.add?.getReturnStorage()
               };
               resolve(params);
             }

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

@@ -205,6 +205,7 @@
       let find = this.repairTabsOptions.find((item) => item.name == this.taskDefinitionKey)?.isOutOrIn || '';
       let optionKey = find || this.taskDefinitionKey;
       this.activeComp = optionKey || 'stater';
+
       //获取当前流程标签信息
       let currentTab = this.tabOptions.find((item) => item.key == this.activeComp) || {};
       this.permissionType = currentTab?.permissionType;
@@ -216,6 +217,7 @@
     mounted() {
       setTimeout(() => {
         this.getActiveCompValue();
+
       }, 400);
     },
     methods: {

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/repair-tabs-page.vue

@@ -68,7 +68,8 @@
       return {
         form: {},
         warehouseInfoString: '',
-        activeName: ''
+        activeName: '',
+        outList:[]
       };
     },
     computed: {
@@ -129,8 +130,9 @@
           case 'outerStoremanOut':
             return {
               form: this.form,
-              bizType: 3,
-              sourceBizNo: this.form.returnHandleNo
+              bizType: 7,
+              sourceBizNo: this.form.returnHandleNo,
+              // detailList:this.outList
             };
           case 'outerInQC':
             return {
@@ -155,6 +157,24 @@
     },
     async created() {
       this.form = await saleReturnGetByIdAPI(this.businessId);
+      let totalCount = 0;
+      this.outList = this.form.detailList.filter((item) => { //外协
+        item['outType'] = item.outboundType;
+        item['categoryName'] = item.productName;
+        item['categoryCode'] = item.productCode;
+        item['packingQuantity'] = item.packageCount;
+        item['quantity'] = item.measurementCount;
+        item['measuringUnit'] = item.measurementUnit;
+        item['categoryId'] = item.productCategoryId;
+        item['engrave'] = item.carveCode;
+        item['categoryName'] = item.productCategoryName;
+        if (item.inOrOut == 2) {
+          return item;
+        }
+      });
+      // this.form.totalCount=totalCount
+      // this.form['warehouseId']=this.detailList[0].warehouseId
+      // this.form['warehouseName']= this.detailList[0].warehouseName
       let innerStoreList = ['innerStoremanIn', 'innerFillWeight', 'innerInQC'];
       let outerStoreList = [
         'outerStoremanOut',
@@ -213,9 +233,9 @@
             returnRecordId: this.form.returnRecordId,
             id: this.form.id,
             returnStorageData: await this.$refs.componentRef.getReturnStorage(),
-            qualityInspectionStatus: await this.$refs.componentRef.getStatus(),
+            qualityInspectionStatus: this.$refs.componentRef.getStatus&&await this.$refs.componentRef.getStatus(),
             qualityInspector:
-              (this.$refs.componentRef &&
+              ((this.$refs.componentRef&&this.$refs.componentRef.getQualityFile) &&
                 this.$refs.componentRef.getQualityFile()) ||
               {}
           };

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

@@ -375,7 +375,7 @@
       // 销售退货入库
       async salesReturnsInStorage(data, pass) {
         // 获取销售退货入库信息
-        console.log('data.returnStorageData--------', data.returnStorageData);
+
         let storageData = data.returnStorageData;
         // 是否已经入库
         // if (storageData.isStorage) {

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

@@ -403,7 +403,6 @@
       async getTableValue() {
         console.log(await this.getValidate());
         try {
-          await this.getValidate();
           // 表单验证通过，执行保存操作
           this.loading = true;
 
@@ -411,6 +410,9 @@
             (this.$refs.inventoryTabledetailRef &&
               this.$refs.inventoryTabledetailRef.getTableValue()) ||
             [];
+            if(redressProductList?.productList){
+              redressProductList=redressProductList.productList
+            }
 
           let commitData = Object.assign({}, this.form, {
             redressProductList
@@ -443,8 +445,14 @@
           this.detailData = data;
           this.form = data;
           this.$nextTick(() => {
-            this.$refs.inventoryTabledetailRef &&
+            if(this.taskDefinitionKey=='leader'){
+              this.$refs.inventoryTabledetailRef &&
               this.$refs.inventoryTabledetailRef.putTableValue(data);
+            }else{
+              this.$refs.inventoryTabledetailRef &&
+              this.$refs.inventoryTabledetailRef.putTableValue(data.redressProductList);
+            }
+          
           });
         }
       }

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

@@ -212,135 +212,387 @@ export default {
         rules: {},
 
         columns: [
-          {
-            width: 45,
-            type: 'index',
-            columnKey: 'index',
-            align: 'center',
-            fixed: 'left'
-          },
-          {
-            width: 200,
-            prop: 'productName',
-            label: '名称',
-            slot: 'productName'
-          },
-          {
-            width: 120,
-            prop: 'productCode',
-            label: '编码',
-            slot: 'productCode'
-          },
-          {
-            width: 200,
-            prop: 'productCategoryName',
-            label: '类型',
-            slot: 'productCategoryName'
-          },
-          {
-            width: 160,
-            prop: 'productBrand',
-            label: '牌号',
-            slot: 'productBrand'
-          },
-          {
-            width: 120,
-            prop: 'modelType',
-            label: '型号',
-            slot: 'modelType'
-          },
-          {
-            width: 120,
-            prop: 'specification',
-            label: '规格',
-            slot: 'specification'
-          },
-          {
-            width: 200,
-            prop: 'customerMark',
-            label: '客户代号',
-            slot: 'customerMark'
-          },
-          {
-            width: 200,
-            prop: 'warehouseName',
-            label: '仓库名称',
-            slot: 'warehouseName'
-          },
+
+        {
+          width: 45,
+          type: 'index',
+          columnKey: 'index',
+          align: 'center',
+          fixed: 'left'
+        },
+        {
+          width: 200,
+          prop: 'productName',
+          label: '名称',
+          slot: 'productName',
+          headerSlot: 'headerProductName',
+          align: "center"
+        },
+        {
+          width: 120,
+          prop: 'productCode',
+          label: '编码',
+          slot: 'productCode',
+          align: "center"
+        },
+        {
+          width: 200,
+          prop: 'productCategoryName',
+          label: '类型',
+          slot: 'productCategoryName',
+          align: "center"
+        },
+        {
+          width: 160,
+          prop: 'productBrand',
+          label: '牌号',
+          slot: 'productBrand',
+          align: "center"
+        },
+        {
+          width: 120,
+          prop: 'modelType',
+          label: '型号',
+          slot: 'modelType',
+          align: "center"
+        },
+        {
+          width: 120,
+          prop: 'specification',
+          label: '规格',
+          slot: 'specification',
+          align: "center"
+        },
+        {
+          width: 200,
+          prop: 'customerMark',
+          label: '客户代号',
+          slot: 'customerMark',
+          headerSlot: 'headerCustomerMark',
+          show: this.isCustomerMark,
+          align: "center"
+        },
+        {
+          width: 120,
+          prop: 'totalCount',
+          label: '数量',
+          slot: 'totalCount',
+          headerSlot: 'headerTotalCount',
+          align: "center"
+        },
+        {
+          width: 120,
+          prop: 'measuringUnit',
+          label: '计量单位',
+          slot: 'measuringUnit',
+          align: "center"
+        },
+        {
+          width: 120,
+          prop: 'singleWeight',
+          label: '单重',
+          slot: 'singleWeight',
+          headerSlot: 'headerSingleWeight',
+          align: "center"
+        },
+        {
+          width: 120,
+          prop: 'totalWeight',
+          label: '总重',
+          slot: 'totalWeight',
+          align: "center"
+        },
+        {
+          width: 120,
+          prop: 'weightUnit',
+          label: '重量单位',
+          slot: 'weightUnit',
+          align: "center"
+        },
+        {
+          width: 160,
+          prop: 'singlePrice',
+          label: '单价',
+          slot: 'singlePrice',
+          headerSlot: 'headerSinglePrice',
+          align: "center",
+          show: !this.detailType
+
+        },
+        // {
+        //   width: 160,
+        //   prop: 'discountSinglePrice',
+        //   label: '折让单价',
+        //   align: "center",
+        // },
+        {
+          width: 120,
+          prop: 'totalPrice',
+          label: '合计',
+          slot: 'totalPrice',
+          align: "center",
+          show: !this.detailType
+
+        },
+        // {
+        //   width: 160,
+        //   prop: 'discountTotalPrice',
+        //   label: '折让合计',
+        //   align: "center",
+        // },
+
+        // {
+        //   width: 80,
+        //   prop: 'deliveryDays',
+        //   label: '交期(天)',
+        //   slot: 'deliveryDays'
+        // },
+        // {
+        //   width: 160,
+        //   prop: 'deliveryDeadline',
+        //   label: '交期截止日期',
+        //   slot: 'deliveryDeadline',
+        //   show: this.isDeliveryDeadline
+        // },
+        {
+          width: 160,
+          prop: 'customerExpectDeliveryDeadline',
+          label: this.contractBookType == 1 ? '客户期望交期' : '交付日期',
+          slot: 'customerExpectDeliveryDeadline',
+          headerSlot: 'headerCustomerExpectDeliveryDeadline',
+          align: "center"
+        },
+        {
+          width: 160,
+          prop: 'produceDeliveryDeadline',
+          label: '生产交付交期',
+          slot: 'produceDeliveryDeadline',
+          show: this.contractBookType == 1 ? true : false,
+          headerSlot: 'headerCustomerExpectDeliveryDeadline',
+          align: "center"
+        },
+
+        {
+          width: 200,
+          prop: 'guaranteePeriod',
+          label: '质保期',
+          slot: 'guaranteePeriod',
+          align: "center"
+        },
+        {
+          width: 200,
+          prop: 'guaranteePeriodDeadline',
+          label: '质保期截止日期',
+          slot: 'guaranteePeriodDeadline',
+          show: this.isGuaranteePeriod,
+          align: "center"
+        },
+        // {
+        //   width: 120,
+        //   prop: 'guaranteePeriodUnitCode',
+        //   label: '',
+        //   slot: 'guaranteePeriodUnitCode'
+        // },
+        {
+          width: 220,
+          prop: 'customerReqFiles',
+          label: '客户需求',
+          slot: 'customerReqFiles',
+          align: "center"
+        },
+        {
+          width: 130,
+          prop: 'technicalAnswerName',
+          label: '技术答疑人',
+          slot: 'technicalAnswerName',
+          align: "center"
+        },
+        {
+          width: 220,
+          prop: 'technicalParams',
+          label: '技术参数',
+          slot: 'technicalParams',
+          align: "center"
+        },
+        {
+          width: 240,
+          prop: 'technicalDrawings',
+          label: '技术图纸',
+          slot: 'technicalDrawings',
+          align: "center"
+        },
+        {
+          width: 240,
+          prop: 'technologyRouteName',
+          label: '工艺路线',
+          slot: 'technologyRouteName',
+          show: this.contractBookType == 1 ? true : false,
+          align: "center"
+
+        },
+        {
+          width: 240,
+          prop: 'industryArtFiles',
+          label: '工艺附件',
+          slot: 'industryArtFiles',
+          align: "center"
+        },
+        {
+          width: 240,
+          prop: 'otherFiles',
+          label: '其他附件',
+          slot: 'otherFiles',
+          align: "center"
+        },
+        {
+          width: 220,
+          prop: 'remark',
+          label: '备注',
+          slot: 'remark',
+          align: "center"
+        },
+        {
+          columnKey: 'action',
+          label: '操作',
+          width: 120,
+          align: 'center',
+          resizable: false,
+          slot: 'action',
+          fixed: 'right',
+          showOverflowTooltip: true
+        }
+
+
+
+          // {
+          //   width: 45,
+          //   type: 'index',
+          //   columnKey: 'index',
+          //   align: 'center',
+          //   fixed: 'left'
+          // },
+          // {
+          //   width: 200,
+          //   prop: 'productName',
+          //   label: '名称',
+          //   slot: 'productName'
+          // },
+          // {
+          //   width: 120,
+          //   prop: 'productCode',
+          //   label: '编码',
+          //   slot: 'productCode'
+          // },
+          // {
+          //   width: 200,
+          //   prop: 'productCategoryName',
+          //   label: '类型',
+          //   slot: 'productCategoryName'
+          // },
+          // {
+          //   width: 160,
+          //   prop: 'productBrand',
+          //   label: '牌号',
+          //   slot: 'productBrand'
+          // },
+          // {
+          //   width: 120,
+          //   prop: 'modelType',
+          //   label: '型号',
+          //   slot: 'modelType'
+          // },
+          // {
+          //   width: 120,
+          //   prop: 'specification',
+          //   label: '规格',
+          //   slot: 'specification'
+          // },
+          // {
+          //   width: 200,
+          //   prop: 'customerMark',
+          //   label: '客户代号',
+          //   slot: 'customerMark'
+          // },
+          // {
+          //   width: 200,
+          //   prop: 'warehouseName',
+          //   label: '仓库名称',
+          //   slot: 'warehouseName'
+          // },
+          // // {
+          // //   width: 100,
+          // //   prop: 'warehouseNum',
+          // //   label: '库存',
+          // //   slot: 'warehouseNum'
+          // // },
+          // {
+          //   width: 120,
+          //   prop: 'totalCount',
+          //   label: '退货数量',
+          //   slot: 'totalCount',
+          //   headerSlot: 'headerTotalCount'
+          // },
+          // {
+          //   width: 120,
+          //   prop: 'sendTotalCount',
+          //   label: '发货数量',
+          //   slot: 'sendTotalCount'
+          // },
+
+
+          // {
+          //   width: 80,
+          //   prop: 'measuringUnit',
+          //   label: '计量单位',
+          //   slot: 'measuringUnit'
+          // },
+          // {
+          //   width: 120,
+          //   prop: 'singleWeight',
+          //   label: '单重',
+          //   slot: 'singleWeight',
+          //   align: "center"
+          // },
+          // {
+          //   width: 200,
+          //   prop: 'receiveTotalWeight',
+          //   label: '收货总重',
+          //   slot: 'receiveTotalWeight',
+          //   align: "center",
+          //   headerSlot: 'headerSendTotalWeight'
+          // },
+          // {
+          //   width: 200,
+          //   prop: 'sendTotalWeight',
+          //   label: '发货总重',
+          //   slot: 'sendTotalWeight',
+          //   align: "center"
+          // },
           // {
           //   width: 100,
-          //   prop: 'warehouseNum',
-          //   label: '库存',
-          //   slot: 'warehouseNum'
+          //   prop: 'increaseTotalWeight',
+          //   label: '增重重量',
+          //   slot: 'increaseTotalWeight',
+          //   align: "center"
+          // },
+          // {
+          //   width: 160,
+          //   prop: 'singlePrice',
+          //   label: '单价',
+          //   slot: 'singlePrice'
+          // },
+          // {
+          //   width: 120,
+          //   prop: 'totalPrice',
+          //   label: '合计',
+          //   slot: 'totalPrice'
+          // },
+          // {
+          //   width: 200,
+          //   prop: 'returnReason',
+          //   label: '退货原因',
+          //   slot: 'returnReason'
           // },
-          {
-            width: 120,
-            prop: 'totalCount',
-            label: '退货数量',
-            slot: 'totalCount',
-            headerSlot: 'headerTotalCount'
-          },
-          {
-            width: 120,
-            prop: 'sendTotalCount',
-            label: '发货数量',
-            slot: 'sendTotalCount'
-          },
-
-
-          {
-            width: 80,
-            prop: 'measuringUnit',
-            label: '计量单位',
-            slot: 'measuringUnit'
-          },
-          {
-            width: 120,
-            prop: 'singleWeight',
-            label: '单重',
-            slot: 'singleWeight',
-            align: "center"
-          },
-          {
-            width: 200,
-            prop: 'receiveTotalWeight',
-            label: '收货总重',
-            slot: 'receiveTotalWeight',
-            align: "center",
-            headerSlot: 'headerSendTotalWeight'
-          },
-          {
-            width: 200,
-            prop: 'sendTotalWeight',
-            label: '发货总重',
-            slot: 'sendTotalWeight',
-            align: "center"
-          },
-          {
-            width: 100,
-            prop: 'increaseTotalWeight',
-            label: '增重重量',
-            slot: 'increaseTotalWeight',
-            align: "center"
-          },
-          {
-            width: 160,
-            prop: 'singlePrice',
-            label: '单价',
-            slot: 'singlePrice'
-          },
-          {
-            width: 120,
-            prop: 'totalPrice',
-            label: '合计',
-            slot: 'totalPrice'
-          },
-          {
-            width: 200,
-            prop: 'returnReason',
-            label: '退货原因',
-            slot: 'returnReason'
-          },
           // {
           //   width: 140,
           //   prop: 'returnType',
@@ -379,23 +631,23 @@ export default {
           //   label: '技术图纸',
           //   slot: 'technicalDrawings'
           // },
-          {
-            width: 220,
-            prop: 'remark',
-            label: '备注',
-            slot: 'remark'
-          },
-          {
-            columnKey: 'action',
-            label: '操作',
-            width: 120,
-            align: 'center',
-            resizable: false,
-            slot: 'action',
-            fixed: 'right',
-            showOverflowTooltip: true,
+          // {
+          //   width: 220,
+          //   prop: 'remark',
+          //   label: '备注',
+          //   slot: 'remark'
+          // },
+          // {
+          //   columnKey: 'action',
+          //   label: '操作',
+          //   width: 120,
+          //   align: 'center',
+          //   resizable: false,
+          //   slot: 'action',
+          //   fixed: 'right',
+          //   showOverflowTooltip: true,
 
-          }
+          // }
         ]
       };
     },

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

@@ -224,19 +224,19 @@ export default {
           align: 'center'
         },
 
-        // {
-        //   width: 120,
-        //   prop: 'deliveryDays',
-        //   label: '交期(天)',
-        //   slot: 'deliveryDays'
-        // },
-        // {
-        //   width: 160,
-        //   prop: 'deliveryDeadline',
-        //   label: '交期截止日期',
-        //   slot: 'deliveryDeadline',
-        //   show: this.isDeliveryDeadline
-        // },
+        {
+          width: 120,
+          prop: 'deliveryDays',
+          label: '交期(天)',
+          // slot: 'deliveryDays'
+        },
+        {
+          width: 160,
+          prop: 'deliveryDeadline',
+          label: '交期截止日期',
+          // slot: 'deliveryDeadline',
+          // show: this.isDeliveryDeadline
+        },
         {
           width: 160,
           prop: 'customerExpectDeliveryDeadline',
@@ -340,7 +340,6 @@ export default {
     };
   },
   computed: {},
-
   methods: {
     //修改回显
     putTableValue(data) {

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

@@ -176,6 +176,8 @@
         }
         if (this.taskDefinitionKey === 'produceLeader') {
           let arr = await this.getTableValue();
+          // console.log(arr,'arr')
+
           if (!arr) {
             return;
           }

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

@@ -109,29 +109,34 @@
               prop="repliedFiles"
               style="margin-bottom: 16px"
             >
-              <fileMain v-model="form.repliedFiles" :type="taskDefinitionKey == 'salesmanUploadReceipt'?'':'view'"></fileMain>
-<!--              <fileUpload-->
-<!--                v-if="taskDefinitionKey == 'salesmanUploadReceipt'"-->
-<!--                v-model="form.repliedFiles"-->
-<!--                module="main"-->
-<!--                :showLib="false"-->
-<!--                :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)"-->
-<!--                >-->
-<!--                  {{ link.name }}-->
-<!--                </el-link>-->
-<!--              </div>-->
+              <fileMain
+                v-model="form.repliedFiles"
+                :type="
+                  taskDefinitionKey == 'salesmanUploadReceipt' ? '' : 'view'
+                "
+              ></fileMain>
+              <!--              <fileUpload-->
+              <!--                v-if="taskDefinitionKey == 'salesmanUploadReceipt'"-->
+              <!--                v-model="form.repliedFiles"-->
+              <!--                module="main"-->
+              <!--                :showLib="false"-->
+              <!--                :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)"-->
+              <!--                >-->
+              <!--                  {{ link.name }}-->
+              <!--                </el-link>-->
+              <!--              </div>-->
             </el-form-item>
           </el-col>
         </el-row>
@@ -181,6 +186,7 @@
         :form="form"
         :sourceBizNo="form.returnNo"
         :saleProductList="form.productList"
+        :detailProductList="detailData.productList"
         :bizType="6"
       ></add>
     </keep-alive>
@@ -204,7 +210,7 @@
   import add from '@/views/bpm/stockManagement/storage.vue';
   import detailDialog from '@/views/bpm/stockManagement/details.vue';
   import fileUpload from '@/components/upload/fileUpload.vue';
-  import fileMain from "@/components/addDoc/index.vue";
+  import fileMain from '@/components/addDoc/index.vue';
 
   export default {
     mixins: [dictMixins],
@@ -413,6 +419,7 @@
       }
       if (this.taskDefinitionKey == 'salesmanUploadReceipt') {
         this.tabOptions.push({ key: 'inoutBoundView', name: '入库单详情' });
+        // this.activeComp = 'inoutBoundView';
       }
       console.log('this.tabOptions----------------', this.tabOptions);
     },
@@ -468,6 +475,12 @@
           this.detailData = data;
           this.form = data;
           this.form.pricingWay = data.saleOrder.pricingWay;
+          this.$nextTick(() => {
+            if (this.taskDefinitionKey == 'storemanApprove') {
+              this.activeComp = 'inoutBound';
+              this.$emit('activeCompChange', 'inoutBound');
+            }
+          });
         }
       }
     }