From 536220a94cd58851eac815d59115df8ef9b8be96 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 17 Nov 2023 14:16:29 +0800
Subject: [PATCH] 住户，房屋，租赁管理页面完善
---
src/views/article/article.vue | 1
src/views/userHouse/hireInfoList.vue | 458 ++++++++++++++
src/views/userHouse/houseList.vue | 619 ------------------
src/views/grid/gridWorkLog/index.vue | 11
src/views/userHouse/houseHoldList-old.vue | 178 +++++
src/views/userHouse/houseHoldList.vue | 548 ++++++++++++-----
src/api/userHouse/list/houseRental.js | 61 +
7 files changed, 1,099 insertions(+), 777 deletions(-)
diff --git a/src/api/userHouse/list/houseRental.js b/src/api/userHouse/list/houseRental.js
new file mode 100644
index 0000000..6dd412e
--- /dev/null
+++ b/src/api/userHouse/list/houseRental.js
@@ -0,0 +1,61 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+ return request({
+ url: '/api/blade-houseRental/houseRental/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+
+export const getPageList = (current, size, params) => {
+ return request({
+ url: '/api/blade-houseRental/houseRental/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+
+export const remove = (ids) => {
+ return request({
+ url: '/api/blade-houseRental/houseRental/remove',
+ method: 'post',
+ params: {
+ ids,
+ }
+ })
+}
+
+export const add = (row) => {
+ return request({
+ url: '/api/blade-houseRental/houseRental/submit',
+ method: 'post',
+ data: row
+ })
+}
+
+export const update = (row) => {
+ return request({
+ url: '/api/blade-houseRental/houseRental/update',
+ method: 'post',
+ data: row
+ })
+}
+
+export const getDetatil = (id) => {
+ return request({
+ url: '/api/blade-houseRental/houseRental/detail',
+ method: 'get',
+ params: {
+ id
+ }
+ })
+}
diff --git a/src/views/article/article.vue b/src/views/article/article.vue
index e866784..679dade 100644
--- a/src/views/article/article.vue
+++ b/src/views/article/article.vue
@@ -82,7 +82,6 @@
<script>
import {getList, remove, update, add, getNotice, upcomment} from "@/api/article/article";
import {mapGetters} from "vuex";
- import userinfo from "@/views/system/userinfo";
export default {
data() {
diff --git a/src/views/grid/gridWorkLog/index.vue b/src/views/grid/gridWorkLog/index.vue
index d18d3cd..67071df 100644
--- a/src/views/grid/gridWorkLog/index.vue
+++ b/src/views/grid/gridWorkLog/index.vue
@@ -23,11 +23,10 @@
>
<template slot="menuLeft">
<el-button
-
size="small"
icon="el-icon-delete"
plain
- v-if="permission.article_delete"
+ v-if="permission.gridWorkLog_delete"
@click="handleDelete"
>删 除
</el-button>
@@ -143,10 +142,10 @@
...mapGetters(["permission","userInfo"]),
permissionList() {
return {
- addBtn: this.vaildData(this.permission.gridPatrolRecord_add, true),
- viewBtn: this.vaildData(this.permission.gridPatrolRecord_view, true),
- delBtn: this.vaildData(this.permission.gridPatrolRecord_delete, true),
- editBtn: this.vaildData(this.permission.gridPatrolRecord_edit, true),
+ addBtn: this.vaildData(this.permission.gridWorkLog_add, true),
+ viewBtn: this.vaildData(this.permission.gridWorkLog_view, true),
+ delBtn: this.vaildData(this.permission.gridWorkLog_delete, true),
+ editBtn: this.vaildData(this.permission.gridWorkLog_edit, true),
};
},
ids() {
diff --git a/src/views/userHouse/hireInfoList.vue b/src/views/userHouse/hireInfoList.vue
index 621df04..5129d2c 100644
--- a/src/views/userHouse/hireInfoList.vue
+++ b/src/views/userHouse/hireInfoList.vue
@@ -1,11 +1,463 @@
<template>
- <div id="">
-141414
- </div>
+ <el-row>
+ <el-col :span="24">
+ <basic-container>
+ <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud" v-model="form"
+ :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
+ :before-open="beforeOpen" :page.sync="page" @search-change="searchChange" @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"
+ @click="handleDelete">删 除
+ </el-button>
+ <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>
+ </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>
+ <el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px">
+
+ <el-tree :data="roleGrantList" show-checkbox check-strictly default-expand-all node-key="id" ref="treeRole"
+ :default-checked-keys="roleTreeObj" :props="props">
+ </el-tree>
+
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="roleBox = false">取 消</el-button>
+ <el-button type="primary" @click="submitRole">确 定</el-button>
+ </span>
+ </el-dialog>
+ <el-dialog title="用户数据导入" append-to-body :visible.sync="excelBox" width="555px">
+ <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
+ <template slot="excelTemplate">
+ <el-button type="primary" @click="handleTemplate">
+ 点击下载<i class="el-icon-download el-icon--right"></i>
+ </el-button>
+ </template>
+ </avue-form>
+ </el-dialog>
+ </basic-container>
+ </el-col>
+ </el-row>
</template>
<script>
+import {
+ getList,
+ getPageList,
+ remove,
+ add,
+ update,
+ getDetatil
+} from "@/api/userHouse/list/houseRental.js";
+import {
+ exportBlob
+} from "@/api/common";
+import {
+ mapGetters
+} from "vuex";
+import {
+ getToken
+} from '@/util/auth';
+import {
+ downloadXls
+} from "@/util/util";
+import {
+ dateNow
+} from "@/util/date";
+import NProgress from 'nprogress';
+import 'nprogress/nprogress.css';
+import func from "@/util/func";
+
+export default {
+ data() {
+ return {
+ form: {},
+ search: {},
+ excelBox: false,
+ selectionList: [],
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0
+ },
+ option: {
+ height: 'auto',
+ calcHeight: 80,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ border: true,
+ index: true,
+ selection: true,
+ viewBtn: true,
+ addBtn:true,
+ dialogType: 'drawer',
+ dialogClickModal: false,
+ column: [{
+ label: "房屋",
+ prop: "address",
+ display: false
+ },
+ {
+ label: "关系",
+ prop: "tenantRelationship",
+ search: true,
+ searchSpan: 4,
+ width: 100,
+ type: "select",
+ dicData: [
+ {
+ label: "同一户",
+ value: 1
+ },
+ {
+ label: "不同一户",
+ value: 2
+ }
+ ],
+ },
+ {
+ label: "房屋状态",
+ prop: "houseStatus",
+ search: true,
+ searchSpan: 4,
+ width: 100,
+ type: "select",
+ dicData: [
+ {
+ label: "部分出租",
+ value: 1
+ },
+ {
+ label: "全部出租",
+ value: 2
+ }
+ ],
+ },
+ {
+ label: "租房时间",
+ prop: "rentalTime",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ width: 100,
+ },
+ {
+ label: "到期时间",
+ prop: "dueTime",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ width: 100
+ },
+ {
+ label: "用途",
+ prop: "rentalUse",
+ type: "select",
+ search: true,
+ searchSpan: 3,
+ dataType: "number",
+ width: 100,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=rentalUseType",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ }
+ },
+ {
+ label: "租赁期限",
+ prop: "dldType",
+ width: 100,
+ display: false,
+ search: true,
+ searchSpan: 3,
+ type: "select",
+ dicData: [
+ {
+ label: "长期",
+ value: 1
+ },
+ {
+ label: "中期",
+ value: 2
+ },
+ {
+ label: "短期",
+ value: 3
+ }
+ ],
+ },
+ {
+ label: "审核状态",
+ prop: "auditStatus",
+ type: "select",
+ width: 80,
+ search: true,
+ searchSpan: 4,
+ display: false,
+ dicData: [
+ {
+ label: "已确认",
+ value: 1
+ },
+ {
+ label: "待确认",
+ value: 0
+ }
+ ],
+ },
+ {
+ label: "创建时间",
+ prop: "createTime",
+ display: false,
+ width: 160,
+ },
+ ]
+ },
+ data: [],
+
+ excelForm: {},
+ excelOption: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [{
+ label: '模板上传',
+ prop: 'excelFile',
+ type: 'upload',
+ drag: true,
+ loadText: '模板上传中，请稍等',
+ span: 24,
+ propsHttp: {
+ res: 'data'
+ },
+ tip: '请上传 .xls,.xlsx 标准格式文件',
+ action: "/api/blade-system/user/import-user"
+ },
+ {
+ label: "数据覆盖",
+ prop: "isCovered",
+ type: "switch",
+ align: "center",
+ width: 80,
+ dicData: [{
+ label: "否",
+ value: 0
+ },
+ {
+ label: "是",
+ value: 1
+ }
+ ],
+ value: 0,
+ slot: true,
+ rules: [{
+ required: true,
+ message: "请选择是否覆盖",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: '模板下载',
+ prop: 'excelTemplate',
+ formslot: true,
+ span: 24,
+ }
+ ]
+ }
+ };
+ },
+ watch: {
+ },
+ computed: {
+ ...mapGetters(["userInfo", "permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.household_add, false),
+ viewBtn: this.vaildData(this.permission.household_view, false),
+ delBtn: this.vaildData(this.permission.household_delete, false),
+ editBtn: this.vaildData(this.permission.household_edit, false)
+ };
+ }
+ },
+ mounted() {
+ },
+ methods: {
+ rowSave(row, done, loading) {
+ add(row).then(() => {
+ this.initFlag = false;
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ done();
+ }, error => {
+ window.console.log(error);
+ loading();
+ });
+ },
+ rowUpdate(row, index, done, loading) {
+ update(row).then(() => {
+ this.initFlag = false;
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ done();
+ }, error => {
+ window.console.log(error);
+ loading();
+ });
+ },
+ rowDel(row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ return remove(row.id);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ });
+ },
+ searchReset() {
+ this.query = {};
+ this.treeDeptId = '';
+ this.onLoad(this.page);
+ },
+ searchChange(params, done) {
+ this.query = params;
+ this.page.currentPage = 1;
+ this.onLoad(this.page, params);
+ done();
+ },
+ selectionChange(list) {
+ this.selectionList = list;
+ },
+ selectionClear() {
+ this.selectionList = [];
+ // this.$refs.crud.toggleSelection();
+ },
+ handleDelete() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据");
+ return;
+ }
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ return remove(this.ids);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ this.$refs.crud.toggleSelection();
+ });
+ },
+ handleImport() {
+ this.excelBox = true;
+ },
+ uploadAfter(res, done, loading, column) {
+ window.console.log(column);
+ this.excelBox = false;
+ this.refreshChange();
+ done();
+ },
+ handleExport() {
+ const account = func.toStr(this.search.account);
+ const realName = func.toStr(this.search.realName);
+ this.$confirm("是否导出用户数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ NProgress.start();
+ exportBlob(
+ `/api/blade-system/user/export-user?${this.website.tokenHeader}=${getToken()}&account=${account}&realName=${realName}`
+ ).then(res => {
+ downloadXls(res.data, `用户数据表${dateNow()}.xlsx`);
+ NProgress.done();
+ })
+ });
+ },
+ handleTemplate() {
+ exportBlob(`/api/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
+ downloadXls(res.data, "用户数据模板.xlsx");
+ })
+ },
+ beforeOpen(done, type) {
+ if (["edit", "view"].includes(type)) {
+ getDetatil(this.form.id).then(res => {
+ this.form = res.data.data;
+ });
+ }
+ this.initFlag = true;
+ done();
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage;
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
+ onLoad(page, params = {}) {
+ this.loading = true;
+ getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ this.loading = false;
+ this.selectionClear();
+ });
+ }
+ }
+};
</script>
<style>
+.box {
+ height: 800px;
+}
+
+.el-scrollbar {
+ height: 100%;
+}
+
+.box .el-scrollbar__wrap {
+ overflow: scroll;
+}
</style>
diff --git a/src/views/userHouse/houseHoldList-old.vue b/src/views/userHouse/houseHoldList-old.vue
new file mode 100644
index 0000000..da17cae
--- /dev/null
+++ b/src/views/userHouse/houseHoldList-old.vue
@@ -0,0 +1,178 @@
+<template>
+
+ <div id="">
+ <el-card>
+ <el-form :inline="true" :model="formInline" class="demo-form-inline">
+ <el-row>
+ <el-col :span="4">
+ <el-form-item label="区域">
+ <el-cascader :options="options">
+ <template slot-scope="{ node, data }">
+ <span>{{ data.label }}</span>
+ <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+ </template>
+ </el-cascader>
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="4">
+ <el-form-item label="姓名">
+ <el-input v-model="input" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="4">
+ <el-form-item label="身份证">
+ <el-input v-model="input" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="4">
+ <el-form-item label="手机">
+ <el-input v-model="input" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="4">
+ <el-form-item label="懂">
+ <el-input v-model="input" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <el-row>
+ <el-col span="5">
+ <el-form-item label="党员">
+ <el-cascader :options="options">
+ <template slot-scope="{ node, data }">
+ <span>{{ data.label }}</span>
+ <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+ </template>
+ </el-cascader>
+ </el-form-item>
+ </el-col>
+
+ <el-col span="5">
+ <el-form-item label="标签">
+ <el-cascader :options="options">
+ <template slot-scope="{ node, data }">
+ <span>{{ data.label }}</span>
+ <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+ </template>
+ </el-cascader>
+ </el-form-item>
+ </el-col>
+
+ <el-col span="2">
+ <el-button type="primary">导出数据<i class="el-icon-download el-icon--right"></i></el-button>
+ </el-col>
+ </el-row>
+
+ </el-form>
+
+ </el-card>
+
+ <el-card>
+ <div id="">
+ <el-table max-height="590" :data="tableData.data" border style="width: 100%"
+ @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55">
+ </el-table-column>
+ <el-table-column fixed prop="id" label="ID" width="150">
+ </el-table-column>
+ <el-table-column prop="name" label="姓名" width="120">
+ </el-table-column>
+ <el-table-column prop="idCard" label="身份证号" width="220">
+ </el-table-column>
+ <el-table-column prop="phoneNumber" label="电话" width="120">
+ </el-table-column>
+ <el-table-column prop="gender" label="性别" width="120">
+ </el-table-column>
+ <el-table-column prop="relationship" label="关系" width="120">
+ </el-table-column>
+ <el-table-column prop="zip" label="小区" width="120">
+ </el-table-column>
+ <el-table-column prop="currentAddress" label="地址" width="120">
+ </el-table-column>
+ <el-table-column fixed="right" label="操作" width="300">
+ <template slot-scope="scope">
+ <el-button @click="handleClick(scope.row)" type="primary" size="small">同屋住户</el-button>
+ <el-button type="primary" size="small">编辑</el-button>
+ <el-button type="primary" size="small">标签</el-button>
+ <el-button type="danger" size="small">删除</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-card>
+
+ <div id="" style="margin-bottom: 50px;">
+ <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+ :current-page="tableFrom.current" :page-sizes="[10, 20, 30, 40]" :page-size="tableFrom.size"
+ layout="total, sizes, prev, pager, next, jumper" :total="tableData.total">
+ </el-pagination>
+ </div>
+
+ </div>
+</template>
+
+<script>
+ import {
+ getList,
+ getPageList,
+ remove,
+ add,
+ update,
+ getDetatil,
+ saveOrUpdateHouseLabel
+ } from "@/api/userHouse/list/houseHold.js";
+ export default {
+ data() {
+ return {
+ tableFrom: {
+ current: 1,
+ size: 10
+ },
+ tableData: {
+ data: [],
+ total: '',
+ }
+ }
+ },
+ created() {
+ this.getUserHouseList()
+ },
+
+ methods: {
+ handleSelectionChange(val) {
+ this.multipleSelection = val;
+ },
+ handleSizeChange(val) {
+ this.tableFrom.size = val
+ this.getUserHouseList()
+ console.log(`每页 ${val} 条`);
+ },
+ handleCurrentChange(val) {
+ this.tableFrom.current = val
+ this.getUserHouseList()
+ console.log(`当前页: ${val}`);
+ },
+
+ getUserHouseList() {
+ // console.log("*************************");
+ getList(this.tableFrom.current, this.tableFrom.size, this.tableFrom).then((res) => {
+ const data = res.data.data;
+ this.tableData.total = data.total;
+ this.tableData.data = data.records;
+ });
+ },
+
+ handleClick(row) {
+ console.log(row);
+ }
+ },
+ }
+</script>
+
+<style>
+</style>
diff --git a/src/views/userHouse/houseHoldList.vue b/src/views/userHouse/houseHoldList.vue
index da17cae..4e31179 100644
--- a/src/views/userHouse/houseHoldList.vue
+++ b/src/views/userHouse/houseHoldList.vue
@@ -1,178 +1,404 @@
<template>
+ <el-row>
+ <el-col :span="24">
+ <basic-container>
+ <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud" v-model="form"
+ :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
+ :before-open="beforeOpen" :page.sync="page" @search-change="searchChange" @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.household_delete"
+ @click="handleDelete">删 除
+ </el-button>
+ <el-button type="success" size="small" plain v-if="this.permission.household_import"
+ icon="el-icon-upload2" @click="handleImport">导入
+ </el-button>
+ <el-button type="warning" size="small" plain v-if="this.permission.household_export"
+ icon="el-icon-download" @click="handleExport">导出
+ </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>
+ <el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px">
- <div id="">
- <el-card>
- <el-form :inline="true" :model="formInline" class="demo-form-inline">
- <el-row>
- <el-col :span="4">
- <el-form-item label="区域">
- <el-cascader :options="options">
- <template slot-scope="{ node, data }">
- <span>{{ data.label }}</span>
- <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
- </template>
- </el-cascader>
- </el-form-item>
- </el-col>
+ <el-tree :data="roleGrantList" show-checkbox check-strictly default-expand-all node-key="id" ref="treeRole"
+ :default-checked-keys="roleTreeObj" :props="props">
+ </el-tree>
- <el-col :span="4">
- <el-form-item label="姓名">
- <el-input v-model="input" placeholder="请输入内容"></el-input>
- </el-form-item>
- </el-col>
-
- <el-col :span="4">
- <el-form-item label="身份证">
- <el-input v-model="input" placeholder="请输入内容"></el-input>
- </el-form-item>
- </el-col>
-
- <el-col :span="4">
- <el-form-item label="手机">
- <el-input v-model="input" placeholder="请输入内容"></el-input>
- </el-form-item>
- </el-col>
-
- <el-col :span="4">
- <el-form-item label="懂">
- <el-input v-model="input" placeholder="请输入内容"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
-
- <el-row>
- <el-col span="5">
- <el-form-item label="党员">
- <el-cascader :options="options">
- <template slot-scope="{ node, data }">
- <span>{{ data.label }}</span>
- <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
- </template>
- </el-cascader>
- </el-form-item>
- </el-col>
-
- <el-col span="5">
- <el-form-item label="标签">
- <el-cascader :options="options">
- <template slot-scope="{ node, data }">
- <span>{{ data.label }}</span>
- <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
- </template>
- </el-cascader>
- </el-form-item>
- </el-col>
-
- <el-col span="2">
- <el-button type="primary">导出数据<i class="el-icon-download el-icon--right"></i></el-button>
- </el-col>
- </el-row>
-
- </el-form>
-
- </el-card>
-
- <el-card>
- <div id="">
- <el-table max-height="590" :data="tableData.data" border style="width: 100%"
- @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55">
- </el-table-column>
- <el-table-column fixed prop="id" label="ID" width="150">
- </el-table-column>
- <el-table-column prop="name" label="姓名" width="120">
- </el-table-column>
- <el-table-column prop="idCard" label="身份证号" width="220">
- </el-table-column>
- <el-table-column prop="phoneNumber" label="电话" width="120">
- </el-table-column>
- <el-table-column prop="gender" label="性别" width="120">
- </el-table-column>
- <el-table-column prop="relationship" label="关系" width="120">
- </el-table-column>
- <el-table-column prop="zip" label="小区" width="120">
- </el-table-column>
- <el-table-column prop="currentAddress" label="地址" width="120">
- </el-table-column>
- <el-table-column fixed="right" label="操作" width="300">
- <template slot-scope="scope">
- <el-button @click="handleClick(scope.row)" type="primary" size="small">同屋住户</el-button>
- <el-button type="primary" size="small">编辑</el-button>
- <el-button type="primary" size="small">标签</el-button>
- <el-button type="danger" size="small">删除</el-button>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="roleBox = false">取 消</el-button>
+ <el-button type="primary" @click="submitRole">确 定</el-button>
+ </span>
+ </el-dialog>
+ <el-dialog title="用户数据导入" append-to-body :visible.sync="excelBox" width="555px">
+ <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
+ <template slot="excelTemplate">
+ <el-button type="primary" @click="handleTemplate">
+ 点击下载<i class="el-icon-download el-icon--right"></i>
+ </el-button>
</template>
- </el-table-column>
- </el-table>
- </div>
- </el-card>
-
- <div id="" style="margin-bottom: 50px;">
- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
- :current-page="tableFrom.current" :page-sizes="[10, 20, 30, 40]" :page-size="tableFrom.size"
- layout="total, sizes, prev, pager, next, jumper" :total="tableData.total">
- </el-pagination>
- </div>
-
- </div>
+ </avue-form>
+ </el-dialog>
+ </basic-container>
+ </el-col>
+ </el-row>
</template>
<script>
- import {
- getList,
- getPageList,
- remove,
- add,
- update,
- getDetatil,
- saveOrUpdateHouseLabel
- } from "@/api/userHouse/list/houseHold.js";
- export default {
- data() {
- return {
- tableFrom: {
- current: 1,
- size: 10
+import {
+ getList,
+ getPageList,
+ remove,
+ add,
+ update,
+ getDetatil,
+ saveOrUpdateHouseLabel
+} from "@/api/userHouse/list/houseHold.js";
+import {
+ exportBlob
+} from "@/api/common";
+import {
+ mapGetters
+} from "vuex";
+import {
+ getToken
+} from '@/util/auth';
+import {
+ downloadXls
+} from "@/util/util";
+import {
+ dateNow
+} from "@/util/date";
+import NProgress from 'nprogress';
+import 'nprogress/nprogress.css';
+import func from "@/util/func";
+
+export default {
+ data() {
+ return {
+ form: {},
+ search: {},
+ excelBox: false,
+ selectionList: [],
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0
+ },
+ option: {
+ height: 'auto',
+ calcHeight: 80,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ border: true,
+ index: true,
+ selection: true,
+ viewBtn: true,
+ addBtn:true,
+ dialogType: 'drawer',
+ dialogClickModal: false,
+ column: [{
+ label: "姓名",
+ prop: "name",
+ search: true,
+ searchSpan: 4,
},
- tableData: {
- data: [],
- total: '',
+ {
+ label: "电话",
+ prop: "phoneNumber",
+ search: true,
+ searchSpan: 4,
+ },
+ {
+ label: "身份证号",
+ prop: "idCard",
+ search: true,
+ searchSpan: 4,
+ },
+ {
+ label: "性别",
+ prop: "gender",
+ type: "select",
+ dicData: [
+ {
+ label: "男",
+ value: 1
+ },
+ {
+ label: "女",
+ value: 0
+ },
+ {
+ label: "未知",
+ value: 1
+ }
+ ],
+ },
+ {
+ label: "关系",
+ prop: "relationship",
+ type:"select",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=roleRelation",
+ dataType: "number",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ },
+ {
+ label: "小区",
+ prop: "aoiName",
+ search: true,
+ searchSpan: 4,
+ },
+ {
+ label: "地址",
+ prop: "address",
+ display: false
+ },
+ ]
+ },
+ data: [],
+
+ excelForm: {},
+ excelOption: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [{
+ label: '模板上传',
+ prop: 'excelFile',
+ type: 'upload',
+ drag: true,
+ loadText: '模板上传中，请稍等',
+ span: 24,
+ propsHttp: {
+ res: 'data'
+ },
+ tip: '请上传 .xls,.xlsx 标准格式文件',
+ action: "/api/blade-system/user/import-user"
+ },
+ {
+ label: "数据覆盖",
+ prop: "isCovered",
+ type: "switch",
+ align: "center",
+ width: 80,
+ dicData: [{
+ label: "否",
+ value: 0
+ },
+ {
+ label: "是",
+ value: 1
+ }
+ ],
+ value: 0,
+ slot: true,
+ rules: [{
+ required: true,
+ message: "请选择是否覆盖",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: '模板下载',
+ prop: 'excelTemplate',
+ formslot: true,
+ span: 24,
}
+ ]
}
- },
- created() {
- this.getUserHouseList()
- },
-
- methods: {
- handleSelectionChange(val) {
- this.multipleSelection = val;
- },
- handleSizeChange(val) {
- this.tableFrom.size = val
- this.getUserHouseList()
- console.log(`每页 ${val} 条`);
- },
- handleCurrentChange(val) {
- this.tableFrom.current = val
- this.getUserHouseList()
- console.log(`当前页: ${val}`);
- },
-
- getUserHouseList() {
- // console.log("*************************");
- getList(this.tableFrom.current, this.tableFrom.size, this.tableFrom).then((res) => {
- const data = res.data.data;
- this.tableData.total = data.total;
- this.tableData.data = data.records;
+ };
+ },
+ watch: {
+ },
+ computed: {
+ ...mapGetters(["userInfo", "permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.household_add, true),
+ viewBtn: this.vaildData(this.permission.household_view, true),
+ delBtn: this.vaildData(this.permission.household_delete, true),
+ editBtn: this.vaildData(this.permission.household_edit, true)
+ };
+ }
+ },
+ mounted() {
+ },
+ methods: {
+ rowSave(row, done, loading) {
+ add(row).then(() => {
+ this.initFlag = false;
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
});
- },
-
- handleClick(row) {
- console.log(row);
- }
+ done();
+ }, error => {
+ window.console.log(error);
+ loading();
+ });
},
+ rowUpdate(row, index, done, loading) {
+ update(row).then(() => {
+ this.initFlag = false;
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ done();
+ }, error => {
+ window.console.log(error);
+ loading();
+ });
+ },
+ rowDel(row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ return remove(row.id);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ });
+ },
+ searchReset() {
+ this.query = {};
+ this.treeDeptId = '';
+ this.onLoad(this.page);
+ },
+ searchChange(params, done) {
+ this.query = params;
+ this.page.currentPage = 1;
+ this.onLoad(this.page, params);
+ done();
+ },
+ selectionChange(list) {
+ this.selectionList = list;
+ },
+ selectionClear() {
+ this.selectionList = [];
+ // this.$refs.crud.toggleSelection();
+ },
+ handleDelete() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据");
+ return;
+ }
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ return remove(this.ids);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ this.$refs.crud.toggleSelection();
+ });
+ },
+ handleImport() {
+ this.excelBox = true;
+ },
+ uploadAfter(res, done, loading, column) {
+ window.console.log(column);
+ this.excelBox = false;
+ this.refreshChange();
+ done();
+ },
+ handleExport() {
+ const account = func.toStr(this.search.account);
+ const realName = func.toStr(this.search.realName);
+ this.$confirm("是否导出用户数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ NProgress.start();
+ exportBlob(
+ `/api/blade-system/user/export-user?${this.website.tokenHeader}=${getToken()}&account=${account}&realName=${realName}`
+ ).then(res => {
+ downloadXls(res.data, `用户数据表${dateNow()}.xlsx`);
+ NProgress.done();
+ })
+ });
+ },
+ handleTemplate() {
+ exportBlob(`/api/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
+ downloadXls(res.data, "用户数据模板.xlsx");
+ })
+ },
+ beforeOpen(done, type) {
+ if (["edit", "view"].includes(type)) {
+ getDetatil(this.form.id).then(res => {
+ this.form = res.data.data;
+ });
+ }
+ this.initFlag = true;
+ done();
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage;
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
+ onLoad(page, params = {}) {
+ this.loading = true;
+ getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ this.loading = false;
+ this.selectionClear();
+ });
+ }
}
+};
</script>
<style>
+.box {
+ height: 800px;
+}
+
+.el-scrollbar {
+ height: 100%;
+}
+
+.box .el-scrollbar__wrap {
+ overflow: scroll;
+}
</style>
diff --git a/src/views/userHouse/houseList.vue b/src/views/userHouse/houseList.vue
index 6e994c1..ec55cab 100644
--- a/src/views/userHouse/houseList.vue
+++ b/src/views/userHouse/houseList.vue
@@ -11,15 +11,6 @@
<el-button type="danger" size="small" plain icon="el-icon-delete" v-if="permission.user_delete"
@click="handleDelete">删 除
</el-button>
- <el-button type="info" size="small" plain v-if="permission.user_role" icon="el-icon-user"
- @click="handleGrant">角色配置
- </el-button>
- <el-button type="info" size="small" plain v-if="permission.user_reset" icon="el-icon-refresh"
- @click="handleReset">密码重置
- </el-button>
- <el-button type="info" size="small" plain v-if="userInfo.role_name.includes('admin')"
- icon="el-icon-coordinate" @click="handleLock">账号解封
- </el-button>
<el-button type="success" size="small" plain v-if="userInfo.role_name.includes('admin')"
icon="el-icon-upload2" @click="handleImport">导入
</el-button>
@@ -79,16 +70,6 @@
exportBlob
} from "@/api/common";
import {
- getDeptTree,
- getDeptLazyTree
- } from "@/api/system/dept";
- import {
- getRoleTree
- } from "@/api/system/role";
- import {
- getPostList
- } from "@/api/system/post";
- import {
mapGetters
} from "vuex";
import website from '@/config/website';
@@ -107,78 +88,17 @@
export default {
data() {
- const validatePass = (rule, value, callback) => {
- if (value === '') {
- callback(new Error('请输入密码'));
- } else {
- callback();
- }
- };
- const validatePass2 = (rule, value, callback) => {
- if (value === '') {
- callback(new Error('请再次输入密码'));
- } else if (value !== this.form.password) {
- callback(new Error('两次输入密码不一致!'));
- } else {
- callback();
- }
- };
return {
form: {},
search: {},
- roleBox: false,
excelBox: false,
- platformBox: false,
- initFlag: true,
selectionList: [],
query: {},
loading: true,
- platformLoading: false,
page: {
pageSize: 10,
currentPage: 1,
total: 0
- },
- platformPage: {
- pageSize: 10,
- currentPage: 1,
- total: 0
- },
- init: {
- roleTree: [],
- deptTree: [],
- },
- props: {
- label: "title",
- value: "key"
- },
- roleGrantList: [],
- roleTreeObj: [],
- treeDeptId: '',
- treeData: [],
- treeOption: {
- nodeKey: 'id',
- lazy: true,
- treeLoad: function(node, resolve) {
- const parentId = (node.level === 0) ? 0 : node.data.id;
- getDeptLazyTree(parentId).then(res => {
- resolve(res.data.data.map(item => {
- return {
- ...item,
- leaf: !item.hasChildren
- }
- }))
- });
- },
- addBtn: false,
- menu: false,
- size: 'small',
- props: {
- labelText: '标题',
- label: 'title',
- value: 'value',
- children: 'children'
- }
},
option: {
height: 'auto',
@@ -195,361 +115,44 @@
column: [{
label: "房屋编号",
prop: "houseCode",
- search: true,
+ width:180,
+ hide:true,
+ disabled:true,
+ },
+ {
+ label: "地址",
+ prop: "address",
+ width:180,
display: false
},
{
label: "小区",
prop: "districtName",
search: true,
- display: false
},
{
label: "楼层",
prop: "floor",
- slot: true,
- display: false
},
{
label: "手机",
prop: "phone",
- slot: true,
- display: false
},
{
label: "服务到期",
prop: "serviceDue",
- slot: true,
- display: false
},
{
label: "物业费",
prop: "propertyPrice",
- slot: true,
- display: false
},
{
label: "面积",
prop: "area",
- slot: true,
- display: false
- },
- // {
- // label: "所属部门",
- // prop: "deptName",
- // slot: true,
- // display: false
- // },
- // {
- // label: "用户平台",
- // prop: "userTypeName",
- // slot: true,
- // display: false
- // },
- // {
- // label: "用户平台",
- // type: "select",
- // dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
- // props: {
- // label: "dictValue",
- // value: "dictKey"
- // },
- // dataType: "number",
- // search: true,
- // hide: true,
- // display: false,
- // prop: "userType",
- // rules: [{
- // required: true,
- // message: "请选择用户平台",
- // trigger: "blur"
- // }]
- // },
- ],
- group: [{
- label: '基础信息',
- prop: 'baseInfo',
- icon: 'el-icon-user-solid',
- column: [
- // {
- // label: "所属租户",
- // prop: "tenantId",
- // type: "tree",
- // dicUrl: "/api/blade-system/tenant/select",
- // props: {
- // label: "tenantName",
- // value: "tenantId"
- // },
- // hide: !website.tenantMode,
- // addDisplay: website.tenantMode,
- // editDisplay: website.tenantMode,
- // viewDisplay: website.tenantMode,
- // rules: [{
- // required: true,
- // message: "请输入所属租户",
- // trigger: "click"
- // }],
- // span: 24,
- // },
- {
- label: "登录账号3",
- prop: "account",
- rules: [{
- required: true,
- message: "请输入登录账号",
- trigger: "blur"
- }],
- },
- // {
- // label: "用户平台",
- // type: "select",
- // dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
- // props: {
- // label: "dictValue",
- // value: "dictKey"
- // },
- // dataType: "number",
- // slot: true,
- // prop: "userType",
- // rules: [{
- // required: true,
- // message: "请选择用户平台",
- // trigger: "blur"
- // }]
- // },
- {
- label: '密码',
- prop: 'password',
- hide: true,
- editDisplay: false,
- viewDisplay: false,
- rules: [{
- required: true,
- validator: validatePass,
- trigger: 'blur'
- }]
- },
- {
- label: '确认密码',
- prop: 'password2',
- hide: true,
- editDisplay: false,
- viewDisplay: false,
- rules: [{
- required: true,
- validator: validatePass2,
- trigger: 'blur'
- }]
- },
- ]
- },
- {
- label: '详细信息',
- prop: 'detailInfo',
- icon: 'el-icon-s-order',
- column: [{
- label: "用户昵称",
- prop: "name",
- hide: true,
- rules: [{
- required: true,
- message: "请输入用户昵称",
- trigger: "blur"
- }]
- },
- {
- label: "用户姓名",
- prop: "realName",
- rules: [{
- required: true,
- message: "请输入用户姓名",
- trigger: "blur"
- }, {
- min: 2,
- max: 5,
- message: '姓名长度在2到5个字符'
- }]
- },
- {
- label: "手机号码",
- prop: "phone",
- overHidden: true
- },
- {
- label: "电子邮箱",
- prop: "email",
- hide: true,
- overHidden: true
- },
- {
- label: "用户性别",
- prop: "sex",
- type: "select",
- dicData: [{
- label: "男",
- value: 1
- },
- {
- label: "女",
- value: 2
- },
- {
- label: "未知",
- value: 3
- }
- ],
- hide: true
- },
- {
- label: "用户生日",
- type: "date",
- prop: "birthday",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "yyyy-MM-dd hh:mm:ss",
- hide: true
- },
- {
- label: "账号状态",
- prop: "statusName",
- hide: true,
- display: false
- }
- ]
- },
- {
- label: '职责信息',
- prop: 'dutyInfo',
- icon: 'el-icon-s-custom',
- column: [
- // {
- // label: "用户编号",
- // prop: "code",
- // },
- {
- label: "所属角色",
- prop: "roleId",
- multiple: true,
- type: "tree",
- dicData: [],
- props: {
- label: "title"
- },
- checkStrictly: true,
- slot: true,
- rules: [{
- required: true,
- message: "请选择所属角色",
- trigger: "click"
- }]
- },
- // {
- // label: "所属部门",
- // prop: "deptId",
- // type: "tree",
- // multiple: true,
- // dicData: [],
- // props: {
- // label: "title"
- // },
- // checkStrictly: true,
- // slot: true,
- // rules: [{
- // required: true,
- // message: "请选择所属部门",
- // trigger: "click"
- // }]
- // },
- // {
- // label: "所属岗位",
- // prop: "postId",
- // type: "tree",
- // multiple: true,
- // dicData: [],
- // props: {
- // label: "postName",
- // value: "id"
- // },
- // rules: [{
- // required: true,
- // message: "请选择所属岗位",
- // trigger: "click"
- // }],
- // },
- ]
},
]
},
data: [],
- platformQuery: {},
- platformSelectionList: [],
- platformData: [],
- platformForm: {},
- platformOption: {
- tip: false,
- searchShow: true,
- searchMenuSpan: 6,
- border: true,
- index: true,
- selection: true,
- viewBtn: true,
- dialogClickModal: false,
- menuWidth: 120,
- editBtnText: '配置',
- column: [{
- label: "登录账号",
- prop: "account",
- search: true,
- display: false
- },
- {
- label: "所属租户",
- prop: "tenantName",
- slot: true,
- display: false
- },
- {
- label: "用户姓名",
- prop: "realName",
- search: true,
- display: false
- },
- {
- label: "用户平台",
- prop: "userTypeName",
- slot: true,
- display: false
- },
- {
- label: "用户平台",
- type: "select",
- dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- search: true,
- hide: true,
- display: false,
- prop: "userType",
- rules: [{
- required: true,
- message: "请选择用户平台",
- trigger: "blur"
- }]
- },
- {
- label: "用户拓展",
- prop: "userExt",
- type: "textarea",
- minRows: 8,
- span: 24,
- overHidden: true,
- row: true,
- hide: true,
- },
- ],
- },
excelForm: {},
excelOption: {
submitBtn: false,
@@ -601,88 +204,22 @@
};
},
watch: {
- 'form.tenantId'() {
- if (this.form.tenantId !== '' && this.initFlag) {
- this.initData(this.form.tenantId);
- }
- },
- 'excelForm.isCovered'() {
- if (this.excelForm.isCovered !== '') {
- const column = this.findObject(this.excelOption.column, "excelFile");
- column.action = `/api/blade-system/user/import-user?isCovered=${this.excelForm.isCovered}`;
- }
- }
},
computed: {
...mapGetters(["userInfo", "permission"]),
permissionList() {
return {
addBtn: this.vaildData(this.permission.user_add, false),
- viewBtn: this.vaildData(this.permission.user_view, false),
- delBtn: this.vaildData(this.permission.user_delete, false),
- editBtn: this.vaildData(this.permission.user_edit, false)
+ viewBtn: this.vaildData(this.permission.user_view, true),
+ delBtn: this.vaildData(this.permission.user_delete, true),
+ editBtn: this.vaildData(this.permission.user_edit, true)
};
- },
- platformPermissionList() {
- return {
- addBtn: false,
- viewBtn: false,
- delBtn: false,
- editBtn: this.vaildData(this.permission.user_edit, false)
- };
- },
- ids() {
- let ids = [];
- this.selectionList.forEach(ele => {
- ids.push(ele.id);
- });
- return ids.join(",");
- },
- },
- mounted() {
- // 非租户模式默认加载管理组数据
- if (!website.tenantMode) {
- this.initData(website.tenantId);
}
},
+ mounted() {
+ },
methods: {
- nodeClick(data) {
- this.treeDeptId = data.id;
- this.page.currentPage = 1;
- this.onLoad(this.page);
- },
- initData(tenantId) {
- getRoleTree(tenantId).then(res => {
- const column = this.findObject(this.option.group, "roleId");
- column.dicData = res.data.data;
- });
- getDeptTree(tenantId).then(res => {
- const column = this.findObject(this.option.group, "deptId");
- column.dicData = res.data.data;
- });
- getPostList(tenantId).then(res => {
- const column = this.findObject(this.option.group, "postId");
- column.dicData = res.data.data;
- });
- },
- submitRole() {
- const roleList = this.$refs.treeRole.getCheckedKeys().join(",");
- grant(this.ids, roleList).then(() => {
- this.roleBox = false;
- this.$message({
- type: "success",
- message: "操作成功!"
- });
- this.onLoad(this.page);
- });
- },
rowSave(row, done, loading) {
- row['tenantId'] = "000000"
- row['userType'] = 1
- row['deptId'] = '1123598813738675201'
- // row.deptId = func.join(row.deptId);
- row.roleId = func.join(row.roleId);
- // row.postId = func.join(row.postId);
add(row).then(() => {
this.initFlag = false;
this.onLoad(this.page);
@@ -697,12 +234,6 @@
});
},
rowUpdate(row, index, done, loading) {
- row['tenantId'] = "000000"
- row['deptId'] = '1123598813738675201'
- row['userType'] = 1
- // row.deptId = func.join(row.deptId);
- row.roleId = func.join(row.roleId);
- // row.postId = func.join(row.postId);
update(row).then(() => {
this.initFlag = false;
this.onLoad(this.page);
@@ -773,64 +304,6 @@
this.$refs.crud.toggleSelection();
});
},
- handleReset() {
- if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据");
- return;
- }
- this.$confirm("确定将选择账号密码重置为123456?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- })
- .then(() => {
- return resetPassword(this.ids);
- })
- .then(() => {
- this.$message({
- type: "success",
- message: "操作成功!"
- });
- this.$refs.crud.toggleSelection();
- });
- },
- handleGrant() {
- if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据");
- return;
- }
- this.roleTreeObj = [];
- if (this.selectionList.length === 1) {
- this.roleTreeObj = this.selectionList[0].roleId.split(",");
- }
- getRoleTree().then(res => {
- this.roleGrantList = res.data.data;
- this.roleBox = true;
- });
- },
- handlePlatform() {
- this.platformBox = true;
- },
- handleLock() {
- if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据");
- return;
- }
- this.$confirm("确定将选择账号解封？", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- })
- .then(() => {
- return unlock(this.ids);
- })
- .then(() => {
- this.$message({
- type: "success",
- message: "操作成功!"
- });
- });
- },
handleImport() {
this.excelBox = true;
},
@@ -866,15 +339,6 @@
if (["edit", "view"].includes(type)) {
getDetatil(this.form.id).then(res => {
this.form = res.data.data;
- if (this.form.hasOwnProperty("deptId")) {
- this.form.deptId = this.form.deptId.split(",");
- }
- if (this.form.hasOwnProperty("roleId")) {
- this.form.roleId = this.form.roleId.split(",");
- }
- if (this.form.hasOwnProperty("postId")) {
- this.form.postId = this.form.postId.split(",");
- }
});
}
this.initFlag = true;
@@ -896,63 +360,6 @@
this.page.total = data.total;
this.data = data.records;
this.loading = false;
- this.selectionClear();
- });
- },
- platformRowUpdate(row, index, done, loading) {
- updatePlatform(row.id, row.userType, row.userExt).then(() => {
- this.platformOnLoad(this.platformPage);
- this.$message({
- type: "success",
- message: "操作成功!"
- });
- done();
- }, error => {
- window.console.log(error);
- loading();
- });
- },
- platformBeforeOpen(done, type) {
- if (["edit", "view"].includes(type)) {
- getUserPlatform(this.platformForm.id).then(res => {
- this.platformForm = res.data.data;
- });
- }
- done();
- },
- platformSearchReset() {
- this.platformQuery = {};
- this.platformOnLoad(this.platformPage);
- },
- platformSearchChange(params, done) {
- this.platformQuery = params;
- this.platformPage.currentPage = 1;
- this.platformOnLoad(this.platformPage, params);
- done();
- },
- platformSelectionChange(list) {
- this.platformSelectionList = list;
- },
- platformSelectionClear() {
- this.platformSelectionList = [];
- this.$refs.platformCrud.toggleSelection();
- },
- platformCurrentChange(currentPage) {
- this.platformPage.currentPage = currentPage;
- },
- platformSizeChange(pageSize) {
- this.platformPage.pageSize = pageSize;
- },
- platformRefreshChange() {
- this.platformOnLoad(this.platformPage, this.platformQuery);
- },
- platformOnLoad(page, params = {}) {
- this.platformLoading = true;
- getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
- const data = res.data.data;
- this.platformPage.total = data.total;
- this.platformData = data.records;
- this.platformLoading = false;
this.selectionClear();
});
}
--
Gitblit v1.9.3