From 6a282bd82bea466322daa07f1ccddc858ccef0df Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Wed, 6 Dec 2023 14:21:47 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E7=AB=8B=E9=A1=B9=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B=E9=A9=B3?=
 =?UTF-8?q?=E5=9B=9E=E5=90=8E=E4=B8=8D=E5=8F=AF=E4=BF=AE=E6=94=B9=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E7=B1=BB=E5=9E=8B=E5=92=8C=E9=A1=B9=E7=9B=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=EF=BC=8C=E5=92=8C=E4=BC=81=E6=A0=87=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9=E5=8D=95=E7=9A=84=E6=8F=90?=
 =?UTF-8?q?=E5=87=BA=E9=83=A8=E9=97=A8=E6=8F=90=E5=87=BA=E4=BA=BA=E5=8F=96?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enterpriseStandardChange/modules/ApproveBaseInfo.vue | 4 ++--
 .../PlanApprovalChangeFlow.vue                           | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

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 @@
               <!--                   :triggerChange="false"-->
               <!--                   dictCode="esp_application_category" />-->
               <a-select v-model="formInline.applicationCategory"
-                        :disabled="disabled"
+                        :disabled="disabled || categoryTypeDisabled"
                         @change="applicationCategoryChange"
                         :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.applicationType')">
                 <a-select-option :value="ApplicationCategory.INITIATION.value">{{ $t('workCenter.enterpriseInitChangePlan.standardProjectEstablishment') }}</a-select-option>
@@ -90,14 +90,14 @@
             <a-form-model-item class="item-model" prop="projectType">
               <a-select v-if="formInline.applicationCategory === ApplicationCategory.INITIATION.value"
                         v-model="formInline.projectType"
-                        :disabled="disabled"
+                        :disabled="disabled || categoryTypeDisabled"
                         :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.itemCategory')">
                 <a-select-option :value="ProjectType.ENACT.value">{{ $t('workCenter.enterpriseInitChangePlan.formulate') }}</a-select-option>
                 <a-select-option :value="ProjectType.MODIFY.value">{{ $t('workCenter.enterpriseInitChangePlan.revise') }}</a-select-option>
               </a-select>
               <a-select v-else-if="formInline.applicationCategory === ApplicationCategory.CHANGE.value"
                         v-model="formInline.projectType"
-                        :disabled="disabled"
+                        :disabled="disabled || categoryTypeDisabled"
                         @change="projectTypeChange"
                         :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.itemCategory')">
                 <a-select-option :value="ProjectType.COMPLETE_TIME_CHANGE.value">{{ $t('workCenter.enterpriseInitChangePlan.completionTimeChange') }}</a-select-option>
@@ -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: '', // 当前节点名称