|
|
|
|
@ -38,6 +38,8 @@
|
|
|
|
|
<el-table-column label="用户账号" prop="userName"></el-table-column>
|
|
|
|
|
<el-table-column label="用户名称" prop="employeeName">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="所属部门" prop="deptName">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="状态">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<el-tag :type="scope.row.userFlag | statusFilterType">{{
|
|
|
|
|
@ -133,26 +135,56 @@
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-row type="flex">
|
|
|
|
|
<el-col :span="23" type="flex">
|
|
|
|
|
<el-form-item prop="comments">
|
|
|
|
|
<label slot="label">备  注</label>
|
|
|
|
|
<el-input v-model="formData.comments" size="small" style="width: 90%" type="textarea"
|
|
|
|
|
row="3"></el-input>
|
|
|
|
|
|
|
|
|
|
<el-col :span="11" type="flex">
|
|
|
|
|
<el-form-item label="所属部门" prop="userFlag">
|
|
|
|
|
<el-select
|
|
|
|
|
v-model="selectDeptList"
|
|
|
|
|
filterable
|
|
|
|
|
remote
|
|
|
|
|
clearable="true"
|
|
|
|
|
style="width: 90%"
|
|
|
|
|
multiple
|
|
|
|
|
size="small"
|
|
|
|
|
reserve-keyword
|
|
|
|
|
placeholder="请选择"
|
|
|
|
|
:remote-method="findDeptMethod"
|
|
|
|
|
:loading="loading"
|
|
|
|
|
>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in fromDeptOptions"
|
|
|
|
|
:key="item.code"
|
|
|
|
|
:label="item.name"
|
|
|
|
|
:value="item.id">
|
|
|
|
|
<span style="float: left">{{ item.code }}</span>
|
|
|
|
|
<span style="float: right; color: #8492a6; font-size: 13px">{{
|
|
|
|
|
item.name
|
|
|
|
|
}}</span>
|
|
|
|
|
</el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-row :gutter="20" type="flex">
|
|
|
|
|
<el-col :span="23" type="flex">
|
|
|
|
|
<el-form-item label="状态" prop="userFlag">
|
|
|
|
|
|
|
|
|
|
<el-col :span="11" type="flex">
|
|
|
|
|
<el-form-item label="状态" prop="userFlag">
|
|
|
|
|
<el-radio-group v-model="formData.userFlag" :disabled="formData.id === 1">
|
|
|
|
|
<el-radio :label="0">禁用</el-radio>
|
|
|
|
|
<el-radio :label="1">正常</el-radio>
|
|
|
|
|
</el-radio-group>
|
|
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-row type="flex">
|
|
|
|
|
<el-col :span="23" type="flex">
|
|
|
|
|
<el-form-item prop="comments">
|
|
|
|
|
<label slot="label">备  注</label>
|
|
|
|
|
<el-input v-model="formData.comments" size="small" style="width: 90%" type="textarea"
|
|
|
|
|
row="3"></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
<el-row :gutter="20" type="flex">
|
|
|
|
|
<el-col :span="23" type="flex">
|
|
|
|
|
<el-form-item label="角色">
|
|
|
|
|
@ -200,6 +232,7 @@ import {isBlank} from "@/utils/strUtil";
|
|
|
|
|
import {filterDepts} from "@/api/auth/authDept";
|
|
|
|
|
import {authRoleList, listRole} from "@/api/system/role";
|
|
|
|
|
import {selectSysParamByKey} from "@/api/system/systemParamConfig";
|
|
|
|
|
import {filterList} from "@/api/system/invWarehouse";
|
|
|
|
|
|
|
|
|
|
const formJson = {
|
|
|
|
|
id: "",
|
|
|
|
|
@ -210,7 +243,8 @@ const formJson = {
|
|
|
|
|
userFlag: 1,
|
|
|
|
|
comments: '',
|
|
|
|
|
dept: null,
|
|
|
|
|
roles: []
|
|
|
|
|
roles: [],
|
|
|
|
|
depts: [],
|
|
|
|
|
};
|
|
|
|
|
export default {
|
|
|
|
|
data() {
|
|
|
|
|
@ -253,6 +287,7 @@ export default {
|
|
|
|
|
formLoading: false,
|
|
|
|
|
formVisible: false,
|
|
|
|
|
formData: formJson,
|
|
|
|
|
selectDeptList: [],
|
|
|
|
|
fromDeptOptions: [],
|
|
|
|
|
configParms: {},
|
|
|
|
|
formRules: {},
|
|
|
|
|
@ -378,8 +413,10 @@ export default {
|
|
|
|
|
userFlag: row.userFlag,
|
|
|
|
|
comments: row.comments,
|
|
|
|
|
roles: row.roles,
|
|
|
|
|
depts: row.depts,
|
|
|
|
|
dept: row.dept,
|
|
|
|
|
};
|
|
|
|
|
this.selectDeptList = row.depts;
|
|
|
|
|
}
|
|
|
|
|
this.formName = "add";
|
|
|
|
|
this.formRules = this.addRules;
|
|
|
|
|
@ -403,10 +440,10 @@ export default {
|
|
|
|
|
this.$message.error("未指定角色！")
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
this.$refs["dataForm"].validate(valid => {
|
|
|
|
|
if (valid) {
|
|
|
|
|
this.formLoading = true;
|
|
|
|
|
this.formData.depts = this.selectDeptList;
|
|
|
|
|
let data = Object.assign({}, this.formData);
|
|
|
|
|
authAdminSave(data, this.formName).then(response => {
|
|
|
|
|
this.formLoading = false;
|
|
|
|
|
@ -427,7 +464,6 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
// 刷新表单
|
|
|
|
|
this.resetForm();
|
|
|
|
|
|
|
|
|
|
this.getList();
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
@ -473,12 +509,11 @@ export default {
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
findDeptMethod() {
|
|
|
|
|
let query = {
|
|
|
|
|
flag: 1
|
|
|
|
|
status: 1,
|
|
|
|
|
};
|
|
|
|
|
filterDepts(query)
|
|
|
|
|
filterList(query)
|
|
|
|
|
.then((response) => {
|
|
|
|
|
this.loading = false;
|
|
|
|
|
this.fromDeptOptions = response.data.list || [];
|
|
|
|
|
@ -494,7 +529,6 @@ export default {
|
|
|
|
|
this.formData.corpName = row.name;
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
filters: {
|
|
|
|
|
statusFilterType(status) {
|
|
|
|
|
@ -526,7 +560,7 @@ export default {
|
|
|
|
|
// 加载角色列表
|
|
|
|
|
this.getRoleList();
|
|
|
|
|
this.getSyncConfig();
|
|
|
|
|
|
|
|
|
|
this.findDeptMethod();
|
|
|
|
|
|
|
|
|
|
//查询是否启用多级仓库，判断是否启用部门
|
|
|
|
|
selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
|
|
|
|
|
|
anthonywj
2 years ago