完善导出功能

This commit is contained in:
WUSIJIAN
2025-12-03 17:24:34 +08:00
parent 8b57729c8a
commit 990bbfd8fd
6 changed files with 682 additions and 797 deletions

View File

@@ -36,10 +36,22 @@ export function updateProduct(data: object) {
}); });
} }
// 导出产品
export function exportProduct(data: object) { export function exportProduct(data: object) {
return newService({ return newService({
url: '/customerService/product/export', url: '/customerService/product/export',
responseType: 'blob',
method: 'get', method: 'get',
params: data, params: data,
}); });
} }
//导入产品
export function importProduct(data: object) {
return newService({
url: '/customerService/product/import',
responseType: 'blob',
method: 'post',
data: data,
});
}

View File

@@ -51,6 +51,14 @@ const responseInterceptor = (response: any) => {
const res = response.data; const res = response.data;
const code = response.data.code; const code = response.data.code;
const message = response.data.message; const message = response.data.message;
// 第65行附近添加如果是文件流响应直接返回整个response
if (
response.config.responseType === 'blob' ||
response.headers['content-type']?.includes('application/zip') ||
response.headers['content-type']?.includes('application/octet-stream')
) {
return response; // 直接返回原始响应不进行JSON解析
}
if (code === 401 || message === 'token is invalid') { if (code === 401 || message === 'token is invalid') {
// 401未授权token过期跳转登录页 // 401未授权token过期跳转登录页
ElMessageBox.alert('登录状态已过期,请重新登录', '提示', { confirmButtonText: '确定' }) ElMessageBox.alert('登录状态已过期,请重新登录', '提示', { confirmButtonText: '确定' })

View File

@@ -1,55 +1,99 @@
<template> <template>
<el-dialog title="是否导出产品" v-model="isShowDialog" width="500px"> <el-dialog title="是否导出产品" v-model="isShowDialog" width="400px">
<div style="text-align: center; padding: 20px 0">
<p style="margin-bottom: 20px; font-size: 14px; color: #606266">确定要导出产品数据吗</p>
</div>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button @click="isShowDialog = false">取消</el-button> <el-button @click="isShowDialog = false">取消</el-button>
<el-button type="primary" @click="handleExport">导出</el-button> <el-button type="primary" @click="handleExport" :loading="loading">导出</el-button>
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref, reactive } from 'vue'; import { ref } from 'vue';
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';
import { exportProduct } from '/@/api/customerService/product'; import { exportProduct } from '/@/api/customerService/product';
const isShowDialog = ref(false); const isShowDialog = ref(false);
const tableData = ref([]); const loading = ref(false);
const exportname = ref(); const exportName = ref(''); // 用于存储产品名称筛选参数
const form = reactive({ // 打开对话框,支持传入筛选参数
exportType: 'current', const openDialog = (name?: string) => {
fileType: 'xlsx',
});
// 打开对话框
const openDialog = (name: string) => {
isShowDialog.value = true; isShowDialog.value = true;
exportname.value = name; exportName.value = name || '';
}; };
// 处理导出 // 处理导出
const handleExport = async () => { const handleExport = async () => {
// 这里处理导出逻辑 try {
if (exportname.value) { loading.value = true;
await exportProduct({ name: exportname.value });
// 构建请求参数
const params: any = {};
if (exportName.value) {
params.name = exportName.value;
}
// 调用导出接口 - 根据API文档这里应该返回JSON
const response = await exportProduct(params);
console.log('导出响应:', response);
// 根据API文档成功响应是200状态码返回JSON数据
// 但实际后端可能直接返回文件流,所以需要处理两种情况
if (response instanceof Blob) {
// 情况1后端直接返回文件流你的实际情况
handleFileDownload(response, 'products_export.zip');
} else if (response.data && response.data instanceof Blob) {
// 情况2文件流在data字段中
handleFileDownload(response.data, 'products_export.zip');
} else if (response.data && response.data.downloadUrl) {
// 情况3返回下载链接符合API文档规范
window.open(response.data.downloadUrl, '_blank');
ElMessage.success('导出任务已提交,请在新窗口下载文件');
} else {
// 情况4返回任务ID或其他信息
ElMessage.success('导出任务已提交,请稍后查看下载列表');
}
isShowDialog.value = false;
} catch (error: any) {
console.error('导出失败:', error);
ElMessage.error(`导出失败:${error.message || '未知错误'}`);
} finally {
loading.value = false;
}
};
// 处理文件下载
const handleFileDownload = (blob: Blob, filename: string) => {
const url = window.URL.createObjectURL(blob);
const link = document.createElement('a');
link.href = url;
// 如果有筛选条件,在文件名中体现
if (exportName.value) {
filename = `products_${exportName.value}_${new Date().getTime()}.zip`;
} else { } else {
await exportProduct({}); filename = `products_${new Date().getTime()}.zip`;
} }
console.log(tableData.value, '111'); link.download = filename;
console.log(exportname.value, '222'); document.body.appendChild(link);
link.click();
document.body.removeChild(link);
window.URL.revokeObjectURL(url);
ElMessage.success('导出成功'); ElMessage.success('导出成功!文件已开始下载');
isShowDialog.value = false;
}; };
// 暴露方法给父组件使用 // 暴露方法给父组件使用
defineExpose({ defineExpose({
/**
* 打开对话框方法
*/
openDialog, openDialog,
}); });
</script> </script>

View File

@@ -16,43 +16,70 @@
:before-upload="beforeUpload" :before-upload="beforeUpload"
:on-exceed="handleExceed" :on-exceed="handleExceed"
:on-remove="handleRemove" :on-remove="handleRemove"
:show-file-list="true"
:auto-upload="false" <!-- 手动触发上传 -->
> >
<div class="el-upload-area"> <div class="el-upload-area">
<el-icon class="el-icon--upload"> <el-icon class="el-icon--upload">
<UploadFilled /> <UploadFilled />
</el-icon> </el-icon>
<div class="el-upload__text">将ZIP文件拖到此处<em>点击上传</em></div> <div class="el-upload__text">将ZIP文件拖到此处<em>点击上传</em></div>
<div class="el-upload__tip">上传ZIP文件批量导入产品TXT格式</div>
</div> </div>
</el-upload> </el-upload>
<!-- 导入说明 --> <!-- 导入说明 -->
<div class="import-instructions mt20"> <div class="import-instructions mt20">
<el-card shadow="never" class="box-card"> <el-card shadow="never" class="box-card">
<template #header>
<div class="card-header">
<span>导入说明</span>
</div>
</template>
<el-text type="info" size="small"> <el-text type="info" size="small">
<ul class="instruction-list"> <ul class="instruction-list">
<li>1. 先下载模板ZIP包查看Word文档格式要求</li> <li>1. 上传包含TXT格式产品数据的ZIP压缩包</li>
<li>2. 按照模板中的Word文档格式准备您的产品文档</li> <li>2. 文件编码请使用UTF-8</li>
<li>3. 将您的Word文档打包成ZIP格式上传</li> <li>3. 文件大小不能超过 {{ fileSizeLimit }}MB</li>
<li>4. 支持 .docx 格式的Word文档</li> <li>4. 导入前请确保数据格式正确</li>
<li>5. 文件大小不能超过 {{ fileSizeLimit }}MB</li>
</ul> </ul>
</el-text> </el-text>
</el-card> </el-card>
</div> </div>
<!-- 导入结果展示 -->
<div v-if="importResult" class="import-result mt20">
<el-alert
:title="importResult.success ? '导入完成' : '导入失败'"
:type="importResult.success ? 'success' : 'error'"
:closable="false"
show-icon
>
<template v-if="importResult.success">
<div>成功导入 {{ importResult.data.failCount === 0 ? '所有' : '部分' }} 产品数据</div>
<div v-if="importResult.data.failCount > 0">
失败 {{ importResult.data.failCount }} 条记录
</div>
<div v-if="importResult.data.failReasons && importResult.data.failReasons.length > 0">
<el-collapse>
<el-collapse-item title="查看失败原因">
<div v-for="(reason, index) in importResult.data.failReasons" :key="index">
{{ reason }}
</div>
</el-collapse-item>
</el-collapse>
</div>
</template>
<template v-else>
<div>{{ importResult.message }}</div>
</template>
</el-alert>
</div>
</div> </div>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<!-- 下载模板按钮 -->
<el-button type="primary" size="default" :loading="downloadLoading" @click="handleDownloadTemplate" class="download-btn">
<template #icon>
<el-icon><Download /></el-icon>
</template>
{{ downloadLoading ? '生成中...' : '下载模板' }}
</el-button>
<el-button @click="handleCancel">取消</el-button> <el-button @click="handleCancel">取消</el-button>
<el-button type="primary" :loading="loading" @click="handleSubmitUpload"> <el-button type="primary" :loading="loading" @click="handleSubmitUpload">
{{ loading ? '导入中...' : '开始导入' }} {{ loading ? '导入中...' : '开始导入' }}
</el-button> </el-button>
@@ -62,186 +89,44 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref, reactive, nextTick } from 'vue'; import { ref, reactive } from 'vue';
import { ElMessage, ElMessageBox, type UploadInstance } from 'element-plus'; import { ElMessage, ElMessageBox, type UploadInstance, type UploadFile } from 'element-plus';
import { UploadFilled, Download } from '@element-plus/icons-vue'; import { UploadFilled } from '@element-plus/icons-vue';
import JSZip from 'jszip'; import { importProduct } from '/@/api/customerService/product';
import { saveAs } from 'file-saver';
// 定义组件事件
const emit = defineEmits<{ const emit = defineEmits<{
/** (e: 'getProductList'): void;
* 获取产品列表事件 - 导入成功后刷新列表
*/
(e: 'getRoleList'): void;
}>(); }>();
// 响应式状态
const isShowDialog = ref(false); const isShowDialog = ref(false);
const loading = ref(false); const loading = ref(false);
const downloadLoading = ref(false);
const uploadRef = ref<UploadInstance>(); const uploadRef = ref<UploadInstance>();
const importResult = ref<any>(null);
// 上传配置 // 上传配置
const uploadAction = '/api/product/import-word-zip'; const uploadAction = '/api/customerService/product/import';
const uploadHeaders = reactive({ const uploadHeaders = reactive({
Authorization: `Bearer ${localStorage.getItem('token') || ''}`, Authorization: `Bearer ${localStorage.getItem('token') || ''}`,
}); });
const uploadData = reactive({ const uploadData = reactive({});
type: 'word-zip',
});
const acceptFileTypes = '.zip,.ZIP'; const acceptFileTypes = '.zip,.ZIP';
const fileSizeLimit = 50; const fileSizeLimit = 50;
// 模板内容定义
const templateContents = {
/** 产品说明书模板内容 */
manual: `产品说明书模板
产品名称_________________________
产品型号_________________________
创建人___________________________
创建时间_________________________
产品描述:
___________________________________
___________________________________
技术参数:
• 规格___________________________
• 尺寸___________________________
• 重量___________________________
• 材质___________________________
功能特点:
1. ________________________________
2. ________________________________
3. ________________________________
使用说明:
___________________________________
___________________________________
注意事项:
• ________________________________
• ________________________________
• ________________________________`,
/** 技术规格书模板内容 */
spec: `技术规格书模板
产品名称_________________________
产品型号_________________________
技术规格:
1. 基本参数
- 工作电压___________________
- 功率_______________________
- 尺寸_______________________
- 重量_______________________
2. 性能指标
- 精度_______________________
- 范围_______________________
- 寿命_______________________
3. 环境要求
- 工作温度___________________
- 存储温度___________________
- 湿度_______________________
4. 安全标准
- 认证_______________________
- 防护等级___________________`,
/** 使用说明文档内容 */
readme: `产品文档导入模板使用说明
================================
欢迎使用产品文档导入模板!
📁 ZIP包内容说明
-----------------
1. 产品说明书模板.docx - 产品详细说明文档模板
2. 技术规格书模板.docx - 技术参数文档模板
3. 使用说明.txt - 本说明文件
📝 使用步骤:
-----------
1. 解压本ZIP包到您的电脑
2. 打开Word文档模板
3. 按照模板格式填写您的产品信息
4. 保存您填写好的Word文档
5. 将填写好的文档重新打包成ZIP格式
6. 在系统中上传您制作的ZIP包
⚙️ 文档要求:
-----------
• 必须使用 .docx 格式Word 2007及以上版本
• 文档命名请使用有意义的名称
• 确保填写所有必填字段
• 文档大小不超过10MB/个
📞 技术支持:
-----------
如有问题请联系系统管理员。
祝您使用愉快!`,
};
/**
* 创建Word文档的二进制内容
* @param content - 文档内容
* @returns Blob对象
*/
const createWordDocumentContent = (content: string): Blob => {
// 简化的Word文档XML结构
const wordContent = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<?mso-application progid="Word.Document"?>
<w:wordDocument xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml">
<w:body>
<w:p>
<w:r>
<w:t>${content.replace(/\n/g, '</w:t></w:r></w:p><w:p><w:r><w:t>')}</w:t>
</w:r>
</w:p>
</w:body>
</w:wordDocument>`;
return new Blob([wordContent], {
type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
});
};
/**
* 创建文本文件内容
* @param content - 文本内容
* @returns Blob对象
*/
const createTextFile = (content: string): Blob => {
return new Blob([content], { type: 'text/plain;charset=utf-8' });
};
/** /**
* 打开对话框 * 打开对话框
*/ */
const openDialog = () => { const openDialog = () => {
isShowDialog.value = true; isShowDialog.value = true;
loading.value = false; loading.value = false;
downloadLoading.value = false; importResult.value = null;
// 清空已上传的文件
nextTick(() => {
uploadRef.value?.clearFiles();
});
}; };
/** /**
* 处理对话框关闭 * 处理对话框关闭
*/ */
const handleDialogClose = () => { const handleDialogClose = () => {
// 清空上传文件
uploadRef.value?.clearFiles(); uploadRef.value?.clearFiles();
importResult.value = null;
}; };
/** /**
@@ -251,49 +136,8 @@ const handleCancel = () => {
isShowDialog.value = false; isShowDialog.value = false;
}; };
/**
* 下载模板文件
*/
const handleDownloadTemplate = async () => {
downloadLoading.value = true;
try {
const zip = new JSZip();
// 添加模板文件到ZIP包
zip.file('产品说明书模板.docx', createWordDocumentContent(templateContents.manual));
zip.file('技术规格书模板.docx', createWordDocumentContent(templateContents.spec));
zip.file('使用说明.txt', createTextFile(templateContents.readme));
// 生成ZIP包
const zipBlob = await zip.generateAsync({
type: 'blob',
compression: 'DEFLATE',
compressionOptions: { level: 6 },
});
// 检查文件大小
if (zipBlob.size === 0) {
throw new Error('生成的ZIP包为空');
}
// 下载文件
const dateString = new Date().toISOString().split('T')[0];
saveAs(zipBlob, `产品文档导入模板_${dateString}.zip`);
ElMessage.success(`模板下载成功!文件大小:${(zipBlob.size / 1024).toFixed(2)}KB`);
} catch (error) {
console.error('模板下载失败:', error);
ElMessage.error(`模板生成失败:${error instanceof Error ? error.message : '未知错误'}`);
} finally {
downloadLoading.value = false;
}
};
/** /**
* 上传前校验 * 上传前校验
* @param file - 上传的文件
* @returns 是否允许上传
*/ */
const beforeUpload = (file: File): boolean => { const beforeUpload = (file: File): boolean => {
const isZip = file.type === 'application/zip' || file.name.toLowerCase().endsWith('.zip'); const isZip = file.type === 'application/zip' || file.name.toLowerCase().endsWith('.zip');
@@ -309,7 +153,7 @@ const beforeUpload = (file: File): boolean => {
return false; return false;
} }
ElMessage.info(`开始上传: ${file.name} (${(file.size / 1024 / 1024).toFixed(2)}MB)`); importResult.value = null;
return true; return true;
}; };
@@ -324,126 +168,89 @@ const handleExceed = () => {
* 处理文件移除 * 处理文件移除
*/ */
const handleRemove = () => { const handleRemove = () => {
// 文件移除后的清理操作 importResult.value = null;
};
/**
* 处理上传成功
* @param response - 服务器响应
*/
const handleUploadSuccess = (response: any) => {
loading.value = false;
if (response.code === 200) {
ElMessage.success('文件导入成功');
emit('getRoleList');
isShowDialog.value = false;
} else {
ElMessage.error(response.msg || '文件导入失败');
}
};
/**
* 处理上传失败
* @param error - 错误信息
*/
const handleUploadError = (error: any) => {
loading.value = false;
ElMessage.error('文件上传失败,请重试');
console.error('Upload error:', error);
}; };
/** /**
* 手动提交上传 * 手动提交上传
*/ */
const handleSubmitUpload = async () => { const handleSubmitUpload = async () => {
if (!uploadRef.value?.uploadFiles?.length) { const fileList = uploadRef.value?.uploadFiles;
ElMessage.warning('请先选择要上传的文件'); if (!fileList || fileList.length === 0) {
ElMessage.warning('请先选择要上传的ZIP文件');
return; return;
} }
try { try {
await ElMessageBox.confirm('确认导入选中的文件吗?', '导入确认', { await ElMessageBox.confirm(
confirmButtonText: '确认导入', '确认导入选中的产品数据吗?',
cancelButtonText: '取消', '导入确认',
type: 'warning', {
}); confirmButtonText: '确认导入',
cancelButtonText: '取消',
type: 'warning',
}
);
loading.value = true; loading.value = true;
uploadRef.value.submit(); importResult.value = null;
const file = fileList[0].raw!;
await handleCustomUpload(file);
} catch { } catch {
// 用户取消操作 loading.value = false;
} }
}; };
// 暴露方法给父组件 /**
defineExpose({ * 自定义上传处理
openDialog, */
}); const handleCustomUpload = async (file: File) => {
</script> try {
// 调用导入接口
<style scoped lang="scss"> const response = await importProduct(file);
.import-container {
padding: 10px 0; // 根据API文档响应结构为: { failCount: number, failReasons: string[] }
} if (response.code === 200) {
importResult.value = {
.upload-demo { success: true,
width: 100%; data: response.data,
} message: '导入成功'
};
.el-upload-area {
padding: 20px; ElMessage.success(`导入完成!失败记录:${response.data.failCount}`);
text-align: center; emit('getProductList');
}
// 3秒后自动关闭
.el-icon--upload { setTimeout(() => {
font-size: 48px; if (isShowDialog.value && response.data.failCount === 0) {
color: #c0c4cc; isShowDialog.value = false;
margin-bottom: 16px; }
} }, 3000);
} else {
.import-instructions { throw new Error(response.message || '导入失败');
.mt20 {
margin-top: 20px;
}
}
.instruction-list {
margin: 0;
padding-left: 16px;
line-height: 1.8;
li {
margin-bottom: 4px;
}
}
.dialog-footer {
display: flex;
justify-content: right;
align-items: center;
.download-btn {
background-color: coral;
border-color: coral;
width: 120px;
&:hover {
background-color: #ff7f50;
border-color: #ff7f50;
} }
} catch (error: any) {
importResult.value = {
success: false,
message: error.message || '导入失败'
};
ElMessage.error(`导入失败:${error.message || '未知错误'}`);
} finally {
loading.value = false;
} }
} };
:deep(.el-upload-dragger) { // 保留原有方法用于自动上传模式
width: 100%; const handleUploadSuccess = (response: any) => {
height: 180px; // 处理自动上传的成功响应
display: flex; };
align-items: center;
justify-content: center;
}
:deep(.el-upload-list) { const handleUploadError = (error: any) => {
margin-top: 10px; // 处理自动上传的错误
} };
</style>
defineExpose({ openDialog });
</script>

View File

@@ -1,18 +1,18 @@
<template> <template>
<div class="system-edit-user-container"> <div class="system-edit-user-container">
<el-dialog :title="(ruleForm.userId!==0?'修改':'添加')+'用户'" v-model="isShowDialog" width="769px"> <el-dialog :title="(ruleForm.userId !== 0 ? '修改' : '添加') + '用户'" v-model="isShowDialog" width="769px">
<el-form ref="formRef" :model="ruleForm" :rules="rules" size="default" label-width="90px"> <el-form ref="formRef" :model="ruleForm" :rules="rules" size="default" label-width="90px">
<el-row :gutter="35"> <el-row :gutter="35">
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="ruleForm.userId===0"> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="ruleForm.userId === 0">
<el-form-item label="用户名" prop="userName"> <el-form-item label="用户名" prop="userName">
<el-input v-model="ruleForm.userName" placeholder="请输入账户名称" clearable></el-input> <el-input v-model="ruleForm.userName" placeholder="请输入账户名称" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="ruleForm.userId===0"> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="ruleForm.userId === 0">
<el-form-item label="账户密码" prop="password"> <el-form-item label="账户密码" prop="password">
<el-input v-model="ruleForm.password" placeholder="请输入" type="password" clearable></el-input> <el-input v-model="ruleForm.password" placeholder="请输入" type="password" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="用户昵称" prop="nickName"> <el-form-item label="用户昵称" prop="nickName">
<el-input v-model="ruleForm.nickName" placeholder="请输入用户昵称" clearable></el-input> <el-input v-model="ruleForm.nickName" placeholder="请输入用户昵称" clearable></el-input>
@@ -21,12 +21,7 @@
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="关联角色" prop="roleIds"> <el-form-item label="关联角色" prop="roleIds">
<el-select v-model="ruleForm.roleIds" placeholder="请选择" clearable class="w100" multiple> <el-select v-model="ruleForm.roleIds" placeholder="请选择" clearable class="w100" multiple>
<el-option <el-option v-for="role in roleList" :key="'role-' + role.id" :label="role.name" :value="role.id"> </el-option>
v-for="role in roleList"
:key="'role-'+role.id"
:label="role.name"
:value="role.id">
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -34,7 +29,7 @@
<el-form-item label="部门" prop="deptId"> <el-form-item label="部门" prop="deptId">
<el-cascader <el-cascader
:options="deptData" :options="deptData"
:props="{ checkStrictly: true,emitPath: false, value: 'deptId', label: 'deptName' }" :props="{ checkStrictly: true, emitPath: false, value: 'deptId', label: 'deptName' }"
placeholder="请选择部门" placeholder="请选择部门"
clearable clearable
class="w100" class="w100"
@@ -60,43 +55,45 @@
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="性别" prop="sex"> <el-form-item label="性别" prop="sex">
<el-select v-model="ruleForm.sex" placeholder="请选择" clearable class="w100"> <el-select v-model="ruleForm.sex" placeholder="请选择" clearable class="w100">
<el-option <el-option v-for="gender in genderData" :key="'gender-' + gender.value" :label="gender.label" :value="gender.value"></el-option>
v-for="gender in genderData" </el-select>
:key="'gender-'+gender.value" </el-form-item>
:label="gender.label" </el-col>
:value="gender.value"></el-option> <!-- 新增租户 -->
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="租户" prop="tenantId">
<el-select v-model="ruleForm.tenantId" placeholder="请选择租户" clearable class="w100" :disabled="ruleForm.userId !== 0">
<el-option v-for="tenant in tenantList" :key="'tenant-' + tenant.id" :label="tenant.name" :value="tenant.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="岗位" prop="postIds"> <el-form-item label="岗位" prop="postIds">
<el-select v-model="ruleForm.postIds" placeholder="请选择" clearable class="w100" multiple> <el-select v-model="ruleForm.postIds" placeholder="请选择" clearable class="w100" multiple>
<el-option <el-option v-for="post in postList" :key="'post-' + post.postId" :label="post.postName" :value="post.postId"> </el-option>
v-for="post in postList" </el-select>
:key="'post-'+post.postId"
:label="post.postName"
:value="post.postId">
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="用户状态"> <el-form-item label="用户状态">
<el-switch v-model="ruleForm.status" inline-prompt :active-value="1" :inactive-value="0" active-text="启" inactive-text="禁"></el-switch> <el-switch
v-model="ruleForm.status"
inline-prompt
:active-value="1"
:inactive-value="0"
active-text=""
inactive-text=""
></el-switch>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="用户类型">
<el-radio-group v-model="ruleForm.isAdmin">
<el-radio :label="1">后台管理员</el-radio>
<el-radio :label="0">前台用户</el-radio>
</el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<el-form-item label="用户类型">
<el-radio-group v-model="ruleForm.isAdmin">
<el-radio
:label="1"
>后台管理员</el-radio>
<el-radio
:label="0"
>前台用户</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20"> <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="用户描述"> <el-form-item label="用户描述">
<el-input v-model="ruleForm.remark" type="textarea" placeholder="请输入用户描述" maxlength="150"></el-input> <el-input v-model="ruleForm.remark" type="textarea" placeholder="请输入用户描述" maxlength="150"></el-input>
@@ -107,7 +104,7 @@
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button @click="onCancel" size="default"> </el-button> <el-button @click="onCancel" size="default"> </el-button>
<el-button type="primary" @click="onSubmit" size="default">{{ruleForm.userId!==0?'修 改':'添 加'}}</el-button> <el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.userId !== 0 ? '修 改' : '添 加' }}</el-button>
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
@@ -115,98 +112,93 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import { reactive, toRefs, onMounted, defineComponent,ref,unref } from 'vue'; import { reactive, toRefs, onMounted, defineComponent, ref, unref } from 'vue';
import {getParams, addUser, editUser, getEditUser} from "/@/api/system/user"; import { getParams, addUser, editUser, getEditUser } from '/@/api/system/user';
import {ElMessage} from "element-plus"; import { ElMessage } from 'element-plus';
export default defineComponent({ export default defineComponent({
name: 'systemEditUser', name: 'systemEditUser',
props:{ props: {
deptData:{ deptData: {
type:Array, type: Array,
default:()=>[] default: () => [],
}, },
genderData:{ genderData: {
type:Array, type: Array,
default:()=>[] default: () => [],
} },
}, },
setup(prop,{emit}) { setup(prop, { emit }) {
const roleList = ref([]); const roleList = ref([]);
const postList = ref([]); const postList = ref([]);
const formRef = ref<HTMLElement | null>(null); const tenantList = ref([]); // 新增租户列表
const formRef = ref<HTMLElement | null>(null);
const state = reactive({ const state = reactive({
isShowDialog: false, isShowDialog: false,
ruleForm: { ruleForm: {
userId: 0, userId: 0,
deptId: 0, deptId: 0,
userName: '', userName: '',
nickName: '', nickName: '',
password: '', password: '',
mobile:'', mobile: '',
email: '', email: '',
sex: '', sex: '',
status: 1, status: 1,
remark: '', remark: '',
postIds: [], postIds: [],
roleIds: [], roleIds: [],
isAdmin:0, isAdmin: 0,
tenantId: '', // 新增租户ID字段
},
//表单校验
rules: {
userName: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
nickName: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
deptId: [{ required: true, message: '归属部门不能为空', trigger: 'blur' }],
password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }],
tenantId: [{ required: true, message: '请选择租户', trigger: 'change' }], // 新增租户校验
email: [
{
type: 'email',
message: "'请输入正确的邮箱地址",
trigger: ['blur', 'change'],
},
],
mobile: [
{ required: true, message: '手机号码不能为空', trigger: 'blur' },
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: '请输入正确的手机号码',
trigger: 'blur',
},
],
}, },
//表单校验
rules: {
userName: [
{ required: true, message: "用户名称不能为空", trigger: "blur" }
],
nickName: [
{ required: true, message: "用户昵称不能为空", trigger: "blur" }
],
deptId: [
{ required: true, message: "归属部门不能为空", trigger: "blur" }
],
password: [
{ required: true, message: "用户密码不能为空", trigger: "blur" }
],
email: [
{
type: "email",
message: "'请输入正确的邮箱地址",
trigger: ["blur", "change"]
}
],
mobile: [
{ required: true, message: "手机号码不能为空", trigger: "blur" },
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: "请输入正确的手机号码",
trigger: "blur"
}
]
}
}); });
// 打开弹窗 // 打开弹窗
const openDialog = (row?:any) => { const openDialog = (row?: any) => {
resetForm() resetForm();
if(row) { if (row) {
getEditUser(row.id).then((res:any)=>{ getEditUser(row.id).then((res: any) => {
const user = res.data.user; const user = res.data.user;
state.ruleForm = { state.ruleForm = {
userId: user.id, userId: user.id,
deptId: user.deptId, deptId: user.deptId,
userName: user.userName, userName: user.userName,
nickName: user.userNickname, nickName: user.userNickname,
password: '-', password: '-',
mobile:user.mobile, mobile: user.mobile,
email: user.userEmail, email: user.userEmail,
sex: String(user.sex), sex: String(user.sex),
status: user.userStatus, status: user.userStatus,
remark: user.remark, remark: user.remark,
postIds: res.data.checkedPosts??[], postIds: res.data.checkedPosts ?? [],
roleIds: res.data.checkedRoleIds??[], roleIds: res.data.checkedRoleIds ?? [],
isAdmin:user.isAdmin, isAdmin: user.isAdmin,
}; tenantId: user.tenantId || '', // 设置租户ID
}) };
} });
}
state.isShowDialog = true; state.isShowDialog = true;
}; };
// 关闭弹窗 // 关闭弹窗
@@ -217,67 +209,88 @@ export default defineComponent({
const onCancel = () => { const onCancel = () => {
closeDialog(); closeDialog();
}; };
// 新增 // 新增
const onSubmit = () => { const onSubmit = () => {
const formWrap = unref(formRef) as any; const formWrap = unref(formRef) as any;
if (!formWrap) return; if (!formWrap) return;
formWrap.validate((valid: boolean) => { formWrap.validate((valid: boolean) => {
if (valid) { if (valid) {
if(state.ruleForm.userId===0){ if (state.ruleForm.userId === 0) {
//添加 // 新增用户 - 包含租户信息
addUser(state.ruleForm).then(()=>{ addUser(state.ruleForm)
ElMessage.success('用户添加成功'); .then(() => {
closeDialog(); // 关闭弹窗 ElMessage.success('用户添加成功');
emit('getUserList') closeDialog(); // 关闭弹窗
}); emit('getUserList');
}else{ })
//修改 .catch((error) => {
editUser(state.ruleForm).then(()=>{ ElMessage.error('用户添加失败:' + (error.message || '未知错误'));
ElMessage.success('用户修改成功'); });
closeDialog(); // 关闭弹窗 } else {
emit('getUserList') // 修改用户 - 根据需求决定是否包含租户信息
}); const editData = { ...state.ruleForm };
} // 如果修改时不允许修改租户可以删除tenantId字段
} // delete editData.tenantId;
});
editUser(editData)
.then(() => {
ElMessage.success('用户修改成功');
closeDialog(); // 关闭弹窗
emit('getUserList');
})
.catch((error) => {
ElMessage.error('用户修改失败:' + (error.message || '未知错误'));
});
}
}
});
}; };
// 初始化部门数据 // 初始化部门数据
const initTableData = () => { const initTableData = () => {
//获取角色岗位选项 //获取角色岗位选项
getParams().then((res:any)=>{ getParams()
roleList.value = res.data.roleList??[]; .then((res: any) => {
postList.value = res.data.posts??[]; roleList.value = res.data.roleList ?? [];
}); postList.value = res.data.posts ?? [];
tenantList.value = res.data.tenantList ?? []; // 获取租户列表
})
.catch((error) => {
console.error('获取参数失败:', error);
ElMessage.error('获取初始化数据失败');
});
}; };
// 页面加载时 // 页面加载时
onMounted(() => { onMounted(() => {
initTableData(); initTableData();
}); });
const resetForm = ()=>{ const resetForm = () => {
state.ruleForm = { state.ruleForm = {
userId: 0, userId: 0,
deptId: 0, deptId: 0,
userName: '', userName: '',
nickName: '', nickName: '',
password: '', password: '',
mobile:'', mobile: '',
email: '', email: '',
sex: '', sex: '',
status: 1, status: 1,
remark: '', remark: '',
postIds: [], postIds: [],
roleIds: [], roleIds: [],
isAdmin:0, isAdmin: 0,
} tenantId: '', // 重置租户ID
}; };
};
return { return {
openDialog, openDialog,
closeDialog, closeDialog,
onCancel, onCancel,
onSubmit, onSubmit,
roleList, roleList,
postList, postList,
formRef, tenantList, // 返回租户列表
formRef,
...toRefs(state), ...toRefs(state),
}; };
}, },

View File

@@ -1,159 +1,155 @@
<template> <template>
<div class="system-user-container"> <div class="system-user-container">
<el-row :gutter="10" style="width: 100%;"> <el-row :gutter="10" style="width: 100%">
<el-col :span="4"> <el-col :span="4">
<el-card shadow="hover"> <el-card shadow="hover">
<el-aside> <el-aside>
<el-scrollbar> <el-scrollbar>
<el-input :prefix-icon="search" v-model="filterText" placeholder="请输入部门名称" clearable size="default" style="width: 80%;"/> <el-input :prefix-icon="search" v-model="filterText" placeholder="请输入部门名称" clearable size="default" style="width: 80%" />
<el-tree <el-tree
ref="treeRef" ref="treeRef"
class="filter-tree" class="filter-tree"
:data="deptData" :data="deptData"
:props="deptProps" :props="deptProps"
default-expand-all default-expand-all
:filter-node-method="deptFilterNode" :filter-node-method="deptFilterNode"
@node-click="handleNodeClick" @node-click="handleNodeClick"
/> />
</el-scrollbar> </el-scrollbar>
</el-aside> </el-aside>
</el-card> </el-card>
</el-col> </el-col>
<el-col :span="20"> <el-col :span="20">
<el-card shadow="hover"> <el-card shadow="hover">
<div class="system-user-search mb15"> <div class="system-user-search mb15">
<el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px"> <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
<el-form-item label="关键字" prop="keyWords"> <el-form-item label="关键字" prop="keyWords">
<el-input <el-input
v-model="tableData.param.keyWords" v-model="tableData.param.keyWords"
placeholder="请输入用户账号或姓名" placeholder="请输入用户账号或姓名"
clearable clearable
size="default" size="default"
style="width: 240px" style="width: 240px"
@keyup.enter.native="userList" @keyup.enter.native="userList"
/> />
</el-form-item> </el-form-item>
<el-form-item label="手机号码" prop="mobile"> <el-form-item label="手机号码" prop="mobile">
<el-input <el-input
v-model="tableData.param.mobile" v-model="tableData.param.mobile"
placeholder="请输入手机号码" placeholder="请输入手机号码"
clearable clearable
size="default" size="default"
style="width: 240px" style="width: 240px"
@keyup.enter.native="userList" @keyup.enter.native="userList"
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status" style="width: 200px;"> <el-form-item label="状态" prop="status" style="width: 200px">
<el-select <el-select v-model="tableData.param.status" placeholder="用户状态" clearable size="default" style="width: 240px">
v-model="tableData.param.status" <el-option label="启用" :value="1" />
placeholder="用户状态" <el-option label="禁用" :value="0" />
clearable </el-select>
size="default" </el-form-item>
style="width: 240px" <el-form-item label="创建时间" prop="dateRange">
> <el-date-picker
<el-option label="启用" :value="1"/> v-model="tableData.param.dateRange"
<el-option label="禁用" :value="0"/> size="default"
</el-select> style="width: 240px"
</el-form-item> value-format="YYYY-MM-DD"
<el-form-item label="创建时间" prop="dateRange"> type="daterange"
<el-date-picker range-separator="-"
v-model="tableData.param.dateRange" start-placeholder="开始日期"
size="default" end-placeholder="结束日期"
style="width: 240px" ></el-date-picker>
value-format="YYYY-MM-DD" </el-form-item>
type="daterange" <el-form-item>
range-separator="-" <el-button size="default" type="primary" class="ml10" @click="userList">
start-placeholder="开始日期" <el-icon>
end-placeholder="结束日期" <ele-Search />
></el-date-picker> </el-icon>
</el-form-item> 查询
<el-form-item> </el-button>
<el-button size="default" type="primary" class="ml10" @click="userList"> <el-button size="default" @click="resetQuery(queryRef)">
<el-icon> <el-icon>
<ele-Search /> <ele-Refresh />
</el-icon> </el-icon>
查询 重置
</el-button> </el-button>
<el-button size="default" @click="resetQuery(queryRef)"> <el-button size="default" type="success" class="ml10" @click="onOpenAddUser">
<el-icon> <el-icon>
<ele-Refresh /> <ele-FolderAdd />
</el-icon> </el-icon>
重置 新增用户
</el-button> </el-button>
<el-button size="default" type="success" class="ml10" @click="onOpenAddUser"> <el-button size="default" type="danger" class="ml10" @click="onRowDel(null)">
<el-icon> <el-icon>
<ele-FolderAdd /> <ele-Delete />
</el-icon> </el-icon>
新增用户 删除用户
</el-button> </el-button>
<el-button size="default" type="danger" class="ml10" @click="onRowDel(null)"> </el-form-item>
<el-icon> </el-form>
<ele-Delete /> </div>
</el-icon> <el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange">
删除用户 <el-table-column type="selection" width="55" align="center" />
</el-button> <el-table-column type="index" label="序号" width="60" />
</el-form-item> <el-table-column prop="userName" label="账户名称" show-overflow-tooltip></el-table-column>
</el-form> <el-table-column prop="userNickname" label="用户昵称" show-overflow-tooltip></el-table-column>
</div> <el-table-column prop="dept.deptName" label="部门" show-overflow-tooltip></el-table-column>
<el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange"> <el-table-column prop="TenantId" label="租户" show-overflow-tooltip></el-table-column>
<el-table-column type="selection" width="55" align="center" /> <el-table-column label="角色" align="center" prop="roleInfo" :show-overflow-tooltip="true">
<el-table-column type="index" label="序号" width="60" /> <template #default="scope">
<el-table-column prop="userName" label="账户名称" show-overflow-tooltip></el-table-column> <span v-for="(item, index) of scope.row.roleInfo" :key="'role-' + index"> {{ item.name + ' ' }} </span>
<el-table-column prop="userNickname" label="用户昵称" show-overflow-tooltip></el-table-column> </template>
<el-table-column prop="dept.deptName" label="部门" show-overflow-tooltip></el-table-column> </el-table-column>
<el-table-column label="角色" align="center" prop="roleInfo" :show-overflow-tooltip="true" > <el-table-column prop="mobile" label="手机号" show-overflow-tooltip></el-table-column>
<template #default="scope"> <el-table-column prop="userStatus" label="用户状态" show-overflow-tooltip>
<span v-for="(item,index) of scope.row.roleInfo" :key="'role-'+index"> {{item.name+' '}} </span> <template #default="scope">
</template> <el-switch
</el-table-column> v-model="scope.row.userStatus"
<el-table-column prop="mobile" label="手机号" show-overflow-tooltip></el-table-column> inline-prompt
<el-table-column prop="userStatus" label="用户状态" show-overflow-tooltip> :active-value="1"
<template #default="scope"> :inactive-value="0"
<el-switch active-text=""
v-model="scope.row.userStatus" inactive-text=""
inline-prompt @change="handleStatusChange(scope.row)"
:active-value="1" >
:inactive-value="0" </el-switch>
active-text="" </template>
inactive-text="" </el-table-column>
@change="handleStatusChange(scope.row)"> <el-table-column prop="createdAt" label="创建时间" show-overflow-tooltip></el-table-column>
</el-switch> <el-table-column label="操作" width="200">
</template> <template #default="scope">
</el-table-column> <el-button size="small" text type="primary" @click="onOpenEditUser(scope.row)">修改</el-button>
<el-table-column prop="createdAt" label="创建时间" show-overflow-tooltip></el-table-column> <el-button size="small" text type="primary" @click="onRowDel(scope.row)">删除</el-button>
<el-table-column label="操作" width="200"> <el-button size="small" text type="primary" @click="handleResetPwd(scope.row)">重置</el-button>
<template #default="scope"> </template>
<el-button size="small" text type="primary" @click="onOpenEditUser(scope.row)">修改</el-button> </el-table-column>
<el-button size="small" text type="primary" @click="onRowDel(scope.row)">删除</el-button> </el-table>
<el-button size="small" text type="primary" @click="handleResetPwd(scope.row)">重置</el-button> <pagination
</template> v-show="tableData.total > 0"
</el-table-column> :total="tableData.total"
</el-table> v-model:page="tableData.param.pageNum"
<pagination v-model:limit="tableData.param.pageSize"
v-show="tableData.total>0" @pagination="userList"
:total="tableData.total" />
v-model:page="tableData.param.pageNum" </el-card>
v-model:limit="tableData.param.pageSize" </el-col>
@pagination="userList" </el-row>
/> <EditUser ref="editUserRef" :dept-data="deptData" :gender-data="sys_user_sex" @getUserList="userList" />
</el-card>
</el-col>
</el-row>
<EditUser ref="editUserRef" :dept-data="deptData" :gender-data="sys_user_sex" @getUserList="userList"/>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import {toRefs, reactive, onMounted, ref, defineComponent, watch, getCurrentInstance} from 'vue'; import { toRefs, reactive, onMounted, ref, defineComponent, watch, getCurrentInstance } from 'vue';
import {ElMessageBox, ElMessage, ElTree,FormInstance} from 'element-plus'; import { ElMessageBox, ElMessage, ElTree, FormInstance } from 'element-plus';
import { Search } from '@element-plus/icons-vue' import { Search } from '@element-plus/icons-vue';
import EditUser from '/@/views/system/user/component/editUser.vue'; import EditUser from '/@/views/system/user/component/editUser.vue';
import {getUserList, getDeptTree, resetUserPwd, changeUserStatus, deleteUser} from '/@/api/system/user/index'; import { getUserList, getDeptTree, resetUserPwd, changeUserStatus, deleteUser } from '/@/api/system/user/index';
interface TableDataState { interface TableDataState {
ids:number[]; ids: number[];
deptProps:{}; deptProps: {};
deptData:any[]; deptData: any[];
tableData: { tableData: {
data: any[]; data: any[];
total: number; total: number;
@@ -161,11 +157,11 @@ interface TableDataState {
param: { param: {
pageNum: number; pageNum: number;
pageSize: number; pageSize: number;
deptId:string; deptId: string;
mobile:string; mobile: string;
status:string; status: string;
keyWords:string; keyWords: string;
dateRange: string[]; dateRange: string[];
}; };
}; };
} }
@@ -174,103 +170,103 @@ export default defineComponent({
name: 'systemUser', name: 'systemUser',
components: { EditUser }, components: { EditUser },
setup() { setup() {
const {proxy} = <any>getCurrentInstance(); const { proxy } = <any>getCurrentInstance();
const {sys_user_sex} = proxy.useDict('sys_user_sex') const { sys_user_sex } = proxy.useDict('sys_user_sex');
const editUserRef = ref(); const editUserRef = ref();
const queryRef = ref(); const queryRef = ref();
const filterText = ref(''); const filterText = ref('');
const treeRef = ref<InstanceType<typeof ElTree>>(); const treeRef = ref<InstanceType<typeof ElTree>>();
const search = Search const search = Search;
const state = reactive<TableDataState>({ const state = reactive<TableDataState>({
ids:[], ids: [],
deptProps:{ deptProps: {
id:"deptId", id: 'deptId',
children: "children", children: 'children',
label: "deptName" label: 'deptName',
}, },
deptData:[ deptData: [
{ {
label: '集团总部', label: '集团总部',
children: [ children: [
{ {
label: '曲靖分部', label: '曲靖分部',
children: [ children: [
{ {
label: '总经办', label: '总经办',
}, },
{ {
label: '市场部', label: '市场部',
}, },
{ {
label: '研发部', label: '研发部',
}, },
], ],
}, },
], ],
}, },
], ],
tableData: { tableData: {
data: [], data: [],
total: 0, total: 0,
loading: false, loading: false,
param: { param: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
deptId:'', deptId: '',
mobile:'', mobile: '',
status:'', status: '',
keyWords:'', keyWords: '',
dateRange:[] dateRange: [],
}, },
}, },
}); });
// 初始化表格数据 // 初始化表格数据
const initTableData = () => { const initTableData = () => {
getDeptTree().then((res:any)=>{ getDeptTree().then((res: any) => {
state.deptData = res.data.deps state.deptData = res.data.deps;
}) });
userList(); userList();
};
const userList = () => {
getUserList(state.tableData.param).then((res: any) => {
state.tableData.data = res.data.userList ?? [];
state.tableData.total = res.data.total;
});
}; };
const userList = ()=>{
getUserList(state.tableData.param).then((res:any)=>{
state.tableData.data = res.data.userList??[];
state.tableData.total = res.data.total;
});
};
// 打开新增用户弹窗 // 打开新增用户弹窗
const onOpenAddUser = () => { const onOpenAddUser = () => {
editUserRef.value.openDialog(); editUserRef.value.openDialog();
}; };
// 打开修改用户弹窗 // 打开修改用户弹窗
const onOpenEditUser = (row:any) => { const onOpenEditUser = (row: any) => {
editUserRef.value.openDialog(row); editUserRef.value.openDialog(row);
}; };
// 删除用户 // 删除用户
const onRowDel = (row:any) => { const onRowDel = (row: any) => {
let msg = '你确定要删除所选用户?'; let msg = '你确定要删除所选用户?';
let ids:number[] = [] ; let ids: number[] = [];
if(row){ if (row) {
msg = `此操作将永久删除用户:“${row.userName}”,是否继续?` msg = `此操作将永久删除用户:“${row.userName}”,是否继续?`;
ids = [row.id] ids = [row.id];
}else{ } else {
ids = state.ids ids = state.ids;
} }
if(ids.length===0){ if (ids.length === 0) {
ElMessage.error('请选择要删除的数据。'); ElMessage.error('请选择要删除的数据。');
return return;
} }
ElMessageBox.confirm(msg, '提示', { ElMessageBox.confirm(msg, '提示', {
confirmButtonText: '确认', confirmButtonText: '确认',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
}) })
.then(() => { .then(() => {
deleteUser(ids).then(()=>{ deleteUser(ids).then(() => {
ElMessage.success('删除成功'); ElMessage.success('删除成功');
userList(); userList();
}) });
}) })
.catch(() => {}); .catch(() => {});
}; };
// 分页改变 // 分页改变
const onHandleSizeChange = (val: number) => { const onHandleSizeChange = (val: number) => {
@@ -284,77 +280,82 @@ export default defineComponent({
onMounted(() => { onMounted(() => {
initTableData(); initTableData();
}); });
watch(filterText, (val) => { watch(filterText, (val) => {
treeRef.value!.filter(val) treeRef.value!.filter(val);
}); });
const deptFilterNode = (value: string, data:any) => { const deptFilterNode = (value: string, data: any) => {
if (!value) return true; if (!value) return true;
return data.deptName.includes(value) return data.deptName.includes(value);
}; };
// 多选框选中数据 // 多选框选中数据
const handleSelectionChange = (selection:any[])=> { const handleSelectionChange = (selection: any[]) => {
state.ids = selection.map(item => item.id) state.ids = selection.map((item) => item.id);
}; };
// 节点单击事件 // 节点单击事件
const handleNodeClick = (data:any) => { const handleNodeClick = (data: any) => {
state.tableData.param.deptId = data.deptId; state.tableData.param.deptId = data.deptId;
userList(); userList();
}; };
/** 重置密码按钮操作 */ /** 重置密码按钮操作 */
const handleResetPwd = (row:any)=> { const handleResetPwd = (row: any) => {
ElMessageBox.prompt('请输入"' + row.userName + '"的新密码', "提示", { ElMessageBox.prompt('请输入"' + row.userName + '"的新密码', '提示', {
confirmButtonText: "确定", confirmButtonText: '确定',
cancelButtonText: "取消" cancelButtonText: '取消',
}).then(({ value }) => { })
if(!value || value==''){ .then(({ value }) => {
ElMessage.success('密码不能为空'); if (!value || value == '') {
return ElMessage.success('密码不能为空');
} return;
resetUserPwd(row.id, value).then(() => { }
ElMessage.success("修改成功,新密码是:" + value); resetUserPwd(row.id, value).then(() => {
}); ElMessage.success('修改成功,新密码是:' + value);
}).catch(() => {}); });
}; })
// 用户状态修改 .catch(() => {});
const handleStatusChange = (row:any)=> { };
let text = row.userStatus === 1 ? "启用" : "停用"; // 用户状态修改
ElMessageBox.confirm('确认要"' + text + '""' + row.userName + '"用户吗?', "警告", { const handleStatusChange = (row: any) => {
confirmButtonText: "确定", let text = row.userStatus === 1 ? '启用' : '停用';
cancelButtonText: "取消", ElMessageBox.confirm('确认要"' + text + '""' + row.userName + '"用户吗?', '警告', {
type: "warning" confirmButtonText: '确定',
}).then(function() { cancelButtonText: '取消',
return changeUserStatus(row.id, row.userStatus); type: 'warning',
}).then(() => { })
ElMessage.success(text + "成功"); .then(function () {
}).catch(function() { return changeUserStatus(row.id, row.userStatus);
row.userStatus =row.userStatus === 0 ?1 : 0; })
}); .then(() => {
}; ElMessage.success(text + '成功');
/** 重置按钮操作 */ })
const resetQuery = (formEl: FormInstance | undefined) => { .catch(function () {
if (!formEl) return row.userStatus = row.userStatus === 0 ? 1 : 0;
formEl.resetFields() });
userList() };
}; /** 重置按钮操作 */
const resetQuery = (formEl: FormInstance | undefined) => {
if (!formEl) return;
formEl.resetFields();
userList();
};
return { return {
queryRef, queryRef,
editUserRef, editUserRef,
onOpenAddUser, onOpenAddUser,
onOpenEditUser, onOpenEditUser,
onRowDel, onRowDel,
onHandleSizeChange, onHandleSizeChange,
onHandleCurrentChange, onHandleCurrentChange,
deptFilterNode, deptFilterNode,
filterText, filterText,
treeRef, treeRef,
search, search,
sys_user_sex, sys_user_sex,
userList, userList,
handleSelectionChange, handleSelectionChange,
handleNodeClick, handleNodeClick,
handleResetPwd, handleResetPwd,
handleStatusChange, handleStatusChange,
resetQuery, resetQuery,
...toRefs(state), ...toRefs(state),
}; };
}, },