diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index c04920b05..c6537ed59 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -273,6 +273,9 @@ export default { type: Boolean, default: false }, + backBTNTexts: { + type: String + }, submitBTNText: { type: String } @@ -405,7 +408,7 @@ export default { }, // 退回按钮文字 backBTNText() { - return this.approval ? '驳回' : '退回' + return this.backBTNTexts ? this.backBTNTexts : this.approval ? '驳回' : '退回' }, userId() { return this.userInfo.userId diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue new file mode 100644 index 000000000..7f255940a --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -0,0 +1,685 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue new file mode 100644 index 000000000..ba97fe78e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -0,0 +1,366 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue new file mode 100644 index 000000000..8857f2844 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -0,0 +1,347 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue new file mode 100644 index 000000000..c708e9536 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue new file mode 100644 index 000000000..7f2ac2480 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 7264af330..84017256c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -494,7 +494,6 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - console.log(data); this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName if (data.form) { diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue index 8511d7862..80f0fab34 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue @@ -1,16 +1,349 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue new file mode 100644 index 000000000..8448aa369 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue index ab5e0161a..e666ae495 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue @@ -1,16 +1,241 @@ - + - diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue new file mode 100644 index 000000000..19f6d92d3 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue @@ -0,0 +1,537 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step2.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step2.vue new file mode 100644 index 000000000..3f40992c5 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zcrh/step2.vue @@ -0,0 +1,356 @@ + + + + + diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index 87f644d28..232cd4047 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -232,6 +232,77 @@ + + +
+
+
+ +
+
+
外部标准化协会入会流程
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -370,6 +441,13 @@ export default { name: 'cywbbzzxdStep1' }) break + // 外部标准化协会入会流程 + case '20': + //政策课题会后流程 + this.$router.push({ + name: 'bzrhStep1' + }) + 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 0c4a73e68..4d63bea69 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -895,6 +895,68 @@ export default { // }) // } break + // 外部标准化协会入会流程 + case '20': + if (row.taskInfo === '技术委员会分委会主任/入会代表所在中心主任提名入会代表') { + this.$router.push({ + name: 'bzrhStep2', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '') { + this.$router.push({ + name: 'bzrhStep3', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '') { + this.$router.push({ + name: 'bzrhStep4', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '') { + this.$router.push({ + name: 'bzrhStep5', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + 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 + } + }) + } + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/router/index.js b/src/router/index.js index 1ad0b984b..82c13a150 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -988,6 +988,15 @@ const routes = [ title: '政策课题入会流程' } }, + { + path: '/zcrhStep2', + name: 'zcrhStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/zcrh/step2.vue'), + meta: { + requireAuth: true, + title: '政策课题入会流程' + } + }, { path: '/zcchStep1', name: 'zcchStep1', @@ -1242,7 +1251,53 @@ const routes = [ requireAuth: true, 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 6a5e62254..76b50a183 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,9 +6,11 @@ // 服务器地址 // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' -const devIp = '192.168.10.52' -// const devIp = '62.234.136.153' -const devInterfacePORT = '9999' +// const devIp = '192.168.10.248' +const devIp = '62.234.136.153' +const devInterfacePORT = '8033' +// const devIp = '10.19.11.243' +// const devInterfacePORT = '4304' // 配置 idm 认证 const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri=' // 配置 前端服务 @@ -37,8 +39,10 @@ const processPort = '17210' *****************************************************************/ // 生产环境配置 -const prodIp = '10.100.5.117' -const prodInterfacePORT = '4202' +const prodIp = '62.234.136.153' +const prodInterfacePORT = '8033' +// const prodIp = 'slrs.foton.com.cn' +// const prodInterfacePORT = '' // 判断环境 const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp