Browse Source

UserDisplay

master
han\hanst 3 days ago
parent
commit
ca15cfe69b
  1. 2
      src/views/modules/erf/components/expApplyForm.vue
  2. 6
      src/views/modules/erf/components/expTriConfirm.vue
  3. 6
      src/views/modules/erf/expApplyApproval.vue
  4. 4
      src/views/modules/erf/triConfirm.vue

2
src/views/modules/erf/components/expApplyForm.vue

@ -243,7 +243,7 @@ export default {
contactMethod: '', contactMethod: '',
processRequirement: '', processRequirement: '',
creatorUserId: this.$store.state.user.id, creatorUserId: this.$store.state.user.id,
creatorName: this.$store.state.user.name
creatorName: this.$store.state.user.userDisplay
}, },
formRules: { formRules: {

6
src/views/modules/erf/components/expTriConfirm.vue

@ -1216,13 +1216,13 @@ export default {
const roleType = this.currentRoleTypeForUser const roleType = this.currentRoleTypeForUser
if (roleType === 'PROD') { if (roleType === 'PROD') {
this.processForm.prodApproverName = row.userName
this.processForm.prodApproverName = row.userDisplay
this.processForm.prodApproverUserId = row.userId this.processForm.prodApproverUserId = row.userId
} else if (roleType === 'QA') { } else if (roleType === 'QA') {
this.processForm.qaApproverName = row.userName
this.processForm.qaApproverName = row.userDisplay
this.processForm.qaApproverUserId = row.userId this.processForm.qaApproverUserId = row.userId
} else if (roleType === 'TECH') { } else if (roleType === 'TECH') {
this.processForm.techApproverName = row.userName
this.processForm.techApproverName = row.userDisplay
this.processForm.techApproverUserId = row.userId this.processForm.techApproverUserId = row.userId
} }

6
src/views/modules/erf/expApplyApproval.vue

@ -492,7 +492,7 @@ export default {
action: '', action: '',
comment: '', comment: '',
operatorUserId: this.$store.state.user.id, operatorUserId: this.$store.state.user.id,
operatorName: this.$store.state.user.name
operatorName: this.$store.state.user.userDisplay
}, },
approvalLoading: false, approvalLoading: false,
@ -642,7 +642,7 @@ export default {
action: '批准', action: '批准',
comment: '批准通过', // comment: '批准通过', //
operatorUserId: this.$store.state.user.id, operatorUserId: this.$store.state.user.id,
operatorName: this.$store.state.user.name
operatorName: this.$store.state.user.userDisplay
} }
this.approvalLoading = true this.approvalLoading = true
@ -696,7 +696,7 @@ export default {
action: '驳回', action: '驳回',
comment: this.rejectReason, comment: this.rejectReason,
operatorUserId: this.$store.state.user.id, operatorUserId: this.$store.state.user.id,
operatorName: this.$store.state.user.name
operatorName: this.$store.state.user.userDisplay
} }
this.approvalLoading = true this.approvalLoading = true

4
src/views/modules/erf/triConfirm.vue

@ -295,7 +295,7 @@ export default {
sampleOk: true, sampleOk: true,
comment: '', comment: '',
approverUserId: this.$store.state.user.id, approverUserId: this.$store.state.user.id,
approverName: this.$store.state.user.name,
approverName: this.$store.state.user.userDisplay,
// //
experimentType: '', experimentType: '',
title: '' title: ''
@ -416,7 +416,7 @@ export default {
sampleOk: true, sampleOk: true,
comment: '', comment: '',
approverUserId: this.$store.state.user.id, approverUserId: this.$store.state.user.id,
approverName: this.$store.state.user.name,
approverName: this.$store.state.user.userDisplay,
// //
experimentType: item.experimentType, experimentType: item.experimentType,
title: item.title title: item.title

Loading…
Cancel
Save