Merge branch 'develop' into FOTON

# Conflicts:
#	package-lock.json
#	src/components/navMenu/index.vue
This commit is contained in:
Superman_Main
2021-11-26 09:02:37 +08:00
18 changed files with 1906 additions and 772 deletions
@@ -1337,6 +1337,54 @@ export default {
})
}
break
case '17':
if (row.taskInfo === '法规认证部副部长审核') {
this.$router.push({
name: 'zcrhStep2',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}else if (row.taskInfo === '法规认证部副总监批准') {
this.$router.push({
name: 'zcrhStep3',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} else if (row.taskInfo === '公司副总批准') {
this.$router.push({
name: 'zcrhStep4',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} else if (row.taskInfo === '修订入会信息') {
this.$router.push({
name: 'zcrhStep1-1',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}
break
// 政策入会流程
case '18':
if (row.taskInfo === '法规认证部副部长批准') {
this.$router.push({
@@ -1373,7 +1421,7 @@ export default {
})
}
break
// 政策参会流程
// 政策参会流程
case '19':
if (row.taskInfo === '申请人填写表单') {
this.$router.push({
@@ -1410,7 +1458,6 @@ export default {
})
}
break
case '21':
if (row.taskInfo === '分委会主任/部门中心主任提名入会代表') {
this.$router.push({