From c5002e58e5e43fc3a66a058bd59adeed605d6cf1 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 23 Aug 2021 11:26:10 +0800 Subject: [PATCH 1/4] commit --- .../pages/details.vue | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) 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){ From c1bc5a6508d27d6f917a238e5f5d6addfcf28a03 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 23 Aug 2021 14:15:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B8=85=E5=8D=95=E8=BD=A6=E5=9E=8B?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E4=B8=8D=E4=B8=BA=E7=A9=BA=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/projectAddEit.vue | 3 +++ 1 file changed, 3 insertions(+) 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, From f1c2cf6a66fa1da39cdad51886ec057c1fcd2f66 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 23 Aug 2021 14:44:12 +0800 Subject: [PATCH 3/4] feat: There is no way the BUSS --- src/pages/details/otherBussStandardDetails/index.vue | 12 ++++++------ .../components/EnterpriseStandardDatabase.vue | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) 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/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 @@ 编辑 - + 删除 From 71f11798baac9e603e711a3f3b3364c8c60b2a39 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 23 Aug 2021 15:31:57 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B8=85=E5=8D=95=E8=BD=A6=E5=9E=8B?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E7=9A=84=E4=B8=AD=E6=96=87bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../page/listOfCountries.vue | 2 -- .../page/listProject.vue | 16 +++++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) 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