354ff0ad by renchao@pashanhoo.com

Merge branch 'dev'

2 parents adce71f4 2666dc12
...@@ -284,10 +284,10 @@ ...@@ -284,10 +284,10 @@
284 :rules="rules.zwlxqssjrules"> 284 :rules="rules.zwlxqssjrules">
285 <el-date-picker 285 <el-date-picker
286 v-model="ruleForm.diyaq.zwlxqssj" 286 v-model="ruleForm.diyaq.zwlxqssj"
287 type="datetime" 287 type="date"
288 placeholder="选择日期" 288 placeholder="选择日期"
289 value-format="yyyy-MM-dd HH:mm:ss" 289 value-format="yyyy-MM-dd"
290 format="yyyy-MM-dd HH:mm:ss"> 290 format="yyyy-MM-dd">
291 </el-date-picker> 291 </el-date-picker>
292 </el-form-item> 292 </el-form-item>
293 </el-col> 293 </el-col>
...@@ -298,10 +298,10 @@ ...@@ -298,10 +298,10 @@
298 :rules="rules.zwlxjssjrules"> 298 :rules="rules.zwlxjssjrules">
299 <el-date-picker 299 <el-date-picker
300 v-model="ruleForm.diyaq.zwlxjssj" 300 v-model="ruleForm.diyaq.zwlxjssj"
301 type="datetime" 301 type="date"
302 placeholder="选择日期" 302 placeholder="选择日期"
303 value-format="yyyy-MM-dd HH:mm:ss" 303 value-format="yyyy-MM-dd"
304 format="yyyy-MM-dd HH:mm:ss"> 304 format="yyyy-MM-dd">
305 </el-date-picker> 305 </el-date-picker>
306 </el-form-item> 306 </el-form-item>
307 </el-col> 307 </el-col>
...@@ -378,11 +378,11 @@ ...@@ -378,11 +378,11 @@
378 :rules="rules.djsjrules"> 378 :rules="rules.djsjrules">
379 <el-date-picker 379 <el-date-picker
380 v-model="ruleForm.qlxx.djsj" 380 v-model="ruleForm.qlxx.djsj"
381 type="datetime" 381 type="date"
382 class="width100" 382 class="width100"
383 placeholder="选择日期" 383 placeholder="选择日期"
384 value-format="yyyy-MM-dd HH:mm:ss" 384 value-format="yyyy-MM-dd HH:mm:ss"
385 format="yyyy-MM-dd HH:mm:ss"> 385 format="yyyy-MM-dd">
386 </el-date-picker> 386 </el-date-picker>
387 </el-form-item> 387 </el-form-item>
388 </el-col> 388 </el-col>
......