From 864f21ccb00830b5688f90e06366c7388a428565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= Date: Tue, 28 Nov 2023 16:25:25 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=9B=BE=E8=8E=B7=E5=8F=96=EF=BC=8C=E5=BE=81?= =?UTF-8?q?=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/FlowChartModal.vue | 4 ++-- src/components/ProcessDetailList.vue | 11 ++++++++++- src/enums/commonEnums.js | 2 +- .../StandardConsultationProcess.vue | 15 +++++++++++---- .../StandardEntryOrChangeProcess.vue | 8 ++++++-- .../StandardProcurementProcess.vue | 8 ++++++-- 6 files changed, 36 insertions(+), 12 deletions(-) diff --git a/src/components/FlowChartModal.vue b/src/components/FlowChartModal.vue index daaba6c5..7e61c159 100644 --- a/src/components/FlowChartModal.vue +++ b/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 { diff --git a/src/components/ProcessDetailList.vue b/src/components/ProcessDetailList.vue index 373e6fb6..64d86475 100644 --- a/src/components/ProcessDetailList.vue +++ b/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) { diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index 3fcd72d3..2ce4a93f 100644 --- a/src/enums/commonEnums.js +++ b/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: { diff --git a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue index 6eea1d69..e48b5e6b 100644 --- a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue +++ b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue @@ -136,7 +136,7 @@ @@ -147,7 +147,7 @@ @@ -237,7 +237,7 @@
- + @@ -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 || [] // 统一处理表单回显 diff --git a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue index b1e0b663..d1ae6f37 100644 --- a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue +++ b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue @@ -285,7 +285,7 @@
- + @@ -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() diff --git a/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue b/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue index b447b7e0..5dd9af17 100644 --- a/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue +++ b/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue @@ -106,7 +106,7 @@
- + @@ -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) }) },