diff --git a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/auditingPage.vue b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/auditingPage.vue index eefaa36b..3a626b1f 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/auditingPage.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/auditing/component/auditingPage.vue @@ -480,16 +480,22 @@ export default { const params = JSON.parse(JSON.stringify(this.queryParams)) params.taskStatus = params.taskStatus + 1 + /* 如果为调试分公司机具 参数修改 直接跳过分管部门审核 */ + if (!this.isMachinery && type == 9) { + params.taskStatus = 32 + } params.leaseApplyInfoList.forEach((v) => { console.log(v) this.$set(v, 'companyAuditRemark', params.companyAuditRemarks) this.$set(v, 'companyAuditBy', this.user.id) - if (!this.isMachinery && type == 9) { - this.$set( - v, - 'examineStatusId', - Number(params.examineStatusId) + 1, - ) + if (!this.isMachinery && type == 9 && params.taskStatus == 32) { + this.$set(v, 'examineStatusId', 30) + } else if ( + !this.isMachinery && + type == 9 && + params.taskStatus == 33 + ) { + this.$set(v, 'examineStatusId', 32) } else { this.$set( v, @@ -503,11 +509,6 @@ export default { params.updateTime = params.updateTimes params.createTime = params.createTimes - /* 如果为调试分公司机具 参数修改 直接跳过分管部门审核 */ - if (!this.isMachinery && type == 9) { - params.taskStatus = 32 - } - console.log(params, '审核参数', type) const res = await auditLeaseByCompany(params) if (res.code == 200) { diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn/index.vue b/sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn/index.vue index 6e3d9ee0..27c93353 100644 --- a/sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn/index.vue +++ b/sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn/index.vue @@ -545,7 +545,7 @@ export default { ? data.parentIds : data.parentId, typeId, - taskId: this.sendParamsReturn.taskId, + taskId: this.sendParams.taskId, }).then((res) => { this.$message.success('已撤回') this.$refs.homeTbRef.getList() @@ -578,7 +578,7 @@ export default { } }) let param = { - taskId: this.sendParamsReturn.taskId, + taskId: this.sendParams.taskId, flag: 1, arr: arr, } @@ -610,7 +610,7 @@ export default { }, ] let param = { - taskId: this.sendParamsReturn.taskId, + taskId: this.sendParams.taskId, flag: 1, arr: arr, } @@ -798,7 +798,7 @@ export default { arr[0].fileUrl = this.imgUrlList.join(',') } let param = { - taskId: this.sendParamsReturn.taskId, + taskId: this.sendParams.taskId, arr: arr, flag: 1, } @@ -838,7 +838,7 @@ export default { ) } let param = { - taskId: this.sendParamsReturn.taskId, + taskId: this.sendParams.taskId, arr: arr, flag: 1, } @@ -877,7 +877,7 @@ export default { if (res == 2) { let endBackParams = { createBy: sessionStorage.getItem('userId'), - taskId: this.sendTbParams.taskId, + taskId: this.sendParams.taskId, } const res = await getScrapReturnCompleteApi(endBackParams)