From 4cfcbd0261cb7f360f9650cf07b5a3bbc07ae4a9 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 23 Dec 2023 11:37:26 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

---
 src/views/gzll/owners.vue |   65 +++++++++++++++++++++++++++-----
 1 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/src/views/gzll/owners.vue b/src/views/gzll/owners.vue
index 031d0b3..769136b 100644
--- a/src/views/gzll/owners.vue
+++ b/src/views/gzll/owners.vue
@@ -11,12 +11,8 @@
       </template>
     </avue-crud>
 
-    <el-dialog title="业委会成员" append-to-body :visible.sync="memberFlag" width="345px" center>
-
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="roleBox = false">取 消</el-button>
-        <el-button type="primary" @click="submitRole">确 定</el-button>
-      </span>
+    <el-dialog title="业委会成员" append-to-body :visible.sync="memberFlag" width="70%" height="60%">
+      <ownersMemberManager ref="ownersMemberManager" />
     </el-dialog>
 
   </basic-container>
@@ -35,8 +31,12 @@
   } from "vuex"
   import website from '@/config/website'
   import func from "@/util/func";
+  import ownersMemberManager from "./components/ownersMemberManager"
 
   export default {
+    components: {
+      ownersMemberManager
+    },
     data() {
       return {
         form: {},
@@ -71,6 +71,11 @@
               prop: "name",
               search: true,
               searchLabelWidth: 136,
+              rules: [{
+                required: true,
+                message: "请输入业委会名称",
+                trigger: "blur",
+              }, ],
             },
             {
               label: "小区",
@@ -83,6 +88,7 @@
                 value: "id"
               },
               defaultExpandedKeys: ["361102003"],
+              cascader: ['principalId'],
               span: 12,
               labelWidth: 120,
               width: 220,
@@ -109,13 +115,43 @@
               label: "总人数",
               prop: "peopleTotal",
               display: false,
-            }, {
-              label: "负责名称",
-              prop: "principalName",
             },
             {
-              label: "负责人手机",
+              label: "业委会负责人",
+              prop: "principalId",
+              span: 12,
+              labelWidth: 120,
+              type: "tree",
+              remote: true,
+              props: {
+                label: 'name',
+                value: 'id'
+              },
+              hide: true,
+              dicUrl: `/api/blade-system/user/searchUserByDistrictId?districtId={{key}}`,
+              defaultExpandedKeys: [],
+              rules: [{
+                required: true,
+                message: "请选择业委会负责人",
+                trigger: "blur",
+              }, ],
+            }, {
+              label: "负责人名称",
+              prop: "principalName",
+              rules: [{
+                required: true,
+                message: "请输入负责人名称",
+                trigger: "blur",
+              }, ],
+            },
+            {
+              label: "负责人手机号",
               prop: "mobile",
+              rules: [{
+                required: true,
+                message: "请输入负责人手机号",
+                trigger: "blur",
+              }, ],
             },
             {
               label: "地址",
@@ -177,9 +213,12 @@
       },
     },
     methods: {
-
       manageMember(row) {
         this.memberFlag = true
+        var that = this
+        this.$nextTick(() => {
+          that.$refs.ownersMemberManager.init(row)
+        })
       },
       rowSave(row, done, loading) {
         row.imageUrl = func.join(row.imageUrl)
@@ -284,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