[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,4 +1,5 @@
 <template>
+  <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">
@@ -96,10 +97,10 @@
                     {{ $t('workCenter.enterpriseInitChangePlan.standardEnglishName') }}
                   </span>
             </div>
-          <a-form-model-item class="item-model" prop="englishName">
+            <a-form-model-item class="item-model" prop="standardEnglishName">
               <a-input class="box-input"
                        :disabled="disabled"
-                     v-model="formInline.englishName"
+                       v-model="formInline.standardEnglishName"
                        :maxLength="50"
                        @change="event => event.target.value = event.target.value.trim()"
                        :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.standardEnglishName')" />
@@ -243,12 +244,12 @@
                     {{ $t('workCenter.enStandardChange.substituteStandardNumber') }}
                   </span>
             </div>
-          <a-form-model-item class="item-model" prop="substitute_standard_number">
+            <a-form-model-item class="item-model" prop="substituteStandardNumber">
               <standard-selection :source="StandardSource.ENTERPRISE.value"
                                   :disabled="disabled"
                                   :disabledSourceSearch="true"
                                   type="radio"
-                                v-model="formInline.substitute_standard_number" />
+                                  v-model="formInline.substituteStandardNumber" />
             </a-form-model-item>
           </div>
           <!--  引用标准  -->
@@ -259,12 +260,12 @@
                     {{ $t('workCenter.enStandardChange.quotedStandard') }}
                   </span>
             </div>
-          <a-form-model-item class="item-model" prop="quoted_standard">
+            <a-form-model-item class="item-model" prop="quotedStandard">
               <standard-selection :source="StandardSource.ENTERPRISE.value"
                                   :disabled="disabled"
                                   :disabledSourceSearch="true"
                                   type="radio"
-                                v-model="formInline.quoted_standard" />
+                                  v-model="formInline.quotedStandard" />
             </a-form-model-item>
           </div>
           <!--  关联文件  -->
@@ -274,11 +275,11 @@
                     {{ $t('workCenter.enStandardChange.relevantFile') }}
                   </span>
             </div>
-          <a-form-model-item class="item-model" prop="associated_file">
+            <a-form-model-item class="item-model" prop="associatedFile">
-            <a-button type="primary" class="button-text" style="width: 200px" @click="clickButtonToUpload('associated_file')">
+              <a-button type="primary" class="button-text" style="width: 200px" @click="clickButtonToUpload('associatedFile')">
                 {{
-                (formInline.associated_file === 'null' || formInline.associated_file === ''
+                  (formInline.associatedFile === 'null' || formInline.associatedFile === ''
-                  || formInline.associated_file === null || formInline.associated_file === undefined)
+                    || formInline.associatedFile === null || formInline.associatedFile === undefined)
                     ? $t('uploadFile.clickUpload')
                     : $t('uploadFile.viewUploadedFiles')
                 }}
@@ -292,10 +293,10 @@
                     {{ $t('workCenter.enStandardChange.degreeOfBidAcquisition') }}
                   </span>
             </div>
-          <a-form-model-item class="item-model" prop="acquisition_degree">
+            <a-form-model-item class="item-model" prop="acquisitionDegree">
               <j-dict-select-tag class="box-input"
                                  :disabled="disabled"
-                               v-model="formInline.acquisition_degree"
+                                 v-model="formInline.acquisitionDegree"
                                  :placeholder="$t('pleaseSelect')+$t('workCenter.enStandardChange.degreeOfBidAcquisition')"
                                  :type="'select'"
                                  :triggerChange="false"
@@ -310,9 +311,9 @@
                     {{ $t('workCenter.enStandardChange.adoptInternationalStandardNumber') }}
                   </span>
             </div>
-          <a-form-model-item class="item-model" prop="international_standard_num">
+            <a-form-model-item class="item-model" prop="internationalStandardNum">
               <a-input class="box-input"
-                     v-model="formInline.international_standard_num"
+                       v-model="formInline.internationalStandardNum"
                        :disabled="disabled"
                        :maxLength="50"
                        @change="event => event.target.value = event.target.value.trim()"
@@ -325,20 +326,23 @@
       <!--  上传文件弹框  -->
       <upload-file ref="uploadFile" @change="uploadFileChange" :return-url="false" :disabled="disabled"></upload-file>
     </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查询企标数据
+      getEnterpriseStandardInfoById({ id: value[0].id, type: '2' }).then(res => {
+        if (res.success) {
+          const result = res.result
           // 标准等级分类
-      // this.formInline.gradeClassification = value[0].
+          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) {