From 9842ce41c0cc7a235ce195a6afc3c8a88dd79160 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, 28 Oct 2021 17:54:46 +0800 Subject: [PATCH] commit --- .../pages/creatProcess/cywbbzzxd/step1.vue | 420 ++++------- .../pages/creatProcess/cywbbzzxd/step3.vue | 419 +++++++++++ .../pages/creatProcess/jrbzhxh/step2.vue | 209 +++++- .../pages/creatProcess/jrbzhxh/step3.vue | 678 ++++++++++++++++++ .../pages/creatProcess/jrbzhxh/step4.vue | 678 ++++++++++++++++++ .../pages/creatProcess/wbsm/step1.vue | 373 +++++++++- .../pages/creatProcess/wbsm/step2.vue | 99 ++- .../tabComponents/processCenter/index.vue | 37 +- src/router/index.js | 27 + 9 files changed, 2562 insertions(+), 378 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue create mode 100644 src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue create mode 100644 src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue index 80f0fab34..18e8c2297 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue @@ -1,192 +1,78 @@ - + @@ -188,6 +196,7 @@ export default { isSubmit: false, saveLoading: false, turnLoading: false, + drawerModal: false, dataList: [], endDataList: [], lastDataList: [], @@ -240,6 +249,26 @@ export default { } }, methods: { + //确认转办 + checkedTransferRole (data) { + this.assigneeNewLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 + pId: this.$route.query.prcId // 流程实例 + }).then(res => { + this.isTransfer = false + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.$router.push("/processCenter"); + this.processNum() + } else { + this.$message.warning(res.message) + } + }) + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -326,51 +355,17 @@ export default { }, // 提交按钮 handleSubmit() { - this.isSubmit = true - let zqa = new Map(); - for (let lastDataListElement of this.dataList) { - let a = zqa.get(lastDataListElement.dutyPeopleInfoId) - if( a == null){ - a = { - id: lastDataListElement.dutyPeopleInfoId, - name: lastDataListElement.dutyPeopleInfo, - standardInfoList: [] - } - } - a.standardInfoList.push(lastDataListElement); - zqa.set(a.id, a); - } - let list = []; - for(let item of zqa) { - list.push(item[1]) - } - let json = { - dockUserList: list, - passInfo: this.passInfo - } - let flag=false - this.dataList.forEach(item => { - if (item.dutyPeopleInfo === '') { - flag=true - this.isSubmit = false - } - }) - if(flag)return this.$message.warning('请选择分发负责人填入') - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskIds', this.taskIds) - completeTask(params).then(res => { - if(res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }).catch(e => { - this.isSubmit = false - }) }, + //驳回按钮 + beforeBack(){ + }, + //转办按钮 + handleTransfer(){ + this.drawerModal = true + this.drawerTitle = '转办处理人' + this.selectPeople = row + }, // 流程阶段负责人选择 choiceZRR (type, title, id) { this.nodeList = [] diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 2b370b569..9ab14f7cf 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -870,7 +870,8 @@ export default { } break case '15': - if (row.taskInfo === '备案任务下发') { + //加入标准化协会信息备案流程 + if (row.taskInfo === '填写入会信息') { this.$router.push({ name: 'jrbzhxhStep2', query: { @@ -881,19 +882,29 @@ export default { prcType: row.prcType } }) + } else if(row.taskInfo === '标准法规工程师审核'){ + this.$router.push({ + name: 'jrbzhxhStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if(row.taskInfo === '标准法规部部长批准'){ + this.$router.push({ + name: 'jrbzhxhStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } - // else if(row.taskInfo === '标准法规部经理审批'){ - // this.$router.push({ - // name: 'xmqdqrStep3', - // query: { - // taskIds: row.taskIds, - // prcId: row.prcId, - // prcNum: row.prcNum, - // prcName: row.prcName, - // prcType: row.prcType - // } - // }) - // } break // 外部标准化协会入会流程 case '20': diff --git a/src/router/index.js b/src/router/index.js index 44d9e2022..7fe4f3114 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1105,6 +1105,15 @@ const routes = [ title: '参与外部标准制修订信息提报流程' } }, + { + path: '/cywbbzzxdStep3', + name: 'cywbbzzxdStep3', + component: () => import('@/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue'), + meta: { + requireAuth: true, + title: '参与外部标准制修订信息提报流程' + } + }, { path: '/jrbzhxhStep1', name: 'jrbzhxhStep1', @@ -1114,6 +1123,24 @@ const routes = [ title: '加入标准化协会信息提报流程' } }, + { + path: '/jrbzhxhStep3', + name: 'jrbzhxhStep3', + component: () => import('@/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue'), + meta: { + requireAuth: true, + title: '加入标准化协会信息提报流程' + } + }, + { + path: '/jrbzhxhStep4', + name: 'jrbzhxhStep4', + component: () => import('@/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue'), + meta: { + requireAuth: true, + title: '加入标准化协会信息提报流程' + } + }, { path: '/jrbzhxhStep2', name: 'jrbzhxhStep2',