diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 24dff2e71..814cf97f8 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -462,39 +462,44 @@ export default { }, { _this: this }, res => { - res.data.records.forEach(item => { - if (item.nylx === "[]") { - item.nylx = null; - } - if (item.typeApplicable === "[]") { - item.typeApplicable = null; - } - if (item.sycpx === "[]") { - item.sycpx = null; - } - if(item.zrbm === "[]"){ - item.zrbm = null - } - if (item.zccssrqgj === "undefined") { - item.zccssrqgj = '-' - } - if (item.xcxssrqgj === "undefined") { - item.xcxssrqgj = '-' - } - if (item.ssrq === "undefined") { - item.ssrq = '-' - } - }); - this.standinfoList = res.data.records; - this.standardFormTotal = res.data.total; - this.standinfoList.forEach(item => { - if (item.standYear === null) { - item.standNumber = item.standSortShow + " " + item.standNumber; - } else { - item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear; - } - }); - this.standInfoTableLoading = false + if (res.data !== null) { + res.data.records.forEach(item => { + if (item.nylx === "[]") { + item.nylx = null; + } + if (item.typeApplicable === "[]") { + item.typeApplicable = null; + } + if (item.sycpx === "[]") { + item.sycpx = null; + } + if(item.zrbm === "[]"){ + item.zrbm = null + } + if (item.zccssrqgj === "undefined") { + item.zccssrqgj = '-' + } + if (item.xcxssrqgj === "undefined") { + item.xcxssrqgj = '-' + } + if (item.ssrq === "undefined") { + item.ssrq = '-' + } + }); + this.standinfoList = res.data.records; + this.standardFormTotal = res.data.total; + this.standinfoList.forEach(item => { + if (item.standYear === null) { + item.standNumber = item.standSortShow + " " + item.standNumber; + } else { + item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear; + } + }); + this.standInfoTableLoading = false + } else { + this.standinfoList = [] + } + }, e => { this.standInfoTableLoading = false }); @@ -506,30 +511,35 @@ export default { }, { _this: this }, res => { - res.data.records.forEach(item => { - if (item.nylx === "[]") { - item.nylx = null; - } - if (item.typeApplicable === "[]") { - item.typeApplicable = null; - } - if (item.sycpx === "[]") { - item.sycpx = null; - } - if(item.zrbm === "[]"){ - item.zrbm = null - } - }); - this.standinfoList = res.data.records; - this.standardFormTotal = res.data.total; - this.standinfoList.forEach(item => { - if (item.standYear === null) { - item.standNumber = item.standSortShow + " " + item.standNumber; - } else { - item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear; - } - }); - this.standInfoTableLoading = false + if (res.data !== null) { + res.data.records.forEach(item => { + if (item.nylx === "[]") { + item.nylx = null; + } + if (item.typeApplicable === "[]") { + item.typeApplicable = null; + } + if (item.sycpx === "[]") { + item.sycpx = null; + } + if(item.zrbm === "[]"){ + item.zrbm = null + } + }); + this.standinfoList = res.data.records; + this.standardFormTotal = res.data.total; + this.standinfoList.forEach(item => { + if (item.standYear === null) { + item.standNumber = item.standSortShow + " " + item.standNumber; + } else { + item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear; + } + }); + this.standInfoTableLoading = false + } else { + this.standinfoList = [] + } + }, e => { this.standInfoTableLoading = false }); @@ -773,13 +783,17 @@ export default { * 高级检索 */ selectMoreBtn() { - this.isAdvancedSearch = true; + this.standardForm.zrbm = '' + this.standardForm.responseUnit = '' + this.standardForm.standName = '' + this.standardForm.standNumber = '' this.standardFormList.standName = ""; this.standardFormList.typeApplicable = ""; this.standardFormList.nylx = ""; this.standardFormList.zrbm = ""; this.standardFormList.sycpx = ""; this.showTableFlag = false; + this.isAdvancedSearch = true; this.page = 1; this.standardForm.page = 1; this.selectInfoMore(); diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index cfe589da2..d9dda2b2c 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -4,7 +4,7 @@