![]()
@@ -219,7 +219,7 @@
-
+
![]()
@@ -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 a5ef6d362535738f86cc25f380832cf75ca03533 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Tue, 26 Oct 2021 17:21:36 +0800
Subject: [PATCH 05/41] =?UTF-8?q?=E5=B8=A6=E5=85=A5=E6=A0=87=E5=87=86,?=
=?UTF-8?q?=E5=8B=98=E8=AF=AF=E4=BB=B6=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?.switch=E6=B2=A1=E5=86=99break(=EF=BC=A0=5F=EF=BC=A0;)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzrk/step1.vue | 86 ++++++++++---------
1 file changed, 46 insertions(+), 40 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index da2503594..90c8e7b01 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -1814,47 +1814,52 @@
// 带入
case 2:
if (this.standardCheckedList.length === 1) {
- const bringData = this.standardCheckedList[0]
- bringData.signFlag = this.form.signFlag && this.form.signFlag != '' ? this.form.signFlag : '0'
- bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0'
+ this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, {
+ _this: this
+ }, res => {
+ if(res && res.data){
+ const bringData = res.data
+ bringData.signFlag = this.form.signFlag && this.form.signFlag != '' ? this.form.signFlag : '0'
+ bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0'
- const json = Object.assign(bringData, bringData.attrInfoCaseMap);
- this.form = JSON.parse(JSON.stringify(json))
+ const json = Object.assign(bringData, bringData.attrInfoCaseMap);
+ this.form = JSON.parse(JSON.stringify(json))
- this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : []
- this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : []
- this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : []
- this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm && JSON.parse(JSON.stringify(json)).zrbm !== '[]' ? JSON.parse(JSON.stringify(json)).zrbm.split(',') : []
- this.form.syrz = JSON.parse(JSON.stringify(json)).syrz && JSON.parse(JSON.stringify(json)).syrz !== '[]' ? JSON.parse(JSON.stringify(json)).syrz.split(',') : []
- this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx && JSON.parse(JSON.stringify(json)).sycpx !== '[]' ? JSON.parse(JSON.stringify(json)).sycpx.split(',') : []
- this.form.nylx = JSON.parse(JSON.stringify(json)).nylx && JSON.parse(JSON.stringify(json)).nylx !== '[]' ? JSON.parse(JSON.stringify(json)).nylx.split(',') : []
- this.form.cllx = JSON.parse(JSON.stringify(json)).cllx && JSON.parse(JSON.stringify(json)).cllx !== '[]' ? JSON.parse(JSON.stringify(json)).cllx.split(',') : []
- this.defaultCheckedKeys = [this.form.standSystem];
- this.defaultCheckedKeys1 = [this.form.cycvppsbm];
- this.defaultCheckedKeys2 = [this.form.kccvppsbm];
- this.defaultCheckedKeys3 = [this.form.dybxh];
- this.key++
- this.key1++
- this.key2++
- this.key3++
- this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
- this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : ''
- this.form.prcNum = this.prcNum
- this.form.prcName = this.prcName
- this.form['id'] = bringData.id
- this.standardDrawer = false
- this.verifySarStandard = true
- this.busVsFunc()
- this.modelFunc()
- this.$forceUpdate()
-
- console.log("this.form",this.form);
- // 遍历对象初始化文件信息
- for(const p in this.form) {
- if (typeof (this.form[p]) != "function") {
- this.initializeFileList(p,this.form[p]);
+ this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : []
+ this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : []
+ this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : []
+ this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm && JSON.parse(JSON.stringify(json)).zrbm !== '[]' ? JSON.parse(JSON.stringify(json)).zrbm.split(',') : []
+ this.form.syrz = JSON.parse(JSON.stringify(json)).syrz && JSON.parse(JSON.stringify(json)).syrz !== '[]' ? JSON.parse(JSON.stringify(json)).syrz.split(',') : []
+ this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx && JSON.parse(JSON.stringify(json)).sycpx !== '[]' ? JSON.parse(JSON.stringify(json)).sycpx.split(',') : []
+ this.form.nylx = JSON.parse(JSON.stringify(json)).nylx && JSON.parse(JSON.stringify(json)).nylx !== '[]' ? JSON.parse(JSON.stringify(json)).nylx.split(',') : []
+ this.form.cllx = JSON.parse(JSON.stringify(json)).cllx && JSON.parse(JSON.stringify(json)).cllx !== '[]' ? JSON.parse(JSON.stringify(json)).cllx.split(',') : []
+ this.defaultCheckedKeys = [this.form.standSystem];
+ this.defaultCheckedKeys1 = [this.form.cycvppsbm];
+ this.defaultCheckedKeys2 = [this.form.kccvppsbm];
+ this.defaultCheckedKeys3 = [this.form.dybxh];
+ this.key++
+ this.key1++
+ this.key2++
+ this.key3++
+ this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+ this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : ''
+ this.form.prcNum = this.prcNum
+ this.form.prcName = this.prcName
+ this.form['id'] = bringData.id
+ this.standardDrawer = false
+ this.verifySarStandard = true
+ this.busVsFunc()
+ this.modelFunc()
+ this.$forceUpdate()
}
- }
+ // 遍历对象初始化文件信息
+ for(const p in this.form) {
+ if (typeof (this.form[p ]) != "function") {
+ this.initializeFileList(p,this.form[p]);
+ }
+ }
+ console.log("res",res);
+ })
} else if (this.standardCheckedList.length > 1) {
this.$message.warning('最多可以带入一条标准信息')
@@ -1890,8 +1895,8 @@
this.getFileList(value,this.kwjFileList);
break;
case 'jdwj':
- debugger
this.getFileList(value,this.jdwjFileList);
+ console.log("初始",this.jdwjFileList)
break;
case 'bpg':
this.getFileList(value,this.bpgFileList);
@@ -1909,7 +1914,7 @@
}, {
_this: this
}, res => {
- debugger
+
let fileList = res.data
if (fileList != null && fileList.length > 0) {
for (let i = 0; i < fileList.length; i++) {
@@ -2454,6 +2459,7 @@
break;
case 'jdwj':
this.fileList=this.jdwjFileList
+ break;
case 'kwj':
this.fileList=this.kwjFileList
break;
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 06/41] 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 07/41] =?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 ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 政策课题入会流程
+ 法规部部长审批
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 课题组联系方式
+
+
+
+
+
+
+
+
+
+
+
+
+ 集团内部参与人员
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 政策课题入会发起流程
+ 发起流程
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击上传
+
+
+
+
+
+
+
+
+
+
+
+ 课题组联系方式
+
+
+
+ 添加
+
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 集团内部参与人员
+
+
+
+ 添加
+
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击上传
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 流程发起人
+
+
+
+
+
+
+
+
+
+
+ 法规认证部部长
+
+
+
+
+
+
+
+
+
+
+ 法规认证部副总监
+
+
+
+
+
+
+
+
+
+
+ 公司副总
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 政策课题入会流程
+ 法规认证部副总监审批
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 课题组联系方式
+
+
+
+
+
+
+
+
+
+
+
+
+ 集团内部参与人员
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 政策课题入会流程
+ 公司副总审批
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 课题组联系方式
+
+
+
+
+
+
+
+
+
+
+
+
+ 集团内部参与人员
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- {{ form.xgdName }}
-
-
- - -
-
-
-
-
- {{ form.fbgbjbdName }}
-
-
- - -
-
-
-
-
- {{ form.zbjbdName }}
-
-
- - -
-
-
-
-
- {{ form.ssgName }}
-
-
- - -
-
-
-
-
- {{ form.caName }}
-
-
- - -
-
-
-
-
-
-
- {{ form.kwjName }}
-
-
- - -
-
-
-
-
- {{ form.jdwjName }}
-
-
- - -
-
-
-
-
- {{ form.bpgName }}
-
-
- - -
-
-
-
-
- {{ form.zqyjgName }}
-
-
- - -
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
+ {{value.name}}
+
+
+ - -
+
+
+
+
-
+
{
let index;
index = this.rh_pageData.comityTel.findIndex(items => {
- return items.id === item;
+ return items === item;
});
if (index > -1) {
this.rh_pageData.comityTel.splice(index, 1);
@@ -537,7 +560,6 @@ export default {
// 协会外部联系方式批量选择
selectedDelete(val) {
this.deleteDataList = val
- console.log(val)
},
// 流程阶段负责人选择
@@ -660,6 +682,9 @@ export default {
/deep/.el-table__body-wrapper {
height: auto!important;
}
+ /deep/.el-textarea__inner {
+ font-family: inherit;
+ }
.make_form {
border: 1px solid #DCDFE6;
padding: 10px;
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
index ba97fe78e..23a0d5765 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
@@ -14,7 +14,19 @@
基础信息
-
+
+
+
+
+ {{ rh_pageData.comityFileNum || '-' }}
+
+
+
+
+ {{ rh_pageData.comityFileName || '-' }}
+
+
+
@@ -33,32 +45,30 @@
{{ rh_pageData.comityKind || '-' }}
-
-
{{ rh_pageData.comityMake.makeQualification || '-' }}
+
+
{{ rh_pageData.comityMake.makeRole || '' }}
-
-
{{ rh_pageData.comityMake.makeCost || '-' }}
+
+
{{ rh_pageData.comityMake.makeDuties || '-' }}
-
-
{{ rh_pageData.comityMake.makeTime || '-' }}
@@ -195,7 +205,6 @@
>
{
})
},
+
+ getData() {
+ const params = {
+ taskIds: this.taskIds,
+ pId: this.pId,
+ }
+ inboundLiaisonDetail(params).then(res => {
+ const processForm = JSON.parse(res.mesg)
+ this.getFormFieldList(processForm)
+ })
+ },
+ getFormFieldList (item) {
+ this.$nextTick(() => {
+ this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
+ // this.rh_pageData.comityFileNum = this.fileTextList
+ })
+ },
// 右上标签页面切换
handleTabs(name) {
this.active = name
@@ -285,6 +320,18 @@ export default {
this.roleShowflag = true
},
drawerCheck (data) {
+ var idList = ''
+ var nameList = ''
+ data.forEach(item => {
+ if (nameList.length > 0) {
+ nameList += ','
+ idList += ','
+ }
+ idList += item.id;
+ nameList += item.name;
+ });
+ this.rh_pageData.comityInRole = nameList
+ this.rh_pageData.comityInRoleId = idList
this.roleShowflag = false
},
// 退回按钮
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
index 8857f2844..17f33801b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
@@ -15,6 +15,18 @@
+
+
+
+ {{ rh_pageData.comityFileNum || '-' }}
+
+
+
+
+ {{ rh_pageData.comityFileName || '-' }}
+
+
+
@@ -33,23 +45,16 @@
{{ rh_pageData.comityKind || '-' }}
-
-
{{ rh_pageData.comityMake.makeQualification || '-' }}
-
-
- {{ rh_pageData.comityMake.makeRole || '' }}
-
-
-
- {{ rh_pageData.comityMake.makeCost || '-' }}
+
+ {{ rh_pageData.comityMake.makeRole || '' }}
@@ -59,15 +64,17 @@
+
+
+ {{ rh_pageData.comityMake.makeCost || '-' }}
+
+
{{ rh_pageData.comityMake.makeTime || '-' }}
-
-
-
填写信息
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 外部标准化协会入会流程
+ 发起流程
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+ {{ rh_pageData.comityFileNum || '-' }}
+
+
+
+
+ {{ rh_pageData.comityFileName || '-' }}
+
+
+
+
+
+
+ {{ 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.comityFileNum || '-' }}
+
+
+
+
+ {{ rh_pageData.comityFileName || '-' }}
+
+
+
+
+
+
+ {{ 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 ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+
+
@@ -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 5e91adf70..907ac844e 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -990,6 +990,54 @@ export default {
})
}
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
}
},
...mapMutations(['setProcess', 'setHandleInfo']),
diff --git a/src/router/index.js b/src/router/index.js
index 8d38cbcfa..92085f4b1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1096,6 +1096,99 @@ 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: '/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: '外部标准化协会参会流程（修订）'
+ }
+ },
]
},
// 本地工具
@@ -1279,52 +1372,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: '外部标准化协会入会流程（修订）'
- }
- },
]
},
// 标准法规库
From 17919a03f78838a35016196b32519f1f1a1046b0 Mon Sep 17 00:00:00 2001
From: shenyanpei
Date: Wed, 27 Oct 2021 16:59:33 +0800
Subject: [PATCH 12/41] =?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=8F=82=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/creatProcess/bzhHd-rh/step1.vue | 10 +-
.../pages/creatProcess/bzhHd-rh/step2.vue | 1 +
.../pages/creatProcess/bzhHy-ch/step1.vue | 450 +++++++++++++++++-
.../pages/creatProcess/bzhHy-ch/step2.vue | 367 +++++++++++++-
.../pages/creatProcess/bzhHy-ch/step3.vue | 394 ++++++++++++++-
.../pages/creatProcess/bzhHy-ch/step4.vue | 371 ++++++++++++++-
.../pages/creatProcess/bzhHy-ch/step5.vue | 365 +++++++++++++-
7 files changed, 1934 insertions(+), 24 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
index 78d9bd1d8..dd60c72b3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
@@ -33,7 +33,7 @@
-
+
-
+
+
+ 外部标准化协会入会流程
+ 发起流程
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 计划内
+ 计划外
+
+
+
+
+
+ 添加
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 流程发起人
+
+
+
+
+
+
+
+
+
+
+ 分委会主任/部门中心主任
+
+
+
+
+
+
+
+
+
+
+
+ 责任工程师
+
+
+
+
+
+
+
+
+
+
+
+ 参会人员所在部门中心主任
+
+
+
+
+
+
+
+
+
+
+
+ 标准法规部人员
+
+
+
+
+
+
+
+
+
+
+
+ 标准法规部主管中心主任
+
+
+
+
+
+
+
+
+
+
+
+ 管理推荐部
+
+
+
+
+
+
+
+
+
+
+
+ 技术委员会常务副主任/总院院长
+
+
+
+
+
+
+
+
+
+
+
+ 技术委员会主任
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 外部标准化协会入会流程
+ 发起流程
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+ {{ ch_pageData.meetingName || '-' }}
+
+
+
+
+ {{ ch_pageData.primaryUnit || '-' }}
+
+
+
+
+
+
+ {{ ch_pageData.associaName || '-' }}
+
+
+
+
+ {{ ch_pageData.meetingTime || '-' }}
+
+
+
+
+
+
+ {{ ch_pageData.meetingPlace || '-' }}
+
+
+
+
+ {{ ch_pageData.feeStand || '-' }}
+
+
+
+
+
+
+ {{ ch_pageData.feeKind || '-' }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ ch_pageData.sort || '-'}}
+
+
+
+
+
+
+
+
+
+
+ 选择人员
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 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 ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+ 外部标准化协会入会流程
+ 发起流程
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+ {{ ch_pageData.meetingName || '-' }}
+
+
+
+
+ {{ ch_pageData.primaryUnit || '-' }}
+
+
+
+
+
+
+ {{ ch_pageData.associaName || '-' }}
+
+
+
+
+ {{ ch_pageData.meetingTime || '-' }}
+
+
+
+
+
+
+ {{ ch_pageData.meetingPlace || '-' }}
+
+
+
+
+ {{ ch_pageData.feeStand || '-' }}
+
+
+
+
+
+
+ {{ ch_pageData.feeKind || '-' }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ ch_pageData.sort || '-' }}
+
+
+
+
+
+
+
+
+
+
+ 填写信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 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 ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+ 外部标准化协会入会流程
+ 发起流程
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+ {{ ch_pageData.meetingName || '-' }}
+
+
+
+
+ {{ ch_pageData.primaryUnit || '-' }}
+
+
+
+
+
+
+ {{ ch_pageData.associaName || '-' }}
+
+
+
+
+ {{ ch_pageData.meetingTime || '-' }}
+
+
+
+
+
+
+ {{ ch_pageData.meetingPlace || '-' }}
+
+
+
+
+ {{ ch_pageData.feeStand || '-' }}
+
+
+
+
+
+
+ {{ ch_pageData.feeKind || '-' }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ ch_pageData.sort || '-' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 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 ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+ 外部标准化协会入会流程
+ 发起流程
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+ {{ ch_pageData.meetingName || '-' }}
+
+
+
+
+ {{ ch_pageData.primaryUnit || '-' }}
+
+
+
+
+
+
+ {{ ch_pageData.associaName || '-' }}
+
+
+
+
+ {{ ch_pageData.meetingTime || '-' }}
+
+
+
+
+
+
+ {{ ch_pageData.meetingPlace || '-' }}
+
+
+
+
+ {{ ch_pageData.feeStand || '-' }}
+
+
+
+
+
+
+ {{ ch_pageData.feeKind || '-' }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ ch_pageData.sort || '-' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 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 ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+ 政策课题参会发起流程
+ 发起流程
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击上传
+
+
+
+
+
+
+
+
+
+
+
+ 课题组联系方式
+
+
+
+ 添加
+
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 集团内部参与人员
+
+
+
+ 添加
+
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击上传
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 流程发起人
+
+
+
+
+
+
+
+
+
+
+ 法规认证部部长
+
+
+
+
+
+
+
+
+
+
+ 公司副总
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+ placeholder="请选择参会时间">
@@ -66,12 +66,26 @@
>
-
- 点击上传
-
+
+
+
+
+ 点击上传
+
+
-
{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}
+
{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}
- 外部信息
+ 课题组联系方式
-
+
添加
-
+
批量删除
@@ -109,36 +123,49 @@
row-key="id">
+
+
+
+
+
+
+
+
+
+
+
+
- 内部信息
+ 集团内部参与人员
-
+
添加
-
+
批量删除
@@ -153,48 +180,103 @@
row-key="id">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击上传
+
+
+
+
+
+
+
+
+
+
+
@@ -207,44 +289,33 @@
class="label-input-form">
-
+
流程发起人
-
-
+
+
-
+
-
+
法规认证部部长
-
-
-
-
-
-
-
-
-
- 法规认证部副总监
-
-
-
+
+
-
+
公司副总
-
-
+
+
@@ -262,6 +333,55 @@
@submit="handleSubmit"
>
+
+
+
+
+
+
+
+
+
+
+
@@ -280,6 +400,7 @@
},
data() {
return {
+ commentText: '',
isSubmit: false,
saveLoading: false,
active: "1", //默认显示
@@ -291,16 +412,250 @@
time2: '',
place: '',
Company: '',
+ modelNameList: '',
+ modelList: []
+ },
+ formRules: {
+ title: [
+ { required: true, message: '请输入课题名称', trigger: 'blur' },
+ ],
+ content: [
+ { required: true, message: '请输入主要议题', trigger: 'blur' },
+ ],
+ price: [
+ { required: true, message: '请输入费用', trigger: 'blur' },
+ ],
+ time: [
+ { required: true, message: '请选择课题研究周期', trigger: 'change' },
+ ],
+ time2: [
+ { required: true, message: '请选择参会时间', trigger: 'change' },
+ ],
+ place: [
+ { required: true, message: '请输入参会地点', trigger: 'blur' },
+ ],
+ Company: [
+ { required: true, message: '请输入承办单位', trigger: 'blur' },
+ ],
+ modelNameList: [
+ { required: true, message: '请上传课题组通知', trigger: 'blur' },
+ ]
},
- formRules: {},
foldFormFlag: true,
data1: [],
data2: [],
- roleForm: {},
- roleFormRules: {}
+ roleForm: {
+ revisionId: this.$store.getters.userInfo.userId,
+ revisionIdName: this.$store.getters.userInfo.userName,
+ ministerId: '',
+ ministerIdName: '',
+ presidentId: '',
+ presidentIdName: '',
+ },
+ roleFormRules: {
+ ministerIdName: [
+ {required: true, message: '请选择法规认证部部长', trigger: 'change'},
+ ],
+ inspectorIdName: [
+ {required: true, message: '请选择法规认证部总监', trigger: 'change'},
+ ],
+ presidentIdName: [
+ {required: true, message: '请选择公司副总', trigger: 'change'},
+ ]
+ },
+ fileMadel: false,
+ fileMadel2: false,
+ fileUrl: 'api/att/attFile/upload',
+ idList1: [],
+ idList2: [],
+ fileIndex: '',
+ fileList: [],
+ nodeList: [],
+ type: '',
+ drawerTitle: '',
+ modalshowflag: false,
}
},
methods: {
+ add1() {
+ var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
+ var json = {
+ ContactPerson: '',
+ Company: '',
+ Telephone: '',
+ Email: '',
+ id: id
+ }
+ this.data1.push(json)
+ },
+ add2() {
+ var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
+ var json = {
+ Sindex: '',
+ Member: '',
+ Company: '',
+ Email: '',
+ id: id,
+ Department: '',
+ Telephone: '',
+ Identity: '',
+ dataName: '',
+ data: [],
+ }
+ this.data2.push(json)
+ },
+ addDelete1() {
+ if (this.idList1.length > 0) {
+ this.$confirm('删除选中数据, 是否继续?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ for (let a = 0; a < this.data1.length; a++) {
+ this.idList1.forEach(item => {
+ if (this.data1[a].id === item) {
+ this.data1.splice(a, 1)
+ }
+ })
+ }
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '已取消删除'
+ });
+ });
+ } else {
+ this.$message.warning('请选择要删除的数据')
+ }
+ },
+ addDelete2() {
+ if (this.idList2.length > 0) {
+ this.$confirm('删除选中数据, 是否继续?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ for (let a = 0; a < this.data2.length; a++) {
+ this.idList2.forEach(item => {
+ if (this.data2[a].id === item) {
+ this.data2.splice(a, 1)
+ }
+ })
+ }
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '已取消删除'
+ });
+ });
+ } else {
+ this.$message.warning('请选择要删除的数据')
+ }
+ },
+ // 导入按钮 上传之前的钩子
+ beginImportFile(file) {
+ var filename = file.name
+ var index1 = filename.lastIndexOf('.')
+ var index2 = filename.length
+ var fileSuffix = filename.substring(index1, index2)
+ // const fileSuffix = file.name.split('.')[1] // 后缀名
+ // 判断上传文件格式
+ if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+ return true
+ } else {
+ this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
+ return false
+ }
+ // 判断文件上传大小
+ // eslint-disable-next-line no-unreachable
+ if (file.size / 1024 / 1024 <= 200) {
+ return true
+ } else {
+ this.$message.error('文件' + file.name + '大小不超过200M')
+ return false
+ }
+ return true
+ },
+ importFileSuccess(response, file) {
+ if (response.ok) {
+ this.rhform.modelList.push(response.data)
+ let list = ''
+ this.rhform.modelList.forEach(item => {
+ if (list.length > 0) {
+ list += ','
+ list += item.name
+ } else {
+ list+= item.name
+ }
+ })
+ this.rhform.modelNameList = list
+ this.$message({
+ showClose: true,
+ message: response.message,
+ type: 'success'
+ })
+ } else {
+ this.$message.error('程序异常，上传失败')
+ }
+ },
+ importFileRemove(file, fileList) {
+ let list = ''
+ this.rhform.modelList = []
+ fileList.forEach(item => {
+ this.rhform.modelList.push(item)
+ if (list.length > 0) {
+ list += ','
+ list += item.name
+ } else {
+ list+= item.name
+ }
+ })
+ this.rhform.modelNameList = list
+ },
+ importFileSuccess2(response, file) {
+ if (response.ok) {
+ this.data2[this.fileIndex].data.push(response.data)
+ let list = ''
+ this.data2[this.fileIndex].data.forEach(item => {
+ if (list.length > 0) {
+ list += ','
+ list += item.name
+ } else {
+ list+= item.name
+ }
+ })
+ this.data2[this.fileIndex].dataName = list
+ this.$message({
+ showClose: true,
+ message: response.message,
+ type: 'success'
+ })
+ } else {
+ this.$message.error('程序异常，上传失败')
+ }
+ },
+ importFileRemove2(file, fileList) {
+ let list = ''
+ this.data2[this.fileIndex].data = []
+ fileList.forEach(item => {
+ this.data2[this.fileIndex].data.push(item)
+ if (list.length > 0) {
+ list += ','
+ list += item.name
+ } else {
+ list+= item.name
+ }
+ })
+ this.data2[this.fileIndex].dataName = list
+ },
+ fileUpload() {
+ this.fileMadel = true
+ },
+ fileUpload2(index) {
+ this.fileIndex = index
+ this.fileList = this.data2[this.fileIndex].data
+ this.fileMadel2 = true
+ },
handleTabs(type) {
this.active = type;
}, // 切换tabs
@@ -310,14 +665,139 @@
handleSave() {
}, // 保存事件
handleSubmit() {
- console.log(this.rhform);
+ this.$refs['rhForm'].validate((valid) => {
+ if (valid) {
+ if (this.data1.length) {
+ if (this.data2.length) {
+ let ContactPerson = 0,Company = 0,Telephone = 0,Email = 0,Sindex = 0,Member = 0,Telephone2 = 0,Email2 = 0, Company2 = 0,Department = 0,Identity = 0
+ this.data1.forEach((item, index) =>{
+ if (!item.ContactPerson) {
+ ContactPerson++
+ } else if (!item.Company) {
+ Company++
+ } else if (!item.Telephone) {
+ Telephone++
+ } else if (!item.Email) {
+ Email++
+ }
+ })
+ this.data2.forEach((item, index) =>{
+ if (!item.Sindex) {
+ Sindex++
+ } else if (!item.Member) {
+ Member++
+ } else if (!item.Telephone) {
+ Telephone2++
+ } else if (!item.Email) {
+ Email2++
+ } else if (!item.Company) {
+ Company2++
+ } else if (!item.Department) {
+ Department++
+ } else if (!item.Identity) {
+ Identity++
+ }
+ })
+ if (ContactPerson > 0) {
+ return this.$message.warning('请输入联络人')
+ } else if (Company > 0) {
+ return this.$message.warning('请输入课题组联络人单位')
+ } else if (Telephone > 0) {
+ return this.$message.warning('请输入课题组联络人电话')
+ } else if (Email > 0) {
+ return this.$message.warning('请输入课题组联络人邮箱')
+ } else if (Sindex > 0) {
+ return this.$message.warning('请输入工作组排名顺序')
+ } else if (Member > 0) {
+ return this.$message.warning('请输入我司成员')
+ } else if (Telephone2 > 0) {
+ return this.$message.warning('请输入内部参与人员电话')
+ } else if (Email2 > 0) {
+ return this.$message.warning('请输入内部参与人员油邮箱')
+ } else if (Company2 > 0) {
+ return this.$message.warning('请输入内部参与人员单位')
+ } else if (Department > 0) {
+ return this.$message.warning('请输入内部参与人员部门')
+ } else if (Identity > 0) {
+ return this.$message.warning('请输入内部参与人员身份')
+ } else {
+ this.$refs['Form'].validate((valid) => {
+ if (valid) {
+ this.isSubmit = true
+ this.$http.get('lawss/activiti/startProcess', {
+ type: '18'
+ }, {}, res => {
+ if (res.ok) {
+ var json = Object.assign(this.rhform, this.roleForm)
+ json.commentText = this.commentText
+ json.data1 = this.data1
+ json.data2 = this.data2
+ this.$http.post('lawss/activiti/completeTask', {
+ json: JSON.stringify(json),
+ taskId: res.data,
+ userId: this.$store.getters.userInfo.userId
+ }, {}, res => {
+ if (res.success) {
+ this.$message.success('流程发起成功')
+ this.$router.push('/processCenter')
+ this.isSubmit = false
+ } else {
+ this.$message.warning('流程启动失败')
+ this.isSubmit = false
+ }
+ })
+ } else {
+ this.$message.warning('流程启动失败')
+ this.isSubmit = false
+ }
+ })
+ } else {
+ return this.$message.warning('请完善人员信息')
+ }
+ })
+ }
+ } else {
+ return this.$message.warning('请添加集团内部参与人员')
+ }
+ } else {
+ return this.$message.warning('请添加课题组人员')
+ }
+ } else {
+ return this.$message.warning('请完善基础信息')
+ }
+ })
}, // 提交事件
- handleSelectionChange1() {
+ handleSelectionChange1(val) {
+ this.idList1 = []
+ val.forEach(item => {
+ this.idList1.push(item.id)
+ })
}, // table1选中change事件
- handleSelectionChange2() {
+ handleSelectionChange2(val) {
+ this.idList2 = []
+ val.forEach(item => {
+ this.idList2.push(item.id)
+ })
}, // table2选中change事件
- choiceZRR() {
+ choiceZRR(type, title, id) {
+ this.nodeList = []
+ this.nodeList.push(id)
+ this.type = type
+ this.drawerTitle = title
+ this.modalshowflag = true
}, // 点击人员input事件
+ checkedRole(data) {
+ if (this.type === 'ministerId') {
+ this.roleForm.ministerId = data[0].id
+ this.roleForm.ministerIdName = data[0].name
+ } else if (this.type === 'inspectorId') {
+ this.roleForm.inspectorId = data[0].id
+ this.roleForm.inspectorIdName = data[0].name
+ } else if (this.type === 'presidentId') {
+ this.roleForm.presidentId = data[0].id
+ this.roleForm.presidentIdName = data[0].name
+ }
+ }, // 选择人员确认事件
},
mounted() {}
};
diff --git a/src/pages/processCenter/pages/creatProcess/zcch/step2.vue b/src/pages/processCenter/pages/creatProcess/zcch/step2.vue
new file mode 100644
index 000000000..0242c64f2
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/zcch/step2.vue
@@ -0,0 +1,433 @@
+
+
+
+ 政策课题参会发起流程
+ 法规部部长审批
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 课题组联系方式
+
+
+
+
+
+
+
+
+
+
+
+
+ 集团内部参与人员
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/zcch/step3.vue b/src/pages/processCenter/pages/creatProcess/zcch/step3.vue
new file mode 100644
index 000000000..fdf0fe27f
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/zcch/step3.vue
@@ -0,0 +1,408 @@
+
+
+
+ 政策课题参会发起流程
+ 公司副总审批
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 课题组联系方式
+
+
+
+
+
+
+
+
+
+
+
+
+ 集团内部参与人员
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/zchh/step1.vue b/src/pages/processCenter/pages/creatProcess/zchh/step1.vue
index 930ba594e..1d7dd9a29 100644
--- a/src/pages/processCenter/pages/creatProcess/zchh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/zchh/step1.vue
@@ -99,7 +99,7 @@