diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 5fd6264ec..adfe46fe3 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -606,7 +606,7 @@ module.exports = { entryName: '项目名称', targetMarket: '目标市场', projectStatus: '项目状态', - StudioEngineer: 'studio工程师', + StudioEngineer: 'R&H Studio', CertificationTime: '认证时间', NTplatform: 'NT平台', NPplatform: 'NP平台', diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue index f8926d418..25117719c 100644 --- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue @@ -81,7 +81,7 @@ mounted() { if (this.queryBy) { this.formInline.reviewResult = this.queryBy.reviewResult || undefined - // this.formInline.approvalOpinion = this.queryBy.approvalOpinion || '' + this.formInline.approvalOpinion = '' this.formInline = { ...this.formInline } } }, diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue index 26b7c6565..88488bdd3 100644 --- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue +++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue @@ -14,8 +14,8 @@ :data-source="dataSource" :columns="columns" > - - {{approvalResult[text]}} + + {{reviewResult[text]}} @@ -33,18 +33,18 @@ return { dataSource: [], loading: false, - approvalResult: { - 0: this.$t('agree'), - 1: this.$t('disagree'), - 2: this.$t('terminationProcess'), - 3: this.$t('issue') + reviewResult: { + 'conformity': this.$t('accord'), + 'inconformity': this.$t('nonConformity'), + 'to track': this.$t('Tracked'), + 'uninvolved': this.$t('notInvolved') }, columns: [ { title: this.$t('result'), - dataIndex: 'approvalResult', + dataIndex: 'reviewResult', align: 'center', - scopedSlots: { customRender: 'approvalResult' } + scopedSlots: { customRender: 'reviewResult' } }, { title: this.$t('opinion'), diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index 46c247446..26f9c325c 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -298,6 +298,7 @@ id: this.queryBy.id, operatorType: 'taskAffirmQuery' } + this.queryBy.approvalOpinion = '' getAction(this.url.queryProjectLawsInventoryInfoById, query).then((res) => { if (res.success) { this.queryProject = res.result[0] || {}