From 4e1b75d9b73b0682bae7484302b53eda21598899 Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 19 Oct 2023 11:33:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=BF=E7=AD=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E3=80=81=E5=86=85=E5=A4=96=E9=83=A8=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzwlComponents/TimeLineFormItem.vue | 2 +- .../hzwlComponents/UploadFormItem.vue | 2 +- .../pages/components/ProcessMixin.vue | 8 +- .../creatProcess/policyMeetings/step1.vue | 108 +++++++++------- .../creatProcess/policyMeetings/step2.vue | 24 ++-- .../creatProcess/policyWarehousing/step1.vue | 115 +++++++++++------- .../creatProcess/policyWarehousing/step2.vue | 14 ++- .../tabComponents/taskDraft/index.vue | 33 ++--- 8 files changed, 181 insertions(+), 125 deletions(-) diff --git a/src/components/hzwlComponents/TimeLineFormItem.vue b/src/components/hzwlComponents/TimeLineFormItem.vue index 954bdd84f..9808c5e9a 100644 --- a/src/components/hzwlComponents/TimeLineFormItem.vue +++ b/src/components/hzwlComponents/TimeLineFormItem.vue @@ -7,7 +7,7 @@ diff --git a/src/components/hzwlComponents/UploadFormItem.vue b/src/components/hzwlComponents/UploadFormItem.vue index 0f3c08d5d..944f4c34f 100644 --- a/src/components/hzwlComponents/UploadFormItem.vue +++ b/src/components/hzwlComponents/UploadFormItem.vue @@ -80,7 +80,7 @@ export default { }, accept: { type: String, - default: '.pdf, .PDF, .ppt, .PPT, .pptx, .PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx' + default: '.pdf, .PDF, .doc, .DOC, .docx, .DOCX, .ppt, .PPT, .pptx, .PPTX, .xls, .XLS, .xlsx, .XLSX, .pdg, .PDG' }, size: { type: Number, diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue index 09e7312ea..e05c69442 100644 --- a/src/pages/processCenter/pages/components/ProcessMixin.vue +++ b/src/pages/processCenter/pages/components/ProcessMixin.vue @@ -118,8 +118,12 @@ export default { }, { label: "内外部会议入库流程", - value: "28" - } + value: "29" + }, + // { + // label: "政策课题入会流程", + // value: "30" + // }, ], formDisableFlag: false, pickerOptions: { diff --git a/src/pages/processCenter/pages/creatProcess/policyMeetings/step1.vue b/src/pages/processCenter/pages/creatProcess/policyMeetings/step1.vue index 71e1b8023..a2e7d2a7a 100644 --- a/src/pages/processCenter/pages/creatProcess/policyMeetings/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/policyMeetings/step1.vue @@ -6,7 +6,7 @@
基础信息
-
人员信息
+
人员信息
审批历史
@@ -72,7 +72,7 @@ import PersonInfo from "./components/PersonInfo"; import ReceiptDescription from "@/components/hzwlComponents/ReceiptDescription"; import ApprovalHistory from "@/components/hzwlComponents/ApprovalHistory"; -import { getDicTypeListCode, saveTaskFirst, queryTaskFirst, inboundLiaisonDetail, taskDel } from 'api/process' +import { getDicTypeListCode, saveTaskFirst, queryTaskFirst, inboundLiaisonDetail, taskDel, saveTaskForPub } from 'api/process' export default { name: "policyMeetings1", @@ -186,6 +186,7 @@ export default { // 审批历史 processData: [], processLoading: false, + showProcess: false, } }, created() { @@ -218,25 +219,18 @@ export default { this.form.meetingTopicList = [ ...res ] }, getData () { - const { bpnId, taskIds, prcId, disabledXX } = this.$route.query - // 1. 根据草稿查询流程详情 2.已办、已发、监控：查看流程数据 - if(bpnId) { - queryTaskFirst({ bpnId }).then(res => { - this.reloadForm = false - let mes = JSON.parse(res.mes) - this.$set(this, 'form', mes.form) - this.roleForm = mes.roleForm - this.$nextTick(() => { - this.reloadForm = true - }) - }) - } + const { bpnId, taskIds, prcId, disabledXX, verifySarStandard } = this.$route.query + if (disabledXX) { this.disabled = disabledXX } // 重新起草 if (taskIds) { this.title = '重新起草' + if (verifySarStandard) { + this.title = '起草' + } + this.showProcess = true inboundLiaisonDetail({ taskIds, pId: prcId @@ -256,6 +250,20 @@ export default { }) } }) + return; + } + + // 根据草稿查询流程详情 + if(bpnId) { + queryTaskFirst({ bpnId }).then(res => { + this.reloadForm = false + let mes = JSON.parse(res.mes) + this.$set(this, 'form', mes.form) + this.roleForm = mes.roleForm + this.$nextTick(() => { + this.reloadForm = true + }) + }) } }, // 审批历史 @@ -275,31 +283,41 @@ export default { handleSave() { this.footerLoading = true let _formData = new FormData() - _formData.append('id', this.$route.query.bpnId || '') // 草稿id - _formData.append('createUser', this.$store.getters.userInfo.userId) - _formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('prcType', '29') - _formData.append('prcName', '内外部会议入库流程') - _formData.append('json', JSON.stringify({ - taskInfo: '起草', - form: this.form, - roleForm: this.roleForm, - })) - // 保存草稿 - saveTaskFirst(_formData).then(res => { - this.$message.success('保存成功') - this.bpnId = res.result - this.$router.replace({ - path: this.$route.path, - query: { - prcType: '29', - processName: '申请人发起流程', - bpnId: res.result - } + + if (this.$route.query.taskIds) { + // 重新起草保存 + _formData.append('taskIds', this.$route.query.taskIds) + _formData.append('json', JSON.stringify(this.form)) + saveTaskForPub(_formData).then(res => { + this.$message.success('保存成功') + }).finally(e => { + this.footerLoading = false }) - }).finally(e => { - this.footerLoading = false - }) + } else { + _formData.append('id', this.$route.query.bpnId || '') // 草稿id + _formData.append('createUser', this.$store.getters.userInfo.userId) + _formData.append('createUserName', this.$store.getters.userInfo.uName) + _formData.append('prcName', '内外部会议入库流程') + _formData.append('json', JSON.stringify({ + taskInfo: '起草', + form: this.form, + roleForm: this.roleForm, + })) + // 保存草稿 + saveTaskFirst(_formData).then(res => { + this.$message.success('保存成功') + this.$router.replace({ + path: this.$route.path, + query: { + prcType: '29', + bpnId: res.result + } + }) + }).finally(e => { + this.footerLoading = false + }) + } }, async submit () { this.footerLoading = true @@ -322,7 +340,10 @@ export default { json: JSON.stringify(json) } const res = await this.$http._post('lawss/activiti/startProcessRollBack', startProcessRollBackQuery) - if(!res.ok) return; + if(!res.ok) { + this.footerLoading = false + return this.$message.error(res.message) + } completeTaskQuery = { taskIds: res.data, @@ -331,12 +352,15 @@ export default { } } const completeTaskRef = await this.$http._post('lawss/activiti/completeTask', completeTaskQuery) - if (!completeTaskRef.success) return; - this.$message.success(completeTaskRef.message) + if (!completeTaskRef.success) { + this.footerLoading = false + return this.$message.error(completeTaskRef.message) + } + this.$message.success(completeTaskRef.message) this.footerLoading = false - if (this.$route.query.bpnId !== '') { + if (this.$route.query.bpnId && this.$route.query.bpnId !== '') { // 删除草稿 taskDel({ id: this.$route.query.bpnId }) } diff --git a/src/pages/processCenter/pages/creatProcess/policyMeetings/step2.vue b/src/pages/processCenter/pages/creatProcess/policyMeetings/step2.vue index a610193f6..741b848d3 100644 --- a/src/pages/processCenter/pages/creatProcess/policyMeetings/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/policyMeetings/step2.vue @@ -1,7 +1,7 @@