diff --git a/src/views/workCenter/enterpriseStandardChange/modules/ApproveBaseInfo.vue b/src/views/workCenter/enterpriseStandardChange/modules/ApproveBaseInfo.vue index 08ede40a..3ef65ab8 100644 --- a/src/views/workCenter/enterpriseStandardChange/modules/ApproveBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardChange/modules/ApproveBaseInfo.vue @@ -109,14 +109,14 @@ export default { title: this.$t('workCenter.enStandardChange.proposingDepartment'), align: 'center', width: 180, - dataIndex: 'orgCode_dictText', + dataIndex: 'createUnit_dictText', scopedSlots: { customRender: 'text' } }, { // 提出人 title: this.$t('workCenter.enStandardChange.introducer'), align: 'center', width: 180, - dataIndex: 'createBy_dictText', + dataIndex: 'createUser_dictText', scopedSlots: { customRender: 'text' } } ], diff --git a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue index 4a2b6736..05daa21a 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue @@ -71,7 +71,7 @@ {{ $t('workCenter.enterpriseInitChangePlan.standardProjectEstablishment') }} @@ -90,14 +90,14 @@ {{ $t('workCenter.enterpriseInitChangePlan.formulate') }} {{ $t('workCenter.enterpriseInitChangePlan.revise') }} {{ $t('workCenter.enterpriseInitChangePlan.completionTimeChange') }} @@ -352,6 +352,8 @@ export default { if (this.$route.query.taskId && !this.$route.query.draftId) { // 有流程id说明是从流程中心来的,需要初始化数据 this.getProcessData('todo', { taskId: this.$route.query.taskId }) + // 待办进来的节点1说明是被驳回的,不可修改申请类型和项目类别 + this.categoryTypeDisabled = true } if (this.$route.query.draftId) { // 有草稿id,说明是从流程中心-草稿来的,需要初始化数据 @@ -377,6 +379,7 @@ export default { loading: false, switchValue: 'base', // 头部tab选中值 disabled: false, + categoryTypeDisabled: false, // 申请类型和项目类别不可更改 onlyLook: false, // 是否仅查看 currentNode: 1, // 当前节点 currentNodeName: '', // 当前节点名称