From 99d49f3ccd8d4ec43af37238bc3fb7b8772f63e2 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 5 Jul 2021 17:59:07 +0800 Subject: [PATCH 1/2] commit --- .../pages/creatProcess/bzdy/step1.vue | 48 +- .../pages/creatProcess/bzdy/step2.vue | 425 ++++++++++++++++++ .../tabComponents/processCenter/index.vue | 13 + src/router/index.js | 9 + 4 files changed, 483 insertions(+), 12 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/bzdy/step2.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index 4cab4e89a..b7e672553 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -7,9 +7,9 @@
基础信息
-
流程信息
+
人员信息
-
+
-->
-
+
{ + this.$refs['qbkwForm'].validate((valid) => { if (valid) { - alert('submit!'); + this.$refs['Form'].validate((valid) => { + if (valid) { + this.$http.get('lawss/activiti/startProcess', { + type: '2' + }, {}, res => { + if (res.ok) { + var json = Object.assign(this.form, this.roleForm) + 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('请完善人员信息') + } + }) } else { - return false; + return this.$message.warning('请完善基础信息') } }) } diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue new file mode 100644 index 000000000..180bdbf29 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue @@ -0,0 +1,425 @@ + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index be0c0448a..5abc3d700 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -252,6 +252,19 @@ export default { } }) } + case '2': + if (row.taskInfo === '责任对接人选择责任人') { + this.$router.push({ + name: 'bzdyStep2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/router/index.js b/src/router/index.js index 95bc69384..263a31742 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -312,6 +312,15 @@ const routes = [ title: '标准调研流程' } }, + { + path: '/bzdyStep2', + name: 'bzdyStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step2.vue'), + meta: { + requireAuth: true, + title: '标准调研流程' + } + }, { path: '/zqyjStep1', name: 'zqyjStep1', From c1d16d1bfdbd748a429565ddb4f8d19951ee969d Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 6 Jul 2021 21:02:00 +0800 Subject: [PATCH 2/2] commit --- .../pages/creatProcess/bzdy/step1.vue | 33 +- .../pages/creatProcess/bzdy/step2.vue | 244 +++------------ .../pages/creatProcess/bzdy/step3.vue | 295 ++++++++++++++++++ .../tabComponents/processCenter/index.vue | 11 + src/router/index.js | 9 + 5 files changed, 367 insertions(+), 225 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/bzdy/step3.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index b7e672553..99dc9fd75 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -56,21 +56,6 @@
-
- - - - - - - - - - - - - -
@@ -156,8 +141,8 @@ size="800px"> -
+
- +
基础信息
-
人员信息
@@ -26,6 +25,7 @@ @@ -51,94 +52,19 @@
+ + + +
-
- - - - - - - - - - - - - -
-
-
-
- - - - - -

流程发起人

-
- - -
- - - - - - -

责任部门对接人

-
- - - -
- - - - - - -

标准法规部部长

-
- - -
- - - - - - -

技术管理中心主任

-
- - -
- - - - - - -

工程研究总院院长

-
- - -
- - - - - -
{ + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.name + }) + this.form.responUserList = idList + this.form.responUserListName = nameList this.modalshowflag = false }, cancleUserInfo () { this.modalshowflag = false }, - 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] - } - }, - choiceZRR (type, title, id) { + choiceZRR () { this.nodeList = [] - this.nodeList.push(id) - this.type = type - this.drawerTitle = title + if (this.form.responUserList.length > 0) { + this.nodeList = this.form.responUserList.split(',') + } this.modalshowflag = true }, getTree () { @@ -297,20 +181,6 @@ this.treeData = res.data }) }, - closeDrawer() { - this.ListModel = false - }, - OkDrawer() { - this.ListModel = false - var item = { - remarks: '123' - } - this.data.push(item) - }, - addList() { - this.title = '新增标准' - this.ListModel = true - }, handleTabs(name) { this.active = name }, @@ -318,29 +188,17 @@ handleSubmit() { this.$refs['qbkwForm'].validate((valid) => { if (valid) { - this.$refs['Form'].validate((valid) => { - if (valid) { - this.$http.get('lawss/activiti/startProcess', { - type: '2' - }, {}, res => { - if (res.ok) { - var json = Object.assign(this.form, this.roleForm) - 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('请完善人员信息') + var json = this.json + json.responUserList = this.form.responUserList + json.responUserListName = this.form.responUserListName + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: this.taskIds, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.success) { + this.$message.success('提交成功') + this.$router.push('/processCenter') } }) } else { @@ -354,10 +212,10 @@ taskIds: this.taskIds, pId: this.pId }).then(res => { - console.log(res); - if (res) { - console.log(res); - } + let data = JSON.parse(res.mesg) + this.form.title = data.title + this.form.date = data.date + this.json = data }).catch(e => { }) }) @@ -372,7 +230,7 @@ diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 15557acd0..e29bc1cb6 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -264,6 +264,17 @@ export default { prcType: row.prcType } }) + } else if (row.taskInfo === '责任人上传调研结果') { + this.$router.push({ + name: 'bzdyStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } break; case'3' : { diff --git a/src/router/index.js b/src/router/index.js index 133af8188..945686dfd 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -339,6 +339,15 @@ const routes = [ title: '标准调研流程' } }, + { + path: '/bzdyStep3', + name: 'bzdyStep3', + component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step3.vue'), + meta: { + requireAuth: true, + title: '标准调研流程' + } + }, { path: '/zqyjStep1', name: 'zqyjStep1',