Bladeren bron

客户退货产品处理审批 出入库标签展示问题

Z 2 jaren geleden
bovenliggende
commit
8387afdf05

+ 11 - 11
src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/customerReturnOrderDialog.vue

@@ -62,29 +62,29 @@ export default {
       pageName: '',
       pageName: '',
       repairTabsOptions: [
       repairTabsOptions: [
         {
         {
-          key: 'outerStoremanOut',
+          name: 'outerStoremanOut',
           isOutOrIn: 'outerStore',
           isOutOrIn: 'outerStore',
-          name: '物品出库给外协'
+          label: '物品出库给外协'
         },
         },
         {
         {
-          key: 'outerStoremanIn',
+          name: 'outerStoremanIn',
           isOutOrIn: 'outerStore',
           isOutOrIn: 'outerStore',
-          name: '外协返修物品入库'
+          label: '外协返修物品入库'
         },
         },
         {
         {
-          key: 'outerInQC',
+          name: 'outerInQC',
           isOutOrIn: 'outerStore',
           isOutOrIn: 'outerStore',
-          name: '外协返修入库质检'
+          label: '外协返修入库质检'
         },
         },
         {
         {
-          key: 'innerStoremanIn',
+          name: 'innerStoremanIn',
           isOutOrIn: 'innerStore',
           isOutOrIn: 'innerStore',
-          name: '内部生产物品入库'
+          label: '内部生产物品入库'
         },
         },
         {
         {
-          key: 'innerInQC',
+          name: 'innerInQC',
           isOutOrIn: 'innerStore',
           isOutOrIn: 'innerStore',
-          name: '内部生产入库质检'
+          label: '内部生产入库质检'
         }
         }
       ],
       ],
       activeComp: '',
       activeComp: '',
@@ -194,7 +194,7 @@ export default {
     //返修节点中有可能多流程
     //返修节点中有可能多流程
     let find =
     let find =
       this.repairTabsOptions.find(
       this.repairTabsOptions.find(
-        (item) => item.key == this.taskDefinitionKey
+        (item) => item.name == this.taskDefinitionKey
       )?.isOutOrIn || '';
       )?.isOutOrIn || '';
     let optionKey = find || this.taskDefinitionKey;
     let optionKey = find || this.taskDefinitionKey;
     this.activeComp = optionKey || 'stater';
     this.activeComp = optionKey || 'stater';

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

@@ -72,30 +72,31 @@
           {
           {
             label: '内部生产物品入库',
             label: '内部生产物品入库',
             name: 'innerStoremanIn',
             name: 'innerStoremanIn',
-            parentType: '1'
+            isOutOrIn: 'innerStore',
           },
           },
           {
           {
             label: '内部生产入库质检',
             label: '内部生产入库质检',
             name: 'innerInQC',
             name: 'innerInQC',
-            parentType: '1'
+            isOutOrIn: 'innerStore',
           },
           },
           {
           {
             label: '物品出库给外协',
             label: '物品出库给外协',
             name: 'outerStoremanOut',
             name: 'outerStoremanOut',
-            parentType: '2'
+            parentTabName:'outerStore',
+            isOutOrIn: 'outerStore',
           },
           },
           {
           {
             label: '外协返修物品入库',
             label: '外协返修物品入库',
             name: 'outerStoremanIn',
             name: 'outerStoremanIn',
-            parentType: '2'
+            isOutOrIn: 'outerStore',
           },
           },
           {
           {
             label: '外协返修入库质检',
             label: '外协返修入库质检',
             name: 'outerInQC',
             name: 'outerInQC',
-            parentType: '2'
+            isOutOrIn: 'outerStore',
           }
           }
         ];
         ];
-        return list.filter((item) => item.parentType == this.innerOuterBoth);
+        return list.filter((item) => item.isOutOrIn == this.activeComp);
       }
       }
     },
     },
     async created() {
     async created() {
@@ -137,7 +138,6 @@
             returnStorageData: await this.$refs.componentRef.getReturnStorage(),
             returnStorageData: await this.$refs.componentRef.getReturnStorage(),
             qualityInspectionStatus: this.$refs.componentRef.getStatus()
             qualityInspectionStatus: this.$refs.componentRef.getStatus()
           };
           };
-          console.log('params----------', params);
           resolve(params);
           resolve(params);
         });
         });
       }
       }