From d51986af5040be240722faee15254f67a0a6d484 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 10 Nov 2023 14:28:15 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E8=81=94=E8=B0=83=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E5=BA=9F=E6=AD=A2=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EnterpriseStandardAnnulFlow.vue           |  42 +--
 .../modules/BaseInfoForm.vue                  | 330 ++++++++++--------
 2 files changed, 179 insertions(+), 193 deletions(-)

diff --git a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue
index 44a4e199..9b87f4d8 100644
--- a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue
+++ b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue
@@ -77,7 +77,7 @@
     </div>
     <!--  人员信息  -->
     <div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0">
-      <process-detail-list :url="url">
+      <process-detail-list>
         <personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNode + ''"></personnel-info>
       </process-detail-list>
     </div>
@@ -112,8 +112,6 @@ import InternalDetailPage from '@/components/InternalDetailPage'
 import ProcessDetailList from '@/components/ProcessDetailList'
 import PersonnelInfo from '@/components/PersonnelInfo'
 import UserSelectModal from '@/components/selection/UserSelectModal'
-import { USER_INFO } from '@/store/mutation-types'
-import Vue from 'vue'
 import pick from 'lodash.pick'
 import {
   enStandardAnnulGetDataById,
@@ -125,41 +123,7 @@ import {
 } from '@/api/workCenter'
 import BaseInfoForm from './modules/BaseInfoForm'
 import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
-
-// 人员信息
-const personalInfo = [ // 人员信息的数据
-  {
-    id: 1,
-    nodeName: '发起人发起',
-    nodeRoleName: '发起人',
-    canChoose: false,
-    userList: Vue.ls.get(USER_INFO).realname + '(' + Vue.ls.get(USER_INFO).username + ')'
-  },
-  {
-    id: 2,
-    nodeName: '相关人员会签',
-    nodeRoleName: '相关人员',
-    canChoose: true,
-    chooseType: 'checkbox',
-    fieldName: ''
-  },
-  {
-    id: 3,
-    nodeName: '起草人和会签人主管级领导审批',
-    nodeRoleName: '起草人和会签人主管级领导',
-    canChoose: true,
-    chooseType: 'radio',
-    fieldName: ''
-  },
-  {
-    id: 4,
-    nodeName: '标准化审批',
-    nodeRoleName: '标准化',
-    canChoose: true,
-    chooseType: 'radio',
-    fieldName: ''
-  }
-]
+import { ProcessKey } from '@/enums/commonEnums'
 
 export default {
   name: 'EnterpriseStandardAnnulFlow',
@@ -178,7 +142,7 @@ export default {
   },
   mounted () {
     // 获取人员信息结构
-    this.getPersonInfoStructure()
+    this.getPersonInfoStructure(ProcessKey.ES_ABOLISH.value)
     if (this.$route.query.taskId) {
       this.currentNodeName = this.$route.query.taskName
       // 有流程id说明是从流程中心来的，需要初始化数据
diff --git a/src/views/workCenter/enterpriseStandardAnnul/modules/BaseInfoForm.vue b/src/views/workCenter/enterpriseStandardAnnul/modules/BaseInfoForm.vue
index 68c1d6e9..35df61c3 100644
--- a/src/views/workCenter/enterpriseStandardAnnul/modules/BaseInfoForm.vue
+++ b/src/views/workCenter/enterpriseStandardAnnul/modules/BaseInfoForm.vue
@@ -1,160 +1,163 @@
 <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.enterpriseInitChangePlan.enterpriseStandardNum')">
-                  {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') }}
-                </span>
+  <a-spin :spinning="loading">
+    <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.enterpriseInitChangePlan.enterpriseStandardNum')">
+                    {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') }}
+                  </span>
+            </div>
+            <a-form-model-item class="item-model" prop="standardNumber">
+              <standard-selection :source="StandardSource.ENTERPRISE.value"
+                                  :disabled="disabled"
+                                  :disabledSourceSearch="true"
+                                  type="radio"
+                                  v-model="formInline.standardNumber"
+                                  @listChange="listChange" />
+            </a-form-model-item>
           </div>
-          <a-form-model-item class="item-model" prop="enStandardNo">
-            <standard-selection :source="StandardSource.ENTERPRISE.value"
-                                :disabled="disabled"
-                                :disabledSourceSearch="true"
-                                type="radio"
-                                v-model="formInline.enStandardNo"
-                                @listChange="listChange" />
-          </a-form-model-item>
-        </div>
-        <!--  企标名称  -->
-        <div class="box-title-text form-flex-item">
-          <div class="title-text">
-                  <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.enterpriseStandardName')">
-                  {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardName') }}
-                </span>
+          <!--  企标名称  -->
+          <div class="box-title-text form-flex-item">
+            <div class="title-text">
+                    <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.enterpriseStandardName')">
+                    {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardName') }}
+                  </span>
+            </div>
+            <a-form-model-item class="item-model" prop="standardName">
+              <a-input class="box-input"
+                       v-model="formInline.standardName"
+                       :maxLength="50"
+                       disabled
+                       @change="event => event.target.value = event.target.value.trim()"
+                       :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardName')" />
+            </a-form-model-item>
           </div>
-          <a-form-model-item class="item-model" prop="enStandardName">
-            <a-input class="box-input"
-                     v-model="formInline.enStandardName"
-                     :maxLength="50"
-                     disabled
-                     @change="event => event.target.value = event.target.value.trim()"
-                     :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardName')" />
-          </a-form-model-item>
-        </div>
-        <!--  标准英文名称  -->
-        <div class="box-title-text form-flex-item">
-          <div class="title-text">
-                <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.standardEnglishName')">
-                  {{ $t('workCenter.enterpriseInitChangePlan.standardEnglishName') }}
-                </span>
+          <!--  标准英文名称  -->
+          <div class="box-title-text form-flex-item">
+            <div class="title-text">
+                  <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.standardEnglishName')">
+                    {{ $t('workCenter.enterpriseInitChangePlan.standardEnglishName') }}
+                  </span>
+            </div>
+            <a-form-model-item class="item-model" prop="englishName">
+              <a-input class="box-input"
+                       disabled
+                       v-model="formInline.englishName"
+                       :maxLength="50"
+                       @change="event => event.target.value = event.target.value.trim()"
+                       :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.standardEnglishName')" />
+            </a-form-model-item>
           </div>
-          <a-form-model-item class="item-model" prop="enStandardEnglishName">
-            <a-input class="box-input"
-                     disabled
-                     v-model="formInline.enStandardEnglishName"
-                     :maxLength="50"
-                     @change="event => event.target.value = event.target.value.trim()"
-                     :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.standardEnglishName')" />
-          </a-form-model-item>
-        </div>
-        <!--  标准类型  -->
-        <div class="box-title-text form-flex-item">
-          <div class="title-text">
-            <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.standardType')">
-              {{ $t('workCenter.enterpriseInitChangePlan.standardType') }}
-            </span>
+          <!--  标准类型  -->
+          <div class="box-title-text form-flex-item">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.standardType')">
+                {{ $t('workCenter.enterpriseInitChangePlan.standardType') }}
+              </span>
+            </div>
+            <a-form-model-item class="item-model" prop="standardCategory">
+              <j-dict-select-tag class="box-input"
+                                 disabled
+                                 v-model="formInline.standardCategory"
+                                 :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.standardType')"
+                                 :type="'select'"
+                                 :triggerChange="false"
+                                 dictCode="esp_standard_type" />
+            </a-form-model-item>
           </div>
-          <a-form-model-item class="item-model" prop="standardType">
-            <j-dict-select-tag class="box-input"
-                               disabled
-                               v-model="formInline.standardType"
-                               :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.standardType')"
-                               :type="'select'"
-                               :triggerChange="false"
-                               dictCode="esp_standard_type" />
-          </a-form-model-item>
-        </div>
-        <!--  代替企标编号  -->
-        <div class="box-title-text form-flex-item">
-          <div class="title-text">
-                <span class="title-text-text" :title="$t('workCenter.enStandardAnnul.substituteStandardNumber')">
-                  {{ $t('workCenter.enStandardAnnul.substituteStandardNumber') }}
-                </span>
+          <!--  代替企标编号  -->
+          <div class="box-title-text form-flex-item">
+            <div class="title-text">
+                  <span class="title-text-text" :title="$t('workCenter.enStandardAnnul.substituteStandardNumber')">
+                    {{ $t('workCenter.enStandardAnnul.substituteStandardNumber') }}
+                  </span>
+            </div>
+            <a-form-model-item class="item-model" prop="substituteStandardNumber">
+              <a-input class="box-input"
+                       disabled
+                       v-model="formInline.substituteStandardNumber"
+                       :maxLength="50"
+                       @change="event => event.target.value = event.target.value.trim()"
+                       :placeholder="$t('pleaseEnter')+$t('workCenter.enStandardAnnul.substituteStandardNumber')" />
+            </a-form-model-item>
           </div>
-          <a-form-model-item class="item-model" prop="substituteStandardNumber">
-            <a-input class="box-input"
-                     disabled
-                     v-model="formInline.substituteStandardNumber"
-                     :maxLength="50"
-                     @change="event => event.target.value = event.target.value.trim()"
-                     :placeholder="$t('pleaseEnter')+$t('workCenter.enStandardAnnul.substituteStandardNumber')" />
-          </a-form-model-item>
-        </div>
-        <!--  被代替企标编号  -->
-        <div class="box-title-text form-flex-item">
-          <div class="title-text">
-                <span class="title-text-text" :title="$t('workCenter.enStandardAnnul.replacedByEnStandardNumber')">
-                  {{ $t('workCenter.enStandardAnnul.replacedByEnStandardNumber') }}
-                </span>
+          <!--  被代替企标编号  -->
+          <div class="box-title-text form-flex-item">
+            <div class="title-text">
+                  <span class="title-text-text" :title="$t('workCenter.enStandardAnnul.replacedByEnStandardNumber')">
+                    {{ $t('workCenter.enStandardAnnul.replacedByEnStandardNumber') }}
+                  </span>
+            </div>
+            <a-form-model-item class="item-model" prop="replacedByStandardNumber">
+              <a-input class="box-input"
+                       disabled
+                       v-model="formInline.replacedByStandardNumber"
+                       :maxLength="50"
+                       @change="event => event.target.value = event.target.value.trim()"
+                       :placeholder="$t('pleaseEnter')+$t('workCenter.enStandardAnnul.replacedByEnStandardNumber')" />
+            </a-form-model-item>
           </div>
-          <a-form-model-item class="item-model" prop="replacedByEnStandardNumber">
-            <a-input class="box-input"
-                     disabled
-                     v-model="formInline.replacedByEnStandardNumber"
-                     :maxLength="50"
-                     @change="event => event.target.value = event.target.value.trim()"
-                     :placeholder="$t('pleaseEnter')+$t('workCenter.enStandardAnnul.replacedByEnStandardNumber')" />
-          </a-form-model-item>
-        </div>
-        <!--  发布日期  -->
-        <div class="box-title-text form-flex-item">
-          <div class="title-text">
-            <span class="title-text-text" :title="$t('workCenter.enStandardChange.releaseDate')">
-                  {{ $t('workCenter.enStandardChange.releaseDate') }}
-                </span>
+          <!--  发布日期  -->
+          <div class="box-title-text form-flex-item">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('workCenter.enStandardChange.releaseDate')">
+                    {{ $t('workCenter.enStandardChange.releaseDate') }}
+                  </span>
+            </div>
+            <a-form-model-item class="item-model" prop="releaseDate">
+              <a-date-picker
+                v-model="formInline.releaseDate"
+                :showTime="false"
+                disabled
+                value-format="YYYY-MM-DD">
+              </a-date-picker>
+            </a-form-model-item>
           </div>
-          <a-form-model-item class="item-model" prop="releaseDate">
-            <a-date-picker
-              v-model="formInline.releaseDate"
-              :showTime="false"
-              disabled
-              value-format="YYYY-MM-DD">
-            </a-date-picker>
-          </a-form-model-item>
-        </div>
-        <!--  实施日期  -->
-        <div class="box-title-text form-flex-item">
-          <div class="title-text">
-            <span class="title-text-text" :title="$t('workCenter.enStandardChange.materialDate')">
-                  {{ $t('workCenter.enStandardChange.materialDate') }}
-                </span>
+          <!--  实施日期  -->
+          <div class="box-title-text form-flex-item">
+            <div class="title-text">
+              <span class="title-text-text" :title="$t('workCenter.enStandardChange.materialDate')">
+                    {{ $t('workCenter.enStandardChange.materialDate') }}
+                  </span>
+            </div>
+            <a-form-model-item class="item-model" prop="implementationDate">
+              <a-date-picker
+                v-model="formInline.implementationDate"
+                :showTime="false"
+                disabled
+                value-format="YYYY-MM-DD">
+              </a-date-picker>
+            </a-form-model-item>
           </div>
-          <a-form-model-item class="item-model" prop="materialDate">
-            <a-date-picker
-              v-model="formInline.materialDate"
-              :showTime="false"
-              disabled
-              value-format="YYYY-MM-DD">
-            </a-date-picker>
-          </a-form-model-item>
-        </div>
-        <!--  废止理由  -->
-        <div class="box-title-text form-flex-item">
-          <div class="title-text">
-            <span class="required">*</span>
-            <span class="title-text-text" :title="$t('workCenter.enStandardAnnul.annulReason')">
-              {{ $t('workCenter.enStandardAnnul.annulReason') }}
-            </span>
+          <!--  废止理由  -->
+          <div class="box-title-text form-flex-item">
+            <div class="title-text">
+              <span class="required">*</span>
+              <span class="title-text-text" :title="$t('workCenter.enStandardAnnul.annulReason')">
+                {{ $t('workCenter.enStandardAnnul.annulReason') }}
+              </span>
+            </div>
+            <a-form-model-item class="item-model" prop="abolishReason">
+              <a-textarea :placeholder="$t('pleaseEnter')+$t('workCenter.enStandardAnnul.annulReason')"
+                          :disabled="disabled"
+                          :maxLength="500"
+                          v-model="formInline.abolishReason" :rows="4" />
+            </a-form-model-item>
           </div>
-          <a-form-model-item class="item-model" prop="annulReason">
-            <a-textarea :placeholder="$t('pleaseEnter')+$t('workCenter.enStandardAnnul.annulReason')"
-                        :disabled="disabled"
-                        :maxLength="500"
-                        v-model="formInline.annulReason" :rows="4" />
-          </a-form-model-item>
         </div>
       </div>
-    </div>
-  </a-form-model>
+    </a-form-model>
+  </a-spin>
 </template>
 
 <script>
 import { StandardSource } from '@/enums/commonEnums'
 import StandardSelection from '@/components/selection/StandardSelection'
+import { getEnterpriseStandardInfoById } from '@/api/enterpriseStandardLibraryApi'
 
 export default {
   name: 'BaseInfoForm',
@@ -169,10 +172,11 @@ export default {
   data () {
     return {
       StandardSource,
+      loading: false,
       formInline: {},
       rules: {
         // 企标编号
-        enStandardNo: [
+        standardNumber: [
           {
             required: true,
             message: this.$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') + this.$t('cannotEmpty'),
@@ -180,7 +184,7 @@ export default {
           }
         ],
         // 废止理由
-        annulReason: [
+        abolishReason: [
           {
             required: true,
             message: this.$t('workCenter.enStandardAnnul.annulReason') + this.$t('cannotEmpty'),
@@ -205,27 +209,45 @@ export default {
       return data
     },
     // 外层获取数据要过校验,返回false表示没有通过校验
-    getDataValidate (callback) {
-      this.$refs.ruleForm.validate(valid => {
+    async getDataValidate () {
+      let data = {}
+      await this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          const data = {}
           data.formInline = this.formInline
-          callback(data)
+        } else {
+          data = false
         }
       })
+      return data
     },
     // 选完企标编号了，需要回显内容,返回流程名称
     listChange (value) {
       console.log(value)
+      this.loading = true
       // 企标名称
-      this.formInline.enStandardName = value[0].standardName
-      // 英文名称
-      // 企标类别
-      // 代替企标编号
-      // 被代替企标编号
-      // 实施日期
-      // 复审日期
-      this.$emit('processNameChange', (this.formInline.enStandardNo || '') + '-' + (this.formInline.enStandardName || '') + '-' + '废止')
+      this.formInline.standardName = value[0].standardName
+      // 根据返回的id查询企标数据
+      getEnterpriseStandardInfoById({ id: value[0].id, type: '2' }).then(res => {
+        if (res.success) {
+          const result = res.result
+          // 标准英文名称
+          this.formInline.standardEnglishName = result.standard_english_name
+          // 标准类型？？
+          // this.formInline.standardEnglishName = result.standard_english_name
+          // 代替企标编号
+          this.formInline.substituteStandardNumber = result.substitute_standard_number
+          // 被代替企标编号
+          this.formInline.replacedByStandardNumber = result.replaced_by_standard_number
+          // 发布日期
+          this.formInline.releaseDate = result.release_date
+          // 实施日期
+          this.formInline.implementationDate = result.implementation_date
+          this.formInline = Object.assign({}, this.formInline)
+        }
+      }).finally(() => {
+        this.loading = false
+      })
+      this.$emit('processNameChange', (this.formInline.standardNumber || '') + '-' + (this.formInline.standardName || '') + '-' + '废止')
     }
   }
 }