From 7262a6d20460ef46f01bdd5cf0714a4cda14206c Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Thu, 29 Jul 2021 09:21:36 +0800 Subject: [PATCH 01/13] =?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=E6=B8=85=E7=A9=BA=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=A1=B5=E7=9A=84=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/addEdit.vue | 60 ++++++++++-------- .../pages/details.vue | 28 +-------- .../pages/otherAddEit.vue | 63 +++++++++++-------- .../pages/projectAddEit.vue | 55 +++++++++------- 4 files changed, 106 insertions(+), 100 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 853fa1c92..e8a607477 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -298,9 +298,6 @@ align="center" width="210px" label="标准实施日期"> - { // 责任部门数据字典 this.zrbmOptions = res.data.ZRBMCLASS @@ -889,6 +889,7 @@ export default { methods: { // 高级检索 selectMoreBtn () { + this.selectLawsStands() this.showSelectBox = !this.showSelectBox this.showTableFlag = false if (!this.showSelectBox) { @@ -985,6 +986,7 @@ export default { }, // 点击显示隐藏数据列表 按钮事件 isShowTable () { + this.selectLawsStands() this.showTableFlag = !this.showTableFlag this.selectedAccInfoSearchList = [] // 清空 }, @@ -1292,25 +1294,31 @@ export default { let rowlist3 = [] for (let i = 0; i < this.sarAccessInfoList.length; i++) { rowlist.push(this.sarAccessInfoList[i].id) - if (this.sarAccessInfoList[i].putTime === null || this.sarAccessInfoList[i].zccssrqgj ===null || this.sarAccessInfoList[i].xcxssrqgj === null) { - rowlist1.push(this.sarAccessInfoList[i].putTime) - rowlist2.push(this.sarAccessInfoList[i].zccssrqgj) - rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj) + if (this.sarAccessInfoList[i].putTime === null) { + rowlist1.push(this.sarAccessInfoList[i].putTime = '') }else { rowlist1.push(this.sarAccessInfoList[i].putTime.toString()) - rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString()) - rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString()) } + if (this.sarAccessInfoList[i].xcxssrqgj === null) { + rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '') + }else { + rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString()) + } + if (this.sarAccessInfoList[i].zccssrqgj === null) { + rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '') + }else { + rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString()) + } } rowlist = rowlist.join(',') rowlist1 = rowlist1.join(',') rowlist2 = rowlist2.join(',') rowlist3 = rowlist3.join(',') let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO)) - sarAccessEO.inforlist = JSON.stringify(rowlist) - sarAccessEO.inforlist1 = JSON.stringify(rowlist1) - sarAccessEO.inforlist2 = JSON.stringify(rowlist2) - sarAccessEO.inforlist3 = JSON.stringify(rowlist3) + sarAccessEO.inforlist = rowlist + sarAccessEO.inforlist1 = rowlist1 + sarAccessEO.inforlist2 = rowlist2 + sarAccessEO.inforlist3 = rowlist3 sarAccessEO.countryArea = sarAccessEO.countryArea.join(',') // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',') // 判断是否有附件 @@ -1391,8 +1399,8 @@ export default { this.$set(item, 'kccvppsbm', '') this.$set(item, 'kccvppscn', '') }else { - this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) - this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) @@ -1433,8 +1441,8 @@ export default { this.$set(item, 'kccvppsbm', '') this.$set(item, 'kccvppscn', '') }else { - this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) - this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) @@ -1469,8 +1477,8 @@ export default { this.$set(item, 'kccvppsbm', '') this.$set(item, 'kccvppscn', '') }else { - this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) - this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) @@ -1571,7 +1579,7 @@ export default { for (var accessInfo in exportList) { accIdAndrestype.push(exportList[accessInfo].id) } - const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName + const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName window.open(exportURL) this.$message.success('导出信息成功') } @@ -1984,7 +1992,7 @@ export default { }, { _this: this }, res => { - this.sarAccessInfoList = res.data + this.sarAccessInfoList = res.data.records this.sarAccessInfoList.forEach(item => { if (item.standYear === null) { item.standNumber = item.standSortShow + ' ' + item.standNumber @@ -2003,8 +2011,8 @@ export default { this.$set(item, 'kccvppsbm', '') this.$set(item, 'kccvppscn', '') }else { - this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) - this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 65ae89739..674ab98bd 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -223,24 +223,12 @@ align="center" width="180px" label="适用车型"> - - - - { - this.standinfoList = res.data; + this.standinfoList = res.data.records; + this.standardFormTotal = res.data.total this.standinfoList.forEach(item => { if (item.standYear === null) { item.standNumber = item.standSortShow + ' ' + item.standNumber @@ -498,7 +475,6 @@ export default { 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 52da71b0b..ebae46d8b 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -290,9 +290,11 @@ width="210px" align="center" label="在产车实施日期"> - + - + { // 责任部门数据字典 this.zrbmOptions = res.data.ZRBMCLASS @@ -944,11 +947,13 @@ export default { return true }, moreSearch () { + this.selectLawsStands() this.moreSearchShow = !this.moreSearchShow this.moreSearchBtn = !this.moreSearchBtn }, // 点击显示隐藏数据列表 按钮事件 isShowTable () { + this.selectLawsStands() this.showTableFlag = !this.showTableFlag this.selectedAccInfoSearchList = [] // 清空 }, @@ -1258,25 +1263,31 @@ export default { let rowlist3 = [] for (let i = 0; i < this.sarAccessInfoList.length; i++) { rowlist.push(this.sarAccessInfoList[i].id) - if (this.sarAccessInfoList[i].putTime === null || this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === null) { - rowlist1.push(this.sarAccessInfoList[i].putTime) - rowlist2.push(this.sarAccessInfoList[i].zccssrqgj) - rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj) + if (this.sarAccessInfoList[i].putTime === null) { + rowlist1.push(this.sarAccessInfoList[i].putTime = '') }else { rowlist1.push(this.sarAccessInfoList[i].putTime.toString()) - rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString()) + } + if (this.sarAccessInfoList[i].xcxssrqgj === null) { + rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '') + }else { rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString()) } + if (this.sarAccessInfoList[i].zccssrqgj === null) { + rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '') + }else { + rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString()) + } } rowlist = rowlist.join(',') rowlist1 = rowlist1.join(',') rowlist2 = rowlist2.join(',') rowlist3 = rowlist3.join(',') let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO)) - sarAccessEO.inforlist = JSON.stringify(rowlist) - sarAccessEO.inforlist1 = JSON.stringify(rowlist1) - sarAccessEO.inforlist2 = JSON.stringify(rowlist2) - sarAccessEO.inforlist3 = JSON.stringify(rowlist3) + sarAccessEO.inforlist = rowlist + sarAccessEO.inforlist1 = rowlist1 + sarAccessEO.inforlist2 = rowlist2 + sarAccessEO.inforlist3 = rowlist3 // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',') // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',') // 判断是否有附件 @@ -1357,8 +1368,8 @@ export default { this.$set(item, 'kccvppsbm', '') this.$set(item, 'kccvppscn', '') }else { - this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) - this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) @@ -1400,8 +1411,8 @@ export default { this.$set(item, 'kccvppsbm', '') this.$set(item, 'kccvppscn', '') }else { - this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) - this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) @@ -1436,8 +1447,8 @@ export default { this.$set(item, 'kccvppsbm', '') this.$set(item, 'kccvppscn', '') }else { - this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) - this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) @@ -1538,7 +1549,7 @@ export default { for (var accessInfo in exportList) { accIdAndrestype.push(exportList[accessInfo].id) } - const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName + const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName window.open(exportURL) // window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames this.$message.success('导出信息成功') @@ -1953,7 +1964,7 @@ export default { }, { _this: this }, res => { - this.sarAccessInfoList = res.data + this.sarAccessInfoList = res.data.records this.sarAccessInfoList.forEach(item => { if (item.standYear === null) { item.standNumber = item.standSortShow + ' ' + item.standNumber @@ -1972,8 +1983,8 @@ export default { this.$set(item, 'kccvppsbm', '') this.$set(item, 'kccvppscn', '') }else { - this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) - this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 4dfcc1846..a1baae20a 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -291,7 +291,9 @@ align="center" label="在产车实施日期"> { // 责任部门数据字典 this.zrbmOptions = res.data.ZRBMCLASS @@ -944,11 +947,13 @@ export default { return true }, moreSearch () { + this.selectLawsStands() this.moreSearchShow = !this.moreSearchShow this.moreSearchBtn = !this.moreSearchBtn }, // 点击显示隐藏数据列表 按钮事件 isShowTable () { + this.selectLawsStands() this.showTableFlag = !this.showTableFlag this.selectedAccInfoSearchList = [] // 清空 }, @@ -1257,25 +1262,31 @@ export default { let rowlist3 = [] for (let i = 0; i < this.sarAccessInfoList.length; i++) { rowlist.push(this.sarAccessInfoList[i].id) - if (this.sarAccessInfoList[i].putTime === null || this.sarAccessInfoList[i].zccssrqgj ===null || this.sarAccessInfoList[i].xcxssrqgj === null) { - rowlist1.push(this.sarAccessInfoList[i].putTime) - rowlist2.push(this.sarAccessInfoList[i].zccssrqgj) - rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj) + if (this.sarAccessInfoList[i].putTime === null) { + rowlist1.push(this.sarAccessInfoList[i].putTime = '') }else { rowlist1.push(this.sarAccessInfoList[i].putTime.toString()) - rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString()) + } + if (this.sarAccessInfoList[i].xcxssrqgj === null) { + rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '') + }else { rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString()) } + if (this.sarAccessInfoList[i].zccssrqgj === null) { + rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '') + }else { + rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString()) + } } rowlist = rowlist.join(',') rowlist1 = rowlist1.join(',') rowlist2 = rowlist2.join(',') rowlist3 = rowlist3.join(',') let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO)) - sarAccessEO.inforlist = JSON.stringify(rowlist) - sarAccessEO.inforlist1 = JSON.stringify(rowlist1) - sarAccessEO.inforlist2 = JSON.stringify(rowlist2) - sarAccessEO.inforlist3 = JSON.stringify(rowlist3) + sarAccessEO.inforlist = rowlist + sarAccessEO.inforlist1 = rowlist1 + sarAccessEO.inforlist2 = rowlist2 + sarAccessEO.inforlist3 = rowlist3 // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',') // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',') // 判断是否有附件 @@ -1356,8 +1367,8 @@ export default { this.$set(item, 'kccvppsbm', '') this.$set(item, 'kccvppscn', '') }else { - this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) - this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) @@ -1399,8 +1410,8 @@ export default { this.$set(item, 'kccvppsbm', '') this.$set(item, 'kccvppscn', '') }else { - this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) - this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) @@ -1435,8 +1446,8 @@ export default { this.$set(item, 'kccvppsbm', '') this.$set(item, 'kccvppscn', '') }else { - this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) - this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) @@ -1537,7 +1548,7 @@ export default { for (var accessInfo in exportList) { accIdAndrestype.push(exportList[accessInfo].id) } - const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName + const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName window.open(exportURL) // window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames this.$message.success('导出信息成功') @@ -1954,7 +1965,7 @@ export default { }, { _this: this }, res => { - this.sarAccessInfoList = res.data + this.sarAccessInfoList = res.data.records this.sarAccessInfoList.forEach(item => { if (item.standYear === null) { item.standNumber = item.standSortShow + ' ' + item.standNumber @@ -1975,8 +1986,8 @@ export default { this.$set(item, 'kccvppsbm', '') this.$set(item, 'kccvppscn', '') }else { - this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) - this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) From c872b0edb14ac6520a3404e0226f05a739a6689a Mon Sep 17 00:00:00 2001 From: fanlin Date: Thu, 29 Jul 2021 09:44:27 +0800 Subject: [PATCH 02/13] =?UTF-8?q?bug:=20=E4=B8=8A=E4=BC=A0=E4=B8=8A?= =?UTF-8?q?=E5=8E=BB=E6=96=87=E4=BB=B6=E4=BB=A5=E5=90=8E=E6=B8=85=E7=A9=BA?= =?UTF-8?q?=E4=BB=A5=E4=BE=BF=E4=BA=8E=E4=B8=8B=E6=AC=A1=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 158a5e6b6..493a8f6ae 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -843,6 +843,7 @@ 1) { - fileList.splice(0, 1) + this.fileList = fileList.splice(0, 1) } if (response.ok) { this.fileMadel = false + this.fileList = [] if(this.fileType === 'fbgbjbd'){ this.form.fbgbjbd = response.data.id; this.form.fbgbjbdName = response.data.name; From 75594d8959be244643c44497da3da798c2f943d2 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 29 Jul 2021 10:15:53 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=B4=E5=BA=A6?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg2/step10.vue | 8 +- .../pages/creatProcess/xmpg2/step11.vue | 8 +- .../pages/creatProcess/xmpg2/step12.vue | 7 +- .../pages/creatProcess/xmpg2/step2.vue | 74 ++++++++++--------- .../pages/creatProcess/xmpg2/step7.vue | 8 +- .../pages/creatProcess/xmpg2/step8.vue | 7 +- .../pages/creatProcess/xmpg2/step9.vue | 7 +- 7 files changed, 80 insertions(+), 39 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue index 517a91b42..4891306dc 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -46,7 +46,6 @@ row-key="standId" height="70%" border - @selection-change="selectStandChange" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" > @@ -175,6 +174,12 @@ + +
@@ -387,6 +392,7 @@ export default { this.listForm.bzFlag = "1"; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + console.log(json) this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue index f560b2da8..ecd157571 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue @@ -46,7 +46,6 @@ row-key="standId" height="70%" border - @selection-change="selectStandChange" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" > @@ -175,6 +174,12 @@ + +
@@ -335,6 +340,7 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { + console.log(res.mesg) if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue index 800bc166b..5cb4a140c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -46,7 +46,6 @@ row-key="standId" height="70%" border - @selection-change="selectStandChange" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" > @@ -175,6 +174,12 @@ + +
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue index f44146803..d00f00f00 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue @@ -312,42 +312,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.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 => { + }); + } }, //提交事件 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.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 => { + }); + } + } }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue index ac7e9a61e..1043c1f48 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue @@ -46,7 +46,6 @@ row-key="standId" height="70%" border - @selection-change="selectStandChange" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" > @@ -175,6 +174,12 @@ + +
@@ -335,6 +340,7 @@ taskIds: this.taskIds, pId: this.pId }).then(res => { + console.log(res.mesg) if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue index 7b02fb449..06afbaec8 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue @@ -46,7 +46,6 @@ row-key="standId" height="70%" border - @selection-change="selectStandChange" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" > @@ -175,6 +174,12 @@ + +
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue index 5ab76b5c5..a88631f58 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue @@ -46,7 +46,6 @@ row-key="standId" height="70%" border - @selection-change="selectStandChange" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" > @@ -175,6 +174,12 @@ + +
From b8444b728d8f3172ae5eb2dfb47464087cbb13de Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Thu, 29 Jul 2021 10:50:01 +0800 Subject: [PATCH 04/13] =?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=E3=80=81=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=A1=B5=E7=9A=84=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/addEdit.vue | 2 +- .../accessStandardsAndRegulations/pages/otherAddEit.vue | 3 +-- .../accessStandardsAndRegulations/pages/projectAddEit.vue | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index e8a607477..2c860654c 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -1173,7 +1173,6 @@ export default { return items.id == item.id }) if(addList > -1){ - this.$message.warning('请勿添加重复数据') // this.$refs.accessTypeSelect.clearSelection() this.$refs.entryTable.clearSelection() this.$refs.searchTable.clearSelection() @@ -1184,6 +1183,7 @@ export default { this.$refs.searchTable.clearSelection() } }) + this.$message.warning('请勿添加重复数据') } else { this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)') } diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index ebae46d8b..4a1bebbc0 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -1142,7 +1142,6 @@ export default { return items.id == item.id }) if(addList > -1){ - this.$message.warning('请勿添加重复数据') // this.$refs.accessTypeSelect.clearSelection() this.$refs.entryTable.clearSelection() this.$refs.searchTable.clearSelection() @@ -1153,6 +1152,7 @@ export default { this.$refs.searchTable.clearSelection() } }) + this.$message.warning('请勿添加重复数据') this.selectedAccInfoSearchList = [] this.$refs.entryTable.clearSelection() this.$refs.searchTable.clearSelection() @@ -1326,7 +1326,6 @@ export default { loading: 'loadData' }, res => { if (res.ok) { - this.$message.success('编辑成功') this.isNext = true this.$router.push({ name: 'AccessStandardsAndRegulations' diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index a1baae20a..8adf94499 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -1141,7 +1141,6 @@ export default { return items.id == item.id }) if(addList > -1){ - this.$message.warning('请勿添加重复数据') // this.$refs.accessTypeSelect.clearSelection() this.$refs.entryTable.clearSelection() this.$refs.searchTable.clearSelection() @@ -1152,6 +1151,7 @@ export default { this.$refs.searchTable.clearSelection() } }) + this.$message.warning('请勿添加重复数据') this.selectedAccInfoSearchList = [] this.$refs.entryTable.clearSelection() this.$refs.searchTable.clearSelection() @@ -1325,7 +1325,6 @@ export default { loading: 'loadData' }, res => { if (res.ok) { - this.$message.success('编辑成功') this.isNext = true this.$router.push({ name: 'AccessStandardsAndRegulations' From 7697871cf908233a0445d1fa2ff300df976c9d46 Mon Sep 17 00:00:00 2001 From: fanlin Date: Thu, 29 Jul 2021 14:16:48 +0800 Subject: [PATCH 05/13] =?UTF-8?q?bug=EF=BC=9A=2046129=20=E5=9B=BD=E5=86=85?= =?UTF-8?q?=E5=A4=96=E6=A0=87=E5=87=86=E5=BA=93=EF=BC=8C=E5=B7=A6=E4=BE=A7?= =?UTF-8?q?=E6=A0=91=E7=8A=B6=E5=9B=BE=E6=9F=A5=E8=AF=A2=E5=8D=A0=E4=BD=8D?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=BA=94=E6=94=B9=E4=B8=BA=EF=BC=9A=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=A0=91=E7=8A=B6=E5=9B=BE=E4=BD=93=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 2 +- .../foreignStandardsAndRegulations/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 59bd2bd9f..5b3add18e 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -4,7 +4,7 @@
Date: Thu, 29 Jul 2021 15:03:30 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1-1.vue | 9 ++++ .../pages/creatProcess/bzqdfb/step1.vue | 46 ++++++----------- .../pages/creatProcess/xmpg/step1.vue | 31 ++++++------ .../pages/creatProcess/xmpg/step2.vue | 49 ++++++++++--------- .../pages/processDetail/index.vue | 12 ++++- 5 files changed, 77 insertions(+), 70 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 401babe87..e1c72c47a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1273,6 +1273,15 @@ export default { res.data = []; } this.dataList = res.data; + this.dataList.forEach(item => { + if (item.xcxssrqgj === null){ + this.$set(item, "XCXSSRQ", ''); + this.$set(item, "ZCCSSRQ", ''); + }else{ + this.$set(item, "XCXSSRQ", item.xcxssrqgj); + this.$set(item, "ZCCSSRQ", item.zccssrqgj); + } + }) this.listForm.dataList = res.data; let formId = []; this.dataList.map(item => { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 576ce6803..09c935c54 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -125,6 +125,9 @@ prop="issueTime" align="center" label="发布日期"> + - - - - + - - - { + if (item.xcxssrqgj === null){ + this.$set(item, "XCXSSRQ", ''); + this.$set(item, "ZCCSSRQ", ''); + }else{ + this.$set(item, "XCXSSRQ", item.xcxssrqgj); + this.$set(item, "ZCCSSRQ", item.zccssrqgj); + } + }) this.listForm.dataList = res.data; let formId = []; this.dataList.map(item => { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index c1c65b777..40db856ba 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -93,20 +93,19 @@ - - - - - - - - - - + + + + + + + + @@ -409,8 +408,8 @@ export default { label: "name" }, roleForm: { - startUserName: this.$store.getters.userInfo.userName, - startUser: this.$store.getters.userInfo.id, + prcCreateUserName: this.$store.getters.userInfo.userName, + prcCreateUser: this.$store.getters.userInfo.userId, qualityEngineer: "", certifiedEngineer: "", qualityEngineerName: "", @@ -521,10 +520,11 @@ export default { this.listForm.certifiedEngineer = data[0].id; this.listForm.certifiedEngineerName = data[0].name; } else if (this.type === "distributePerson") { - // this.dataList.distributePerson = data[0].id; - // this.dataList.distributePersonName = data[0].name; + this.dataList.distributePersonId = data[0].id; + this.dataList.distributePerson = data[0].name; this.listForm.dataList[this.dsadadadsada].distributePersonId = data[0].id; this.listForm.dataList[this.dsadadadsada].distributePerson = data[0].name; + console.log(this.dataList) this.showColumn = false; this.$nextTick(() => { this.showColumn = true; @@ -652,6 +652,7 @@ export default { this.$message.warning("请选择分发责任人"); } else { var json = Object.assign(this.listForm, this.roleForm); + console.log(json); this.$refs["listForm"].validate((valid) => { if (valid) { this.$refs["roleForm"].validate((valid) => { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 123463a43..2d7414f24 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -328,33 +328,36 @@ export default { //驳回事件 beforeBack () { - this.listForm.passFlag = '1' - this.handleSubmit() + if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + this.$message.warning('请填写审批意见') + }else{ + this.listForm.passFlag = '1' + this.handleSubmit() + } }, //提交事件 handleSubmit() { - this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; - this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; - this.listForm.zrUserId = this.$store.getters.userInfo.userId ; - this.listForm.commentText = this.commentText; - this.listForm.standId = this.listForm.standId; - this.listForm.breakdownList = this.listForm.breakdownList - 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.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 => { + + }); + } - }); }, //标准表格选择框改变 selectStandChange(data) { diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 152f4d24b..ff4dd93eb 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -205,10 +205,18 @@ export default { this.toProcessDetail('bzqdfbStep4',row) }else if (prcType === '5'){ //标准项目合规评估 标准维度 - this.toProcessDetail('xmpgStep7',row) + if(row.taskInfo === '标准法规部部长审批'){ + this.toProcessDetail('xmpgStep7',row) + }else{ + this.toProcessDetail('xmpgStep2',row) + } }else if(prcType === '6'){ //标准项目合规评估 项目维度 - this.toProcessDetail('xmpg2Step12',row) + if(row.taskInfo === '标准法规部领导审核'){ + this.toProcessDetail('xmpg2Step12',row) + }else{ + this.toProcessDetail('xmpg2Step2',row) + } } } else { this.$message.warning('当前流程未全部办理完成，无法查看') From d62f69ed7e85510ec1e750e0ec857073f4c4034e Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 29 Jul 2021 15:22:24 +0800 Subject: [PATCH 07/13] commit --- .../config/pages/mechanismManage/index.vue | 2 +- src/pages/home1/components/todoList/index.vue | 451 +++++++++++++++++- .../processCenter/pages/newProcess/index.vue | 19 +- .../tabComponents/processCenter/index.vue | 1 - 4 files changed, 458 insertions(+), 15 deletions(-) diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index beb4d7667..bf1e90b44 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -312,7 +312,7 @@ export default { } .tree-content { background: #fff; - width: 16%; + width: 300px; position: relative; .tree { width: 95%; diff --git a/src/pages/home1/components/todoList/index.vue b/src/pages/home1/components/todoList/index.vue index 72814cde8..f7e585052 100644 --- a/src/pages/home1/components/todoList/index.vue +++ b/src/pages/home1/components/todoList/index.vue @@ -87,6 +87,7 @@ export default { } }) } + break case '2': if (row.taskInfo === '责任对接人选择责任人') { this.$router.push({ @@ -110,9 +111,166 @@ export default { prcType: row.prcType } }) + } else if (row.taskInfo === '责任对接人审批') { + this.$router.push({ + name: 'bzdyStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '标准法规工程师调研汇总'){ + this.$router.push({ + name: 'bzdyStep5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '责任人会签'){ + this.$router.push({ + name: 'bzdyStep6', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '部长+对接人审核') { + this.$router.push({ + name: 'bzdyStep7', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo.indexOf('工程研究总院院长') == 0 ) { + this.$router.push({ + name: 'bzdyStep9', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else { + this.$router.push({ + name: 'bzdyStep8', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } break; - //标准清单更新/发布流程 + case '3': + if (row.taskInfo === '责任对接人选择责任人') { + this.$router.push({ + name: 'bzzqyjStep2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '责任人填写征求意见'){ + this.$router.push({ + name: 'bzzqyjStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '责任对接人审批') { + this.$router.push({ + name: 'bzzqyjStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '标准法规工程师汇总填写处理意见') { + this.$router.push({ + name: 'bzzqyjStep5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '责任人会签') { + this.$router.push({ + name: 'bzzqyjStep6', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '部长+对接人审核') { + this.$router.push({ + name: 'bzzqyjStep7', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo.indexOf('技术委员会相关专委会主任') == 0 ) { + this.$router.push({ + name: 'bzzqyjStep8', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else { + this.$router.push({ + name: 'bzzqyjStep9', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + break + //标准清单更新/发布流程 case'4' : if (row.taskInfo === '进行会签，填写意见') { this.$router.push({ @@ -148,8 +306,8 @@ export default { } }) } - break; - //项目合规评估流程 + break + //项目合规评估流程 case '5' : if(row.taskInfo === '标准法规部业务经理审批'){ this.$router.push({ @@ -162,8 +320,293 @@ export default { prcType: row.prcType } }) + }else if(row.taskInfo === '标准评估任务下发'){ + this.$router.push({ + name: 'xmpgStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if(row.taskInfo === '合规性评估'){ + this.$router.push({ + name: 'xmpgStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if(row.taskInfo === '分发责任人审核'){ + this.$router.push({ + name: 'xmpgStep5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if(row.taskInfo === '汇总审核'){ + this.$router.push({ + name: 'xmpgStep6', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if(row.taskInfo === '标准法规部领导审核'){ + this.$router.push({ + name: 'xmpgStep7', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + break + //项目评估流程-项目 + case '6': + if(row.taskInfo === '标准法规部业务经理审批'){ + this.$router.push({ + name: 'xmpg2Step2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if(row.taskInfo === '工程经理转办'){ + this.$router.push({ + name: 'xmpg2Step3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '架构经理任务分发') { + this.$router.push({ + name: 'xmpg2Step4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '分发责任人下发') { + this.$router.push({ + name: 'xmpg2Step5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '合规性评估') { + this.$router.push({ + name: 'xmpg2Step6', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + 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 + //未符合项整改流程 + case '8' : + if(row.taskInfo === '下发至标准法规工程师'){ + this.$router.push({ + name: 'wfhxzgStep2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '确认+选择责任人') { + this.$router.push({ + name: 'wfhxzgStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '上传佐证材料填写信息') { + this.$router.push({ + name: 'wfhxzgStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else { + this.$router.push({ + name: 'wfhxzgStep5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + break + case '9': + if (row.taskInfo === '选择执行人') { + this.$router.push({ + name: 'bzjdStep2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '填写解读分析') { + this.$router.push({ + name: 'bzjdStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '责任人审核') { + this.$router.push({ + name: 'bzjdStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '工程师审核') { + this.$router.push({ + name: 'bzjdStep5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '部长审批') { + this.$router.push({ + name: 'bzjdStep6', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } - } }, }, diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index 320976806..db1b4483f 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -4,7 +4,7 @@

标准法规管理流程
- +
@@ -22,7 +22,7 @@
- +
@@ -40,7 +40,7 @@
- +
@@ -58,7 +58,7 @@
- +
@@ -76,7 +76,7 @@
- +
@@ -94,7 +94,7 @@
- +
@@ -112,7 +112,7 @@
- +
@@ -130,7 +130,7 @@
- +
@@ -281,7 +281,8 @@ export default { * @returns {boolean} */ bzfggllc() { - return true + const idArray = ['2564bd61852551b99e0fe3d49a89b288', '2d0f99ba961c551b1d8cad8ad5223731', '7751d25f72d0a6515e4110ae41837db8', '90c7bae6308595f053c6f6f90167e493', '9adff72ab464793564c5d1de20b45620', 'a151f5e2ee44f8df81e201b8696fca31', 'f4eeb9ed48eac5686a456a5582508d9c', 'fc25b770ad3752cdec52f3bd7b35a6a1'] + return this.checkPermission(idArray) }, /** * 政策管理流程 diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index b28ec60cb..3af975738 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -216,7 +216,6 @@ export default { dealWith (row) { // 办理 this.setHandleInfo(JSON.stringify(row)) const prcType = row.prcType - console.log(prcType); switch(prcType) { case '1': if (row.taskInfo === '标准法规业务经理审批') { From 77825748b45440048a3501eca59cbeed7af8cf46 Mon Sep 17 00:00:00 2001 From: fanlin Date: Thu, 29 Jul 2021 15:29:59 +0800 Subject: [PATCH 08/13] =?UTF-8?q?bug=EF=BC=9A=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E4=BA=BA=E4=BF=AE=E8=AE=A2=E9=A1=B5=E9=9D=A2=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=9C=88=E4=BD=8F=E7=9A=84=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E9=A1=B5=E9=9D=A2=E5=92=8C=E4=BF=AE=E8=AE=A2=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=BC=BA=E5=B0=91=E9=83=A8=E5=88=86=E4=BB=A3=E6=9B=BF?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 17 +++++++++++++++++ .../pages/creatProcess/bzrk/step2.vue | 11 ++++++++++- .../pages/creatProcess/bzrk/step3.vue | 8 ++++++++ .../pages/creatProcess/bzrk/step4.vue | 18 ++++++++++++++++++ 4 files changed, 53 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 493a8f6ae..9f0ac517a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -711,6 +711,20 @@ + + + {{'手动查找'}} + - + + + + + + + + + + {{'手动查找'}} + + Date: Thu, 29 Jul 2021 15:32:37 +0800 Subject: [PATCH 09/13] commit --- .../domesticStandardsAndRegulations/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 5b3add18e..59bd2bd9f 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -4,7 +4,7 @@
Date: Thu, 29 Jul 2021 15:35:12 +0800 Subject: [PATCH 10/13] =?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=88=91=E5=8F=B8=E7=BD=B2?= =?UTF-8?q?=E5=90=8D=E4=BA=BA=E4=B8=8E=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=9A=84=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzrk/step1.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 9f0ac517a..73e8b0114 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -638,8 +638,13 @@ - - + From 9cff5a507063a6be443ef1ca9d9325f8091003bf Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Thu, 29 Jul 2021 16:59:48 +0800 Subject: [PATCH 11/13] =?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=E6=B8=85=E7=A9=BA=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=A1=B5=E7=9A=84=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standAutoSplit/index.vue | 38 +-- .../standAutoSplit/pages/itemSplitInfo.vue | 10 +- .../localTool/standardRecognition/index.vue | 306 +++++++++--------- .../page/listOfCountries.vue | 6 +- .../page/listOther.vue | 6 +- .../page/listProject.vue | 6 +- .../pages/addEdit.vue | 8 +- .../pages/details.vue | 12 +- .../pages/otherAddEit.vue | 8 +- .../pages/projectAddEit.vue | 8 +- 10 files changed, 190 insertions(+), 218 deletions(-) diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index e4306b6ee..3f07616db 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -51,20 +51,12 @@ prop="showNumber" label="标准号/政策号" align="center"> - - - - - + 失败 - +