From 9507b5157ac3dd2b3c50e76a15a4e1cc6344c71d 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, 22 Jul 2021 21:10:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step3.vue | 35 -- .../pages/creatProcess/xmpg2/step3.vue | 182 ++++--- .../pages/creatProcess/xmpg2/step4.vue | 457 +++++++++++++++++- .../pages/creatProcess/xmpg2/step5.vue | 456 ++++++++++++++++- .../tabComponents/processCenter/index.vue | 44 ++ 5 files changed, 1058 insertions(+), 116 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 22b171a3f..5965a188a 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -124,45 +124,10 @@ {{ listForm.breakdownList[scope.$index].implementer == null ? "请选择落实人" : listForm.breakdownList[scope.$index].implementer }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
@@ -34,10 +34,18 @@ clearable > + + + - + + + @@ -77,75 +89,14 @@ {{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }} - - - - - - - - - - - - - -
-
- - -
- - -
- - -
@@ -215,15 +166,22 @@
+ + @@ -248,16 +206,34 @@ export default { processType: 1, isSubmit: false, saveLoading: false, + showColumn: true, + drawerTitle: "", //drawer标题 + modalshowflag: false, // drawer开关 + selectList: [], + treeData: [], // 人员数据 + roleForm: { + jgUser: "" + }, + nodeList: [], + defaultProps: { + children: "children", + label: "name" + }, //表单的数据 listForm: { projectNumber: "", //项目编号 projectName: "", //项目名称 + jgUser: "", //架构经理 dataList: [], //项目下的标准数据 breakdownList: [] //标准下的分解单数据 + }, dataList: [], //展示的标准数据 commentText: "", //审批意见 - detailData: [] //流程历史数据 + detailData: [], //流程历史数据 + userId: this.$store.getters.userInfo.userId, + taskIds: this.$route.query.taskIds, + pId: this.$route.query.prcId }; }, methods: { @@ -307,16 +283,71 @@ export default { this.listForm.breakdownList = item.breakdownList; }); }, - //驳回事件 - beforeBack() { + //保存事件 + handleSave() { }, //提交事件 handleSubmit() { - + if (this.listForm.jgUser == null || this.listForm.jgUser == undefined ) { + this.$message.warning("请选择架构经理"); + } else { + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + console.log(json); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }, e => { + }); + } }, + choiceZRR(scope, type, title, id) { + if (scope != null) { + this.dsadadadsada = scope.$index; + } + this.nodeList = []; + this.nodeList.push(id); + this.type = type; + this.drawerTitle = title; + this.modalshowflag = true; + }, + //标准表格选择框改变 + selectStandChange(data) { + this.selectList = data; + }, + getTree() { + this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => { + this.treeData = res.data; + }); + }, + drawerCheck(data) { + var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); + if (getlist.length == 1) { + this.roleRow = getlist[0]; + } else { + this.$refs.tree.setCheckedKeys([data.id]); + this.roleRow = this.$refs.tree.getCheckedNodes()[0]; + } + }, + checkedRole(data) { + if (this.type === "jgUser") { + this.listForm.jgUserId = data[0].id; + this.listForm.jgUser = data[0].name; + } + }, + cancleUserInfo() { + this.modalshowflag = false; + } }, - computed: { listNoDataText() { return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; @@ -325,6 +356,7 @@ export default { mounted() { this.processTable(); this.getData(); + this.getTree(); } }; @@ -332,7 +364,7 @@ export default { + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index aadb150b8..21631e4b2 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -1,13 +1,463 @@ - + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 1e44638e8..64152b927 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -556,6 +556,50 @@ export default { prcType: row.prcType } }) + }else if(row.taskInfo === '工程经理转办'){ + this.$router.push({ + name: 'xmpg2Step3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '架构经理任务分发') { + this.$router.push({ + name: 'xmpg2Step4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '分发责任人下发') { + this.$router.push({ + name: 'xmpg2Step5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '合规性评估') { + this.$router.push({ + name: 'xmpg2Step6', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } break //未符合项整改流程