diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue index 1cef75dc..26e182a4 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue @@ -333,6 +333,7 @@ export default { agreementCode: null, //协议code companyId: '', //登录信息中取 createBy: '', //用户名 + userId: '', taskType: 29, taskStatus: 30, //领料人信息 @@ -678,6 +679,7 @@ export default { } this.queryParams.createBy = this.user.userName this.queryParams.companyId = this.user.companyId + this.queryParams.userId = this.user.userId let res if (this.taskId) { @@ -698,7 +700,11 @@ export default { taskId: this.taskId, leaseApplyInfoList: this.leaseApplyInfoList, } - + console.log( + '驳回提交--------------保存', + params, + '参数----------', + ) res = await editLeaseApply(params) } else { // console.log(this.queryParams) @@ -711,6 +717,11 @@ export default { return } res = await submitLeaseApply(this.queryParams) + console.log( + '正常申请提交--------------保存', + this.queryParams, + '参数--------------', + ) } if (res.code == 200) { this.$message({ diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue index e2800a0a..9e297ea7 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue @@ -209,7 +209,8 @@ scope.row.taskStatus == 98 " >{{ - scope.row.leaseApplyInfoList[0].companyAuditRemark + scope.row.leaseApplyInfoList[0] + .companyAuditRemark || '' }} {{ scope.row.leaseApplyInfoList[0].deptAuditRemark }} + >{{ + scope.row.leaseApplyInfoList[0].deptAuditRemark || + '' + }} {{ scope.row.leaseApplyInfoList[0].directAuditRemark }} + >{{ + scope.row.leaseApplyInfoList[0].directAuditRemark || + '' + }} {{ - scope.row.leaseApplyInfoList[0].directAuditRemark + scope.row.leaseApplyInfoList[0].directAuditRemark || + '' }} {{ - scope.row.leaseApplyInfoList[0].directAuditRemark + scope.row.leaseApplyInfoList[0].directAuditRemark || '' }} diff --git a/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue b/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue index 24dc26de..6ca48ea1 100644 --- a/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue +++ b/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue @@ -279,7 +279,6 @@ @@ -363,14 +362,20 @@ 通过 不通过