From 8cf96197ea8fbb043a9705858096bc539dba7b8e Mon Sep 17 00:00:00 2001
From: jiangyuying <jiang478938504@126.com>
Date: Fri, 25 Aug 2023 16:02:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A5=BC=E9=95=BF=E5=8D=95=E5=85=83=E9=95=BF?=
 =?UTF-8?q?=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/resi.vue               |  1 +
 .../residentManagement/louzhang/addForm.vue   | 60 ++++++++++++++-----
 .../louzhang/louzhangList.vue                 | 16 ++---
 3 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 6b94683cd..2eb7b9baf 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1328,6 +1328,7 @@ export default {
   watch: {
     $route: {
       handler: function (newVal, oldVal) {
+        console.log(newVal, oldVal)
         if (newVal.name == "base-resi") {
           this.$nextTick(() => {
             if (newVal.params.category) {
diff --git a/src/views/modules/base/residentManagement/louzhang/addForm.vue b/src/views/modules/base/residentManagement/louzhang/addForm.vue
index 1053e3128..ecbddff2b 100644
--- a/src/views/modules/base/residentManagement/louzhang/addForm.vue
+++ b/src/views/modules/base/residentManagement/louzhang/addForm.vue
@@ -10,15 +10,16 @@
         <el-row>
           <el-col :span="24">
             <div class="info-prop"
-                 v-if="formType == 'detail'||formType == 'edit'">
+                 v-if="formType == 'detail'">
               <span class="info-title-2">所属组织: </span>
-              <span>{{ formData.agencyName || "--" }}</span>
+
             </div>
             <el-form-item v-else
                           label="所属组织"
                           label-width="100px"
                           prop="agencyId">
-              <el-cascader ref="ref_cascader_agency"
+              <el-cascader v-if="formType == 'add'"
+                           ref="ref_cascader_agency"
                            class="width-two"
                            v-model="formData.agencyId"
                            :options="optionsA"
@@ -26,6 +27,8 @@
                            :props="{ checkStrictly: true, emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'}"
                            clearable />
 
+              <span v-else>{{ formData.agencyName || "--" }}</span>
+
             </el-form-item>
           </el-col>
 
@@ -85,13 +88,14 @@
             <div class="info-prop"
                  v-if="formType == 'detail'">
               <span class="info-title-2">类型: </span>
-              <span>{{ formData.dormitoryTypeName || "--" }}</span>
+              <span>{{ formData.dormitoryName || "--" }}</span>
             </div>
             <el-form-item label-width="100px"
                           label="类型"
-                          prop="dormitoryType"
+                          prop="dormitoryTypeArray"
                           v-else>
-              <el-select v-model="formData.dormitoryType"
+              <el-select v-model="formData.dormitoryTypeArray"
+                         multiple
                          clearable>
                 <el-option v-for="item in dormitoryTypeList"
                            :key="item.value"
@@ -182,7 +186,8 @@ export default {
         name: "",
         mobile: "",
         idNum: "",
-        dormitoryType: "",
+        dormitoryTypeArray: [],
+        dormitoryTypeCode: '',
         rangeList: []
 
       },
@@ -193,7 +198,7 @@ export default {
         name: [{ required: true, message: "姓名不能为空", trigger: "change" }],
         mobile: [{ required: true, message: "联系电话不能为空", trigger: "change" }],
         idNum: [{ required: true, message: "身份证号不能为空", trigger: "change" }],
-        dormitoryType: [{ required: true, message: "类型不能为空", trigger: "change" }],
+        dormitoryTypeArray: [{ required: true, message: "类型不能为空", trigger: "change" }],
         rangeList: [{ required: true, message: "管理范围不能为空", trigger: "change" }],
       },
 
@@ -226,8 +231,19 @@ export default {
 
       const { data, code, msg } = await requestGet(url);
       if (code === 0) {
-        console.log(data);
+        if (data.dormitoryTypeCode === '1,1') {
+          data.dormitoryTypeArray = ['0', '1']
+        } else if (data.dormitoryTypeCode === '1,0') {//选了单元长
+          data.dormitoryTypeArray = ['0']
+        } else if (data.dormitoryTypeCode === '0,1') {//选了楼长
+          data.dormitoryTypeArray = ['1']
+        } else {
+          data.dormitoryTypeArray = []
+        }
+
+
         this.formData = { ...data };
+        console.log(this.formData)
       } else {
         this.$message.error(msg);
       }
@@ -248,7 +264,7 @@ export default {
     },
 
     handleChangeRange (val) {
-      console.log('改变范围', val)
+
 
     },
     getGridList () {
@@ -266,13 +282,13 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           } else {
-            console.log('获取查询详情成功', res.data)
+
             let { agencyList, subAgencyList } = res.data
 
             const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }]
             this.optionsA = this.deepTree(_arr)
             this.optionsRange = this.deepTree(_arr)
-            console.log('optionsA----', this.optionsA)
+
           }
         })
         .catch(() => {
@@ -298,14 +314,28 @@ export default {
         if (!valid) {
           return false;
         }
+
         if (this.formType == 'edit') {
           // this.formData.categorizedResiId = this.scopeId
         }
-        console.log(this.formData);
+        if (this.formData.dormitoryTypeArray.includes('0')) {//选了单元长
+          if (this.formData.dormitoryTypeArray.includes('1')) {//选了楼长
+            this.formData.dormitoryTypeCode = '1,1'
+          } else {
+            this.formData.dormitoryTypeCode = '1,0'
+          }
+        } else {
+          if (this.formData.dormitoryTypeArray.includes('1')) {//选了楼长
+            this.formData.dormitoryTypeCode = '0,1'
+          } else {
+            this.formData.dormitoryTypeCode = '0,0'
+          }
+        }
+
         const url =
           this.formType === "edit"
-            ? "/actual/base/resiCategorized/buildingUnitChief//update"
-            : "/actual/base/resiCategorized/buildingUnitChief//create";
+            ? "/actual/base/resiCategorized/buildingUnitChief/update"
+            : "/actual/base/resiCategorized/buildingUnitChief/create";
 
         const { data, code, msg } = await requestPost(url, this.formData);
         if (code === 0) {
diff --git a/src/views/modules/base/residentManagement/louzhang/louzhangList.vue b/src/views/modules/base/residentManagement/louzhang/louzhangList.vue
index 67b9e3e08..9279f8171 100644
--- a/src/views/modules/base/residentManagement/louzhang/louzhangList.vue
+++ b/src/views/modules/base/residentManagement/louzhang/louzhangList.vue
@@ -170,7 +170,7 @@
                            align="center"
                            width="50" />
 
-          <el-table-column prop="prefectureName"
+          <el-table-column prop="agencyName"
                            align="center"
                            width="150"
                            label="所属组织"
@@ -195,25 +195,25 @@
                            label="身份证号"
                            :show-overflow-tooltip="true">
           </el-table-column>
-          <el-table-column prop="genderName"
+          <el-table-column prop="dormitoryName"
                            align="center"
                            width="80"
                            label="类型"
                            :show-overflow-tooltip="true">
-            <template slot-scope="scope">
+            <!-- <template slot-scope="scope">
               <span>{{
-                scope.row.gender
-                  ? scope.row.gender == "1"
+                scope.row.dormitoryType
+                  ? scope.row.dormitoryType == 1
                     ? "楼长"
-                    : scope.row.gender == "0"
+                    : scope.row.dormitoryType == 0
                     ? "单元长"
                     : "--"
                   : "--"
               }}</span>
-            </template>
+            </template> -->
           </el-table-column>
 
-          <el-table-column prop="currentResidence"
+          <el-table-column prop="communityName"
                            align="center"
                            min-width="200"
                            label="管理小区"