Merge remote-tracking branch 'origin/main'

ruoyi-ui/src/views/szxc/address/index.vue

@@ -1,6 +1,6 @@
 <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="90px">
       <el-form-item label="姓名" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -25,6 +25,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <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="hjAddress">
         <el-input
           v-model="queryParams.hjAddress"
@@ -33,30 +37,6 @@
           @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>
@@ -109,16 +89,14 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="addressList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="addressList" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="姓名" align="center" prop="name" />
       <el-table-column label="身份证号" align="center" prop="idCard" />
       <el-table-column label="户号" align="center" prop="acountNo" />
       <el-table-column label="户籍地址" align="center" prop="hjAddress" />
-      <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
@@ -159,18 +137,13 @@
         <el-form-item label="户号" prop="acountNo">
           <el-input v-model="form.acountNo" placeholder="请输入户号" />
         </el-form-item>
+        <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-form-item label="户籍地址" prop="hjAddress">
           <el-input v-model="form.hjAddress" 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-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -182,9 +155,13 @@
 
 <script>
 import { listAddress, getAddress, delAddress, addAddress, updateAddress } from "@/api/szxc/address";
+import { deptTreeSelect } from "@/api/system/user";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Address",
+  components: { Treeselect },
   data() {
     return {
       // 遮罩层
@@ -203,6 +180,8 @@ export default {
       addressList: [],
       // 弹出层标题
       title: "",
+      // 组织树选项
+      deptOptions: undefined,
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -213,27 +192,58 @@ export default {
         idCard: null,
         acountNo: null,
         hjAddress: null,
+        deptId: null
+      },
+      // 表单参数
+      form: {
+        id: null,
+        name: null,
+        idCard: null,
+        acountNo: null,
+        hjAddress: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
         deptId: null,
         deptName: null,
         userId: null
       },
-      // 表单参数
-      form: {},
       // 表单校验
       rules: {
+        name: [
+          { required: true, message: "姓名不能为空", trigger: "blur" }
+        ],
+        idCard: [
+          { required: true, message: "身份证号不能为空", trigger: "blur" }
+        ],
         acountNo: [
           { required: true, message: "户号不能为空", trigger: "blur" }
         ],
         deptId: [
-          { required: true, message: "部门id不能为空", trigger: "blur" }
+          { required: true, message: "所属网格不能为空", trigger: "blur" }
+        ],
+        hjAddress: [
+          { 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;