From 7002d1cc5b5a6582f5ac163d476bc59df49b55e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 31 Aug 2021 15:18:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9bug=E5=8F=8A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmqdqr/step1-1.vue | 780 ++++++++++++++++++ .../pages/creatProcess/xmqdqr/step1-2.vue | 741 +++++++++++++++++ .../pages/creatProcess/xmqdqr/step1.vue | 33 +- .../pages/processDetail/index.vue | 3 + .../tabComponents/taskDraft/index.vue | 10 + src/router/index.js | 18 + 6 files changed, 1574 insertions(+), 11 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue create mode 100644 src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue new file mode 100644 index 000000000..daf6f0784 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue @@ -0,0 +1,780 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue new file mode 100644 index 000000000..e9c4a5451 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue @@ -0,0 +1,741 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index 628214c8b..2b8fd94e8 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -232,11 +232,20 @@
- - + + placeholder="请选择" + filterable + size="small" + > + + { this.ProjectDatas = res.data.total.records; this.total = res.data.total.total; + this.page = 1; }, e => { }); @@ -530,6 +540,7 @@ export default { } else { this.qdform.detailedListName = this.selectedList[0].detailedListName; this.qdform.detailedListId = this.selectedList[0].id; + this.qdform.detailedListVision = this.selectedList[0].detailedListVision; this.detailedListModel = false; } }, @@ -578,14 +589,14 @@ export default { }, //提交事件 handleSubmit() { - this.qdform.commentText = this.commentText + this.qdform.commentText = this.commentText; var json = Object.assign(this.qdform, this.roleForm); this.$refs["qdqrForm"].validate((valid) => { if (valid) { this.$refs["Form"].validate((valid) => { if (valid) { - this.isSubmit = true - this.$http.get("lawss/activiti/startProcess", {type: "10"}, { + this.isSubmit = true; + this.$http.get("lawss/activiti/startProcess", { type: "10" }, { _this: this }, res => { if (res.ok) { @@ -600,7 +611,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } - this.isSubmit = false + this.isSubmit = false; }); } }); @@ -622,7 +633,7 @@ export default { _formData.append("createUserName", this.$store.getters.userInfo.userName); _formData.append("prcType", "10"); _formData.append("json", JSON.stringify({ - taskInfo: '确认人确认', + taskInfo: "确认人确认", form: this.qdform, roleForm: this.roleForm, commentText: this.commentText @@ -634,7 +645,7 @@ export default { }).catch(e => { this.saveLoading = false; }); - }, + } }, mounted() { // 查询各下拉框数据 diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 5dabf5193..f450ea977 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -228,6 +228,9 @@ export default { }else if(prcType === '3'){ //标准征求意见 this.toProcessDetail('bzzqyjStep1-9',row) + }else if(prcType === '10'){ + //项目清单确认 + this.toProcessDetail('xmqdqrStep1-2',row) } } else { this.$message.warning('当前流程未全部办理完成,无法查看') diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 1826a1a9b..d549fffd8 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -345,6 +345,16 @@ export default { } }) break + case '10': + this.$router.push({ + name: 'xmqdqrStep1-1', + query: { + type: '10', + processName: '项目清单确认流程', + bpnId: id + } + }) + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/router/index.js b/src/router/index.js index c5f00b910..a5808bd79 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -547,6 +547,24 @@ const routes = [ title: '项目清单确认流程' } }, + { + path: '/xmqdqrStep1-1', + name: 'xmqdqrStep1-1', + component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue'), + meta: { + requireAuth: true, + title: '项目清单确认流程' + } + }, + { + path: '/xmqdqrStep1-2', + name: 'xmqdqrStep1-2', + component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue'), + meta: { + requireAuth: true, + title: '项目清单确认流程' + } + }, { path: '/wfhxzgStep1', name: 'wfhxzgStep1',