From 485e4e0ec20bfcda92326f9e170dd488126a58fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 18 Nov 2021 16:28:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE=E8=AE=A2?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbfz/step1.vue | 6 +- .../qbzxdjhgk/component/cancel.vue | 10 + .../qbzxdjhgk/component/delay.vue | 10 + .../qbzxdjhgk/component/establish.vue | 10 + .../qbzxdjhgk/component/merge.vue | 11 + .../qbzxdjhgk/component/rename.vue | 10 + .../pages/creatProcess/qbzxdjhgk/step1.vue | 368 ++++++++++++++---- .../tabComponents/processCenter/index.vue | 11 + .../tabComponents/taskDraft/index.vue | 22 ++ 9 files changed, 376 insertions(+), 82 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue index 93f144a02..3df3dc672 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue @@ -459,9 +459,11 @@ export default { queryTaskFirst({ bpnId: this.$route.query.bpnId }).then(res => { + console.log(res.mes); let mes = JSON.parse(res.mes) this.roleForm = mes.roleForm - this.standardSearch = mes.standardSearch + this.standardSearch = mes.qbfsForm + this.standShow = true this.commentText = mes.commentText }); }, @@ -567,7 +569,7 @@ export default { _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.userName) - _formData.append('prcType', '23') + _formData.append('prcType', '24') _formData.append('json', JSON.stringify({ roleForm: this.roleForm, qbfsForm: this.standardSearch, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index f4c7b265a..33ecbeebf 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -243,6 +243,7 @@ export default { components: { ProcessTitle }, + props: ['message'], data(){ return{ formRules: { @@ -276,6 +277,15 @@ export default { } }, + watch:{ + message: { + immediate: true, + deep: true, + handler(val) { + this.qbfsForm = val + } + } + }, methods: { validateForm () { let flag = null diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index c7bb5d770..306985a27 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -259,6 +259,7 @@ export default { components: { ProcessTitle }, + props: ['message'], data(){ return{ formRules: { @@ -298,6 +299,15 @@ export default { } }, + watch:{ + message: { + immediate: true, + deep: true, + handler(val) { + this.qbfsForm = val + } + } + }, methods: { validateForm () { let flag = null diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index c2dddc143..e21492e45 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -97,6 +97,7 @@ export default { components: { ProcessTitle }, + props: ['message'], data(){ return { qbfsForm: { @@ -148,6 +149,15 @@ export default { } }, + watch:{ + message: { + immediate: true, + deep: true, + handler(val) { + this.qbfsForm = val + } + } + }, methods: { validateForm () { let flag = null diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index ca9777f95..cc5897e1e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -307,6 +307,7 @@ export default { components: { ProcessTitle }, + props: ['message'], data(){ return { standShow: false, @@ -372,6 +373,16 @@ export default { }, mounted() { this.getStandDataBtn() + + }, + watch:{ + message: { + immediate: true, + deep: true, + handler(val) { + this.qbfsForm = val + } + } }, methods: { validateForm () { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index 0c85ac74d..cfb23dd2a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -250,6 +250,7 @@ export default { components: { ProcessTitle }, + props: ['message'], data(){ return{ formRules: { @@ -286,6 +287,15 @@ export default { } }, + watch:{ + message: { + immediate: true, + deep: true, + handler(val) { + this.qbfsForm = val + } + } + }, methods: { validateForm () { let flag = null diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index 4e6ff3250..2df447bac 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -6,7 +6,9 @@
基础信息
-
人员信息
+
审批历史
+
人员信息
+
@@ -20,16 +22,21 @@ - 合并 - 延期 - 取消 - 更名 - 立项 + 合并 + + 延期 + + 取消 + + 更名 + + 立项 + - +
@@ -56,9 +63,9 @@ :model="roleForm" :rules="roleFormRules" class="label-input-form"> - + - +

标准法规工程师

@@ -69,7 +76,7 @@ + :color="roleForm.dockUser ? '#66b1ff' : ''">

申请部门高级经理

@@ -83,7 +90,7 @@
+ :color="roleForm.countersigner ? '#66b1ff' : ''">

申请部门中心主任

@@ -97,7 +104,7 @@
+ :color="roleForm.examine ? '#66b1ff' : ''">

标准法规工作组组长

@@ -111,7 +118,7 @@
+ :color="roleForm.approver ? '#66b1ff' : ''">

标准法规部部长

@@ -125,7 +132,7 @@
+ :color="roleForm.engineer ? '#66b1ff' : ''">

标准法规部工程师

@@ -142,6 +149,73 @@
+
+
+ + + + + + + + + + + + + + + + + + + + + 流程列表加载中 +
+
+ { + this.detailData = res + }, e => { + }) }, - toggleComName(name){ - this.comName = name + getDatas(){ + queryTaskFirst({ + bpnId: this.$route.query.bpnId + }).then(res => { + let mes = JSON.parse(res.mes) + this.roleForm = mes.roleForm + this.qbfsForm = mes.qbfsForm + this.commentText = mes.commentText + }); }, - //流程保存 - handleSave(){ + 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.getFormFieldList(processForm); + } + }).catch(e => { + }); + }); + }, + /** + * @description: 动态表单读取 + */ + getFormFieldList(item) { + this.$nextTick(() => { + this.qbfsForm = item; + this.roleForm.dockUser = item.dockUser; + this.roleForm.dockUserName = item.dockUserName; + this.roleForm.countersigner = item.countersigner; + this.roleForm.countersignerName = item.countersignerName; + this.roleForm.approver = item.approver; + this.roleForm.approverName = item.approverName; + this.roleForm.engineer = item.engineer; + this.roleForm.engineerName = item.engineerName; + this.roleForm.examine = item.examine; + this.roleForm.examineName = item.examineName; + }); + }, + handleTabs(name) { + this.active = name; + }, + toggleComName(name) { + this.comName = name; + if(this.comName === 'merge'){ + this.$refs["childForm"].qbfsForm = '1' + }else if(this.comName === 'delay'){ + this.$refs["childForm"].qbfsForm.type = '2' + }else if(this.comName === 'cancel'){ + this.$refs["childForm"].qbfsForm.type = '3' + }else if(this.comName === 'rename'){ + this.$refs["childForm"].qbfsForm.type = '4' + }else if(this.comName === 'establish'){ + this.$refs["childForm"].qbfsForm.type = '5' + } }, + //流程保存 + handleSave() { + let qbzxdFrom = this.$refs["childForm"].qbfsForm; + this.saveLoading = true + let _formData = new FormData() + _formData.append('id', this.bpnId || '') + _formData.append('createUser', this.$store.getters.userInfo.userId) + _formData.append('createUserName', this.$store.getters.userInfo.userName) + _formData.append('prcType', '25') + _formData.append('json', JSON.stringify({ + roleForm: this.roleForm, + qbfsForm: qbzxdFrom, + commentText: this.commentText + })) + saveTaskFirst(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) + }, //流程提交 - handleSubmit(){ - let flag = this.$refs['childForm'].validateForm() - let qbzxdFrom = this.$refs["childForm"].qbfsForm - if(flag){ - this.$refs['roleForm'].validate((valid) => { - if(valid){ - this.isSubmit = true - var json = Object.assign(qbzxdFrom, this.roleForm) - this.$http.get('lawss/activiti/startProcess', {type: '25'}, { - _this: this - }, res => { - if (res.ok) { - this.$http.post('lawss/activiti/completeTask', { - taskIds: res.data, - userId : this.$store.getters.userInfo.userId, - json: JSON.stringify(json) - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message) - this.isSubmit = false - this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) - } - }) - } - }) - }else{ - this.$message.warning('请完善人员信息') - } - }) - }else{ - this.$message.warning('请完善基础信息') - } + handleSubmit() { + if (this.$route.query.prcNum === undefined) { + let flag = this.$refs["childForm"].validateForm(); + let qbzxdFrom = this.$refs["childForm"].qbfsForm; + if (flag) { + this.$refs["roleForm"].validate((valid) => { + if (valid) { + this.isSubmit = true; + var json = Object.assign(qbzxdFrom, this.roleForm); + this.$http.get("lawss/activiti/startProcess", { type: "25" }, { + _this: this + }, res => { + if (res.ok) { + this.$http.post("lawss/activiti/completeTask", { + taskIds: res.data, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.isSubmit = false; + this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); + } + }); + } + }); + } else { + this.$message.warning("请完善人员信息"); + } + }); + } else { + this.$message.warning("请完善基础信息"); + } + } else { + let flag = this.$refs["childForm"].validateForm(); + let qbzxdFrom = this.$refs["childForm"].qbfsForm; + if (flag) { + this.$refs["roleForm"].validate((valid) => { + if (valid) { + this.isSubmit = true; + var json = Object.assign(qbzxdFrom, this.roleForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.isSubmit = false; + this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); + } + }); + } else { + this.$message.warning("请完善人员信息"); + } + }); + } else { + this.$message.warning("请完善基础信息"); + } + } + }, // 流程阶段负责人选择 @@ -282,17 +490,17 @@ export default { this.drawerTitle = title; this.modalshowflag = true; }, - checkedRole (data) { + checkedRole(data) { if (this.type === "dockUser") { this.roleForm.dockUser = data[0].id; this.roleForm.dockUserName = data[0].name; - }else if(this.type === 'examine'){ + } else if (this.type === "examine") { this.roleForm.examine = data[0].id; this.roleForm.examineName = data[0].name; - }else if(this.type === 'approver'){ + } else if (this.type === "approver") { this.roleForm.approver = data[0].id; this.roleForm.approverName = data[0].name; - }else if(this.type === 'engineer'){ + } else if (this.type === "engineer") { this.roleForm.engineer = data[0].id; this.roleForm.engineerName = data[0].name; } @@ -318,8 +526,8 @@ export default { }); this.roleForm.countersigner = idList; this.roleForm.countersignerName = nameList; - }, - }, + } + } }; diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 3c3adaadb..4a0427751 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -1685,6 +1685,17 @@ export default { prcType: row.prcType } }) + }else if(row.taskInfo === '企标制修订计划整改') { + this.$router.push({ + name: 'qbzxdjhgkStep1', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } break } diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index cf29d268f..77b36d8f9 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -539,6 +539,28 @@ export default { } }) break + //企标废止 + case '24': + this.$router.push({ + name: 'qbfzStep1', + query: { + type: '24', + processName: '企标废止流程', + bpnId: id + } + }) + break + //企标制修订计划管控 + case '25': + this.$router.push({ + name: 'qbzxdjhgkStep1', + query: { + type: '25', + processName: '企标制修订计划管控', + bpnId: id + } + }) + break } }, ...mapMutations(['setProcess', 'setHandleInfo']),