97e97e1f by 赵千

Merge branch 'dev' into 'master'

Dev

See merge request !1
2 parents 31be28cd 1184490f
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 </el-form-item> 22 </el-form-item>
23 </el-col> 23 </el-col>
24 <el-col :span="6"> 24 <el-col :span="6">
25 <el-form-item label="接收日期" prop="receiveStartTime"> 25 <el-form-item label="受理时间" prop="receiveStartTime">
26 <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart" 26 <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
27 clearable v-model="form.receiveStartTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> 27 clearable v-model="form.receiveStartTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
28 </el-form-item> 28 </el-form-item>
......