Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wt

src/BIZComponents/inventoryTable.vue

@@ -323,6 +323,7 @@
             dictName="产地"
             clearable
             v-model="scope.row.provenance"
+            collapse-tags
             multiple
           >
           </DictSelection>
@@ -715,13 +716,13 @@
                 : '';
             }
           },
-          {
-            width: 120,
-            prop: 'approvalNumber',
-            align: 'center',
-            label: '批准文号',
-            showOverflowTooltip: true
-          },
+          // {
+          //   width: 120,
+          //   prop: 'approvalNumber',
+          //   align: 'center',
+          //   label: '批准文号',
+          //   showOverflowTooltip: true
+          // },
           {
             width: 120,
             prop: 'packingSpecification',

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

@@ -63,44 +63,44 @@
         repairTabsOptions: [
         {
             label: '生产计划审核',
-            name: 'Activity_1lfkrs6',
-            isOutOrIn: 'innerStore'
-          },
-          {
-            label: '内部生产物品入库',
-            name: 'innerStoremanIn',
-            isOutOrIn: 'innerStore'
-          },
-          {
-            label: '填写重量',
-            name: 'innerFillWeight',
-            isOutOrIn: 'innerStore'
-          },
-          {
-            label: '内部生产入库质检',
-            name: 'innerInQC',
+            name: 'repairProducePlan',
             isOutOrIn: 'innerStore'
           },
+          // {
+          //   label: '内部生产物品入库',
+          //   name: 'innerStoremanIn',
+          //   isOutOrIn: 'innerStore'
+          // },
+          // {
+          //   label: '填写重量',
+          //   name: 'innerFillWeight',
+          //   isOutOrIn: 'innerStore'
+          // },
+          // {
+          //   label: '内部生产入库质检',
+          //   name: 'innerInQC',
+          //   isOutOrIn: 'innerStore'
+          // },
           {
             label: '物品出库给外协',
             name: 'outerStoremanOut',
             isOutOrIn: 'outerStore'
           },
-          {
-            label: '外协返修物品入库',
-            name: 'outerStoremanIn',
-            isOutOrIn: 'outerStore'
-          },
-          {
-            label: '填写重量',
-            name: 'outerFillWeight',
-            isOutOrIn: 'outerStore'
-          },
-          {
-            label: '外协返修入库质检',
-            name: 'outerInQC',
-            isOutOrIn: 'outerStore'
-          }
+          // {
+          //   label: '外协返修物品入库',
+          //   name: 'outerStoremanIn',
+          //   isOutOrIn: 'outerStore'
+          // },
+          // {
+          //   label: '填写重量',
+          //   name: 'outerFillWeight',
+          //   isOutOrIn: 'outerStore'
+          // },
+          // {
+          //   label: '外协返修入库质检',
+          //   name: 'outerInQC',
+          //   isOutOrIn: 'outerStore'
+          // }
         ],
         activeComp: '',
         permissionType: '',
@@ -194,13 +194,13 @@
             name: '内部处理',
             isShow: [1, 9].includes(this.innerOuterBoth)
           },
-          {
-            key: 'QCApprove2',
-            permissionType: 'update',
-            isShowReturnOrder: false,
-            name: '质检员反馈',
-            isShow: true
-          }
+          // {
+          //   key: 'QCApprove2',
+          //   permissionType: 'update',
+          //   isShowReturnOrder: false,
+          //   name: '质检员反馈',
+          //   isShow: true
+          // }
         ];
         return list.filter((item) => item.isShow);
       }

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

@@ -46,7 +46,7 @@
       innerFillWeight: () => import('@/views/bpm/stockManagement/quality.vue'),
       outerFillWeight: () => import('@/views/bpm/stockManagement/quality.vue'),
       outerFillWeightDetails: () =>   import('@/views/bpm/stockManagement/details.vue'),
-      Activity_1lfkrs6: () =>
+      repairProducePlan: () =>
         import(
           '@/views/bpm/handleTask/components/saleOrder/customerReturnGoods/productionPlanList.vue'
         )
@@ -102,50 +102,50 @@
         let list = [
           {
             label: '生产计划审核',
-            name: 'Activity_1lfkrs6',
-            isOutOrIn: 'innerStore'
-          },
-          {
-            label: '内部生产物品入库',
-            name: 'innerStoremanIn',
-            isOutOrIn: 'innerStore'
-          },
-          {
-            label: '填写重量',
-            name: 'innerFillWeight',
-            isOutOrIn: 'innerStore'
-          },
-          {
-            label: '内部生产入库质检',
-            name: 'innerInQC',
+            name: 'repairProducePlan',
             isOutOrIn: 'innerStore'
           },
+          // {
+          //   label: '内部生产物品入库',
+          //   name: 'innerStoremanIn',
+          //   isOutOrIn: 'innerStore'
+          // },
+          // {
+          //   label: '填写重量',
+          //   name: 'innerFillWeight',
+          //   isOutOrIn: 'innerStore'
+          // },
+          // {
+          //   label: '内部生产入库质检',
+          //   name: 'innerInQC',
+          //   isOutOrIn: 'innerStore'
+          // },
           {
             label: '物品出库给外协',
             name: 'outerStoremanOut',
             isOutOrIn: 'outerStore'
           },
-          {
-            label: '外协返修物品入库',
-            name: 'outerStoremanIn',
-            isOutOrIn: 'outerStore'
-          },
-          {
-            label: '填写重量',
-            name: 'outerFillWeight',
-            isOutOrIn: 'outerStore'
-          },
-          {
-            label: '外协返修入库质检',
-            name: 'outerInQC',
-            isOutOrIn: 'outerStore'
-          }
+          // {
+          //   label: '外协返修物品入库',
+          //   name: 'outerStoremanIn',
+          //   isOutOrIn: 'outerStore'
+          // },
+          // {
+          //   label: '填写重量',
+          //   name: 'outerFillWeight',
+          //   isOutOrIn: 'outerStore'
+          // },
+          // {
+          //   label: '外协返修入库质检',
+          //   name: 'outerInQC',
+          //   isOutOrIn: 'outerStore'
+          // }
         ];
         return list.filter((item) => item.isOutOrIn == this.activeComp);
       },
       activeNameProps() {
         switch (this.componentVal) {
-          case 'Activity_1lfkrs6':
+          case 'repairProducePlan':
             return {
               ids: this.form.detailList
                 .filter((item) => item.inOrOut == 1)
@@ -245,7 +245,7 @@
       // }
 
       let innerStoreList = [
-        'Activity_1lfkrs6',
+        'repairProducePlan',
         'innerStoremanIn',
         'innerFillWeight',
         'innerInQC'
@@ -280,8 +280,9 @@
     },
     methods: {
       isValidComponent(componentName) {
+     
         const validComponents = [
-          'Activity_1lfkrs6',
+          'repairProducePlan',
           'outerStoremanOut',
           'outerStoremanIn',
           'outerInQC',

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

@@ -454,6 +454,8 @@
         this.$refs.formRef.validate(async (validate) => {
           if ((!validate || !data) && !!pass)
             return this.$message.warning('有必填项未填，请检查');
+            // alert(1)
+            // return
           if (this.taskDefinitionKey === 'storeman' && !!pass) {
             // 销售退货入库节点
             this.salesReturnsInStorage(data, pass);

src/views/bpm/outgoingManagement/outbound.vue

@@ -736,7 +736,7 @@ export default {
         };
         let pData3 = {//销售退货处理 外协出库
           type: 3,
-          outInId: this.form?.returnInReceiptId?.toString(),
+          outInIds: this.form?.returnInReceiptId?.split(','),
           packageNos: this.detailList.map(item => item.packageNo)
         }
 

src/views/bpm/stockManagement/storage.vue

@@ -1306,7 +1306,7 @@ export default {
                   (val) => val.categoryCode == item.productCode
                 ).index
                 : this.productList[0].index, // 产品索引
-              batchNo: item.batchNo || this.productList[0].batchNo, // 批次号
+              batchNo: this.productList[0].batchNo, // 批次号
               packageNo: item.packageNo || packingCodeList[index]?.onlyCode, // 包装编码
               packingQuantity: 1, // 包装数量
               packingUnit: item.packingUnit, // 单位
@@ -1348,6 +1348,17 @@ export default {
       });
       return measureQuantity;
     },
+        //多产品明细获取批次号 ys
+    // getBatch(code) {
+    // let batch=''
+    // console.log(this.productList,'this.productList')
+    // this.productList.forEach((item) => {
+    //     if (code == item.) {
+    //       batch =item.batchNo
+    //     }
+    //   });
+    //   return batch
+    // },
     //多产品明细数据转换
     async getDetailsVal(code, productBrand) {
       const { data } = await storageApi.getAssetNum([