diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 01b160c62..dfaefd9c5 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -420,7 +420,7 @@ export default { } break; case 'buss3': - if (row.taskInfo === '对接人选择复审人') { + if (row.taskInfo === '选择复审人') { this.$router.push({ name: 'qbfsStepSub1', query: { @@ -431,7 +431,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '复审人选择复审结果'){ + }else if (row.taskInfo === '复审'){ this.$router.push({ name: 'qbfsStepSub2', query: { @@ -442,7 +442,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '发起人汇总结果'){ + }else if (row.taskInfo === '汇总'){ this.$router.push({ name: 'bussFs2', query: { @@ -453,7 +453,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '重新发起人汇总结果'){ + }else if (row.taskInfo === '重新汇总'){ this.$router.push({ name: 'bussFsC2', query: { @@ -464,7 +464,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '标准法规部高级经理批准'){ + }else if (row.taskInfo === '批准'){ this.$router.push({ name: 'bussFs3', query: { diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue index 4d5c3e846..e08585b67 100644 --- a/src/pages/processCenter/pages/components/ProcessMixin.vue +++ b/src/pages/processCenter/pages/components/ProcessMixin.vue @@ -126,7 +126,7 @@ export default { methods: { getPrcNameFilter(row){ if(row && row.prcType === 'buss3'){ - return row.prcName + '-' + row.taskInfo + return row.prcName }else { return row.prcName } diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue new file mode 100644 index 000000000..cfd0dd576 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue @@ -0,0 +1,791 @@ + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue index 2f00bbe89..f8ceee7e6 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue @@ -220,7 +220,7 @@
- +
@@ -250,7 +250,7 @@
- +
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index d81453389..72d6a2514 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -659,7 +659,7 @@ export default { } break; case 'buss3': - if (row.taskInfo === '对接人选择复审人') { + if (row.taskInfo === '选择复审人') { this.$router.push({ name: 'qbfsStepSub1', query: { @@ -670,7 +670,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '复审人选择复审结果'){ + }else if (row.taskInfo === '复审'){ this.$router.push({ name: 'qbfsStepSub2', query: { @@ -681,7 +681,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '发起人汇总结果'){ + }else if (row.taskInfo === '汇总'){ this.$router.push({ name: 'bussFs2', query: { @@ -692,7 +692,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '重新发起人汇总结果'){ + }else if (row.taskInfo === '重新汇总'){ this.$router.push({ name: 'bussFsC2', query: { @@ -703,7 +703,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '标准法规部高级经理批准'){ + }else if (row.taskInfo === '批准'){ this.$router.push({ name: 'bussFs3', query: { diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 72d2e093e..df3f08c18 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -292,7 +292,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '发起企标制修订流程'){ + }else if (mes.taskInfo === '起草'){ this.$router.push({ name: 'bussLibrary1', query: { @@ -302,7 +302,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '重新发起企标制修订-技术标准流程'){ + }else if (mes.taskInfo === '重新起草'){ this.$router.push({ name: 'bussLibraryC1', query: { @@ -312,7 +312,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '企标编写汇总修订'){ + }else if (mes.taskInfo === '企标编写汇总'){ this.$router.push({ name: 'bussLibrary3', query: { @@ -323,7 +323,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '标准化员初审'){ + }else if (mes.taskInfo === '标准化初审'){ this.$router.push({ name: 'bussLibrary4', query: { @@ -333,7 +333,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '重新企标编写汇总修订'){ + }else if (mes.taskInfo === '重新企标编写汇总'){ this.$router.push({ name: 'bussLibraryC3', query: { @@ -344,7 +344,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '会签征求意见'){ + }else if (mes.taskInfo === '征求意见'){ this.$router.push({ name: 'bussLibrary5', query: { @@ -355,7 +355,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '技术委员会评审/评审意见修改评审'){ + }else if (mes.taskInfo === '技术委员会评审、评审意见修改'){ this.$router.push({ name: 'bussLibrary6', query: { @@ -366,7 +366,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '复审'){ + }else if (mes.taskInfo === '标准化复审'){ this.$router.push({ name: 'bussLibrary7', query: { @@ -377,7 +377,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '重新技术委员会评审/评审意见修改评审'){ + }else if (mes.taskInfo === '重新技术委员会评审、评审意见修改'){ this.$router.push({ name: 'bussLibraryC6', query: { @@ -430,7 +430,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '培训'){ + }else if (mes.taskInfo === '主起草人培训'){ this.$router.push({ name: 'bussLibrary12', query: { @@ -458,7 +458,7 @@ export default { name: 'bussLibrary1', query: { type: 'buss1', - processName: '发起企标制修订流程', + processName: '起草', bpnId: id, verifySarStandard: true, } @@ -477,7 +477,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '发起企标制修订流程'){ + }else if (mes.taskInfo === '起草'){ this.$router.push({ name: 'bussLibraryProduct1', query: { @@ -487,7 +487,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '企标编写汇总修订'){ + }else if (mes.taskInfo === '企标编写汇总'){ this.$router.push({ name: 'bussLibraryProduct3', query: { @@ -497,7 +497,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '重新企标编写汇总修订'){ + }else if (mes.taskInfo === '重新企标编写汇总'){ this.$router.push({ name: 'bussLibraryProductC3', query: { @@ -507,7 +507,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '会签征求意见'){ + }else if (mes.taskInfo === '征求意见'){ this.$router.push({ name: 'bussLibraryProduct5', query: { @@ -553,13 +553,68 @@ export default { name: 'bussLibraryProduct1', query: { type: 'buss2', - processName: '发起企标制修订流程', + processName: '起草', bpnId: id, verifySarStandard: true, } }) } break + case 'buss3': + if(mes !== null && mes.taskInfo !== null) { + if (mes.taskInfo === '起草'){ + this.$router.push({ + name: 'bussLibraryProduct1', + query: { + type: 'buss3', + processName: mes.taskInfo, + bpnId: id, + verifySarStandard: true, + } + }) + }else if (mes.taskInfo === '汇总'){ + this.$router.push({ + name: 'bussFs2', + query: { + type: 'buss3', + processName: mes.taskInfo, + bpnId: id, + verifySarStandard: true, + } + }) + }else if (mes.taskInfo === '重新汇总'){ + this.$router.push({ + name: 'bussFsC2', + query: { + type: 'buss3', + processName: mes.taskInfo, + bpnId: id, + verifySarStandard: true, + } + }) + }else if (mes.taskInfo === '复审'){ + this.$router.push({ + name: 'qbfsStepSub2', + query: { + type: 'buss3', + processName: mes.taskInfo, + bpnId: id, + verifySarStandard: true, + } + }) + } + }else { + this.$router.push({ + name: 'qbfsStep1', + query: { + type: 'buss3', + processName: '起草', + bpnId: id, + verifySarStandard: true, + } + }) + } + break // 法规入库及评估流程 case '2': this.$router.push({ diff --git a/src/router/index.js b/src/router/index.js index c3225a014..fc6b23981 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1991,6 +1991,15 @@ const routes = [ title: '企标复审流程' } }, + { + path: '/bussFsC2', + name: 'bussFsC2', + component: () => import('@/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue'), + meta: { + requireAuth: true, + title: '企标复审流程' + } + }, { path: '/bussFs3', name: 'bussFs3',