UDI
/
udi-spms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	src/layout/components/Navbar.vue
master
schry 2 years ago
parent 2855678a15 dd8870adb3
commit 3c93522839
3 changed files with 117 additions and 75 deletions
Show Stats Download Patch File Download Diff File

23
src/api/auth/authAdmin.js
Unescape Escape View File

@ -74,4 +74,27 @@ export function updateInv(data) {
data: data data: data
}); });
} }
//获取当前登陆人用户信息
export function selectUser(query) {
return axios({
url: "/admin/auth/admin/selectUser",
method: "get",
params: query
});
}
export function modifyPasswd(data) {
return axios({
url: "/admin/auth/admin/updateUser",
method: "post",
data: data
});
}
export function filterByUser(query) {
return axios({
url: "/admin/auth/admin/selectUser",
method: "get",
params: query
});
}

2
src/views/forgetPasswd.vue
Unescape Escape View File

@ -17,7 +17,7 @@
:model="inputQuery" :model="inputQuery"
:rules="rules" :rules="rules"
ref="inputQuery" ref="inputQuery"
style="margin-left: 20%" style="margin-left: 20%"
> >
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">

167
src/views/system/user/authUser.vue
Unescape Escape View File

@ -1,38 +1,42 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form :inline="true" :model="query" size="mini"> <el-form :inline="true" :model="query" size="mini" v-show="showSearch">
<el-form-item label="用户账号:"> <el-row>
<el-input v-model="query.userName" placeholder="用户账号" clearable></el-input> <el-col :span="8">
</el-form-item> <el-form-item label="用户账号:">
<el-form-item class="query-form-item" label="账号状态:"> <el-input v-model="query.userName" placeholder="用户账号" clearable></el-input>
<el-select v-model="query.userFlag" placeholder="请选择账号状态:"> </el-form-item>
<el-option label="全部" value=""></el-option> </el-col>
<el-option label="禁用" value="0"></el-option> <el-col :span="8">
<el-option label="正常" value="1"></el-option> <el-form-item class="query-form-item" label="账号状态:">
</el-select> <el-select v-model="query.userFlag" placeholder="请选择账号状态:">
</el-form-item> <el-option label="全部" value=""></el-option>
<el-form-item> <el-option label="禁用" value="0"></el-option>
<el-button-group> <el-option label="正常" value="1"></el-option>
<el-button </el-select>
type="primary" </el-form-item>
icon="el-icon-refresh" </el-col>
@click="onReset" <el-col :span="8">
>重置 <el-form-item label="所属部门:">
</el-button> <el-input v-model="query.deptName" placeholder="所属部门" clearable></el-input>
<el-button type="primary" icon="el-icon-search" @click="onSubmit" </el-form-item>
>查询 </el-col>
</el-button </el-row>
>
<el-button type="primary" @click.native="handleForm(null, null)" icon="el-icon-plus"
:disabled="!configParms.sysUser && query.customerId == 110"
v-hasPermi="['system:user:add']"
>新增
</el-button
>
</el-button-group>
</el-form-item>
</el-form> </el-form>
<div class="top-right-btn">
<el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
<el-button type="primary" @click.native="handleForm(null, null)" icon="el-icon-plus"
:disabled="!configParms.sysUser && query.customerId == 110"
v-hasPermi="['system:user:add']">新增</el-button>
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" <el-table v-loading="loading" :data="list"
style="width: 100%" style="width: 100%"
border highlight-current-row> border highlight-current-row>
@ -71,7 +75,7 @@
</el-button> </el-button>
<el-button <el-button
type="text" type="text"
:disabled="scope.row.id === 1 || !configParms.sysUser" :disabled="scope.row.id === '1' || !configParms.sysUser"
@click.native="handleDel(scope.$index, scope.row)" @click.native="handleDel(scope.$index, scope.row)"
v-hasPermi="['system:user:remove']" v-hasPermi="['system:user:remove']"
>删除 >删除
@ -102,13 +106,14 @@
<el-row type="flex"> <el-row type="flex">
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="用户账号" prop="userName"> <el-form-item label="用户账号" prop="userName">
<el-input v-model="formData.userName" size="small" style="width: 90%"></el-input> <el-input v-model="formData.userName" size="small" style="width: 90%"
:disabled="formData.id == 1"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="用户名称" prop="employeeName"> <el-form-item label="用户名称" prop="employeeName">
<el-input v-model="formData.employeeName" size="small" <el-input v-model="formData.employeeName" size="small"
style="width: 90%"></el-input> style="width: 90%" :disabled="formData.id == 1"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -167,46 +172,46 @@
</el-col> </el-col>
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="状态" prop="userFlag"> <el-form-item label="状态" prop="userFlag">
<el-radio-group v-model="formData.userFlag" :disabled="formData.id === 1"> <el-radio-group v-model="formData.userFlag" :disabled="formData.id == 1">
<el-radio :label="1">正常</el-radio> <el-radio :label="1">正常</el-radio>
<el-radio :label="0">禁用</el-radio> <el-radio :label="0">禁用</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="11" type="flex"> <!-- <el-col :span="11" type="flex">
<el-form-item label="所属仓库" prop="locInvCode"> <el-form-item label="所属仓库" prop="locInvCode">
<el-select <el-select
v-model="formData.locInvCode" v-model="formData.locInvCode"
filterable filterable
remote remote
clearable="true" clearable="true"
style="width: 90%" style="width: 90%"
size="small" size="small"
reserve-keyword reserve-keyword
placeholder="请选择" placeholder="请选择"
:loading="loading" :loading="loading"
@change="change" @change="change"
> >
<el-option <el-option
v-for="item in fromWarehouseOptions" v-for="item in fromWarehouseOptions"
:key="item.code" :key="item.code"
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
<span style="float: left">{{ item.code }}</span> <span style="float: left">{{ item.code }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ <span style="float: right; color: #8492a6; font-size: 13px">{{
item.name item.name
}}</span> }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>--> </el-col>-->
</el-row> </el-row>
<el-row :gutter="20" type="flex"> <el-row :gutter="20" type="flex">
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="角色"> <el-form-item label="角色" prop="roles">
<el-checkbox-group v-model="formData.roles" :disabled="formData.id === 1" > <el-checkbox-group v-model="formData.roles" :disabled="formData.id == 1">
<el-checkbox <el-checkbox
v-for="item in roles" v-for="item in roles"
:key="item.roleId" :key="item.roleId"
@ -258,7 +263,7 @@ import {findConfig} from "@/api/sync/spsSyncStatus";
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import {listRole} from "@/api/system/role"; import {listRole} from "@/api/system/role";
import {selectSysParamByKey} from "@/api/system/systemParamConfig"; import {selectSysParamByKey} from "@/api/system/systemParamConfig";
import {filterList, selectInvById,getDeptById} from '@/api/system/invWarehouse' import {filterList, selectInvById, getDeptById} from '@/api/system/invWarehouse'
const formJson = { const formJson = {
id: "", id: "",
@ -291,10 +296,12 @@ export default {
} }
}; };
return { return {
showSearch: true,
roles: [], roles: [],
query: { query: {
userName: "", userName: "",
userFlag: "", userFlag: "1",
deptName: "",
page: 1, page: 1,
limit: 10, limit: 10,
roleId: "", roleId: "",
@ -340,6 +347,12 @@ export default {
depts: [ depts: [
{required: true, message: "请选择所属部门", trigger: "change"} {required: true, message: "请选择所属部门", trigger: "change"}
], ],
roles: [
{required: true, message: "请选择用户角色"}
],
employeeName: [
{required: true, message: "请输入用户名称", trigger: "blur"}
]
}, },
editRules: { editRules: {
userName: [ userName: [
@ -356,13 +369,20 @@ export default {
}; };
}, },
methods: { methods: {
getDeptList(){
},
hideSearch() {
this.showSearch = !this.showSearch;
},
onReset() { onReset() {
this.$router.push({ this.$router.push({
path: "" path: ""
}); });
this.query = { this.query = {
userName: "", userName: "",
userFlag: "", userFlag: "1",
deptName: null,
page: 1, page: 1,
limit: 10, limit: 10,
roleId: "", roleId: "",
@ -378,7 +398,7 @@ export default {
this.query.page = 1; this.query.page = 1;
this.getList(); this.getList();
}, },
change(){ change() {
this.$forceUpdate(); this.$forceUpdate();
}, },
findInv(val) { findInv(val) {
@ -397,7 +417,7 @@ export default {
}, },
getList() { getList() {
this.loading = true; this.loading = true;
this.query.key='key'; this.query.key = 'key';
authAdminList(this.query) authAdminList(this.query)
.then(response => { .then(response => {
this.loading = false; this.loading = false;
@ -459,7 +479,7 @@ export default {
roles: row.roles, roles: row.roles,
depts: row.depts, depts: row.depts,
dept: row.dept, dept: row.dept,
locInvCode:row.locInvCode locInvCode: row.locInvCode
}; };
} }
this.formName = "add"; this.formName = "add";
@ -564,10 +584,10 @@ export default {
}; };
filterList(query) filterList(query)
.then((response) => { .then((response) => {
var deptList=[]; var deptList = [];
this.loading = false; this.loading = false;
for(var i=0;i<response.data.list.length;i++){ for (var i = 0; i < response.data.list.length; i++) {
if(response.data.list[i].id!=1){ if (response.data.list[i].id != 1) {
deptList.push(response.data.list[i]); deptList.push(response.data.list[i]);
} }
} }
@ -617,7 +637,6 @@ export default {
this.getSyncConfig(); this.getSyncConfig();
this.findDeptMethod(); this.findDeptMethod();
//查询是否启用多级仓库，判断是否启用部门 //查询是否启用多级仓库，判断是否启用部门
selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => { selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {

Write Preview
Loading…
Cancel
Save