From 8318c115463ee371cd7b13f0a60d42b923e011fd Mon Sep 17 00:00:00 2001
From: bibi <541660090@qq.com>
Date: Sat, 22 Jan 2022 17:02:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Basic/Authority/_details/index.vue  | 23 ------------
 .../Authority/{component => depend}/config.js |  0
 .../Authority/{component => depend}/form.vue  |  0
 .../permissions copy.vue                      |  0
 .../{component => depend}/permissions.vue     |  0
 src/views/Basic/Authority/index.vue           |  4 +-
 .../Employee/{component => depend}/config.js  |  0
 .../Employee/{component => depend}/form.vue   |  0
 src/views/Basic/Employee/index.vue            |  4 +-
 .../{component => depend}/config.js           |  0
 .../EstateInfo/_buildingManage/index.vue      |  2 +-
 .../{component => depend}/config.js           |  0
 .../EstateInfo/_houseHoldAudit/index.vue      |  2 +-
 .../{component => depend}/addForm.vue         |  0
 .../{component => depend}/config.js           |  2 +-
 .../Basic/EstateInfo/_houseHoldInfo/index.vue | 37 ++++++++++---------
 .../{component => depend}/config.js           |  0
 .../Basic/EstateInfo/_houseManage/index.vue   |  2 +-
 18 files changed, 28 insertions(+), 48 deletions(-)
 delete mode 100644 src/views/Basic/Authority/_details/index.vue
 rename src/views/Basic/Authority/{component => depend}/config.js (100%)
 rename src/views/Basic/Authority/{component => depend}/form.vue (100%)
 rename src/views/Basic/Authority/{component => depend}/permissions copy.vue (100%)
 rename src/views/Basic/Authority/{component => depend}/permissions.vue (100%)
 rename src/views/Basic/Employee/{component => depend}/config.js (100%)
 rename src/views/Basic/Employee/{component => depend}/form.vue (100%)
 rename src/views/Basic/EstateInfo/_buildingManage/{component => depend}/config.js (100%)
 rename src/views/Basic/EstateInfo/_houseHoldAudit/{component => depend}/config.js (100%)
 rename src/views/Basic/EstateInfo/_houseHoldInfo/{component => depend}/addForm.vue (100%)
 rename src/views/Basic/EstateInfo/_houseHoldInfo/{component => depend}/config.js (98%)
 rename src/views/Basic/EstateInfo/_houseManage/{component => depend}/config.js (100%)

diff --git a/src/views/Basic/Authority/_details/index.vue b/src/views/Basic/Authority/_details/index.vue
deleted file mode 100644
index 39f5c2f..0000000
--- a/src/views/Basic/Authority/_details/index.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
- * @Author: your name
- * @Date: 2021-11-23 10:27:56
- * @LastEditTime: 2021-11-23 10:30:58
- * @LastEditors: Please set LastEditors
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: /ansu-business/src/views/Billing/_details/index.vue
--->
-<template>
-    <div>
-        444444
-    </div>
-</template>
-
-<script>
-export default {
-	name: "Billing_details"
-}
-</script>
-
-<style lang="less" scoped>
-
-</style>
diff --git a/src/views/Basic/Authority/component/config.js b/src/views/Basic/Authority/depend/config.js
similarity index 100%
rename from src/views/Basic/Authority/component/config.js
rename to src/views/Basic/Authority/depend/config.js
diff --git a/src/views/Basic/Authority/component/form.vue b/src/views/Basic/Authority/depend/form.vue
similarity index 100%
rename from src/views/Basic/Authority/component/form.vue
rename to src/views/Basic/Authority/depend/form.vue
diff --git a/src/views/Basic/Authority/component/permissions copy.vue b/src/views/Basic/Authority/depend/permissions copy.vue
similarity index 100%
rename from src/views/Basic/Authority/component/permissions copy.vue
rename to src/views/Basic/Authority/depend/permissions copy.vue
diff --git a/src/views/Basic/Authority/component/permissions.vue b/src/views/Basic/Authority/depend/permissions.vue
similarity index 100%
rename from src/views/Basic/Authority/component/permissions.vue
rename to src/views/Basic/Authority/depend/permissions.vue
diff --git a/src/views/Basic/Authority/index.vue b/src/views/Basic/Authority/index.vue
index ba5fb1a..b6ab32f 100644
--- a/src/views/Basic/Authority/index.vue
+++ b/src/views/Basic/Authority/index.vue
@@ -58,9 +58,9 @@
 </template>
 
 <script>
-import {columns,pagination,searchForm} from './component/config.js'
+import {columns,pagination,searchForm} from './depend/config.js'
 import { rolelist,listByRole } from "@/api/basic/role";
-import rolePermissions from './component/permissions.vue'
+import rolePermissions from './depend/permissions.vue'
 export default {
 	components:{
 		rolePermissions
diff --git a/src/views/Basic/Employee/component/config.js b/src/views/Basic/Employee/depend/config.js
similarity index 100%
rename from src/views/Basic/Employee/component/config.js
rename to src/views/Basic/Employee/depend/config.js
diff --git a/src/views/Basic/Employee/component/form.vue b/src/views/Basic/Employee/depend/form.vue
similarity index 100%
rename from src/views/Basic/Employee/component/form.vue
rename to src/views/Basic/Employee/depend/form.vue
diff --git a/src/views/Basic/Employee/index.vue b/src/views/Basic/Employee/index.vue
index c64e08d..6d4cd37 100644
--- a/src/views/Basic/Employee/index.vue
+++ b/src/views/Basic/Employee/index.vue
@@ -201,8 +201,8 @@
   </div>
 </template>
 <script>
-import { columns, pagination, searchForm } from "./component/config.js";
-import vueForm from "./component/form.vue";
+import { columns, pagination, searchForm } from "./depend/config.js";
+import vueForm from "./depend/form.vue";
 import {
 	departmentList,
 	departmentInsert,
diff --git a/src/views/Basic/EstateInfo/_buildingManage/component/config.js b/src/views/Basic/EstateInfo/_buildingManage/depend/config.js
similarity index 100%
rename from src/views/Basic/EstateInfo/_buildingManage/component/config.js
rename to src/views/Basic/EstateInfo/_buildingManage/depend/config.js
diff --git a/src/views/Basic/EstateInfo/_buildingManage/index.vue b/src/views/Basic/EstateInfo/_buildingManage/index.vue
index a12cd17..dd716ea 100644
--- a/src/views/Basic/EstateInfo/_buildingManage/index.vue
+++ b/src/views/Basic/EstateInfo/_buildingManage/index.vue
@@ -135,7 +135,7 @@
 </template>
 
 <script>
-import { columns,pagination,searchForm} from "./component/config"
+import { columns,pagination,searchForm} from "./depend/config"
 import { buildingList } from "@/api/basic/estate"
 export default {
 	data() {
diff --git a/src/views/Basic/EstateInfo/_houseHoldAudit/component/config.js b/src/views/Basic/EstateInfo/_houseHoldAudit/depend/config.js
similarity index 100%
rename from src/views/Basic/EstateInfo/_houseHoldAudit/component/config.js
rename to src/views/Basic/EstateInfo/_houseHoldAudit/depend/config.js
diff --git a/src/views/Basic/EstateInfo/_houseHoldAudit/index.vue b/src/views/Basic/EstateInfo/_houseHoldAudit/index.vue
index 87fe509..061393f 100644
--- a/src/views/Basic/EstateInfo/_houseHoldAudit/index.vue
+++ b/src/views/Basic/EstateInfo/_houseHoldAudit/index.vue
@@ -122,7 +122,7 @@ import {
 	searchForm,
 	reset,
 	handleTableChange,
-} from "./component/config";
+} from "./depend/config";
 import { reviewList, review } from "@/api/basic/resident";
 export default {
 	data() {
diff --git a/src/views/Basic/EstateInfo/_houseHoldInfo/component/addForm.vue b/src/views/Basic/EstateInfo/_houseHoldInfo/depend/addForm.vue
similarity index 100%
rename from src/views/Basic/EstateInfo/_houseHoldInfo/component/addForm.vue
rename to src/views/Basic/EstateInfo/_houseHoldInfo/depend/addForm.vue
diff --git a/src/views/Basic/EstateInfo/_houseHoldInfo/component/config.js b/src/views/Basic/EstateInfo/_houseHoldInfo/depend/config.js
similarity index 98%
rename from src/views/Basic/EstateInfo/_houseHoldInfo/component/config.js
rename to src/views/Basic/EstateInfo/_houseHoldInfo/depend/config.js
index 824ce21..bf607fd 100644
--- a/src/views/Basic/EstateInfo/_houseHoldInfo/component/config.js
+++ b/src/views/Basic/EstateInfo/_houseHoldInfo/depend/config.js
@@ -39,7 +39,7 @@ export const columns = [
 		title: "房屋名称",
 		dataIndex: "manageBuildingName",
 		scopedSlots: { customRender: "name" },
-		width: "20%",
+		width: "25%",
 	},
 	{
 		title: "房屋类型",
diff --git a/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue b/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue
index 4981ced..ac25d7e 100644
--- a/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue
+++ b/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue
@@ -11,7 +11,7 @@
               <a-select-option value="3">保密</a-select-option>
             </a-select>
             <a-input style="width: 200px" placeholder="请输入关键字（姓名/手机号）" />
-            <a-button type="primary">查 询</a-button>
+            <a-button type="primary" @click='getData'>查 询</a-button>
             <a-button>重 置</a-button>
           </a-space>
         </a-col>
@@ -46,7 +46,7 @@
       <!-- 表格 -->
       <a-table
         :columns="columns"
-        :data-source="newData"
+        :data-source="tableData"
         :pagination="pagination"
         :scroll="{ x: 1300 }"
         :row-selection="{
@@ -60,8 +60,8 @@
         "
       >
         <span slot="name" slot-scope="text, row">
-          <a-select style="width :200px" @change='changeHouse' placeholder='请选择房屋'>
-            <a-select-option v-for="item,index in row.residentListEstateVoList" :key='index' :value="item.id">
+          <a-select style="width :100%" @change='changeHouse' placeholder='请选择房屋'>
+            <a-select-option v-for="item,index in row.residentListEstateVoList" :key='index' :value="item.id" @click="chooseHouse(row)">
               {{
             item.manageBuildingName +
             "栋/" +
@@ -94,7 +94,7 @@
 </template>
 
 <script>
-import { columns,pagination,searchForm } from './component/config.js'
+import { columns,pagination,searchForm } from './depend/config.js'
 import { residentList } from '@/api/basic/resident'
 export default {
 	data() {
@@ -109,6 +109,7 @@ export default {
 				},
 				detail:{}
 			},
+			table_row:{},
 			changeId:null,
 			pagination: pagination,
 			searchForm:searchForm,
@@ -147,7 +148,6 @@ export default {
 				keyword:this.searchForm.keyword,
 			})
 			this.tableData = res.data.rows
-			this.newData  =  this.tableData
 		},
 		addClose(){
 			this.drawer.add.show = false;
@@ -168,19 +168,22 @@ export default {
 		},
 		// 表格行切换房屋
 		changeHouse(value){
-			// 遍历每行
-			this.newData.forEach((item,index)=>{
-				// 遍历每行中的所有房子
-				item.residentListEstateVoList.forEach(items=>{
-					// 当有房子id和changeid相同时
-					if(items.id === value){
-						// 给newData赋值
-						this.$set(this.newData[index],'identity' ,items.identity )
-						this.$set(this.newData[index],'manageEstateTypeName' ,items.manageEstateTypeName )
-					}
-				})
+			// 选中的行
+			this.tableData.forEach((item,index)=>{
+				if(item.id === this.table_row.id) {
+					console.log(item);
+					item.residentListEstateVoList.forEach((items)=>{
+						if(items.id === value){
+							this.$set(this.tableData[index],'identity' ,items.identity )
+							this.$set(this.tableData[index],'manageEstateTypeName' ,items.manageEstateTypeName )
+						}
+					})
+				}
 			})
 		},
+		chooseHouse(row){
+			this.table_row  = row
+		},
 		handleTableChange(pagination) {
 			console.log(pagination);
 			const pager = { ...this.pagination };
diff --git a/src/views/Basic/EstateInfo/_houseManage/component/config.js b/src/views/Basic/EstateInfo/_houseManage/depend/config.js
similarity index 100%
rename from src/views/Basic/EstateInfo/_houseManage/component/config.js
rename to src/views/Basic/EstateInfo/_houseManage/depend/config.js
diff --git a/src/views/Basic/EstateInfo/_houseManage/index.vue b/src/views/Basic/EstateInfo/_houseManage/index.vue
index 9babbcc..04ec4c2 100644
--- a/src/views/Basic/EstateInfo/_houseManage/index.vue
+++ b/src/views/Basic/EstateInfo/_houseManage/index.vue
@@ -250,7 +250,7 @@ function getBase64(file) {
 		reader.onerror = error => reject(error);
 	});
 }
-import { columns,pagination,searchForm, del } from "./component/config"
+import { columns,pagination,searchForm, del } from "./depend/config"
 import { houseList } from '@/api/basic/estate'
 export default {
 	data() {