Merge remote-tracking branch 'origin/develop' into develop

2021-11-28 17:00:50 +08:00
parent 463d35ad14 ed591dcde4
commit a9488b7835
11 changed files with 529 additions and 48 deletions
@@ -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>