Merge branch 'lisu_V4' into dev

src/views/modules/resourceManagement/enterprise/index.vue

@@ -30,7 +30,7 @@
                         </el-form-item>
                         <el-form-item label="九小场所分类" prop="nineSmallPlacesCategory">
                             <el-select v-model.trim="formData.nineSmallPlacesCategory" placeholder="请选择" class="u-item-width-normal"
-                                size="small">
+                                size="small" clearable>
                                 <el-option v-for="item in placeTypeList" :label="item.label" :value="item.value"
                                     :key="item.value">
                                 </el-option>
@@ -38,7 +38,7 @@
                         </el-form-item>
                         <el-form-item label="最新检查时间" prop="orderDate">
                             <el-date-picker class="u-item-width-normal" size="small"
-                                v-model.trim="formData.orderDate"  type="datetime" format="yyyy-MM-dd HH:mm:ss"
+                                v-model.trim="formData.orderDate"  type="datetime" value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd HH:mm:ss"
                                 placeholder="选择日期"></el-date-picker>
                         </el-form-item>
                         <el-form-item label="最新检查结果" prop="checkResultFlag">