From 638408f564b291c5253c99e42f1118f4cbb56dc5 Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Thu, 28 Mar 2024 13:58:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E7=AE=A1=E7=90=86=E3=80=81?=
 =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E8=81=94?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/szxc/ldinfo/index.vue | 378 ++++++++++++++++++-----
 ruoyi-ui/src/views/szxc/xqinfo/index.vue | 268 +++++++++++-----
 2 files changed, 481 insertions(+), 165 deletions(-)

diff --git a/ruoyi-ui/src/views/szxc/ldinfo/index.vue b/ruoyi-ui/src/views/szxc/ldinfo/index.vue
index b230a10..95b73b6 100644
--- a/ruoyi-ui/src/views/szxc/ldinfo/index.vue
+++ b/ruoyi-ui/src/views/szxc/ldinfo/index.vue
@@ -1,9 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="所属小区" prop="xqId">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="所属网格" prop="deptId">
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" :disable-branch-nodes="true" style="width:215px;"
+                    placeholder="请选择所属网格"/>
+      </el-form-item>
+      <el-form-item label="所属小区" prop="xqName">
         <el-input
-          v-model="queryParams.xqId"
+          v-model="queryParams.xqName"
           placeholder="请输入所属小区"
           clearable
           @keyup.enter.native="handleQuery"
@@ -17,29 +21,65 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="类别字典" prop="ldSort">
-        <el-input
+      <el-form-item label="楼栋类型" prop="ldType">
+        <el-select
+          v-model="queryParams.ldType"
+          placeholder="楼栋类型"
+          clearable
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_ld_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="楼栋类别" prop="ldSort">
+        <el-select
           v-model="queryParams.ldSort"
-          placeholder="请输入类别字典"
+          placeholder="楼栋类别"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_ldlb"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="楼栋结构字典" prop="ldjg">
-        <el-input
+      <el-form-item label="楼栋结构" prop="ldjg">
+        <el-select
           v-model="queryParams.ldjg"
-          placeholder="请输入楼栋结构字典"
+          placeholder="楼栋结构"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_ldjg"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="取暖方式" prop="qnfs">
-        <el-input
+        <el-select
           v-model="queryParams.qnfs"
-          placeholder="请输入取暖方式"
+          placeholder="取暖方式"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_qnfs"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="楼层数" prop="lcNum">
         <el-input
@@ -65,38 +105,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="楼栋描述" prop="ldDescribe">
-        <el-input
-          v-model="queryParams.ldDescribe"
-          placeholder="请输入楼栋描述"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属网格" prop="deptName">
-        <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入所属网格"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建者ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入创建者ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -149,22 +157,36 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="ldinfoList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="所属小区" align="center" prop="xqId" />
+    <el-table v-loading="loading" :data="ldinfoList" @selection-change="handleSelectionChange" border>
+      <el-table-column type="selection" width="45" align="center" />
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="所属小区" align="center" prop="xqName" />
       <el-table-column label="楼栋名称" align="center" prop="ldName" />
-      <el-table-column label="类型(0小区楼栋1独立房2其它)" align="center" prop="xqType" />
-      <el-table-column label="类别字典" align="center" prop="ldSort" />
-      <el-table-column label="楼栋结构字典" align="center" prop="ldjg" />
-      <el-table-column label="取暖方式" align="center" prop="qnfs" />
+      <el-table-column label="楼栋类型" align="center" prop="ldType" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_ld_type" :value="scope.row.ldType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="楼栋类别" align="center" prop="ldSort" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_ldlb" :value="scope.row.ldSort"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="楼栋结构" align="center" prop="ldjg" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_ldjg" :value="scope.row.ldjg"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="取暖方式" align="center" prop="qnfs" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_qnfs" :value="scope.row.qnfs"/>
+        </template>
+      </el-table-column>
       <el-table-column label="楼层数" align="center" prop="lcNum" />
       <el-table-column label="单元数" align="center" prop="unitNum" />
       <el-table-column label="户数" align="center" prop="huNum" />
       <el-table-column label="楼栋描述" align="center" prop="ldDescribe" />
-      <el-table-column label="部门id" align="center" prop="deptId" />
       <el-table-column label="所属网格" align="center" prop="deptName" />
-      <el-table-column label="创建者ID" align="center" prop="userId" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -184,7 +206,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -194,22 +216,80 @@
     />
 
     <!-- 添加或修改楼栋信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="所属小区" prop="xqId">
-          <el-input v-model="form.xqId" placeholder="请输入所属小区" />
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="所属小区" prop="xqName">
+          <el-input readonly
+            placeholder="请选择所属小区"
+            v-model="form.xqName">
+            <el-button slot="append" icon="el-icon-search" @click="xqQuery()"></el-button>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="所属网格" prop="deptName">
+          <el-input v-model="form.deptName" placeholder="请输入所属网格" disabled/>
         </el-form-item>
         <el-form-item label="楼栋名称" prop="ldName">
           <el-input v-model="form.ldName" placeholder="请输入楼栋名称" />
         </el-form-item>
-        <el-form-item label="类别字典" prop="ldSort">
-          <el-input v-model="form.ldSort" placeholder="请输入类别字典" />
+        <el-form-item label="楼栋类型" prop="ldType">
+          <el-select
+            v-model="form.ldType"
+            placeholder="楼栋类型"
+            clearable
+            style="width:100%"
+          >
+            <el-option
+              v-for="dict in dict.type.szxc_ld_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
-        <el-form-item label="楼栋结构字典" prop="ldjg">
-          <el-input v-model="form.ldjg" placeholder="请输入楼栋结构字典" />
+        <el-form-item label="楼栋类别" prop="ldSort">
+          <el-select
+            v-model="form.ldSort"
+            placeholder="楼栋类别"
+            clearable
+            style="width:100%"
+          >
+            <el-option
+              v-for="dict in dict.type.szxc_ldlb"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="楼栋结构" prop="ldjg">
+          <el-select
+            v-model="form.ldjg"
+            placeholder="楼栋结构"
+            clearable
+            style="width:100%"
+          >
+            <el-option
+              v-for="dict in dict.type.szxc_ldjg"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="取暖方式" prop="qnfs">
-          <el-input v-model="form.qnfs" placeholder="请输入取暖方式" />
+          <el-select
+            v-model="form.qnfs"
+            placeholder="取暖方式"
+            clearable
+            style="width:100%"
+          >
+            <el-option
+              v-for="dict in dict.type.szxc_qnfs"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="楼层数" prop="lcNum">
           <el-input v-model="form.lcNum" placeholder="请输入楼层数" />
@@ -221,16 +301,7 @@
           <el-input v-model="form.huNum" placeholder="请输入户数" />
         </el-form-item>
         <el-form-item label="楼栋描述" prop="ldDescribe">
-          <el-input v-model="form.ldDescribe" placeholder="请输入楼栋描述" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="所属网格" prop="deptName">
-          <el-input v-model="form.deptName" placeholder="请输入所属网格" />
-        </el-form-item>
-        <el-form-item label="创建者ID" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入创建者ID" />
+          <el-input v-model="form.ldDescribe" type="textarea" placeholder="请输入楼栋描述" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -238,14 +309,71 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog title="选择小区" :visible.sync="xqInfo.visible" width="900px" append-to-body>
+      <el-form :model="xqInfo.queryParams" ref="queryForm" size="small" :inline="true" label-width="70px">
+        <el-form-item label="小区名称" prop="name">
+          <el-input
+            v-model="xqInfo.queryParams.name"
+            placeholder="请输入小区名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="xqInfoQuery">搜索</el-button>
+        </el-form-item>
+      </el-form>
+      <el-alert title="双击选择户主" type="warning" :closable="false"></el-alert>
+      <el-table v-loading="xqInfo.loading" :data="xqInfo.list" border @cell-dblclick="xqInfoDblclick">
+        <el-table-column label="所属网格" align="center" prop="deptName" />
+        <el-table-column label="小区类型" align="center" prop="xqType" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.szxc_xq_type" :value="scope.row.xqType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="小区名称" align="center" prop="name" />
+        <el-table-column label="楼栋数" align="center" prop="ldNum" />
+        <el-table-column label="建筑面积" align="center" prop="jzArea" />
+        <el-table-column label="占地面积" align="center" prop="zdArea" />
+        <el-table-column label="物业管理方式" align="center" prop="wyType" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.szxc_wy_type" :value="scope.row.wyType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="物业负责人" align="center" prop="wyResponse" />
+        <el-table-column label="联系电话" align="center" prop="wyPhone" />
+        <el-table-column label="小区地址" align="center" prop="xqAddress" />
+        <el-table-column label="建成日期" align="center" prop="buildDate" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.buildDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="小区描述" align="center" prop="xqDescribe" />
+      </el-table>
+      <pagination
+        v-show="xqInfo.total>0"
+        :total="xqInfo.total"
+        :page.sync="xqInfo.queryParams.pageNum"
+        :limit.sync="xqInfo.queryParams.pageSize"
+        @pagination="getlistXqinfo"
+      />
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import { listLdinfo, getLdinfo, delLdinfo, addLdinfo, updateLdinfo } from "@/api/szxc/ldinfo";
+import { listXqinfo } from "@/api/szxc/xqinfo";
+import { deptTreeSelect } from "@/api/system/user";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Ldinfo",
+  components: { Treeselect },
+  dicts: ['szxc_xq_type', 'szxc_ld_type', 'szxc_ldlb', 'szxc_ldjg', 'szxc_qnfs' ],
   data() {
     return {
       // 遮罩层
@@ -262,6 +390,8 @@ export default {
       total: 0,
       // 楼栋信息表格数据
       ldinfoList: [],
+      // 组织树选项
+      deptOptions: undefined,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -272,7 +402,7 @@ export default {
         pageSize: 10,
         xqId: null,
         ldName: null,
-        xqType: null,
+        ldType: null,
         ldSort: null,
         ldjg: null,
         qnfs: null,
@@ -285,7 +415,27 @@ export default {
         userId: null
       },
       // 表单参数
-      form: {},
+      form: {
+        id: null,
+        xqId: null,
+        xqName:  null,
+        ldName: null,
+        ldType: null,
+        ldSort: null,
+        ldjg: null,
+        qnfs: null,
+        lcNum: null,
+        unitNum: null,
+        huNum: null,
+        ldDescribe: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        deptId: null,
+        deptName: null,
+        userId: null,
+      },
       // 表单校验
       rules: {
         xqId: [
@@ -294,13 +444,42 @@ export default {
         deptId: [
           { required: true, message: "部门id不能为空", trigger: "blur" }
         ],
-      }
+      },
+      // 小区信息
+      xqInfo: {
+        visible: false,
+        // 遮罩层
+        loading: false,
+        // 总条数
+        total: 0,
+        // 查询参数
+        queryParams:{
+          pageNum: 1,
+          pageSize: 10,
+          name: null
+        },
+        // 查询列表
+        list: [],
+        // 选中数据
+        selectRow: null
+      },
     };
   },
   created() {
     this.getList();
+    this.getDeptTree();
   },
   methods: {
+    /** 查询组织下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    selectedTree(node){
+      this.form.deptId = node.id;
+      this.form.deptName = node.label;
+    },
     /** 查询楼栋信息列表 */
     getList() {
       this.loading = true;
@@ -320,8 +499,9 @@ export default {
       this.form = {
         id: null,
         xqId: null,
+        xqName:  null,
         ldName: null,
-        xqType: null,
+        ldType: null,
         ldSort: null,
         ldjg: null,
         qnfs: null,
@@ -335,7 +515,7 @@ export default {
         updateTime: null,
         deptId: null,
         deptName: null,
-        userId: null
+        userId: null,
       };
       this.resetForm("form");
     },
@@ -406,7 +586,35 @@ export default {
       this.download('szxc/ldinfo/export', {
         ...this.queryParams
       }, `ldinfo_${new Date().getTime()}.xlsx`)
-    }
+    },
+    // 小区查询
+    xqQuery(){
+      this.xqInfo.visible = true;
+      this.getlistXqinfo()
+    },
+    /** 查询户主信息列表 */
+    getlistXqinfo() {
+      this.xqInfo.loading = true;
+      listXqinfo(this.xqInfo.queryParams).then(response => {
+        this.xqInfo.list = response.rows;
+        this.xqInfo.total = response.total;
+        this.xqInfo.loading = false;
+      });
+    },
+    // 户主信息查询
+    xqInfoQuery(){
+      this.xqInfo.queryParams.pageNum = 1;
+      this.getlistXqinfo();
+    },
+    // 户主选择 选中数据
+    xqInfoDblclick(row) {
+      this.xqInfo.selectRow = row;
+      this.form.xqId = row.id;
+      this.form.xqName = row.name;
+      this.form.deptId = row.deptId;
+      this.form.deptName = row.deptName;
+      this.xqInfo.visible = false
+    },
   }
 };
 </script>
diff --git a/ruoyi-ui/src/views/szxc/xqinfo/index.vue b/ruoyi-ui/src/views/szxc/xqinfo/index.vue
index 662ad65..f9ccf30 100644
--- a/ruoyi-ui/src/views/szxc/xqinfo/index.vue
+++ b/ruoyi-ui/src/views/szxc/xqinfo/index.vue
@@ -1,6 +1,33 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="所属网格" prop="deptId">
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" :disable-branch-nodes="true" style="width:215px;"
+                    placeholder="请选择所属网格"/>
+      </el-form-item>
+      <el-form-item label="小区类型" prop="xqType">
+        <el-select
+          v-model="queryParams.xqType"
+          placeholder="小区类型"
+          clearable
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_xq_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="小区名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入小区名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="楼栋数" prop="ldNum">
         <el-input
           v-model="queryParams.ldNum"
@@ -25,6 +52,21 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="物业管理方式" prop="wyType">
+        <el-select
+          v-model="queryParams.wyType"
+          placeholder="物业管理方式"
+          clearable
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_wy_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="物业负责人" prop="wyResponse">
         <el-input
           v-model="queryParams.wyResponse"
@@ -41,14 +83,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="小区地址" prop="xqAddress">
+<!--      <el-form-item label="小区地址" prop="xqAddress">
         <el-input
           v-model="queryParams.xqAddress"
           placeholder="请输入小区地址"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="建成日期" prop="buildDate">
         <el-date-picker clearable
           v-model="queryParams.buildDate"
@@ -57,38 +99,6 @@
           placeholder="请选择建成日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="小区描述" prop="xqDescribe">
-        <el-input
-          v-model="queryParams.xqDescribe"
-          placeholder="请输入小区描述"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属网格" prop="deptName">
-        <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入所属网格"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建者ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入创建者ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -141,14 +151,24 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="xqinfoList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="类型(0老旧1新2片区散户)" align="center" prop="xqType" />
+    <el-table v-loading="loading" :data="xqinfoList" @selection-change="handleSelectionChange" border>
+      <el-table-column type="selection" width="45" align="center" />
+      <el-table-column label="ID" align="center" prop="id" min-width="60"/>
+      <el-table-column label="所属网格" align="center" prop="deptName" />
+      <el-table-column label="小区类型" align="center" prop="xqType" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_xq_type" :value="scope.row.xqType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="小区名称" align="center" prop="name" />
       <el-table-column label="楼栋数" align="center" prop="ldNum" />
       <el-table-column label="建筑面积" align="center" prop="jzArea" />
       <el-table-column label="占地面积" align="center" prop="zdArea" />
-      <el-table-column label="物业管理方式(0物业公司1业主自治2其他)" align="center" prop="wyType" />
+      <el-table-column label="物业管理方式" align="center" prop="wyType" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_wy_type" :value="scope.row.wyType"/>
+        </template>
+      </el-table-column>
       <el-table-column label="物业负责人" align="center" prop="wyResponse" />
       <el-table-column label="联系电话" align="center" prop="wyPhone" />
       <el-table-column label="小区地址" align="center" prop="xqAddress" />
@@ -158,9 +178,6 @@
         </template>
       </el-table-column>
       <el-table-column label="小区描述" align="center" prop="xqDescribe" />
-      <el-table-column label="部门id" align="center" prop="deptId" />
-      <el-table-column label="所属网格" align="center" prop="deptName" />
-      <el-table-column label="创建者ID" align="center" prop="userId" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -180,7 +197,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -190,45 +207,107 @@
     />
 
     <!-- 添加或修改小区信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="楼栋数" prop="ldNum">
-          <el-input v-model="form.ldNum" placeholder="请输入楼栋数" />
-        </el-form-item>
-        <el-form-item label="建筑面积" prop="jzArea">
-          <el-input v-model="form.jzArea" placeholder="请输入建筑面积" />
-        </el-form-item>
-        <el-form-item label="占地面积" prop="zdArea">
-          <el-input v-model="form.zdArea" placeholder="请输入占地面积" />
-        </el-form-item>
-        <el-form-item label="物业负责人" prop="wyResponse">
-          <el-input v-model="form.wyResponse" placeholder="请输入物业负责人" />
-        </el-form-item>
-        <el-form-item label="联系电话" prop="wyPhone">
-          <el-input v-model="form.wyPhone" placeholder="请输入联系电话" />
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body top="15px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="所属网格" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" :disable-branch-nodes="true"
+                          placeholder="请选择所属网格" style="width:100%;" @select="selectedTree"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="小区名称" prop="name">
+              <el-input v-model="form.name" placeholder="请输入小区名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="小区类型" prop="xqType">
+              <el-select
+                v-model="form.xqType"
+                placeholder="小区类型"
+                clearable
+                style="width:100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.szxc_xq_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="楼栋数" prop="ldNum">
+              <el-input v-model="form.ldNum" placeholder="请输入楼栋数" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="建筑面积" prop="jzArea">
+              <el-input v-model="form.jzArea" placeholder="请输入建筑面积" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="占地面积" prop="zdArea">
+              <el-input v-model="form.zdArea" placeholder="请输入占地面积" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="物业管理方式" prop="wyType">
+              <el-select
+                v-model="form.wyType"
+                placeholder="物业管理方式"
+                clearable
+                style="width:100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.szxc_wy_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="物业负责人" prop="wyResponse">
+              <el-input v-model="form.wyResponse" placeholder="请输入物业负责人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="联系电话" prop="wyPhone">
+              <el-input v-model="form.wyPhone" placeholder="请输入联系电话" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="建成日期" prop="buildDate">
+              <el-date-picker clearable style="width: 100%"
+                              v-model="form.buildDate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="请选择建成日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-form-item label="小区地址" prop="xqAddress">
           <el-input v-model="form.xqAddress" placeholder="请输入小区地址" />
         </el-form-item>
-        <el-form-item label="建成日期" prop="buildDate">
-          <el-date-picker clearable
-            v-model="form.buildDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择建成日期">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="小区描述" prop="xqDescribe">
-          <el-input v-model="form.xqDescribe" placeholder="请输入小区描述" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="所属网格" prop="deptName">
-          <el-input v-model="form.deptName" placeholder="请输入所属网格" />
-        </el-form-item>
-        <el-form-item label="创建者ID" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入创建者ID" />
+          <el-input v-model="form.xqDescribe" type="textarea" placeholder="请输入小区描述" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -241,9 +320,14 @@
 
 <script>
 import { listXqinfo, getXqinfo, delXqinfo, addXqinfo, updateXqinfo } from "@/api/szxc/xqinfo";
+import { deptTreeSelect } from "@/api/system/user";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Xqinfo",
+  components: { Treeselect },
+  dicts: ['szxc_xq_type', 'szxc_wy_type'],
   data() {
     return {
       // 遮罩层
@@ -260,6 +344,8 @@ export default {
       total: 0,
       // 小区信息表格数据
       xqinfoList: [],
+      // 组织树选项
+      deptOptions: undefined,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -268,6 +354,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        name: null,
         xqType: null,
         ldNum: null,
         jzArea: null,
@@ -287,15 +374,35 @@ export default {
       // 表单校验
       rules: {
         deptId: [
-          { required: true, message: "部门id不能为空", trigger: "blur" }
+          { required: true, message: "所属网格不能为空", trigger: "blur" }
+        ],
+        name: [
+          { required: true, message: "小区名称不能为空", trigger: "blur" }
+        ],
+        xqType: [
+          { required: true, message: "小区类型不能为空", trigger: "blur" }
+        ],
+        xqAddress: [
+          { required: true, message: "小区地址不能为空", trigger: "blur" }
         ],
       }
     };
   },
   created() {
     this.getList();
+    this.getDeptTree();
   },
   methods: {
+    /** 查询组织下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    selectedTree(node){
+      this.form.deptId = node.id;
+      this.form.deptName = node.label;
+    },
     /** 查询小区信息列表 */
     getList() {
       this.loading = true;
@@ -314,6 +421,7 @@ export default {
     reset() {
       this.form = {
         id: null,
+        name: null,
         xqType: null,
         ldNum: null,
         jzArea: null,