diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 035bc085c..1eb907311 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -32,16 +32,16 @@ diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue index 3907c404a..79cce7720 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue @@ -268,7 +268,6 @@ export default { _this: this }, res => { let arr = res.data.records; - console.log('271', arr) arr.forEach(item => { // 国家地区转换 if (item.countryArea !== null || item.countryArea !== "") { @@ -283,7 +282,6 @@ export default { } } }) - console.log('286',arr) this.sarAccessListDatas = arr this.tableLoading = false this.sarSarAccessEOSearch.page = 1 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue index 822bb4bd8..da32a185b 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue @@ -85,7 +85,7 @@ align="center"> @@ -279,8 +279,8 @@ export default { }, { _this: this }, res => { - this.sarAccessListDatas = res.data.records - this.sarAccessListDatas.forEach(item =>{ + let arr = res.data.records; + arr.forEach(item =>{ // 适用车型转换 if (item.carType !== null) { let k = (item.carType || "").split(',') @@ -289,11 +289,12 @@ export default { if (this.energyKindOptions[i].value === k[m]) { k[m] = this.energyKindOptions[i].label } - item.carType = k.join(',') + item.carTypeShow = k.join(',') } } } }) + this.sarAccessListDatas = arr this.tableLoading = false this.sarSarAccessEOSearch.page = 1 this.sarAccessListTotal = res.data.total @@ -393,8 +394,8 @@ export default { }, { _this: this }, res => { - this.sarAccessListDatas = res.data.records - this.sarAccessListDatas.forEach(item =>{ + let arr = res.data.records + arr.forEach(item =>{ // 适用车型转换 if (item.carType !== null) { let k = (item.carType || "").split(',') @@ -403,11 +404,12 @@ export default { if (this.energyKindOptions[i].value === k[m]) { k[m] = this.energyKindOptions[i].label } - item.carType = k.join(',') + item.carTypeShow = k.join(',') } } } }) + this.sarAccessListDatas = arr this.tableLoading = false this.sarSarAccessEOSearch.page = 1 this.sarAccessListTotal = res.data.total diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 43f6c4d65..8a5e45bd9 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -682,6 +682,9 @@ export default { detailedListName: [ {required: true, message: '清单名称不能为空', trigger: 'blur'}, {type: 'string', max: 100, message: '清单名称不能超过100个字符', trigger: 'blur'} + ], + carType: [ + {required: true,message: '车型类别不能为空', trigger: 'blur'} ] }, disabledFlag: false, diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 63534935d..4fe14ff2d 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -365,7 +365,7 @@ 编辑 - + 删除 diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 0c1c556e0..10b8a91f7 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -699,6 +699,51 @@ export default { cancelStand() { this.standModel = false; }, + //如果张宇欢改好了就把这个放开,然后把底下那个注释了 + // okStand() { + // let _this = this; + // if (this.standList.length < 1) { + // _this.$message.warning("请选择标准"); + // } else { + // for (let i = 0; i < this.dataList.length; i++) { + // let newStand = false; + // for (let j = 0; j < this.standList.length; j++) { + // if (this.standList[j].id == this.dataList[i].standId) { + // newStand = true; + // this.standList.splice(j, 1) + // j-- + // } + // } + // if (newStand) { + // _this.$message.warning("请勿重复添加数据"); + // } else { + // // _this.dataList.push(item); + // } + // } + // this.standardData = [] + // _this.standModel = false; + // for (var i = 0; i < this.standList.length; i++) { + // this.standList1.push({ + // standId: this.standList[i].id, + // projectId: this.localProEO.id + // }) + // } + // if (this.standList1 != '') { + // this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, { + // _this: this + // }, res => { + // if (res.ok) { + // // this.$message.success(res.message) + // this.getDataList() + // } + // }, e => { + // }); + // } + // this.standList = [] + // this.standList1 = [] + // _this.standModel = false; + // } + // }, //添加标准确定事件 okStand(){ if(this.standList.length > 0){