diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index e91f8deb4..0b1b4c7fc 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -487,22 +487,26 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="在产车实施日期" prop="zccssrqgj">
-          <el-date-picker
+<!--          <el-date-picker
             clearable
             v-model.trim="editRowData.zccssrqgj"
             type="dates"
             value-format="yyyy-MM-dd"
             placeholder="选择日期">
-          </el-date-picker>
+          </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>
         </el-form-item>
         <el-form-item label="新车型实施日期" prop="xcxssrqgj">
-          <el-date-picker
-            clearable
-            v-model.trim="editRowData.xcxssrqgj"
-            type="dates"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期">
-          </el-date-picker>
+<!--          <el-date-picker-->
+<!--            clearable-->
+<!--            v-model.trim=""-->
+<!--            type="dates"-->
+<!--            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>
         </el-form-item>
         <el-form-item label="责任部门" prop="zrbm">
           <el-input v-model.trim="editRowData.zrbm" disabled/>
@@ -1578,11 +1582,17 @@ export default {
       } 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;
     },
     // 抽屉取消按钮
@@ -1602,12 +1612,6 @@ export default {
       if (this.editRowData.ssrq !== '' && this.editRowData.ssrq !== null) {
         this.editRowData.ssrq = this.editRowData.ssrq.join(',')
       }
-      if (this.editRowData.xcxssrqgj !== '' && this.editRowData.xcxssrqgj !== null) {
-        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',')
-      }
-      if (this.editRowData.zccssrqgj !== '' && this.editRowData.zccssrqgj !== null) {
-        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',')
-      }
       this.drawerEdit = false
     },
     // 点击清单条目导入按钮事件
@@ -2498,6 +2502,13 @@ export default {
 }
 </script>
 <style lang="less" scoped>
+.customDataPicker{
+  border: 1px solid #DCDFE6;
+  border-radius: 4px;
+  /deep/ .add-form-item .el-form-item__content{
+    margin-left: 0 !important;
+  }
+}
 .list-of-standards-and-regulations-details {
   height: calc(~'100% - 50px');
   background: #ffffff;