diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index ef85c3bf..1e2ecf16 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -247,7 +247,7 @@ export const ConsultationProcess = new EsEnums({ moduleOwnerSummary: { text: '模块负责人汇总', value: 'module_owner_end', btn: ['return', 'save', 'submit'] }, leaderApproval: { text: '各部所主管级领导审批', value: 'depart_leader_end', btn: ['return', 'save', 'agree', 'reject'] }, leaderSummary: { text: '各部所主管级领导汇总', value: 'depart_leader_collect', btn: ['return', 'save', 'submit'] }, - regulatoryEngineerApproval: { text: '法规工程师审批', value: 'engineer_start_end', btn: ['return', 'save', 'agree', 'reject'] } + regulatoryEngineerApproval: { text: '法规工程师审批', value: 'engineer_end', btn: ['return', 'save', 'agree', 'reject'] } }) // 下发人员类型 diff --git a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue index 04f8bc44..8a673d00 100644 --- a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue +++ b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue @@ -200,6 +200,7 @@ :data-source="dataSource" bordered form-is-depend="isAdopt" + :pagination="false" :extra-form="collectExtraForm" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"> @@ -773,7 +774,7 @@ export default { } // 获取人员信息数据 this.getPersonInfoStructure(ProcessKey.CONSULTATION.value, () => { - this.initPersonInfoData(!this.currentNode || this.currentNode.indexOf(ConsultationProcess.initiate.value) === 0) + this.initPersonInfoData(this.currentNode.indexOf(ConsultationProcess.initiate.value) === 0) }) // 找不到这个节点默认使用审批节点页面及按钮,发起除外 this.nodeEnumsKey = this.currentNode ? ConsultationProcess.keyOfValue(this.currentNode) || 'regulatoryEngineerApproval' : 'initiate'