diff --git a/src/components/CustomFormComponents/DatePickerGroup.vue b/src/components/CustomFormComponents/DatePickerGroup.vue index 4eed2dcd0..a3e7878b7 100644 --- a/src/components/CustomFormComponents/DatePickerGroup.vue +++ b/src/components/CustomFormComponents/DatePickerGroup.vue @@ -94,6 +94,10 @@ export default { required:{ type:Boolean, default:false + }, + naButton:{ + type:Boolean, + default:false } }, components: {}, @@ -144,7 +148,16 @@ export default { return { disabledDate (time) { return _this.tagList.includes(_this.$dateFormat(time, 'yyyy-MM-dd')) - } + }, + shortcuts:_this.naButton ? [{ + text: 'N/A', + onClick() { + _this.tagList.push('N/A') + _this.datePickerVisible = false + _this.datePickerVal = '' + _this.$emit('input', _this.tagList.join(',')) + } + }] : null } } }, diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 0b1b4c7fc..e2b5d2eac 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -478,13 +478,8 @@ - - + + - + @@ -505,7 +500,7 @@ - + @@ -1574,24 +1569,12 @@ export default { } if (this.editRowData.ssrq === "-") { this.editRowData.ssrq = ""; - } else if (this.editRowData.ssrq&& this.editRowData.ssrq !== "-" ) { - this.editRowData.ssrq = this.editRowData.ssrq.split(","); } if (this.editRowData.zccssrqgj === "-") { this.editRowData.zccssrqgj = ""; - } else if (this.editRowData.zccssrqgj && this.editRowData.zccssrqgj !== "-") { - this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(","); - } - if (this.editRowData.zccssrqgj instanceof Array && this.editRowData.zccssrqgj[0] === 'N/A'){ - this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',') } if (this.editRowData.xcxssrqgj === "-") { this.editRowData.xcxssrqgj = ""; - } else if (this.editRowData.xcxssrqgj && this.editRowData.xcxssrqgj !== "-") { - this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(","); - } - if (this.editRowData.xcxssrqgj instanceof Array && this.editRowData.xcxssrqgj[0] === 'N/A'){ - this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',') } this.drawerEdit = true; }, @@ -1609,9 +1592,6 @@ export default { if(this.editRowData.syrz){ this.editRowData.syrz = this.editRowData.syrz.join(',') } - if (this.editRowData.ssrq !== '' && this.editRowData.ssrq !== null) { - this.editRowData.ssrq = this.editRowData.ssrq.join(',') - } this.drawerEdit = false }, // 点击清单条目导入按钮事件 @@ -1711,8 +1691,9 @@ export default { sarAccessEO.reNewPeople = this.$store.getters.userInfo.userId sarAccessEO.inforlist = rowlist sarAccessEO.inforlist1 = rowlist1 - sarAccessEO.inforlist2 = rowlist2 - sarAccessEO.inforlist3 = rowlist3 + // 在产车 和 新车型 实施日期与后台对接的不对 + sarAccessEO.inforlist2 = rowlist3 + sarAccessEO.inforlist3 = rowlist2 sarAccessEO.inforlist4 = rowlist4 sarAccessEO.countryArea = sarAccessEO.countryArea.join(',') // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')