first-dev
/
smart-cloud-ui
5
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into ui_2024_3_26_suzejing 

# Conflicts:
#	src/main.js
pull/4/head
xiaoSu 2024-04-02 15:04:49 +08:00
parent ec2a485106 de80f953a6
commit 03207ec87d
7 changed files with 134 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -47,7 +47,7 @@
"fuse.js": "6.4.3",
"highlight.js": "9.18.5",
"js-beautify": "1.13.0",
"js-cookie": "3.0.1",
"js-cookie": "^3.0.1",
"jsencrypt": "3.0.0-rc.1",
"less-loader": "^12.2.0",
"maptalks": "^1.0.0-rc.33",

2
src/api/system/user.js
View File

@ -127,7 +127,7 @@ export function updateAuthRole(data) {
}
// 查询部门下拉树结构
export function deptTreeSelect() {
export function deptTreeSelect(data) {
return request({
url: '/system/user/deptTree',
method: 'get'

4
src/main.js
View File

@ -38,6 +38,10 @@ import VueMeta from 'vue-meta'
// 字典数据组件
import DictData from '@/components/DictData'
Vue.prototype.$cookies = Cookies; // 注入到Vue原型链上
// 全局方法挂载
Vue.prototype.getDicts = getDicts
Vue.prototype.getConfigKey = getConfigKey
Vue.prototype.parseTime = parseTime

9
src/store/modules/user.js
View File

@ -1,5 +1,6 @@
import {getInfo, login, logout, refreshToken} from '@/api/login'
import {getToken, removeToken, setExpiresIn, setToken} from '@/utils/auth'
import Cookies from "js-cookie";
const user = {
state: {
@ -7,6 +8,7 @@ const user = {
id: '',
name: '',
avatar: '',
companySign: '',
roles: [],
permissions: []
},
@ -32,6 +34,10 @@ const user = {
},
SET_PERMISSIONS: (state, permissions) => {
state.permissions = permissions
},
SET_COMPANY: (state, companySign) => {
state.companySign = companySign
Cookies.set('companySign', companySign)
}
},
@ -60,6 +66,7 @@ const user = {
GetInfo({commit, state}) {
return new Promise((resolve, reject) => {
getInfo().then(res => {
// debugger
const user = res.data.user
const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : user.avatar;
if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
@ -70,6 +77,8 @@ const user = {
}
commit('SET_ID', user.userId)
commit('SET_NAME', user.userName)
let de = user.dept
commit('SET_COMPANY',de.companySign)
commit('SET_AVATAR', avatar)
resolve(res)
}).catch(error => {

2
src/utils/request.js
View File

@ -73,7 +73,7 @@ service.interceptors.request.use(config => {
// 响应拦截器
service.interceptors.response.use(res => {
debugger
// debugger
// 未设置状态码则默认成功状态
const code = res.data.code || 200;
// 获取错误信息

104
src/views/system/dept/index.vue
View File

@ -1,7 +1,15 @@
<template>
<div class="app-container">
<el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" size="small">
<el-form-item label="部门名称" prop="deptName">
<!-- <el-form-item label="企业名称" prop="companySign">-->
<!-- <treeselect-->
<!-- v-model="queryParams.companySign"-->
<!-- :options="deptOptions"-->
<!-- :show-count="true"-->
<!-- placeholder="请选择上级部门"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="名称" prop="deptName">
<el-input
v-model="queryParams.deptName"
clearable
@ -26,6 +34,17 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5" v-if="'ZL' === this.$cookies.get('companySign')">
<el-button
v-hasPermi="['system:dept:add']"
icon="el-icon-plus"
plain
size="mini"
type="primary"
@click="handleAddEnterprise"
>企业入驻
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['system:dept:add']"
@ -59,7 +78,7 @@
row-key="deptId"
>
<el-table-column label="部门名称" prop="deptName" width="260"></el-table-column>
<el-table-column label="排序" prop="orderNum" width="200"></el-table-column>
<el-table-column label="企业标识" prop="companySign" width="200"></el-table-column>
<el-table-column label="状态" prop="status" width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
@ -101,6 +120,69 @@
</el-table-column>
</el-table>
<!-- 企业入驻对话框 -->
<el-dialog :title="title" :visible.sync="openCompany" append-to-body width="600px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
<el-form-item label="企业名称" prop="deptName">
<el-input v-model="form.deptName" placeholder="请输入企业名称"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="显示排序" prop="orderNum">
<el-input-number v-model="form.orderNum" :min="0" controls-position="right"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="负责人" prop="leader">
<el-input v-model="form.leader" maxlength="20" placeholder="请输入负责人"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" maxlength="11" placeholder="请输入联系电话"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" maxlength="50" placeholder="请输入邮箱"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="企业状态">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="企业标识" prop="leader">
<el-input v-model="form.companySign" maxlength="20" placeholder="请输入企业标识"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- 添加或修改部门对话框 -->
<el-dialog :title="title" :visible.sync="open" append-to-body width="600px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
@ -168,6 +250,7 @@
import {addDept, delDept, getDept, listDept, listDeptExcludeChild, updateDept} from "@/api/system/dept";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import Cookies from "js-cookie";
export default {
name: "Dept",
@ -187,12 +270,15 @@ export default {
title: "",
// 是否显示弹出层
open: false,
// 是否显示企业入驻对话框
openCompany:false,
// 是否展开，默认全部展开
isExpandAll: true,
// 重新渲染表格状态
refreshTable: true,
// 查询参数
queryParams: {
companySign: undefined,
deptName: undefined,
status: undefined
},
@ -204,7 +290,7 @@ export default {
{required: true, message: "上级部门不能为空", trigger: "blur"}
],
deptName: [
{required: true, message: "部门名称不能为空", trigger: "blur"}
{required: true, message: "部门/企业名称不能为空", trigger: "blur"}
],
orderNum: [
{required: true, message: "显示排序不能为空", trigger: "blur"}
@ -230,6 +316,7 @@ export default {
this.getList();
},
methods: {
Cookies,
/** 查询部门列表 */
getList() {
this.loading = true;
@ -282,6 +369,7 @@ export default {
this.reset();
if (row != undefined) {
this.form.parentId = row.deptId;
this.form.companySign = row.companySign;
}
this.open = true;
this.title = "添加部门";
@ -289,6 +377,16 @@ export default {
this.deptOptions = this.handleTree(response.data, "deptId");
});
},
/** 企业入驻操作 */
handleAddEnterprise(row) {
this.reset();
this.form.parentId = 0;
this.openCompany = true;
this.title = "企业入驻";
listDept().then(response => {
this.deptOptions = this.handleTree(response.data, "deptId");
});
},
/** 展开/折叠操作 */
toggleExpandAll() {
this.refreshTable = false;

25
src/views/system/user/index.vue
View File

@ -141,7 +141,6 @@
</el-col>
<right-toolbar :columns="columns" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="50"/>
<el-table-column v-if="columns[0].visible" key="userId" align="center" label="用户编号" prop="userId"/>
@ -149,11 +148,13 @@
prop="userName"/>
<el-table-column v-if="columns[2].visible" key="nickName" :show-overflow-tooltip="true" align="center" label="用户昵称"
prop="nickName"/>
<el-table-column v-if="columns[3].visible" key="deptName" :show-overflow-tooltip="true" align="center" label="部门"
<el-table-column v-if="columns[3].visible" key="companySign" :show-overflow-tooltip="true" align="center" label="企业标识"
prop="dept.companySign"/>
<el-table-column v-if="columns[4].visible" key="deptName" :show-overflow-tooltip="true" align="center" label="部门"
prop="dept.deptName"/>
<el-table-column v-if="columns[4].visible" key="phonenumber" align="center" label="手机号码"
<el-table-column v-if="columns[5].visible" key="phonenumber" align="center" label="手机号码"
prop="phonenumber" width="120"/>
<el-table-column v-if="columns[5].visible" key="status" align="center" label="状态">
<el-table-column v-if="columns[6].visible" key="status" align="center" label="状态">
<template slot-scope="scope">
<el-switch
v-model="scope.row.status"
@ -398,7 +399,7 @@ export default {
// 弹出层标题
title: "",
// 部门树选项
deptOptions: undefined,
deptOptions: [],
// 是否显示弹出层
open: false,
// 部门名称
@ -488,8 +489,7 @@ export default {
}
},
created() {
this.getList();
this.getDeptTree();
this.getDeptTree(1);
this.getConfigKey("sys.user.initPassword").then(response => {
this.initPassword = response.data.msg;
});
@ -506,10 +506,19 @@ export default {
);
},
/** 查询部门下拉树结构 */
getDeptTree() {
getDeptTree(num) {
// debugger
deptTreeSelect().then(response => {
this.deptOptions = response.data;
if (1 === num){
this.queryParams.deptId = response.data[0].id;
this.getList();
}
});
// if (1 === num){
// this.queryParams = this.deptOptions[0].id;
// this.getList();
// }
},
// 筛选节点
filterNode(value, data) {