From 3cbb0111a0c4f2c184eadf7ee2cb470a5704970d Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 15 Jul 2021 15:19:22 +0800 Subject: [PATCH] commit --- .../pages/creatProcess/bzjd/step1.vue | 185 +++++++++++++----- .../pages/creatProcess/bzjd/step4.vue | 13 ++ .../pages/creatProcess/bzjd/step5.vue | 13 ++ .../pages/creatProcess/bzjd/step6.vue | 13 ++ .../tabComponents/processCenter/index.vue | 33 ++++ src/router/index.js | 27 +++ 6 files changed, 234 insertions(+), 50 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/bzjd/step4.vue create mode 100644 src/pages/processCenter/pages/creatProcess/bzjd/step5.vue create mode 100644 src/pages/processCenter/pages/creatProcess/bzjd/step6.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index fe16bf313..194ae0752 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -10,7 +10,7 @@
人员信息
-
+
+ + + +
+ 批量编辑 +
+ + + + + + + + + + + + + 数据获取中
@@ -82,21 +128,6 @@ - - - -

对接部门责任人

-
- - - -
- - - @@ -126,7 +157,7 @@ > { deposit.set(item.id, item); @@ -427,9 +462,13 @@ _this: this }, res => { if (res.ok) { + res.data.list.forEach(item => { + item.zrUserId = '' + item.zrUserIdName= '' + }) this.itemList = res.data.list - console.log(res); } + this.loading = false }) } else if (this.selectedList.length > 1) { this.$message.warning("只能选择一条数据进行带入"); @@ -470,12 +509,37 @@ this.roleRow = this.$refs.tree.getCheckedNodes()[0] } }, - choiceZRRS () { - this.nodeList2 = [] - if ( this.roleForm.zrUserId.length > 0) { - this.nodeList2 = this.roleForm.zrUserId.split(',') + drawerCheck2 (data) { + var getlist = this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()); + if(getlist.length == 1) { + this.roleRow = getlist[0] + }else { + this.$refs.tree2.setCheckedKeys([data.id]); + this.roleRow = this.$refs.tree2.getCheckedNodes()[0] + } + }, + handleSelectionChange (val) { + this.zrIdList = [] + val.forEach( item => { + this.zrIdList.push(item.id) + }) + }, + choiceZRRS (row, type, index) { + if (type === 1) { + this.zrIndex= index + this.zrType = type + this.nodeList2.push(row) + this.modalshowflag2 = true + } else { + // 批量 + if (this.zrIdList.length > 0) { + this.zrType = type + this.nodeList2 = [] + this.modalshowflag2 = true + } else { + this.$message.warning('请选择要编辑的数据') + } } - this.modalshowflag2 = true }, saveUserInfo2 () { var idList = '' @@ -488,8 +552,19 @@ idList += item.id nameList += item.name }) - this.roleForm.zrUserId = idList - this.roleForm.zrUserIdName = nameList + if (this.zrType == 1) { + this.itemList[this.zrIndex].zrUserId = idList + this.itemList[this.zrIndex].zrUserIdName = nameList + } else { + this.itemList.forEach( item => { + this.zrIdList.forEach( items => { + if (item.id === items) { + item.zrUserId = idList + item.zrUserIdName = nameList + } + }) + }) + } this.modalshowflag2 = false }, cancleUserInfo2 () { @@ -504,28 +579,38 @@ if (valid) { this.$refs['Form'].validate((valid) => { if (valid) { - this.$http.get('lawss/activiti/startProcess', { - type: '9' - }, {}, res => { - if (res.ok) { - var json = Object.assign(this.form, this.roleForm) - json.commentText = this.commentText - json.standInData = this.standId - json.itemList = this.itemList - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskId: res.data, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - if (res.success) { - this.$message.success('流程发起成功') - this.$router.push('/processCenter') - } - }) - } else { - this.$message.warning('流程启动失败') + let b = 0 + for (let a = 0; a < this.itemList.length; a++) { + if (!this.itemList[a].zrUserId) { + b++ } - }) + } + if (b > 0) { + this.$message.warning('请选择责任人') + } else { + this.$http.get('lawss/activiti/startProcess', { + type: '9' + }, {}, res => { + if (res.ok) { + var json = Object.assign(this.form, this.roleForm) + json.commentText = this.commentText + json.standInData = this.standId + json.itemList = this.itemList + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: res.data, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.success) { + this.$message.success('流程发起成功') + this.$router.push('/processCenter') + } + }) + } else { + this.$message.warning('流程启动失败') + } + }) + } } else { return this.$message.warning('请完善人员信息') } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue new file mode 100644 index 000000000..51fa5d16e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue new file mode 100644 index 000000000..e5703d7c0 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue new file mode 100644 index 000000000..15b0a36dd --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 5d55a3700..72f598fcc 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -613,6 +613,39 @@ export default { prcType: row.prcType } }) + } else if (row.taskInfo === '4') { + this.$router.push({ + name: 'bzjdStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '5') { + this.$router.push({ + name: 'bzjdStep5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '6') { + this.$router.push({ + name: 'bzjdStep6', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } } }, diff --git a/src/router/index.js b/src/router/index.js index 4fdfc96b2..4ab6e1b9d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -618,6 +618,33 @@ const routes = [ title: '标准解读流程' } }, + { + path: '/bzjdStep4', + name: 'bzjdStep4', + component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step4.vue'), + meta: { + requireAuth: true, + title: '标准解读流程' + } + }, + { + path: '/bzjdStep5', + name: 'bzjdStep5', + component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step5.vue'), + meta: { + requireAuth: true, + title: '标准解读流程' + } + }, + { + path: '/bzjdStep6', + name: 'bzjdStep6', + component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step6.vue'), + meta: { + requireAuth: true, + title: '标准解读流程' + } + }, ] }, // 本地工具