xiaozhan
/
tobacco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 经纪人代理商修改；

Browse Source
master
wx-jincw 7 months ago
parent b73b00bfaa
commit 759b6ff5d0
5 changed files with 67 additions and 23 deletions
Show Stats Download Patch File Download Diff File

18
bs-ui/src/api/system/user.js
Unescape View File

@ -172,3 +172,21 @@ export function deptTreeSelect() {
method: 'get'
})
}
// 批量移除用户部门/代理商
export function removeDepts(data) {
return request({
url: '/system/user/removeDepts',
method: 'post',
data: data
})
}
// 批量修改用户部门/代理商
export function updateDepts(data) {
return request({
url: '/system/user/updateDepts',
method: 'post',
data: data
})
}

25
bs-ui/src/views/broker/broker/components/BrokerUser.vue
Unescape View File

@ -116,7 +116,7 @@
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="userList" @sort-change="handleSortChange" :height="tableHeight - 150"
<el-table v-loading="loading" :data="userList" @sort-change="handleSortChange"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center"/>
<el-table-column label="登录账号" key="userName" width="100" prop="userName" v-if="columns[1].visible"
@ -131,7 +131,7 @@
width="120"/>
<!-- <el-table-column label="地址" align="center" prop="address" sortable='custom'/> -->
<el-table-column label="公司" prop="company" sortable='custom'/>
<el-table-column label="状态" key="status" v-if="columns[5].visible">
<el-table-column label="状态" v-if="columns[5].visible">
<template slot-scope="scope">
<el-switch
v-model="scope.row.status"
@ -141,7 +141,7 @@
></el-switch>
</template>
</el-table-column>
<el-table-column label="审核状态" key="status" v-if="columns[5].visible">
<el-table-column label="审核状态" v-if="columns[5].visible">
<template slot-scope="scope">
<el-switch
v-model="scope.row.reviewStatus"
@ -366,7 +366,6 @@
</div>
</template>
<script>
import AutoTableHeight from '@/views/broker/AutoTableHeight';
import {listBrokerByTree} from "@/api/broker/broker";
import {
listUserByType,
@ -379,6 +378,8 @@ import {
changeUserStatus,
deptTreeSelect,
changeUserReviewStatus,
removeDepts,
updateDepts,
} from "@/api/system/user";
import {getToken} from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect";
@ -691,7 +692,10 @@ export default {
this.reset();
const userId = row.userId || this.ids;
getUser(userId).then(response => {
this.form = response.data;
this.form = response.data || {};
if (this.form.deptId == 0) {
this.form.deptId = null;
}
this.postOptions = response.posts;
this.roleOptions = response.roles;
this.$set(this.form, "postIds", response.postIds);
@ -708,7 +712,10 @@ export default {
this.reset();
const userId = row.userId || this.ids;
getUser(userId).then(response => {
this.form = response.data;
this.form = response.data || {};
if (this.form.deptId == 0) {
this.form.deptId = null;
}
this.postOptions = response.posts;
this.roleOptions = response.roles;
this.$set(this.form, "postIds", response.postIds);
@ -761,9 +768,11 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
const userIds = row.userId || this.ids;
const userIds = row.userId ? [row.userId] : this.ids;
this.$modal.confirm('是否确认从代理商移出这些用户？').then(function () {
return delUser(userIds);
return removeDepts({
userIds,
});
}).then(() => {
this.getList();
this.$modal.msgSuccess("移出成功");

2
bs-ui/src/views/broker/broker/components/DfBroker.vue
Unescape View File

@ -83,7 +83,7 @@
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="brokerList" @sort-change="handleSortChange" :height="tableHeight - 150"
<el-table v-loading="loading" :data="brokerList" @sort-change="handleSortChange"
@selection-change="handleSelectionChange" row-key="id" :highlight-current-row="true" @row-click="handleRowClick"
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">

22
bs-ui/src/views/broker/broker/components/NoBrokerUser.vue
Unescape View File

@ -50,20 +50,23 @@
/>
</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm" >确 定</el-button>
<el-button v-loading="saving" type="primary" @click="submitForm" >确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import { listUser } from "@/api/system/user";
import { listUser, updateDepts } from "@/api/system/user";
export default {
name: 'NoBrokerUser',
data() {
return {
open: false,
loading: false,
saving: false,
userList: [],
list: [],
total: 0,
queryParams: { pageNum: 1, pageSize: 10, hasBroker: '0' },
@ -105,10 +108,21 @@ export default {
this.handleQuery();
},
submitForm() {
if (!this.brokerId || this.list.length === 0) {
if (!this.currentBrokerId || this.list.length === 0) {
return;
}
this.saving = true;
updateDepts({
deptId: this.currentBrokerId,
userIds: this.list.map(item => item.userId)
}).then(response => {
this.saving = false;
this.$modal.msgSuccess("添加成功");
this.open = false;
this.$emit('success');
}).catch(e => {
this.saving = false;
});
}
}
}

23
bs-ui/src/views/system/user/index.vue
Unescape View File

@ -30,10 +30,10 @@
<!--用户数据-->
<el-col :span="20" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="登录账号" prop="userName">
<el-form-item label="登陆账号" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入登录账号"
placeholder="请输入登陆账号"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
@ -149,7 +149,7 @@
<el-table-column type="selection" width="50" align="center" />
<el-table-column type="index" width="50" align="center" :index="customIndex" />
<!-- <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" /> -->
<el-table-column label="登录账号" align="center" key="userName" prop="userName" v-if="columns[0].visible" :show-overflow-tooltip="true" />
<el-table-column label="登陆账号" align="center" key="userName" prop="userName" v-if="columns[0].visible" :show-overflow-tooltip="true" />
<el-table-column label="真实姓名" align="center" key="realName" prop="realName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
<el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
<el-table-column label="代理商" align="center" key="deptName" prop="deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
@ -219,7 +219,7 @@
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="登录账号" prop="userName">
<el-input v-model="form.userName" placeholder="请输入登录账号" maxlength="20" minlength="2" />
<el-input v-model="form.userName" placeholder="请输入登陆账号" maxlength="20" minlength="2" />
</el-form-item>
</el-col>
</el-row>
@ -250,8 +250,8 @@
</el-row>
<el-row :gutter="10">
<el-col :span="12">
<el-form-item v-if="form.userId == undefined" label="登录账号" prop="userName">
<el-input v-model="form.userName" placeholder="请输入登录账号" maxlength="20" minlength="2" />
<el-form-item v-if="form.userId == undefined" label="登陆账号" prop="userName">
<el-input v-model="form.userName" placeholder="请输入登陆账号" maxlength="20" minlength="2" />
</el-form-item>
</el-col>
<el-col :span="12">
@ -481,7 +481,7 @@ export default {
// 列信息
columns: [
// { key: 0, label: `用户编号`, visible: true },
{ key: 0, label: `登录账号`, visible: true },
{ key: 0, label: `登陆账号`, visible: true },
{ key: 1, label: `真实姓名`, visible: true },
{ key: 2, label: `用户昵称`, visible: true },
{ key: 3, label: `部门`, visible: true },
@ -492,8 +492,8 @@ export default {
// 表单校验
rules: {
userName: [
{ required: true, message: "登录账号不能为空", trigger: "blur" },
{ min: 2, max: 20, message: '登录账号长度必须介于 2 和 20 之间', trigger: 'blur' }
{ required: true, message: "登陆账号不能为空", trigger: "blur" },
{ min: 2, max: 20, message: '登陆账号长度必须介于 2 和 20 之间', trigger: 'blur' }
],
nickName: [
{ required: true, message: "用户昵称不能为空", trigger: "blur" }
@ -662,7 +662,10 @@ export default {
this.reset();
const userId = row.userId || this.ids;
getUser(userId).then(response => {
this.form = response.data;
this.form = response.data || {};
if (this.form.deptId == 0) {
this.form.deptId = null;
}
this.postOptions = response.posts;
this.roleOptions = response.roles;
this.$set(this.form, "postIds", response.postIds);

Write Preview
Loading…
Cancel
Save