From ebfc739bdbbc0dd0fccd0bf47b7d2d5397c3c511 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 22 Mar 2024 12:44:21 +0800
Subject: [PATCH] 轮播图片

---
 src/views/userHouse/components/householdManager.vue |  117 +++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 67 insertions(+), 50 deletions(-)

diff --git a/src/views/userHouse/components/householdManager.vue b/src/views/userHouse/components/householdManager.vue
index c10ad49..ee5ba04 100644
--- a/src/views/userHouse/components/householdManager.vue
+++ b/src/views/userHouse/components/householdManager.vue
@@ -12,18 +12,6 @@
                             @click="handleDelete">删 除
                         </el-button>
                     </template>
-                    <template slot-scope="{row}" slot="tenantName">
-                        <el-tag>{{ row.tenantName }}</el-tag>
-                    </template>
-                    <template slot-scope="{row}" slot="roleName">
-                        <el-tag>{{ row.roleName }}</el-tag>
-                    </template>
-                    <template slot-scope="{row}" slot="deptName">
-                        <el-tag>{{ row.deptName }}</el-tag>
-                    </template>
-                    <template slot-scope="{row}" slot="userTypeName">
-                        <el-tag>{{ row.userTypeName }}</el-tag>
-                    </template>
                 </avue-crud>
             </basic-container>
         </el-col>
@@ -65,7 +53,7 @@
             var regIdCard = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/
 
             // 如果通过该验证,说明身份证格式正确,但准确性还需计算
-            if (regIdCard.test(value)) {
+            if (regIdCard.test(value) || value == '') {
                 if (value.length == 18) {
                     var idCardWi = new Array(7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10,
                         5, 8, 4, 2) // 将前17位加权因子保存在数组里
@@ -129,12 +117,15 @@
                 total: 0
             },
             option: {
-                labelWidth: 144,
+                labelWidth: 120,
+                searchLabelWidth: 96,
+                searchShow: true,
+                searchMenuSpan: 4,
+                menuWidth: 210,
+
                 height: 420,
                 calcHeight: 80,
                 tip: false,
-                searchShow: true,
-                searchMenuSpan: 6,
                 border: true,
                 index: true,
                 selection: true,
@@ -164,11 +155,12 @@
                     },
 
                     {
-                        width: 96,
+                        width: 110,
                         label: "姓名",
                         prop: "name",
+                        searchSpan: 4,
+                        searchLabelWidth: 66,
                         search: true,
-                        searchSpan: 3,
                         rules: [
                             {
                                 required: true,
@@ -192,12 +184,12 @@
                     },
 
                     {
-                        display: true,
                         width: 160,
+                        display: true,
                         label: "身份证号",
                         prop: "idCard",
                         search: true,
-                        searchSpan: 4,
+                        searchSpan: 5,
                         slot: true,
                         rules: [
                             {
@@ -208,14 +200,26 @@
                     },
 
                     {
+                        width: 160,
                         hide: true,
                         display: false,
-                        width: 160,
                         label: "证件号码",
                         prop: "cardNo",
                     },
 
+
                     {
+                        label: "出生日期",
+                        prop: "birthday",
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd",
+                        hide: true,
+                    },
+
+
+                    {
+                        width: 60,
                         label: "性别",
                         prop: "gender",
                         type: "select",
@@ -240,7 +244,7 @@
                         label: "手机号码",
                         prop: "phoneNumber",
                         search: true,
-                        searchSpan: 3,
+                        searchSpan: 5,
                         slot: true,
                         rules: [
                             {
@@ -253,6 +257,19 @@
                                 trigger: 'blur'
                             }
                         ],
+                    },
+
+                    {
+                        label: "居住情况",
+                        prop: "residentialStatus",
+                        type: "select",
+                        hide: true,
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=residentialStatusType",
+                        dataType: "number",
+                        props: {
+                            label: "dictValue",
+                            value: "dictKey",
+                        },
                     },
 
                     {
@@ -280,40 +297,19 @@
                         },
                     },
 
-
                     {
-                        label: "居住情况",
-                        prop: "residentialStatus",
-                        type: "select",
-                        hide: true,
-                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=residentialStatusType",
-                        dataType: "number",
-                        props: {
-                            label: "dictValue",
-                            value: "dictKey",
-                        },
-                    },
-
-                    {
-                        width: 142,
-                        label: "小区",
+                        width: 220,
+                        overHidden: true,
+                        label: '小区名称',
                         prop: "aoiName",
                         display: false
                     },
 
                     {
+                        overHidden: true,
                         label: "地址",
                         prop: "address",
                         display: false
-                    },
-
-                    {
-                        label: "生日",
-                        prop: "birthday",
-                        type: "date",
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd",
-                        hide: true,
                     },
 
                     {
@@ -488,6 +484,7 @@
                     },
 
                     {
+                        disabled: true,
                         hide: true,
                         width: 160,
                         label: "疾病名称",
@@ -528,6 +525,12 @@
                     {
                         label: "车牌号",
                         prop: "cardNumber",
+                        hide: true,
+                    },
+
+                    {
+                        label: "备注",
+                        prop: "remark",
                         hide: true,
                     },
                 ]
@@ -605,7 +608,6 @@
                     homeAdcodeColumn.disabled = false
                 }
             },
-            immediate: true
         },
 
         'form.cardType': {
@@ -628,8 +630,22 @@
                     cardNoColumn.display = true
                 }
             },
-            immediate: true
-        }
+        },
+
+        'form.healthStatus': {
+            handler (newData) {
+                let diseaseNameColumn = this.findObject(
+                    this.option.column,
+                    'diseaseName'
+                )
+
+                if (newData == 3) {
+                    diseaseNameColumn.disabled = false
+                } else {
+                    diseaseNameColumn.disabled = true
+                }
+            },
+        },
     },
     computed: {
         ...mapGetters(["userInfo", "permission"]),
@@ -789,6 +805,7 @@
         onLoad (page, params = {}) {
             params['houseCode'] = this.houseCode
             this.loading = true
+
             getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
                 const data = res.data.data
                 this.page.total = data.total

--
Gitblit v1.9.3