diff --git a/pages/exitMaterial/exitMaterial.vue b/pages/exitMaterial/exitMaterial.vue index 3a4cc75..f2e44ca 100644 --- a/pages/exitMaterial/exitMaterial.vue +++ b/pages/exitMaterial/exitMaterial.vue @@ -44,7 +44,7 @@ 修改 @@ -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) { diff --git a/pages/exitMaterialDetail/exitMaterialDetail.vue b/pages/exitMaterialDetail/exitMaterialDetail.vue index f05c0ee..aa221c2 100644 --- a/pages/exitMaterialDetail/exitMaterialDetail.vue +++ b/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); diff --git a/pages/exitMaterialSelect/exitMaterialSelect.vue b/pages/exitMaterialSelect/exitMaterialSelect.vue index dfe2cfd..cf36685 100644 --- a/pages/exitMaterialSelect/exitMaterialSelect.vue +++ b/pages/exitMaterialSelect/exitMaterialSelect.vue @@ -57,8 +57,10 @@ import { basePath } from '../../public'; agreementId: '', submitList: { parentId: '', + taskId:'', backApplyDetails: '' - } + }, + taskId:'' } }, computed: { @@ -173,12 +175,15 @@ import { basePath } from '../../public'; }) 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).then(res => { console.log(res); if (res.data.code == 200) { + uni.showToast({ icon: 'none', title: res.data.msg, @@ -234,6 +239,7 @@ import { basePath } from '../../public'; console.log(params); that.agreementId = params.agreeId that.submitList.parentId = params.id + that.taskId = params.taskId // 退料物料选择 that.$api.exitMaterial.selectMaterial({ agreementId: params.agreeId