diff --git a/src/views/material/back/component/addReturn.vue b/src/views/material/back/component/addReturn.vue index deca93c0..184e11eb 100644 --- a/src/views/material/back/component/addReturn.vue +++ b/src/views/material/back/component/addReturn.vue @@ -717,6 +717,8 @@ export default { // 获取 设备树结构数据 async GetDeviceTypeTreeFn(agreementId) { const params = { + unitId: this.queryParams.unitId, + proId: this.queryParams.proId, agreementId: agreementId } const res = await getDeviceTreeByAgreementId(params) @@ -950,7 +952,9 @@ export default { backPerson: this.queryParams.backPerson, phone: this.queryParams.phone, remark: this.queryParams.remark, - agreementId: this.queryParams.agreementId + unitId: this.queryParams.unitId, + proId: this.queryParams.proId, + agreementId: this.queryParams.agreementId, // backTime: this.queryParams.backTime, // createBy: this.queryParams.createBy, // companyId: this.queryParams.companyId, diff --git a/src/views/material/back/component/home.vue b/src/views/material/back/component/home.vue index 6462a72b..bafebd98 100644 --- a/src/views/material/back/component/home.vue +++ b/src/views/material/back/component/home.vue @@ -323,12 +323,12 @@ export default { onDictReady(dict) { // 获取back_task_status的所有选项 const validOptions = dict.type.back_task_status || [] - + // 如果有有效选项,设置第一个为默认值 if (validOptions.length > 0) { this.queryParams.status = validOptions[0].value } - + // 执行查询 this.getList() }, @@ -457,10 +457,13 @@ export default { // }, handleSubmit(row){ + console.log(row) this.$modal.confirm('是否确认提交所选择的退料任务?') .then(() => { let param = { id:row.id, - taskId:row.taskId + taskId:row.taskId, + proId:row.proId, + unitId:row.unitId, } submitBackApply(param).then((res) => { this.getList() diff --git a/src/views/material/back/component/queryReturn.vue b/src/views/material/back/component/queryReturn.vue index e71c4b3c..ef522c0e 100644 --- a/src/views/material/back/component/queryReturn.vue +++ b/src/views/material/back/component/queryReturn.vue @@ -587,6 +587,7 @@ export default { async GetDeviceTypeTreeFn(agreementId) { const params = { agreementId: agreementId, + unitId: this.queryParams.unitId, } const res = await getDeviceTreeByAgreementId(params) console.log('resgetUseTypeTreee==========', res) diff --git a/src/views/materialsStation/toolsBack/back/component/addReturn.vue b/src/views/materialsStation/toolsBack/back/component/addReturn.vue index b20662c9..a160853e 100644 --- a/src/views/materialsStation/toolsBack/back/component/addReturn.vue +++ b/src/views/materialsStation/toolsBack/back/component/addReturn.vue @@ -137,7 +137,7 @@ - + @@ -206,13 +206,13 @@ @@ -566,6 +566,7 @@ export default { type: 'success' }) } + console.log('🚀 ~ handleTypeChange ~ this.equipmentList:', this.equipmentList) } // 清空临时选中值