This commit is contained in:
linfso 2025-05-30 14:01:16 +08:00
parent c518aae998
commit 8dd2a16b99
2 changed files with 40 additions and 57 deletions

View File

@ -77,6 +77,17 @@ export function addChildUser(data) {
})
}
// 查询用户列表
export function listChildUser(query) {
return request({
url: '/oms2c/emisStaff/listChildUser',
method: 'get',
params: query
})
}

View File

@ -101,58 +101,20 @@
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="登录账号" align="left" key="userName" prop="userName" v-if="columns[0].visible" />
<!-- <el-table-column label="用户名称" align="left" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" /> -->
<el-table-column label="昵称" align="left" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
<!-- <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" /> -->
<el-table-column label="手机号码" align="center" key="phone" prop="phone" v-if="columns[4].visible" width="120" />
<el-table-column label="启用状态" align="center" key="status" v-if="columns[5].visible">
<el-table-column label="登录账号" align="left" key="userName" width="120" prop="userName" />
<el-table-column label="名称" align="left" key="nickName" prop="nickName" width="120" :show-overflow-tooltip="true" />
<el-table-column label="手机号码" align="center" key="phone" prop="phone" width="120" />
<el-table-column label="启用状态" align="center" prop="blOpenOms" width="80">
<template slot-scope="scope">
<el-switch
v-model="scope.row.status"
active-value="0"
inactive-value="1"
@change="handleStatusChange(scope.row)"
></el-switch>
<el-tag v-if="scope.row.blOpenOms==1" type="success">启用</el-tag>
<el-tag v-if="scope.row.blOpenOms==0" type="danger">停用</el-tag>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
<el-table-column label="创建时间" align="left" prop="createTime" min-width="170">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<!-- <el-table-column
label="操作"
align="center"
width="160"
class-name="small-padding fixed-width"
>
<template slot-scope="scope" >
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" >
<span class="el-dropdown-link">
<i class="el-icon-d-arrow-right el-icon--right"></i>更多
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="handleResetPwd" icon="el-icon-key"
>重置密码</el-dropdown-item>
<el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
>分配角色</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template>
</el-table-column> -->
</el-table>
<pagination
@ -169,19 +131,24 @@
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item label="登录账号" prop="userName">
<el-input v-model="form.userName" placeholder="系统自动生成" maxlength="30" disabled />
</el-form-item>
</el-col> -->
<el-col :span="12">
<el-form-item label="名称" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入名称" maxlength="30" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="手机号码" prop="phone">
<el-input v-model="form.phone" placeholder="请输入手机号码" maxlength="11" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="昵称" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
<el-col :span="12" v-if="form.id == undefined">
<el-form-item label="用户密码" prop="password">
<el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
</el-form-item>
</el-col>
<el-col :span="12">
@ -189,11 +156,6 @@
<el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
</el-form-item>
</el-col>
<el-col :span="12" v-if="form.id == undefined">
<el-form-item label="用户密码" prop="password">
<el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="用户性别">
<el-select v-model="form.sex" placeholder="请选择性别">
@ -207,6 +169,14 @@
</el-form-item>
</el-col> -->
<el-col :span="12">
<el-form-item label="开通OMS" prop="blOpenOms" >
<el-radio-group v-model="form.blOpenOms">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="状态">
<el-radio-group v-model="form.status">
<el-radio
@ -216,7 +186,7 @@
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="12">
<el-form-item label="角色">
<el-select v-model="form.roleIds" multiple placeholder="请选择角色">
@ -248,6 +218,8 @@
<script>
import { listOmsUser, getOmsUserInfo, delUser, addUser, updateUser, resetUserPwd, changeUserStatus } from "@/api/system/user";
import { addChildUser,listChildUser } from "@/api/oms/emisStaff";
import { getToken } from "@/utils/auth";
export default {
@ -367,7 +339,7 @@ export default {
/** 查询用户列表 */
getList() {
this.loading = true;
listOmsUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listChildUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.userList = response.rows;
this.total = response.total;
this.loading = false;
@ -489,7 +461,7 @@ export default {
this.getList();
});
} else {
addUser(this.form).then(response => {
addChildUser(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();