From 231e3dc4a946ba6e7d9e2e87cd529c7dba76331f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 02 Jan 2024 15:15:36 +0800
Subject: [PATCH] 住户管理,人口字段补充整改

---
 src/views/userHouse/houseHoldList.vue |   98 +++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 82 insertions(+), 16 deletions(-)

diff --git a/src/views/userHouse/houseHoldList.vue b/src/views/userHouse/houseHoldList.vue
index 887d686..4091bbc 100644
--- a/src/views/userHouse/houseHoldList.vue
+++ b/src/views/userHouse/houseHoldList.vue
@@ -239,19 +239,19 @@
                         }
                         ],
                     },
+                    // {
+                    // label: "关系",
+                    // prop: "roleType",
+                    // type: "select",
+                    // dicUrl: "/api/blade-system/dict-biz/dictionary?code=roleType",
+                    // dataType: "number",
+                    //     props: {
+                    //         label: "dictValue",
+                    //         value: "dictKey",
+                    //     },
+                    // },
                     {
-                        label: "关系",
-                        prop: "roleType",
-                        type: "select",
-                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=roleType",
-                        dataType: "number",
-                        props: {
-                            label: "dictValue",
-                            value: "dictKey",
-                        },
-                    },
-                    {
-                        label: "与角色关系",
+                        label: "与业主关系",
                         prop: "relationship",
                         type: "select",
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=roleRelation",
@@ -423,22 +423,38 @@
                         prop: "otherContact",
                         hide: true,
                     },
+
                     {
                         label: "现居住地址",
                         prop: "currentAddress",
                         hide: true,
                     },
+
+                    {
+                        label: "居住地行政区划",
+                        prop: "homeAdcode",
+                        hide: true,
+                        type: 'select',
+                        props: {
+                            label: 'name',
+                            value: 'code'
+                        },
+                        dicUrl: `/api/blade-system/region/select?code=361102`,
+                    },
+
                     {
                         label: "残疾证",
                         prop: "disabilityCert",
                         hide: true,
                     },
                     {
+                        hide: true,
                         width: 160,
                         label: "宗教信仰",
                         prop: "religiousBelief",
                     },
                     {
+                        hide: true,
                         label: "健康状况",
                         prop: "healthStatus",
                         type: "select",
@@ -450,10 +466,12 @@
                         },
                     },
                     {
+                        hide: true,
                         width: 160,
                         label: "疾病名称",
                         prop: "diseaseName"
                     },
+
                     {
                         label: "户籍类型",
                         prop: "residentType",
@@ -465,42 +483,67 @@
                             value: "dictKey",
                         },
                     },
+
                     {
+                        hide: true,
+                        parent: false,
                         width: 160,
                         label: "户籍地行政区划",
-                        prop: "residentAdcode"
+                        prop: "residentAdcode",
+                        type: "tree",
+                        props: {
+                            label: 'name',
+                            value: 'id'
+                        },
+                        dicUrl: `/api/blade-system/region/getBaseTree`,
                     },
+
                     {
+                        hide: true,
+                        parent: false,
                         width: 160,
                         label: "籍贯地行政区划",
-                        prop: "nativePlaceAdcode"
+                        prop: "nativePlaceAdcode",
+                        type: "tree",
+                        props: {
+                            label: 'name',
+                            value: 'id'
+                        },
+                        dicUrl: `/api/blade-system/region/getBaseTree`,
                     },
+
                     {
+                        hide: true,
                         width: 160,
                         label: "外出详址",
                         prop: "goOutAddr"
                     },
                     {
+                        hide: true,
                         width: 160,
                         label: "外出去向",
                         prop: "goOutWhere"
                     },
                     {
+                        hide: true,
                         width: 160,
                         label: "外出时间",
                         prop: "goOutTime"
                     },
                     {
+                        hide: true,
                         width: 160,
                         label: "外出原因",
                         prop: "goOutReason"
                     },
                     {
+                        hide: true,
                         width: 160,
                         label: "职业类别",
                         prop: "occupation"
                     },
                     {
+                        hide: true,
                         width: 160,
                         label: "就职单位地址",
                         prop: "cmpyRegAddr"
@@ -597,7 +640,30 @@
             householdLabelList: [],
         }
     },
-    watch: {},
+    watch: {
+        'form.source': {
+            handler (newData) {
+                let currentAddressColumn = this.findObject(
+                    this.option.column,
+                    'currentAddress'
+                )
+
+                let homeAdcodeColumn = this.findObject(
+                    this.option.column,
+                    'homeAdcode'
+                )
+
+                if (newData == 1) {
+                    currentAddressColumn.disabled = false
+                    homeAdcodeColumn.disabled = false
+                } else {
+                    currentAddressColumn.disabled = true
+                    homeAdcodeColumn.disabled = true
+                }
+            },
+            immediate: true
+        }
+    },
     computed: {
         ...mapGetters(["userInfo", "permission"]),
         permissionList () {
@@ -826,7 +892,7 @@
         },
         beforeOpen (done, type) {
             if (["edit", "view"].includes(type)) {
-                getDetatil(this.form.id).then(res => {
+                getDetatils(this.form.id).then(res => {
                     this.form = res.data.data
                 })
             }

--
Gitblit v1.9.3