@@ -247,6 +247,21 @@
+
+
+
+
+
+
![]()
+
+
+
+
@@ -443,11 +458,16 @@ export default {
break
// 外部标准化协会入会流程
case '20':
- //政策课题会后流程
this.$router.push({
name: 'bzrhStep1'
})
break
+ // 外部标准化协会参会流程
+ case '21':
+ this.$router.push({
+ name: 'bzchStep1'
+ })
+ break
}
},
checkPermission(permissionIdArray) {
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 4d63bea69..6b6f87bfc 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -870,7 +870,8 @@ export default {
}
break
case '15':
- if (row.taskInfo === '备案任务下发') {
+ //加入标准化协会信息备案流程
+ if (row.taskInfo === '填写入会信息') {
this.$router.push({
name: 'jrbzhxhStep2',
query: {
@@ -881,19 +882,29 @@ export default {
prcType: row.prcType
}
})
+ } else if(row.taskInfo === '标准法规工程师审核'){
+ this.$router.push({
+ name: 'jrbzhxhStep3',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if(row.taskInfo === '标准法规部部长批准'){
+ this.$router.push({
+ name: 'jrbzhxhStep4',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
}
- // else if(row.taskInfo === '标准法规部经理审批'){
- // this.$router.push({
- // name: 'xmqdqrStep3',
- // query: {
- // taskIds: row.taskIds,
- // prcId: row.prcId,
- // prcNum: row.prcNum,
- // prcName: row.prcName,
- // prcType: row.prcType
- // }
- // })
- // }
break
// 外部标准化协会入会流程
case '20':
@@ -908,7 +919,7 @@ export default {
prcType: row.prcType
}
})
- } else if (row.taskInfo === '') {
+ } else if (row.taskInfo === '入会代表填写入会信息表') {
this.$router.push({
name: 'bzrhStep3',
query:{
@@ -919,7 +930,7 @@ export default {
prcType: row.prcType
}
})
- } else if (row.taskInfo === '') {
+ } else if (row.taskInfo === '入会人员所在部门负责人审核') {
this.$router.push({
name: 'bzrhStep4',
query:{
@@ -930,7 +941,7 @@ export default {
prcType: row.prcType
}
})
- } else if (row.taskInfo === '') {
+ } else if (row.taskInfo === '标准法规工程师汇总修订') {
this.$router.push({
name: 'bzrhStep5',
query:{
@@ -941,12 +952,60 @@ export default {
prcType: row.prcType
}
})
+ }else if (row.taskInfo === '标准法规部主管领导审核') {
+ this.$router.push({
+ name: 'bzrhStep6',
+ query:{
+ taskInfo: row.taskInfo,
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '费用管理部门会签') {
+ this.$router.push({
+ name: 'bzrhStep6',
+ query:{
+ taskInfo: row.taskInfo,
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '技术委员会常务副主任/总院院长审定') {
+ this.$router.push({
+ name: 'bzrhStep6',
+ query:{
+ taskInfo: row.taskInfo,
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '标准法规工程师汇总修订完毕'){
+ this.$router.push({
+ name: 'bzrhStep6',
+ query:{
+ taskInfo: row.taskInfo,
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
}
break
- case '17':
- if (row.taskInfo === '法规认证部副部长审核') {
+ case '18':
+ if (row.taskInfo === '法规认证部副部长批准') {
this.$router.push({
- name: 'zcrhStep2',
+ name: 'zcchStep2',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -955,6 +1014,113 @@ export default {
prcType: row.prcType
}
})
+ } else if (row.taskInfo === '公司副总批准') {
+ this.$router.push({
+ name: 'zcchStep3',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '修订参会信息') {
+ this.$router.push({
+ name: 'zcchStep1-1',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }
+ break
+ // 政策参会流程
+ case '19':
+ if (row.taskInfo === '申请人填写表单') {
+ this.$router.push({
+ name: 'zchhStep1',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '审核员批准') {
+ this.$router.push({
+ name: 'zchhStep2',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '申请人修订申请信息') {
+ this.$router.push({
+ name: 'zchhStep1',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }
+ break
+ // 政策会后流程
+ case '21':
+ if (row.taskInfo === '技术委员会分委会主任/入会代表所在中心主任提名入会代表') {
+ this.$router.push({
+ name: 'bzchStep2',
+ query:{
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '') {
+ this.$router.push({
+ name: 'bzchStep3',
+ query:{
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '') {
+ this.$router.push({
+ name: 'bzchStep4',
+ query:{
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '') {
+ this.$router.push({
+ name: 'bzchStep5',
+ query:{
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
}
break
}
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index 1673f66fb..21d8ebce5 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -389,6 +389,16 @@ export default {
}
})
break
+ case '20':
+ this.$router.push({
+ name: 'bzrhStep1',
+ query: {
+ type: '20',
+ processName: '外部标准化协会入会流程',
+ bpnId: id
+ }
+ })
+ break
}
},
...mapMutations(['setProcess', 'setHandleInfo']),
diff --git a/src/router/index.js b/src/router/index.js
index 82c13a150..ba365c489 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -997,6 +997,33 @@ const routes = [
title: '政策课题入会流程'
}
},
+ {
+ path: '/zcrhStep3',
+ name: 'zcrhStep3',
+ component: () => import('@/pages/processCenter/pages/creatProcess/zcrh/step3.vue'),
+ meta: {
+ requireAuth: true,
+ title: '政策课题入会流程'
+ }
+ },
+ {
+ path: '/zcrhStep4',
+ name: 'zcrhStep4',
+ component: () => import('@/pages/processCenter/pages/creatProcess/zcrh/step4.vue'),
+ meta: {
+ requireAuth: true,
+ title: '政策课题入会流程'
+ }
+ },
+ {
+ path: '/zcrhStep1-1',
+ name: 'zcrhStep1-1',
+ component: () => import('@/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue'),
+ meta: {
+ requireAuth: true,
+ title: '政策课题入会流程'
+ }
+ },
{
path: '/zcchStep1',
name: 'zcchStep1',
@@ -1006,6 +1033,33 @@ const routes = [
title: '政策课题参会流程'
}
},
+ {
+ path: '/zcchStep2',
+ name: 'zcchStep2',
+ component: () => import('@/pages/processCenter/pages/creatProcess/zcch/step2.vue'),
+ meta: {
+ requireAuth: true,
+ title: '政策课题参会流程'
+ }
+ },
+ {
+ path: '/zcchStep3',
+ name: 'zcchStep3',
+ component: () => import('@/pages/processCenter/pages/creatProcess/zcch/step3.vue'),
+ meta: {
+ requireAuth: true,
+ title: '政策课题参会流程'
+ }
+ },
+ {
+ path: '/zcchStep1-1',
+ name: 'zcchStep1-1',
+ component: () => import('@/pages/processCenter/pages/creatProcess/zcch/step1-1.vue'),
+ meta: {
+ requireAuth: true,
+ title: '政策课题参会流程'
+ }
+ },
{
path: '/zchhStep1',
name: 'zchhStep1',
@@ -1015,6 +1069,15 @@ const routes = [
title: '政策课题会后流程'
}
},
+ {
+ path: '/zchhStep2',
+ name: 'zchhStep2',
+ component: () => import('@/pages/processCenter/pages/creatProcess/zchh/step2.vue'),
+ meta: {
+ requireAuth: true,
+ title: '政策课题会后流程'
+ }
+ },
{
path: '/wbsmStep1',
name: 'wbsmStep1',
@@ -1051,6 +1114,15 @@ const routes = [
title: '参与外部标准制修订信息提报流程'
}
},
+ {
+ path: '/cywbbzzxdStep3',
+ name: 'cywbbzzxdStep3',
+ component: () => import('@/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue'),
+ meta: {
+ requireAuth: true,
+ title: '参与外部标准制修订信息提报流程'
+ }
+ },
{
path: '/jrbzhxhStep1',
name: 'jrbzhxhStep1',
@@ -1060,6 +1132,24 @@ const routes = [
title: '加入标准化协会信息提报流程'
}
},
+ {
+ path: '/jrbzhxhStep3',
+ name: 'jrbzhxhStep3',
+ component: () => import('@/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue'),
+ meta: {
+ requireAuth: true,
+ title: '加入标准化协会信息提报流程'
+ }
+ },
+ {
+ path: '/jrbzhxhStep4',
+ name: 'jrbzhxhStep4',
+ component: () => import('@/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue'),
+ meta: {
+ requireAuth: true,
+ title: '加入标准化协会信息提报流程'
+ }
+ },
{
path: '/jrbzhxhStep2',
name: 'jrbzhxhStep2',
@@ -1069,6 +1159,108 @@ const routes = [
title: '加入标准化协会信息提报流程'
}
},
+ // 外部标准化协会入会流程
+ {
+ path: '/bzrhStep1',
+ name: 'bzrhStep1',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue'),
+ meta: {
+ requireAuth: true,
+ title: '外部标准化协会入会流程（流程发起）'
+ }
+ },
+ {
+ path: '/bzrhStep2',
+ name: 'bzrhStep2',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue'),
+ meta: {
+ requireAuth: true,
+ title: '外部标准化协会入会流程（选择代表）'
+ }
+ },
+ {
+ path: '/bzrhStep3',
+ name: 'bzrhStep3',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue'),
+ meta: {
+ requireAuth: true,
+ title: '外部标准化协会入会流程（入选代表填写信息）'
+ }
+ },
+ {
+ path: '/bzrhStep4',
+ name: 'bzrhStep4',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue'),
+ meta: {
+ requireAuth: true,
+ title: '外部标准化协会入会流程（责任负责人审批）'
+ }
+ },
+ {
+ path: '/bzrhStep5',
+ name: 'bzrhStep5',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue'),
+ meta: {
+ requireAuth: true,
+ title: '外部标准化协会入会流程（修订）'
+ }
+ },
+ {
+ path: '/bzrhStep6',
+ name: 'bzrhStep6',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue'),
+ meta: {
+ requireAuth: true,
+ title: '外部标准化协会入会流程（审批)'
+ }
+ },
+
+ // 外部标准化协会参会流程
+ {
+ path: '/bzchStep1',
+ name: 'bzchStep1',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue'),
+ meta: {
+ requireAuth: true,
+ title: '外部标准化协会参会流程（流程发起）'
+ }
+ },
+ {
+ path: '/bzchStep2',
+ name: 'bzchStep2',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue'),
+ meta: {
+ requireAuth: true,
+ title: '外部标准化协会参会流程（选择入会代表）'
+ }
+ },
+ {
+ path: '/bzchStep3',
+ name: 'bzchStep3',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue'),
+ meta: {
+ requireAuth: true,
+ title: '外部标准化协会参会流程（入会人确认）'
+ }
+ },
+ {
+ path: '/bzchStep4',
+ name: 'bzchStep4',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue'),
+ meta: {
+ requireAuth: true,
+ title: '外部标准化协会参会流程（审批）'
+ }
+ },
+ {
+ path: '/bzchStep5',
+ name: 'bzchStep5',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue'),
+ meta: {
+ requireAuth: true,
+ title: '外部标准化协会参会流程（修订）'
+ }
+ },
]
},
// 本地工具
@@ -1252,52 +1444,6 @@ const routes = [
title: '技术要求清单管理'
}
},
- // 外部标准化协会入会流程
- {
- path: '/bzrhStep1',
- name: 'bzrhStep1',
- component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue'),
- meta: {
- requireAuth: true,
- title: '外部标准化协会入会流程（流程发起）'
- }
- },
- {
- path: '/bzrhStep2',
- name: 'bzrhStep2',
- component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue'),
- meta: {
- requireAuth: true,
- title: '外部标准化协会入会流程（选择代表）'
- }
- },
- {
- path: '/bzrhStep3',
- name: 'bzrhStep3',
- component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue'),
- meta: {
- requireAuth: true,
- title: '外部标准化协会入会流程（入选代表填写信息）'
- }
- },
- {
- path: '/bzrhStep4',
- name: 'bzrhStep4',
- component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue'),
- meta: {
- requireAuth: true,
- title: '外部标准化协会入会流程（责任负责人审批）'
- }
- },
- {
- path: '/bzrhStep5',
- name: 'bzrhStep5',
- component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue'),
- meta: {
- requireAuth: true,
- title: '外部标准化协会入会流程（修订）'
- }
- },
]
},
// 标准法规库
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 76b50a183..3d38d1c7b 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -6,11 +6,9 @@
// 服务器地址
// const devIp = '39.98.140.126'
// const devInterfacePORT = '10005'
-// const devIp = '192.168.10.248'
-const devIp = '62.234.136.153'
-const devInterfacePORT = '8033'
-// const devIp = '10.19.11.243'
-// const devInterfacePORT = '4304'
+const devIp = '192.168.10.50'
+// const devIp = '62.234.136.153'
+const devInterfacePORT = '9999'
// 配置 idm 认证
const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri='
// 配置 前端服务