Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

zhongrj

2024-01-06 bbff46e35d4314b95af6f0019773bc23f0e25c4b

 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>
@@ -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,9 +200,9 @@
                    },

                    {
                        width: 160,
                        hide: true,
                        display: false,
                        width: 160,
                        label: "证件号码",
                        prop: "cardNo",
                    },
@@ -227,6 +219,7 @@


                    {
                        width: 60,
                        label: "性别",
                        prop: "gender",
                        type: "select",
@@ -251,7 +244,7 @@
                        label: "手机号码",
                        prop: "phoneNumber",
                        search: true,
                        searchSpan: 3,
                        searchSpan: 5,
                        slot: true,
                        rules: [
                            {
@@ -313,6 +306,7 @@
                    },

                    {
                        overHidden: true,
                        label: "地址",
                        prop: "address",
                        display: false
@@ -805,6 +799,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