From bbff46e35d4314b95af6f0019773bc23f0e25c4b Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 06 Jan 2024 18:17:40 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

---
 src/views/article/components/discussionManageChild.vue |   53 ++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/src/views/article/components/discussionManageChild.vue b/src/views/article/components/discussionManageChild.vue
index daa6662..13f60e1 100644
--- a/src/views/article/components/discussionManageChild.vue
+++ b/src/views/article/components/discussionManageChild.vue
@@ -1,11 +1,9 @@
 <template>
-
   <div>
     <el-dialog title="" append-to-body :visible.sync="dialogVisibles" width="60%" :before-close="handleClose">
       <avue-form ref="DisCussFrom" :option="option" v-model="disCussFrom" @submit="handleSubmit"></avue-form>
     </el-dialog>
   </div>
-
 </template>
 
 <script>
@@ -178,7 +176,7 @@
               label: "选择用户",
               prop: "userIds",
               hide: true,
-              // type: "table",
+              type: "table",
               display: false,
               span: 6,
               // labelWidth: 120,
@@ -190,7 +188,13 @@
                 searchShow: true,
                 searchMenuSpan: 6,
                 submitText: "确定",
+                selection: true,
                 column: [{
+                    label: "社区",
+                    prop: "neiName",
+                    search: true,
+                    searchSpan: 4,
+                  }, {
                     label: "姓名",
                     prop: "name",
                     search: true,
@@ -202,15 +206,43 @@
                     }, ],
                   },
                   {
-                    label: "联系方式",
-                    prop: "phoneNumber",
+                    label: "小区",
+                    prop: "aoiCode",
+                    searchSpan: 5,
+                    type: 'tree',
                     search: true,
-                    searchSpan: 4,
+                    parent: false,
+                    dicUrl: `/api/blade-district/district/getDistrictTree`,
+                    props: {
+                      label: "name",
+                      value: "aoiCode"
+                    },
+                    // defaultExpandedKeys: ["361102003"],
+                    span: 12,
+                    labelWidth: 120,
+                    width: 220,
+                    // overHidden: true,
                     rules: [{
                       required: true,
-                      message: "请输入联系方式",
+                      message: "请选择小区",
                       trigger: "blur",
                     }, ],
+                    // disabled: true
+                    display: true,
+                    hide: true,
+                  },
+
+                  {
+                    label: "楼栋",
+                    prop: "building",
+                    search: true,
+                    searchSpan: 4,
+                  },
+                  {
+                    label: "单元",
+                    prop: "unit",
+                    search: true,
+                    searchSpan: 4,
                   },
                   {
                     label: "地址",
@@ -227,7 +259,7 @@
                 total: 0
               },
               formatter: (row) => {
-                this.form.phoneNumber = row.phoneNumber
+                // this.form.phoneNumber =  row.phoneNumber
                 return row.name
               },
               onLoad: ({
@@ -248,14 +280,13 @@
                   this.loading = true
                   var params = {
                     ...data,
-                    townStreetCode: "361102005"
+                    // townStreetCode: "361102005"
                   }
                   getHouseholdList(page.currentPage, page.pageSize, Object.assign(params)).then(res => {
                     const resData = res.data.data
                     var total = resData.total
                     var data = resData.records
                     this.loading = false
-                    this.selectionClear()
                     //分页查询信息
                     callback({
                       total: total,
@@ -299,7 +330,7 @@
     watch: {
       'disCussFrom.appointUser': {
         handler(newData) {
-          const column = this.findObject(this.option.column, "userIds");
+          const column = this.findObject(this.option.column, "userIds")
           if (newData == 1) {
             column.display = true
           } else {

--
Gitblit v1.9.3