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/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index b9b21b9ec..ab3f438a2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -662,7 +662,7 @@ export default { * @description: 动态表单读取 */ getFormFieldList (item) { - console.log(item); + item.commentText = '' this.$nextTick(() => { this.hisListForm = JSON.parse(JSON.stringify(item)) this.listForm = JSON.parse(JSON.stringify(item)) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue index 74e27f107..a988ccfa7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue @@ -346,6 +346,7 @@ >