From ea18ed54c161719a6fd2d09499adbeb1a1656eb0 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Tue, 7 Dec 2021 13:25:00 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=8D=89=E7=A8=BF=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/process.js | 9 +++ .../pages/creatProcess/bzhHd-rh/step2.vue | 3 + .../pages/creatProcess/bzhHd-rh/step4.vue | 3 + .../pages/creatProcess/bzhHd-rh/step6.vue | 5 ++ .../pages/creatProcess/bzhHh-hh/step2.vue | 3 + .../pages/creatProcess/bzhHy-ch/step2.vue | 3 + .../pages/creatProcess/bzhHy-ch/step4.vue | 3 + .../pages/creatProcess/bzhHy-ch/step6.vue | 5 ++ .../pages/creatProcess/wfhxzg/step3.vue | 3 - .../pages/creatProcess/wfhxzg/step5.vue | 3 + .../pages/phone/wfhxzg/step5.vue | 5 +- .../tabComponents/taskDraft/index.vue | 48 ++++++++++++- src/router/index.js | 70 +++++++++++++++++++ 13 files changed, 155 insertions(+), 8 deletions(-) diff --git a/src/api/process.js b/src/api/process.js index cfab0cb4e..683f86681 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -137,6 +137,15 @@ export function queryTaskFirst (data) { params: data }) } + +// 草稿删除 +export function taskDel (data) { + return axios({ + url: '/api/lawss/activiti/delCG', + method: 'post', + params: data + }) +} // 整改流程 详情查询nonconformity export function getNonconformity (data) { return axios({ diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index cb3106e91..1082a588c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -269,6 +269,9 @@ export default { this.getData() }, methods: { + phoneClick () { + this.$router.push('/phoneBzrhStep2') + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue index 593e411dc..a306f33cf 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue @@ -292,6 +292,9 @@ export default { this.getData() }, methods: { + phoneClick () { + this.$router.push('/phoneBzrhStep4') + }, // 右上标签页面切换 handleTabs(name) { this.active = name diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue index 51673820e..834b8905c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue @@ -303,6 +303,11 @@ export default { this.getData() }, methods: { + phoneClick () { + if (this.taskInfo !== '标准法规工程师汇总修订完毕') { + this.$router.push('/phoneBzrhStep6') + } + }, // 右上标签页面切换 handleTabs(name) { this.active = name diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue index aac1c3c67..de46ff5d8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue @@ -274,6 +274,9 @@ export default { this.getData() }, methods: { + phoneClick () { + this.$router.push('/phoneBzhhStep2') + }, // 右上标签页面切换 handleTabs(name) { this.active = name diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue index df261c830..1a8d9166d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue @@ -241,6 +241,9 @@ export default { this.getData() }, methods: { + phoneClick () { + this.$router.push('/phoneBzchStep2') + }, // 右上标签页面切换 handleTabs(name) { this.active = name diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue index 40e385017..5b07fb850 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue @@ -246,6 +246,9 @@ export default { this.getData() }, methods: { + phoneClick () { + this.$router.push('/phoneBzchStep4') + }, // 右上标签页面切换 handleTabs(name) { this.active = name diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue index a11847ce6..c2daaa0c5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue @@ -260,6 +260,11 @@ export default { this.getData() }, methods: { + phoneClick () { + if (this.taskInfo !== '标准法规工程师修订完毕') { + this.$router.push('/phoneBzchStep6') + } + }, // 右上标签页面切换 handleTabs(name) { this.active = name diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index 1d18d8aea..10dd1a94b 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -235,9 +235,6 @@ export default { } }, methods: { - phoneClick () { - this.$router.push('/phoneWfhxStep4') - }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 3f6afc40c..b27f634d1 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -225,6 +225,9 @@ export default { } }, methods: { + phoneClick () { + this.$router.push('/phoneWfhxStep5') + }, queryFile(row) { this.fileTextList = row.fileText this.fileMadel = true diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue index 2dd643d0f..b438e87c6 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue @@ -63,7 +63,7 @@
-
+
清空 + 删除
@@ -115,16 +116,17 @@ {{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }} - + @@ -144,6 +146,7 @@ + + + diff --git a/src/pages/processCenter/pages/phone/xmpg/step2.vue b/src/pages/processCenter/pages/phone/xmpg/step2.vue new file mode 100644 index 000000000..9edcfa4a0 --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmpg/step2.vue @@ -0,0 +1,575 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/xmpg/step5.vue b/src/pages/processCenter/pages/phone/xmpg/step5.vue new file mode 100644 index 000000000..d55f74197 --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmpg/step5.vue @@ -0,0 +1,679 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/xmpg/step6.vue b/src/pages/processCenter/pages/phone/xmpg/step6.vue new file mode 100644 index 000000000..4f758a8dc --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmpg/step6.vue @@ -0,0 +1,666 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/xmpg/step7.vue b/src/pages/processCenter/pages/phone/xmpg/step7.vue new file mode 100644 index 000000000..f489f7fb1 --- /dev/null +++ b/src/pages/processCenter/pages/phone/xmpg/step7.vue @@ -0,0 +1,662 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 4b0b17c49..dfdcc7173 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1984,6 +1984,56 @@ const routes = [ title: '标准解读流程' } }, + { + path: '/phoneBzqdfbStep4', + name: 'phoneBzqdfbStep4', + component: () => import('@/pages/processCenter/pages/phone/bzqdfb/step4.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '标准清单发布/更新流程' + } + }, + { + path: '/phoneXmpgStep2', + name: 'phoneXmpgStep2', + component: () => import('@/pages/processCenter/pages/phone/xmpg/step2.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '标准合规评估流程' + } + }, + { + path: '/phoneXmpgStep5', + name: 'phoneXmpgStep5', + component: () => import('@/pages/processCenter/pages/phone/xmpg/step5.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '标准合规评估流程' + } + }, + { + path: '/phoneXmpgStep6', + name: 'phoneXmpgStep6', + component: () => import('@/pages/processCenter/pages/phone/xmpg/step6.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '标准合规评估流程' + } + }, + { + path: '/phoneXmpgStep7', + name: 'phoneXmpgStep7', + component: () => import('@/pages/processCenter/pages/phone/xmpg/step7.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '标准合规评估流程' + } + }, { path: '/phoneWfhxStep5', name: 'phoneWfhxStep5', From 4b8686678ba3c6647437124a6bc9d31413f581b9 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Tue, 7 Dec 2021 14:22:55 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=8D=89=E7=A8=BF=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/processList/tabComponents/taskDraft/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index bdcc58f52..bc316dd0b 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -184,7 +184,7 @@ export default { size: parseInt(this.$store.getters.userInfo.configContent), userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId, prcName: this.searchForm.prcName, - prcType: parseInt(this.searchForm.prcType) || '' + prcType: this.searchForm.prcType }, { loading: 'loading',