FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2021-11-09 17:41:43 +08:00
parent a81082079c 503e1a69aa
commit 17bd676c09
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/home2/components/todoList/index.vue
+2 -2
View File
@@ -1206,7 +1206,7 @@ export default {
} }
else if(row.taskInfo === '责任人反馈情况'){ else if(row.taskInfo === '责任人反馈情况'){
this.$router.push({ this.$router.push({
name: 'zdrzbzORzchgxxmscStep5-1', name: 'zdrzbzORzchgxxmscStep5',
query: { query: {
taskIds: row.taskIds, taskIds: row.taskIds,
prcId: row.prcId, prcId: row.prcId,
@@ -1230,7 +1230,7 @@ export default {
} }
else if(row.taskInfo === '法规管理员审核'){ else if(row.taskInfo === '法规管理员审核'){
this.$router.push({ this.$router.push({
name: 'zdrzbzORzchgxxmscStep7-1', name: 'zdrzbzORzchgxxmscStep7',
query: { query: {
taskIds: row.taskIds, taskIds: row.taskIds,
prcId: row.prcId, prcId: row.prcId,
src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5-1.vue → src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5.vue
+3 -3
View File
@@ -1,5 +1,5 @@
<template> <template>
<div class="zdrzbzORzchgxxmsc-step5-1"> <div class="zdrzbzORzchgxxmsc-step5">
<ProcessHeader toggle> <ProcessHeader toggle>
<template slot="proName">重点认证标准/政策合规性项目审查流程</template> <template slot="proName">重点认证标准/政策合规性项目审查流程</template>
<template slot="proNode">责任人反馈{{ feedbackDept==='1'?'事业部':'产品规划部' }}情况</template> <template slot="proNode">责任人反馈{{ feedbackDept==='1'?'事业部':'产品规划部' }}情况</template>
@@ -297,7 +297,7 @@ import {inboundLiaisonDetail, processCreateStand, saveTaskForPub, changeAssignee
import axios from "axios"; import axios from "axios";
export default { export default {
name: "zdrzbzORzchgxxmscStep5-1", name: "zdrzbzORzchgxxmscStep5",
data() { data() {
return { return {
//用来判断反馈情况的是哪个部门，1代表各事业部，2代表产品规划部，0代表其他部门 //用来判断反馈情况的是哪个部门，1代表各事业部，2代表产品规划部，0代表其他部门
@@ -512,7 +512,7 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.zdrzbzORzchgxxmsc-step5-1 { .zdrzbzORzchgxxmsc-step5 {
/deep/ .el-drawer__container { /deep/ .el-drawer__container {
.prc-content-border { .prc-content-border {
border: none; border: none;
src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step7-1.vue → src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step7.vue
+3 -3
View File
@@ -1,5 +1,5 @@
<template> <template>
<div class="zdrzbzORzchgxxmsc-step7-1"> <div class="zdrzbzORzchgxxmsc-step7">
<ProcessHeader toggle> <ProcessHeader toggle>
<template slot="proName">重点认证标准/政策合规性项目审查流程</template> <template slot="proName">重点认证标准/政策合规性项目审查流程</template>
<template slot="proNode">法规管理员审核</template> <template slot="proNode">法规管理员审核</template>
@@ -298,7 +298,7 @@ import {inboundLiaisonDetail, processCreateStand, saveTaskForPub, changeAssignee
import axios from "axios"; import axios from "axios";
export default { export default {
name: "zdrzbzORzchgxxmscStep7-1", name: "zdrzbzORzchgxxmscStep7",
data() { data() {
return { return {
//用来判断反馈情况的是哪个部门，1代表各事业部，2代表产品规划部，0代表其他部门 //用来判断反馈情况的是哪个部门，1代表各事业部，2代表产品规划部，0代表其他部门
@@ -499,7 +499,7 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.zdrzbzORzchgxxmsc-step7-1 { .zdrzbzORzchgxxmsc-step7 {
/deep/ .el-drawer__container { /deep/ .el-drawer__container {
.prc-content-border { .prc-content-border {
border: none; border: none;
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+2 -2
View File
@@ -1029,7 +1029,7 @@ export default {
} }
else if(row.taskInfo === '责任人反馈情况'){ else if(row.taskInfo === '责任人反馈情况'){
this.$router.push({ this.$router.push({
name: 'zdrzbzORzchgxxmscStep5-1', name: 'zdrzbzORzchgxxmscStep5',
query: { query: {
taskIds: row.taskIds, taskIds: row.taskIds,
prcId: row.prcId, prcId: row.prcId,
@@ -1053,7 +1053,7 @@ export default {
} }
else if(row.taskInfo === '法规管理员审核'){ else if(row.taskInfo === '法规管理员审核'){
this.$router.push({ this.$router.push({
name: 'zdrzbzORzchgxxmscStep7-1', name: 'zdrzbzORzchgxxmscStep7',
query: { query: {
taskIds: row.taskIds, taskIds: row.taskIds,
prcId: row.prcId, prcId: row.prcId,
src/router/index.js
+6 -6
View File
@@ -447,10 +447,10 @@ const routes = [
} }
}, },
{ {
path: '/zdrzbzORzchgxxmscStep5-1', path: '/zdrzbzORzchgxxmscStep5',
name: 'zdrzbzORzchgxxmscStep5-1', name: 'zdrzbzORzchgxxmscStep5',
//1代表各事业部，2代表产品规划部 //1代表各事业部，2代表产品规划部
component: () => import('process/creatProcess/zdrzbzORzchgxxmsc/step5-1.vue'), component: () => import('process/creatProcess/zdrzbzORzchgxxmsc/step5.vue'),
meta: { meta: {
requireAuth: true, requireAuth: true,
title: '重点认证标准/政策合规性项目审查流程' title: '重点认证标准/政策合规性项目审查流程'
@@ -466,9 +466,9 @@ const routes = [
} }
}, },
{ {
path: '/zdrzbzORzchgxxmscStep7-1', path: '/zdrzbzORzchgxxmscStep7',
name: 'zdrzbzORzchgxxmscStep7-1', name: 'zdrzbzORzchgxxmscStep7',
component: () => import('process/creatProcess/zdrzbzORzchgxxmsc/step7-1.vue'), component: () => import('process/creatProcess/zdrzbzORzchgxxmsc/step7.vue'),
meta: { meta: {
requireAuth: true, requireAuth: true,
title: '重点认证标准/政策合规性项目审查流程' title: '重点认证标准/政策合规性项目审查流程'