|
|
@@ -11,56 +11,78 @@
|
|
|
</el-col>
|
|
|
<el-col :span="19">
|
|
|
<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">
|
|
|
+ <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 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-setting" @click="handlePlatform"
|
|
|
+ >平台配置
|
|
|
</el-button>
|
|
|
- <el-button type="info" size="small" plain v-if="permission.user_role" icon="el-icon-user"
|
|
|
- @click="handleGrant">角色配置
|
|
|
+ <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="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-setting"
|
|
|
- @click="handlePlatform">平台配置
|
|
|
- </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 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">
|
|
|
+ <template slot-scope="{ row }" slot="tenantName">
|
|
|
<el-tag>{{ row.tenantName }}</el-tag>
|
|
|
</template>
|
|
|
- <template slot-scope="{row}" slot="roleName">
|
|
|
+ <template slot-scope="{ row }" slot="roleName">
|
|
|
<el-tag>{{ row.roleName }}</el-tag>
|
|
|
</template>
|
|
|
- <template slot-scope="{row}" slot="deptName">
|
|
|
+ <template slot-scope="{ row }" slot="deptName">
|
|
|
<el-tag>{{ row.deptName }}</el-tag>
|
|
|
</template>
|
|
|
- <template slot-scope="{row}" slot="userTypeName">
|
|
|
+ <template slot-scope="{ row }" slot="userTypeName">
|
|
|
<el-tag>{{ row.userTypeName }}</el-tag>
|
|
|
</template>
|
|
|
|
|
|
-
|
|
|
- <template slot-scope="{row}" slot="workingStatus">
|
|
|
- <div :style="row.workingStatus == 1 ? 'color: red;' : ''">{{ row.workingStatus == 0 ? '启用' : '禁用' }}</div>
|
|
|
+ <template slot-scope="{ row }" slot="workingStatus">
|
|
|
+ <div :style="row.workingStatus == 1 ? 'color: red;' : ''">{{ row.workingStatus == 0 ? "启用" : "禁用" }}</div>
|
|
|
</template>
|
|
|
- <template slot-scope="{type,disabled}" slot="accountForm">
|
|
|
- <avue-input :disabled="type == 'view'" v-model="form.account" size="small" placeholder="请输入 登录账号" @change="accountChange"></avue-input>
|
|
|
+ <template slot-scope="{ type, disabled }" slot="accountForm">
|
|
|
+ <avue-input
|
|
|
+ :disabled="type == 'view'"
|
|
|
+ v-model="form.account"
|
|
|
+ size="small"
|
|
|
+ placeholder="请输入 登录账号"
|
|
|
+ @change="accountChange"
|
|
|
+ ></avue-input>
|
|
|
</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
|
|
|
+ :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">
|
|
|
@@ -71,16 +93,13 @@
|
|
|
<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>
|
|
|
+ <el-button type="primary" @click="handleTemplate"> 点击下载<i class="el-icon-download el-icon--right"></i> </el-button>
|
|
|
</template>
|
|
|
</avue-form>
|
|
|
</el-dialog>
|
|
|
|
|
|
<!-- 重置密码对话框 -->
|
|
|
<el-dialog title="重置密码" :visible.sync="dialogVisible" width="30%" :append-to-body="true">
|
|
|
-
|
|
|
<el-form :inline="true">
|
|
|
<el-form-item label="密码重置为:" prop="changeThePassword">
|
|
|
<el-input v-model="newPassword" placeholder="请输入内容"></el-input>
|
|
|
@@ -94,16 +113,28 @@
|
|
|
</el-dialog>
|
|
|
|
|
|
<el-dialog title="用户平台配置" append-to-body :visible.sync="platformBox">
|
|
|
- <avue-crud :option="platformOption" :table-loading="platformLoading" :data="platformData" ref="platformCrud"
|
|
|
- v-model="platformForm" :before-open="platformBeforeOpen" :page.sync="platformPage"
|
|
|
- :permission="platformPermissionList" @row-update="platformRowUpdate" @search-change="platformSearchChange"
|
|
|
- @search-reset="platformSearchReset" @selection-change="platformSelectionChange"
|
|
|
- @current-change="platformCurrentChange" @size-change="platformSizeChange"
|
|
|
- @refresh-change="platformRefreshChange" @on-load="platformOnLoad">
|
|
|
- <template slot-scope="{row}" slot="tenantName">
|
|
|
+ <avue-crud
|
|
|
+ :option="platformOption"
|
|
|
+ :table-loading="platformLoading"
|
|
|
+ :data="platformData"
|
|
|
+ ref="platformCrud"
|
|
|
+ v-model="platformForm"
|
|
|
+ :before-open="platformBeforeOpen"
|
|
|
+ :page.sync="platformPage"
|
|
|
+ :permission="platformPermissionList"
|
|
|
+ @row-update="platformRowUpdate"
|
|
|
+ @search-change="platformSearchChange"
|
|
|
+ @search-reset="platformSearchReset"
|
|
|
+ @selection-change="platformSelectionChange"
|
|
|
+ @current-change="platformCurrentChange"
|
|
|
+ @size-change="platformSizeChange"
|
|
|
+ @refresh-change="platformRefreshChange"
|
|
|
+ @on-load="platformOnLoad"
|
|
|
+ >
|
|
|
+ <template slot-scope="{ row }" slot="tenantName">
|
|
|
<el-tag>{{ row.tenantName }}</el-tag>
|
|
|
</template>
|
|
|
- <template slot-scope="{row}" slot="userTypeName">
|
|
|
+ <template slot-scope="{ row }" slot="userTypeName">
|
|
|
<el-tag>{{ row.userTypeName }}</el-tag>
|
|
|
</template>
|
|
|
</avue-crud>
|
|
|
@@ -114,39 +145,28 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import {
|
|
|
- getList,
|
|
|
- getUser,
|
|
|
- getUserPlatform,
|
|
|
- remove,
|
|
|
- update,
|
|
|
- updatePlatform,
|
|
|
- add,
|
|
|
- grant,
|
|
|
- resetPassword,
|
|
|
- resetYourPassword
|
|
|
-} from "@/api/system/user";
|
|
|
+import { getList, getUser, getUserPlatform, remove, update, updatePlatform, add, grant, resetPassword, resetYourPassword } from "@/api/system/user";
|
|
|
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';
|
|
|
-import { getToken } from '@/util/auth';
|
|
|
+import website from "@/config/website";
|
|
|
+import { getToken } from "@/util/auth";
|
|
|
|
|
|
export default {
|
|
|
data() {
|
|
|
const validatePass = (rule, value, callback) => {
|
|
|
- if (value === '') {
|
|
|
- callback(new Error('请输入密码'));
|
|
|
+ if (value === "") {
|
|
|
+ callback(new Error("请输入密码"));
|
|
|
} else {
|
|
|
callback();
|
|
|
}
|
|
|
};
|
|
|
const validatePass2 = (rule, value, callback) => {
|
|
|
- if (value === '') {
|
|
|
- callback(new Error('请再次输入密码'));
|
|
|
+ if (value === "") {
|
|
|
+ callback(new Error("请再次输入密码"));
|
|
|
} else if (value !== this.form.password) {
|
|
|
- callback(new Error('两次输入密码不一致!'));
|
|
|
+ callback(new Error("两次输入密码不一致!"));
|
|
|
} else {
|
|
|
callback();
|
|
|
}
|
|
|
@@ -161,7 +181,7 @@ export default {
|
|
|
platformBox: false,
|
|
|
initFlag: true,
|
|
|
// 需要重置的密码
|
|
|
- newPassword: '123456',
|
|
|
+ newPassword: "123456",
|
|
|
selectionList: [],
|
|
|
query: {},
|
|
|
loading: true,
|
|
|
@@ -178,7 +198,7 @@ export default {
|
|
|
},
|
|
|
init: {
|
|
|
roleTree: [],
|
|
|
- deptTree: [],
|
|
|
+ deptTree: []
|
|
|
},
|
|
|
props: {
|
|
|
label: "title",
|
|
|
@@ -186,34 +206,36 @@ export default {
|
|
|
},
|
|
|
roleGrantList: [],
|
|
|
roleTreeObj: [],
|
|
|
- treeDeptId: '',
|
|
|
+ treeDeptId: "",
|
|
|
treeData: [],
|
|
|
treeOption: {
|
|
|
- nodeKey: 'id',
|
|
|
+ nodeKey: "id",
|
|
|
lazy: true,
|
|
|
- treeLoad: function (node, resolve) {
|
|
|
- const parentId = (node.level === 0) ? 0 : node.data.id;
|
|
|
+ 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
|
|
|
- }
|
|
|
- }))
|
|
|
+ resolve(
|
|
|
+ res.data.data.map(item => {
|
|
|
+ return {
|
|
|
+ ...item,
|
|
|
+ leaf: !item.hasChildren
|
|
|
+ };
|
|
|
+ })
|
|
|
+ );
|
|
|
});
|
|
|
},
|
|
|
addBtn: false,
|
|
|
menu: false,
|
|
|
- size: 'small',
|
|
|
+ size: "small",
|
|
|
props: {
|
|
|
- labelText: '标题',
|
|
|
- label: 'title',
|
|
|
- value: 'value',
|
|
|
- children: 'children'
|
|
|
+ labelText: "标题",
|
|
|
+ label: "title",
|
|
|
+ value: "value",
|
|
|
+ children: "children"
|
|
|
}
|
|
|
},
|
|
|
option: {
|
|
|
- height: 'auto',
|
|
|
+ height: "auto",
|
|
|
calcHeight: 80,
|
|
|
tip: false,
|
|
|
searchShow: true,
|
|
|
@@ -274,11 +296,13 @@ export default {
|
|
|
hide: true,
|
|
|
display: false,
|
|
|
prop: "userType",
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请选择用户平台",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
+ rules: [
|
|
|
+ {
|
|
|
+ required: true,
|
|
|
+ message: "请选择用户平台",
|
|
|
+ trigger: "blur"
|
|
|
+ }
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
label: "用户状态",
|
|
|
@@ -287,23 +311,23 @@ export default {
|
|
|
dicData: [
|
|
|
{
|
|
|
label: "启用",
|
|
|
- value: '0'
|
|
|
+ value: "0"
|
|
|
},
|
|
|
{
|
|
|
label: "禁用",
|
|
|
- value: '1'
|
|
|
+ value: "1"
|
|
|
}
|
|
|
],
|
|
|
hide: false,
|
|
|
slot: true,
|
|
|
display: false
|
|
|
- },
|
|
|
+ }
|
|
|
],
|
|
|
group: [
|
|
|
{
|
|
|
- label: '基础信息',
|
|
|
- prop: 'baseInfo',
|
|
|
- icon: 'el-icon-user-solid',
|
|
|
+ label: "基础信息",
|
|
|
+ prop: "baseInfo",
|
|
|
+ icon: "el-icon-user-solid",
|
|
|
column: [
|
|
|
{
|
|
|
label: "所属企业",
|
|
|
@@ -318,21 +342,25 @@ export default {
|
|
|
addDisplay: website.tenantMode,
|
|
|
editDisplay: website.tenantMode,
|
|
|
viewDisplay: website.tenantMode,
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请输入所属企业",
|
|
|
- trigger: "click"
|
|
|
- }],
|
|
|
- span: 24,
|
|
|
+ rules: [
|
|
|
+ {
|
|
|
+ required: true,
|
|
|
+ message: "请输入所属企业",
|
|
|
+ trigger: "click"
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ span: 24
|
|
|
},
|
|
|
{
|
|
|
label: "登录账号",
|
|
|
prop: "account",
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请输入登录账号",
|
|
|
- trigger: "blur"
|
|
|
- }],
|
|
|
+ rules: [
|
|
|
+ {
|
|
|
+ required: true,
|
|
|
+ message: "请输入登录账号",
|
|
|
+ trigger: "blur"
|
|
|
+ }
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
label: "用户平台",
|
|
|
@@ -345,57 +373,64 @@ export default {
|
|
|
dataType: "number",
|
|
|
slot: true,
|
|
|
prop: "userType",
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请选择用户平台",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
+ rules: [
|
|
|
+ {
|
|
|
+ required: true,
|
|
|
+ message: "请选择用户平台",
|
|
|
+ trigger: "blur"
|
|
|
+ }
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
- label: '密码',
|
|
|
- prop: 'password',
|
|
|
+ label: "密码",
|
|
|
+ prop: "password",
|
|
|
hide: true,
|
|
|
editDisplay: false,
|
|
|
viewDisplay: false,
|
|
|
- rules: [{ required: true, validator: validatePass, trigger: 'blur' }]
|
|
|
+ rules: [{ required: true, validator: validatePass, trigger: "blur" }]
|
|
|
},
|
|
|
{
|
|
|
- label: '确认密码',
|
|
|
- prop: 'password2',
|
|
|
+ label: "确认密码",
|
|
|
+ prop: "password2",
|
|
|
hide: true,
|
|
|
editDisplay: false,
|
|
|
viewDisplay: false,
|
|
|
- rules: [{ required: true, validator: validatePass2, trigger: 'blur' }]
|
|
|
- },
|
|
|
+ rules: [{ required: true, validator: validatePass2, trigger: "blur" }]
|
|
|
+ }
|
|
|
]
|
|
|
},
|
|
|
{
|
|
|
- label: '详细信息',
|
|
|
- prop: 'detailInfo',
|
|
|
- icon: 'el-icon-s-order',
|
|
|
+ label: "详细信息",
|
|
|
+ prop: "detailInfo",
|
|
|
+ icon: "el-icon-s-order",
|
|
|
column: [
|
|
|
{
|
|
|
label: "用户昵称",
|
|
|
prop: "name",
|
|
|
hide: true,
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请输入用户昵称",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
+ rules: [
|
|
|
+ {
|
|
|
+ required: true,
|
|
|
+ message: "请输入用户昵称",
|
|
|
+ trigger: "blur"
|
|
|
+ }
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
label: "用户姓名",
|
|
|
prop: "realName",
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请输入用户姓名",
|
|
|
- trigger: "blur"
|
|
|
- }, {
|
|
|
- min: 2,
|
|
|
- max: 20,
|
|
|
- message: '姓名长度在2到20个字符'
|
|
|
- }]
|
|
|
+ rules: [
|
|
|
+ {
|
|
|
+ required: true,
|
|
|
+ message: "请输入用户姓名",
|
|
|
+ trigger: "blur"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ min: 2,
|
|
|
+ max: 20,
|
|
|
+ message: "姓名长度在2到20个字符"
|
|
|
+ }
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
label: "积分余额",
|
|
|
@@ -403,15 +438,15 @@ export default {
|
|
|
overHidden: true,
|
|
|
hide: true,
|
|
|
disabled: true,
|
|
|
- addDisplay: false,//当前行数据在新增表单中是否可见
|
|
|
- editDisplay: false,//当前行数据在编辑表单中是否可见
|
|
|
+ addDisplay: false, //当前行数据在新增表单中是否可见
|
|
|
+ editDisplay: false, //当前行数据在编辑表单中是否可见
|
|
|
viewDisplay: false, // 当前行数据在查看表单中是否可见
|
|
|
value: 0
|
|
|
},
|
|
|
{
|
|
|
label: "手机号码",
|
|
|
prop: "phone",
|
|
|
- overHidden: true,
|
|
|
+ overHidden: true
|
|
|
// rules: [{
|
|
|
// required: true,
|
|
|
// message: "请输入手机号码",
|
|
|
@@ -424,12 +459,12 @@ export default {
|
|
|
hide: true,
|
|
|
overHidden: true
|
|
|
},
|
|
|
- {
|
|
|
- label: "邮箱授权码",
|
|
|
- prop: "emailAuthorization",
|
|
|
- hide: true,
|
|
|
- overHidden: true
|
|
|
- },
|
|
|
+ {
|
|
|
+ label: "邮箱授权码",
|
|
|
+ prop: "emailAuthorization",
|
|
|
+ hide: true,
|
|
|
+ overHidden: true
|
|
|
+ },
|
|
|
{
|
|
|
label: "用户性别",
|
|
|
prop: "sex",
|
|
|
@@ -465,19 +500,21 @@ export default {
|
|
|
dicData: [
|
|
|
{
|
|
|
label: "启用",
|
|
|
- value: '0'
|
|
|
+ value: "0"
|
|
|
},
|
|
|
{
|
|
|
label: "禁用",
|
|
|
- value: '1'
|
|
|
+ value: "1"
|
|
|
}
|
|
|
],
|
|
|
hide: true,
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请选择用户状态",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
+ rules: [
|
|
|
+ {
|
|
|
+ required: true,
|
|
|
+ message: "请选择用户状态",
|
|
|
+ trigger: "blur"
|
|
|
+ }
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
label: "账号状态",
|
|
|
@@ -488,9 +525,9 @@ export default {
|
|
|
]
|
|
|
},
|
|
|
{
|
|
|
- label: '银行信息',
|
|
|
- prop: 'bankInfo',
|
|
|
- icon: 'el-icon-s-finance',
|
|
|
+ label: "银行信息",
|
|
|
+ prop: "bankInfo",
|
|
|
+ icon: "el-icon-s-finance",
|
|
|
column: [
|
|
|
{
|
|
|
label: "开户行",
|
|
|
@@ -511,13 +548,13 @@ export default {
|
|
|
]
|
|
|
},
|
|
|
{
|
|
|
- label: '职责信息',
|
|
|
- prop: 'dutyInfo',
|
|
|
- icon: 'el-icon-s-custom',
|
|
|
+ label: "职责信息",
|
|
|
+ prop: "dutyInfo",
|
|
|
+ icon: "el-icon-s-custom",
|
|
|
column: [
|
|
|
{
|
|
|
label: "用户编号",
|
|
|
- prop: "code",
|
|
|
+ prop: "code"
|
|
|
},
|
|
|
{
|
|
|
label: "所属角色",
|
|
|
@@ -531,28 +568,32 @@ export default {
|
|
|
// checkStrictly: true,
|
|
|
leafOnly: true,
|
|
|
slot: true,
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请选择所属角色",
|
|
|
- trigger: "click"
|
|
|
- }]
|
|
|
+ rules: [
|
|
|
+ {
|
|
|
+ required: true,
|
|
|
+ message: "请选择所属角色",
|
|
|
+ trigger: "click"
|
|
|
+ }
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
label: "所属部门",
|
|
|
prop: "deptId",
|
|
|
type: "tree",
|
|
|
- multiple: true,
|
|
|
- dicData: [],
|
|
|
+ dicUrl: "/api/blade-system/dept/tree",
|
|
|
+ // showAllLevels: false,
|
|
|
props: {
|
|
|
- label: "title"
|
|
|
+ label: "title",
|
|
|
+ value: "value",
|
|
|
+ children: "children"
|
|
|
},
|
|
|
- checkStrictly: true,
|
|
|
- slot: true,
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请选择所属部门",
|
|
|
- trigger: "click"
|
|
|
- }]
|
|
|
+ rules: [
|
|
|
+ {
|
|
|
+ required: true,
|
|
|
+ message: "请选择所属部门",
|
|
|
+ trigger: "click"
|
|
|
+ }
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
label: "岗位(团队)",
|
|
|
@@ -563,15 +604,15 @@ export default {
|
|
|
props: {
|
|
|
label: "postName",
|
|
|
value: "id"
|
|
|
- },
|
|
|
+ }
|
|
|
// rules: [{
|
|
|
// required: true,
|
|
|
// message: "请选择所属岗位",
|
|
|
// trigger: "click"
|
|
|
// }],
|
|
|
- },
|
|
|
+ }
|
|
|
]
|
|
|
- },
|
|
|
+ }
|
|
|
]
|
|
|
},
|
|
|
data: [],
|
|
|
@@ -589,7 +630,7 @@ export default {
|
|
|
viewBtn: true,
|
|
|
dialogClickModal: false,
|
|
|
menuWidth: 120,
|
|
|
- editBtnText: '配置',
|
|
|
+ editBtnText: "配置",
|
|
|
column: [
|
|
|
{
|
|
|
label: "登录账号",
|
|
|
@@ -628,11 +669,13 @@ export default {
|
|
|
hide: true,
|
|
|
display: false,
|
|
|
prop: "userType",
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请选择用户平台",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
+ rules: [
|
|
|
+ {
|
|
|
+ required: true,
|
|
|
+ message: "请选择用户平台",
|
|
|
+ trigger: "blur"
|
|
|
+ }
|
|
|
+ ]
|
|
|
},
|
|
|
{
|
|
|
label: "用户拓展",
|
|
|
@@ -642,9 +685,9 @@ export default {
|
|
|
span: 24,
|
|
|
overHidden: true,
|
|
|
row: true,
|
|
|
- hide: true,
|
|
|
- },
|
|
|
- ],
|
|
|
+ hide: true
|
|
|
+ }
|
|
|
+ ]
|
|
|
},
|
|
|
excelForm: {},
|
|
|
excelOption: {
|
|
|
@@ -652,16 +695,16 @@ export default {
|
|
|
emptyBtn: false,
|
|
|
column: [
|
|
|
{
|
|
|
- label: '模板上传',
|
|
|
- prop: 'excelFile',
|
|
|
- type: 'upload',
|
|
|
+ label: "模板上传",
|
|
|
+ prop: "excelFile",
|
|
|
+ type: "upload",
|
|
|
drag: true,
|
|
|
- loadText: '模板上传中,请稍等',
|
|
|
+ loadText: "模板上传中,请稍等",
|
|
|
span: 24,
|
|
|
propsHttp: {
|
|
|
- res: 'data'
|
|
|
+ res: "data"
|
|
|
},
|
|
|
- tip: '请上传 .xls,.xlsx 标准格式文件',
|
|
|
+ tip: "请上传 .xls,.xlsx 标准格式文件",
|
|
|
action: "/api/blade-user/import-user"
|
|
|
},
|
|
|
{
|
|
|
@@ -691,23 +734,23 @@ export default {
|
|
|
]
|
|
|
},
|
|
|
{
|
|
|
- label: '模板下载',
|
|
|
- prop: 'excelTemplate',
|
|
|
+ label: "模板下载",
|
|
|
+ prop: "excelTemplate",
|
|
|
formslot: true,
|
|
|
- span: 24,
|
|
|
+ span: 24
|
|
|
}
|
|
|
]
|
|
|
}
|
|
|
};
|
|
|
},
|
|
|
watch: {
|
|
|
- 'form.tenantId'() {
|
|
|
- if (this.form.tenantId !== '' && this.initFlag) {
|
|
|
+ "form.tenantId"() {
|
|
|
+ if (this.form.tenantId !== "" && this.initFlag) {
|
|
|
this.initData(this.form.tenantId);
|
|
|
}
|
|
|
},
|
|
|
- 'excelForm.isCovered'() {
|
|
|
- if (this.excelForm.isCovered !== '') {
|
|
|
+ "excelForm.isCovered"() {
|
|
|
+ if (this.excelForm.isCovered !== "") {
|
|
|
const column = this.findObject(this.excelOption.column, "excelFile");
|
|
|
column.action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
|
|
|
}
|
|
|
@@ -737,7 +780,7 @@ export default {
|
|
|
ids.push(ele.id);
|
|
|
});
|
|
|
return ids.join(",");
|
|
|
- },
|
|
|
+ }
|
|
|
},
|
|
|
created() {
|
|
|
// 根据 企业好判断是否要显示 积分余额
|
|
|
@@ -747,7 +790,7 @@ export default {
|
|
|
// this.refsDisplay()
|
|
|
// })
|
|
|
// }
|
|
|
- let arr = localStorage.getItem('roleName').split(',')
|
|
|
+ let arr = localStorage.getItem("roleName").split(",");
|
|
|
this.$nextTick(() => {
|
|
|
// 循环这个 实例
|
|
|
for (let item of this.$refs.crud.option.group) {
|
|
|
@@ -757,17 +800,17 @@ export default {
|
|
|
// 判断是不是积分余额
|
|
|
if (ite.prop == "pointsBalance") {
|
|
|
// 判断是否是admin 权限
|
|
|
- if (arr.indexOf('admin') != -1) {
|
|
|
- ite.disabled = false
|
|
|
+ if (arr.indexOf("admin") != -1) {
|
|
|
+ ite.disabled = false;
|
|
|
}
|
|
|
- ite.addDisplay = true
|
|
|
- ite.editDisplay = true
|
|
|
- ite.viewDisplay = true
|
|
|
+ ite.addDisplay = true;
|
|
|
+ ite.editDisplay = true;
|
|
|
+ ite.viewDisplay = true;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- })
|
|
|
+ });
|
|
|
},
|
|
|
mounted() {
|
|
|
// 非企业模式默认加载管理组数据
|
|
|
@@ -776,13 +819,13 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
- accountChange(val){
|
|
|
- this.form.name=val
|
|
|
- this.form.realName=val
|
|
|
+ accountChange(val) {
|
|
|
+ this.form.name = val;
|
|
|
+ this.form.realName = val;
|
|
|
},
|
|
|
// 循环实例 修改积分余额是否显示
|
|
|
refsDisplay() {
|
|
|
- let arr = localStorage.getItem('roleName').split(',')
|
|
|
+ let arr = localStorage.getItem("roleName").split(",");
|
|
|
// 循环这个 实例
|
|
|
for (let item of this.$refs.crud.option.group) {
|
|
|
// 判断是不是详细详细里的
|
|
|
@@ -791,12 +834,12 @@ export default {
|
|
|
// 判断是不是积分余额
|
|
|
if (ite.prop == "pointsBalance") {
|
|
|
// 判断是否是admin 权限
|
|
|
- if (arr.indexOf('admin') != -1) {
|
|
|
- ite.disabled = false
|
|
|
+ if (arr.indexOf("admin") != -1) {
|
|
|
+ ite.disabled = false;
|
|
|
}
|
|
|
- ite.addDisplay = true
|
|
|
- ite.editDisplay = true
|
|
|
- ite.viewDisplay = true
|
|
|
+ ite.addDisplay = true;
|
|
|
+ ite.editDisplay = true;
|
|
|
+ ite.viewDisplay = true;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -823,21 +866,21 @@ export default {
|
|
|
// }
|
|
|
// })
|
|
|
|
|
|
- column.dicData = []
|
|
|
- if (localStorage.getItem('roleName').indexOf('admin') != -1) {
|
|
|
- column.dicData = data
|
|
|
+ column.dicData = [];
|
|
|
+ if (localStorage.getItem("roleName").indexOf("admin") != -1) {
|
|
|
+ column.dicData = data;
|
|
|
} else {
|
|
|
for (let item of data) {
|
|
|
- if (item.title != '管理员') {
|
|
|
- column.dicData.push(item)
|
|
|
+ if (item.title != "管理员") {
|
|
|
+ column.dicData.push(item);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
- getDeptTree(tenantId).then(res => {
|
|
|
- const column = this.findObject(this.option.group, "deptId");
|
|
|
- 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;
|
|
|
@@ -855,53 +898,59 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
rowSave(row, done, loading) {
|
|
|
- row.deptId = row.deptId.join(",");
|
|
|
+ // row.deptId = row.deptId.join(",");
|
|
|
row.roleId = row.roleId.join(",");
|
|
|
row.postId = row.postId.join(",");
|
|
|
// 福达写死小程序
|
|
|
let userObj = JSON.parse(localStorage.getItem("saber-userInfo")).content;
|
|
|
- if (userObj.tenant_id == '577435') {
|
|
|
+ if (userObj.tenant_id == "577435") {
|
|
|
// row.userType = 4
|
|
|
- row.appletsId = 'wxa92adb24f1784863'
|
|
|
+ row.appletsId = "wxa92adb24f1784863";
|
|
|
}
|
|
|
- add(row).then(() => {
|
|
|
- this.initFlag = false;
|
|
|
- this.onLoad(this.page);
|
|
|
- this.$message({
|
|
|
- type: "success",
|
|
|
- message: "操作成功!"
|
|
|
- });
|
|
|
- done();
|
|
|
- }, error => {
|
|
|
- window.console.log(error);
|
|
|
- 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) {
|
|
|
- row.deptId = row.deptId.join(",");
|
|
|
+ // row.deptId = row.deptId.join(",");
|
|
|
row.roleId = row.roleId.join(",");
|
|
|
row.postId = row.postId.join(",");
|
|
|
if (!row.workingStatus) {
|
|
|
- row.workingStatus = '0'
|
|
|
+ row.workingStatus = "0";
|
|
|
}
|
|
|
// 福达写死小程序
|
|
|
let userObj = JSON.parse(localStorage.getItem("saber-userInfo")).content;
|
|
|
- if (userObj.tenant_id == '577435') {
|
|
|
+ if (userObj.tenant_id == "577435") {
|
|
|
// row.userType = 4
|
|
|
- row.appletsId = 'wxa92adb24f1784863'
|
|
|
+ row.appletsId = "wxa92adb24f1784863";
|
|
|
}
|
|
|
- update(row).then(() => {
|
|
|
- this.initFlag = false;
|
|
|
- this.onLoad(this.page);
|
|
|
- this.$message({
|
|
|
- type: "success",
|
|
|
- message: "操作成功!"
|
|
|
- });
|
|
|
- done();
|
|
|
- }, error => {
|
|
|
- window.console.log(error);
|
|
|
- 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("确定将选择数据删除?", {
|
|
|
@@ -922,7 +971,7 @@ export default {
|
|
|
},
|
|
|
searchReset() {
|
|
|
this.query = {};
|
|
|
- this.treeDeptId = '';
|
|
|
+ this.treeDeptId = "";
|
|
|
this.onLoad(this.page);
|
|
|
},
|
|
|
searchChange(params, done) {
|
|
|
@@ -985,15 +1034,15 @@ export default {
|
|
|
// 重置密码为指定内容
|
|
|
resetPasswordDiy() {
|
|
|
resetPassword(this.ids, this.newPassword).then(res => {
|
|
|
- console.log(res)
|
|
|
+ console.log(res);
|
|
|
if (res.data.code === 200) {
|
|
|
this.$message({
|
|
|
- message: '操作成功!',
|
|
|
- type: 'success'
|
|
|
+ message: "操作成功!",
|
|
|
+ type: "success"
|
|
|
});
|
|
|
this.dialogVisible = false;
|
|
|
}
|
|
|
- })
|
|
|
+ });
|
|
|
},
|
|
|
handleGrant() {
|
|
|
if (this.selectionList.length === 0) {
|
|
|
@@ -1027,7 +1076,9 @@ export default {
|
|
|
cancelButtonText: "取消",
|
|
|
type: "warning"
|
|
|
}).then(() => {
|
|
|
- window.open(`/api/blade-user/export-user?${this.website.tokenHeader}=${getToken()}&account=${this.search.account}&realName=${this.search.realName}`);
|
|
|
+ window.open(
|
|
|
+ `/api/blade-user/export-user?${this.website.tokenHeader}=${getToken()}&account=${this.search.account}&realName=${this.search.realName}`
|
|
|
+ );
|
|
|
});
|
|
|
},
|
|
|
handleTemplate() {
|
|
|
@@ -1040,9 +1091,9 @@ export default {
|
|
|
// }
|
|
|
getUser(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("deptId")) {
|
|
|
+ // this.form.deptId = this.form.deptId.split(",");
|
|
|
+ // }
|
|
|
if (this.form.hasOwnProperty("roleId")) {
|
|
|
this.form.roleId = this.form.roleId.split(",");
|
|
|
}
|
|
|
@@ -1074,17 +1125,20 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
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();
|
|
|
- });
|
|
|
+ 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)) {
|