From 40ec0dfba7bcfbfbd47d86c03fda96be078e2225 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 11:01:28 +0800
Subject: [PATCH] 业委会优化

---
 src/api/system/user.js                            |   10 ++++++++++
 src/views/gzll/components/ownersMemberManager.vue |   38 +++++++++++++++++++++++++++++++-------
 src/views/gzll/owners.vue                         |   11 ++++++++---
 3 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/src/api/system/user.js b/src/api/system/user.js
index b37cbf9..b58f2d4 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -128,3 +128,13 @@
     }
   })
 }
+
+export const getUserByDistrictId = (districtId) => {
+  return request({
+    url: '/api/blade-system/user/searchUserByDistrictId',
+    method: 'get',
+    params: {
+      districtId,
+    }
+  })
+}
\ No newline at end of file
diff --git a/src/views/gzll/components/ownersMemberManager.vue b/src/views/gzll/components/ownersMemberManager.vue
index 2504ed4..2c852af 100644
--- a/src/views/gzll/components/ownersMemberManager.vue
+++ b/src/views/gzll/components/ownersMemberManager.vue
@@ -39,6 +39,10 @@
     getDetail
   } from "@/api/owners/ownersCommittee.js";
 
+  import {
+    getUserByDistrictId
+  } from "@/api/system/user.js";
+
   // import {
   //     update as committeeUpdate,
   //   } from "@/api/owners_committee"
@@ -63,6 +67,7 @@
     data() {
       return {
         owners: {},
+        userList: [],
         form: {},
         search: {},
         excelBox: false,
@@ -92,19 +97,27 @@
               prop: "userId",
               span: 12,
               labelWidth: 120,
-              type: "select",
+              type: "tree",
               remote: true,
+              hide: true,
+              // dicUrl: `/api/blade-system/user/searchUserByDistrictId?districtId={{key}}`,
+              dicData: [],
               props: {
                 label: 'name',
                 value: 'id'
               },
-              hide: true,
-              dicUrl: `/api/blade-system/user/searchUser?name={{key}}` + `&current=1&size=30`,
+              defaultExpandedKeys: [],
               rules: [{
                 required: true,
                 message: "请选择业委会成员",
                 trigger: "blur",
               }, ],
+              click({
+                column,
+                value
+              }) {
+                console.log(column, value)
+              }
             }, {
               label: "名称",
               prop: "name",
@@ -356,6 +369,10 @@
       init(data) {
         this.ownersId = data.id
         this.owners = data
+        const column = this.findObject(this.option.column, "userId");
+        let arr = []
+        arr.push(this.owners.areaId)
+        column.defaultExpandedKeys = arr;
         this.onLoad(this.page)
       },
       rowSave(row, done, loading) {
@@ -370,7 +387,7 @@
           });
           done();
         }, error => {
-          window.console.log(error);
+          // window.console.log(error);
           loading();
         });
       },
@@ -384,7 +401,7 @@
           });
           done();
         }, error => {
-          window.console.log(error);
+          // window.console.log(error);
           loading();
         });
       },
@@ -449,7 +466,6 @@
         this.excelBox = true;
       },
       uploadAfter(res, done, loading, column) {
-        window.console.log(column);
         this.excelBox = false;
         this.refreshChange();
         done();
@@ -482,6 +498,9 @@
         if (["edit", "view"].includes(type)) {
           getDetail(this.form.id).then(res => {
             this.form = res.data.data;
+            const column = this.findObject(this.option.column, "userId");
+            console.table(this.userList)
+            column.dicData = this.userList;
           });
         }
         this.initFlag = true;
@@ -506,6 +525,11 @@
           this.loading = false;
           this.selectionClear();
         });
+        getUserByDistrictId(this.owners.areaId).then(res => {
+          const column = this.findObject(this.option.column, "userId");
+          this.userList = res.data.data;
+          column.dicData = res.data.data;
+        })
       }
     }
   };
@@ -523,4 +547,4 @@
   .box .el-scrollbar__wrap {
     overflow: scroll;
   }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/gzll/owners.vue b/src/views/gzll/owners.vue
index e0ecea6..769136b 100644
--- a/src/views/gzll/owners.vue
+++ b/src/views/gzll/owners.vue
@@ -88,6 +88,7 @@
                 value: "id"
               },
               defaultExpandedKeys: ["361102003"],
+              cascader: ['principalId'],
               span: 12,
               labelWidth: 120,
               width: 220,
@@ -120,14 +121,15 @@
               prop: "principalId",
               span: 12,
               labelWidth: 120,
-              type: "select",
+              type: "tree",
               remote: true,
               props: {
                 label: 'name',
                 value: 'id'
               },
               hide: true,
-              dicUrl: `/api/blade-system/user/searchUser?name={{key}}` + `&current=1&size=30`,
+              dicUrl: `/api/blade-system/user/searchUserByDistrictId?districtId={{key}}`,
+              defaultExpandedKeys: [],
               rules: [{
                 required: true,
                 message: "请选择业委会负责人",
@@ -211,7 +213,6 @@
       },
     },
     methods: {
-
       manageMember(row) {
         this.memberFlag = true
         var that = this
@@ -322,6 +323,10 @@
                 urls.push(website.minioUrl + name)
               })
               this.form.constructionSchemeUrls = urls.join(",")
+              const column = this.findObject(this.option.column, "principalId");
+              let arr = []
+              arr.push(this.form.areaId)
+              column.defaultExpandedKeys = arr;
             }
           });
         }

--
Gitblit v1.9.3