From d8c688bf5fa596a5c22c6eee6eec8d435e82a9d7 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 2 Dec 2021 18:06:07 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E4=BC=81?= =?UTF-8?q?=E6=A0=87=20=E5=A4=9A=E9=80=89=E6=A0=8F=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 2 +- .../regulatoryRepository/foreignRegulationsDatabase/index.vue | 2 +- .../foreignStandardsAndRegulations/index.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 2cc363571..322658c1c 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -195,8 +195,8 @@ :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="standSelectChange"> + diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue index 6a155f2ee..36545c4c5 100644 --- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue +++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue @@ -181,8 +181,8 @@ fontWeight: 'bold', height: '48px'}" @selection-change="standSelectChange" > + + From bc4b4dca4cd7a26b801bde088fc63ba39994f371 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 2 Dec 2021 21:02:54 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E6=AD=A5=E4=BF=9D=E5=AD=98=E5=90=8E=E6=96=87=E4=BB=B6=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index b54c9cb35..627beb06f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1750,6 +1750,14 @@ this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form['id'] = item.id + + // 遍历对象初始化文件信息 + for(const p in this.form) { + if (typeof (this.form[p ]) != "function") { + this.initializeFileList(p,this.form[p]); + } + } + }) }, // 将文本状态的id与name对应 From 7206a24355281fe55bcc8724c8ad898414f1949d Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 3 Dec 2021 09:39:24 +0800 Subject: [PATCH 03/16] commit --- src/components/navMenu/index.vue | 50 +++++++++---------- .../enterBSysRevPlanManaLib/index.vue | 1 - 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 01799fdb3..09c1e0610 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -116,11 +116,11 @@ // path: '/partCodeApply', // menuId: 'ad9db496772c075f78495382b7581fe9' // }, - // { - // title: '工作组数据统计', - // path: '/dataStatisComments', - // menuId: '' - // }, + { + title: '工作组数据统计', + path: '/dataStatisComments', + menuId: '' + }, { title: '海外法规', path: '/foreignStandardsAndRegulations', @@ -132,11 +132,11 @@ menuId: '2b25c67f10abbbadf37d60daaaec54d3' }, - // { - // title: '国内外政策', - // path: '/foreignRegulationsDatabase', - // menuId: 'ef02a3b0af9a4b3ede460456a9591ebc' - // }, + { + title: '国内外政策', + path: '/foreignRegulationsDatabase', + menuId: 'ef02a3b0af9a4b3ede460456a9591ebc' + }, // // // { // // // title: '标准制修订管理', // // // path: '/demo2One' @@ -182,10 +182,10 @@ path: '/nonConfomity', menuId: '0119abd677e0204e061eb0f0b8cafda0' }, - // { - // title: '工作组', - // path: '/workingGroup', - // }, + { + title: '工作组', + path: '/workingGroup', + }, // { // title: '备案产品标准库', // path: '/enterpriseStandardFiling', @@ -196,11 +196,11 @@ path: '/standInvolveProject', menuId: '8a9c87fe06244fb9d55e78fb281f625b' }, - // { - // title: '企标制修订计划', - // path: '/enterpriseStandardPlan', - // // menuId: '8a9c87fe06244fb9d55e78fb281f625b' - // } + { + title: '企标制修订计划', + path: '/enterpriseStandardPlan', + // menuId: '8a9c87fe06244fb9d55e78fb281f625b' + } // { // title: '动态信息', // path: '/information', @@ -254,7 +254,7 @@ { title: '标准化活动日历', path: '/standCalendar', - menuId: '0ea66e3dd36873082b6851f69e92c8be' + menuId: '' }, // { // title: '标准比对库', @@ -342,11 +342,11 @@ // path: '/convertDocView', // menuId: '3F52K25546' // }, - // { - // title: '菜单管理', - // path: '/menuManage', - // menuId: '87b8b4f5817a7829696e63185c744d52' - // }, + { + title: '菜单管理', + path: '/menuManage', + menuId: '87b8b4f5817a7829696e63185c744d52' + }, { title: '链接管理', path: '/linkManage', diff --git a/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue b/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue index 9a2d65b9d..5c27786fe 100644 --- a/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue +++ b/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue @@ -146,7 +146,6 @@ @click="clearSearch" > - Date: Fri, 3 Dec 2021 10:05:16 +0800 Subject: [PATCH 04/16] commit --- .../processCenter/pages/newProcess/index.vue | 840 ++++++++---------- 1 file changed, 354 insertions(+), 486 deletions(-) diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index 4752ed581..d45ee8087 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -16,9 +16,9 @@
- - - + + + @@ -225,382 +225,232 @@
-
标准调研流程
+
参与外部标准制修订信息提报流程
- + -
+
-
标准征求意见流程
+
外部标准化协会入会流程
- + -
+
-
标准清单发布/更新流程
+
外部标准化协会参会流程
- + -
+
-
标准合规评估流程
+
政策征求意见流程
+ + +
- + -
+
-
未符合项整改流程
+
重点认证标准/政策合规性项目审查流程
+ + +
- + -
+
-
标准解读流程
+
企标复审流程
- + -
+
-
项目合规评估流程-项目
+
企标废止流程
- + -
+
-
项目清单确认流程
+
企标制修订计划管控
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
From 1cc9edc022cf9564628343078912d340ffcbe3a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 3 Dec 2021 10:40:28 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=88=86=E9=A1=B5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue | 3 ++- src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue | 2 +- src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index ef1f9f7ae..00a810200 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -702,12 +702,12 @@ export default { standNumber: '', //标准编号 standCode: '', //企标编号 dataSource: 'INLAND', + standType: 'INLAND', lawNumber: '', // 标准编号/政策编号 lawName: '', // 标准名称/政策名称 page: 1, pageSize: this.$store.getters.userInfo.configContent, total: 0, - standType: '', quoteIdList: '', validFlag: '0', menuId: 'nomenu' @@ -1094,6 +1094,7 @@ export default { }, //添加标准的查询按钮 searchLawBtn(){ + console.log(this.handleSelectForm); this.lawInfoTableLoading = true if (this.handleSelectForm.dataSource === 'INLAND'){ this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{ diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue index 0072b8b4c..f886ef95e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue @@ -721,7 +721,7 @@ export default { page: 1, pageSize: this.$store.getters.userInfo.configContent, total: 0, - standType: '', + standType: 'INLAND', quoteIdList: '', validFlag: '0', menuId: 'nomenu' diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue index 376574cb6..611fd5c46 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue @@ -705,7 +705,7 @@ export default { page: 1, pageSize: this.$store.getters.userInfo.configContent, total: 0, - standType: '', + standType: 'INLAND', quoteIdList: '', validFlag: '0', menuId: 'nomenu' From 691f139158dd88346020ffbe8704bfdff2065741 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Fri, 3 Dec 2021 11:24:04 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=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/creatProcess/bzhHd-rh/step1.vue | 109 +++++---- .../pages/creatProcess/bzhHd-rh/step2.vue | 133 ++++++----- .../pages/creatProcess/bzhHd-rh/step3.vue | 97 +++++--- .../pages/creatProcess/bzhHd-rh/step4.vue | 137 ++++++----- .../pages/creatProcess/bzhHd-rh/step5.vue | 73 ++++-- .../pages/creatProcess/bzhHd-rh/step6.vue | 216 +++++++++--------- 6 files changed, 451 insertions(+), 314 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index d89dae681..f5ebeacff 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -67,7 +67,7 @@ v-for="item in comityRoleOptions" :key="item.value" :label="item.label" - :value="item.value"/> + :value="item.label"/> @@ -80,7 +80,7 @@ v-for="item in comityStateOptions" :key="item.value" :label="item.label" - :value="item.value"/> + :value="item.label"/> @@ -93,7 +93,7 @@ v-for="item in comityKindOptions" :key="item.value" :label="item.label" - :value="item.value"/> + :value="item.label"/> @@ -161,7 +161,7 @@ - +
@@ -196,7 +196,7 @@ align="center" label="联络人"> @@ -228,6 +228,19 @@
+ + +
+ + +
+ +
@@ -469,6 +482,8 @@ export default { nodeListOne: [], isSubmit: false, saveLoading: false, + + commentText: '', } }, @@ -530,6 +545,7 @@ export default { this.fileTextList.splice(index, 1) } }) + this.rh_pageData.infoSources = this.fileTextList }, // 文件上传成功 handleOnsuccess(res, file, fileList) { @@ -547,6 +563,7 @@ export default { }) } this.fileListData.fileText = this.newDataList + this.rh_pageData.infoSources = this.newDataList this.$message({ showClose: true, message: res.message, @@ -663,7 +680,8 @@ export default { _formData.append('prcType', '20') _formData.append('json', JSON.stringify({ roleForm: this.roleForm, - rh_pageData: this.rh_pageData + rh_pageData: this.rh_pageData, + commentText: this.commentText })) saveTaskFirst(_formData).then(res => { this.saveLoading = false @@ -675,41 +693,46 @@ export default { }, // 提交按钮 handleSubmit() { - let json = { - prcCreateUser: this.$store.getters.userInfo.userId, - prcCreateUserName: this.$store.getters.userInfo.userName, - roleList: this.roleForm, - rh_pageData: this.rh_pageData, - directorList: this.rh_pageData.comityInRoleId, - } - this.$refs['rh_pageData'].validate((valid) => { - if (valid) { - this.$refs['roleForm'].validate((valid) => { - if (valid) { - this.isSubmit = true - const paramsInfo = { - type: '20' - } - startProcess(paramsInfo).then(res => { - this.taskID = res.data - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskID) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }) - }) - } else { - this.$message.warning('请完成流程信息的人员选择') - } - }) + if (this.commentText === '') { + this.$message.warning('请输入回执说明') + } else { + let json = { + prcCreateUser: this.$store.getters.userInfo.userId, + prcCreateUserName: this.$store.getters.userInfo.userName, + roleList: this.roleForm, + rh_pageData: this.rh_pageData, + commentText: this.commentText, + directorList: this.rh_pageData.comityInRoleId, } - }) + this.$refs['rh_pageData'].validate((valid) => { + if (valid) { + this.$refs['roleForm'].validate((valid) => { + if (valid) { + this.isSubmit = true + const paramsInfo = { + type: '20' + } + startProcess(paramsInfo).then(res => { + this.taskID = res.data + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskID) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }) + }) + } else { + this.$message.warning('请完成流程信息的人员选择') + } + }) + } + }) + } } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index 746fbfade..93313835a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -15,18 +15,6 @@
- - - - {{ rh_pageData.comityFileNum || '-' }} - - - - - {{ rh_pageData.comityFileName || '-' }} - - - @@ -75,8 +63,18 @@ + + + + {{ '-' }} + + {{ item.name }} {{ ';'}} + + + + - +
- +
{ - if (valid) { - this.isBack = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('退回成功') - this.$router.push("/processCenter"); - } - this.isBack = false - }); + if (this.commentText === '') { + this.$message.warning('请输入审批意见') + } else { + let json = { + roleList: this.roleForm, + memberId: this.$store.getters.userInfo.userId, + passFlag: '0', + commentText: this.commentText, + rh_pageData: this.rh_pageData, } - }) + this.$refs['rh_pageData'].validate((valid) => { + if (valid) { + this.isBack = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('退回成功') + this.$router.push("/processCenter"); + } + this.isBack = false + }); + } + }) + } }, // 提交按钮 handleSubmit() { - let json = { - roleList: this.roleForm, - memberId: this.$store.getters.userInfo.userId, - passFlag: '1', - commentText: this.commentText, - rh_pageData: this.rh_pageData, - } - this.$refs['rh_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); + if (this.commentText === '') { + this.$message.warning('请输入审批意见') + } else { + let json = { + roleList: this.roleForm, + memberId: this.$store.getters.userInfo.userId, + passFlag: '1', + commentText: this.commentText, + rh_pageData: this.rh_pageData, } - }) + this.$refs['rh_pageData'].validate((valid) => { + if (valid) { + this.isSubmit = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } + }) + } } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue index fb8e342a1..033c60363 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -15,18 +15,6 @@
- - - - {{ rh_pageData.comityFileNum || '-' }} - - - - - {{ rh_pageData.comityFileName || '-' }} - - - @@ -75,6 +63,16 @@ + + + + {{ '-' }} + + {{ item.name }} {{ ';'}} + + + +
+ + +
+ + +
+ +
@@ -303,6 +315,7 @@ export default { workPath: '', comityTel: [], fillPeople: '', + fillPeopleId: '', fillUnit: '', fillDept: '', fillPost: '', @@ -324,6 +337,8 @@ export default { taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, + commentText: '', + infoSourcesLength: '' } }, computed: { @@ -364,7 +379,9 @@ export default { this.$nextTick(() => { this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName + this.rh_pageData.fillPeopleId = this.$store.getters.userInfo.userId this.roleForm = JSON.parse(JSON.stringify(item)).roleList + this.infoSourcesLength = this.rh_pageData.infoSources.length // this.rh_pageData.comityFileNum = this.fileTextList }) }, @@ -409,29 +426,41 @@ export default { }, // 提交按钮 handleSubmit() { - let json = { - roleList: this.roleForm, - selfUser: this.$store.getters.userInfo.userId, - charge: this.rh_pageData.fillLeaderId, - rh_pageData: this.rh_pageData, - } - this.$refs['rh_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); + if (this.commentText === '') { + this.$message.warning('请输入回执说明') + } else { + let json = { + roleList: this.roleForm, + selfUser: this.$store.getters.userInfo.userId, + charge: this.rh_pageData.fillLeaderId, + rh_pageData: this.rh_pageData, } - }) - } + this.$refs['rh_pageData'].validate((valid) => { + if (valid) { + this.isSubmit = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } + }) + } + + }, + /** 点击对应附件进行下载*/ + previews(val) { + let attId = val + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } + }, } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue index 6148c73ab..e1b2a0e03 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue @@ -15,18 +15,6 @@
- - - - {{ rh_pageData.comityFileNum || '-' }} - - - - - {{ rh_pageData.comityFileName || '-' }} - - - @@ -75,6 +63,16 @@ + + + + {{ '-' }} + + {{ item.name }} {{ ';'}} + + + + @@ -116,7 +114,7 @@
- +
{ this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData + this.infoSourcesLength = this.rh_pageData.infoSources.length this.rh_pageData.myPartRole = [{ + fillPeopleId: this.rh_pageData.fillPeopleId, fillPeople: this.rh_pageData.fillPeople, fillUnit: this.rh_pageData.fillUnit, fillDept: this.rh_pageData.fillDept, @@ -331,57 +334,73 @@ export default { // 退回按钮 handleSubmitNo() { - let json = { - member: this.selfUser, - passFlag: '0', - roleList: this.roleForm, - commentText: this.textarea, - rh_pageData: this.rh_pageData, - } - this.$refs['rh_pageData'].validate((valid) => { - if (valid) { - this.isBack = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('退回成功') - this.$router.push("/processCenter"); - } - this.isBack = false - }); + if(this.textarea === '') { + this.$message.warning('请输入审批意见') + } else { + let json = { + member: this.selfUser, + passFlag: '0', + roleList: this.roleForm, + commentText: this.textarea, + rh_pageData: this.rh_pageData, } - }) + this.$refs['rh_pageData'].validate((valid) => { + if (valid) { + this.isBack = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('退回成功') + this.$router.push("/processCenter"); + } + this.isBack = false + }); + } + }) + } + }, // 提交按钮 handleSubmit() { - let json = { - member: this.selfUser, - passFlag: '1', - engineerSum: this.roleForm.startUser, - roleList: this.roleForm, - commentText: this.textarea, - rh_pageData: this.rh_pageData, - } - this.$refs['rh_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); + if(this.textarea === '') { + this.$message.warning('请输入审批意见') + } else { + let json = { + member: this.selfUser, + passFlag: '1', + engineerSum: this.roleForm.startUser, + roleList: this.roleForm, + commentText: this.textarea, + rh_pageData: this.rh_pageData, } - }) - } + this.$refs['rh_pageData'].validate((valid) => { + if (valid) { + this.isSubmit = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } + }) + } + }, + /** 点击对应附件进行下载*/ + previews(val) { + let attId = val + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } + }, } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue index e8160495e..fae37b7b7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue @@ -15,18 +15,6 @@
- - - - {{ rh_pageData.comityFileNum || '-' }} - - - - - {{ rh_pageData.comityFileName || '-' }} - - - @@ -75,6 +63,16 @@ + + + + {{ '-' }} + + {{ item.name }} {{ ';'}} + + + + @@ -154,6 +152,19 @@
+ + +
+ + +
+ +
@@ -294,6 +305,10 @@ export default { taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, + deleteDataList: [], + + infoSourcesLength: '', + commentText: '' } }, computed: { @@ -338,6 +353,7 @@ export default { this.$nextTick(() => { this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData this.roleForm = JSON.parse(JSON.stringify(item)).roleList + this.infoSourcesLength = this.rh_pageData.infoSources.length // this.rh_pageData.comityFileNum = this.fileTextList }) }, @@ -356,7 +372,7 @@ export default { this.deleteDataList.map(item => { let index; index = this.rh_pageData.myPartRole.findIndex(items => { - return items.id === item; + return items === item; }); if (index > -1) { this.rh_pageData.myPartRole.splice(index, 1); @@ -374,13 +390,32 @@ export default { }, // 保存按钮 handleSave() { + this.saveLoading = true + let _formData = new FormData() + _formData.append('taskIds', this.taskIds) + _formData.append('json', JSON.stringify({ + rh_pageData: this.rh_pageData, + roleList: this.roleForm, + commentText: this.commentText + })) + saveTaskForPub(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) }, // 提交按钮 handleSubmit() { + if (this.commentText === '') { + this.$message.warning('请输入回执说明') + } else { let json = { leader: this.roleForm.leaderUserId, rh_pageData: this.rh_pageData, roleList: this.roleForm, + commentText: this.commentText } this.$refs['rh_pageData'].validate((valid) => { if (valid) { @@ -398,7 +433,17 @@ export default { }); } }) - } + } + + }, + + /** 点击对应附件进行下载*/ + previews(val) { + let attId = val + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } + }, } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue index f46729998..3a8594b69 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue @@ -18,18 +18,6 @@
- - - - {{ rh_pageData.comityFileNum || '-' }} - - - - - {{ rh_pageData.comityFileName || '-' }} - - - @@ -78,8 +66,18 @@ + + + + {{ '-' }} + + {{ item.name }} {{ ';'}} + + + + - + -
- - 批量删除 - -
+ + +
+ + +
+ +
@@ -277,6 +279,11 @@ export default { taskInfo: this.$route.query.taskInfo, taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, + + infoSourcesLength: '', + + textTitle: '审批意见', + textHolder: '请输入审批意见' } }, computed: { @@ -308,6 +315,10 @@ export default { }, getData() { + if (this.taskInfo === '标准法规工程师汇总修订完毕') { + this.textTitle = '回执说明' + this.textHolder = '请输入回执说明' + } const params = { taskIds: this.taskIds, pId: this.pId, @@ -321,114 +332,107 @@ export default { this.$nextTick(() => { this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData this.roleForm = JSON.parse(JSON.stringify(item)).roleList + this.infoSourcesLength = this.rh_pageData.infoSources.length // this.rh_pageData.comityFileNum = this.fileTextList }) }, - /** 批量删除 */ - del_paryForm() { - if (this.deleteDataList.length < 1) { - this.$message.warning("请选择一条数据进行删除"); - } else { - this.$confirm("您确认删除这些数据?", "提示", { - confirmButtonText: "确认", - confirmButtonClass: "common-button-primary", - cancelButtonText: "取消", - type: "warning" - }).then(() => { - let exits = []; - this.deleteDataList.map(item => { - let index; - index = this.rh_pageData.myPartRole.findIndex(items => { - return items.id === item; - }); - if (index > -1) { - this.rh_pageData.myPartRole.splice(index, 1); - } - exits.push(item); - }); - this.deleteDataList = []; - }).catch(() => { - }); + /** 点击对应附件进行下载*/ + previews(val) { + let attId = val + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; } }, - selectedDelete(val) { this.deleteDataList = val }, // 退回按钮 handleSubmitNo() { - let json = { - passFlag: '0', - rh_pageData: this.rh_pageData, - roleList: this.roleForm - } - if (this.taskInfo === '标准法规部主管领导审核') { - json.manageDepartmentList = this.roleForm.feeUserId - } else if (this.taskInfo === '费用管理部门会签') { - json.manageDepartment = this.$store.getters.userInfo.userId - json.president = this.roleForm.engineerUserId - } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { - json.engineerSumDone = this.roleForm.startUser + if (this.textarea === '') { + this.$message.warning('请输入反馈意见') } else { - json = { + let json = { + passFlag: '0', rh_pageData: this.rh_pageData, roleList: this.roleForm } - } - this.$refs['rh_pageData'].validate((valid) => { - if (valid) { - this.isBack = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isBack = false - }); + if (this.taskInfo === '标准法规部主管领导审核') { + json.manageDepartmentList = this.roleForm.feeUserId + } else if (this.taskInfo === '费用管理部门会签') { + json.manageDepartment = this.$store.getters.userInfo.userId + json.president = this.roleForm.engineerUserId + } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { + json.engineerSumDone = this.roleForm.startUser + } else { + json = { + rh_pageData: this.rh_pageData, + roleList: this.roleForm + } } - }) + this.$refs['rh_pageData'].validate((valid) => { + if (valid) { + this.isBack = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isBack = false + }); + } + }) + } }, // 提交按钮 handleSubmit() { - let json = { - passFlag: '1', - rh_pageData: this.rh_pageData, - roleList: this.roleForm - } - if (this.taskInfo === '标准法规部主管领导审核') { - json.manageDepartmentList = this.roleForm.feeUserId - } else if (this.taskInfo === '费用管理部门会签') { - json.manageDepartment = this.$store.getters.userInfo.userId - json.president = this.roleForm.engineerUserId - } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { - json.engineerSumDone = this.roleForm.startUser + if (this.textarea === '') { + if (this.taskInfo === '标准法规工程师汇总修订完毕') { + this.$message.warning('请输入回执说明') + } else { + this.$message.warning('请输入反馈意见') + } } else { - json = { + let json = { + passFlag: '1', rh_pageData: this.rh_pageData, + commentText: this.textarea, roleList: this.roleForm } - } - this.$refs['rh_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); + if (this.taskInfo === '标准法规部主管领导审核') { + json.manageDepartmentList = this.roleForm.feeUserId + } else if (this.taskInfo === '费用管理部门会签') { + json.manageDepartment = this.$store.getters.userInfo.userId + json.president = this.roleForm.engineerUserId + } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { + json.engineerSumDone = this.roleForm.startUser + } else { + json = { + rh_pageData: this.rh_pageData, + roleList: this.roleForm + } } - }) + this.$refs['rh_pageData'].validate((valid) => { + if (valid) { + this.isSubmit = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } + }) + } } } } From cd5b4442ff5712ce802de3e99544bfdfd1dfcb00 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Fri, 3 Dec 2021 13:58:53 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=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/creatProcess/bzhHd-rh/step3.vue | 11 +- .../pages/creatProcess/bzhHd-rh/step6-1.vue | 507 ++++++++++++++++++ .../pages/creatProcess/bzhHy-ch/step6-1.vue | 482 +++++++++++++++++ .../pages/processDetail/index.vue | 6 + src/router/index.js | 18 + 5 files changed, 1022 insertions(+), 2 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue create mode 100644 src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue index 033c60363..5898f8ed8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -14,7 +14,7 @@
- + @@ -153,7 +153,7 @@ - + +
+ + + + +
+
基础信息
+
审批历史
+
+
+
+ + + +
+ + + + + {{ 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 || '-' }} + + + + + + + {{ '-' }} + + {{ item.name }} {{ ';'}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + +
+ + +
+ + +
+
+
+ + + + + + + + + + + + + + + + + + + + + 流程列表加载中 +
+
+
+ + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue new file mode 100644 index 000000000..aab5fc477 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue @@ -0,0 +1,482 @@ + + + + + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 081dd1ae8..586eed8cc 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -258,6 +258,12 @@ export default { }else if(prcType === '10'){ //项目清单确认 this.toProcessDetail('xmqdqrStep1-3',row) + } else if(prcType === '20') { + // 入会流程 + this.toProcessDetail('bzrhStep6-1',row) + } else if(prcType === '21') { + // 参会流程 + this.toProcessDetail('bzchStep6-1',row) } } else { this.$message.warning('当前流程未全部办理完成，无法查看') diff --git a/src/router/index.js b/src/router/index.js index 430af915a..51d645e1c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1631,6 +1631,15 @@ const routes = [ title: '外部标准化协会入会流程（审批)' } }, + { + path: '/bzrhStep6-1', + name: 'bzrhStep6-1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会入会流程' + } + }, // 外部标准化协会参会流程 { @@ -1687,6 +1696,15 @@ const routes = [ title: '外部标准化协会参会流程（审定）' } }, + { + path: '/bzchStep6-1', + name: 'bzchStep6-1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会参会流程' + } + }, { path: '/bzhhStep1', name: 'bzhhStep1', From e3b81f600995f19b57de1cc66b498a6ef90d4e82 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Fri, 3 Dec 2021 15:02:04 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=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/bzhHy-ch/step1.vue | 112 ++++++++---- .../pages/creatProcess/bzhHy-ch/step2.vue | 119 +++++++------ .../pages/creatProcess/bzhHy-ch/step3.vue | 88 +++++++--- .../pages/creatProcess/bzhHy-ch/step4.vue | 114 ++++++------ .../pages/creatProcess/bzhHy-ch/step5.vue | 92 +++++++--- .../pages/creatProcess/bzhHy-ch/step6-1.vue | 157 +++-------------- .../pages/creatProcess/bzhHy-ch/step6.vue | 165 +++++++++++------- 7 files changed, 452 insertions(+), 395 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index 6e269cd45..ce7cc3e85 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -97,7 +97,8 @@ - + @@ -170,6 +171,19 @@
+ + +
+ + +
+ +
@@ -319,7 +333,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {startProcess, saveTaskFirst, completeTask} from '@/api/process.js' +import {startProcess, queryTaskFirst, saveTaskFirst, completeTask} from '@/api/process.js' export default { components: { @@ -393,6 +407,13 @@ export default { roleShowflagOne: false, isSubmit: false, saveLoading: false, + commentText: '' + } + }, + mounted() { + this.bpnId = this.$route.query.bpnId + if (this.bpnId !== undefined) { + this.getData() } }, methods: { @@ -400,6 +421,16 @@ export default { handleTabs(name) { this.active = name }, + getData() { + queryTaskFirst({ + bpnId: this.$route.query.bpnId + }).then(res => { + let mes = JSON.parse(res.mes) + this.ch_pageData = mes.ch_pageData + this.commentText = mes.commentText + this.roleForm = mes.roleForm + }); + }, //上传按钮 /* uploadFile(val) { @@ -557,10 +588,12 @@ export default { _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.userName) - _formData.append('prcType', '20') + _formData.append('prcType', '21') _formData.append('json', JSON.stringify({ roleForm: this.roleForm, - ch_pageData: this.ch_pageData + ch_pageData: this.ch_pageData, + commentText: this.commentText + })) saveTaskFirst(_formData).then(res => { this.saveLoading = false @@ -572,39 +605,44 @@ export default { }, /** 提交按钮*/ handleSubmit() { - let json = { - prcCreateUser: this.$store.getters.userInfo.userId, - prcCreateUserName: this.$store.getters.userInfo.userName, - roleList: this.roleForm, - ch_pageData: this.ch_pageData, - directorList: this.roleForm.dockUser, - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.$refs['roleForm'].validate((valid) => { - if (valid) { - this.isSubmit = true - const paramsInfo = { - type: '21' - } - startProcess(paramsInfo).then(res => { - this.taskID = res.data - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskID) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }) - }) - } - }) + if (this.commentText === '') { + this.$message.warning('请输入回执说明') + } else { + let json = { + prcCreateUser: this.$store.getters.userInfo.userId, + prcCreateUserName: this.$store.getters.userInfo.userName, + roleList: this.roleForm, + ch_pageData: this.ch_pageData, + commentText: this.commentText, + directorList: this.roleForm.dockUser, } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.$refs['roleForm'].validate((valid) => { + if (valid) { + this.isSubmit = true + const paramsInfo = { + type: '21' + } + startProcess(paramsInfo).then(res => { + this.taskID = res.data + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskID) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }) + }) + } + }) + } + }) + } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue index ae2d7683e..85d3a435c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue @@ -59,19 +59,18 @@ - + {{ '-' }} + + {{ item.name }} {{ ';'}} + - {{ ch_pageData.sort || '-'}} + 计划内 + 计划外 @@ -104,14 +103,14 @@
- +
+ v-model="commentText">
@@ -217,7 +216,7 @@ export default { ch_pageData: {}, ch_rules: {}, nodeList: [], - textContent: '', + commentText: '', isBack: false, isSubmit: false, @@ -228,6 +227,7 @@ export default { taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, + uploadFileLength: '' } }, computed: { @@ -272,61 +272,72 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData + this.uploadFileLength = this.ch_pageData.fileTextList.length this.ch_pageData.meetingInRole = this.$store.getters.userInfo.userName this.roleForm = JSON.parse(JSON.stringify(item)).roleList }) }, // 退回按钮 handleSubmitNo() { - let json = { - roleList: this.roleForm, - memberId: this.$store.getters.userInfo.userId, - passFlag: '0', - commentText: this.textContent, - ch_pageData: this.ch_pageData, - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isBack = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('退回成功') - this.$router.push("/processCenter"); - } - this.isBack = false - }); + if (this.commentText === '') { + this.$message.warning('请输入审批意见') + } else { + let json = { + roleList: this.roleForm, + memberId: this.$store.getters.userInfo.userId, + passFlag: '0', + commentText: this.commentText, + ch_pageData: this.ch_pageData, } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.isBack = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('退回成功') + this.$router.push("/processCenter"); + } + this.isBack = false + }); + } + }) + } + }, // 提交按钮 handleSubmit() { - let json = { - roleList: this.roleForm, - memberId: this.$store.getters.userInfo.userId, - passFlag: '1', - commentText: this.textContent, - ch_pageData: this.ch_pageData, - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); + if (this.commentText === '') { + this.$message.warning('请输入审批意见') + } else { + let json = { + roleList: this.roleForm, + memberId: this.$store.getters.userInfo.userId, + passFlag: '1', + commentText: this.commentText, + ch_pageData: this.ch_pageData, } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.isSubmit = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } + }) + } + } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue index 96acc61f8..d828e443a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue @@ -59,18 +59,18 @@ - + {{ '-' }} + + {{ item.name }} {{ ';'}} + - {{ ch_pageData.sort || '-' }} + 计划内 + 计划外 @@ -123,9 +123,10 @@ - +
+ + +
+ + +
+ +
@@ -269,7 +283,12 @@ export default { fillLeader: '', fillFile: '', }, - ch_rules: {}, + ch_rules: { + fillLeader: [ + {required: true, message: "请选择参与人部门领导", trigger: 'blur'}, + { trigger: 'change' } + ] + }, detailData: [], loading: false, @@ -284,6 +303,9 @@ export default { taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, + + uploadFileLength: '', + commentText: '' } }, computed: { @@ -327,6 +349,7 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData + this.uploadFileLength = this.ch_pageData.fileTextList.length this.ch_pageData.fillPeopleId = this.$store.getters.userInfo.userId this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName this.roleForm = JSON.parse(JSON.stringify(item)).roleList @@ -356,6 +379,7 @@ export default { _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ roleList: this.roleForm, + commentText: this.commentText, selfUser: this.$store.getters.userInfo.userId, charge: this.ch_pageData.fillLeaderId, ch_pageData: this.ch_pageData, @@ -370,28 +394,34 @@ export default { }, // 提交按钮 handleSubmit() { - let json = { - roleList: this.roleForm, - selfUser: this.$store.getters.userInfo.userId, - charge: this.ch_pageData.fillLeaderId, - ch_pageData: this.ch_pageData, - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); + if (this.commentText === '') { + this.$message.warning('请输入回执说明') + } else { + let json = { + roleList: this.roleForm, + selfUser: this.$store.getters.userInfo.userId, + commentText: this.commentText, + charge: this.ch_pageData.fillLeaderId, + ch_pageData: this.ch_pageData, } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.isSubmit = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } + }) + } + } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue index bf3e176f4..0e6e1971c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue @@ -59,18 +59,18 @@ - + {{ '-' }} + + {{ item.name }} {{ ';'}} + - {{ ch_pageData.sort || '-' }} + 计划内 + 计划外 @@ -109,7 +109,7 @@
- +
{ this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData + this.uploadFileLength = this.ch_pageData.fileTextList.length this.ch_pageData.myPartRole = [{ fillPeopleId: this.ch_pageData.fillPeopleId, fillPeople: this.ch_pageData.fillPeople, @@ -292,56 +294,64 @@ export default { }, // 退回按钮 handleSubmitNo() { - let json = { - member: this.selfUser, - passFlag: '0', - roleList: this.roleForm, - commentText: this.textarea, - ch_pageData: this.ch_pageData, - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isBack = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('退回成功') - this.$router.push("/processCenter"); - } - this.isBack = false - }); + if (this.textarea === '') { + this.$message.warning('请输入审批意见') + } else { + let json = { + member: this.selfUser, + passFlag: '0', + roleList: this.roleForm, + commentText: this.textarea, + ch_pageData: this.ch_pageData, } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.isBack = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('退回成功') + this.$router.push("/processCenter"); + } + this.isBack = false + }); + } + }) + } }, // 提交按钮 handleSubmit() { - let json = { - member: this.selfUser, - passFlag: '1', - engineerSum: this.roleForm.startUser, - roleList: this.roleForm, - commentText: this.textarea, - ch_pageData: this.ch_pageData, - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); + if (this.textarea === '') { + this.$message.warning('请输入审批意见') + } else { + let json = { + member: this.selfUser, + passFlag: '1', + engineerSum: this.roleForm.startUser, + roleList: this.roleForm, + commentText: this.textarea, + ch_pageData: this.ch_pageData, } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.isSubmit = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } + }) + } } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue index ee1c0f053..a8c3901ba 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue @@ -59,18 +59,18 @@ - + {{ '-' }} + + {{ item.name }} {{ ';'}} + - {{ ch_pageData.sort || '-' }} + 计划内 + 计划外 @@ -126,6 +126,19 @@
+ + +
+ + +
+ +
@@ -210,7 +223,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { startProcess, saveTaskFirst,completeTask, inboundLiaisonDetail } from '@/api/process.js' +import { startProcess, saveTaskForPub,completeTask, inboundLiaisonDetail } from '@/api/process.js' export default { components: { ProcessHeader, @@ -237,6 +250,9 @@ export default { taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, + + uploadFileLength: '', + commentText: '' } }, computed: { @@ -280,6 +296,7 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData + this.uploadFileLength = this.ch_pageData.fileTextList.length this.roleForm = JSON.parse(JSON.stringify(item)).roleList // this.ch_pageData.comityFileNum = this.fileTextList }) @@ -318,30 +335,51 @@ export default { }, // 保存按钮 handleSave() { + this.saveLoading = true + let _formData = new FormData() + _formData.append('taskIds', this.taskIds) + _formData.append('json', JSON.stringify({ + ch_pageData: this.ch_pageData, + roleList: this.roleForm, + commentText: this.commentText + })) + saveTaskForPub(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) }, // 提交按钮 handleSubmit() { - let json = { - leader: this.roleForm.leaderUserId, - ch_pageData: this.ch_pageData, - roleList: this.roleForm, - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); + if (this.commentText === '') { + this.$message.warning('请输入审批意见') + } else { + let json = { + leader: this.roleForm.leaderUserId, + ch_pageData: this.ch_pageData, + commentText: this.commentText, + roleList: this.roleForm, } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.isSubmit = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } + }) + } + } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue index aab5fc477..9104f1397 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue @@ -2,10 +2,7 @@
- - - - +
基础信息
@@ -62,18 +59,18 @@ - + {{ '-' }} + + {{ item.name }} {{ ';'}} + - {{ ch_pageData.sort || '-' }} + 计划内 + 计划外 @@ -111,6 +108,19 @@
+ + +
+ + +
+ +
@@ -179,21 +189,6 @@ 流程列表加载中
- -
@@ -230,6 +225,10 @@ export default { taskInfo: this.$route.query.taskInfo, taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, + + uploadFileLength: '', + passTitle: '回执说明', + passHolder: '请输入回执说明' } }, computed: { @@ -273,116 +272,12 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData + this.uploadFileLength = this.ch_pageData.fileTextList.length + this.textarea = JSON.parse(JSON.stringify(item)).commentText this.roleForm = JSON.parse(JSON.stringify(item)).roleList // this.ch_pageData.comityFileNum = this.fileTextList }) }, - - /** 批量删除 */ - del_paryForm() { - if (this.deleteDataList.length < 1) { - this.$message.warning("请选择一条数据进行删除"); - } else { - this.$confirm("您确认删除这些数据?", "提示", { - confirmButtonText: "确认", - confirmButtonClass: "common-button-primary", - cancelButtonText: "取消", - type: "warning" - }).then(() => { - let exits = []; - this.deleteDataList.map(item => { - let index; - index = this.ch_pageData.myPartRole.findIndex(items => { - return items.id === item; - }); - if (index > -1) { - this.ch_pageData.myPartRole.splice(index, 1); - } - exits.push(item); - }); - this.deleteDataList = []; - }).catch(() => { - }); - } - }, - - selectedDelete(val) { - this.deleteDataList = val - }, - // 退回按钮 - handleSubmitNo() { - let json = { - passFlag: '0', - ch_pageData: this.ch_pageData, - roleList: this.roleForm - } - if (this.taskInfo === '技术管理中心主任审批') { - json.manageDepartmentList = this.roleForm.feeUserId - } else if (this.taskInfo === '费用管理部门会签') { - json.manageDepartment = this.$store.getters.userInfo.userId - json.president = this.roleForm.engineerUserId - } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { - json.engineerSumDone = this.roleForm.startUser - } else { - json = { - ch_pageData: this.ch_pageData, - roleList: this.roleForm - } - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isBack = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isBack = false - }); - } - }) - }, - // 提交按钮 - handleSubmit() { - let json = { - passFlag: '1', - ch_pageData: this.ch_pageData, - roleList: this.roleForm - } - if (this.taskInfo === '技术管理中心主任审批') { - json.manageDepartmentList = this.roleForm.feeUserId - } else if (this.taskInfo === '费用管理部门会签') { - json.manageDepartment = this.$store.getters.userInfo.userId - json.president = this.roleForm.engineerUserId - } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { - json.engineerSumDone = this.roleForm.startUser - } else { - json = { - ch_pageData: this.ch_pageData, - roleList: this.roleForm - } - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); - } - }) - } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue index 105a1410d..eea516e65 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue @@ -62,18 +62,18 @@ - + {{ '-' }} + + {{ item.name }} {{ ';'}} + - {{ ch_pageData.sort || '-' }} + 计划内 + 计划外 @@ -111,6 +111,19 @@ + + +
+ + +
+ +
@@ -230,6 +243,10 @@ export default { taskInfo: this.$route.query.taskInfo, taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, + + uploadFileLength: '', + passTitle: '审批意见', + passHolder: '请输入审批意见' } }, computed: { @@ -261,6 +278,10 @@ export default { }, getData() { + if (this.taskInfo === '标准法规工程师修订完毕') { + this.passTitle = '回执说明', + this.passHolder = '请输入回执说明' + } const params = { taskIds: this.taskIds, pId: this.pId, @@ -273,6 +294,7 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData + this.uploadFileLength = this.ch_pageData.fileTextList.length this.roleForm = JSON.parse(JSON.stringify(item)).roleList // this.ch_pageData.comityFileNum = this.fileTextList }) @@ -293,7 +315,7 @@ export default { this.deleteDataList.map(item => { let index; index = this.ch_pageData.myPartRole.findIndex(items => { - return items.id === item; + return items === item; }); if (index > -1) { this.ch_pageData.myPartRole.splice(index, 1); @@ -311,77 +333,90 @@ export default { }, // 退回按钮 handleSubmitNo() { - let json = { - passFlag: '0', - ch_pageData: this.ch_pageData, - roleList: this.roleForm - } - if (this.taskInfo === '技术管理中心主任审批') { - json.manageDepartmentList = this.roleForm.feeUserId - } else if (this.taskInfo === '费用管理部门会签') { - json.manageDepartment = this.$store.getters.userInfo.userId - json.president = this.roleForm.engineerUserId - } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { - json.engineerSumDone = this.roleForm.startUser + if (this.textarea === '') { + this.$message.warning('请输入审批意见') } else { - json = { + let json = { + passFlag: '0', ch_pageData: this.ch_pageData, + commentText: this.textarea, roleList: this.roleForm } - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isBack = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isBack = false - }); + if (this.taskInfo === '技术管理中心主任审批') { + json.manageDepartmentList = this.roleForm.feeUserId + } else if (this.taskInfo === '费用管理部门会签') { + json.manageDepartment = this.$store.getters.userInfo.userId + json.president = this.roleForm.engineerUserId + } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { + json.engineerSumDone = this.roleForm.startUser + } else { + json = { + ch_pageData: this.ch_pageData, + commentText: this.textarea, + roleList: this.roleForm + } } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.isBack = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isBack = false + }); + } + }) + } }, // 提交按钮 handleSubmit() { - let json = { - passFlag: '1', - ch_pageData: this.ch_pageData, - roleList: this.roleForm - } - if (this.taskInfo === '技术管理中心主任审批') { - json.manageDepartmentList = this.roleForm.feeUserId - } else if (this.taskInfo === '费用管理部门会签') { - json.manageDepartment = this.$store.getters.userInfo.userId - json.president = this.roleForm.engineerUserId - } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { - json.engineerSumDone = this.roleForm.startUser + if (this.textarea === '') { + this.$message.warning('请输入审批意见') } else { - json = { + let json = { + passFlag: '1', ch_pageData: this.ch_pageData, + commentText: this.textarea, roleList: this.roleForm } - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); + if (this.taskInfo === '技术管理中心主任审批') { + json.manageDepartmentList = this.roleForm.feeUserId + } else if (this.taskInfo === '费用管理部门会签') { + json.manageDepartment = this.$store.getters.userInfo.userId + json.president = this.roleForm.engineerUserId + } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { + json.engineerSumDone = this.roleForm.startUser + } else { + json = { + ch_pageData: this.ch_pageData, + commentText: this.textarea, + roleList: this.roleForm + } } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.isSubmit = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } + }) + } + } } } From e221dce3e92edd07697eb4234e82519fce23be6f Mon Sep 17 00:00:00 2001 From: "wangxiahui@91isoft.com" <140316hui> Date: Fri, 3 Dec 2021 15:31:32 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=8C=E8=B4=A3=E4=BB=BB=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E5=B8=88ui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/rectificationDatabase.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 64976940d..fe11fec51 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -1120,7 +1120,7 @@ export default { this.roleShowflag = true }, drawerCheck(data) { - this.addForm.dutyEngineer = data[0].name.slice(0,data[0].name.indexOf('(')) + this.addForm.dutyEngineer = data[0].name this.roleShowflag = false }, /** 选择认证工程师和质量工程师 */ @@ -1140,7 +1140,7 @@ export default { idList += ',' } idList += item.id - nameList += item.name.slice(0,item.name.indexOf('(')) + nameList += item.name }) if (this.type === 'authEngineer') { this.addForm.authEngineer = nameList From 353a756e607b4154ee8e67f966b59554b842e136 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 3 Dec 2021 15:32:36 +0800 Subject: [PATCH 10/16] commit --- .../enterpriseStandardPlan/index.vue | 209 ++++++++++++++---- 1 file changed, 172 insertions(+), 37 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index f9eefc43b..11f39d81b 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -19,13 +19,13 @@ @@ -101,27 +101,33 @@ label="计划状态" align="center" width="150"> + + @@ -180,7 +186,7 @@
@@ -199,38 +205,38 @@ - - - + + + - - - + + + + + + - +
+ + + + +
+ + +
+
+ 手动查找 +
+
+ - - - - - - @@ -285,6 +306,40 @@ @click="addDrawerClose">取消
+ + + + + + + +
+ 确认 + +
+ @@ -295,6 +350,15 @@ components: {}, data() { return { + QCDWmodal: false, + QCDWValue: [], + QCDWList: [], + type: '', + drawerTitle: '', + modalshowflag2: false, + modalshowflag: false, + nodeList: [], + nodeList2: [], loading: false, submitLoading: false, addDrawerTitle: '', @@ -307,10 +371,13 @@ planStatus: '', // 计划状态 reviseStatus: '', // 制修订状态 resPerson: '', // 评审责任人 + resPersonName: '', wgLeader: '', // 工作组组长 + wgLeaderName: '', draftTime: '', // 计划标准初稿完成时间 releaseTime: '', // 计划标准发布时间 drafter: '', // 起草人 + drafterName: '', // remarks: '', // 备注 }, addFormRules: { @@ -327,19 +394,19 @@ {required: true, message: '请选择制修订状态', trigger: 'change'}, ], resPerson: [ - {required: true, message: '请输入评审责任人', trigger: 'blur'}, + {required: true, message: '请选择评审责任人', trigger: 'change'}, ], wgLeader: [ - {required: true, message: '请输入工作组组长', trigger: 'blur'}, + {required: true, message: '请选择工作组组长', trigger: 'change'}, ], draftTime: [ - {required: true, message: '请输入计划标准初稿完成时间', trigger: 'blur'}, + {required: true, message: '请输入计划标准初稿完成时间', trigger: 'change'}, ], releaseTime: [ {required: true, message: '请输入计划标准发布时间', trigger: 'blur'}, ], drafter: [ - {required: true, message: '请输入起草人', trigger: 'blur'}, + {required: true, message: '请选择起草人', trigger: 'change'}, ], }, form: { @@ -358,6 +425,59 @@ props: {}, watch: {}, methods: { + QCDWOK () { + let arr1 = [] + if (this.addForm.unit) { + let str = this.addForm.unit.replace(/，/g, ',') + arr1 = str.split(',') + } + let arr2 = arr1.concat(this.QCDWValue) + this.addForm.unit = Array.from(new Set(arr2)).join(',') + this.QCDWmodal = false + }, + QCDWClick () { + this.QCDWValue = [] + this.QCDWmodal = true + }, + choiceZRR (type, title, id) { + this.nodeList = [] + this.nodeList.push(id) + this.type = type + this.drawerTitle = title + this.modalshowflag = true + }, + checkedRole (data) { + this.addForm.wgLeader = data[0].id + this.addForm.wgLeaderName = data[0].name + }, + choiceZRRS (type, title, id) { + this.type = type + this.drawerTitle = title + this.nodeList2 = [] + if (id) { + this.nodeList2 = id.split(',') + } + this.modalshowflag2 = true + }, + checkedRole2 (data) { + var idList = '' + var nameList = '' + data.forEach( item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.name + }) + if (this.type === 'resPerson') { + this.addForm.resPerson = idList + this.addForm.resPersonName = nameList + } else if (this.type === 'drafter') { + this.addForm.drafter = idList + this.addForm.drafterName = nameList + } + }, addDrawerSubmit () { this.$refs['addForm'].validate((valid) => { if (valid) { @@ -376,9 +496,15 @@ }, res => { this.submitLoading = false if (res.ok) { - this.addDrawer = false - this.$message.success(tips + '成功') - this.getData() + if (res.data === '操作成功') { + this.addDrawer = false + this.$message.success(tips + '成功') + this.getData() + } else { + this.addDrawer = false + this.$message.warning(res.data) + this.getData() + } } else { this.$message.warning(tips + '失败') } @@ -473,9 +599,12 @@ reviseStatus: command[0].reviseStatus, // 制修订状态 resPerson: command[0].resPerson, // 评审责任人 wgLeader: command[0].wgLeader, // 工作组组长 + resPersonName: command[0].resPersonName, // 评审责任人 + wgLeaderName: command[0].wgLeaderName, // 工作组组长 draftTime: command[0].draftTime, // 计划标准初稿完成时间 releaseTime: command[0].releaseTime, // 计划标准发布时间 - drafter: command[0].drafter, // 起草人 + drafterName: command[0].drafterName, // 起草人 + drafter: command[0].drafter, } break case '删除': @@ -525,6 +654,12 @@ computed: {}, mounted() { this.getData() + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + this.QCDWList = res.data.QCDW // 起草单位 + }, e => { + }) }, } From b4d6a56e4776879ce36191938aa9a8e4e4d93914 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 3 Dec 2021 16:47:56 +0800 Subject: [PATCH 11/16] commit --- src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 11f39d81b..36a2dd59a 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -276,13 +276,13 @@
手动查找
- From 05d8d380a019db43a3f3209636bccda675ef4d87 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Fri, 3 Dec 2021 17:28:34 +0800 Subject: [PATCH 12/16] feat: There is no way the, BUSS PROCESS -1 --- .../pages/creatProcess/qbrk/step1.vue | 2802 +++++++++++++++++ .../pages/creatProcess/qbrk/step2.vue | 1231 ++++++++ .../pages/creatProcess/qbrk/step3.vue | 2485 +++++++++++++++ .../pages/creatProcess/qbrk/step5.vue | 985 ++++++ .../processCenter/pages/newProcess/index.vue | 21 + .../tabComponents/processCenter/index.vue | 146 + src/router/index.js | 115 + 7 files changed, 7785 insertions(+) create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/step1.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/step2.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/step3.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/step5.vue diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue new file mode 100644 index 000000000..69eb52786 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -0,0 +1,2802 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue new file mode 100644 index 000000000..6fe740a52 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue @@ -0,0 +1,1231 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue new file mode 100644 index 000000000..f598b654d --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -0,0 +1,2485 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue new file mode 100644 index 000000000..301d09b3c --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -0,0 +1,985 @@ + + + + + diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index efdfb9cb1..3840da988 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -298,6 +298,21 @@ + + +
+
+
+ +
+
+
企标制修订流程及企业标准库流程
+
+
+
+
+ +
@@ -379,6 +394,12 @@ export default { this.$store.commit('setDetailMap', this.$route.path) this.$store.commit('setHandleInfo') switch (prcType) { + case 'buss1': + // 企标制修订流程及企业标准库流程 + this.$router.push({ + name: 'bussLibrary1' + }) + break case '2': // 标准调研流程 this.$router.push({ diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index f31618145..b3465c084 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -318,6 +318,152 @@ export default { }) } break + case 'buss1': + if (row.taskInfo === '企标编写') { + this.$router.push({ + name: 'bussLibrary2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '企标汇总修订'){ + this.$router.push({ + name: 'bzrkStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '标准化员审批'){ + this.$router.push({ + name: 'bzrkStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '重新企标汇总修订'){ + this.$router.push({ + name: 'bzrkStepC3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '会签征求意见'){ + this.$router.push({ + name: 'bzrkStep5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '主起草人修订并组织评审'){ + this.$router.push({ + name: 'bzrkStep6', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '标准法规工程师复审'){ + this.$router.push({ + name: 'bzrkStep7', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '重新修订并组织评审'){ + this.$router.push({ + name: 'bzrkStepC6', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '技术委员会负责人/起草中心主任审核'){ + this.$router.push({ + name: 'bzrkStep8', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '标准法规部部长审核'){ + this.$router.push({ + name: 'bzrkStep9', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '专委会副主任/起草单位中心主任审定'){ + this.$router.push({ + name: 'bzrkStep10', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '专委会主任/总院院长或主管副院长批准'){ + this.$router.push({ + name: 'bzrkStep11', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '主起草人培训'){ + this.$router.push({ + name: 'bzrkStep12', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + break case 'laws1': if (row.taskInfo === '政策入库审批') { this.$router.push({ diff --git a/src/router/index.js b/src/router/index.js index 950677be7..de739f1be 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -907,6 +907,121 @@ const routes = [ title: '政策入库流程' } }, + { + path: '/bussLibrary1', + name: 'bussLibrary1', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step1.vue'), + meta: { + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + }, + // { + // path: '/bussLibrary2', + // name: 'bussLibrary2', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step2.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // }, + // { + // path: '/bussLibrary3', + // name: 'bussLibrary3', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step3.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // },{ + // path: '/bussLibraryC3', + // name: 'bussLibraryC3', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // },{ + // path: '/bussLibrary4', + // name: 'bussLibrary4', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step4.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // },{ + // path: '/bussLibrary5', + // name: 'bussLibrary5', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step5.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // },{ + // path: '/bussLibrary6', + // name: 'bussLibrary6', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step6.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // },{ + // path: '/bussLibraryC6', + // name: 'bussLibraryC6', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // },{ + // path: '/bussLibrary7', + // name: 'bussLibrary7', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step7.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // },{ + // path: '/bussLibrary8', + // name: 'bussLibrary8', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step8.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // },{ + // path: '/bussLibrary9', + // name: 'bussLibrary9', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step9.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // },{ + // path: '/bussLibrary10', + // name: 'bussLibrary10', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step10.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // },{ + // path: '/bussLibrary11', + // name: 'bussLibrary11', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step11.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // },{ + // path: '/bussLibrary12', + // name: 'bussLibrary12', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step12.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // }, { path: '/bzdyStep1', name: 'bzdyStep1', From faa0f2a792f238885f38f220fca0da91b005b275 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Fri, 3 Dec 2021 17:29:50 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=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 --- .../home2/components/empennage/index.vue | 36 +++-- src/pages/home2/index.vue | 4 +- .../pages/creatProcess/bzhHd-rh/step1.vue | 106 +++++++------- .../pages/creatProcess/bzhHd-rh/step2.vue | 85 ++++++------ .../pages/creatProcess/bzhHd-rh/step3.vue | 78 ++++++----- .../pages/creatProcess/bzhHd-rh/step4.vue | 79 ++++++----- .../pages/creatProcess/bzhHd-rh/step5.vue | 74 +++++----- .../pages/creatProcess/bzhHd-rh/step6.vue | 75 +++++----- .../pages/creatProcess/bzhHy-ch/step1.vue | 102 +++++++------- .../pages/creatProcess/bzhHy-ch/step2.vue | 97 +++++++------ .../pages/creatProcess/bzhHy-ch/step3.vue | 73 +++++----- .../pages/creatProcess/bzhHy-ch/step4.vue | 113 ++++++++------- .../pages/creatProcess/bzhHy-ch/step5.vue | 111 ++++++++------- .../pages/creatProcess/bzhHy-ch/step6.vue | 131 ++++++++++-------- 14 files changed, 627 insertions(+), 537 deletions(-) diff --git a/src/pages/home2/components/empennage/index.vue b/src/pages/home2/components/empennage/index.vue index 490412f1a..7463fc5a6 100644 --- a/src/pages/home2/components/empennage/index.vue +++ b/src/pages/home2/components/empennage/index.vue @@ -6,16 +6,16 @@ 友情链接
@@ -61,6 +59,15 @@ import {getImg} from '@/api/linkApi.js' export default { name: 'Empennage', + filters: { + snippet: function (value) { + if (value && value.length > 8) { + return value.slice(0, 8) + '...' + } else { + return value + } + } + }, components: {}, mixins: [], data() { @@ -168,6 +175,7 @@ export default { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue deleted file mode 100644 index f598b654d..000000000 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ /dev/null @@ -1,2485 +0,0 @@ - - - - - diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue deleted file mode 100644 index 301d09b3c..000000000 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ /dev/null @@ -1,985 +0,0 @@ - - - - - diff --git a/src/router/index.js b/src/router/index.js index 8da1a1b18..312f8af3b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -934,15 +934,15 @@ const routes = [ title: '企标制修订流程及企业标准库流程' } }, - // { - // path: '/bussLibrary2', - // name: 'bussLibrary2', - // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step2.vue'), - // meta: { - // requireAuth: true, - // title: '企标制修订流程及企业标准库流程' - // } - // }, + { + path: '/bussLibrary2', + name: 'bussLibrary2', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step2.vue'), + meta: { + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + }, // { // path: '/bussLibrary3', // name: 'bussLibrary3',