From ea357bf590ab39b804701117905108d95f7ae015 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Tue, 10 Oct 2023 11:14:30 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=A1=B5=EF=BC=8C=E4=BC=81=E6=A0=87=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E7=AB=8B=E9=A1=B9/=E5=8F=98=E6=9B=B4=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/less/common.less                   |  1 +
 src/common/lang/workCenter/zh.js              |  4 +
 src/common/lang/zh-cn.js                      |  2 +
 src/components/PersonnelInfo.vue              |  6 +-
 src/views/workCenter/NewProcess.vue           |  2 +-
 .../RevisionPlanActivelyReportFlow.vue        | 86 +++++++++++++++++++
 .../modules/EngineerInitForm.vue              | 55 ++++++++++++
 .../{flow => }/PlanApprovalChangeFlow.vue     | 15 +++-
 .../{flow => }/modules/ApprovalBaseInfo.vue   |  4 +-
 .../{flow => }/modules/ChangeBaseInfo.vue     |  0
 .../modules/ChangeBaseInfoDrawer.vue          |  2 +-
 11 files changed, 166 insertions(+), 11 deletions(-)
 create mode 100644 src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue
 create mode 100644 src/views/workCenter/annualRevisionPlanActivelyReport/modules/EngineerInitForm.vue
 rename src/views/workCenter/enterpriseStandardInitChange/{flow => }/PlanApprovalChangeFlow.vue (98%)
 rename src/views/workCenter/enterpriseStandardInitChange/{flow => }/modules/ApprovalBaseInfo.vue (99%)
 rename src/views/workCenter/enterpriseStandardInitChange/{flow => }/modules/ChangeBaseInfo.vue (100%)
 rename src/views/workCenter/enterpriseStandardInitChange/{flow => }/modules/ChangeBaseInfoDrawer.vue (99%)

diff --git a/src/assets/less/common.less b/src/assets/less/common.less
index a7a1ffe7..a60555dd 100644
--- a/src/assets/less/common.less
+++ b/src/assets/less/common.less
@@ -793,6 +793,7 @@
   padding-left: 12px;
   position: relative;
   margin-top: 32px;
+  margin-bottom: 20px;
 }
 
 .process-part-title::before {
diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js
index b7304b50..f7cc5d4c 100644
--- a/src/common/lang/workCenter/zh.js
+++ b/src/common/lang/workCenter/zh.js
@@ -76,6 +76,10 @@ module.exports = {
     superintendent: '所长',
     relatedPersonnel: '相关人员'
   },
+  // 年度制修订计划（各部门主动上报）
+  revisionPlanActivelyReport: {
+    revisionPlanDesc: '制修订计划说明'
+  },
   // 流程配置
   processConfig: {
     processType: '流程类型',
diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js
index f1883343..a14f7aa5 100644
--- a/src/common/lang/zh-cn.js
+++ b/src/common/lang/zh-cn.js
@@ -148,6 +148,8 @@ module.exports = {
   turnTo: '转办',
   agree: '同意',
   reject: '驳回',
+  basicInformation: '基础信息',
+  personalInformation: '人员信息',
   // 树右键
   treeRight: {
     addFolder: '新增文件夹',
diff --git a/src/components/PersonnelInfo.vue b/src/components/PersonnelInfo.vue
index 0ac44d73..7dce9baf 100644
--- a/src/components/PersonnelInfo.vue
+++ b/src/components/PersonnelInfo.vue
@@ -29,9 +29,9 @@
               <div class="personnel-container-content-text">
                 <template v-if="step.canChoose && index >= currentNodeIndex">
                   <!--                  TODO 数据库设计确定后处理数据抛出格式-->
-                  <user-select-by-work-group v-if="step.chooseSource === 'workGroup'" v-model="step.user" :type="step.chooseType" input-type="textarea"/>
-                  <user-select-by-contact v-else-if="step.chooseSource === 'contactManage'" v-model="step.user" :type="step.chooseType" input-type="textarea"/>
-                  <user-selection v-else :type="step.chooseType" v-model="step.user" input-type="textarea" />
+                  <user-select-by-work-group v-if="step.chooseSource === 'workGroup'" v-model="step.user" :type="step.chooseType" input-type="textarea" :disabled="step.disabled"/>
+                  <user-select-by-contact v-else-if="step.chooseSource === 'contactManage'" v-model="step.user" :type="step.chooseType" input-type="textarea" :disabled="step.disabled"/>
+                  <user-selection v-else :type="step.chooseType" v-model="step.user" input-type="textarea" :disabled="step.disabled" />
                 </template>
                 <div class="personnel-container-content-echo-text" v-else>{{ step.userList }}</div>
               </div>
diff --git a/src/views/workCenter/NewProcess.vue b/src/views/workCenter/NewProcess.vue
index 18a56cd8..3739221b 100644
--- a/src/views/workCenter/NewProcess.vue
+++ b/src/views/workCenter/NewProcess.vue
@@ -51,7 +51,7 @@ export default {
           list: [
             { // 企标立项/变更计划
               title: this.$t('workCenter.newProcess.enterpriseProjectChangePlan'),
-              path: '/workCenter/enterpriseStandardInitChange/flow/planApprovalChangeFlow'
+              path: '/workCenter/enterpriseStandardInitChange/planApprovalChangeFlow'
             },
             { // 年度制修订计划审批流程(各部门主动上报)
               title: this.$t('workCenter.newProcess.annualRevisionPlanActivelyReport'),
diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue
new file mode 100644
index 00000000..0ace2761
--- /dev/null
+++ b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue
@@ -0,0 +1,86 @@
+<template>
+  <internal-detail-page :title="pageTitle" :content-padding="0">
+    <!--  标题右侧tab  -->
+    <template v-slot:titleRightCustom>
+      <div class="table-operator-tab">
+        <a class="switch-item" :class="switchValue === 'base' ? 'table-operator-tab-active' : ''"
+           @click="switchChange('base')">基础信息
+        </a>
+        <a class="switch-item" :class="switchValue === 'user' ? 'table-operator-tab-active' : ''"
+           @click="switchChange('user')">人员信息
+        </a>
+      </div>
+    </template>
+    <!--  基础信息  -->
+    <div class="scroll-content">
+      <!--  流程信息  -->
+      <div class="process-part-title">{{ $t('processInformation') }}</div>
+      <a-form :form="processInfoForm">
+        <a-row>
+          <a-col :span="12">
+            <!--  流程名称  -->
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('processName')">
+              <a-input :placeholder="$t('pleaseEnter') + $t('processName')"
+                       @change="event => event.target.value = event.target.value.trim()"
+                       :disabled="disabled"
+                       :maxLength="50"
+                       v-decorator="['processName', validatorRules.processName]" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <!--  截止日期  -->
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('expirationDate')">
+              <a-date-picker :placeholder="$t('pleaseSelect') + $t('expirationDate')"
+                             style="width: 100%"
+                             :disabled="disabled"
+                             value-format="YYYY-MM-DD"
+                             v-decorator="['expirationDate']" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <!--  流程说明  -->
+            <a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('processExplain')">
+              <a-textarea :placeholder="$t('pleaseEnter') + $t('processExplain')"
+                          :maxLength="500"
+                          :rows="4"
+                          :disabled="disabled"
+                          v-decorator="['processExplain']" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+
+      <!--  业务基本信息  -->
+      <div class="process-part-title">{{ $t('basicServiceInformation') }}</div>
+      <engineer-init-form v-if="currentNode === 1"></engineer-init-form>
+
+      <!--  流程审批信息  -->
+      <div class="process-part-title">{{ $t('processApprovalInformation') }}</div>
+      <a-form :form="approvalInfoForm">
+        <!--备注-->
+        <a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('remarks')">
+          <a-textarea :placeholder="$t('pleaseEnter') + $t('remarks')"
+                      :maxLength="500"
+                      :rows="4"
+                      v-decorator="['remarks', validatorRules.remarks]" />
+        </a-form-item>
+        <!--附件-->
+        <a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('businessSupport.questionAnswer.attach')">
+          <j-upload v-decorator="['file']" return-id />
+        </a-form-item>
+      </a-form>
+    </div>
+  </internal-detail-page>
+</template>
+
+<script>
+import EngineerInitForm from './modules/EngineerInitForm'
+export default {
+  name: 'RevisionPlanActivelyReportFlow',
+  components: { EngineerInitForm }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/EngineerInitForm.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/EngineerInitForm.vue
new file mode 100644
index 00000000..0d9aed8c
--- /dev/null
+++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/EngineerInitForm.vue
@@ -0,0 +1,55 @@
+<template>
+  <a-form-model :model="formInline" class="form-add" :rules="rules" ref="ruleForm">
+    <div class="collapsible-panel-form">
+      <div class="form-flex-box collapsible-panel-form-content collapsible-content-no-head">
+        <!--  制修订计划说明  -->
+        <div class="box-title-text form-flex-item">
+          <div class="title-text">
+            <span class="required">*</span>
+            <span class="title-text-text" :title="$t('workCenter.revisionPlanActivelyReport.revisionPlanDesc')">
+                  {{ $t('workCenter.revisionPlanActivelyReport.revisionPlanDesc') }}
+                </span>
+          </div>
+          <a-form-model-item class="item-model" prop="revisionPlanDesc">
+            <a-textarea :placeholder="$t('pleaseEnter')+$t('workCenter.revisionPlanActivelyReport.revisionPlanDesc')"
+                        :maxLength="500"
+                        :disabled="disabled"
+                        v-model="formInline.revisionPlanDesc" :rows="4" />
+          </a-form-model-item>
+        </div>
+      </div>
+    </div>
+  </a-form-model>
+</template>
+
+<script>
+export default {
+  name: 'EngineerInitForm',
+  props: {
+    disabled: {
+      type: Boolean,
+      required: false,
+      default: false
+    }
+  },
+  data () {
+    return {
+      formInline: {},
+      rules: {
+        // 企标编号
+        enterpriseStandardNum: [
+          {
+            required: true,
+            message: this.$t('workCenter.revisionPlanActivelyReport.revisionPlanDesc') + this.$t('cannotEmpty'),
+            trigger: 'blur'
+          }
+        ]
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/workCenter/enterpriseStandardInitChange/flow/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
similarity index 98%
rename from src/views/workCenter/enterpriseStandardInitChange/flow/PlanApprovalChangeFlow.vue
rename to src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
index 7b61ccfa..9549685e 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/flow/PlanApprovalChangeFlow.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
@@ -1,13 +1,13 @@
 <template>
-  <internal-detail-page :title="pageTitle">
+  <internal-detail-page :title="pageTitle" :content-padding="0">
     <!--  标题右侧tab  -->
     <template v-slot:titleRightCustom>
       <div class="table-operator-tab">
         <a class="switch-item" :class="switchValue === 'base' ? 'table-operator-tab-active' : ''"
-           @click="switchChange('base')">基础信息
+           @click="switchChange('base')">{{ $t('basicInformation') }}
         </a>
         <a class="switch-item" :class="switchValue === 'user' ? 'table-operator-tab-active' : ''"
-           @click="switchChange('user')">人员信息
+           @click="switchChange('user')">{{ $t('personalInformation') }}
         </a>
       </div>
     </template>
@@ -162,7 +162,7 @@
       </a-form>
     </div>
     <!--  人员信息  -->
-    <div v-if="switchValue === 'user'" class="scroll-content">
+    <div v-if="switchValue === 'user'" class="scroll-content personnel-info-wrapper">
       <personnel-info :data="personnelInfoData" :currentNode="currentNode"></personnel-info>
     </div>
     <!--  操作按钮  -->
@@ -680,4 +680,11 @@ export default {
     margin-bottom: 0;
   }
 }
+
+// 人员信息
+.personnel-info-wrapper {
+  /deep/ .ant-steps {
+    width: 400px;
+  }
+}
 </style>
diff --git a/src/views/workCenter/enterpriseStandardInitChange/flow/modules/ApprovalBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue
similarity index 99%
rename from src/views/workCenter/enterpriseStandardInitChange/flow/modules/ApprovalBaseInfo.vue
rename to src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue
index a861593f..7659ee4f 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/flow/modules/ApprovalBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue
@@ -800,7 +800,7 @@ export default {
         projectStatement: true // 立项说明部分
       },
       uploadName: '',
-      fileMaxSize: undefined,
+      fileMaxSize: undefined
     }
   },
   mounted () {
@@ -856,7 +856,7 @@ export default {
     // 选择用户得到用户名
     userSelectNameChange (value, fieldName) {
       this.formInline[fieldName + '_dictText'] = value
-    },
+    }
   }
 }
 </script>
diff --git a/src/views/workCenter/enterpriseStandardInitChange/flow/modules/ChangeBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/ChangeBaseInfo.vue
similarity index 100%
rename from src/views/workCenter/enterpriseStandardInitChange/flow/modules/ChangeBaseInfo.vue
rename to src/views/workCenter/enterpriseStandardInitChange/modules/ChangeBaseInfo.vue
diff --git a/src/views/workCenter/enterpriseStandardInitChange/flow/modules/ChangeBaseInfoDrawer.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/ChangeBaseInfoDrawer.vue
similarity index 99%
rename from src/views/workCenter/enterpriseStandardInitChange/flow/modules/ChangeBaseInfoDrawer.vue
rename to src/views/workCenter/enterpriseStandardInitChange/modules/ChangeBaseInfoDrawer.vue
index 2d8ff5c3..7f949679 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/flow/modules/ChangeBaseInfoDrawer.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/modules/ChangeBaseInfoDrawer.vue
@@ -198,7 +198,7 @@
 <script>
 import { StandardSource } from '@/enums/commonEnums'
 import UserSelection from '@/components/selection/UserSelection'
-import EnterprisePlanSelection from '../../../../../components/selection/EnterprisePlanSelection'
+import EnterprisePlanSelection from '@/components/selection/EnterprisePlanSelection'
 
 export default {
   name: 'ChangeBaseInfoDrawer',