update 流程详情流程图获取，征求意见流程调整

src/components/FlowChartModal.vue

@@ -28,7 +28,7 @@ export default {
       visible: false,
       confirmLoading: false,
       chartData: {},
-      processId: null // 流程id
+      processKey: null // 流程key
     }
   },
   methods: {
@@ -41,7 +41,7 @@ export default {
     },
     initChartData () {
       this.confirmLoading = true
-      getFlowNodeList({ modelId: this.processId }).then(res => {
+      getFlowNodeList({ key: this.processKey }).then(res => {
         if (res.success) {
           this.chartData = Object.assign({}, res.result || {})
         } else {

src/components/ProcessDetailList.vue

@@ -138,6 +138,12 @@ export default {
       type: String,
       required: false,
       default: null
+    },
+    // 流程key
+    processKey: {
+      type: String,
+      required: false,
+      default: null
     }
   },
   data () {
@@ -269,7 +275,10 @@ export default {
      * 跳转流程图页面
      */
     viewFlowChart () {
-      this.$refs.flowChartModal.processId = '62507'
+      if (!this.processKey) {
+        return
+      }
+      this.$refs.flowChartModal.processKey = this.processKey
       this.$refs.flowChartModal.open()
     },
     handlePreview (file) {

src/enums/commonEnums.js

@@ -306,7 +306,7 @@ export const SolicitOpinions = {
 
 // 法规采购流程节点
 export const ProcurementProcessNodes = new EsEnums({
-  initiate: { text: '发起人申请', value: 'Activity_0fmr3id', btn: ['save', 'submit'] },
+  initiate: { text: '申请采购标准法规', value: 'Activity_0fmr3id', btn: ['save', 'submit'] },
   sponsorLeaderApproval: { text: '发起人主管级领导审批', value: 'Activity_1fr1x5i', btn: ['return', 'save', 'agree', 'reject'] },
   standardLeaderApproval: { text: '标准化主管级领导审批', value: 'Activity_06jy4oo', btn: ['return', 'save', 'agree', 'reject'] },
   standardSuperiorLeaderApproval: {

src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue

@@ -136,7 +136,7 @@
               <!--模块负责人-->
               <a-form-item :label="$t('workCenter.standardConsultationProcess.moduleOwner')">
                 <user-selection v-decorator="['moduleOwnerId', validatorRules.moduleOwnerId]"
-                                :name-str="dispatchInfo.moduleOwnerId"
+                                :name-str="dispatchInfo.moduleOwnerId_dictText"
                                 type="checkbox"
                                 :placeholder="$t('pleaseSelect') + $t('workCenter.standardConsultationProcess.moduleOwner')" />
               </a-form-item>
@@ -147,7 +147,7 @@
               <!--设计工程师-->
               <a-form-item :label="$t('workCenter.standardConsultationProcess.designEngineer')">
                 <user-selection v-decorator="['designEngineerId', validatorRules.designEngineerId]"
-                                :name-str="dispatchInfo.designEngineerId"
+                                :name-str="dispatchInfo.designEngineerId_dictText"
                                 type="checkbox"
                                 :placeholder="$t('pleaseSelect') + $t('workCenter.standardConsultationProcess.designEngineer')" />
               </a-form-item>
@@ -237,7 +237,7 @@
 
     <!--人员信息-->
     <div class="detail-page-scroll-content p-0" v-show="switchValue === 'user'">
-      <process-detail-list>
+      <process-detail-list :process-key="processKey">
         <template #personnelInfo>
           <personnel-info ref="personnelInfo" :data="personnelInfoData" />
         </template>
@@ -718,6 +718,10 @@ export default {
     }
   },
   computed: {
+    // 流程的key
+    processKey () {
+      return ProcessKey.CONSULTATION.value
+    },
     pageTitle () {
       const subTitle = this.$route.query.taskName || ConsultationProcess.initiate.text
       return `${this.$t('flowCenter')}${this.$route.meta.title}（${subTitle}）`
@@ -777,7 +781,7 @@ export default {
       this.currentNode = ConsultationProcess.initiate.value
     }
     // 获取人员信息数据
-    this.getPersonInfoStructure(ProcessKey.CONSULTATION.value, () => {
+    this.getPersonInfoStructure(this.processKey, () => {
       this.initPersonInfoData(this.currentNode.indexOf(ConsultationProcess.initiate.value) === 0)
     })
     // 找不到这个节点默认使用审批节点页面及按钮，发起除外
@@ -808,6 +812,9 @@ export default {
           }
           // 业务分派信息
           this.dispatchInfo = Object.assign({}, result.businessInfoDTO.processFbConsultationUserLink || {})
+          if (this.dispatchInfo.userType) {
+            this.handleSenderTypeChange(this.dispatchInfo.userType)
+          }
           // 征求意见列表
           this.dataSource = result.businessInfoDTO.processFbConsultationLists || []
           // 统一处理表单回显

src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue

@@ -285,7 +285,7 @@
     </div>
     <!--人员信息-->
     <div class="detail-page-scroll-content p-0" v-show="switchValue === 'user'">
-      <process-detail-list>
+      <process-detail-list :process-key="processKey">
         <template #personnelInfo>
           <personnel-info ref="personnelInfo" :data="personnelInfoData" />
         </template>
@@ -455,6 +455,10 @@ export default {
         return ['substitute_standard_number', 'reference_standard']
       }
       return []
+    },
+    // 流程key
+    processKey () {
+      return ProcessKey.FB_ENTRY_CHANGE.value
     }
   },
   watch: {
@@ -481,7 +485,7 @@ export default {
     }
     this.disabled = FGEntryChangeProcessNode.propertyOfValue('disabled', this.currentNode) || false
     // 获取人员信息
-    this.getPersonInfoStructure(ProcessKey.FB_ENTRY_CHANGE.value, () => {
+    this.getPersonInfoStructure(this.processKey, () => {
       this.initPersonInfoData(this.currentNode === FGEntryChangeProcessNode.initiate.value)
     })
     this.getSourceOptions()

src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue

@@ -106,7 +106,7 @@
 
     <!--人员信息-->
     <div class="detail-page-scroll-content p-0" v-show="switchValue === 'user'">
-      <process-detail-list>
+      <process-detail-list :process-key="processKey">
         <template #personnelInfo>
           <personnel-info ref="personnelInfo" :data="personnelInfoData" />
         </template>
@@ -249,6 +249,10 @@ export default {
     // 表格是否可以增删改
     canTableOperate () {
       return this.currentNode === ProcurementProcessNodes.initiate.value
+    },
+    // 流程key
+    processKey () {
+      return ProcessKey.LEGAL_PROCUREMENT.value
     }
   },
   created () {
@@ -262,7 +266,7 @@ export default {
       this.columns.push(this.operateColumn)
     }
     this.btnList = ProcurementProcessNodes.propertyOfValue('btn', this.currentNode)
-    this.getPersonInfoStructure(ProcessKey.LEGAL_PROCUREMENT.value, () => {
+    this.getPersonInfoStructure(this.processKey, () => {
       this.initPersonInfoData(this.currentNode === ProcurementProcessNodes.initiate.value)
     })
   },