From c6635b3497b9a3bb7ebd7a2ac72e91c6a4d27595 Mon Sep 17 00:00:00 2001
From: baoyu <102349094+Bytq@users.noreply.github.com>
Date: Tue, 16 Apr 2024 15:05:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=20=E5=B8=A6=E5=85=A5=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9C=89N/A=E6=97=B6=E4=B8=8D=E8=83=BD=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomFormComponents/DatePickerGroup.vue  | 15 ++++++++-
 .../pages/addEdit.vue                         | 33 ++++---------------
 2 files changed, 21 insertions(+), 27 deletions(-)

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 @@
           </el-select>
         </el-form-item>
         <el-form-item label="标准实施日期" prop="putTime">
-          <el-date-picker
-            clearable
-            v-model.trim="editRowData.ssrq"
-            type="dates"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期">
-          </el-date-picker>
+          <custom-date-pick-group class="customDataPicker" style="margin-left: 0px" v-model="editRowData.ssrq" :config="{attrName: '',attrField: 'ssrq'}" :naButton=true>
+          </custom-date-pick-group>
         </el-form-item>
         <el-form-item label="在产车实施日期" prop="zccssrqgj">
 <!--          <el-date-picker
@@ -494,7 +489,7 @@
             value-format="yyyy-MM-dd"
             placeholder="选择日期">
           </el-date-picker>-->
-          <custom-date-pick-group class="customDataPicker" style="margin-left: 0px" v-model="editRowData.zccssrqgj" :config="{attrName: '',attrField: 'zccssrqgj'}">
+          <custom-date-pick-group class="customDataPicker" style="margin-left: 0px" v-model="editRowData.zccssrqgj" :config="{attrName: '',attrField: 'zccssrqgj'}" :naButton=true>
           </custom-date-pick-group>
         </el-form-item>
         <el-form-item label="新车型实施日期" prop="xcxssrqgj">
@@ -505,7 +500,7 @@
 <!--            value-format="yyyy-MM-dd"-->
 <!--            placeholder="选择日期">-->
 <!--          </el-date-picker>-->
-          <custom-date-pick-group class="customDataPicker" style="margin-left: 0px" v-model="editRowData.xcxssrqgj" :config="{attrName: '',attrField: 'xcxssrqgj'}">
+          <custom-date-pick-group class="customDataPicker" style="margin-left: 0px" v-model="editRowData.xcxssrqgj" :config="{attrName: '',attrField: 'xcxssrqgj'}" :naButton=true>
           </custom-date-pick-group>
         </el-form-item>
         <el-form-item label="责任部门" prop="zrbm">
@@ -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(',')