diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 1ff6ac433..273677a0f 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -654,7 +654,7 @@ export default { break //标准合规评估 case '5' : - if(row.taskInfo === '审核(标准法规业务经理)'){ + if(row.taskInfo === '审核1'){ this.$router.push({ name: 'bzpgStep2', query: { @@ -665,7 +665,7 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '项目分发(项目群负责人/标准法规工程师)'){ + }else if(row.taskInfo === '项目分发'){ this.$router.push({ name: 'bzpgStep3', query: { @@ -676,7 +676,7 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '任务分发(项目经理)'){ + }else if(row.taskInfo === '任务分发'){ this.$router.push({ name: 'bzpgStep4', query: { @@ -687,7 +687,7 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '合规评估(专业技术人员)'){ + }else if(row.taskInfo === '合规评估'){ this.$router.push({ name: 'bzpgStep5', query: { @@ -698,7 +698,7 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '审核(项目经理)'){ + }else if(row.taskInfo === '审核2'){ this.$router.push({ name: 'bzpgStep6', query: { @@ -709,7 +709,7 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '审定(项目群负责人)'){ + }else if(row.taskInfo === '审定'){ this.$router.push({ name: 'bzpgStep7', query: { @@ -720,7 +720,7 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '批准(标准法规部高级经理)'){ + }else if(row.taskInfo === '批准'){ this.$router.push({ name: 'bzpgStep8', query: { @@ -731,6 +731,17 @@ export default { prcType: row.prcType } }) + }else if(row.taskInfo === '重新起草'){ + this.$router.push({ + name: 'bzpgStep1', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } break //项目评估流程-项目 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index 8901c466e..46a76fae1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -434,10 +434,9 @@ newArr.push(arr[a]) } this.tableData = newArr - this.form.hzfileId = data.hzfileId || data.form.hzfileId - this.form.hzfileName = data.hzfileName || data.form.hzfileName + this.form.hzfileId = data.form ? data.form.hzfileId : (data.hzfileId ? hzfileId : '') + this.form.hzfileName = data.form ? data.form.hzfileName : (data.hzfileName ? hzfileName : '') this.newDocUser = data.form ? data.form.docUser : data.docUser - this.commentText5 = data.commentText5 || '' this.json = data || data.form }).catch(e => { }) diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 44e1b82c8..72e99d344 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -658,7 +658,7 @@ export default { } break; case '2': - if (row.taskInfo === '责任对接人选择责任人') { + if (row.taskInfo === '任务分发') { this.$router.push({ name: 'bzdyStep2', query: { @@ -669,7 +669,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '责任人上传调研结果') { + } else if (row.taskInfo === '调研结果反馈') { this.$router.push({ name: 'bzdyStep3', query: { @@ -680,7 +680,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '责任对接人审批') { + } else if (row.taskInfo === '调研结果审批') { this.$router.push({ name: 'bzdyStep4', query: { @@ -691,7 +691,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '标准法规工程师调研汇总'){ + } else if (row.taskInfo === '调研结果处理'){ this.$router.push({ name: 'bzdyStep5', query: { @@ -702,7 +702,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '责任人会签'){ + } else if (row.taskInfo === '会签'){ this.$router.push({ name: 'bzdyStep6', query: { @@ -713,7 +713,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '部长+对接人审核') { + } else if (row.taskInfo === '审核') { this.$router.push({ name: 'bzdyStep7', query: { @@ -724,9 +724,9 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo.indexOf('工程研究总院院长') == 0 ) { + } else if (row.taskInfo === '审定') { this.$router.push({ - name: 'bzdyStep9', + name: 'bzdyStep8', query: { taskIds: row.taskIds, prcId: row.prcId, @@ -735,9 +735,9 @@ export default { prcType: row.prcType } }) - } else { + } else if (row.taskInfo === '批准') { this.$router.push({ - name: 'bzdyStep8', + name: 'bzdyStep9', query: { taskIds: row.taskIds, prcId: row.prcId, @@ -782,7 +782,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '意见审批(经理、研发副总裁)') { + } else if (row.taskInfo === '意见审批') { this.$router.push({ name: 'bzzqyjStep4-1', query: { @@ -793,7 +793,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '管理员(起草节点一个人)') { + } else if (row.taskInfo === '管理员') { this.$router.push({ name: 'bzzqyjStep4-2', query: { @@ -815,7 +815,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '会签(选择会签人部长)') { + } else if (row.taskInfo === '会签') { this.$router.push({ name: 'bzzqyjStep6', query: { @@ -826,7 +826,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '审核(李部、会签人部长)') { + } else if (row.taskInfo === '审核') { this.$router.push({ name: 'bzzqyjStep7', query: { @@ -837,7 +837,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '审定(阚主任、技术委员会相关专委会主任/研究总院职能部门领导)' ) { + } else if (row.taskInfo === '审定' ) { this.$router.push({ name: 'bzzqyjStep8', query: { @@ -848,7 +848,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '批准(工程研究总院院长批准、标准法规主管副院长)') { + } else if (row.taskInfo === '批准') { this.$router.push({ name: 'bzzqyjStep9', query: { @@ -900,7 +900,7 @@ export default { break //标准合规评估 case '5' : - if(row.taskInfo === '审核(标准法规业务经理)'){ + if(row.taskInfo === '审核1'){ this.$router.push({ name: 'bzpgStep2', query: { @@ -911,7 +911,7 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '项目分发(项目群负责人/标准法规工程师)'){ + }else if(row.taskInfo === '项目分发'){ this.$router.push({ name: 'bzpgStep3', query: { @@ -922,7 +922,7 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '任务分发(项目经理)'){ + }else if(row.taskInfo === '任务分发'){ this.$router.push({ name: 'bzpgStep4', query: { @@ -933,7 +933,7 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '合规评估(专业技术人员)'){ + }else if(row.taskInfo === '合规评估'){ this.$router.push({ name: 'bzpgStep5', query: { @@ -944,7 +944,7 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '审核(项目经理)'){ + }else if(row.taskInfo === '审核2'){ this.$router.push({ name: 'bzpgStep6', query: { @@ -955,7 +955,7 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '审定(项目群负责人)'){ + }else if(row.taskInfo === '审定'){ this.$router.push({ name: 'bzpgStep7', query: { @@ -966,7 +966,7 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '批准(标准法规部高级经理)'){ + }else if(row.taskInfo === '批准'){ this.$router.push({ name: 'bzpgStep8', query: { @@ -977,7 +977,7 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '整改节点'){ + }else if(row.taskInfo === '重新起草'){ this.$router.push({ name: 'bzpgStep1', query: { @@ -1168,7 +1168,7 @@ export default { } break case '9': - if (row.taskInfo === '选择执行人') { + if (row.taskInfo === '选择责任人') { this.$router.push({ name: 'bzjdStep2', query: { @@ -1179,7 +1179,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '填写解读分析') { + } else if (row.taskInfo === '解读') { this.$router.push({ name: 'bzjdStep3', query: { @@ -1190,7 +1190,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '责任人审核') { + } else if (row.taskInfo === '审核') { this.$router.push({ name: 'bzjdStep4', query: { @@ -1201,7 +1201,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '工程师审核') { + } else if (row.taskInfo === '管理员') { this.$router.push({ name: 'bzjdStep5', query: { @@ -1212,7 +1212,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '部长审批') { + } else if (row.taskInfo === '批准') { this.$router.push({ name: 'bzjdStep6', query: {