From 32a7e1f37b2637ff780d757f25fa097d215f6e11 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 22 Jan 2024 14:27:00 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web
---
src/views/userHouse/houseList.vue | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/views/userHouse/houseList.vue b/src/views/userHouse/houseList.vue
index 69c1039..7118fa2 100644
--- a/src/views/userHouse/houseList.vue
+++ b/src/views/userHouse/houseList.vue
@@ -8,23 +8,29 @@
@search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
@size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
<template slot="menuLeft">
- <el-button type="danger" size="small" plain icon="el-icon-delete" v-if="permission.user_delete"
+ <el-button type="danger" size="small" plain icon="el-icon-delete" v-if="permission.house_del"
@click="handleDelete">删 除
</el-button>
- <el-button type="success" size="small" plain v-if="userInfo.role_name.includes('admin')"
+ <!-- <el-button type="success" size="small" plain v-if="userInfo.role_name.includes('admin')"
icon="el-icon-upload2" @click="handleImport">导入
</el-button>
<el-button type="warning" size="small" plain v-if="userInfo.role_name.includes('admin')"
+ icon="el-icon-download" @click="handleExport">导出
+ </el-button> -->
+ <el-button type="success" size="small" plain v-if="permission.house_import"
+ icon="el-icon-upload2" @click="handleImport">导入
+ </el-button>
+ <el-button type="warning" size="small" plain v-if="permission.house_export"
icon="el-icon-download" @click="handleExport">导出
</el-button>
</template>
<template slot-scope="{row, size}" slot="menu">
<el-button :size="size" type="text" icon="el-icon-circle-plus-outline"
- v-if="permission.househould_manager" @click="handleHouseholdManager(row)">住户管理
+ v-if="permission.house_manager" @click="handleHouseholdManager(row)">住户管理
</el-button>
<el-button :size="size" type="text" icon="el-icon-circle-plus-outline"
- v-if="permission.househould_manager" @click="manageLabel(row)">标签
+ v-if="permission.house_tag" @click="manageLabel(row)">标签
</el-button>
</template>
@@ -305,7 +311,7 @@
label: "name",
value: "id",
},
- cascader: ["gridId"],
+ cascader: ["gridCode"],
rules: [
{
required: true,
@@ -333,12 +339,12 @@
{
hide: true,
label: "所属网格",
- prop: "gridId",
+ prop: "gridCode",
type: "tree",
cell: true,
props: {
label: "gridName",
- value: "id",
+ value: "gridCode",
},
dicUrl:
"/api/blade-grid/grid/getGridList?communityCode={{neiCode}}",
@@ -488,7 +494,7 @@
return {
addBtn: this.vaildData(this.permission.house_add, true),
viewBtn: this.vaildData(this.permission.house_view, true),
- delBtn: this.vaildData(this.permission.house_delete, true),
+ delBtn: this.vaildData(this.permission.house_del, true),
editBtn: this.vaildData(this.permission.house_edit, true)
}
},
--
Gitblit v1.9.3