From 91c23c9c6d26d700c11c339dab5e04f119fbd9d1 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sat, 21 Aug 2021 23:32:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9B=BD=E5=A4=96=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6,=E5=90=8C=E6=97=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=BA=86=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index ff90ae8a6..1acacbe00 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -3126,6 +3126,7 @@ export default { // 处理动态表单的时间和下拉框格式 const formFieldList = this.formFieldList const sarStandAttrObj = {} + formFieldList.forEach((item) => { const value = nowstandinfo[item.attrField] // 时间格式处理 @@ -3140,6 +3141,8 @@ export default { } sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField] }) + + nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'") console.log("nowstandinfo"); console.log(nowstandinfo); @@ -3153,10 +3156,35 @@ export default { if (this.addOrUPdateFlag === 1) { sessionStorage.removeItem('STAND_INLAND') } + + console.log("hello") + console.log(formFieldList); + let standardToLawsInfo={'countryArea':'','standId':'','ssrq':'','zccssrqgj':'','xcxssrqgj':''} + standardToLawsInfo.countryArea=nowstandinfo.country; + standardToLawsInfo.standId=nowstandinfo.id; + standardToLawsInfo.ssrq=nowstandinfo.SSRQ; + standardToLawsInfo.zccssrqgj=nowstandinfo.ZCCSSRQ; + standardToLawsInfo.xcxssrqgj=nowstandinfo.XCXSSRQ; + + console.log("country") + console.log(standardToLawsInfo); + this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/standardToLaws', + standardToLawsInfo, + {_this:this} + ) + + + } }, e => { this.isSubmit = false }) + + + + + + } else { this.isSubmit = false } 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 2/3] 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 3/3] =?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,