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)