354ff0ad by renchao@pashanhoo.com

Merge branch 'dev'

2 parents adce71f4 2666dc12
......@@ -284,10 +284,10 @@
:rules="rules.zwlxqssjrules">
<el-date-picker
v-model="ruleForm.diyaq.zwlxqssj"
type="datetime"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss">
value-format="yyyy-MM-dd"
format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -298,10 +298,10 @@
:rules="rules.zwlxjssjrules">
<el-date-picker
v-model="ruleForm.diyaq.zwlxjssj"
type="datetime"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss">
value-format="yyyy-MM-dd"
format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -378,11 +378,11 @@
:rules="rules.djsjrules">
<el-date-picker
v-model="ruleForm.qlxx.djsj"
type="datetime"
type="date"
class="width100"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss">
format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
......