From 7c3c229485636e05f7fc7f9620d683f216234312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Wed, 18 Oct 2023 15:35:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=94=BF=E7=AD=96=E5=BE=81?= =?UTF-8?q?=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/components/ProcessMixin.vue | 450 +- .../components/addModel.vue | 2 +- .../components/approvalHistory.vue | 4 +- .../components/personnelInformation.vue | 32 + .../components/solicitationList.vue | 2 +- .../creatProcess/policyConsultation/index.vue | 91 +- .../tabComponents/processCenter/index.vue | 4611 +++++++++-------- 7 files changed, 2649 insertions(+), 2543 deletions(-) diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue index d55652987..f9111a9e3 100644 --- a/src/pages/processCenter/pages/components/ProcessMixin.vue +++ b/src/pages/processCenter/pages/components/ProcessMixin.vue @@ -1,231 +1,235 @@ diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/addModel.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/addModel.vue index 38d3c2c88..3a9c0b7a6 100644 --- a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/addModel.vue +++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/addModel.vue @@ -181,7 +181,7 @@ fileName: '', accept: '', fileMax_M: 0, - taskKey: this.$route.query.taskKey, + taskKey: this.$route.query.taskDefinitionKey, } }, diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/approvalHistory.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/approvalHistory.vue index 77a7dbd72..8986b06c5 100644 --- a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/approvalHistory.vue +++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/approvalHistory.vue @@ -64,7 +64,9 @@ } }, mounted() { - // this.getHistoryData() + if (this.$route.query.prcNum) { + this.getHistoryData() + } }, methods: { getHistoryData() { diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/personnelInformation.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/personnelInformation.vue index 1ce8fefd8..eb01772ca 100644 --- a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/personnelInformation.vue +++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/personnelInformation.vue @@ -285,6 +285,38 @@ } }) }, + getData(item) { + let row = item ? JSON.parse(JSON.stringify(item)) : {} + this.roleForm = { + djrUserIds: row.djrUserIds, + djrUserNames: row.djrUserNames, + + glyUserId: row.glyUserId, + glyUserName: row.glyUserName, + + pzr1UserId: row.pzr1UserId, + pzr1UserName: row.pzr1UserName, + + pzr2UserId: row.pzr2UserId, + pzr2UserName: row.pzr2UserName, + + sdr1UserIds: row.sdr1UserIds, + sdr1UserNames: row.sdr1UserNames, + + sdr2UserIds: row.sdr2UserIds, + sdr2UserNames: row.sdr2UserNames, + + shr1UserIds: row.shr1UserIds, + shr1UserNames: row.shr1UserNames, + + shr2UserIds: row.shr2UserIds, + shr2UserNames: row.shr2UserNames, + + startUser: row.startUser, + startUserName: row.startUserName, + } + this.roleForm = {...this.roleForm} + }, } } diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/solicitationList.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/solicitationList.vue index 7b893e9a3..3b18cffcb 100644 --- a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/solicitationList.vue +++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/solicitationList.vue @@ -183,7 +183,7 @@ editNum: 0, selectList: [], deleteList: [], - taskKey: this.$route.query.taskKey,//流程节点key + taskKey: this.$route.query.taskDefinitionKey,//流程节点key } }, computed: { diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue index 980f259d2..dea952fda 100644 --- a/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue +++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue @@ -271,7 +271,7 @@ import solicitationList from "./components/solicitationList";//征求意见列表 import policySolicitingOpinions from "./components/policySolicitingOpinions"; import processFile from "../../components/processFile"; - import {queryTaskFirst, saveTaskFirst, taskDel, changeAssigneeNew} from "api/process"; + import {queryTaskFirst, saveTaskFirst, taskDel, changeAssigneeNew, inboundLiaisonDetail} from "api/process"; import axios from "axios"; export default { @@ -332,11 +332,12 @@ commentText: '', fileListName: '', fileName: '', - taskKey: this.$route.query.taskKey, + taskKey: this.$route.query.taskDefinitionKey, title: '', checkBox: false, selectType: '', - roleForm:{}, + roleForm: {}, + bpnId: '', } }, computed: { @@ -437,6 +438,9 @@ return true }, }, + mounted() { + this.getData() + }, methods: { handlePreview(file) { let attId = "" @@ -484,16 +488,22 @@ //保存事件 handleSave() { this.saveLoading = true; + if (!this.taskKey || this.taskKey == 'PolicySolicitOpinionProcessKey1') { + this.draftSaving() + } + }, + //草稿保存 + draftSaving() { let _formData = new FormData(); - let json = this.form + let json = this.dataForm json.commentText = this.commentText _formData.append('id', this.bpnId || '') _formData.append("createUser", this.$store.getters.userInfo.userId); _formData.append("createUserName", this.$store.getters.userInfo.userName); - _formData.append("prcType", "laws2"); + _formData.append("prcType", "29"); _formData.append("json", JSON.stringify({ form: json, - roleForm: this.roleForm, + roleForm: this.$refs.personnelInformationRef.roleForm, commentText: this.commentText })); saveTaskFirst(_formData).then(res => { @@ -508,13 +518,23 @@ handleSubmit() { this.$refs['zczqyjForm'].validate((valid) => { if (valid) { - if (this.showPersonnel) { + if (!this.taskKey || this.taskKey == 'PolicySolicitOpinionProcessKey1') { this.$refs.personnelInformationRef.submit((row) => { this.isSubmit = true this.saveLoading = true; - this.roleForm = row - this.startProcessRollBack() + this.startProcessRollBack(row) }) + } else if (this.taskKey == 'PolicySolicitOpinionProcessKey2') { + this.isSubmit = true + this.saveLoading = true; + const json = Object.assign(this.dataForm); + json.commentText = this.commentText + json.approvalFlag = 0 + let query = { + form: json, + commentText: this.commentText + } + this.completeTask(this.$route.query.taskIds, query) } } else { return this.$message.warning('请完善基础信息') @@ -523,23 +543,33 @@ }, handleReject() { // approvalFlag value:0通过 1驳回 + if (this.taskKey == 'PolicySolicitOpinionProcessKey2') { + const json = Object.assign(this.dataForm); + json.commentText = this.commentText + json.approvalFlag = 1 + let query = { + form: json, + commentText: this.commentText + } + this.completeTask(this.$route.query.taskIds,query) + } }, //启动流程 - startProcessRollBack() { - const json = Object.assign(this.dataForm, this.roleForm); + startProcessRollBack(roleForm) { + const json = Object.assign(this.dataForm, roleForm); json.commentText = this.commentText + let query = { + form: json, + commentText: this.commentText + } this.$http.post('lawss/activiti/startProcessRollBack', { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '29', - json: JSON.stringify({ - form: json, - roleForm: this.roleForm, - commentText: this.commentText - }) + json: JSON.stringify(query) }, {_this: this}, res => { if (res.ok) { - this.completeTask(res.data) + this.completeTask(res.data, query) } else { this.$message.warning('流程启动失败') this.isSubmit = false @@ -548,11 +578,9 @@ }) }, //提交流程 - completeTask(taskId) { - const json = Object.assign(this.dataForm, this.roleForm); - json.commentText = this.commentText + completeTask(taskId, query) { this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), + json: JSON.stringify(query), taskId: taskId || this.taskId, userId: this.$store.getters.userInfo.userId }, {_this: this}, res => { @@ -641,6 +669,27 @@ this.dataForm.zrdwUserName = '' this.dataForm = {...this.dataForm} }, + getData() { + return new Promise((resolve, reject) => { + inboundLiaisonDetail({ + taskIds: this.$route.query.taskIds, + pId: this.$route.query.prcId + }).then(res => { + if (res) { + const processForm = JSON.parse(res.mesg) + this.formProcessing(processForm) + } + }).catch(e => { + }); + }); + }, + formProcessing(row) { + this.dataForm = row + this.dataForm = {...this.dataForm} + if (this.showPersonnel) { + this.$refs.personnelInformationRef.getData(row) + } + }, } } diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 5d4758ca8..b875e6b86 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -1,2312 +1,2331 @@ - - - - - - - - - - - - - - - - - 查询 - 清空 - + + + + + + + + + + + + + + + + + 查询 + + 清空 + + + + + + - - - - - - - + + - - - - - {{ scope.row.prcNum }} - - - - - {{ getPrcName(scope.row.prcType,scope.row.taskInfo) }} - - - - - {{ getPrcNameFilter(scope.row) }} - - - - - - - {{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }} - - - - - - - - - - 办理 - 转办 - - - - - - - - - - 数据获取中 + @selection-change="handleSelectionChange"> + + + + + {{ scope.row.prcNum }} + + + + + {{ getPrcName(scope.row.prcType,scope.row.taskInfo) }} + + + + + {{ getPrcNameFilter(scope.row) + }} + + + + + + + {{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }} + + + + + + + + + + 办理 + + 转办 + + + + + + + + + + + 数据获取中 - - + + + -