Merge remote-tracking branch 'origin/dev_contract' into dev_contract

# Conflicts:
#	src/views/modules/plugins/rent/rentcontractinfo.vue

src/views/modules/plugins/rent/rentcontractinfo.vue

@@ -159,8 +159,8 @@
         <el-table-column prop="endDate" label="合同结束日期" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button type="text"  @click="addOrUpdateHandle(scope.row.id)">{{ $t('checkBtn') }}</el-button>
+            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('checkBtn') }}</el-button>
-            <el-button type="text"  @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/modules/plugins/rent/rentcontractreview.vue

@@ -2,14 +2,12 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-rent__rentContractInfo}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item label="所属网格"
+        <el-form-item label="所属网格" label-width="100px"
                       prop="gridId">
           <el-select
                   v-model.trim="dataForm.gridId"
                   placeholder="请选择"
-                  size="small"
                   clearable
-                  class="resi-cell-select"
                   @change="handleChangeGrid"
           >
             <el-option
@@ -21,16 +19,14 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="所属房屋">
+        <el-form-item label="所属房屋" label-width="100px">
           <div class="resi-cell-value">
             <div class="resi-cell-col">
               <el-form-item prop="villageId">
                 <el-select
                         v-model.trim="dataForm.villageId"
                         placeholder="请选择小区"
-                        size="small"
                         clearable
-                        class="resi-cell-select"
                         @clear="handleClearVillage"
                         @change="handleChangeV"
                 >
@@ -47,10 +43,8 @@
                 <el-select
                         v-model.trim="dataForm.buildId"
                         placeholder="楼号"
-                        size="small"
                         clearable
                         style="width: 120px;"
-                        class="resi-cell-select"
                         :disabled="changeVDisabled"
                         @clear="handleClearBuild"
                         @change="handleChangeB"
@@ -69,10 +63,8 @@
                         v-model.trim="dataForm.unitId"
                         :disabled="changeBDisabled"
                         placeholder="单元"
-                        size="small"
                         clearable
                         style="width: 120px;"
-                        class="resi-cell-select"
                         @click="handleClearDan"
                         @change="handleChangeD"
                 >
@@ -90,10 +82,8 @@
                         v-model.trim="dataForm.homeId"
                         :disabled="changeDDisabled"
                         placeholder="房号"
-                        size="small"
                         clearable
                         style="width: 120px;"
-                        class="resi-cell-select"
                 >
                   <el-option
                           v-for="item in optionsH"