From d02ade492472a80b87ceb9f8de99c9a628d397ca Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 02 Jan 2024 21:17:06 +0800
Subject: [PATCH] 字段顺序调整

---
 src/views/userHouse/components/householdManager.vue |  275 ++++++++++++++++++++++++++++--------------------------
 1 files changed, 142 insertions(+), 133 deletions(-)

diff --git a/src/views/userHouse/components/householdManager.vue b/src/views/userHouse/components/householdManager.vue
index 8d9b1c5..731b74f 100644
--- a/src/views/userHouse/components/householdManager.vue
+++ b/src/views/userHouse/components/householdManager.vue
@@ -91,12 +91,34 @@
                     search: true,
                     searchSpan: 4,
                 },
+
+                {
+                    label: "性别",
+                    prop: "gender",
+                    type: "select",
+                    dicData: [
+                        {
+                            label: "男",
+                            value: 1
+                        },
+                        {
+                            label: "女",
+                            value: 0
+                        },
+                        {
+                            label: "未知",
+                            value: 1
+                        }
+                    ],
+                },
+
                 {
                     label: "电话",
                     prop: "phoneNumber",
                     search: true,
                     searchSpan: 4,
                 },
+
                 {
                     label: "身份证号",
                     prop: "idCard",
@@ -117,38 +139,20 @@
                     label: "证件号码",
                     prop: "cardNo",
                 },
+
+                // {
+                // label: "关系",
+                // prop: "roleType",
+                // type: "select",
+                // dicUrl: "/api/blade-system/dict-biz/dictionary?code=roleType",
+                // dataType: "number",
+                //     props: {
+                //         label: "dictValue",
+                //         value: "dictKey",
+                //     },
+                // },
                 {
-                    label: "性别",
-                    prop: "gender",
-                    type: "select",
-                    dicData: [
-                        {
-                            label: "男",
-                            value: 1
-                        },
-                        {
-                            label: "女",
-                            value: 0
-                        },
-                        {
-                            label: "未知",
-                            value: 1
-                        }
-                    ],
-                },
-                {
-                    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",
@@ -193,11 +197,7 @@
                         value: "dictKey",
                     },
                 },
-                {
-                    label: "身份证号",
-                    prop: "idCard",
-                    hide: true,
-                },
+
                 {
                     label: "生日",
                     prop: "birthday",
@@ -240,98 +240,19 @@
                         value: "dictKey",
                     },
                 },
-                {
-                    label: "户籍登记地",
-                    prop: "hukouRegistration",
-                    hide: true,
-                },
-                {
-                    label: "工作状态",
-                    prop: "workStatus",
-                    type: "select",
-                    hide: true,
-                    dicUrl: "/api/blade-system/dict-biz/dictionary?code=workStatusType",
-                    dataType: "number",
-                    props: {
-                        label: "dictValue",
-                        value: "dictKey",
-                    },
-                },
-                {
-                    label: "工作单位",
-                    prop: "employer",
-                    hide: true,
-                },
-                {
-                    label: "婚姻状态",
-                    prop: "maritalStatus",
-                    type: "select",
-                    hide: true,
-                    dicUrl: "/api/blade-system/dict-biz/dictionary?code=marriageStatusType",
-                    dataType: "number",
-                    props: {
-                        label: "dictValue",
-                        value: "dictKey",
-                    },
-                },
-                {
-                    label: "车牌号",
-                    prop: "cardNumber",
-                    hide: true,
-                },
-                {
-                    label: "其他联系方式",
-                    prop: "otherContact",
-                    hide: true,
-                },
-                {
-                    disabled: false,
-                    label: "现居住地址",
-                    prop: "currentAddress",
-                    hide: true,
-                },
 
                 {
-                    disabled: false,
-                    label: "居住地行政区划",
-                    prop: "homeAdcode",
                     hide: true,
-                    type: 'select',
+                    parent: false,
+                    width: 160,
+                    label: "籍贯地行政区划",
+                    prop: "nativePlaceAdcode",
+                    type: "tree",
                     props: {
                         label: 'name',
-                        value: 'code'
+                        value: 'id'
                     },
-                    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",
-                    dicUrl: "/api/blade-system/dict-biz/dictionary?code=healthStatus",
-                    dataType: "number",
-                    props: {
-                        label: "dictValue",
-                        value: "dictKey",
-                    },
-                },
-                {
-                    hide: true,
-                    width: 160,
-                    label: "疾病名称",
-                    prop: "diseaseName"
+                    dicUrl: `/api/blade-system/region/getBaseTree`,
                 },
 
                 {
@@ -361,31 +282,79 @@
                 },
 
                 {
+                    label: "户籍地址",
+                    prop: "hukouRegistration",
                     hide: true,
-                    parent: false,
-                    width: 160,
-                    label: "籍贯地行政区划",
-                    prop: "nativePlaceAdcode",
-                    type: "tree",
+                },
+
+                {
+                    disabled: false,
+                    label: "居住地行政区划",
+                    prop: "homeAdcode",
+                    hide: true,
+                    type: 'select',
                     props: {
                         label: 'name',
-                        value: 'id'
+                        value: 'code'
                     },
-                    dicUrl: `/api/blade-system/region/getBaseTree`,
+                    dicUrl: `/api/blade-system/region/select?code=361102`,
+                },
+
+                {
+                    disabled: false,
+                    label: "现居住地址",
+                    prop: "currentAddress",
+                    hide: true,
+                },
+
+                {
+                    label: "婚姻状态",
+                    prop: "maritalStatus",
+                    type: "select",
+                    hide: true,
+                    dicUrl: "/api/blade-system/dict-biz/dictionary?code=marriageStatusType",
+                    dataType: "number",
+                    props: {
+                        label: "dictValue",
+                        value: "dictKey",
+                    },
+                },
+                {
+                    label: "车牌号",
+                    prop: "cardNumber",
+                    hide: true,
+                },
+                {
+                    label: "残疾证",
+                    prop: "disabilityCert",
+                    hide: true,
                 },
 
                 {
                     hide: true,
                     width: 160,
-                    label: "外出详址",
-                    prop: "goOutAddr"
+                    label: "宗教信仰",
+                    prop: "religiousBelief",
+                },
+                {
+                    hide: true,
+                    label: "健康状况",
+                    prop: "healthStatus",
+                    type: "select",
+                    dicUrl: "/api/blade-system/dict-biz/dictionary?code=healthStatus",
+                    dataType: "number",
+                    props: {
+                        label: "dictValue",
+                        value: "dictKey",
+                    },
                 },
                 {
                     hide: true,
                     width: 160,
-                    label: "外出去向",
-                    prop: "goOutWhere"
+                    label: "疾病名称",
+                    prop: "diseaseName"
                 },
+
                 {
                     hide: true,
                     width: 160,
@@ -398,18 +367,58 @@
                     label: "外出原因",
                     prop: "goOutReason"
                 },
+
+                {
+                    hide: true,
+                    width: 160,
+                    label: "外出去向",
+                    prop: "goOutWhere"
+                },
+
+                {
+                    hide: true,
+                    width: 160,
+                    label: "外出详址",
+                    prop: "goOutAddr"
+                },
+
+                {
+                    label: "工作状态",
+                    prop: "workStatus",
+                    type: "select",
+                    hide: true,
+                    dicUrl: "/api/blade-system/dict-biz/dictionary?code=workStatusType",
+                    dataType: "number",
+                    props: {
+                        label: "dictValue",
+                        value: "dictKey",
+                    },
+                },
+
+                {
+                    label: "就职单位",
+                    prop: "employer",
+                    hide: true,
+                },
+
                 {
                     hide: true,
                     width: 160,
                     label: "职业类别",
                     prop: "occupation"
                 },
+
                 {
                     hide: true,
                     width: 160,
                     label: "就职单位地址",
                     prop: "cmpyRegAddr"
                 },
+                {
+                    label: "其他联系方式",
+                    prop: "otherContact",
+                    hide: true,
+                },
                 ]
             },
             houseCode: "",

--
Gitblit v1.9.3