diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 398c2b577..dda912463 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -559,11 +559,11 @@ { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 0d44e7924..0d73dd9a0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -354,7 +354,6 @@ this.form.cid = data.cid this.form.endTime = data.endTime this.form.cname = data.cname - console.log(data); this.oldData = JSON.parse(JSON.stringify(data.summaryList)) data.summaryList.forEach( item => { if (item.state) { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 813827b12..61b4a50d7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -366,6 +366,7 @@ }) this.json = data this.data = arr + this.oldData = data.oldinfo }).catch(e => { }) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue index c4cfc9b43..5593b545e 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue @@ -66,6 +66,7 @@
+ 数据获取中 { this.sarAccessListDatas = res.data.records + this.sarAccessListDatas.forEach(item => { + // 国家地区转换 + if (item.countryArea !== null || item.countryArea !== "") { + let k = (item.countryArea || "").split(',') + for (let i in this.countryOptions) { + for (let m = 0; m< k.length; m++) { + if (this.countryOptions[i].value === k[m]) { + k[m] = this.countryOptions[i].label + } + item.countryArea = k.join(',') + } + } + } + }) this.sarSarAccessEOSearch.page = 1 this.sarAccessListTotal = res.data.total + this.tableLoading = false }, e => { }); @@ -349,6 +366,9 @@ export default { }) } }, + created() { + this.searchSarAccess(); + }, mounted() { // 分页查询数据 this.searchSarAccess(); diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue index b0af84fa9..2be49a492 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue @@ -57,6 +57,7 @@
+ 数据获取中 { }); diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue index 50f1509bf..822bb4bd8 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue @@ -67,6 +67,7 @@
+ 数据获取中 { @@ -405,6 +408,7 @@ export default { } } }) + this.tableLoading = false this.sarSarAccessEOSearch.page = 1 this.sarAccessListTotal = res.data.total }, e => { diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 612bd54e5..9198a2f34 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -214,11 +214,7 @@