bug

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

@@ -352,7 +352,7 @@
                 <el-select
                   v-if="isTrue"
                   v-model="row.inOrOut"
-                  @change="listChange('inOrOut', row.inOrOut, row)"
+                  @change="listChange('inOrOut', row.inOrOut,'inOrOut')"
                 >
                   <el-option label="内部" :value="1" />
                   <el-option label="外部" :value="2" />

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

@@ -45,6 +45,7 @@
       innerInQC: () => import('@/views/bpm/stockManagement/quality.vue'),
       innerFillWeight: () => import('@/views/bpm/stockManagement/quality.vue'),
       outerFillWeight: () => import('@/views/bpm/stockManagement/quality.vue'),
+      outerFillWeightDetails: () =>   import('@/views/bpm/stockManagement/details.vue'),
       Activity_1lfkrs6: () =>
         import(
           '@/views/bpm/handleTask/components/saleOrder/customerReturnGoods/productionPlanList.vue'
@@ -85,19 +86,14 @@
     watch: {
       activeName(val) {
         let componentName = val;
-        const detailsArr = ['outerStoremanOut', 'outerStoremanIn'];
+        const detailsArr = ['outerStoremanOut', 'outerStoremanIn','outerFillWeight'];
         if (
           detailsArr.includes(componentName) &&
           componentName != this.taskDefinitionKey
         ) {
           componentName = componentName + 'Details';
         }
-        console.log(
-          detailsArr.includes(componentName) &&
-            !detailsArr.includes(this.taskDefinitionKey),
-          'sss'
-        );
-        console.log(componentName, 'componentName');
+   
         this.componentVal = componentName;
       }
     },
@@ -164,7 +160,7 @@
           case 'outerStoremanIn':
             return {
               form: this.form,
-              bizType: 6,
+              bizType: 9,
               sourceBizNo: this.form.returnHandleNo,
               detailList: this.detailList,
               isMoreProduct:true
@@ -177,9 +173,10 @@
           case 'outerStoremanOut':
             return {
               form: this.form,
-              bizType: 7,
+              bizType: 6,
               sourceBizNo: this.form.returnHandleNo,
-              detailList: this.detailList
+              detailList: this.detailList,
+              
             };
           case 'outerStoremanOutDetails':
             return {
@@ -202,6 +199,11 @@
               isIds:true,
               qualityInspectionItems: ['weight']
             };
+            case 'outerFillWeightDetails':
+            return {
+              businessId: this.form.outerOutReceiptId,
+              isIds: true
+            };
           case 'innerFillWeight':
             return {
               businessId: this.form.innerInReceiptId,

src/views/bpm/outgoingManagement/outbound.vue

@@ -922,8 +922,14 @@
             taskIds: this.extractedList.map((item) => item.taskId),
             workOrderIds: this.extractedList.map((item) => item.workOrderId)
           };
+          let pData3 = {//销售退货处理 外协出库
+            type: 3, 
+             outInId:this.form?.returnInReceiptId?.toString(),
+             packageNos:this.detailList.map(item=>item.packageNo)
+          }
+          
           storageApi
-            .getHierarchyFifo(this.wwType == 3 ? pData2 : pData)
+            .getHierarchyFifo(this.wwType == 3 ? pData2 :this.bizType==6?pData3:pData)
             .then((data) => {
               this.detailData(data, this.dimension);
             })
@@ -990,6 +996,7 @@
             taskIds: this.form.productList.map((item) => item.taskId),
             workOrderIds: [this.form.sourceId]
           };
+    
           storageApi
             .getHierarchyFifo(this.form.sourceId ? pData2 : pData)
             .then((data) => {

src/views/bpm/stockManagement/storage.vue

@@ -1062,6 +1062,11 @@
             required: true,
             message: '请选择入库场景',
             trigger: 'change'
+          },
+         storageTime: {
+            required: true,
+            message: '请选择入库时间',
+            trigger: 'change'
           }
         },
         qualityResultsOptions, // 质检结果选项
@@ -1719,6 +1724,7 @@
       getNowDate() {
         let date = new Date(),
           obj = {
+            year: date.getFullYear(), //获取当前月份(0-11,0代表1月)
             month: date.getMonth() + 1, //获取当前月份(0-11,0代表1月)
             strDate: date.getDate(), // 获取当前日(1-31)
             hour: date.getHours(), //获取当前小时(0 ~ 23)