diff --git a/src/views/modules/erf/components/expApplyForm.vue b/src/views/modules/erf/components/expApplyForm.vue index 1ee9174..0e57e0f 100644 --- a/src/views/modules/erf/components/expApplyForm.vue +++ b/src/views/modules/erf/components/expApplyForm.vue @@ -243,7 +243,7 @@ export default { contactMethod: '', processRequirement: '', creatorUserId: this.$store.state.user.id, - creatorName: this.$store.state.user.name + creatorName: this.$store.state.user.userDisplay }, formRules: { diff --git a/src/views/modules/erf/components/expTriConfirm.vue b/src/views/modules/erf/components/expTriConfirm.vue index f1d9101..0182bbf 100644 --- a/src/views/modules/erf/components/expTriConfirm.vue +++ b/src/views/modules/erf/components/expTriConfirm.vue @@ -1216,13 +1216,13 @@ export default { const roleType = this.currentRoleTypeForUser if (roleType === 'PROD') { - this.processForm.prodApproverName = row.userName + this.processForm.prodApproverName = row.userDisplay this.processForm.prodApproverUserId = row.userId } else if (roleType === 'QA') { - this.processForm.qaApproverName = row.userName + this.processForm.qaApproverName = row.userDisplay this.processForm.qaApproverUserId = row.userId } else if (roleType === 'TECH') { - this.processForm.techApproverName = row.userName + this.processForm.techApproverName = row.userDisplay this.processForm.techApproverUserId = row.userId } diff --git a/src/views/modules/erf/expApplyApproval.vue b/src/views/modules/erf/expApplyApproval.vue index 7d2d152..d2b07bb 100644 --- a/src/views/modules/erf/expApplyApproval.vue +++ b/src/views/modules/erf/expApplyApproval.vue @@ -492,7 +492,7 @@ export default { action: '', comment: '', operatorUserId: this.$store.state.user.id, - operatorName: this.$store.state.user.name + operatorName: this.$store.state.user.userDisplay }, approvalLoading: false, @@ -642,7 +642,7 @@ export default { action: '批准', comment: '批准通过', // 默认审批意见 operatorUserId: this.$store.state.user.id, - operatorName: this.$store.state.user.name + operatorName: this.$store.state.user.userDisplay } this.approvalLoading = true @@ -696,7 +696,7 @@ export default { action: '驳回', comment: this.rejectReason, operatorUserId: this.$store.state.user.id, - operatorName: this.$store.state.user.name + operatorName: this.$store.state.user.userDisplay } this.approvalLoading = true diff --git a/src/views/modules/erf/triConfirm.vue b/src/views/modules/erf/triConfirm.vue index f5ab62d..62c6554 100644 --- a/src/views/modules/erf/triConfirm.vue +++ b/src/views/modules/erf/triConfirm.vue @@ -295,7 +295,7 @@ export default { sampleOk: true, comment: '', approverUserId: this.$store.state.user.id, - approverName: this.$store.state.user.name, + approverName: this.$store.state.user.userDisplay, // 用于展示的信息 experimentType: '', title: '' @@ -416,7 +416,7 @@ export default { sampleOk: true, comment: '', approverUserId: this.$store.state.user.id, - approverName: this.$store.state.user.name, + approverName: this.$store.state.user.userDisplay, // 用于展示的信息 experimentType: item.experimentType, title: item.title