From 2769f9f376139e4414919b42193efa65f00e820c Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 21 Mar 2024 22:15:46 +0800
Subject: [PATCH] 租客,居住证申请操作,住户列表修改

---
 src/views/userHouse/hireInfoList.vue |   65 ++++++++++++++++++++++++--------
 1 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/src/views/userHouse/hireInfoList.vue b/src/views/userHouse/hireInfoList.vue
index 5d0b714..524c6f9 100644
--- a/src/views/userHouse/hireInfoList.vue
+++ b/src/views/userHouse/hireInfoList.vue
@@ -25,7 +25,7 @@
 
                     <template slot-scope="{row, size}" slot="menu">
                         <el-button type="text" :size="size" icon="el-icon-edit" v-if="permission.houseRental_edit"
-                            @click="showEditMoel(2,row)">编 辑
+                            @click="showEditMoel(2, row)">编 辑
                         </el-button>
 
 
@@ -116,7 +116,7 @@
 
 import retalInfo from './components/retalInfo'
 export default {
-    components: {retalInfo},
+    components: { retalInfo },
     data() {
         return {
             roleBox: false,
@@ -193,17 +193,29 @@
                     }
                     ],
                 },
+                // {
+                //     label: "关系",
+                //     prop: "relationship",
+                //     type: "select",
+                //     dicUrl: "/api/blade-system/dict-biz/dictionary?code=roleRelation",
+                //     dataType: "number",
+                //     props: {
+                //         label: "dictValue",
+                //         value: "dictKey",
+                //     },
+                //     display: false
+                // },
                 {
-                    label: "关系",
-                    prop: "relationship",
+                    label: "民族",
+                    prop: "ethnicity",
                     type: "select",
-                    dicUrl: "/api/blade-system/dict-biz/dictionary?code=roleRelation",
+                    // hide: true,
+                    dicUrl: "/api/blade-system/dict-biz/dictionary?code=nationType",
                     dataType: "number",
                     props: {
                         label: "dictValue",
                         value: "dictKey",
                     },
-                    display: false
                 },
                 {
                     width: 220,
@@ -214,12 +226,26 @@
                     searchSpan: 4,
                     display: false
                 },
+                // {
+                //     label: "地址",
+                //     prop: "address",
+                //     minWidth: 160,
+                //     overHidden: true,
+                //     display: false
+                // },
+                
                 {
-                    label: "地址",
-                    prop: "address",
-                    minWidth: 160,
+                    label: "户籍地址",
+                    prop: "hukouRegistration",
+                    // hide: true,
+                    minWidth: 150,
                     overHidden: true,
-                    display: false
+                },
+                {
+                    label: "工作单位",
+                    prop: "employer",
+                    // editDisplay:false,
+                    // hide: true,
                 },
                 ]
             },
@@ -245,7 +271,8 @@
                         label: "房屋",
                         prop: "houseName",
                         display: false,
-                        width:120
+                        minWidth: 150,
+                        overHidden: true,
                     },
                     {
                         label: "房屋",
@@ -592,6 +619,9 @@
             row.address = this.rowHouseHold.address
             row.housingRentalId = this.rowHouseHold.id
             row.houseCode = this.rowHouseHold.houseCode
+            if (row.idCard) {
+                row.cardType = 111
+            }
             householdAdd(row).then(() => {
                 this.initFlag = false
                 this.onLoadHouseHold()
@@ -652,6 +682,9 @@
             })
         },
         houseHoldRowUpdate(row, index, done, loading) {
+            if (row.idCard) {
+                row.cardType = 111
+            }
             householdUpdate(row).then(() => {
                 this.initFlag = false
                 this.onLoadHouseHold()
@@ -823,13 +856,13 @@
             })
         },
 
-        showEditMoel(type,item) {
-            if(type == 1){
+        showEditMoel(type, item) {
+            if (type == 1) {
                 this.$refs.RetalInfo.initOpen(type)
-            }else {
-                this.$refs.RetalInfo.initOpen(type,item.id)
+            } else {
+                this.$refs.RetalInfo.initOpen(type, item.id)
             }
-            
+
         },
     }
 }

--
Gitblit v1.9.3