feat: 添加includeReworkBom支持材料定额功能

src/views/produce/components/picking/details.vue

@@ -203,7 +203,7 @@
       rowClick(row) {},
 
       handleAdd() {
-        this.$emit('pickAdd', 'pick', this.dataList);
+        this.$emit('pickAdd', {type:'pick',includeReworkBom:true,dataList:this.dataList});
       },
 
       refresh() {

src/views/produce/components/picking/index.vue

@@ -358,6 +358,10 @@
         default() {
           return [];
         }
+      },
+      includeReworkBom:{
+        type: Boolean,
+        default: false
       }
     },
 
@@ -409,8 +413,11 @@
       getList() {
         let param = {
           ids: this.workListIds,
-          taskId: this.taskObj.id
+          taskId: this.taskObj.id,
         };
+        if(this.includeReworkBom) {
+          param.includeReworkBom = true;
+        }
         if (this.clientEnvironmentId == 21) {
           znworkorderList(param).then((res) => {
             let arr = res.map((e) => {

src/views/produceOrder/workReport.vue

@@ -310,6 +310,7 @@
         v-if="pickingShow"
         @close="pickingClose"
         :workListIds="workListIds"
+        :includeReworkBom="includeReworkBom"
       ></picking>
 
       <!-- 工艺文件 -->
@@ -495,7 +496,8 @@
         planDotLineEnabled: false,
         firstArticlePickFeedReady: true,
         firstArticlePickFeedMsg: '',
-        firstArticlePickFeedCheckKey: ''
+        firstArticlePickFeedCheckKey: '',
+        includeReworkBom: false
       };
     },
 
@@ -1708,7 +1710,8 @@
         });
       },
 
-      pickAdd() {
+      pickAdd(data) {
+        this.includeReworkBom = data?.includeReworkBom;
         this.checkPick();
 
         // this.pickingShow = true;