代码同步 02.19 -2

master
张博文 3 months ago
parent ba00da66be
commit d7a906bda4

@ -26,6 +26,14 @@ export function getUser(userId) {
}) })
} }
// 获得当前登录用户,所属租户可创建用户数量
export function getUserMaxNum() {
return request({
url: '/system/user/get/maxNum',
method: 'get'
})
}
// 新增用户 // 新增用户
export function addUser(data) { export function addUser(data) {
return request({ return request({

@ -22,7 +22,7 @@
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list" > <el-table v-loading="loading" :data="list" >
<el-table-column label="号" align="center" type="index" width="80" > <el-table-column label="号" align="center" type="index" width="80" >
<template v-slot="{ $index }"> <template v-slot="{ $index }">
<span>{{($index+1)+ (searchFormParam.queryParams.pageNo-1)*searchFormParam.queryParams.pageSize }}</span> <span>{{($index+1)+ (searchFormParam.queryParams.pageNo-1)*searchFormParam.queryParams.pageSize }}</span>
</template> </template>

File diff suppressed because it is too large Load Diff

@ -22,7 +22,7 @@
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column label="号" align="center" type="index" width="80" > <el-table-column label="号" align="center" type="index" width="80" >
<template v-slot="{ $index }"> <template v-slot="{ $index }">
<span>{{($index+1)+ (searchFormParam.queryParams.pageNo-1)*searchFormParam.queryParams.pageSize }}</span> <span>{{($index+1)+ (searchFormParam.queryParams.pageNo-1)*searchFormParam.queryParams.pageSize }}</span>
</template> </template>

@ -16,13 +16,13 @@
<div class="app-container-list main-bgcolor main-radius shopping"> <div class="app-container-list main-bgcolor main-radius shopping">
<div class="shopping-top"> <div class="shopping-top">
<div class="shopping-title">员工列表</div> <div class="shopping-title">员工列表</div>
<el-button class="shopping-add-btn" type="primary" plain @click="handleAdd" <el-button class="shopping-add-btn" type="primary" plain @click="handleAdd"
v-hasPermi="['basic:workers-info:create']">添加员工</el-button> v-hasPermi="['basic:workers-info:create']">添加员工</el-button>
</div> </div>
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column label="号" align="center" width="80px"> <el-table-column label="号" align="center" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ (scope.$index+1)+(searchFormParam.queryParams.pageNo-1)*searchFormParam.queryParams.pageSize }} {{ (scope.$index+1)+(searchFormParam.queryParams.pageNo-1)*searchFormParam.queryParams.pageSize }}
</template> </template>
@ -55,7 +55,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px" label-position="top"> <el-form ref="form" :model="form" :rules="rules" label-width="80px" label-position="top">
<el-form-item label="所属商户" prop="belongBusinessName"> <el-form-item label="所属商户" prop="belongBusinessName">
<div style="display: flex;"> <div style="display: flex;">
<el-select v-model="form.belongBusinessId" :placeholder=this.belongBusinessPlaceholder clearable filterable style="flex: 1;"> <el-select v-model="form.belongBusinessId" :placeholder=this.belongBusinessPlaceholder clearable filterable style="flex: 1;">
<el-option v-for="businessInfo in businessNameList" <el-option v-for="businessInfo in businessNameList"
:key="businessInfo.index" :label="businessInfo.businessName" :value="businessInfo.id" @click.native="labelClick(businessInfo.businessName)"/> :key="businessInfo.index" :label="businessInfo.businessName" :value="businessInfo.id" @click.native="labelClick(businessInfo.businessName)"/>
</el-select> </el-select>
@ -197,7 +197,7 @@ export default {
this.total = response.data.total; this.total = response.data.total;
this.loading = false; this.loading = false;
}); });
}, },
/** 获取商户名称列表 */ /** 获取商户名称列表 */
getBusinessNameList(){ getBusinessNameList(){
getBusinessNameList().then(response => { getBusinessNameList().then(response => {
@ -273,7 +273,7 @@ export default {
if (!valid) { if (!valid) {
return; return;
} }
// //
if (this.form.id != null) { if (this.form.id != null) {
updateWorkersInfo(this.form).then(response => { updateWorkersInfo(this.form).then(response => {
@ -312,11 +312,11 @@ export default {
}).catch(() => {}); }).catch(() => {});
}, },
//el-select //el-select
labelClick(data){ labelClick(data){
this.form.belongBusinessName = data; this.form.belongBusinessName = data;
}, },
} }
}; };
</script> </script>

@ -20,11 +20,12 @@
</div> </div>
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column label="号" align="center" type="index" width="80" > <el-table-column label="号" align="center" type="index" width="80" >
<template v-slot="{ $index }"> <template v-slot="{ $index }">
<span>{{($index+1)+ (queryParams.pageNo-1)*queryParams.pageSize }}</span> <span>{{($index+1)+ (queryParams.pageNo-1)*queryParams.pageSize }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检测报告模板编号" align="center" prop="templateId" />
<el-table-column label="检测报告模板名称" align="center" prop="templateName" /> <el-table-column label="检测报告模板名称" align="center" prop="templateName" />
<el-table-column label="所属商户名称" align="center" prop="belongBusinessName" /> <el-table-column label="所属商户名称" align="center" prop="belongBusinessName" />
<el-table-column label="创建时间" align="center" prop="createTime" > <el-table-column label="创建时间" align="center" prop="createTime" >
@ -309,7 +310,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const id = row.id; const id = row.id;
this.$modal.confirm('是否确认删除检测报告模板编号为"' + id + '"的数据项?').then(function() { this.$modal.confirm('是否确认删除检测报告模板编号为"' + row.templateId + '"的数据项?').then(function() {
return deleteInspectionTemplate(id); return deleteInspectionTemplate(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();

@ -22,11 +22,12 @@
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column label="号" align="center" type="index" width="80" > <el-table-column label="号" align="center" type="index" width="80" >
<template v-slot="{ $index }"> <template v-slot="{ $index }">
<span>{{($index+1)+ (queryParams.pageNo-1)*queryParams.pageSize }}</span> <span>{{($index+1)+ (queryParams.pageNo-1)*queryParams.pageSize }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="模板编号" align="center" prop="templateId" />
<el-table-column label="模板名称" align="center" prop="templateName" /> <el-table-column label="模板名称" align="center" prop="templateName" />
<el-table-column label="创建时间" align="center" prop="createTime" > <el-table-column label="创建时间" align="center" prop="createTime" >
<template v-slot="{ row }"> <template v-slot="{ row }">
@ -301,7 +302,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const id = row.id; const id = row.id;
this.$modal.confirm('是否确认删除溯源模板编号为"' + id + '"的数据项?').then(function() { this.$modal.confirm('是否确认删除溯源模板编号为"' + row.templateId + '"的数据项?').then(function() {
return deleteTraceTemplate(id); return deleteTraceTemplate(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();

@ -28,7 +28,7 @@
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column label="号" align="center" type="index" width="80"> <el-table-column label="号" align="center" type="index" width="80">
<template v-slot="{ $index }"> <template v-slot="{ $index }">
<span>{{ <span>{{
$index + 1 + (queryParams.pageNo - 1) * queryParams.pageSize $index + 1 + (queryParams.pageNo - 1) * queryParams.pageSize

@ -18,7 +18,7 @@
<h1>码仓列表 </h1> <h1>码仓列表 </h1>
<br/> <br/>
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column label="号" align="center" type="index" width="80" > <el-table-column label="号" align="center" type="index" width="80" >
<template v-slot="{ $index }"> <template v-slot="{ $index }">
<span>{{($index+1)+ (queryParams.pageNo-1)*queryParams.pageSize }}</span> <span>{{($index+1)+ (queryParams.pageNo-1)*queryParams.pageSize }}</span>
</template> </template>

@ -17,7 +17,7 @@
<div class="app-container-list main-bgcolor main-radius"> <div class="app-container-list main-bgcolor main-radius">
<h1>生码列表</h1> <h1>生码列表</h1>
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column label="号" align="center" type="index" width="80" > <el-table-column label="号" align="center" type="index" width="80" >
<template v-slot="{ $index }"> <template v-slot="{ $index }">
<span>{{($index+1)+ (queryParams.pageNo-1)*queryParams.pageSize }}</span> <span>{{($index+1)+ (queryParams.pageNo-1)*queryParams.pageSize }}</span>
</template> </template>
@ -98,7 +98,9 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="drawer-footer"> <div class="drawer-footer">
<el-button type="primary" @click="submitForm"> </el-button> <el-button type="primary" @click="submitForm" >
</el-button>
<el-button @click="openDraw = false"> </el-button> <el-button @click="openDraw = false"> </el-button>
</div> </div>
</div> </div>
@ -275,6 +277,12 @@ export default {
if (!valid) { if (!valid) {
return; return;
} }
const loading = this.$loading({
lock: true,
text: '码包生成中, 请您等待几秒, 稍微休息一下~~~~~',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
// //
createGenerateRecord(this.form).then(res => { createGenerateRecord(this.form).then(res => {
if(res.data){ if(res.data){
@ -283,6 +291,8 @@ export default {
this.openDraw = false; this.openDraw = false;
this.getList(); this.getList();
} }
}).finally(() => {
loading.close();
}); });
}); });
}, },

@ -25,7 +25,7 @@
</div> </div>
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column label="号" align="center" type="index" width="80" > <el-table-column label="号" align="center" type="index" width="80" >
<template v-slot="{ $index }"> <template v-slot="{ $index }">
<span>{{($index+1)+ (queryParams.pageNo-1)*queryParams.pageSize }}</span> <span>{{($index+1)+ (queryParams.pageNo-1)*queryParams.pageSize }}</span>
</template> </template>
@ -294,7 +294,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const id = row.id; const id = row.id;
this.$modal.confirm('是否确认删除标识码生成记录编号为"' + id + '"的数据项?').then(function() { this.$modal.confirm('是否确认删除标识码生成记录编号为"' + row.generateRecordId + '"的数据项?').then(function() {
return deleteGenerateRecord(id); return deleteGenerateRecord(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();

@ -22,7 +22,6 @@
</div> </div>
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column type="selection" width="55"/>
<el-table-column label="编号" align="center" type="index" width="80" > <el-table-column label="编号" align="center" type="index" width="80" >
<template v-slot="{ $index }"> <template v-slot="{ $index }">
<span>{{($index+1)+ (searchFormParam.queryParams.pageNo-1)*searchFormParam.queryParams.pageSize }}</span> <span>{{($index+1)+ (searchFormParam.queryParams.pageNo-1)*searchFormParam.queryParams.pageSize }}</span>

@ -467,7 +467,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const id = row.id; const id = row.id;
this.$modal.confirm('是否确认删除采收入库编号为"' + id + '"的数据项?').then(function() { this.$modal.confirm('是否确认删除采收入库单号为"' + row.harverstId + '"的数据项?').then(function() {
return deleteHarvestInfo(id); return deleteHarvestInfo(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();

@ -22,7 +22,7 @@
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column label="号" align="center" type="index" width="80" > <el-table-column label="号" align="center" type="index" width="80" >
<template v-slot="{ $index }"> <template v-slot="{ $index }">
<span>{{($index+1)+ (queryParams.pageNo-1)*queryParams.pageSize }}</span> <span>{{($index+1)+ (queryParams.pageNo-1)*queryParams.pageSize }}</span>
</template> </template>
@ -624,7 +624,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const id = row.id; const id = row.id;
this.$modal.confirm('是否确认删除检验检疫编号为"' + id + '"的数据项?').then(function() { this.$modal.confirm('是否确认删除入库批次为"' + row.harvestBatchId + '"的数据项?').then(function() {
return deleteInspection(id); return deleteInspection(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();

@ -113,7 +113,7 @@
</el-table-column> </el-table-column>
<el-table-column label="联系人" align="center" prop="contactName" /> <el-table-column label="联系人" align="center" prop="contactName" />
<el-table-column label="联系手机" align="center" prop="contactMobile" /> <el-table-column label="联系手机" align="center" prop="contactMobile" />
<el-table-column label="账号额度" align="center" prop="accountCount"> <el-table-column label="用户上限数量" align="center" prop="accountCount">
<template v-slot="scope"> <template v-slot="scope">
<el-tag> {{ scope.row.accountCount }} </el-tag> <el-tag> {{ scope.row.accountCount }} </el-tag>
</template> </template>
@ -179,7 +179,7 @@
<!-- 对话框(添加 / 修改) --> <!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="租户名" prop="name"> <el-form-item label="租户名" prop="name">
<el-input v-model="form.name" placeholder="请输入租户名" maxlength="30" /> <el-input v-model="form.name" placeholder="请输入租户名" maxlength="30" />
</el-form-item> </el-form-item>
@ -224,10 +224,10 @@
maxlength="20" maxlength="20"
/> />
</el-form-item> </el-form-item>
<el-form-item label="账号额度" prop="accountCount"> <el-form-item label="用户上限数量" prop="accountCount">
<el-input-number <el-input-number
v-model="form.accountCount" v-model="form.accountCount"
placeholder="请输入账号额度" placeholder="请输入用户上限数量"
controls-position="right" controls-position="right"
:min="0" :min="0"
:max="999999999" :max="999999999"

@ -7,82 +7,254 @@
<el-row :gutter="20"> <el-row :gutter="20">
<!--用户数据--> <!--用户数据-->
<el-col :span="24" :xs="24"> <el-col :span="24" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <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="请输入用户名称" clearable style="width: 240px" <el-input
@keyup.enter.native="handleQuery"/> v-model="queryParams.username"
placeholder="请输入用户名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="手机号码" prop="mobile"> <el-form-item label="手机号码" prop="mobile">
<el-input v-model="queryParams.mobile" placeholder="请输入手机号码" clearable style="width: 240px" <el-input
@keyup.enter.native="handleQuery"/> v-model="queryParams.mobile"
placeholder="请输入手机号码"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px"> <el-select
<el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/> v-model="queryParams.status"
placeholder="用户状态"
clearable
style="width: 240px"
>
<el-option
v-for="dict in statusDictDatas"
:key="parseInt(dict.value)"
:label="dict.label"
:value="parseInt(dict.value)"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="创建时间" prop="createTime"> <el-form-item label="创建时间" prop="createTime">
<el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange" <el-date-picker
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" /> v-model="queryParams.createTime"
style="width: 240px"
value-format="yyyy-MM-dd HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery"
<el-button icon="el-icon-refresh" @click="resetQuery"></el-button> >搜索</el-button
>
<el-button icon="el-icon-refresh" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div
style="
width: 300px;
text-align: center;
background-color: #ffffff;
padding: 5px;
border-radius: 3px;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
font-size: 14px;
margin-bottom: 10px;
"
>
<i class="el-icon-info" style=""></i>
<span style="margin-left: 5px">
当前租户可创建用户数量为
<span style="color: #4fb8fe">{{ total }}</span>
/
<span style="color: #4fb8fe">{{ userMaxNum }}</span>
</span>
</div>
<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
v-hasPermi="['system:user:create']">新增</el-button> type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:user:create']"
>新增</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
v-hasPermi="['system:user:import']">导入</el-button> type="info"
icon="el-icon-upload2"
size="mini"
@click="handleImport"
v-hasPermi="['system:user:import']"
>导入</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
v-hasPermi="['system:user:export']">导出</el-button> type="warning"
icon="el-icon-download"
size="mini"
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['system:user:export']"
>导出</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>
</el-row> </el-row>
<el-table v-loading="loading" :data="userList"> <el-table v-loading="loading" :data="userList">
<el-table-column label="用户编号" align="center" key="id" prop="id" v-if="columns[0].visible" /> <el-table-column
<el-table-column label="用户名称" align="center" key="username" prop="username" v-if="columns[1].visible" :show-overflow-tooltip="true" /> label="用户编号"
<el-table-column label="用户昵称" align="center" key="nickname" prop="nickname" v-if="columns[2].visible" :show-overflow-tooltip="true" /> align="center"
<el-table-column label="手机号码" align="center" key="mobile" prop="mobile" v-if="columns[4].visible" width="120" /> key="id"
<el-table-column label="状态" key="status" v-if="columns[5].visible" align="center"> prop="id"
v-if="columns[0].visible"
/>
<el-table-column
label="用户名称"
align="center"
key="username"
prop="username"
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="mobile"
prop="mobile"
v-if="columns[4].visible"
width="120"
/>
<el-table-column
label="状态"
key="status"
v-if="columns[5].visible"
align="center"
>
<template v-slot="scope"> <template v-slot="scope">
<el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)" /> <el-switch
v-model="scope.row.status"
:active-value="0"
:inactive-value="1"
@change="handleStatusChange(scope.row)"
/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160"> <el-table-column
label="创建时间"
align="center"
prop="createTime"
v-if="columns[6].visible"
width="160"
>
<template v-slot="scope"> <template v-slot="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<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
v-hasPermi="['system:user:update']">修改</el-button> size="mini"
<el-dropdown @command="(command) => handleCommand(command, scope.$index, scope.row)" type="text"
v-hasPermi="['system:user:delete', 'system:user:update-password', 'system:permission:assign-user-role']"> icon="el-icon-edit"
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button> @click="handleUpdate(scope.row)"
v-hasPermi="['system:user:update']"
>修改</el-button
>
<el-dropdown
@command="
(command) => handleCommand(command, scope.$index, scope.row)
"
v-hasPermi="[
'system:user:delete',
'system:user:update-password',
'system:permission:assign-user-role',
]"
>
<el-button size="mini" type="text" icon="el-icon-d-arrow-right"
>更多</el-button
>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item command="handleDelete" v-if="scope.row.id !== 1" size="mini" type="text" icon="el-icon-delete" <el-dropdown-item
v-hasPermi="['system:user:delete']">删除</el-dropdown-item> command="handleDelete"
<el-dropdown-item command="handleResetPwd" size="mini" type="text" icon="el-icon-key" v-if="scope.row.id !== 1"
v-hasPermi="['system:user:update-password']">重置密码</el-dropdown-item> size="mini"
<el-dropdown-item command="handleRole" size="mini" type="text" icon="el-icon-circle-check" type="text"
v-hasPermi="['system:permission:assign-user-role']">分配角色</el-dropdown-item> icon="el-icon-delete"
v-hasPermi="['system:user:delete']"
>删除</el-dropdown-item
>
<el-dropdown-item
command="handleResetPwd"
size="mini"
type="text"
icon="el-icon-key"
v-hasPermi="['system:user:update-password']"
>重置密码</el-dropdown-item
>
<el-dropdown-item
command="handleRole"
size="mini"
type="text"
icon="el-icon-circle-check"
v-hasPermi="['system:permission:assign-user-role']"
>分配角色</el-dropdown-item
>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" <pagination
@pagination="getList"/> v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-col> </el-col>
</el-row> </el-row>
@ -97,28 +269,54 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="手机号码" prop="mobile"> <el-form-item label="手机号码" prop="mobile">
<el-input v-model="form.mobile" placeholder="请输入手机号码" maxlength="11" /> <el-input
v-model="form.mobile"
placeholder="请输入手机号码"
maxlength="11"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="邮箱" prop="email"> <el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" /> <el-input
v-model="form.email"
placeholder="请输入邮箱"
maxlength="50"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.id === undefined" label="用户名称" prop="username"> <el-form-item
v-if="form.id === undefined"
label="用户名称"
prop="username"
>
<el-input v-model="form.username" placeholder="请输入用户名称" /> <el-input v-model="form.username" placeholder="请输入用户名称" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.id === undefined" label="用户密码" prop="password"> <el-form-item
<el-input v-model="form.password" placeholder="请输入用户密码" type="password" show-password /> v-if="form.id === undefined"
label="用户密码"
prop="password"
>
<el-input
v-model="form.password"
placeholder="请输入用户密码"
type="password"
show-password
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="用户性别"> <el-form-item label="用户性别">
<el-select v-model="form.sex" placeholder="请选择"> <el-select v-model="form.sex" placeholder="请选择">
<el-option v-for="dict in sexDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/> <el-option
v-for="dict in sexDictDatas"
:key="parseInt(dict.value)"
:label="dict.label"
:value="parseInt(dict.value)"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -126,7 +324,11 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注"> <el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input> <el-input
v-model="form.remark"
type="textarea"
placeholder="请输入内容"
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -138,18 +340,39 @@
</el-dialog> </el-dialog>
<!-- 用户导入对话框 --> <!-- 用户导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body> <el-dialog
<el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :title="upload.title"
:action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :visible.sync="upload.open"
:on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag> width="400px"
append-to-body
>
<el-upload
ref="upload"
:limit="1"
accept=".xlsx, .xls"
:headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport"
:disabled="upload.isUploading"
:on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess"
:auto-upload="false"
drag
>
<i class="el-icon-upload"></i> <i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处<em>点击上传</em></div> <div class="el-upload__text">将文件拖到此处<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip"> <div class="el-upload__tip text-center" slot="tip">
<div class="el-upload__tip" slot="tip"> <div class="el-upload__tip" slot="tip">
<el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据 <el-checkbox v-model="upload.updateSupport" />
是否更新已经存在的用户数据
</div> </div>
<span>仅允许导入xlsxlsx格式文件</span> <span>仅允许导入xlsxlsx格式文件</span>
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate"></el-link> <el-link
type="primary"
:underline="false"
style="font-size: 12px; vertical-align: baseline"
@click="importTemplate"
>下载模板</el-link
>
</div> </div>
</el-upload> </el-upload>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -159,7 +382,12 @@
</el-dialog> </el-dialog>
<!-- 分配角色 --> <!-- 分配角色 -->
<el-dialog title="分配角色" :visible.sync="openRole" width="500px" append-to-body> <el-dialog
title="分配角色"
:visible.sync="openRole"
width="500px"
append-to-body
>
<el-form :model="form" label-width="80px"> <el-form :model="form" label-width="80px">
<el-form-item label="用户名称"> <el-form-item label="用户名称">
<el-input v-model="form.username" :disabled="true" /> <el-input v-model="form.username" :disabled="true" />
@ -170,10 +398,10 @@
<el-form-item label="角色"> <el-form-item label="角色">
<el-select v-model="form.roleIds" multiple placeholder="请选择"> <el-select v-model="form.roleIds" multiple placeholder="请选择">
<el-option <el-option
v-for="item in roleOptions" v-for="item in roleOptions"
:key="parseInt(item.id)" :key="parseInt(item.id)"
:label="item.name" :label="item.name"
:value="parseInt(item.id)" :value="parseInt(item.id)"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -183,7 +411,6 @@
<el-button @click="cancelRole"> </el-button> <el-button @click="cancelRole"> </el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -197,18 +424,19 @@ import {
importTemplate, importTemplate,
listUser, listUser,
resetUserPwd, resetUserPwd,
updateUser updateUser,
getUserMaxNum,
} from "@/api/system/user"; } from "@/api/system/user";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import {listSimplePosts} from "@/api/system/post"; import { listSimplePosts } from "@/api/system/post";
import {CommonStatusEnum} from "@/utils/constants"; import { CommonStatusEnum } from "@/utils/constants";
import {DICT_TYPE, getDictDatas} from "@/utils/dict"; import { DICT_TYPE, getDictDatas } from "@/utils/dict";
import {assignUserRole, listUserRoles} from "@/api/system/permission"; import { assignUserRole, listUserRoles } from "@/api/system/permission";
import {listSimpleRoles} from "@/api/system/role"; import { listSimpleRoles } from "@/api/system/role";
import {getBaseHeader} from "@/utils/request"; import { getBaseHeader } from "@/utils/request";
export default { export default {
name: "User", name: "User",
@ -241,7 +469,7 @@ export default {
form: {}, form: {},
defaultProps: { defaultProps: {
children: "children", children: "children",
label: "name" label: "name",
}, },
// //
upload: { upload: {
@ -256,7 +484,7 @@ export default {
// //
headers: getBaseHeader(), headers: getBaseHeader(),
// //
url: process.env.VUE_APP_BASE_API + '/admin-api/system/user/import' url: process.env.VUE_APP_BASE_API + "/admin-api/system/user/import",
}, },
// //
queryParams: { queryParams: {
@ -266,7 +494,7 @@ export default {
mobile: undefined, mobile: undefined,
status: undefined, status: undefined,
deptId: undefined, deptId: undefined,
createTime: [] createTime: [],
}, },
// //
columns: [ columns: [
@ -276,33 +504,34 @@ export default {
{ key: 3, label: `部门`, visible: true }, { key: 3, label: `部门`, visible: true },
{ key: 4, label: `手机号码`, visible: true }, { key: 4, label: `手机号码`, visible: true },
{ key: 5, label: `状态`, visible: true }, { key: 5, label: `状态`, visible: true },
{ key: 6, label: `创建时间`, visible: true } { key: 6, label: `创建时间`, visible: true },
], ],
// //
rules: { rules: {
username: [ username: [
{ required: true, message: "用户名称不能为空", trigger: "blur" } { required: true, message: "用户名称不能为空", trigger: "blur" },
], ],
nickname: [ nickname: [
{ required: true, message: "用户昵称不能为空", trigger: "blur" } { required: true, message: "用户昵称不能为空", trigger: "blur" },
], ],
password: [ password: [
{ required: true, message: "用户密码不能为空", trigger: "blur" } { required: true, message: "用户密码不能为空", trigger: "blur" },
], ],
email: [ email: [
{ {
type: "email", type: "email",
message: "'请输入正确的邮箱地址", message: "'请输入正确的邮箱地址",
trigger: ["blur", "change"] trigger: ["blur", "change"],
} },
], ],
mobile: [ mobile: [
{ {
pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/, pattern:
/^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
message: "请输入正确的手机号码", message: "请输入正确的手机号码",
trigger: "blur" trigger: "blur",
} },
] ],
}, },
// //
openRole: false, openRole: false,
@ -312,34 +541,43 @@ export default {
// //
statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS), statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
sexDictDatas: getDictDatas(DICT_TYPE.SYSTEM_USER_SEX), sexDictDatas: getDictDatas(DICT_TYPE.SYSTEM_USER_SEX),
//
userMaxNum: 0,
}; };
}, },
watch: { watch: {
// //
deptName(val) { deptName(val) {
this.$refs.tree.filter(val); this.$refs.tree.filter(val);
} },
}, },
created() { created() {
this.getList(); this.getList();
this.getUserMaxNumFunction();
// this.getConfigKey("sys.user.init-password").then(response => { // this.getConfigKey("sys.user.init-password").then(response => {
// this.initPassword = response.msg; // this.initPassword = response.msg;
// }); // });
}, },
methods: { methods: {
//
getUserMaxNumFunction() {
getUserMaxNum().then((response) => {
this.userMaxNum = response.data;
});
},
// //
handleCommand(command, index, row) { handleCommand(command, index, row) {
switch (command) { switch (command) {
case 'handleUpdate': case "handleUpdate":
this.handleUpdate(row);// this.handleUpdate(row); //
break; break;
case 'handleDelete': case "handleDelete":
this.handleDelete(row);// this.handleDelete(row); //
break; break;
case 'handleResetPwd': case "handleResetPwd":
this.handleResetPwd(row); this.handleResetPwd(row);
break; break;
case 'handleRole': case "handleRole":
this.handleRole(row); this.handleRole(row);
break; break;
default: default:
@ -349,12 +587,11 @@ export default {
/** 查询用户列表 */ /** 查询用户列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listUser(this.queryParams).then(response => { listUser(this.queryParams).then((response) => {
this.userList = response.data.list; this.userList = response.data.list;
this.total = response.data.total; this.total = response.data.total;
this.loading = false; this.loading = false;
} });
);
}, },
// //
filterNode(value, data) { filterNode(value, data) {
@ -369,12 +606,18 @@ export default {
// //
handleStatusChange(row) { handleStatusChange(row) {
let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用"; let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
this.$modal.confirm('确认要"' + text + '""' + row.username + '"用户吗?').then(function() { this.$modal
.confirm('确认要"' + text + '""' + row.username + '"用户吗?')
.then(function () {
return changeUserStatus(row.id, row.status); return changeUserStatus(row.id, row.status);
}).then(() => { })
.then(() => {
this.$modal.msgSuccess(text + "成功"); this.$modal.msgSuccess(text + "成功");
}).catch(function() { })
row.status = row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE .catch(function () {
row.status =
row.status === CommonStatusEnum.ENABLE
? CommonStatusEnum.DISABLE
: CommonStatusEnum.ENABLE; : CommonStatusEnum.ENABLE;
}); });
}, },
@ -402,7 +645,7 @@ export default {
status: "0", status: "0",
remark: undefined, remark: undefined,
postIds: [], postIds: [],
roleIds: [] roleIds: [],
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -428,7 +671,7 @@ export default {
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id; const id = row.id;
getUser(id).then(response => { getUser(id).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改用户"; this.title = "修改用户";
@ -439,17 +682,19 @@ export default {
handleResetPwd(row) { handleResetPwd(row) {
this.$prompt('请输入"' + row.username + '"的新密码', "提示", { this.$prompt('请输入"' + row.username + '"的新密码', "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消" cancelButtonText: "取消",
}).then(({ value }) => { })
resetUserPwd(row.id, value).then(response => { .then(({ value }) => {
resetUserPwd(row.id, value).then((response) => {
this.$modal.msgSuccess("修改成功,新密码是:" + value); this.$modal.msgSuccess("修改成功,新密码是:" + value);
}); });
}).catch(() => {}); })
.catch(() => {});
}, },
/** 分配用户角色操作 */ /** 分配用户角色操作 */
handleRole(row) { handleRole(row) {
this.reset(); this.reset();
const id = row.id const id = row.id;
// form username nickname // form username nickname
this.form.id = id; this.form.id = id;
this.form.username = row.username; this.form.username = row.username;
@ -457,29 +702,29 @@ export default {
// //
this.openRole = true; this.openRole = true;
// //
listSimpleRoles().then(response => { listSimpleRoles().then((response) => {
// roleOptions // roleOptions
this.roleOptions = []; this.roleOptions = [];
this.roleOptions.push(...response.data); this.roleOptions.push(...response.data);
}); });
// //
listUserRoles(id).then(response => { listUserRoles(id).then((response) => {
// //
this.form.roleIds = response.data; this.form.roleIds = response.data;
}) });
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function() { submitForm: function () {
this.$refs["form"].validate(valid => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.id !== undefined) { if (this.form.id !== undefined) {
updateUser(this.form).then(response => { updateUser(this.form).then((response) => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addUser(this.form).then(response => { addUser(this.form).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
@ -489,12 +734,12 @@ export default {
}); });
}, },
/** 提交按钮(角色权限) */ /** 提交按钮(角色权限) */
submitRole: function() { submitRole: function () {
if (this.form.id !== undefined) { if (this.form.id !== undefined) {
assignUserRole({ assignUserRole({
userId: this.form.id, userId: this.form.id,
roleIds: this.form.roleIds, roleIds: this.form.roleIds,
}).then(response => { }).then((response) => {
this.$modal.msgSuccess("分配角色成功"); this.$modal.msgSuccess("分配角色成功");
this.openRole = false; this.openRole = false;
this.getList(); this.getList();
@ -504,26 +749,34 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除用户编号为"' + ids + '"的数据项?').then(function() { this.$modal
.confirm('是否确认删除用户编号为"' + ids + '"的数据项?')
.then(function () {
return delUser(ids); return delUser(ids);
}).then(() => { })
.then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => {}); })
.catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.$modal.confirm('是否确认导出所有用户数据项?').then(() => { this.$modal
.confirm("是否确认导出所有用户数据项?")
.then(() => {
// //
let params = {...this.queryParams}; let params = { ...this.queryParams };
params.pageNo = undefined; params.pageNo = undefined;
params.pageSize = undefined; params.pageSize = undefined;
this.exportLoading = true; this.exportLoading = true;
return exportUser(params); return exportUser(params);
}).then(response => { })
this.$download.excel(response, '用户数据.xls'); .then((response) => {
this.$download.excel(response, "用户数据.xls");
this.exportLoading = false; this.exportLoading = false;
}).catch(() => {}); })
.catch(() => {});
}, },
/** 导入按钮操作 */ /** 导入按钮操作 */
handleImport() { handleImport() {
@ -532,8 +785,8 @@ export default {
}, },
/** 下载模板操作 */ /** 下载模板操作 */
importTemplate() { importTemplate() {
importTemplate().then(response => { importTemplate().then((response) => {
this.$download.excel(response, '用户导入模板.xls'); this.$download.excel(response, "用户导入模板.xls");
}); });
}, },
// //
@ -543,7 +796,7 @@ export default {
// //
handleFileSuccess(response, file, fileList) { handleFileSuccess(response, file, fileList) {
if (response.code !== 0) { if (response.code !== 0) {
this.$modal.msgError(response.msg) this.$modal.msgError(response.msg);
return; return;
} }
this.upload.open = false; this.upload.open = false;
@ -551,17 +804,22 @@ export default {
this.$refs.upload.clearFiles(); this.$refs.upload.clearFiles();
// //
let data = response.data; let data = response.data;
let text = '创建成功数量:' + data.createUsernames.length; let text = "创建成功数量:" + data.createUsernames.length;
for (const username of data.createUsernames) { for (const username of data.createUsernames) {
text += '<br />&nbsp;&nbsp;&nbsp;&nbsp;' + username; text += "<br />&nbsp;&nbsp;&nbsp;&nbsp;" + username;
} }
text += '<br />更新成功数量:' + data.updateUsernames.length; text += "<br />更新成功数量:" + data.updateUsernames.length;
for (const username of data.updateUsernames) { for (const username of data.updateUsernames) {
text += '<br />&nbsp;&nbsp;&nbsp;&nbsp;' + username; text += "<br />&nbsp;&nbsp;&nbsp;&nbsp;" + username;
} }
text += '<br />更新失败数量:' + Object.keys(data.failureUsernames).length; text +=
"<br />更新失败数量:" + Object.keys(data.failureUsernames).length;
for (const username in data.failureUsernames) { for (const username in data.failureUsernames) {
text += '<br />&nbsp;&nbsp;&nbsp;&nbsp;' + username + '' + data.failureUsernames[username]; text +=
"<br />&nbsp;&nbsp;&nbsp;&nbsp;" +
username +
"" +
data.failureUsernames[username];
} }
this.$alert(text, "导入结果", { dangerouslyUseHTMLString: true }); this.$alert(text, "导入结果", { dangerouslyUseHTMLString: true });
this.getList(); this.getList();
@ -575,9 +833,11 @@ export default {
return { return {
id: node.id, id: node.id,
label: node.name, label: node.name,
children: node.children children: node.children,
} };
} },
} },
}; };
</script> </script>
<style lang="scss" scoped></style>

Loading…
Cancel
Save