@@ -56,7 +56,7 @@ import PersonInfo from "./components/PersonInfo";
import {saveTaskFirst, queryTaskFirst, taskDel} from "api/process";
export default {
- name: "ZrckStep1",
+ name: "zrckStep1",
components: {
ProcessHeader,
ProcessFooter,
@@ -290,7 +290,7 @@ export default {
_formData.append('prcType', 'laws1')
_formData.append('prcName', '政策入库流程')
_formData.append('json', JSON.stringify({
- taskInfo: '申请人发起',
+ taskInfo: '起草',
form: this.form,
roleForm: this.roleForm,
}))
@@ -329,14 +329,14 @@ export default {
if (res.success) {
this.$message.success(res.message)
this.footerLoading = false
- if (this.$route.query.bpnId !== '') {
- let taskId = {
- id: this.$route.query.bpnId
- }
+ // if (this.$route.query.bpnId !== '') {
+ // let taskId = {
+ // id: this.$route.query.bpnId
+ // }
// taskDel(taskId).then(res=>{
// return res
// })
- }
+ // }
// 流程提交之后,应该流转至待办任务页面
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
}
diff --git a/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/step2.vue b/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/step2.vue
new file mode 100644
index 000000000..a1026472f
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/hzwl-zcrk/step2.vue
@@ -0,0 +1,475 @@
+
+
+
+ 政策入库流程
+ 批准
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index aa9994893..5d4758ca8 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -491,29 +491,45 @@ export default {
}
break
case 'laws1':
- if (row.taskInfo === '政策入库审批') {
- this.$router.push({
- name: 'zcrkStep2',
- query: {
- taskIds: row.taskIds,
- prcId: row.prcId,
- prcNum: row.prcNum,
- prcName: row.prcName,
- prcType: row.prcType
- }
- })
- }else if (row.taskInfo === '重新发起入库流程'){
- this.$router.push({
- name: 'zcrkStep3',
- query: {
- taskIds: row.taskIds,
- prcId: row.prcId,
- prcNum: row.prcNum,
- prcName: row.prcName,
- prcType: row.prcType
- }
- })
+ let routeName = ''
+ switch (row.taskInfo) {
+ case '政策入库审批':
+ routeName = 'zcrk2'
+ break
}
+ this.$router.push({
+ name: routeName,
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ // if (row.taskInfo === '政策入库审批') {
+ // this.$router.push({
+ // name: 'zcrkStep2',
+ // query: {
+ // taskIds: row.taskIds,
+ // prcId: row.prcId,
+ // prcNum: row.prcNum,
+ // prcName: row.prcName,
+ // prcType: row.prcType
+ // }
+ // })
+ // }else if (row.taskInfo === '重新发起入库流程'){
+ // this.$router.push({
+ // name: 'zcrkStep3',
+ // query: {
+ // taskIds: row.taskIds,
+ // prcId: row.prcId,
+ // prcNum: row.prcNum,
+ // prcName: row.prcName,
+ // prcType: row.prcType
+ // }
+ // })
+ // }
break
case 'buss2':
if (row.taskInfo === '企标编写') {
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index ea15f9894..dd8c5fb0b 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -820,39 +820,60 @@ export default {
break
// 政策入库、
case 'laws1':
- if(mes !== null && mes.taskInfo !== null && mes.taskInfo !== undefined) {
- if (mes.taskInfo === '申请人发起') {
- this.$router.push({
- name: 'zcrkStep1',
- query: {
- type: '1',
- processName: '申请人发起流程',
- bpnId: id,
- verifySarStandard: true,
- }
- })
- }else if(mes.taskInfo === '申请人重新发起'){
- this.$router.push({
- name: 'zcrkStep3',
- query: {
- type: '1',
- processName: '申请人发起流程',
- bpnId: id,
- verifySarStandard: true,
- }
- })
+ let routeName = ''
+ let processName=''
+ if (mes && mes.taskInfo) {
+ switch (mes.taskInfo) {
+ case '起草':
+ routeName = 'zcrk1'
+ processName = '申请人发起流程'
+ break
}
- }else {
- this.$router.push({
- name: 'zcrkStep1',
- query: {
- type: '1',
- processName: '申请人发起流程',
- bpnId: id,
- verifySarStandard: true,
- }
- })
+ } else {
+ routeName = 'zcrk1'
+ processName = '申请人发起流程'
}
+ this.$router.push({
+ name: routeName,
+ query: {
+ type: 'laws1',
+ processName,
+ bpnId: id,
+ }
+ })
+ // if(mes !== null && mes.taskInfo !== null && mes.taskInfo !== undefined) {
+ // if (mes.taskInfo === '申请人发起') {
+ // this.$router.push({
+ // name: 'zcrkStep1',
+ // query: {
+ // type: '1',
+ // processName: '申请人发起流程',
+ // bpnId: id,
+ // verifySarStandard: true,
+ // }
+ // })
+ // }else if(mes.taskInfo === '申请人重新发起'){
+ // this.$router.push({
+ // name: 'zcrkStep3',
+ // query: {
+ // type: '1',
+ // processName: '申请人发起流程',
+ // bpnId: id,
+ // verifySarStandard: true,
+ // }
+ // })
+ // }
+ // }else {
+ // this.$router.push({
+ // name: 'zcrkStep1',
+ // query: {
+ // type: '1',
+ // processName: '申请人发起流程',
+ // bpnId: id,
+ // verifySarStandard: true,
+ // }
+ // })
+ // }
break
case '21':
this.$router.push({
diff --git a/src/router/index.js b/src/router/index.js
index ff4d2eac3..92bd01c8d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1151,6 +1151,15 @@ const routes = [
title: '政策入库流程'
}
},
+ {
+ path: '/zcrk2',
+ name: 'zcrk2',
+ component: () => import('@/pages/processCenter/pages/creatProcess/hzwl-zcrk/step2.vue'),
+ meta: {
+ requireAuth: true,
+ title: '政策入库流程'
+ }
+ },
{
path: '/zcrkStep1',
name: 'zcrkStep1',