Merge branch 'wyx' of http://120.46.222.128:10021/elink-star/epmet-apartment-pc into wyx

# Conflicts:
#	src/views/mz/dept/index.vue

src/views/mz/dept/index.vue

@@ -231,22 +231,10 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="小区公寓图片" prop="images">
-              <el-upload
+              <el-upload :action="uploadUlr" :headers="$getElUploadHeaders()" list-type="picture-card"
-                :action="uploadUlr"
+                :file-list="fileList" :on-preview="handlePictureCardPreview" :on-remove="disabled ? null : handleRemove"
-                :headers="$getElUploadHeaders()"
+                :on-change="disabled ? null : handleChange" :on-success="disabled ? null : handleSuccess" :limit="3"
-                list-type="picture-card"
+                multiple :class="{ 'upload-disabled': disabled, 'upload-normal': !disabled }" accept=".png, .jpg">
-                :file-list="fileList"
-                :on-preview="handlePictureCardPreview"
-                :on-remove="disabled ? null : handleRemove"
-                :on-change="disabled ? null : handleChange"
-                :on-success="disabled ? null : handleSuccess"
-                :limit="3"
-                multiple
-                :class="{
-                  'upload-disabled': disabled,
-                  'upload-normal': !disabled,
-                }"
-              >
                 <i class="el-icon-plus" v-if="!disabled"></i>
               </el-upload>
               <el-dialog :visible.sync="dialogVisible">

src/views/mz/realTimeHousingResources/index.vue

@@ -45,7 +45,7 @@
       </el-form-item>
       <!-- 状态 -->
       <el-form-item label="入住情况" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
           <el-option label="未入住" value="0" />
           <el-option label="已入住" value="1" />
         </el-select>

src/views/records/roomselection/index.vue

@@ -125,11 +125,11 @@
         />
       </el-form-item>
       <!-- 状态 -->
-      <el-form-item label="状态" prop="state">
+      <el-form-item label="当前状态" prop="state">
         <el-select
           clearable
           v-model="queryParams.state"
-          placeholder="请选择状态"
+          placeholder="请选择当前状态"
           style="width: 220px"
           @keyup.enter.native="handleQuery"
         >