[update] 企标更改流程发起联调

src/api/workCenter.js

@@ -58,75 +58,73 @@ const standardizationInitGetDataById = (taskId, params) => getAction(`/process/e
 
 // 企标更改流程
 // 保存
-const enStandardChangeSave = (params) => postAction('', params)
+const enStandardChangeSave = (params) => postAction('/process/es/change/save', params)
 // 发起
-const enStandardChangeApproval = (params) => postAction('', params)
+const enStandardChangeApproval = (params) => postAction('/process/es/change/start', params)
 // 转办
-const enStandardChangeTurnTo = (params) => postAction('', params)
+const enStandardChangeTurnTo = (params) => postAction('/process/es/change/transfer', params)
 // 同意
-const enStandardChangeAgree = (params) => postAction('', params)
+const enStandardChangeAgree = (params) => postAction('/process/es/change/agree', params)
 // 拒绝
-const enStandardChangeReject = (params) => postAction('', params)
+const enStandardChangeReject = (params) => postAction('/process/es/change/reject', params)
 // 根据id查流程数据
-const enStandardChangeGetDataById = (params) => getAction('', params)
+const enStandardChangeGetDataById = (taskId, params) => getAction(`/process/es/change/handle/${taskId}`, params)
 
 // 企标复审流程
-// 根据id查询流程数据
-const enStandardRecheckGetDataById = (params) => getAction('', params)
 // 保存
-const enStandardRecheckSave = (params) => postAction('', params)
+const enStandardRecheckSave = (params) => postAction('/process/es/recheck/save', params)
 // 发起
-const enStandardRecheckApproval = (params) => postAction('', params)
+const enStandardRecheckApproval = (params) => postAction('/process/es/recheck/start', params)
 // 转办
-const enStandardRecheckTurnTo = (params) => postAction('', params)
+const enStandardRecheckTurnTo = (params) => postAction('/process/es/recheck/transfer', params)
-// 提交
-const enStandardRecheckSubmit = (params) => postAction('', params)
 // 同意
-const enStandardRecheckAgree = (params) => postAction('', params)
+const enStandardRecheckAgree = (params) => postAction('/process/es/recheck/agree', params)
 // 驳回
-const enStandardRecheckReject = (params) => postAction('', params)
+const enStandardRecheckReject = (params) => postAction('/process/es/recheck/reject', params)
+// 根据id查询流程数据
+const enStandardRecheckGetDataById = (taskId, params) => getAction(`/process/es/recheck/handle/${taskId}`, params)
 
 // 企标废止流程
-// 根据id查询流程数据--办理
-const enStandardAnnulGetDataById = (params) => getAction('', params)
 // 保存
-const enStandardAnnulSave = (params) => postAction('', params)
+const enStandardAnnulSave = (params) => postAction('/process/es/abolish/save', params)
 // 发起
-const enStandardAnnulApproval = (params) => postAction('', params)
+const enStandardAnnulApproval = (params) => postAction('/process/es/abolish/start', params)
 // 转办
-const enStandardAnnulTurnTo = (params) => postAction('', params)
+const enStandardAnnulTurnTo = (params) => postAction('/process/es/abolish/transfer', params)
 // 同意
-const enStandardAnnulAgree = (params) => postAction('', params)
+const enStandardAnnulAgree = (params) => postAction('/process/es/abolish/agree', params)
 // 驳回
-const enStandardAnnulReject = (params) => postAction('', params)
+const enStandardAnnulReject = (params) => postAction('/process/es/abolish/reject', params)
+// 根据id查询流程数据--办理
+const enStandardAnnulGetDataById = (taskId, params) => getAction(`/process/es/abolish/handle/${taskId}`, params)
 
 // 企标封存流程
-// 根据id查询流程数据--办理
-const enStandardSealSaveGetDataById = (params) => getAction('', params)
 // 保存
-const enStandardSealSaveSave = (params) => postAction('', params)
+const enStandardSealSaveSave = (params) => postAction('/process/es/archive/save', params)
 // 发起
-const enStandardSealSaveApproval = (params) => postAction('', params)
+const enStandardSealSaveApproval = (params) => postAction('/process/es/archive/start', params)
 // 转办
-const enStandardSealSaveTurnTo = (params) => postAction('', params)
+const enStandardSealSaveTurnTo = (params) => postAction('/process/es/archive/transfer', params)
 // 同意
-const enStandardSealSaveAgree = (params) => postAction('', params)
+const enStandardSealSaveAgree = (params) => postAction('/process/es/archive/agree', params)
 // 驳回
-const enStandardSealSaveReject = (params) => postAction('', params)
+const enStandardSealSaveReject = (params) => postAction('/process/es/archive/reject', params)
+// 根据id查询流程数据--办理
+const enStandardSealSaveGetDataById = (taskId, params) => getAction(`/process/es/archive/handle/${taskId}`, params)
 
 // 已封存企标启用流程
-// 根据id查询流程数据--办理
-const enStandardStartUseGetDataById = (params) => getAction('', params)
 // 保存
-const enStandardStartUseSave = (params) => postAction('', params)
+const enStandardStartUseSave = (params) => postAction('/process/es/enable/save', params)
 // 发起
-const enStandardStartUseApproval = (params) => postAction('', params)
+const enStandardStartUseApproval = (params) => postAction('/process/es/enable/start', params)
 // 转办
-const enStandardStartUseTurnTo = (params) => postAction('', params)
+const enStandardStartUseTurnTo = (params) => postAction('/process/es/enable/transfer', params)
 // 同意
-const enStandardStartUseAgree = (params) => postAction('', params)
+const enStandardStartUseAgree = (params) => postAction('/process/es/enable/agree', params)
 // 驳回
-const enStandardStartUseReject = (params) => postAction('', params)
+const enStandardStartUseReject = (params) => postAction('/process/es/enable/reject', params)
+// 根据id查询流程数据--办理
+const enStandardStartUseGetDataById = (taskId, params) => getAction(`/process/es/enable/handle/${taskId}`, params)
 
 // 流程中心
 // 待办-转办
@@ -189,7 +187,6 @@ export {
   enStandardRecheckSave,
   enStandardRecheckApproval,
   enStandardRecheckTurnTo,
-  enStandardRecheckSubmit,
   enStandardRecheckAgree,
   enStandardRecheckReject,
 

src/enums/commonEnums.js

@@ -157,10 +157,15 @@ export const ProcessKey = {
   ES_ANNUAL_INIT: { text: 'es-annual-init', value: 'es-annual-init' },
   // 企标制修订流程
   // 企标更改流程
+  ES_CHANGE: { text: 'es-change', value: 'es-change' },
   // 企标复审流程
+  ES_RECHECK: { text: 'es-recheck', value: 'es-recheck' },
   // 企标废止流程
+  ES_ABOLISH: { text: 'es-abolish', value: 'es-abolish' },
   // 企标封存流程
+  ES_ARCHIVE: { text: 'es-archive', value: 'es-archive' },
   // 已封存企标启用流程
+  ES_ENABLE: { text: 'es-enable', value: 'es-enable' },
   // 标准法规入库/变更流程
   FB_ENTRY_CHANGE: { text: 'fb-entry-change', value: 'fb-entry-change' }
 }

src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue

@@ -78,7 +78,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>
@@ -113,8 +113,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 {
   enStandardChangeSave,
@@ -127,50 +125,7 @@ import {
 import MainDrafterInitBaseInfo from './modules/MainDrafterInitBaseInfo'
 import ApproveBaseInfo from './modules/ApproveBaseInfo'
 import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
-
+import { ProcessKey } from '../../../enums/commonEnums'
-// 人员信息
-const personalInfo = [ // 人员信息的数据
-  {
-    id: 1,
-    nodeName: '主起草人发起',
-    nodeRoleName: '发起人',
-    canChoose: false,
-    userList: Vue.ls.get(USER_INFO).realname + '(' + Vue.ls.get(USER_INFO).username + ')',
-    fieldName: 'mainDraftUser'
-  },
-  {
-    id: 2,
-    nodeName: '相关人员校对',
-    nodeRoleName: '相关人员',
-    canChoose: true,
-    chooseType: 'checkbox',
-    fieldName: 'relatedUser'
-  },
-  {
-    id: 3,
-    nodeName: '起草人主管级领导审批',
-    nodeRoleName: '起草人主管级领导',
-    canChoose: true,
-    chooseType: 'radio',
-    fieldName: 'mainDraftUserLeader'
-  },
-  {
-    id: 4,
-    nodeName: '标准化审批',
-    nodeRoleName: '标准化',
-    canChoose: true,
-    chooseType: 'radio',
-    fieldName: 'standardizationUser'
-  },
-  {
-    id: 5,
-    nodeName: '起草人主管级上一级领导审批',
-    nodeRoleName: '起草人主管级上一级领导',
-    canChoose: true,
-    chooseType: 'radio',
-    fieldName: 'mainDraftUserLeaderLeader'
-  }
-]
 
 export default {
   name: 'EnterpriseStandardChangeFlow',
@@ -190,7 +145,7 @@ export default {
   },
   mounted () {
     // 获取人员信息结构
-    this.getPersonInfoStructure()
+    this.getPersonInfoStructure(ProcessKey.ES_CHANGE.value)
     if (this.$route.query.taskId) {
       this.currentNodeName = this.$route.query.taskName
       // 有流程id说明是从流程中心来的，需要初始化数据

src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue

@@ -1,344 +1,348 @@
 <template>
-  <a-form-model :model="formInline" class="form-add" :rules="rules" ref="ruleForm">
+  <a-spin :spinning="loading">
-    <div class="collapsible-panel-form">
+    <a-form-model :model="formInline" class="form-add" :rules="rules" ref="ruleForm">
-      <div class="form-flex-box collapsible-panel-form-content collapsible-content-no-head">
+      <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">
+          <div class="box-title-text form-flex-item">
-            <span class="required">*</span>
+            <div class="title-text">
-            <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.typeOfRevision')">
+              <span class="required">*</span>
-                  {{ $t('workCenter.enterpriseInitChangePlan.typeOfRevision') }}
+              <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.typeOfRevision')">
-                </span>
+                    {{ $t('workCenter.enterpriseInitChangePlan.typeOfRevision') }}
+                  </span>
+            </div>
+            <a-form-model-item class="item-model">
+              <a-input class="box-input"
+                       :maxLength="50"
+                       defaultValue="更改"
+                       disabled
+                       @change="event => event.target.value = event.target.value.trim()"
+                       :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.typeOfRevision')" />
+            </a-form-model-item>
           </div>
-          <a-form-model-item class="item-model">
+          <!--  企标编号  -->
-            <a-input class="box-input"
+          <div class="box-title-text form-flex-item">
-                     :maxLength="50"
+            <div class="title-text">
-                     defaultValue="更改"
+              <span class="required">*</span>
-                     disabled
+              <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')">
-                     @change="event => event.target.value = event.target.value.trim()"
+                    {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') }}
-                     :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.typeOfRevision')" />
+                  </span>
-          </a-form-model-item>
+            </div>
-        </div>
+            <a-form-model-item class="item-model" prop="standardNumber">
-        <!--  企标编号  -->
+              <standard-selection :source="StandardSource.ENTERPRISE.value"
-        <div class="box-title-text form-flex-item">
+                                  :disabled="disabled"
-          <div class="title-text">
+                                  :disabledSourceSearch="true"
-            <span class="required">*</span>
+                                  type="radio"
-            <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')">
+                                  v-model="formInline.standardNumber"
-                  {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') }}
+                                  @listChange="listChange" />
-                </span>
+            </a-form-model-item>
           </div>
-          <a-form-model-item class="item-model" prop="standardNumber">
+          <!--  企标名称  -->
-            <standard-selection :source="StandardSource.ENTERPRISE.value"
+          <div class="box-title-text form-flex-item">
-                                :disabled="disabled"
+            <div class="title-text">
-                                :disabledSourceSearch="true"
+                    <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.enterpriseStandardName')">
-                                type="radio"
+                    {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardName') }}
-                                v-model="formInline.standardNumber"
+                  </span>
-                                @listChange="listChange" />
+            </div>
-          </a-form-model-item>
+            <a-form-model-item class="item-model" prop="standardName">
-        </div>
+              <a-input class="box-input"
-        <!--  企标名称  -->
+                       v-model="formInline.standardName"
-        <div class="box-title-text form-flex-item">
+                       :maxLength="50"
-          <div class="title-text">
+                       @change="event => event.target.value = event.target.value.trim()"
-                  <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.enterpriseStandardName')">
+                       :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardName')" />
-                  {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardName') }}
+            </a-form-model-item>
-                </span>
           </div>
-          <a-form-model-item class="item-model" prop="standardName">
+          <!--  标准等级分类  -->
-            <a-input class="box-input"
+          <div class="box-title-text form-flex-item">
-                     v-model="formInline.standardName"
+            <div class="title-text">
-                     :maxLength="50"
+              <span class="required">*</span>
-                     @change="event => event.target.value = event.target.value.trim()"
+              <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.standardGradeClassification')">
-                     :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardName')" />
+                {{ $t('workCenter.enterpriseInitChangePlan.standardGradeClassification') }}
-          </a-form-model-item>
+              </span>
-        </div>
+            </div>
-        <!--  标准等级分类  -->
+            <a-form-model-item class="item-model" prop="gradeClassification">
-        <div class="box-title-text form-flex-item">
+              <j-dict-select-tag class="box-input"
-          <div class="title-text">
+                                 :disabled="disabled"
-            <span class="required">*</span>
+                                 v-model="formInline.gradeClassification"
-            <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.standardGradeClassification')">
+                                 :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.standardGradeClassification')"
-              {{ $t('workCenter.enterpriseInitChangePlan.standardGradeClassification') }}
+                                 :type="'select'"
-            </span>
+                                 :triggerChange="false"
+                                 dictCode="standard_grade_classify" />
+            </a-form-model-item>
           </div>
-          <a-form-model-item class="item-model" prop="gradeClassification">
+          <!--  标准体系  -->
-            <j-dict-select-tag class="box-input"
+          <div class="box-title-text form-flex-item">
-                               :disabled="disabled"
+            <div class="title-text">
-                               v-model="formInline.gradeClassification"
+              <span class="required">*</span>
-                               :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.standardGradeClassification')"
+              <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.standardSystem')">
-                               :type="'select'"
+                {{ $t('workCenter.enterpriseInitChangePlan.standardSystem') }}
-                               :triggerChange="false"
+              </span>
-                               dictCode="standard_grade_classify" />
+            </div>
-          </a-form-model-item>
+            <a-form-model-item class="item-model" prop="standardSystem">
-        </div>
+              <a-tree-select
-        <!--  标准体系  -->
+                v-model="formInline.standardSystem"
-        <div class="box-title-text form-flex-item">
+                :getPopupContainer="triggerNode=> triggerNode.parentNode"
-          <div class="title-text">
+                style="width: 100%"
-            <span class="required">*</span>
+                :disabled="disabled"
-            <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.standardSystem')">
+                :tree-data="standardSystemOptions"
-              {{ $t('workCenter.enterpriseInitChangePlan.standardSystem') }}
+                tree-checkable
-            </span>
+                treeCheckStrictly
+                :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.standardSystem')" />
+            </a-form-model-item>
           </div>
-          <a-form-model-item class="item-model" prop="standardSystem">
+          <!--  标准英文名称  -->
-            <a-tree-select
+          <div class="box-title-text form-flex-item">
-              v-model="formInline.standardSystem"
+            <div class="title-text">
-              :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                  <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.standardEnglishName')">
-              style="width: 100%"
+                    {{ $t('workCenter.enterpriseInitChangePlan.standardEnglishName') }}
-              :disabled="disabled"
+                  </span>
-              :tree-data="standardSystemOptions"
+            </div>
-              tree-checkable
+            <a-form-model-item class="item-model" prop="standardEnglishName">
-              treeCheckStrictly
+              <a-input class="box-input"
-              :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.standardSystem')" />
+                       :disabled="disabled"
-          </a-form-model-item>
+                       v-model="formInline.standardEnglishName"
-        </div>
+                       :maxLength="50"
-        <!--  标准英文名称  -->
+                       @change="event => event.target.value = event.target.value.trim()"
-        <div class="box-title-text form-flex-item">
+                       :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.standardEnglishName')" />
-          <div class="title-text">
+            </a-form-model-item>
-                <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"
+          <div class="box-title-text form-flex-item">
-                     :disabled="disabled"
+            <div class="title-text title-text-long">
-                     v-model="formInline.englishName"
+              <span class="required">*</span>
-                     :maxLength="50"
+              <span class="title-text-text" :title="$t('workCenter.enStandardChange.releaseDate')">
-                     @change="event => event.target.value = event.target.value.trim()"
+                    {{ $t('workCenter.enStandardChange.releaseDate') }}
-                     :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.standardEnglishName')" />
+                  </span>
-          </a-form-model-item>
+            </div>
-        </div>
+            <a-form-model-item class="item-model" prop="releaseDate">
-        <!--  发布日期  -->
+              <a-date-picker
-        <div class="box-title-text form-flex-item">
+                v-model="formInline.releaseDate"
-          <div class="title-text title-text-long">
+                :showTime="false"
-            <span class="required">*</span>
+                :disabled="disabled"
-            <span class="title-text-text" :title="$t('workCenter.enStandardChange.releaseDate')">
+                value-format="YYYY-MM-DD">
-                  {{ $t('workCenter.enStandardChange.releaseDate') }}
+              </a-date-picker>
-                </span>
+            </a-form-model-item>
           </div>
-          <a-form-model-item class="item-model" prop="releaseDate">
+          <!--  实施日期  -->
-            <a-date-picker
+          <div class="box-title-text form-flex-item">
-              v-model="formInline.releaseDate"
+            <div class="title-text title-text-long">
-              :showTime="false"
+              <span class="required">*</span>
-              :disabled="disabled"
+              <span class="title-text-text" :title="$t('workCenter.enStandardChange.materialDate')">
-              value-format="YYYY-MM-DD">
+                    {{ $t('workCenter.enStandardChange.materialDate') }}
-            </a-date-picker>
+                  </span>
-          </a-form-model-item>
+            </div>
-        </div>
+            <a-form-model-item class="item-model" prop="implementationDate">
-        <!--  实施日期  -->
+              <a-date-picker
-        <div class="box-title-text form-flex-item">
+                v-model="formInline.implementationDate"
-          <div class="title-text title-text-long">
+                :showTime="false"
-            <span class="required">*</span>
+                :disabled="disabled"
-            <span class="title-text-text" :title="$t('workCenter.enStandardChange.materialDate')">
+                value-format="YYYY-MM-DD">
-                  {{ $t('workCenter.enStandardChange.materialDate') }}
+              </a-date-picker>
-                </span>
+            </a-form-model-item>
           </div>
-          <a-form-model-item class="item-model" prop="implementationDate">
+          <!--  是否试行  -->
-            <a-date-picker
+          <div class="box-title-text form-flex-item">
-              v-model="formInline.implementationDate"
+            <div class="title-text">
-              :showTime="false"
+              <span class="title-text-text" :title="$t('workCenter.enStandardChange.isTry')">
-              :disabled="disabled"
+                    {{ $t('workCenter.enStandardChange.isTry') }}
-              value-format="YYYY-MM-DD">
+                  </span>
-            </a-date-picker>
+            </div>
-          </a-form-model-item>
+            <a-form-model-item class="item-model" prop="tryFlag">
-        </div>
+              <j-dict-select-tag class="box-input"
-        <!--  是否试行  -->
+                                 :disabled="disabled"
-        <div class="box-title-text form-flex-item">
+                                 v-model="formInline.tryFlag"
-          <div class="title-text">
+                                 :placeholder="$t('pleaseSelect')+$t('workCenter.enStandardChange.isTry')"
-            <span class="title-text-text" :title="$t('workCenter.enStandardChange.isTry')">
+                                 :type="'select'"
-                  {{ $t('workCenter.enStandardChange.isTry') }}
+                                 :triggerChange="false"
-                </span>
+                                 dictCode="is_trial" />
+            </a-form-model-item>
           </div>
-          <a-form-model-item class="item-model" prop="tryFlag">
+          <!--  试行周期  -->
-            <j-dict-select-tag class="box-input"
+          <div class="box-title-text form-flex-item">
-                               :disabled="disabled"
+            <div class="title-text">
-                               v-model="formInline.tryFlag"
+              <span class="title-text-text" :title="$t('workCenter.enStandardChange.trialPeriod')">
-                               :placeholder="$t('pleaseSelect')+$t('workCenter.enStandardChange.isTry')"
+                    {{ $t('workCenter.enStandardChange.trialPeriod') }}
-                               :type="'select'"
+                  </span>
-                               :triggerChange="false"
+            </div>
-                               dictCode="is_trial" />
+            <a-form-model-item class="item-model" prop="trialPeriod">
-          </a-form-model-item>
+              <j-dict-select-tag class="box-input"
-        </div>
+                                 :disabled="disabled"
-        <!--  试行周期  -->
+                                 v-model="formInline.trialPeriod"
-        <div class="box-title-text form-flex-item">
+                                 :placeholder="$t('pleaseSelect')+$t('workCenter.enStandardChange.trialPeriod')"
-          <div class="title-text">
+                                 :type="'select'"
-            <span class="title-text-text" :title="$t('workCenter.enStandardChange.trialPeriod')">
+                                 :triggerChange="false"
-                  {{ $t('workCenter.enStandardChange.trialPeriod') }}
+                                 dictCode="trial_period" />
-                </span>
+            </a-form-model-item>
           </div>
-          <a-form-model-item class="item-model" prop="trialPeriod">
+          <!--  零部件名称  -->
-            <j-dict-select-tag class="box-input"
+          <div class="box-title-text form-flex-item">
-                               :disabled="disabled"
+            <div class="title-text">
-                               v-model="formInline.trialPeriod"
+              <span class="required">*</span>
-                               :placeholder="$t('pleaseSelect')+$t('workCenter.enStandardChange.trialPeriod')"
+              <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.partName')">
-                               :type="'select'"
+                {{ $t('workCenter.enterpriseInitChangePlan.partName') }}
-                               :triggerChange="false"
+              </span>
-                               dictCode="trial_period" />
+            </div>
-          </a-form-model-item>
+            <a-form-model-item class="item-model" prop="partName">
-        </div>
+              <a-tree-select v-model="formInline.partName"
-        <!--  零部件名称  -->
-        <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.partName')">
-              {{ $t('workCenter.enterpriseInitChangePlan.partName') }}
-            </span>
-          </div>
-          <a-form-model-item class="item-model" prop="partName">
-            <a-tree-select v-model="formInline.partName"
-                           :disabled="disabled"
-                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                           style="width: 100%"
-                           :tree-data="partNameOptions"
-                           :label-in-value="false"
-                           :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.partName')" />
-          </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.principalDrafter')">
-                  {{ $t('workCenter.enterpriseInitChangePlan.principalDrafter') }}
-                </span>
-          </div>
-          <a-form-model-item class="item-model" prop="mainDraftingUser">
-            <user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.principalDrafter')"
-                            v-model="formInline.mainDraftingUser"
-                            :disabled="disabled"
-                            filedName="mainDraftingUser"
-                            @nameChange="userSelectNameChange"
-                            :nameStr="formInline.mainDraftingUser_dictText"
-                            type="radio" />
-          </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.mainDraftUnit')">
-                  {{ $t('workCenter.enterpriseInitChangePlan.mainDraftUnit') }}
-                </span>
-          </div>
-          <a-form-model-item class="item-model" prop="mainDraftingUnit">
-            <j-select-depart v-model="formInline.mainDraftingUnit"
                              :disabled="disabled"
-                             :backDepart="true" />
+                             :getPopupContainer="triggerNode=> triggerNode.parentNode"
-          </a-form-model-item>
+                             style="width: 100%"
-        </div>
+                             :tree-data="partNameOptions"
-        <!--  标准适用范围  -->
+                             :label-in-value="false"
-        <div class="box-title-text form-flex-item">
+                             :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.partName')" />
-          <div class="title-text title-text-long">
+            </a-form-model-item>
-                <span class="title-text-text" :title="$t('workCenter.enStandardChange.scopeOfApplication')">
-                  {{ $t('workCenter.enStandardChange.scopeOfApplication') }}
-                </span>
           </div>
-          <a-form-model-item class="item-model" prop="standardScope">
+          <!--  主起草人  -->
-            <a-textarea :placeholder="$t('pleaseEnter')+$t('workCenter.enStandardChange.scopeOfApplication')"
+          <div class="box-title-text form-flex-item">
-                        :maxLength="500"
+            <div class="title-text">
-                        :disabled="disabled"
+              <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.principalDrafter')">
-                        v-model="formInline.standardScope" :rows="4" />
+                    {{ $t('workCenter.enterpriseInitChangePlan.principalDrafter') }}
-          </a-form-model-item>
+                  </span>
-        </div>
+            </div>
-        <!--  代替标准号  -->
+            <a-form-model-item class="item-model" prop="mainDraftingUser">
-        <div class="box-title-text form-flex-item">
+              <user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.principalDrafter')"
-          <div class="title-text">
+                              v-model="formInline.mainDraftingUser"
-            <span class="required">*</span>
+                              :disabled="disabled"
-            <span class="title-text-text" :title="$t('workCenter.enStandardChange.substituteStandardNumber')">
+                              filedName="mainDraftingUser"
-                  {{ $t('workCenter.enStandardChange.substituteStandardNumber') }}
+                              @nameChange="userSelectNameChange"
-                </span>
+                              :nameStr="formInline.mainDraftingUser_dictText"
+                              type="radio" />
+            </a-form-model-item>
           </div>
-          <a-form-model-item class="item-model" prop="substitute_standard_number">
+          <!--  主起草单位  -->
-            <standard-selection :source="StandardSource.ENTERPRISE.value"
+          <div class="box-title-text form-flex-item">
-                                :disabled="disabled"
+            <div class="title-text">
-                                :disabledSourceSearch="true"
+              <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.mainDraftUnit')">
-                                type="radio"
+                    {{ $t('workCenter.enterpriseInitChangePlan.mainDraftUnit') }}
-                                v-model="formInline.substitute_standard_number" />
+                  </span>
-          </a-form-model-item>
+            </div>
-        </div>
+            <a-form-model-item class="item-model" prop="mainDraftingUnit">
-        <!--  引用标准  -->
+              <j-select-depart v-model="formInline.mainDraftingUnit"
-        <div class="box-title-text form-flex-item">
-          <div class="title-text">
-            <span class="required">*</span>
-            <span class="title-text-text" :title="$t('workCenter.enStandardChange.quotedStandard')">
-                  {{ $t('workCenter.enStandardChange.quotedStandard') }}
-                </span>
-          </div>
-          <a-form-model-item class="item-model" prop="quoted_standard">
-            <standard-selection :source="StandardSource.ENTERPRISE.value"
-                                :disabled="disabled"
-                                :disabledSourceSearch="true"
-                                type="radio"
-                                v-model="formInline.quoted_standard" />
-          </a-form-model-item>
-        </div>
-        <!--  关联文件  -->
-        <div class="box-title-text form-flex-item">
-          <div class="title-text title-text-long">
-                <span class="title-text-text" :title="$t('workCenter.enStandardChange.relevantFile')">
-                  {{ $t('workCenter.enStandardChange.relevantFile') }}
-                </span>
-          </div>
-          <a-form-model-item class="item-model" prop="associated_file">
-            <a-button type="primary" class="button-text" style="width: 200px" @click="clickButtonToUpload('associated_file')">
-              {{
-                (formInline.associated_file === 'null' || formInline.associated_file === ''
-                  || formInline.associated_file === null || formInline.associated_file === undefined)
-                  ? $t('uploadFile.clickUpload')
-                  : $t('uploadFile.viewUploadedFiles')
-              }}
-            </a-button>
-          </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.degreeOfBidAcquisition')">
-                  {{ $t('workCenter.enStandardChange.degreeOfBidAcquisition') }}
-                </span>
-          </div>
-          <a-form-model-item class="item-model" prop="acquisition_degree">
-            <j-dict-select-tag class="box-input"
                                :disabled="disabled"
-                               v-model="formInline.acquisition_degree"
+                               :backDepart="true" />
-                               :placeholder="$t('pleaseSelect')+$t('workCenter.enStandardChange.degreeOfBidAcquisition')"
+            </a-form-model-item>
-                               :type="'select'"
+          </div>
-                               :triggerChange="false"
+          <!--  标准适用范围  -->
-                               dictCode="degree_bid_acquisition" />
+          <div class="box-title-text form-flex-item">
-          </a-form-model-item>
+            <div class="title-text title-text-long">
-        </div>
+                  <span class="title-text-text" :title="$t('workCenter.enStandardChange.scopeOfApplication')">
-        <!--  采用国际标准号  -->
+                    {{ $t('workCenter.enStandardChange.scopeOfApplication') }}
-        <div class="box-title-text form-flex-item">
+                  </span>
-          <div class="title-text">
+            </div>
-            <span class="required">*</span>
+            <a-form-model-item class="item-model" prop="standardScope">
-            <span class="title-text-text" :title="$t('workCenter.enStandardChange.adoptInternationalStandardNumber')">
+              <a-textarea :placeholder="$t('pleaseEnter')+$t('workCenter.enStandardChange.scopeOfApplication')"
-                  {{ $t('workCenter.enStandardChange.adoptInternationalStandardNumber') }}
+                          :maxLength="500"
-                </span>
+                          :disabled="disabled"
+                          v-model="formInline.standardScope" :rows="4" />
+            </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.enStandardChange.substituteStandardNumber')">
+                    {{ $t('workCenter.enStandardChange.substituteStandardNumber') }}
+                  </span>
+            </div>
+            <a-form-model-item class="item-model" prop="substituteStandardNumber">
+              <standard-selection :source="StandardSource.ENTERPRISE.value"
+                                  :disabled="disabled"
+                                  :disabledSourceSearch="true"
+                                  type="radio"
+                                  v-model="formInline.substituteStandardNumber" />
+            </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.enStandardChange.quotedStandard')">
+                    {{ $t('workCenter.enStandardChange.quotedStandard') }}
+                  </span>
+            </div>
+            <a-form-model-item class="item-model" prop="quotedStandard">
+              <standard-selection :source="StandardSource.ENTERPRISE.value"
+                                  :disabled="disabled"
+                                  :disabledSourceSearch="true"
+                                  type="radio"
+                                  v-model="formInline.quotedStandard" />
+            </a-form-model-item>
+          </div>
+          <!--  关联文件  -->
+          <div class="box-title-text form-flex-item">
+            <div class="title-text title-text-long">
+                  <span class="title-text-text" :title="$t('workCenter.enStandardChange.relevantFile')">
+                    {{ $t('workCenter.enStandardChange.relevantFile') }}
+                  </span>
+            </div>
+            <a-form-model-item class="item-model" prop="associatedFile">
+              <a-button type="primary" class="button-text" style="width: 200px" @click="clickButtonToUpload('associatedFile')">
+                {{
+                  (formInline.associatedFile === 'null' || formInline.associatedFile === ''
+                    || formInline.associatedFile === null || formInline.associatedFile === undefined)
+                    ? $t('uploadFile.clickUpload')
+                    : $t('uploadFile.viewUploadedFiles')
+                }}
+              </a-button>
+            </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.degreeOfBidAcquisition')">
+                    {{ $t('workCenter.enStandardChange.degreeOfBidAcquisition') }}
+                  </span>
+            </div>
+            <a-form-model-item class="item-model" prop="acquisitionDegree">
+              <j-dict-select-tag class="box-input"
+                                 :disabled="disabled"
+                                 v-model="formInline.acquisitionDegree"
+                                 :placeholder="$t('pleaseSelect')+$t('workCenter.enStandardChange.degreeOfBidAcquisition')"
+                                 :type="'select'"
+                                 :triggerChange="false"
+                                 dictCode="degree_bid_acquisition" />
+            </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.enStandardChange.adoptInternationalStandardNumber')">
+                    {{ $t('workCenter.enStandardChange.adoptInternationalStandardNumber') }}
+                  </span>
+            </div>
+            <a-form-model-item class="item-model" prop="internationalStandardNum">
+              <a-input class="box-input"
+                       v-model="formInline.internationalStandardNum"
+                       :disabled="disabled"
+                       :maxLength="50"
+                       @change="event => event.target.value = event.target.value.trim()"
+                       :placeholder="$t('pleaseEnter')+$t('workCenter.enStandardChange.adoptInternationalStandardNumber')" />
+            </a-form-model-item>
           </div>
-          <a-form-model-item class="item-model" prop="international_standard_num">
-            <a-input class="box-input"
-                     v-model="formInline.international_standard_num"
-                     :disabled="disabled"
-                     :maxLength="50"
-                     @change="event => event.target.value = event.target.value.trim()"
-                     :placeholder="$t('pleaseEnter')+$t('workCenter.enStandardChange.adoptInternationalStandardNumber')" />
-          </a-form-model-item>
         </div>
       </div>
-    </div>
 
-    <!--  上传文件弹框  -->
+      <!--  上传文件弹框  -->
-    <upload-file ref="uploadFile" @change="uploadFileChange" :return-url="false" :disabled="disabled"></upload-file>
+      <upload-file ref="uploadFile" @change="uploadFileChange" :return-url="false" :disabled="disabled"></upload-file>
-  </a-form-model>
+    </a-form-model>
+  </a-spin>
 </template>
 
 <script>
 import { StandardSource } from '@/enums/commonEnums'
-import { getTreeList } from '@/api/enterpriseStandardLibraryApi'
+import { getTreeList, getEnterpriseStandardInfoById } from '@/api/enterpriseStandardLibraryApi'
 import { getFormDictTreeList } from '@/api/api'
 import StandardSelection from '@/components/selection/StandardSelection'
 import UserSelection from '@/components/selection/UserSelection'
+import UploadFile from '@/components/UploadFile'
 
 export default {
   name: 'BaseInfoForm',
   components: {
     StandardSelection,
-    UserSelection
+    UserSelection,
+    UploadFile
   },
   props: {
     disabled: {
@@ -360,6 +364,7 @@ export default {
   data () {
     return {
       StandardSource,
+      loading: false,
       standardSystemOptions: [], // 标准体系下拉框数据
       partNameOptions: [], // 零部件名称下拉框数据
       formInline: {},
@@ -441,25 +446,52 @@ export default {
     // 选完企标编号了，需要回显内容
     listChange (value) {
       console.log(value)
+      this.loading = true
       // 企标名称
       this.formInline.standardName = value[0].standardName
-      // 标准等级分类
+      // 根据返回的id查询企标数据
-      // this.formInline.gradeClassification = value[0].
+      getEnterpriseStandardInfoById({ id: value[0].id, type: '2' }).then(res => {
-      // 标准体系
+        if (res.success) {
-      // 标准英文名称
+          const result = res.result
-      // 发布日期
+          // 标准等级分类
-      // 实施日期
+          this.formInline.gradeClassification = result.grade_classification
-      // 是否试行
+          // 标准体系
-      // 试行周期
+          this.formInline.standardSystem = result.standard_system ? result.standard_system.split(',').map(item => {
-      // 零部件名称
+            return { value: item }
-      // 主起草人
+          }) : []
-      // 主起草单位
+          console.log(this.formInline.standardSystem)
-      // 标准适用范围
+          // 标准英文名称
-      // 代替标准号
+          this.formInline.standardEnglishName = result.standard_english_name
-      // 引用标准
+          // 发布日期
-      // 关联文件
+          this.formInline.releaseDate = result.release_date
-      // 采标程度
+          // 实施日期
-      // 采用国际标准号
+          this.formInline.implementationDate = result.implementation_date
+          // 是否试行
+          this.formInline.tryFlag = result.try_flag
+          // 试行周期
+          this.formInline.trialPeriod = result.trial_period
+          // 零部件名称
+          this.formInline.partName = result.part_name
+          // 主起草人
+          this.formInline.mainDraftingUser = result.main_drafting_user
+          this.formInline.mainDraftingUser_dictText = result.main_drafting_user_dictText
+          // 主起草单位
+          this.formInline.mainDraftingUnit = result.main_drafting_unit
+          // 代替标准号
+          this.formInline.substituteStandardNumber = result.substitute_standard_number
+          // 引用标准
+          this.formInline.quotedStandard = result.reference_standard
+          // 关联文件
+          this.formInline.associatedFile = result.associated_file
+          // 采标程度
+          this.formInline.acquisitionDegree = result.acquisition_degree || null
+          // 采用国际标准号
+          this.formInline.internationalStandardNum = result.international_standard_num
+          this.formInline = Object.assign({}, this.formInline)
+        }
+      }).finally(() => {
+        this.loading = false
+      })
     },
     // 选择用户得到用户名
     userSelectNameChange (value, fieldName) {

src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue

@@ -149,19 +149,23 @@ export default {
       // 把数据抛出，在线编辑不知道要不要抛
       const data = {}
       data.formInline = this.$refs.baseInfoForm.formInline
+      data.formInline.standardSystem = data.formInline.standardSystem.map(item => item.value).join(',')
       data.dataSource = this.dataSource
       return data
     },
     // 外层获取数据要过校验,返回false表示没有通过校验
-    getDataValidate (callback) {
+    async getDataValidate () {
-      this.$refs.baseInfoForm.$refs.ruleForm.validate(valid => {
+      let data = {}
+      await this.$refs.baseInfoForm.$refs.ruleForm.validate(valid => {
         if (valid) {
-          const data = {}
           data.formInline = this.$refs.baseInfoForm.formInline
+          data.formInline.standardSystem = data.formInline.standardSystem.map(item => item.value).join(',')
           data.dataSource = this.dataSource
-          callback(data)
+        } else {
+          data = false
         }
       })
+      return data
     },
     // 企标编号和名称修改触发流程名称的修改
     processNameChange (value) {