From 7c9f6a5035b1c4a717321ecadcf8f1c65c805a9f Mon Sep 17 00:00:00 2001 From: fanlin Date: Tue, 27 Jul 2021 09:17:11 +0800 Subject: [PATCH 01/42] =?UTF-8?q?bug:=20=E4=B8=8B=E8=BD=BD=E6=B0=B4?= =?UTF-8?q?=E5=8D=B0=E4=BC=A0=E5=8F=82=E5=8A=A0userId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index ac24b9540..0e9a838b7 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -2170,7 +2170,7 @@ export default { this.$message.error('水印下载仅支持PDF,pdf格式文件') } else { if (attId != null && attId !== '') { - window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId } else { this.$message.error('请选择要下载的文件') } From a69a3fe6ab1e9ccc2f336bb4a78330ffe5cfb997 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, 27 Jul 2021 09:39:51 +0800 Subject: [PATCH 02/42] commit --- src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 865bad1cd..b0315ca40 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -83,7 +83,8 @@ From 04eca92d736cc139930b5594c787cfafa406e33b Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 27 Jul 2021 10:05:28 +0800 Subject: [PATCH 03/42] commit --- .../pages/creatProcess/bzdy/step1-1.vue | 1 - .../pages/creatProcess/bzdy/step3.vue | 1 - .../pages/creatProcess/bzdy/step4.vue | 1 - .../pages/creatProcess/bzdy/step5.vue | 1 - .../pages/creatProcess/bzzqyj/step1-1.vue | 622 ++++++++++++++++++ .../pages/creatProcess/bzzqyj/step1.vue | 22 +- .../pages/creatProcess/bzzqyj/step2.vue | 2 +- .../pages/creatProcess/bzzqyj/step3.vue | 1 - .../pages/creatProcess/bzzqyj/step4.vue | 1 - .../pages/creatProcess/bzzqyj/step5.vue | 1 - .../pages/creatProcess/bzzqyj/step6.vue | 1 - .../pages/creatProcess/bzzqyj/step7.vue | 1 - .../pages/creatProcess/bzzqyj/step8.vue | 1 - .../pages/creatProcess/bzzqyj/step9.vue | 1 - .../tabComponents/taskDraft/index.vue | 12 +- .../pags/consultationDetails.vue | 68 +- src/router/index.js | 9 + 17 files changed, 704 insertions(+), 42 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index dc9425a1f..6f7638f37 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -146,7 +146,6 @@ +
+ + + + + +
+
基础信息
+
人员信息
+
+
+
+ + + + +
+ + + +
+ 选择标准 +
+ + + + + + + + + + + + + +
+ +
+ + +
+ + +
+ + +
+
+
+ + + + + +

流程发起人

+
+ + +
+ + + + + + +

责任部门对接人

+
+ + + +
+ + + + + + +

标准法规部部长

+
+ + +
+ + + + + + +

技术管理中心主任

+
+ + +
+ + + + + + +

工程研究总院院长

+
+ + +
+ + + + + +
+
+ + + +
+
+ + +
+
+ + + + + + + {{ opt.label }} + + + + + + + + + + + 查询 + 清空 + + +
+
+ +
+
+ + + + + + + + + +
+
+
+ + 数据加载中…… +
+ 取消 + 带入 +
+
+ + + +
+ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index d7f0df38b..1f82da739 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -263,6 +263,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' +import { saveTaskFirst } from 'api/process' export default { name: "bzzqyjStep1", @@ -489,7 +490,26 @@ export default { handleTabs(name) { this.active = name }, - handleSave() {}, + handleSave() { + this.saveLoading = true + let _formData = new FormData() + _formData.append('id', this.bpnId || '') + _formData.append('createUser', this.$store.getters.userInfo.userId) + _formData.append('createUserName', this.$store.getters.userInfo.userName) + _formData.append('prcType', '3') + _formData.append('json', JSON.stringify({ + form: this.form, + roleForm: this.roleForm, + commentText: this.commentText + })) + saveTaskFirst(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 06eb9fd69..0804ddc82 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -135,7 +135,6 @@ { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 6ee42f0a7..e30b056fb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -184,7 +184,6 @@
- - + + - + @@ -132,6 +132,14 @@ export default { partCode: '', content: '', }, + opinionContentRules: { + partCode: [ + { required: true, message: '请输入章节编号', trigger: 'blur' }, + ], + content: [ + { required: true, message: '请输入修改意见内容(包括理由或依据)', trigger: 'blur' } + ], + }, standinfoList: [], // 详情列表 form: { cid: this.$route.query.item.cid, @@ -228,32 +236,36 @@ export default { }, //点击抽屉按钮提交事件 saveUserInfo() { - var url = '' - var form = { - cid: this.$route.query.item.cid, - content: this.opinionContent.content, - partCode: this.opinionContent.partCode, - userId: this.$store.getters.userInfo.userId, - userName: this.$store.getters.userInfo.account, - deptName: this.$store.getters.userInfo.orgName, - deptId: this.$store.getters.userInfo.orgId - } - if (this.type === 'edit') { - form.id = this.id - form.autUserId = this.$store.getters.userInfo.userId - url = 'slrs/sar-public-idea-all/updateStand' - } else { - url = 'slrs/sar-public-idea-all/insetStand' - } - this.$http.post(url, form, { - _this: this - }, res => { - if (res.respCode === '200') { - this.form.page = 1 - this.getList() - } + this.$refs['formAdd'].validate((valid) => { + if (valid) { + var url = '' + var form = { + cid: this.$route.query.item.cid, + content: this.opinionContent.content, + partCode: this.opinionContent.partCode, + userId: this.$store.getters.userInfo.userId, + userName: this.$store.getters.userInfo.account, + deptName: this.$store.getters.userInfo.orgName, + deptId: this.$store.getters.userInfo.orgId + } + if (this.type === 'edit') { + form.id = this.id + form.autUserId = this.$store.getters.userInfo.userId + url = 'slrs/sar-public-idea-all/updateStand' + } else { + url = 'slrs/sar-public-idea-all/insetStand' + } + this.$http.post(url, form, { + _this: this + }, res => { + if (res.respCode === '200') { + this.form.page = 1 + this.getList() + } + }) + this.isDialog = false + } }) - this.isDialog = false }, //点击抽屉按钮取消事件 closeDrawer() { diff --git a/src/router/index.js b/src/router/index.js index 99a83b87c..d46cfc24f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -591,6 +591,15 @@ const routes = [ title: '标准征求意见流程' } }, + { + path: '/bzzqyjStep1-1', + name: 'bzzqyjStep1-1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue'), + meta: { + requireAuth: true, + title: '标准征求意见流程' + } + }, { path: '/bzzqyjStep2', name: 'bzzqyjStep2', From 677dc31b815feb612f97a0a347f8256466cae25f Mon Sep 17 00:00:00 2001 From: fanlin Date: Tue, 27 Jul 2021 10:07:28 +0800 Subject: [PATCH 04/42] =?UTF-8?q?bug:=20=20=E5=9B=BD=E5=86=85=E5=A4=96?= =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=89=8B=E5=8A=A8=E6=9F=A5=E6=89=BE=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=8F=98=E5=B0=91=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomFormComponents/InputForStandards.vue | 2 +- .../CustomFormComponents/InputForStandardsForForeign.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue index 0afef8433..3b9d5a974 100644 --- a/src/components/CustomFormComponents/InputForStandards.vue +++ b/src/components/CustomFormComponents/InputForStandards.vue @@ -361,7 +361,7 @@ export default { page: 1, pageSize: this.$store.getters.userInfo.configContent, total: 0, - standType: 'INLAND', + standType: 'ALL', quoteIdList: '', validFlag: '0' } diff --git a/src/components/CustomFormComponents/InputForStandardsForForeign.vue b/src/components/CustomFormComponents/InputForStandardsForForeign.vue index 08d4408ee..303fce717 100644 --- a/src/components/CustomFormComponents/InputForStandardsForForeign.vue +++ b/src/components/CustomFormComponents/InputForStandardsForForeign.vue @@ -329,7 +329,7 @@ export default { page: 1, pageSize: this.$store.getters.userInfo.configContent, total: 0, - standType: 'FOREIGN', + standType: 'ALL', quoteIdList: '', validFlag: '0' } From c796c9f67cadc005866ddeef64a93287b0285baa Mon Sep 17 00:00:00 2001 From: fanlin Date: Tue, 27 Jul 2021 10:22:28 +0800 Subject: [PATCH 05/42] =?UTF-8?q?bug=EF=BC=9A=E6=B5=B7=E5=A4=96=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=BC=A0=E5=8F=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index edb3821e4..131840831 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -2187,7 +2187,7 @@ export default { type: 'warning' }).then(() => { this.$http.delete("sarResource/ts-resource", { - menuId: data.id + resourceId: data.id }, res => { }, e => { if(e.ok){ From c2d0570a5e65ffce166422cec99a8cc56706499e Mon Sep 17 00:00:00 2001 From: yangzijiao Date: Tue, 27 Jul 2021 10:33:12 +0800 Subject: [PATCH 06/42] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/details.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index ab7f62f3e..b868827c8 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -628,7 +628,7 @@ export default { name: "OtherStandardDetails", params: { id: data.id, - pageType: data.sarType + pageType: data.standType } }); window.open(routeUrl.href, "_blank"); @@ -660,10 +660,10 @@ export default { // changeState(row) { let routeUrl = this.$router.resolve({ - name: "ComplianceDetails", + name: "OtherStandardDetails", query: { - sarId: row.resId, - sarType: row.sarState + id: data.id, + pageType: this.standType } }); window.open(routeUrl.href, "_blank"); From 00a374ff9de73eb8534b33f457f8139dee5f0606 Mon Sep 17 00:00:00 2001 From: fanlin Date: Tue, 27 Jul 2021 10:41:37 +0800 Subject: [PATCH 07/42] =?UTF-8?q?bug:=20=20=E6=A0=87=E5=87=86=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B--=E5=9C=88=E4=BD=8F=E7=9A=84?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=BA=94=E8=AF=A5=E6=98=AF=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=A4=9A=E9=80=89=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/treeSelect/treeSelectNew.vue | 7 +++++++ .../processCenter/pages/creatProcess/bzrk/step1.vue | 13 ++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/components/treeSelect/treeSelectNew.vue b/src/components/treeSelect/treeSelectNew.vue index b8a892ea0..fcd07294a 100644 --- a/src/components/treeSelect/treeSelectNew.vue +++ b/src/components/treeSelect/treeSelectNew.vue @@ -6,6 +6,7 @@ :size="width" :append-to-body=true :before-close="cancelUserInfo" + :show-checkbox="showCheckBox" > @@ -1235,6 +1241,7 @@ url:'', urlChild:'', drawerTitle: '', //drawer标题 + showCheckBox: true, // 树形控件是否展示多选框 nodeKey: 'id', defaultCheckedKeys: [], nodeKeyCode: 'code', From 986bb091e7ca43703e988cb14420fb0b2046d672 Mon Sep 17 00:00:00 2001 From: fanlin Date: Tue, 27 Jul 2021 10:48:19 +0800 Subject: [PATCH 08/42] =?UTF-8?q?bug:=20=E6=A0=87=E5=87=86=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B=20=20=E8=B4=A3=E4=BB=BB=E4=BA=BA?= =?UTF-8?q?=E4=BC=9A=E7=AD=BE=E8=8A=82=E7=82=B9=E7=82=B9=E5=87=BB=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=B2=A1=E5=8F=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index b98012836..1a84a2fe9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -1605,6 +1605,7 @@ export default { }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) + this.commentText = processForm.commentText this.getFormFieldList(processForm) } }).catch(e => { From fd7342e865140f3e81eea1241bc830b61ca76c2d Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Tue, 27 Jul 2021 11:29:23 +0800 Subject: [PATCH 09/42] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/addEdit.vue | 117 ++++++------------ .../pages/details.vue | 11 +- .../pages/otherAddEit.vue | 66 ++++++---- .../pages/projectAddEit.vue | 110 +++++++--------- 4 files changed, 136 insertions(+), 168 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 24dcc9a41..2f3209ac2 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -80,7 +80,7 @@ - + - - - - - - - - -
- - + + + + + - + - - - - - - - - - - - - - - {{$t('m.dataAcquisition')}} @@ -746,7 +684,7 @@ export default { {value: 'FOREIGN_STAND', label: '海外标准法规'}, //{value: 'FOREIGN_LAWS', label: '国内外政策'}, // {value: 'BUSINESS', label: '企业标准 '}, - {value: 'TEMP', label: '标准法规清单 '} + // {value: 'TEMP', label: '标准法规清单 '} ], // 新增、编辑 数据搜索字段 sarAccessInfoSearch: { @@ -766,6 +704,22 @@ export default { validFlag: 0, advanceSearchVOStr: '' }, + sarAccessInfo: { + id: '', + issueTime: '', + standName: '', + textStatus: '', + // applicationScope: '', //适用区域 + keywords: '', // 关键字 + detailedListName: '', //清单名称 + applyArctic: '', // 能源种类 + askType: '', // 监管类型 + dataSource: 'INLAND_STAND', // 数据来源 + page: 1, + pageSize: this.$store.getters.userInfo.configContent, + validFlag: 0, + advanceSearchVOStr: '' + }, moreSearchBtn: true, // 多属性搜索按钮 状态 showTableFlag: true, // 显示添加列表 状态 showSelectBox: true, // 显示高级查询 状态 @@ -1474,7 +1428,12 @@ export default { }, // 查询数据搜索 table 数据 selectLawsStands () { - StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{ + if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { + this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' + } else { + this.sarAccessInfoSearch.standType = 'FOREIGN' + } + StandardsInfoPage(this.sarAccessInfoSearch, this.sarAccessInfo).then(res =>{ this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList.forEach(item => { if (item.standYear === null) { @@ -1482,8 +1441,6 @@ export default { } else { item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear } - }) - this.sarAccessInfoSearchList.forEach(item => { this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index b868827c8..65ae89739 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -191,13 +191,13 @@ align="center"> { this.standinfoList = res.data; + this.standinfoList.forEach(item => { + if (item.standYear === null) { + item.standNumber = item.standSortShow + ' ' + item.standNumber + } else { + item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear + } + }) this.total = res.data.total; }, e => { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 8cfff16a1..464ccc753 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -115,7 +115,11 @@ @click="clearSearchLaws">清空 - + + + 高级查询 + + 高级查询 @@ -124,10 +128,17 @@
- - + + + + + - + - - - { + if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { + this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' + } else { + this.sarAccessInfoSearch.standType = 'FOREIGN' + } + StandardsInfoPage(this.sarAccessInfoSearch, this.sarAccessInfo).then(res =>{ this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList.forEach(item => { if (item.standYear === null) { @@ -1288,8 +1309,6 @@ export default { } else { item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear } - }) - this.sarAccessInfoSearchList.forEach(item => { this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) @@ -1303,7 +1322,6 @@ export default { }) this.drawerTotal = res.data.list.length }, e => { - }) }, // 数据搜索table判断checked状态 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 67196879a..f801e9a9e 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -65,7 +65,7 @@ - +
- - + + + + + - + - - - - - - - - - - - - - - - - {{$t('m.dataAcquisition')}} @@ -519,7 +477,7 @@ import CustomRoleTree from '@/components/CustomFormComponents/roleTree' import stand from "../../../config/pages/attributeCustom/components/stand"; import { mapGetters } from 'vuex' import {interfaceUrl} from "@/sysConfig"; -import {dicTypeData} from "@/api/unqualProcess"; +import {dicTypeData, StandardsInfoPage} from "@/api/unqualProcess" export default { name: 'OtherAddEit', components: { @@ -601,9 +559,9 @@ export default { dataSourceOptions: [ {value: 'INLAND_STAND', label: '国内标准法规'}, {value: 'FOREIGN_STAND', label: '海外标准法规'}, - {value: 'FOREIGN_LAWS', label: '国内外政策'}, + // {value: 'FOREIGN_LAWS', label: '国内外政策'}, // {value: 'BUSINESS', label: '企业标准 '}, - {value: 'TEMP', label: '标准法规清单 '} + // {value: 'TEMP', label: '标准法规清单 '} ], // 新增、编辑 数据搜索字段 sarAccessInfoSearch: { @@ -620,6 +578,22 @@ export default { validFlag: 0, advanceSearchVOStr: '' }, + sarAccessInfo: { + id: '', + issueTime: '', + standName: '', + textStatus: '', + // applicationScope: '', //适用区域 + keywords: '', // 关键字 + detailedListName: '', //清单名称 + applyArctic: '', // 能源种类 + askType: '', // 监管类型 + dataSource: 'INLAND_STAND', // 数据来源 + page: 1, + pageSize: this.$store.getters.userInfo.configContent, + validFlag: 0, + advanceSearchVOStr: '' + }, moreSearchBtn: true, // 多属性搜索按钮 状态 showTableFlag: true, // 显示添加列表 状态 showSelectBox: true, // 显示高级查询 状态 @@ -1276,9 +1250,12 @@ export default { }, // 查询数据搜索 table 数据 selectLawsStands () { - this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, { - _this: this - }, res =>{ + if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { + this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' + } else { + this.sarAccessInfoSearch.standType = 'FOREIGN' + } + StandardsInfoPage(this.sarAccessInfoSearch, this.sarAccessInfo).then(res =>{ this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList.forEach(item => { if (item.standYear === null) { @@ -1286,10 +1263,19 @@ export default { } else { item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear } + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) + this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) + this.$set(item, 'nylx', item.attrInfoMap.NYLX) + this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) + this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) + this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) + this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) + this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) }) this.drawerTotal = res.data.list.length }, e => { - }) }, // 数据搜索table判断checked状态 From 818b620c20e78f5eed33cc90aa76c63b15fb2235 Mon Sep 17 00:00:00 2001 From: zqx0221 <2119066161@qq.com> Date: Tue, 27 Jul 2021 11:29:00 +0800 Subject: [PATCH 10/42] =?UTF-8?q?fix:=E9=93=BE=E6=8E=A5=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E7=82=B9=E5=87=BB=E9=93=BE=E6=8E=A5=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/linkManage/index.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue index f23611502..783a6a8dc 100644 --- a/src/pages/config/pages/linkManage/index.vue +++ b/src/pages/config/pages/linkManage/index.vue @@ -48,8 +48,10 @@ width="220px"> + Date: Tue, 27 Jul 2021 13:43:50 +0800 Subject: [PATCH 11/42] =?UTF-8?q?bug=EF=BC=9A=20=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E5=9C=A8=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E9=A1=B5=E9=9D=A2=E4=B8=8A=E4=BC=A0=E7=9A=84=E9=99=84?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=B5=81=E8=BD=AC=E5=88=B0=E8=B4=A3=E4=BB=BB?= =?UTF-8?q?=E4=BA=BA=E4=BC=9A=E7=AD=BE=E8=8A=82=E7=82=B9=EF=BC=8C=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E6=B2=A1=E6=B3=95=E4=B8=8B=E8=BD=BD=EF=BC=8C=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E6=98=AF=E5=8F=AF=E4=BB=A5=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step2.vue | 215 ++++++++++------- .../pages/creatProcess/bzrk/step3.vue | 63 ++++- .../pages/creatProcess/bzrk/step5.vue | 216 +++++++++++------- 3 files changed, 312 insertions(+), 182 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 1a4702620..6bbadff45 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -201,84 +201,84 @@
- - - -
- {{ form.xgdName }} -
-
- - - -
- - -
- {{ form.fbgbjbdName }} -
-
- - - -
- - -
- {{ form.zbjbdName }} -
-
- - - -
- - -
- {{ form.bpgName }} -
-
- - - -
- - -
- {{ form.ssgName }} -
-
- - - -
- - - - -
- {{ form.kwjName }} -
-
- - - -
- - -
- {{ form.zqyjgName }} -
-
- - - -
- - -
- {{ form.caName }} -
-
- - - -
- - -
- {{ form.jdwjName }} -
-
- - - -
- - - + + + +
+ {{ form.xgdName }} +
+
+ - - +
+ + +
+ {{ form.fbgbjbdName }} +
+
+ - - +
+ + +
+ {{ form.zbjbdName }} +
+
+ - - +
+ + +
+ {{ form.bpgName }} +
+
+ - - +
+ + +
+ {{ form.ssgName }} +
+
+ - - +
+ + + + +
+ {{ form.kwjName }} +
+
+ - - +
+ + +
+ {{ form.zqyjgName }} +
+
+ - - +
+ + +
+ {{ form.caName }} +
+
+ - - +
+ + +
+ {{ form.jdwjName }} +
+
+ - - +
+ + +
@@ -467,14 +467,14 @@ clearable > - -
- {{ form.glwjName }} -
-
- - - -
- + +
+ {{ form.glwjName }} +
+
+ - - +
+ @@ -685,6 +685,16 @@ name: "bzrkStep2", data () { return { + xgdFileId: '', + fbgbjbdFileId: '', + bpgFileId: '', + ssgFileId: '', + zqyjgFileId: '', + jdwjFileId: '', + kwjFileId: '', + glwjFileId: '', + caFileId: '', + zbjbdFileId:'', rules: { commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }], approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }] @@ -844,6 +854,29 @@ }, }, methods: { + downloadFile (fileType) { + if(fileType === 'fbgbjbd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId + }else if(fileType === 'xgd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId + }else if(fileType === 'bpg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId + }else if(fileType === 'ssg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId + }else if(fileType === 'zqyjg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId + }else if(fileType === 'jdwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId + }else if(fileType === 'kwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId + }else if(fileType === 'glwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId + }else if(fileType === 'ca'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId + }else if(fileType === 'zbjbd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId + } + }, getRule(){ if (this.formTongGuo.approvalOpinion !== '1') { this.$refs.formTongGuo.clearValidate('commentText') @@ -910,6 +943,16 @@ }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) + this.xgdFileId = processForm.xgd + this.fbgbjbdFileId = processForm.fbgbjbd + this.bpgFileId = processForm.bpg + this.ssgFileId = processForm.ssg + this.zqyjgFileId = processForm.zqyjg + this.jdwjFileId = processForm.jdwj + this.kwjFileId = processForm.kwj + this.glwjFileId = processForm.glwj + this.caFileId = processForm.ca + this.zbjbdFileId = processForm.zbjbd this.getFormFieldList(processForm) } }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 254066498..599e5826a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -197,7 +197,7 @@ -
+
{{ form.xgdName }}
@@ -205,7 +205,7 @@
-
+
{{ form.fbgbjbdName }}
@@ -213,7 +213,7 @@
-
+
{{ form.zbjbdName }}
@@ -221,7 +221,7 @@
-
+
{{ form.bpgName }}
@@ -229,7 +229,7 @@
-
+
{{ form.ssgName }}
@@ -239,7 +239,7 @@ -
+
{{ form.kwjName }}
@@ -247,7 +247,7 @@
-
+
{{ form.zqyjgName }}
@@ -255,7 +255,7 @@
-
+
{{ form.caName }}
@@ -263,7 +263,7 @@
-
+
{{ form.jdwjName }}
@@ -461,7 +461,7 @@ -
+
{{ form.glwjName }}
@@ -666,6 +666,16 @@ export default { name: "bzrkStep3", data () { return { + xgdFileId: '', + fbgbjbdFileId: '', + bpgFileId: '', + ssgFileId: '', + zqyjgFileId: '', + jdwjFileId: '', + kwjFileId: '', + glwjFileId: '', + caFileId: '', + zbjbdFileId:'', activeName:'1', // 当前流程类型(1待办/2已办) processType: 1, @@ -818,6 +828,29 @@ export default { }, }, methods: { + downloadFile (fileType) { + if(fileType === 'fbgbjbd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId + }else if(fileType === 'xgd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId + }else if(fileType === 'bpg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId + }else if(fileType === 'ssg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId + }else if(fileType === 'zqyjg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId + }else if(fileType === 'jdwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId + }else if(fileType === 'kwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId + }else if(fileType === 'glwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId + }else if(fileType === 'ca'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId + }else if(fileType === 'zbjbd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId + } + }, popoverHide (checkedIds, checkedData) { if(checkedData) { this.form.standSystem = checkedData.id @@ -879,6 +912,16 @@ export default { }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) + this.xgdFileId = processForm.xgd + this.fbgbjbdFileId = processForm.fbgbjbd + this.bpgFileId = processForm.bpg + this.ssgFileId = processForm.ssg + this.zqyjgFileId = processForm.zqyjg + this.jdwjFileId = processForm.jdwj + this.kwjFileId = processForm.kwj + this.glwjFileId = processForm.glwj + this.caFileId = processForm.ca + this.zbjbdFileId = processForm.zbjbd this.getFormFieldList(processForm) } }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index eb5a19493..e62214175 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -198,84 +198,84 @@
- - - -
- {{ form.xgd }} -
-
- - - -
- - -
- {{ form.fbgbjbd }} -
-
- - - -
- - -
- {{ form.zbjbd }} -
-
- - - -
- - -
- {{ form.bpg }} -
-
- - - -
- - -
- {{ form.ssg }} -
-
- - - -
- - - - -
- {{ form.kwj }} -
-
- - - -
- - -
- {{ form.zqyjg }} -
-
- - - -
- - -
- {{ form.ca }} -
-
- - - -
- - -
- {{ form.jdwj }} -
-
- - - -
- - - + + + +
+ {{ form.xgdName }} +
+
+ - - +
+ + +
+ {{ form.fbgbjbdName }} +
+
+ - - +
+ + +
+ {{ form.zbjbdName }} +
+
+ - - +
+ + +
+ {{ form.bpgName }} +
+
+ - - +
+ + +
+ {{ form.ssgName }} +
+
+ - - +
+ + + + +
+ {{ form.kwjName }} +
+
+ - - +
+ + +
+ {{ form.zqyjgName }} +
+
+ - - +
+ + +
+ {{ form.caName }} +
+
+ - - +
+ + +
+ {{ form.jdwjName }} +
+
+ - - +
+ + +
@@ -465,14 +465,15 @@ clearable > - -
- {{ form.glwj }} -
-
- - - -
- + +
+ {{ form.glwjName }} +
+
+ - - +
+ + @@ -670,6 +671,16 @@ name: "bzrkStep5", data () { return { + xgdFileId: '', + fbgbjbdFileId: '', + bpgFileId: '', + ssgFileId: '', + zqyjgFileId: '', + jdwjFileId: '', + kwjFileId: '', + glwjFileId: '', + caFileId: '', + zbjbdFileId:'', // 当前流程类型(1待办/2已办) processType: 1, detailData: [], @@ -790,6 +801,29 @@ }, }, methods: { + downloadFile (fileType) { + if(fileType === 'fbgbjbd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId + }else if(fileType === 'xgd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId + }else if(fileType === 'bpg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId + }else if(fileType === 'ssg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId + }else if(fileType === 'zqyjg'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId + }else if(fileType === 'jdwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId + }else if(fileType === 'kwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId + }else if(fileType === 'glwj'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId + }else if(fileType === 'ca'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId + }else if(fileType === 'zbjbd'){ + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId + } + }, popoverHide (checkedIds, checkedData) { console.log(checkedIds); console.log(checkedData); @@ -816,6 +850,16 @@ }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) + this.xgdFileId = processForm.xgd + this.fbgbjbdFileId = processForm.fbgbjbd + this.bpgFileId = processForm.bpg + this.ssgFileId = processForm.ssg + this.zqyjgFileId = processForm.zqyjg + this.jdwjFileId = processForm.jdwj + this.kwjFileId = processForm.kwj + this.glwjFileId = processForm.glwj + this.caFileId = processForm.ca + this.zbjbdFileId = processForm.zbjbd this.getFormFieldList(processForm) } }).catch(e => { From 6cb41bdb35f3fa8186a1477bc27057dc4c1b15f0 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 27 Jul 2021 13:44:09 +0800 Subject: [PATCH 12/42] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=A0=87=E5=87=86=E7=BB=B4=E5=BA=A6=20?= =?UTF-8?q?=E7=AC=AC=E4=BA=94=E6=AD=A5bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index b0315ca40..6cb34f168 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -304,8 +304,6 @@ export default { }, //提交事件 handleSubmit() { - this.listForm.dataList.forEach(item => { - if (item.workPeople !== undefined) { this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { @@ -321,10 +319,6 @@ export default { } }, e => { }); - } else { - this.$message.warning("请选择分发负责人"); - } - }); }, //批量分发按钮 batchOperation(id) { From be01e64b4a620fd1c50b921a4a8529835f8ca3a6 Mon Sep 17 00:00:00 2001 From: fanlin Date: Tue, 27 Jul 2021 14:04:18 +0800 Subject: [PATCH 13/42] =?UTF-8?q?bug=EF=BC=9A=201=E3=80=81=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E5=9C=88?= =?UTF-8?q?=E4=BD=8F=E7=9A=84=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=85=88=E6=89=8B?= =?UTF-8?q?=E5=8A=A8=E8=BE=93=E5=85=A5=EF=BC=8C=E7=84=B6=E5=90=8E=E5=86=8D?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=9F=A5=E6=89=BE=EF=BC=8C=E7=82=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E5=B0=B1=E4=BC=9A=E6=8A=8A=E6=89=8B=E5=8A=A8=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E7=9A=84=E6=A0=87=E5=87=86=E5=8F=B7=E8=A6=86=E7=9B=96?= =?UTF-8?q?=202=E3=80=81=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81?= =?UTF-8?q?=E7=A8=8B--=E9=87=87=E6=A0=87=E7=BC=96=E5=8F=B7=E4=B9=9F?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=94=AF=E6=8C=81=E6=89=8B=E5=8A=A8=E6=9F=A5?= =?UTF-8?q?=E6=89=BE=E5=92=8C=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 14 ++++++++++++-- .../pages/creatProcess/bzrk/step4.vue | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 9348fdfa0..7ec5ba5c2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -733,6 +733,13 @@ placeholder="请输入采标编号" clearable > + {{'手动查找'}} @@ -1841,10 +1848,13 @@ this.replaceLawsNumModel = false }) // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',') + // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖 if(this.replaceLawType === 'dtbjh'){ - this.form.dtbjh = textArr.join(',') + this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'yybj'){ - this.form.yybj = textArr.join(',') + this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',') + }else if(this.replaceLawType === 'cbbh'){ + this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',') }else { this.form.byybj = textArr.join(',') } diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 1a84a2fe9..28b72d89b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -718,6 +718,13 @@ placeholder="请输入采标编号" clearable > + {{'手动查找'}} Date: Tue, 27 Jul 2021 14:23:59 +0800 Subject: [PATCH 14/42] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E9=AB=98=E7=BA=A7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/addEdit.vue | 154 ++++++-------- .../pages/otherAddEit.vue | 188 +++++------------- .../pages/projectAddEit.vue | 131 +++++------- 3 files changed, 166 insertions(+), 307 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 2f3209ac2..f001bac6b 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -87,26 +87,6 @@ :maxlength="100" > - - - - - - - - - -
- + + + + - - - - - - - - - - - - - - - + + 查询
@@ -292,6 +242,7 @@ v-btn-permission="''" >删除
+ - - - + - + - + - + - + - + - + - + - + - + - +
@@ -689,14 +638,7 @@ export default { // 新增、编辑 数据搜索字段 sarAccessInfoSearch: { id: '', - countryArea: '', // 国家 - issueTime: '', standName: '', - textStatus: '', - // applicationScope: '', //适用区域 - keywords: '', // 关键字 - detailedListName: '', //清单名称 - applyArctic: '', // 能源种类 askType: '', // 监管类型 dataSource: 'INLAND_STAND', // 数据来源 page: 1, @@ -706,13 +648,8 @@ export default { }, sarAccessInfo: { id: '', - issueTime: '', + standNumber: '', standName: '', - textStatus: '', - // applicationScope: '', //适用区域 - keywords: '', // 关键字 - detailedListName: '', //清单名称 - applyArctic: '', // 能源种类 askType: '', // 监管类型 dataSource: 'INLAND_STAND', // 数据来源 page: 1, @@ -1058,15 +995,11 @@ export default { }, // 点击清空查询条件 按钮事件 clearSearchLaws () { - this.sarAccessInfoSearch.advanceSearchVOStr = '' - this.sarAccessInfoSearch.applyArctic = '' // 能源种类 - this.sarAccessInfoSearch.keywords = '' // 关键字 this.sarAccessInfoSearch.askType = '' // 监管类型 - this.sarAccessInfoSearch.detailedListName = '' // 清单名称 this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源 this.sarAccessInfoSearch.standName = '' - this.sarAccessInfoSearch.putTime = '' - this.sarAccessInfoSearch.textStatus = '' + this.sarAccessInfo.standName = '' + this.sarAccessInfo.standNumber = '' this.isListType = false this.selectLawsStands() }, @@ -1433,7 +1366,36 @@ export default { } else { this.sarAccessInfoSearch.standType = 'FOREIGN' } - StandardsInfoPage(this.sarAccessInfoSearch, this.sarAccessInfo).then(res =>{ + StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{ + this.sarAccessInfoSearchList = res.data.list + this.sarAccessInfoSearchList.forEach(item => { + if (item.standYear === null) { + item.standNumber = item.standSortShow + ' ' + item.standNumber + } else { + item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear + } + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) + this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) + this.$set(item, 'nylx', item.attrInfoMap.NYLX) + this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) + this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) + this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) + this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) + this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) + }) + this.drawerTotal = res.data.list.length + }, e => { + }) + }, + selectBtn() { + if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { + this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' + } else { + this.sarAccessInfoSearch.standType = 'FOREIGN' + } + StandardsInfoPage(this.sarAccessInfo).then(res =>{ this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList.forEach(item => { if (item.standYear === null) { @@ -2126,6 +2088,12 @@ export default { text-align: right; } } +.labelBox { + /deep/ .el-form-item__label { + padding-right: 5px; + padding-left: 10px; + } +} .un-select { user-select: none; } diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 464ccc753..08ec91a6c 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -65,40 +65,13 @@ - + - - - - - - - - - - - - -
- + + + + - - - - - - - - - - - - - - - + + 查询
@@ -263,46 +206,6 @@ - - - - - - - - - - - - - {{$t('m.dataAcquisition')}} @@ -407,16 +310,6 @@ width="210px" align="center" label="责任部门"> - { + StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{ + this.sarAccessInfoSearchList = res.data.list + this.sarAccessInfoSearchList.forEach(item => { + if (item.standYear === null) { + item.standNumber = item.standSortShow + ' ' + item.standNumber + } else { + item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear + } + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) + this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) + this.$set(item, 'nylx', item.attrInfoMap.NYLX) + this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) + this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) + this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) + this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) + this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) + }) + this.drawerTotal = res.data.list.length + }, e => { + }) + }, + // 高级检索查询按钮 + selectBtn() { + if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { + this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' + } else { + this.sarAccessInfoSearch.standType = 'FOREIGN' + } + StandardsInfoPage(this.sarAccessInfo).then(res =>{ this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList.forEach(item => { if (item.standYear === null) { @@ -2005,6 +1921,12 @@ export default { text-align: right; } } +.labelBox { + /deep/ .el-form-item__label { + padding-right: 5px; + padding-left: 10px; + } +} .un-select { user-select: none; } diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index f801e9a9e..a784e604c 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -72,33 +72,6 @@ :maxlength="100" > - - - - - - - - - - - - -
- + + + + - - - - - - - - - - - - - - - + + 查询
@@ -566,11 +509,7 @@ export default { // 新增、编辑 数据搜索字段 sarAccessInfoSearch: { id: '', - countryArea: '', // 国家 - // applicationScope: '', //适用区域 - keywords: '', // 关键字 - detailedListName: '', //清单名称 - applyArctic: '', // 能源种类 + standName: '', askType: '', // 监管类型 dataSource: 'INLAND_STAND', // 数据来源 page: 1, @@ -580,13 +519,8 @@ export default { }, sarAccessInfo: { id: '', - issueTime: '', standName: '', - textStatus: '', - // applicationScope: '', //适用区域 - keywords: '', // 关键字 - detailedListName: '', //清单名称 - applyArctic: '', // 能源种类 + standNumber: '', askType: '', // 监管类型 dataSource: 'INLAND_STAND', // 数据来源 page: 1, @@ -917,11 +851,10 @@ export default { // 点击清空查询条件 按钮事件 clearSearchLaws () { this.sarAccessInfoSearch.standName = '' + this.sarAccessInfo.standName = '' + this.sarAccessInfo.standNumber = '' this.sarAccessInfoSearch.advanceSearchVOStr = '' - this.sarAccessInfoSearch.applyArctic = '' // 能源种类 - this.sarAccessInfoSearch.keywords = '' // 关键字 this.sarAccessInfoSearch.askType = '' // 监管类型 - this.sarAccessInfoSearch.detailedListName = '' // 清单名称 this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源 this.isListType = false this.selectLawsStands() @@ -1278,6 +1211,36 @@ export default { }, e => { }) }, + /** 高级查询查询按钮*/ + selectBtn() { + if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { + this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' + } else { + this.sarAccessInfoSearch.standType = 'FOREIGN' + } + StandardsInfoPage(this.sarAccessInfo).then(res =>{ + this.sarAccessInfoSearchList = res.data.list + this.sarAccessInfoSearchList.forEach(item => { + if (item.standYear === null) { + item.standNumber = item.standSortShow + ' ' + item.standNumber + } else { + item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear + } + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) + this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) + this.$set(item, 'nylx', item.attrInfoMap.NYLX) + this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) + this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) + this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) + this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) + this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) + }) + this.drawerTotal = res.data.list.length + }, e => { + }) + }, // 数据搜索table判断checked状态 selectable (row) { return row.isRelateAccess === '1' @@ -1973,6 +1936,12 @@ export default { text-align: right; } } +.labelBox { + /deep/ .el-form-item__label { + padding-right: 5px; + padding-left: 10px; + } +} .un-select { user-select: none; } From 4e921d67e588ea0733cb98a068d257daf4a6d908 Mon Sep 17 00:00:00 2001 From: fanlin Date: Tue, 27 Jul 2021 14:38:23 +0800 Subject: [PATCH 15/42] bug --- .../pages/creatProcess/bzrk/step1.vue | 2 +- .../pages/creatProcess/bzrk/step4.vue | 6 +++--- .../domesticStandardsAndRegulations/index.vue | 10 ++++------ .../foreignStandardsAndRegulations/index.vue | 20 +++++++++---------- 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 7ec5ba5c2..c7ada11bb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1856,7 +1856,7 @@ }else if(this.replaceLawType === 'cbbh'){ this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',') }else { - this.form.byybj = textArr.join(',') + this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',') } // this.$emit('input', textArr.join(',')) this.$refs.selections.clearSelection() diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 28b72d89b..74c328123 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -737,7 +737,7 @@ class="common-button-primary" size="mini" style="position:absolute;top: 10px;right: 0;" - @click="selectLaws('dtbjh'),config.attrName = '代替标准号'" + @click="selectLaws('byybj'),config.attrName = '代替标准号'" >{{'手动查找'}} @@ -1412,8 +1412,8 @@ export default { this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'cbbh'){ this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',') - }else { - this.form.byybj = textArr.join(',') + } else { + this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',') } // this.$emit('input', textArr.join(',')) this.$refs.selections.clearSelection() diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 80c28f02a..87253a87c 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -188,22 +188,21 @@ + prop="XCXSSRQ" + sortable="custom" + width="150px" + label="新车型实施日期"> + prop="ZCCSSRQ" + sortable="custom" + width="150px" + label="在产车实施日期"> Date: Tue, 27 Jul 2021 14:39:01 +0800 Subject: [PATCH 16/42] =?UTF-8?q?feat:=20=E5=9B=BD=E5=86=85=E5=A4=96?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BA=93=20=E5=B7=A6=E4=BE=A7=E6=A0=91=20?= =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 8 +++++--- .../domesticStandardsAndRegulations/index.vue | 14 +++++++++----- .../foreignStandardsAndRegulations/index.vue | 11 ++++++----- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 0e9a838b7..4a5b94f9d 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -1267,6 +1267,9 @@ export default { }, watch: {}, methods: { + FormatDate(date){ + return moment(date).format('YYYY-MM-DD'); + }, // 将文本状态的id与name对应 setMap(data){ data.forEach(item => { @@ -2703,8 +2706,8 @@ export default { location.half = half location.showAll = false }) - this.$http.get('sarSarAccessInfo/sar-sar-access-info/selectProTimeInfoByStandId', { - standId: this.$route.params.id + this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', { + id: this.$route.params.id }, { _this: this }, res => { @@ -2721,7 +2724,6 @@ export default { } }) this.dynamicFormField = displayLocation - console.log(this.dynamicFormField) }) sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation)) this.loading = false diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 80c28f02a..cd2dcfac0 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2679,10 +2679,11 @@ export default { }, // 树节点鼠标移入移出 mouseenter(data){ - console.log(data) - this.$set(data, 'show', true) - if(data.parentId !== null){ - this.$set(data, 'showDel', true) + if(data.menuName !== '我的收藏'){ + this.$set(data, 'show', true) + if(data.parentId !== null){ + this.$set(data, 'showDel', true) + } } }, mouseleave(data){ @@ -2690,6 +2691,7 @@ export default { this.$set(data, 'showDel', false) }, treeClick (treeNode) { + console.log(treeNode) this.selectSarMenu = treeNode this.standCommonlySearch.menuId = treeNode.id this.sarStandardsSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询 @@ -3431,8 +3433,9 @@ export default { formData.nowOrder = this.nowOrder formData.nowOrderBy = this.nowOrderBy // formData.orderBy = this.orderBy + console.log(this.selectSarMenu.id) // 处理我的收藏和个性化标签传参 - if (this.selectSarMenu.id === 'wdsc') { + if (this.selectSarMenu.menuName === '我的收藏') { formData.menuId = undefined formData.labelMenuId = undefined formData.collectMenuId = 'wdsc' @@ -3472,6 +3475,7 @@ export default { } } this.stahndinfoList = res.data.list + console.log(this.stahndinfoList) this.total = res.data.count if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarStandardsSearch.page !== 1) { this.pageChange(1) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 131840831..ff9af285b 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -2217,10 +2217,11 @@ export default { }, // 树节点鼠标移入移出 mouseenter(data){ - console.log(data) - this.$set(data, 'show', true) - if(data.parentId !== null){ - this.$set(data, 'showDel', true) + if(data.menuName !== '我的收藏'){ + this.$set(data, 'show', true) + if(data.parentId !== null){ + this.$set(data, 'showDel', true) + } } }, mouseleave(data){ @@ -2878,7 +2879,7 @@ export default { formData.nowOrderBy = this.nowOrder ? this.orderBy : '' formData.nowOrder = this.nowOrder // 处理我的收藏和个性化标签传参 - if (this.selectSarMenu.id === 'wdsc') { + if (this.selectSarMenu.menuName === '我的收藏') { formData.menuId = undefined formData.labelMenuId = undefined formData.collectMenuId = 'wdsc' From 7657b7ed6af90e6c6a89bc7493e1938e83dffa7a 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, 27 Jul 2021 14:53:01 +0800 Subject: [PATCH 17/42] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1-1.vue | 2855 ++++++++--------- .../pages/creatProcess/bzqdfb/step1.vue | 70 +- .../pages/creatProcess/bzqdfb/step2.vue | 20 +- .../pages/creatProcess/xmpg2/step5.vue | 2 +- .../tabComponents/processCenter/index.vue | 66 + 5 files changed, 1530 insertions(+), 1483 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index bc2aba78e..6d6626e98 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1,1456 +1,1431 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index c274edff0..302272626 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -49,26 +49,25 @@ > -
-

{{listForm.fileName}} +

+

+ {{ listForm.fileName }} + + + 点击上传 + +

-
- - - 点击上传 - - -
@@ -741,17 +740,13 @@ export default { }, roleForm: { startUserName: this.$store.getters.userInfo.userName, - startUser: this.$store.getters.userInfo.id, + startUser: this.$store.getters.userInfo.userId, dockUser: "", - responUserList: "", ministerUser: "", directorUser: "", - presidentUser: "", dockUserName: "", - responUserListName: "", ministerUserName: "", directorUserName: "", - presidentUserName: "" }, formRules: { listType: [ @@ -806,7 +801,7 @@ export default { modelName: "", standId: "", //选择的清单的id signFlag: "1", //是否会签 1为会签 2为不会签 - inforlist: "", //用来存放标准列表的标准id + inforlist: " ", //用来存放标准列表的标准id dataList: [{ code: "", //标准号 standName: "", //标准名称 @@ -850,9 +845,6 @@ export default { } else if (this.type === "directorUser") { this.roleForm.directorUser = data[0].id; this.roleForm.directorUserName = data[0].name; - } else if (this.type === "presidentUser") { - this.roleForm.presidentUser = data[0].id; - this.roleForm.presidentUserName = data[0].name; } this.modalshowflag = false; }, @@ -1032,19 +1024,8 @@ export default { if (this.dataList.length < 1) { this.$message.warning("标准不能为空"); } else { - let json = this.listForm; - this.listForm.fileId = this.fileIds.join(","); - this.listForm.fileName = this.fileListName.join(","); - this.listForm.model = this.listForm.fileId; - this.listForm.modelName = this.listForm.fileName; - json.zrUserId = this.roleForm.dockUser; //会签人 - json.jlUserId = this.roleForm.directorUser; //业务经理 - json.applyUpdUserId = this.roleForm.ministerUser; // 修订人 - json.approvalOpinion = ""; - json.prcCreateUser = this.$store.getters.userInfo.userId; - json.prcCreateUserName = this.$store.getters.userInfo.uName; - json.standName = this.listForm.listName; - json.standId = this.listForm.standId; + var json = Object.assign(this.listForm, this.roleForm) + console.log(json); this.$refs["qdfbForm"].validate((valid) => { if (valid) { this.$refs["Form"].validate((valid) => { @@ -1100,6 +1081,12 @@ export default { }); this.fileListName = middle; this.fileIds.push(file.response.data.id); + if(this.listForm.fileName === null ){ + this.listForm.fileName = this.fileListName.join(',') + }else { + this.listForm.fileName = this.listForm.fileName + ',' + this.fileListName.join(','); + } + this.listForm.fileId = this.listForm.fileId + ',' + this.fileIds.join(',') this.$message.success("上传成功"); } else { this.$message.error(res.message); @@ -1202,6 +1189,7 @@ export default { if (this.standList.length < 1) { this.$message.warning("请选择需要添加进清单的数据"); } else { + let exits = [] this.standList.map(item => { let newStand = false; for (let itemKey of this.dataList) { @@ -1214,8 +1202,10 @@ export default { this.$message.warning("请勿重复添加数据"); } else { this.dataList.push(item); + exits.push(item.id) } }); + this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',') this.standardData = []; this.standModel = false; } diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 976a14cda..617b6018c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -78,8 +78,13 @@ width="180px" label="标准号"> diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 64152b927..c6302ea23 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -600,6 +600,72 @@ export default { prcType: row.prcType } }) + } else if(row.taskInfo === '分发负责人审批') { + this.$router.push({ + name: 'xmpg2Step7', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '架构经理审批') { + this.$router.push({ + name: 'xmpg2Step8', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '工程经理审批') { + this.$router.push({ + name: 'xmpg2Step9', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '标准法规部经理审批') { + this.$router.push({ + name: 'xmpg2Step10', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '汇总审批') { + this.$router.push({ + name: 'xmpg2Step11', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '标准法规部部长审批') { + this.$router.push({ + name: 'xmpg2Step12', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } break //未符合项整改流程 From 9c27738b08abfca968525b5a1f37fb0654751c50 Mon Sep 17 00:00:00 2001 From: zqx0221 <2119066161@qq.com> Date: Tue, 27 Jul 2021 15:37:40 +0800 Subject: [PATCH 18/42] =?UTF-8?q?fix:=E9=93=BE=E6=8E=A5=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E5=88=A0=E9=99=A4=E9=93=BE=E6=8E=A5=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/linkManage/index.vue | 106 ++++++++++++-------- 1 file changed, 65 insertions(+), 41 deletions(-) diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue index 783a6a8dc..6f7caa83e 100644 --- a/src/pages/config/pages/linkManage/index.vue +++ b/src/pages/config/pages/linkManage/index.vue @@ -163,33 +163,46 @@ }, //表格中操作列删除操作弹窗 deleteLink (row) { + this.$confirm('此操作将删除该链接, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.$http.delete('sarUrl/tsUrl/delete', { - id: row.id + id: row.id }, { - _this: this, - loading: 'Loading' + _this: this, + loading: 'Loading' }, res => { - if (res.ok) { - this.$message.success('删除成功') - let arr = [] - for (let a = 0; a < this.linkList.length; a++) { - if (this.linkList[a].id === row.id) { - this.linkList.splice(a, 1) - } - } - this.linkList.forEach((item, index) => { - let json = {} - json.id = item.id - json.orderBy = index + 1 - arr.push(json) - }) - this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => { - this.getLink() - }) - }else { - this.$message.warning(res.message) + if (res.ok) { + this.$message.success('删除成功') + let arr = [] + for (let a = 0; a < this.linkList.length; a++) { + if (this.linkList[a].id === row.id) { + this.linkList.splice(a, 1) + } } + this.linkList.forEach((item, index) => { + let json = {} + json.id = item.id + json.orderBy = index + 1 + arr.push(json) + }) + this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => { + this.getLink() + }) + }else { + this.$message.warning(res.message) + } }) + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' + }); + }); + }, //头部删除按钮 deleteAllLink() { @@ -202,28 +215,39 @@ this.$message.warning('请选择要删除的链接') } else { this.modalRole = true + this.$confirm('此操作将删除链接, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { this.$http.delete('sarUrl/tsUrl/deleteBatch', { - ids: this.ids + ids: this.ids }, {}, res => { - if (res.ok) { - this.$message.success('删除成功') - let arr = this.linkList.filter(items => { - if (!this.ids.includes(items.id)) return items; - }) - let newArr = [] - arr.forEach((item, index) => { - let json = {} - json.id = item.id - json.orderBy = index + 1 - newArr.push(json) - }) - this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(newArr), {}, res => { - this.getLink() - }) - }else { - this.$message.warning(res.message) - } + if (res.ok) { + this.$message.success('删除成功') + let arr = this.linkList.filter(items => { + if (!this.ids.includes(items.id)) return items; + }) + let newArr = [] + arr.forEach((item, index) => { + let json = {} + json.id = item.id + json.orderBy = index + 1 + newArr.push(json) + }) + this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(newArr), {}, res => { + this.getLink() + }) + }else { + this.$message.warning(res.message) + } }) + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' + }); + }); } }, //弹窗关闭操作 From 9baf7dc117d27eaa88ecfc6c80d6c8bb7176b9cf Mon Sep 17 00:00:00 2001 From: fanlin Date: Tue, 27 Jul 2021 15:38:37 +0800 Subject: [PATCH 19/42] =?UTF-8?q?bug=EF=BC=9A=E6=A0=87=E5=87=86=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B--=E6=B5=81=E7=A8=8B=E4=B8=AD?= =?UTF-8?q?=E5=BF=83---=E5=B7=B2=E5=8F=91=E6=B5=81=E7=A8=8B=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=E7=9A=84=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=96=87=E4=BB=B6=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B9=B1=E7=A0=81=EF=BC=8C=E5=8E=BB=E6=8E=89=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=B5=81=E7=A8=8B=E3=80=81=E8=A2=AB=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E6=A0=87=E5=87=86=E3=80=81=E5=8F=82=E4=BC=9A=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=9C=88=E4=BD=8F=E7=9A=84=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=B2=A1=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step4.vue | 4 +- .../pages/creatProcess/bzrk/step5.vue | 130 ++++++++++-------- 2 files changed, 77 insertions(+), 57 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 74c328123..6c3ddd005 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -709,7 +709,7 @@ class="common-button-primary" size="mini" style="position:absolute;top: 10px;right: 0;" - @click="selectLaws('dtbjh'),config.attrName = '代替标准号'" + @click="selectLaws('yybj'),config.attrName = '引用标准'" >{{'手动查找'}} @@ -737,7 +737,7 @@ class="common-button-primary" size="mini" style="position:absolute;top: 10px;right: 0;" - @click="selectLaws('byybj'),config.attrName = '代替标准号'" + @click="selectLaws('byybj'),config.attrName = '被引用标准'" >{{'手动查找'}} diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index e62214175..b062aa82e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -42,13 +42,11 @@ - - + - + + + + + - - - - + - - - - + - - - - + - - - + + + + + - - - + + + + + + + +
{{ form.glwjName }} @@ -492,22 +505,22 @@ clearable > - - - - - - + + + + + + + + + + + + + + + +
@@ -777,6 +790,7 @@ zrbmOptions: [], // 责任部门 zrgcsOptions: [], // 责任工程师 txlbOptions: [], // 体系类别 + qcdwOption: [], // 起草单位 data: [], // 标准列表数据 ListForm: {}, // 新增数据 user1: '', @@ -860,6 +874,11 @@ this.glwjFileId = processForm.glwj this.caFileId = processForm.ca this.zbjbdFileId = processForm.zbjbd + this.form.standYear = processForm.standYear + this.form.standSystem = processForm.standSystem + this.form.kccvppsbm = processForm.kccvppsbm + this.form.cycvppsbm = processForm.cycvppsbm + this.form.dybxh = processForm.dybxh this.getFormFieldList(processForm) } }).catch(e => { @@ -958,6 +977,7 @@ this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.qcdwOption = res.data.QCDW // 体系类别 }) } } From 2eca268fd0f12dd8d3747252f27bd057410a4f2a Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 27 Jul 2021 15:49:45 +0800 Subject: [PATCH 20/42] commit --- src/components/navMenu/index.vue | 2 +- .../pages/creatProcess/bzdy/step1-1.vue | 4 +- .../pages/creatProcess/bzdy/step1.vue | 4 +- .../pages/creatProcess/bzdy/step3.vue | 4 +- .../pages/creatProcess/bzdy/step5.vue | 4 +- .../pages/creatProcess/bzdy/step6.vue | 4 +- .../pages/creatProcess/bzdy/step7.vue | 4 +- .../pages/creatProcess/bzdy/step8.vue | 4 +- .../pages/creatProcess/bzdy/step9.vue | 4 +- .../pages/creatProcess/bzjd/step1.vue | 217 ++++++++---------- .../tabComponents/alreadyProcess/index.vue | 2 +- .../tabComponents/alreadySend/index.vue | 2 +- .../tabComponents/processCenter/index.vue | 2 +- .../tabComponents/taskDraft/index.vue | 2 +- .../pags/consultationDetails.vue | 26 ++- 15 files changed, 129 insertions(+), 156 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 2e85d241d..f9cb687af 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -458,7 +458,7 @@ export default { overflow-y: auto; user-select: none; box-sizing: border-box; - background: url("~assets/images/shangqi/sideBar/side-bar-isCollapse-bg.png") no-repeat; + background: url("~assets/images/shangqi/sideBar/newside-bar-bg1.png") no-repeat; background-size: 100% 100%; &:not(.is-collapse) { width: 212px; diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index 6f7638f37..bb093c810 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -327,11 +327,11 @@ 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'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index db34d6fd9..4bed4251c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -318,11 +318,11 @@ export default { 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'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index 94122ef61..2166ae91f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -236,11 +236,11 @@ 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'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index 47f247302..fd03d1776 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -260,11 +260,11 @@ 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'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue index d9e652faa..307627111 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue @@ -259,11 +259,11 @@ 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'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue index 699657b95..caf5acd2d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue @@ -259,11 +259,11 @@ 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'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue index 220de8e65..df88eaaca 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue @@ -259,11 +259,11 @@ 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'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue index 91fa08324..16c896fdb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -259,11 +259,11 @@ 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'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 1ac24ea1b..d240a7ac1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -165,7 +165,7 @@
@@ -313,58 +313,63 @@
- - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -392,6 +397,7 @@ saveLoading: false, // 基础信息form表单 form: { + id: '', itemsNum: '', itemsName: '', standId: '', @@ -570,7 +576,7 @@ this.listModel = false; this.listModel2 = true this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { - infoId: this.form.id, + infoId: this.form.standId, page: 1, pageSize: 9999 }, { @@ -621,46 +627,25 @@ }, /*** **********************************************/ /** 流程节点负责人的选择 *****************************/ - choiceZRR (type, title, id) { - this.nodeList = [] - this.nodeList.push(id) - this.type = type - this.drawerTitle = title - this.modalshowflag = true - }, - getTree () { - this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { - this.treeData = res.data - }) - }, - saveUserInfo () { - if (this.type === 'deptUserId') { - this.roleForm.deptUserId = this.roleRow.id - this.roleForm.deptUserIdName = this.roleRow.name + saveUserInfo (data) { + if (this.type === 0) { + this.roleForm.deptUserId = data[0].id + this.roleForm.deptUserIdName = data[0].name + } else if (this.type === 1) { + this.itemList[this.zrIndex].zrUserId = data[0].id + this.itemList[this.zrIndex].zrUserIdName = data[0].name + } else { + this.itemList.forEach( item => { + this.zrIdList.forEach( items => { + if (item.id === items) { + item.zrUserId = data[0].id + item.zrUserIdName = data[0].name + } + }) + }) } this.modalshowflag = false }, - cancleUserInfo () { - this.modalshowflag = false - }, - drawerCheck (data) { - var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); - if(getlist.length == 1) { - this.roleRow = getlist[0] - }else { - this.$refs.tree.setCheckedKeys([data.id]); - this.roleRow = this.$refs.tree.getCheckedNodes()[0] - } - }, - drawerCheck2 (data) { - var getlist = this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()); - if(getlist.length == 1) { - this.roleRow = getlist[0] - }else { - this.$refs.tree2.setCheckedKeys([data.id]); - this.roleRow = this.$refs.tree2.getCheckedNodes()[0] - } - }, handleSelectionChange (val) { this.zrIdList = [] val.forEach( item => { @@ -668,51 +653,30 @@ }) }, choiceZRRS (row, type, index) { + this.type = type if (type === 1) { - this.nodeList2 = [] - this.zrIndex= index + this.drawerTitle = '选择责任人' + this.nodeList = [] + this.zrIndex = index this.zrType = type - this.nodeList2.push(row) - this.modalshowflag2 = true - } else { + this.nodeList.push(row) + this.modalshowflag = true + } else if (type === 2) { // 批量 if (this.zrIdList.length > 0) { this.zrType = type - this.nodeList2 = [] - this.modalshowflag2 = true + this.nodeList = [] + this.modalshowflag = true + this.drawerTitle = '批量选择责任人' } else { this.$message.warning('请选择要编辑的数据') } - } - }, - saveUserInfo2 () { - var idList = '' - var nameList = '' - this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => { - if (nameList.length > 0) { - nameList += ',' - idList += ',' - } - idList += item.id - nameList += item.name - }) - if (this.zrType == 1) { - this.itemList[this.zrIndex].zrUserId = idList - this.itemList[this.zrIndex].zrUserIdName = nameList } else { - this.itemList.forEach( item => { - this.zrIdList.forEach( items => { - if (item.id === items) { - item.zrUserId = idList - item.zrUserIdName = nameList - } - }) - }) + this.nodeList = [] + this.nodeList.push(row) + this.drawerTitle = '选择标准法规部部长' + this.modalshowflag = true } - this.modalshowflag2 = false - }, - cancleUserInfo2 () { - this.modalshowflag2 = false }, handleTabs(name) { this.active = name @@ -766,7 +730,6 @@ } }, mounted () { - this.getTree() this.sarStandCompareHis() this.sarStandCompareHis2() this.tableHeight = $('.content').height() - 44 diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue index 2e9643307..a68ddea6e 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue @@ -127,7 +127,7 @@ - 查看 + 查看
diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue index 647a5fd38..d1bdadf80 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue @@ -127,7 +127,7 @@ - 查看 + 查看
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 64152b927..4075151f6 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -124,7 +124,7 @@ + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue index 19eb851ea..7b02fb449 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue @@ -41,92 +41,98 @@ + :data="dataList" + style="width: 100%; border: 1px solid #cccccc" + row-key="standId" + height="70%" + border + @selection-change="selectStandChange" + :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', + fontWeight: 'bold', height: '48px'}" + > + type="selection" + width="55" + align="center"> + prop="standEnName" + label="标准编号" + width="180" + fixed="left" + align="center" + > + prop="standName" + fixed="left" + width="180" + align="center" + label="标准名称" + > + prop="itemsNum" + align="center" + width="200" + label="条款号"> + prop="itemsName" + width="200" + align="center" + label="条款名称"> + prop="xcxssrqgj" + width="200" + align="center" + label="新车型实施日期"> + prop="zccssrqgj" + width="200" + align="center" + label="在产车实施日期"> + prop="productType" + align="center" + label="在研产品"> + prop="complianceReasons" + align="center" + width="160" + label="合规"> + align="center" + width="160" + prop="researchNonCompliance" + label="不合规"> + prop="noCompliance" + align="center" + width="160" + label="不合规项目"> + prop="countermeasures" + align="center" + width="160" + label="应对措施"> + prop="completionTime" + align="center" + width="160" + label="完成时间"> @@ -134,48 +140,41 @@ + align="center" + label="在产产品"> + prop="zcComplianceReasons" + align="center" + width="160" + label="合规(具体情况)"> + align="center" + width="160" + label="不合规"> + prop="zcNoCompliance" + align="center" + width="160" + label="不合规项目"> + prop="zcCountermeasures" + align="center" + width="160" + label="应对措施"> + prop="zcCompletionTime" + align="center" + width="160" + label="完成时间"> - -
@@ -297,7 +296,7 @@ export default { saveLoading: false, //表单的数据 listForm: { - BZFlag: " ", //1审批通过 其他为驳回 + jgFlag: " ", //1审批通过 其他为驳回 projectNumber: "", //项目编号 projectName: "", //项目名称 dataList: [], //项目下的标准数据 @@ -359,42 +358,50 @@ export default { }, //驳回事件 beforeBack() { - this.listForm.BZFlag = "2"; - this.listForm.commentText = this.commentText; - const json = JSON.stringify(this.listForm); - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.taskIds, - userId: this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - }, e => { - }); + if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + this.$message.warning('请填写审批意见') + }else{ + this.listForm.jgFlag = "2"; + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }, e => { + }); + } }, //提交事件 handleSubmit() { - this.listForm.BZFlag = "1"; - this.listForm.commentText = this.commentText; - const json = JSON.stringify(this.listForm); - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.taskIds, - userId: this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - }, e => { - }); - } + if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + this.$message.warning('请填写审批意见') + }else{ + this.listForm.jgFlag = "1"; + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }, e => { + }); + } + }, }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue index 19cfdb36d..5ab76b5c5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue @@ -41,92 +41,98 @@ + :data="dataList" + style="width: 100%; border: 1px solid #cccccc" + row-key="standId" + height="70%" + border + @selection-change="selectStandChange" + :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', + fontWeight: 'bold', height: '48px'}" + > + type="selection" + width="55" + align="center"> + prop="standEnName" + label="标准编号" + width="180" + fixed="left" + align="center" + > + prop="standName" + fixed="left" + width="180" + align="center" + label="标准名称" + > + prop="itemsNum" + align="center" + width="200" + label="条款号"> + prop="itemsName" + width="200" + align="center" + label="条款名称"> + prop="xcxssrqgj" + width="200" + align="center" + label="新车型实施日期"> + prop="zccssrqgj" + width="200" + align="center" + label="在产车实施日期"> + prop="productType" + align="center" + label="在研产品"> + prop="complianceReasons" + align="center" + width="160" + label="合规"> + align="center" + width="160" + prop="researchNonCompliance" + label="不合规"> + prop="noCompliance" + align="center" + width="160" + label="不合规项目"> + prop="countermeasures" + align="center" + width="160" + label="应对措施"> + prop="completionTime" + align="center" + width="160" + label="完成时间"> @@ -134,48 +140,41 @@ + align="center" + label="在产产品"> + prop="zcComplianceReasons" + align="center" + width="160" + label="合规(具体情况)"> + align="center" + width="160" + label="不合规"> + prop="zcNoCompliance" + align="center" + width="160" + label="不合规项目"> + prop="zcCountermeasures" + align="center" + width="160" + label="应对措施"> + prop="zcCompletionTime" + align="center" + width="160" + label="完成时间"> - -
@@ -359,42 +358,50 @@ export default { }, //驳回事件 beforeBack() { - this.listForm.BZFlag = "2"; - this.listForm.commentText = this.commentText; - const json = JSON.stringify(this.listForm); - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.taskIds, - userId: this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - }, e => { - }); + if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + this.$message.warning('请填写审批意见') + }else{ + this.listForm.gcFlag = "2"; + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }, e => { + }); + } }, //提交事件 handleSubmit() { - this.listForm.BZFlag = "1"; - this.listForm.commentText = this.commentText; - const json = JSON.stringify(this.listForm); - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.taskIds, - userId: this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - }, e => { - }); - } + if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + this.$message.warning('请填写审批意见') + }else{ + this.listForm.gcFlag = "1"; + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }, e => { + }); + } + }, }, computed: { listNoDataText() { From 567cb4905ed9a844476491e258c82ad77cbf43aa Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 28 Jul 2021 10:28:36 +0800 Subject: [PATCH 41/42] =?UTF-8?q?feat:=20=E5=9B=BD=E5=A4=96=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=BA=93=20=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 96 ++++++++++++++++++- 1 file changed, 95 insertions(+), 1 deletion(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index c00a70b96..affcc92df 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -199,9 +199,103 @@
+