Merge branch 'develop' into FOTON

src/components/CustomFormComponents/DatePicker.vue

@@ -14,7 +14,7 @@
         :value-format="valueFormat"
         format="yyyy-MM-dd"
         :value="value"
-        type="dates"
+        type="date"
         :editable="true"
         :disabled="disabled"
         :placeholder="placeholder"
@@ -74,7 +74,4 @@ export default {
 </script>
 
 <style scoped>
-/deep/ .el-input__inner {
-  padding-left: 30px;
-}
 </style>

src/components/CustomFormComponents/DatePickerGroup.vue

@@ -145,6 +145,9 @@ export default {
   watch: {
     value (val) {
       this.tagList = val !== '' && val !== null ? val.split(',') : []
+      this.tagList=this.tagList.map((item)=>item.substring(0,10))
+      console.log("this.tagList",this.tagList);
+
     },
     tagList: {
       handler (val) {