更新
This commit is contained in:
parent
b1aa6c6324
commit
e6699aa4bb
@ -41,18 +41,15 @@
|
|||||||
|
|
||||||
<el-row :gutter="10" class="mb8">
|
<el-row :gutter="10" class="mb8">
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
|
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增
|
||||||
v-hasPermi="['system:user:create']">新增
|
|
||||||
</el-button>
|
</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button type="info" icon="el-icon-upload2" size="mini" @click="handleImport"
|
<el-button type="info" icon="el-icon-upload2" size="mini" @click="handleImport">导入
|
||||||
v-hasPermi="['system:user:import']">导入
|
|
||||||
</el-button>
|
</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
|
<el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading">导出
|
||||||
v-hasPermi="['system:user:export']">导出
|
|
||||||
</el-button>
|
</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
|
||||||
@ -82,10 +79,10 @@
|
|||||||
<el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
|
<el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
|
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
|
||||||
v-hasPermi="['system:user:update']">修改
|
>修改
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
|
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
|
||||||
v-hasPermi="['system:user:delete']">删除
|
>删除
|
||||||
</el-button>
|
</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
@ -105,9 +102,9 @@
|
|||||||
<el-input v-model="form.nickname" placeholder="请输入员工名称"/>
|
<el-input v-model="form.nickname" placeholder="请输入员工名称"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12" v-if="isInsert">
|
<el-col :span="12">
|
||||||
<el-form-item label="岗位" prop="postId">
|
<el-form-item label="岗位" prop="postId">
|
||||||
<el-select v-model="form.postId" placeholder="请选择岗位" filterable>
|
<el-select multiple v-model="form.roleIds" placeholder="请选择岗位" >
|
||||||
<el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id"/>
|
<el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id"/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@ -673,7 +670,7 @@ export default {
|
|||||||
getPostsByDeptId() {
|
getPostsByDeptId() {
|
||||||
getPost().then(response => {
|
getPost().then(response => {
|
||||||
this.postOptions = response.data;
|
this.postOptions = response.data;
|
||||||
this.form.postId = this.postOptions[0].id
|
// this.form.postId = this.postOptions[0].id
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
/** 分配员工角色操作 */
|
/** 分配员工角色操作 */
|
||||||
@ -709,6 +706,11 @@ export default {
|
|||||||
updateUser(this.form).then(response => {
|
updateUser(this.form).then(response => {
|
||||||
this.$modal.msgSuccess("修改成功");
|
this.$modal.msgSuccess("修改成功");
|
||||||
this.open = false;
|
this.open = false;
|
||||||
|
let data = {
|
||||||
|
userId: this.form.userId,
|
||||||
|
roleIds: this.form.roleIds
|
||||||
|
}
|
||||||
|
permissionAssign(data)
|
||||||
this.getList();
|
this.getList();
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
@ -717,11 +719,9 @@ export default {
|
|||||||
addUser(this.form).then(response => {
|
addUser(this.form).then(response => {
|
||||||
this.$modal.msgSuccess("新增成功");
|
this.$modal.msgSuccess("新增成功");
|
||||||
this.open = false;
|
this.open = false;
|
||||||
let roleIds = []
|
|
||||||
roleIds.push(this.form.postId)
|
|
||||||
let data = {
|
let data = {
|
||||||
userId: response.data,
|
userId: response.data,
|
||||||
roleIds: roleIds
|
roleIds: this.form.roleIds
|
||||||
}
|
}
|
||||||
permissionAssign(data)
|
permissionAssign(data)
|
||||||
});
|
});
|
||||||
|
@ -259,6 +259,7 @@ export default {
|
|||||||
if (this.queryParams.endTime) {
|
if (this.queryParams.endTime) {
|
||||||
this.queryParams.endTime = moment(this.queryParams.endTime).format('YYYY-MM-DD HH:mm');
|
this.queryParams.endTime = moment(this.queryParams.endTime).format('YYYY-MM-DD HH:mm');
|
||||||
}
|
}
|
||||||
|
this.queryParams.carAge = 1
|
||||||
listInfo(this.queryParams).then(response => {
|
listInfo(this.queryParams).then(response => {
|
||||||
this.infoList = response.data.records;
|
this.infoList = response.data.records;
|
||||||
this.total = response.data.total;
|
this.total = response.data.total;
|
||||||
|
Loading…
Reference in New Issue
Block a user