Merge branch 'bd-dev' of 47.94.45.65:angelo/web-base-admin into bd-test
This commit is contained in:
commit
03b681d255
|
@ -74,7 +74,7 @@
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="ruleForm.ruleFormTime"
|
v-model="ruleForm.ruleFormTime"
|
||||||
:disabled="lookOver"
|
:disabled="lookOver"
|
||||||
value-format="yyyy-MM-dd HH:mm:ss"
|
value-format="yyyy-MM-dd"
|
||||||
type="datetimerange"
|
type="datetimerange"
|
||||||
:range-separator="'至'"
|
:range-separator="'至'"
|
||||||
:start-placeholder="'开始日期'"
|
:start-placeholder="'开始日期'"
|
||||||
|
@ -90,8 +90,8 @@
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="ruleForm.ruleFormTime1"
|
v-model="ruleForm.ruleFormTime1"
|
||||||
:disabled="lookOver"
|
:disabled="lookOver"
|
||||||
value-format="yyyy-MM-dd HH:mm:ss"
|
value-format="yyyy-MM-dd"
|
||||||
type="datetimerange"
|
type="daterange"
|
||||||
:range-separator="'至'"
|
:range-separator="'至'"
|
||||||
:start-placeholder="'开始日期'"
|
:start-placeholder="'开始日期'"
|
||||||
:end-placeholder="'结束日期'"
|
:end-placeholder="'结束日期'"
|
||||||
|
|
Loading…
Reference in New Issue