冲突合并

pages/exitMaterial/exitMaterial.vue

@@ -44,7 +44,7 @@
 				<view 
 					style="background-color: #FCA30D;"
 					v-show="exit.typeId == null"
-					@click="chooseMaterial(exit.agreementId, exit.id)"
+					@click="chooseMaterial(exit.agreementId, exit.id, exit.taskId)"
 				>
 					<uni-icons style="color: #fff;" type="compose" ></uni-icons>
 					修改
@@ -227,7 +227,8 @@ import { basePath } from '../../public'
 					phone: '',
 					backTime: '',
 					backPerson: '',
-					remark: ''
+					remark: '',
+          taskId: ''
 				},
 				fetchedList: [],
 				ableRoleArr: ['admin', 'em04', 'me02', 'dm03'],
@@ -338,9 +339,9 @@ import { basePath } from '../../public'
 					url: `/pages/exitMaterialDetail/exitMaterialDetail?id=${id}&typeId=${typeId}`
 				})
 			},
-			chooseMaterial (agreeId, id) {
+			chooseMaterial (agreeId, id,taskId) {
 				uni.navigateTo({
-					url: `/pages/exitMaterialSelect/exitMaterialSelect?agreeId=${agreeId}&id=${id}`
+					url: `/pages/exitMaterialSelect/exitMaterialSelect?agreeId=${agreeId}&id=${id}&taskId=${taskId}`
 				})
 			},
 			delOffer (id) {

pages/exitMaterialDetail/exitMaterialDetail.vue

@@ -52,7 +52,8 @@ import { basePath } from '../../public';
 				],
 				totalFine: '',
 				cartList: [],
-				typeId: ''
+				typeId: '',
+        taskId:''
 			}
 		},
 		computed: {
@@ -153,6 +154,7 @@ import { basePath } from '../../public';
 					// 提交退料清单
 					that.$api.exitMaterial.subExitMaterial({
 						typeId: that.typeId,
+						taskId: this.taskId,
 						num: subList
 					}).then(res => {
 						console.log(res);

pages/exitMaterialSelect/exitMaterialSelect.vue

@@ -69,8 +69,10 @@
                 agreementId: "",
                 submitList: {
                     parentId: "",
+                    taskId: "",
                     backApplyDetails: "",
                 },
+                taskId: "",
             };
         },
         computed: {
@@ -192,9 +194,11 @@
                                 );
                                 let set = new Set(setArr);
                                 console.log(set.size);
+
                                 if (set.size == 1) {
                                     that.submitList.companyId =
                                         that.submitList.backApplyDetails[0].companyId;
+                                    that.submitList.taskId = that.taskId;
                                     console.log(that.submitList);
                                     that.$api.exitMaterial
                                         .subExitMaterial(that.submitList)
@@ -257,6 +261,7 @@
             console.log(params);
             that.agreementId = params.agreeId;
             that.submitList.parentId = params.id;
+            that.taskId = params.taskId;
             // 退料物料选择
             that.$api.exitMaterial
                 .selectMaterial({