Merge remote-tracking branch 'origin/master'

lin

2024-03-11 18b8c4bc2f30fc59a47134cd7dae2fd35ce21294

 src/views/userHouse/hireInfoList.vue

@@ -14,6 +14,9 @@
                    </template>

                    <template slot="menuLeft">
                        <el-button type="primary" size="small" plain icon="el-icon-plus"
                            v-if="permission.houseRental_add" @click="showEditMoel(1)">新 增
                        </el-button>
                        <el-button type="danger" size="small" plain icon="el-icon-delete"
                            v-if="permission.houseRental_delete" @click="handleDelete">删 除
                        </el-button>
@@ -21,14 +24,20 @@
                    </template>

                    <template slot-scope="{row, size}" slot="menu">
                        <!-- <el-button type="text" :size="size" icon="el-icon-edit" v-if="permission.houseRental_edit"
                            @click="showEditMoel(row)">编 辑
                        </el-button> -->
                        <el-button type="text" :size="size" icon="el-icon-edit" v-if="permission.houseRental_edit"
                            @click="showEditMoel(2,row)">编 辑
                        </el-button>


                        <el-button :size="size" type="text" icon="el-icon-circle-plus-outline"
                            v-if="permission.househould_manager" @click="ManageTenants(row)">管理租户
                        </el-button>

                        <!-- <el-button :size="size" type="text" icon="el-icon-circle-plus-outline"
                             @click="ManageTenants(row)">管理租户
                        </el-button> -->


                        <!--  <el-button type="success" size="small" plain icon="el-icon-upload2" @click="handleImport">导入
            </el-button>
            <el-button type="warning" size="small" plain icon="el-icon-download" @click="handleExport">导出
@@ -227,21 +236,23 @@
                index: true,
                selection: true,
                viewBtn: true,
                addBtn: true,
                // editBtn: false,
                addBtn: false,
                editBtn: false,
                dialogType: 'drawer',
                dialogClickModal: false,
                column: [
                    {
                        label: "房屋",
                        prop: "houseName",
                        display: false
                        display: false,
                        width:120
                    },
                    {
                        label: "房屋",
                        prop: "houseCode",
                        hide: true,
                        type: "table",

                        children: {
                            border: true,
                            height: 400,
@@ -812,8 +823,13 @@
            })
        },

        showEditMoel(item) {
            this.$refs.RetalInfo.initOpen(item.id)
        showEditMoel(type,item) {
            if(type == 1){
                this.$refs.RetalInfo.initOpen(type)
            }else {
                this.$refs.RetalInfo.initOpen(type,item.id)
            }
            
        },
    }
}