diff --git a/sgzb-ui/src/views/claimAndreturn/return/scrap/component/return.vue b/sgzb-ui/src/views/claimAndreturn/return/scrap/component/return.vue index ccff0975..e836f94d 100644 --- a/sgzb-ui/src/views/claimAndreturn/return/scrap/component/return.vue +++ b/sgzb-ui/src/views/claimAndreturn/return/scrap/component/return.vue @@ -814,15 +814,25 @@ export default { }, // 完成退料 async handleComplete() { + console.log('🚀 ~ handleComplete ~ handleComplete:', this.$refs.homeTbRef.tableList) let param1 = { parentId: this.sendParams.id, } const res1 = await getRecord(param1) if (res1.code == 200) { + let typeId = '' + if (this.$refs.homeTbRef.tableList.length > 0) { + this.$refs.homeTbRef.tableList.forEach((item) => { + if (item.backStatus == 0) { + typeId += item.modelId + ',' + } + }) + } let param = { createBy: sessionStorage.getItem('userId'), parentId: this.sendParams.id, taskId: this.sendParams.taskId, + typeId: typeId, } endBack(param).then((response) => { if (response.code == 200) { diff --git a/sgzb-ui/src/views/index.vue b/sgzb-ui/src/views/index.vue index 6d9a44e9..d7b55a65 100644 --- a/sgzb-ui/src/views/index.vue +++ b/sgzb-ui/src/views/index.vue @@ -406,7 +406,7 @@ export default { } }, created() { - this.isOnRoles = this.roles ? this.roles.split(',').some((role) => ['em01', 'em02', 'fgs', 'sgb', 'dm01', ].includes(role)) : false + this.isOnRoles = this.roles ? this.roles.split(',').some((role) => ['em01', 'em02', 'fgs', 'sgb', 'dm01', 'dm02' ].includes(role)) : false this.getList() this.getTaskTypeList() },