From f726e12fcfdbd7e54304b7982a2cbe1f1991f2b1 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 17 Nov 2022 13:40:36 +0800
Subject: [PATCH] 111

---
 .../scss/modules/management/list-main.scss    |  47 ++-
 .../scss/modules/visual/communityManage.scss  |   5 +-
 .../modules/base/community/community.vue      | 304 +++++++++---------
 3 files changed, 192 insertions(+), 164 deletions(-)

diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss
index 373609c10..48187b012 100644
--- a/src/assets/scss/modules/management/list-main.scss
+++ b/src/assets/scss/modules/management/list-main.scss
@@ -8,25 +8,55 @@
 
   .div_search {
 
-    padding: 20px 20px 5px 15px;
-    box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+    padding: 10px;
+    // box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
     background-color: #f6f6f6;
     border: 1px solid #D3DCE6;
-  margin-top:15px;
+    margin-top:18px;
+
+    .div_search_btn{
+      float:right;
+    }                                                                                                                                                                                                                                                                                                                          
+
+    //特殊查询的文字，如房屋级联
+    .div_search_label{
+      line-height: 36px;
+      margin-left:24px;
+      margin-right:6px;
+      font-size: 14px;
+      color: #606266;
+      vertical-align: middle;
+    }
   }
   .data-tag{
     margin-left:10px;
   }
 
+   //查询栏---常规宽度
+   .item_width_normal{
+    width: 138px;
+  }
+   //查询栏---日期、时间范围的宽度
+   .item_width_daterange{
+    width: 176px;
+  }
+   //查询栏---小区、楼、单元、楼号，级联长度
+   .item_width_buildcascader{
+    width: 151px;
+  }
+
+   .item_width_2{
+    width: 138px;
+  }
+
   .item_width_1{
     width: 260px;
   }
   .item_width_3{
     width: 200px;
   }
-  .item_width_2{
-    width: 160px;
-  }
+
+ 
 
   .list_item_width_1 {
     width: 165px;
@@ -44,10 +74,7 @@
   // padding: 10px 20px;
   position: relative;
 
-  .div_table_item {
-    margin-top: 10px;
-    position: relative;
-  }
+  
 
   .div_btn {
     margin-top: 10px;
diff --git a/src/assets/scss/modules/visual/communityManage.scss b/src/assets/scss/modules/visual/communityManage.scss
index ea7f424b6..8c0e4a09f 100644
--- a/src/assets/scss/modules/visual/communityManage.scss
+++ b/src/assets/scss/modules/visual/communityManage.scss
@@ -1,5 +1,8 @@
 
-
+.div_table_item {
+  margin-top: 10px;
+  position: relative;
+}
 .div_del {
   position: absolute;
   left: 10px;
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 22cc9a8e2..aa0da356f 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -35,159 +35,156 @@
       <div class="div_search">
         <el-form :inline="true"
                  ref="ref_searchform"
-                 :label-width="'80px'">
-          <div>
-
-            <el-form-item label="房主姓名"
-                          prop="ownerName">
-              <el-input v-model="ownerName"
-                        class="item_width_2"
-                        size="small"
-                        clearable
-                        placeholder="请输入内容">
-
-              </el-input>
-            </el-form-item>
-            <el-form-item label="联系方式"
-                          prop="ownerPhone">
-              <el-input v-model="ownerPhone"
-                        class="item_width_2"
-                        size="small"
-                        clearable
-                        placeholder="请输入手机">
-              </el-input>
-
-            </el-form-item>
-
-            <el-form-item label="房屋状态"
-                          prop="rentFlag">
-              <el-select class="item_width_2"
-                         v-model="rentFlag"
-                         placeholder="请选择"
-                         size="small"
-                         clearable>
-                <el-option v-for="item in rentList"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-
-            <el-form-item label="房屋用途"
-                          prop="purpose">
-              <el-select v-model="purpose"
-                         class="item_width_2"
-                         placeholder="请选择"
-                         size="small"
-                         clearable>
-                <el-option v-for="item in purposeArr"
-                           :key="item.dictValue"
-                           :label="item.dictName"
-                           :value="item.dictValue">
-                </el-option>
-              </el-select>
-
-            </el-form-item>
-
-            <el-form-item label="备注"
-                          prop="remark">
-              <el-input v-model="remark"
-                        class="item_width_2"
-                        size="small"
-                        clearable
-                        placeholder="请输入备注">
-              </el-input>
-            </el-form-item>
-            <el-form-item label="更新时间"
-                          prop="updateStartDate">
-              <el-date-picker v-model="updateStartDate"
-                              :picker-options="startPickerOptions"
-                              class="item_width_2"
-                              size="small"
-                              type="date"
-                              value-format="yyyyMMdd"
-                              value="yyyy-MM-dd"
-                              placeholder="开始时间">
-              </el-date-picker>
-              <span class="data-tag">至</span>
-              <el-date-picker v-model="updateEndDate"
-                              :picker-options="endPickerOptions"
-                              class="item_width_2 data-tag"
-                              size="small"
-                              type="date"
-                              value-format="yyyyMMdd"
-                              value="yyyy-MM-dd"
-                              placeholder="结束时间">
-              </el-date-picker>
-            </el-form-item>
-
-            <el-form-item label="所属房屋">
-              <div class="resi-cell-value">
-                <div class="resi-cell-col">
-                  <el-form-item prop="neighborHoodId">
-                    <el-select v-model.trim="neighborHoodId"
-                               :disabled="vDisabled"
-                               placeholder="小区"
-                               size="small"
-                               clearable
-                               class="resi-cell-select"
-                               @change="handleChangeV">
-                      <el-option v-for="item in optionsV"
-                                 :key="item.value"
-                                 :label="item.label"
-                                 :value="item.value">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item prop="buildingId">
-                    <el-select v-model.trim="buildingId"
-                               placeholder="楼号"
-                               :disabled="!neighborHoodId || bDisabled"
-                               size="small"
-                               clearable
-                               class="resi-cell-select resi-cell-select-middle list_item_width_1"
-                               @change="handleChangeB">
-                      <el-option v-for="item in optionsB"
-                                 :key="item.value"
-                                 :label="item.label"
-                                 :value="item.value">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item prop="buildingUnitId">
-                    <el-select v-model.trim="buildingUnitId"
-                               placeholder="单元"
-                               size="small"
-                               :disabled="!buildingId"
-                               clearable
-                               class="resi-cell-select resi-cell-select-middle list_item_width_1"
-                               @change="handleChangeD">
-                      <el-option v-for="item in optionsD"
-                                 :key="item.value"
-                                 :label="item.label"
-                                 :value="item.value">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item prop="houseId">
-                    <el-select v-model.trim="houseId"
-                               placeholder="房号"
-                               :disabled="!buildingUnitId"
-                               size="small"
-                               clearable
-                               class="resi-cell-select resi-cell-select-middle list_item_width_1">
-                      <el-option v-for="item in optionsH"
-                                 :key="item.value"
-                                 :label="item.label"
-                                 :value="item.value">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </div>
-              </div>
-            </el-form-item>
-
+                 :label-width="'100px'">
+
+          <el-form-item label="房主姓名"
+                        prop="ownerName">
+            <el-input v-model="ownerName"
+                      class="item_width_normal"
+                      size="small"
+                      clearable
+                      placeholder="请输入内容">
+
+            </el-input>
+          </el-form-item>
+          <el-form-item label="联系方式"
+                        prop="ownerPhone">
+            <el-input v-model="ownerPhone"
+                      class="item_width_normal"
+                      size="small"
+                      clearable
+                      placeholder="请输入手机">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="房屋状态"
+                        prop="rentFlag">
+            <el-select class="item_width_normal"
+                       v-model="rentFlag"
+                       placeholder="请选择"
+                       size="small"
+                       clearable>
+              <el-option v-for="item in rentList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="房屋用途"
+                        prop="purpose">
+            <el-select v-model="purpose"
+                       class="item_width_normal"
+                       placeholder="请选择"
+                       size="small"
+                       clearable>
+              <el-option v-for="item in purposeArr"
+                         :key="item.dictValue"
+                         :label="item.dictName"
+                         :value="item.dictValue">
+              </el-option>
+            </el-select>
+
+          </el-form-item>
+
+          <el-form-item label="备注"
+                        prop="remark">
+            <el-input v-model="remark"
+                      class="item_width_normal"
+                      size="small"
+                      clearable
+                      placeholder="请输入备注">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="更新时间"
+                        prop="updateStartDate">
+            <el-date-picker v-model="updateStartDate"
+                            :picker-options="startPickerOptions"
+                            class="item_width_daterange"
+                            size="small"
+                            type="date"
+                            value-format="yyyyMMdd"
+                            value="yyyy-MM-dd"
+                            placeholder="开始时间">
+            </el-date-picker>
+            <span class="data-tag">至</span>
+            <el-date-picker v-model="updateEndDate"
+                            :picker-options="endPickerOptions"
+                            class="item_width_daterange data-tag"
+                            size="small"
+                            type="date"
+                            value-format="yyyyMMdd"
+                            value="yyyy-MM-dd"
+                            placeholder="结束时间">
+            </el-date-picker>
+          </el-form-item>
+          <span class="div_search_label">所属房屋：</span>
+          <!-- <el-form-item label="所属房屋"> -->
+
+          <el-form-item prop="neighborHoodId">
+            <el-select v-model.trim="neighborHoodId"
+                       :disabled="vDisabled"
+                       placeholder="小区"
+                       size="small"
+                       clearable
+                       class="item_width_buildcascader"
+                       @change="handleChangeV">
+              <el-option v-for="item in optionsV"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="buildingId">
+            <el-select v-model.trim="buildingId"
+                       placeholder="楼号"
+                       :disabled="!neighborHoodId || bDisabled"
+                       size="small"
+                       clearable
+                       class="item_width_buildcascader"
+                       @change="handleChangeB">
+              <el-option v-for="item in optionsB"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="buildingUnitId">
+            <el-select v-model.trim="buildingUnitId"
+                       placeholder="单元"
+                       size="small"
+                       :disabled="!buildingId"
+                       clearable
+                       class="item_width_buildcascader"
+                       @change="handleChangeD">
+              <el-option v-for="item in optionsD"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="houseId">
+            <el-select v-model.trim="houseId"
+                       placeholder="房号"
+                       :disabled="!buildingUnitId"
+                       size="small"
+                       clearable
+                       class="item_width_buildcascader">
+              <el-option v-for="item in optionsH"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <!-- </el-form-item> -->
+          <div class="div_search_btn">
             <el-button style="margin-left:30px"
                        size="small"
                        class="diy-button--blue"
@@ -198,6 +195,7 @@
                        @click="resetSearch">重置</el-button>
           </div>
         </el-form>
+
       </div>
       <div class="div_table div_left_table">
         <build-table v-if="selTreeObj.level==='neighborHood'&&!showRoomTable"