![]()
@@ -352,19 +352,19 @@ 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'
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 6c76b6aad..0c4a73e68 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -869,6 +869,32 @@ 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
}
},
...mapMutations(['setProcess', 'setHandleInfo']),
diff --git a/src/router/index.js b/src/router/index.js
index 6bdd35887..1ad0b984b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1033,6 +1033,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',
@@ -1041,7 +1050,16 @@ const routes = [
requireAuth: true,
title: '加入标准化协会信息提报流程'
}
- }
+ },
+ {
+ path: '/jrbzhxhStep2',
+ name: 'jrbzhxhStep2',
+ component: () => import('@/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue'),
+ meta: {
+ requireAuth: true,
+ title: '加入标准化协会信息提报流程'
+ }
+ },
]
},
// 本地工具
From 3f7500be6e614b3f91bc3cd0eb1071d4464d6d22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 26 Oct 2021 17:23:36 +0800
Subject: [PATCH 2/3] commit
---
.../pages/creatProcess/cywbbzzxd/step1.vue | 343 ++++++++++-
.../pages/creatProcess/cywbbzzxd/step2.vue | 13 +
.../pages/creatProcess/jrbzhxh/step1.vue | 237 +++++++-
.../pages/creatProcess/jrbzhxh/step2.vue | 537 ++++++++++++++++++
4 files changed, 1119 insertions(+), 11 deletions(-)
create mode 100644 src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue
create mode 100644 src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
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 @@
-
- 参与外部标准制修订流程
-
+
+
+ 参与外部标准制修订信息提报流程
+ 发起流程
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击上传
+
+
+
+
+
+
+
+
+ 参与人信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 协会信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+
+
+
+
-
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 @@
+
+
+
+
+ 加入标准化协会信息备案流程
+ 入会信息填报
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击上传
+
+
+
+
+
+
+
+
+ 参与人信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 协会信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
+
+
From 8a8832496a782b6bd1976cebfc742ad33650ac9e Mon Sep 17 00:00:00 2001
From: shenyanpei
Date: Tue, 26 Oct 2021 17:26:57 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=96=E9=83=A8=E6=A0=87=E5=87=86?=
=?UTF-8?q?=E5=8C=96=E5=8D=8F=E4=BC=9A=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/components/ProcessFooter.vue | 5 +-
.../pages/creatProcess/bzhHd-rh/step1.vue | 685 ++++++++++++++++++
.../pages/creatProcess/bzhHd-rh/step2.vue | 366 ++++++++++
.../pages/creatProcess/bzhHd-rh/step3.vue | 347 +++++++++
.../pages/creatProcess/bzhHd-rh/step4.vue | 13 +
.../pages/creatProcess/bzhHd-rh/step5.vue | 13 +
.../processCenter/pages/newProcess/index.vue | 78 ++
.../tabComponents/processCenter/index.vue | 48 ++
src/router/index.js | 48 +-
9 files changed, 1601 insertions(+), 2 deletions(-)
create mode 100644 src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
create mode 100644 src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
create mode 100644 src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
create mode 100644 src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
create mode 100644 src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
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 @@
+
+
+
+
+ 外部标准化协会入会流程
+ 发起流程
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击上传
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加
+
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 流程发起人
+
+
+
+
+
+
+
+
+
+
+ 技术委员会分委会主任/技术主管部门负责人
+
+
+
+
+
+
+
+
+
+
+
+ 责任工程师
+
+
+
+
+
+
+
+
+
+
+
+ 参会人员所在部门负责人
+
+
+
+
+
+
+
+
+
+
+
+ 标准法规部人员
+
+
+
+
+
+
+
+
+
+
+
+ 标准法规部主管领导
+
+
+
+
+
+
+
+
+
+
+
+ 费用管理部门
+
+
+
+
+
+
+
+
+
+
+
+ 技术委员会常务副主任/总院院长
+
+
+
+
+
+
+
+
+
+
+
+ 总院技术委员会主任
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 外部标准化协会入会流程
+ 发起流程
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+ {{ rh_pageData.comityName || '-' }}
+
+
+
+
+ {{ rh_pageData.comityState || '-' }}
+
+
+
+
+
+
+ {{ rh_pageData.comityKind || '-' }}
+
+
+
+
+
+
+ {{ rh_pageData.comityMake.makeQualification || '-' }}
+
+
+
+
+ {{ rh_pageData.comityMake.makeRole || '' }}
+
+
+
+
+
+
+ {{ rh_pageData.comityMake.makeCost || '-' }}
+
+
+
+
+ {{ rh_pageData.comityMake.makeDuties || '-' }}
+
+
+
+
+
+
+ {{ rh_pageData.comityMake.makeTime || '-' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择人员
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+ 外部标准化协会入会流程
+ 发起流程
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+ {{ rh_pageData.comityName || '-' }}
+
+
+
+
+ {{ rh_pageData.comityState || '-' }}
+
+
+
+
+
+
+ {{ rh_pageData.comityKind || '-' }}
+
+
+
+
+
+
+ {{ rh_pageData.comityMake.makeQualification || '-' }}
+
+
+
+
+ {{ rh_pageData.comityMake.makeRole || '' }}
+
+
+
+
+
+
+ {{ rh_pageData.comityMake.makeCost || '-' }}
+
+
+
+
+ {{ rh_pageData.comityMake.makeDuties || '-' }}
+
+
+
+
+
+
+ {{ rh_pageData.comityMake.makeTime || '-' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 填写信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+