diff --git a/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn1.vue b/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn1.vue index 1e5aaebb..684f513d 100644 --- a/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn1.vue +++ b/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn1.vue @@ -274,6 +274,9 @@ export default { rejectId: { type: [String, Number], }, + agreementId: { + type: [String, Number], + }, }, data() { const validatePhone = (rule, value, callback) => { @@ -485,7 +488,7 @@ export default { // } if (this.rejectId) { this.rowId = this.rejectId - this.returnNoteByApply(this.rejectId) + this.GetViewByApply({ id: this.rejectId, agreementId: this.agreementId}) } getInfo().then((res) => { this.companyId = res.user.companyId @@ -550,8 +553,8 @@ export default { }, // 获取 任务详情数据 - async GetViewByApply(Id) { - const res = await materialReturnNoteByApply({ id: Id }) + async GetViewByApply(params) { + const res = await materialReturnNoteByApply({ id: params.id, agreementId: params.agreementId}) const data = res.data[0] // console.log(data) // this.queryParams.taskId = data.taskId diff --git a/sgzb-ui/src/views/claimAndreturn/return/apply/component/home1.vue b/sgzb-ui/src/views/claimAndreturn/return/apply/component/home1.vue index 3ef34a29..7d97a5b8 100644 --- a/sgzb-ui/src/views/claimAndreturn/return/apply/component/home1.vue +++ b/sgzb-ui/src/views/claimAndreturn/return/apply/component/home1.vue @@ -782,7 +782,7 @@ export default { // isEdit: true, // }, // }) - this.$emit('rejectSubmit', row.id) + this.$emit('rejectSubmit', { id: row.id, agreementId: row.agreementId }) }, // 退料单 handleUpdateOrder() { diff --git a/sgzb-ui/src/views/claimAndreturn/return/apply/index.vue b/sgzb-ui/src/views/claimAndreturn/return/apply/index.vue index 2b6dd9b0..69f7622c 100644 --- a/sgzb-ui/src/views/claimAndreturn/return/apply/index.vue +++ b/sgzb-ui/src/views/claimAndreturn/return/apply/index.vue @@ -9,6 +9,7 @@ 批量通过 @@ -320,6 +321,7 @@ size="mini" @click="refusedAll" :disabled="multiple" + v-if="showHandle" >批量不通过 @@ -512,7 +514,7 @@ export default { pageNum: 1, pageSize: 10, keyWord: '', - typeId: '', + typeId: undefined, }, // 表单参数 form: {},