diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index 243e6163e..c6537ed59 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -111,6 +111,15 @@ :loading="submitLoading" v-if="showAffirm" >确认 + 不备案 @@ -188,6 +197,10 @@ export default { type: Boolean, default: false }, + showRecord:{ + type: Boolean, + default: false + }, showAffirm: { type: Boolean, default: false @@ -206,6 +219,11 @@ export default { type: Boolean, default: false }, + //不备案按钮Loading + recordLoading:{ + type: Boolean, + default: false + }, // 提交按钮loading submitLoading: { type: Boolean, @@ -255,6 +273,9 @@ export default { type: Boolean, default: false }, + backBTNTexts: { + type: String + }, submitBTNText: { type: String } @@ -285,6 +306,9 @@ export default { handleSubmit2() { this.$emit('submit2') }, + handleRecord(){ + this.$emit('record') + }, handleSubmit() { this.$emit('submit') }, @@ -384,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/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/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index c62c8ca78..232cd4047 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -189,7 +189,7 @@ -
+
@@ -204,7 +204,7 @@ -
+
@@ -219,7 +219,7 @@ -
+
@@ -232,6 +232,77 @@
+ + +
+
+
+ +
+
+
外部标准化协会入会流程
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -352,24 +423,31 @@ export default { name: 'zchhStep1' }) break - case '18': + case '16': //外部署名推荐审批流程 this.$router.push({ name: 'wbsmStep1' }) break - case '19': + case '15': //加入标准化协会信息提报流程 this.$router.push({ name: 'jrbzhxhStep1' }) break - case '20': + case '14': //参与外部标准制修订信息提报流程 this.$router.push({ 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 15dafb8e0..4d63bea69 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -869,6 +869,80 @@ export default { }) } break + case '15': + if (row.taskInfo === '备案任务下发') { + this.$router.push({ + name: 'jrbzhxhStep2', + 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': + 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({ diff --git a/src/router/index.js b/src/router/index.js index 37ab82ac6..82c13a150 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1042,6 +1042,15 @@ const routes = [ title: '参与外部标准制修订信息提报流程' } }, + { + path: '/cywbbzzxdStep2', + name: 'cywbbzzxdStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue'), + meta: { + requireAuth: true, + title: '参与外部标准制修订信息提报流程' + } + }, { path: '/jrbzhxhStep1', name: 'jrbzhxhStep1', @@ -1050,7 +1059,16 @@ const routes = [ requireAuth: true, title: '加入标准化协会信息提报流程' } - } + }, + { + path: '/jrbzhxhStep2', + name: 'jrbzhxhStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue'), + meta: { + requireAuth: true, + title: '加入标准化协会信息提报流程' + } + }, ] }, // 本地工具 @@ -1233,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: '外部标准化协会入会流程(修订)' + } + }, ] }, // 标准法规库