diff --git a/src/api/customerService/product/index.ts b/src/api/customerService/product/index.ts
index 77a55d6..cdfa43d 100644
--- a/src/api/customerService/product/index.ts
+++ b/src/api/customerService/product/index.ts
@@ -36,10 +36,22 @@ export function updateProduct(data: object) {
 	});
 }
 
+// 导出产品
 export function exportProduct(data: object) {
 	return newService({
 		url: '/customerService/product/export',
+		responseType: 'blob',
 		method: 'get',
 		params: data,
 	});
 }
+
+//导入产品
+export function importProduct(data: object) {
+	return newService({
+		url: '/customerService/product/import',
+		responseType: 'blob',
+		method: 'post',
+		data: data,
+	});
+}
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 3f7e8b1..03e7d49 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -51,6 +51,14 @@ const responseInterceptor = (response: any) => {
 	const res = response.data;
 	const code = response.data.code;
 	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') {
 		// 401未授权：token过期，跳转登录页
 		ElMessageBox.alert('登录状态已过期，请重新登录', '提示', { confirmButtonText: '确定' })
diff --git a/src/views/customerService/product/component/exportDialog.vue b/src/views/customerService/product/component/exportDialog.vue
index 0f9a398..7a70815 100644
--- a/src/views/customerService/product/component/exportDialog.vue
+++ b/src/views/customerService/product/component/exportDialog.vue
@@ -1,55 +1,99 @@
 <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>
 			<span class="dialog-footer">
 				<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>
 		</template>
 	</el-dialog>
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive } from 'vue';
+import { ref } from 'vue';
 import { ElMessage } from 'element-plus';
 import { exportProduct } from '/@/api/customerService/product';
 
 const isShowDialog = ref(false);
-const tableData = ref([]);
-const exportname = ref();
+const loading = ref(false);
+const exportName = ref(''); // 用于存储产品名称筛选参数
 
-const form = reactive({
-	exportType: 'current',
-	fileType: 'xlsx',
-});
-
-// 打开对话框
-const openDialog = (name: string) => {
+// 打开对话框，支持传入筛选参数
+const openDialog = (name?: string) => {
 	isShowDialog.value = true;
-	exportname.value = name;
+	exportName.value = name || '';
 };
 
 // 处理导出
 const handleExport = async () => {
-	// 这里处理导出逻辑
-	if (exportname.value) {
-		await exportProduct({ name: exportname.value });
+	try {
+		loading.value = true;
+
+		// 构建请求参数
+		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 {
-		await exportProduct({});
+		filename = `products_${new Date().getTime()}.zip`;
 	}
 
-	console.log(tableData.value, '111');
-	console.log(exportname.value, '222');
+	link.download = filename;
+	document.body.appendChild(link);
+	link.click();
+	document.body.removeChild(link);
+	window.URL.revokeObjectURL(url);
 
-	ElMessage.success('导出成功');
-	isShowDialog.value = false;
+	ElMessage.success('导出成功！文件已开始下载');
 };
 
 // 暴露方法给父组件使用
 defineExpose({
-	/**
-	 * 打开对话框方法
-	 */
 	openDialog,
 });
 </script>
diff --git a/src/views/customerService/product/component/importDialog.vue b/src/views/customerService/product/component/importDialog.vue
index c705f84..c3ae637 100644
--- a/src/views/customerService/product/component/importDialog.vue
+++ b/src/views/customerService/product/component/importDialog.vue
@@ -16,43 +16,70 @@
 				:before-upload="beforeUpload"
 				:on-exceed="handleExceed"
 				:on-remove="handleRemove"
+				:show-file-list="true"
+				:auto-upload="false" <!-- 手动触发上传 -->
 			>
 				<div class="el-upload-area">
 					<el-icon class="el-icon--upload">
 						<UploadFilled />
 					</el-icon>
 					<div class="el-upload__text">将ZIP文件拖到此处，或<em>点击上传</em></div>
+					<div class="el-upload__tip">上传ZIP文件批量导入产品（TXT格式）</div>
 				</div>
 			</el-upload>
 
 			<!-- 导入说明 -->
 			<div class="import-instructions mt20">
 				<el-card shadow="never" class="box-card">
+					<template #header>
+						<div class="card-header">
+							<span>导入说明</span>
+						</div>
+					</template>
 					<el-text type="info" size="small">
 						<ul class="instruction-list">
-							<li>1. 请先下载模板ZIP包，查看Word文档格式要求</li>
-							<li>2. 按照模板中的Word文档格式准备您的产品文档</li>
-							<li>3. 将您的Word文档打包成ZIP格式上传</li>
-							<li>4. 支持 .docx 格式的Word文档</li>
-							<li>5. 文件大小不能超过 {{ fileSizeLimit }}MB</li>
+							<li>1. 请上传包含TXT格式产品数据的ZIP压缩包</li>
+							<li>2. 文件编码请使用UTF-8</li>
+							<li>3. 文件大小不能超过 {{ fileSizeLimit }}MB</li>
+							<li>4. 导入前请确保数据格式正确</li>
 						</ul>
 					</el-text>
 				</el-card>
 			</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>
 
 		<template #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 type="primary" :loading="loading" @click="handleSubmitUpload">
 					{{ loading ? '导入中...' : '开始导入' }}
 				</el-button>
@@ -62,186 +89,44 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, nextTick } from 'vue';
-import { ElMessage, ElMessageBox, type UploadInstance } from 'element-plus';
-import { UploadFilled, Download } from '@element-plus/icons-vue';
-import JSZip from 'jszip';
-import { saveAs } from 'file-saver';
+import { ref, reactive } from 'vue';
+import { ElMessage, ElMessageBox, type UploadInstance, type UploadFile } from 'element-plus';
+import { UploadFilled } from '@element-plus/icons-vue';
+import { importProduct } from '/@/api/customerService/product';
 
-// 定义组件事件
 const emit = defineEmits<{
-	/**
-	 * 获取产品列表事件 - 导入成功后刷新列表
-	 */
-	(e: 'getRoleList'): void;
+	(e: 'getProductList'): void;
 }>();
 
-// 响应式状态
 const isShowDialog = ref(false);
 const loading = ref(false);
-const downloadLoading = ref(false);
 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({
 	Authorization: `Bearer ${localStorage.getItem('token') || ''}`,
 });
-const uploadData = reactive({
-	type: 'word-zip',
-});
+const uploadData = reactive({});
 const acceptFileTypes = '.zip,.ZIP';
 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 = () => {
 	isShowDialog.value = true;
 	loading.value = false;
-	downloadLoading.value = false;
-
-	// 清空已上传的文件
-	nextTick(() => {
-		uploadRef.value?.clearFiles();
-	});
+	importResult.value = null;
 };
 
 /**
  * 处理对话框关闭
  */
 const handleDialogClose = () => {
-	// 清空上传文件
 	uploadRef.value?.clearFiles();
+	importResult.value = null;
 };
 
 /**
@@ -251,49 +136,8 @@ const handleCancel = () => {
 	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 isZip = file.type === 'application/zip' || file.name.toLowerCase().endsWith('.zip');
@@ -309,7 +153,7 @@ const beforeUpload = (file: File): boolean => {
 		return false;
 	}
 
-	ElMessage.info(`开始上传: ${file.name} (${(file.size / 1024 / 1024).toFixed(2)}MB)`);
+	importResult.value = null;
 	return true;
 };
 
@@ -324,126 +168,89 @@ const handleExceed = () => {
  * 处理文件移除
  */
 const handleRemove = () => {
-	// 文件移除后的清理操作
-};
-
-/**
- * 处理上传成功
- * @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);
+	importResult.value = null;
 };
 
 /**
  * 手动提交上传
  */
 const handleSubmitUpload = async () => {
-	if (!uploadRef.value?.uploadFiles?.length) {
-		ElMessage.warning('请先选择要上传的文件');
+	const fileList = uploadRef.value?.uploadFiles;
+	if (!fileList || fileList.length === 0) {
+		ElMessage.warning('请先选择要上传的ZIP文件');
 		return;
 	}
 
 	try {
-		await ElMessageBox.confirm('确认导入选中的文件吗？', '导入确认', {
-			confirmButtonText: '确认导入',
-			cancelButtonText: '取消',
-			type: 'warning',
-		});
+		await ElMessageBox.confirm(
+			'确认导入选中的产品数据吗？',
+			'导入确认',
+			{
+				confirmButtonText: '确认导入',
+				cancelButtonText: '取消',
+				type: 'warning',
+			}
+		);
 
 		loading.value = true;
-		uploadRef.value.submit();
+		importResult.value = null;
+		
+		const file = fileList[0].raw!;
+		await handleCustomUpload(file);
+		
 	} catch {
-		// 用户取消操作
+		loading.value = false;
 	}
 };
 
-// 暴露方法给父组件
-defineExpose({
-	openDialog,
-});
-</script>
-
-<style scoped lang="scss">
-.import-container {
-	padding: 10px 0;
-}
-
-.upload-demo {
-	width: 100%;
-}
-
-.el-upload-area {
-	padding: 20px;
-	text-align: center;
-}
-
-.el-icon--upload {
-	font-size: 48px;
-	color: #c0c4cc;
-	margin-bottom: 16px;
-}
-
-.import-instructions {
-	.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;
+/**
+ * 自定义上传处理
+ */
+const handleCustomUpload = async (file: File) => {
+	try {
+		// 调用导入接口
+		const response = await importProduct(file);
+		
+		// 根据API文档，响应结构为: { failCount: number, failReasons: string[] }
+		if (response.code === 200) {
+			importResult.value = {
+				success: true,
+				data: response.data,
+				message: '导入成功'
+			};
+			
+			ElMessage.success(`导入完成！失败记录：${response.data.failCount}条`);
+			emit('getProductList');
+			
+			// 3秒后自动关闭
+			setTimeout(() => {
+				if (isShowDialog.value && response.data.failCount === 0) {
+					isShowDialog.value = false;
+				}
+			}, 3000);
+		} else {
+			throw new Error(response.message || '导入失败');
 		}
+		
+	} catch (error: any) {
+		importResult.value = {
+			success: false,
+			message: error.message || '导入失败'
+		};
+		ElMessage.error(`导入失败：${error.message || '未知错误'}`);
+	} finally {
+		loading.value = false;
 	}
-}
+};
 
-:deep(.el-upload-dragger) {
-	width: 100%;
-	height: 180px;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
+// 保留原有方法用于自动上传模式
+const handleUploadSuccess = (response: any) => {
+	// 处理自动上传的成功响应
+};
 
-:deep(.el-upload-list) {
-	margin-top: 10px;
-}
-</style>
+const handleUploadError = (error: any) => {
+	// 处理自动上传的错误
+};
+
+defineExpose({ openDialog });
+</script>
\ No newline at end of file
diff --git a/src/views/system/user/component/editUser.vue b/src/views/system/user/component/editUser.vue
index de132fe..0fc35b9 100644
--- a/src/views/system/user/component/editUser.vue
+++ b/src/views/system/user/component/editUser.vue
@@ -1,18 +1,18 @@
 <template>
 	<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-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-input v-model="ruleForm.userName" placeholder="请输入账户名称" clearable></el-input>
 						</el-form-item>
 					</el-col>
-          <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-input v-model="ruleForm.password" placeholder="请输入" type="password" clearable></el-input>
-            </el-form-item>
-          </el-col>
+					<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-input v-model="ruleForm.password" placeholder="请输入" type="password" clearable></el-input>
+						</el-form-item>
+					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="用户昵称" prop="nickName">
 							<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-form-item label="关联角色" prop="roleIds">
 							<el-select v-model="ruleForm.roleIds" placeholder="请选择" clearable class="w100" multiple>
-								<el-option
-                    v-for="role in roleList"
-                    :key="'role-'+role.id"
-                    :label="role.name"
-                    :value="role.id">
-                </el-option>
+								<el-option v-for="role in roleList" :key="'role-' + role.id" :label="role.name" :value="role.id"> </el-option>
 							</el-select>
 						</el-form-item>
 					</el-col>
@@ -34,7 +29,7 @@
 						<el-form-item label="部门" prop="deptId">
 							<el-cascader
 								:options="deptData"
-								:props="{ checkStrictly: true,emitPath: false, value: 'deptId', label: 'deptName' }"
+								:props="{ checkStrictly: true, emitPath: false, value: 'deptId', label: 'deptName' }"
 								placeholder="请选择部门"
 								clearable
 								class="w100"
@@ -60,43 +55,45 @@
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="性别" prop="sex">
 							<el-select v-model="ruleForm.sex" placeholder="请选择" clearable class="w100">
-								<el-option
-                   v-for="gender in genderData"
-                   :key="'gender-'+gender.value"
-                   :label="gender.label"
-                   :value="gender.value"></el-option>
+								<el-option v-for="gender in genderData" :key="'gender-' + gender.value" :label="gender.label" :value="gender.value"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<!-- 新增租户 -->
+					<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-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="岗位" prop="postIds">
-              <el-select v-model="ruleForm.postIds" placeholder="请选择" clearable class="w100" multiple>
-                <el-option
-                    v-for="post in postList"
-                    :key="'post-'+post.postId"
-                    :label="post.postName"
-                    :value="post.postId">
-                </el-option>
-              </el-select>
+							<el-select v-model="ruleForm.postIds" placeholder="请选择" clearable class="w100" multiple>
+								<el-option v-for="post in postList" :key="'post-' + post.postId" :label="post.postName" :value="post.postId"> </el-option>
+							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<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-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-form-item label="用户描述">
 							<el-input v-model="ruleForm.remark" type="textarea" placeholder="请输入用户描述" maxlength="150"></el-input>
@@ -107,7 +104,7 @@
 			<template #footer>
 				<span class="dialog-footer">
 					<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>
 			</template>
 		</el-dialog>
@@ -115,98 +112,93 @@
 </template>
 
 <script lang="ts">
-import { reactive, toRefs, onMounted, defineComponent,ref,unref } from 'vue';
-import {getParams, addUser, editUser, getEditUser} from "/@/api/system/user";
-import {ElMessage} from "element-plus";
-
+import { reactive, toRefs, onMounted, defineComponent, ref, unref } from 'vue';
+import { getParams, addUser, editUser, getEditUser } from '/@/api/system/user';
+import { ElMessage } from 'element-plus';
 
 export default defineComponent({
 	name: 'systemEditUser',
-  props:{
-    deptData:{
-      type:Array,
-      default:()=>[]
-    },
-    genderData:{
-      type:Array,
-      default:()=>[]
-    }
-  },
-	setup(prop,{emit}) {
-    const roleList = ref([]);
-    const postList = ref([]);
-    const formRef = ref<HTMLElement | null>(null);
+	props: {
+		deptData: {
+			type: Array,
+			default: () => [],
+		},
+		genderData: {
+			type: Array,
+			default: () => [],
+		},
+	},
+	setup(prop, { emit }) {
+		const roleList = ref([]);
+		const postList = ref([]);
+		const tenantList = ref([]); // 新增租户列表
+		const formRef = ref<HTMLElement | null>(null);
 		const state = reactive({
 			isShowDialog: false,
 			ruleForm: {
-        userId: 0,
-        deptId: 0,
-        userName: '',
-        nickName: '',
-        password: '',
-        mobile:'',
-        email: '',
-        sex: '',
-        status: 1,
-        remark: '',
-        postIds: [],
-        roleIds: [],
-        isAdmin:0,
+				userId: 0,
+				deptId: 0,
+				userName: '',
+				nickName: '',
+				password: '',
+				mobile: '',
+				email: '',
+				sex: '',
+				status: 1,
+				remark: '',
+				postIds: [],
+				roleIds: [],
+				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) => {
-      resetForm()
-      if(row) {
-        getEditUser(row.id).then((res:any)=>{
-          const user = res.data.user;
-          state.ruleForm = {
-            userId: user.id,
-            deptId: user.deptId,
-            userName: user.userName,
-            nickName: user.userNickname,
-            password: '-',
-            mobile:user.mobile,
-            email: user.userEmail,
-            sex: String(user.sex),
-            status: user.userStatus,
-            remark: user.remark,
-            postIds: res.data.checkedPosts??[],
-            roleIds: res.data.checkedRoleIds??[],
-            isAdmin:user.isAdmin,
-          };
-        })
-      }
+		const openDialog = (row?: any) => {
+			resetForm();
+			if (row) {
+				getEditUser(row.id).then((res: any) => {
+					const user = res.data.user;
+					state.ruleForm = {
+						userId: user.id,
+						deptId: user.deptId,
+						userName: user.userName,
+						nickName: user.userNickname,
+						password: '-',
+						mobile: user.mobile,
+						email: user.userEmail,
+						sex: String(user.sex),
+						status: user.userStatus,
+						remark: user.remark,
+						postIds: res.data.checkedPosts ?? [],
+						roleIds: res.data.checkedRoleIds ?? [],
+						isAdmin: user.isAdmin,
+						tenantId: user.tenantId || '', // 设置租户ID
+					};
+				});
+			}
 			state.isShowDialog = true;
 		};
 		// 关闭弹窗
@@ -217,67 +209,88 @@ export default defineComponent({
 		const onCancel = () => {
 			closeDialog();
 		};
+
 		// 新增
 		const onSubmit = () => {
-      const formWrap = unref(formRef) as any;
-      if (!formWrap) return;
-      formWrap.validate((valid: boolean) => {
-        if (valid) {
-          if(state.ruleForm.userId===0){
-            //添加
-            addUser(state.ruleForm).then(()=>{
-              ElMessage.success('用户添加成功');
-              closeDialog(); // 关闭弹窗
-              emit('getUserList')
-            });
-          }else{
-            //修改
-            editUser(state.ruleForm).then(()=>{
-              ElMessage.success('用户修改成功');
-              closeDialog(); // 关闭弹窗
-              emit('getUserList')
-            });
-          }
-        }
-      });
+			const formWrap = unref(formRef) as any;
+			if (!formWrap) return;
+			formWrap.validate((valid: boolean) => {
+				if (valid) {
+					if (state.ruleForm.userId === 0) {
+						// 新增用户 - 包含租户信息
+						addUser(state.ruleForm)
+							.then(() => {
+								ElMessage.success('用户添加成功');
+								closeDialog(); // 关闭弹窗
+								emit('getUserList');
+							})
+							.catch((error) => {
+								ElMessage.error('用户添加失败：' + (error.message || '未知错误'));
+							});
+					} else {
+						// 修改用户 - 根据需求决定是否包含租户信息
+						const editData = { ...state.ruleForm };
+						// 如果修改时不允许修改租户，可以删除tenantId字段
+						// delete editData.tenantId;
+
+						editUser(editData)
+							.then(() => {
+								ElMessage.success('用户修改成功');
+								closeDialog(); // 关闭弹窗
+								emit('getUserList');
+							})
+							.catch((error) => {
+								ElMessage.error('用户修改失败：' + (error.message || '未知错误'));
+							});
+					}
+				}
+			});
 		};
 		// 初始化部门数据
 		const initTableData = () => {
-      //获取角色岗位选项
-      getParams().then((res:any)=>{
-        roleList.value = res.data.roleList??[];
-        postList.value = res.data.posts??[];
-      });
+			//获取角色岗位选项
+			getParams()
+				.then((res: any) => {
+					roleList.value = res.data.roleList ?? [];
+					postList.value = res.data.posts ?? [];
+					tenantList.value = res.data.tenantList ?? []; // 获取租户列表
+				})
+				.catch((error) => {
+					console.error('获取参数失败：', error);
+					ElMessage.error('获取初始化数据失败');
+				});
 		};
 		// 页面加载时
 		onMounted(() => {
 			initTableData();
 		});
-    const resetForm = ()=>{
-      state.ruleForm = {
-        userId: 0,
-        deptId: 0,
-        userName: '',
-        nickName: '',
-        password: '',
-        mobile:'',
-        email: '',
-        sex: '',
-        status: 1,
-        remark: '',
-        postIds: [],
-        roleIds: [],
-        isAdmin:0,
-      }
-    };
+		const resetForm = () => {
+			state.ruleForm = {
+				userId: 0,
+				deptId: 0,
+				userName: '',
+				nickName: '',
+				password: '',
+				mobile: '',
+				email: '',
+				sex: '',
+				status: 1,
+				remark: '',
+				postIds: [],
+				roleIds: [],
+				isAdmin: 0,
+				tenantId: '', // 重置租户ID
+			};
+		};
 		return {
 			openDialog,
 			closeDialog,
 			onCancel,
 			onSubmit,
-      roleList,
-      postList,
-      formRef,
+			roleList,
+			postList,
+			tenantList, // 返回租户列表
+			formRef,
 			...toRefs(state),
 		};
 	},
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index d79521e..9762058 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1,159 +1,155 @@
 <template>
 	<div class="system-user-container">
-    <el-row :gutter="10" style="width: 100%;">
-      <el-col :span="4">
-        <el-card shadow="hover">
-          <el-aside>
-            <el-scrollbar>
-              <el-input :prefix-icon="search" v-model="filterText" placeholder="请输入部门名称" clearable size="default" style="width: 80%;"/>
-              <el-tree
-                  ref="treeRef"
-                  class="filter-tree"
-                  :data="deptData"
-                  :props="deptProps"
-                  default-expand-all
-                  :filter-node-method="deptFilterNode"
-                  @node-click="handleNodeClick"
-              />
-            </el-scrollbar>
-          </el-aside>
-        </el-card>
-      </el-col>
-      <el-col :span="20">
-        <el-card shadow="hover">
-          <div class="system-user-search mb15">
-            <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
-              <el-form-item label="关键字" prop="keyWords">
-                <el-input
-                    v-model="tableData.param.keyWords"
-                    placeholder="请输入用户账号或姓名"
-                    clearable
-                    size="default"
-                    style="width: 240px"
-                    @keyup.enter.native="userList"
-                />
-              </el-form-item>
-              <el-form-item label="手机号码" prop="mobile">
-                <el-input
-                    v-model="tableData.param.mobile"
-                    placeholder="请输入手机号码"
-                    clearable
-                    size="default"
-                    style="width: 240px"
-                    @keyup.enter.native="userList"
-                />
-              </el-form-item>
-              <el-form-item label="状态" prop="status" style="width: 200px;">
-                <el-select
-                    v-model="tableData.param.status"
-                    placeholder="用户状态"
-                    clearable
-                    size="default"
-                    style="width: 240px"
-                >
-                  <el-option label="启用"  :value="1"/>
-                  <el-option label="禁用"  :value="0"/>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="创建时间" prop="dateRange">
-                <el-date-picker
-                    v-model="tableData.param.dateRange"
-                    size="default"
-                    style="width: 240px"
-                    value-format="YYYY-MM-DD"
-                    type="daterange"
-                    range-separator="-"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                ></el-date-picker>
-              </el-form-item>
-              <el-form-item>
-                <el-button size="default" type="primary" class="ml10" @click="userList">
-                  <el-icon>
-                    <ele-Search />
-                  </el-icon>
-                  查询
-                </el-button>
-                <el-button size="default" @click="resetQuery(queryRef)">
-                  <el-icon>
-                    <ele-Refresh />
-                  </el-icon>
-                  重置
-                </el-button>
-                <el-button size="default" type="success" class="ml10" @click="onOpenAddUser">
-                  <el-icon>
-                    <ele-FolderAdd />
-                  </el-icon>
-                  新增用户
-                </el-button>
-                <el-button size="default" type="danger" class="ml10" @click="onRowDel(null)">
-                  <el-icon>
-                    <ele-Delete />
-                  </el-icon>
-                  删除用户
-                </el-button>
-              </el-form-item>
-            </el-form>
-          </div>
-          <el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column type="index" label="序号" width="60" />
-            <el-table-column prop="userName" label="账户名称" show-overflow-tooltip></el-table-column>
-            <el-table-column prop="userNickname" label="用户昵称" show-overflow-tooltip></el-table-column>
-            <el-table-column prop="dept.deptName" label="部门" show-overflow-tooltip></el-table-column>
-            <el-table-column label="角色" align="center" prop="roleInfo" :show-overflow-tooltip="true" >
-              <template #default="scope">
-                <span v-for="(item,index) of scope.row.roleInfo" :key="'role-'+index">   {{item.name+'   '}}   </span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="mobile" label="手机号" show-overflow-tooltip></el-table-column>
-            <el-table-column prop="userStatus" label="用户状态" show-overflow-tooltip>
-              <template #default="scope">
-                <el-switch
-                    v-model="scope.row.userStatus"
-                    inline-prompt
-                    :active-value="1"
-                    :inactive-value="0"
-                    active-text="启"
-                    inactive-text="禁"
-                    @change="handleStatusChange(scope.row)">
-                </el-switch>
-              </template>
-            </el-table-column>
-            <el-table-column prop="createdAt" label="创建时间" show-overflow-tooltip></el-table-column>
-            <el-table-column label="操作" width="200">
-              <template #default="scope">
-                <el-button size="small" text type="primary" @click="onOpenEditUser(scope.row)">修改</el-button>
-                <el-button size="small" text type="primary" @click="onRowDel(scope.row)">删除</el-button>
-                <el-button size="small" text type="primary" @click="handleResetPwd(scope.row)">重置</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-          <pagination
-              v-show="tableData.total>0"
-              :total="tableData.total"
-              v-model:page="tableData.param.pageNum"
-              v-model:limit="tableData.param.pageSize"
-              @pagination="userList"
-          />
-        </el-card>
-      </el-col>
-    </el-row>
-		<EditUser ref="editUserRef" :dept-data="deptData" :gender-data="sys_user_sex" @getUserList="userList"/>
+		<el-row :gutter="10" style="width: 100%">
+			<el-col :span="4">
+				<el-card shadow="hover">
+					<el-aside>
+						<el-scrollbar>
+							<el-input :prefix-icon="search" v-model="filterText" placeholder="请输入部门名称" clearable size="default" style="width: 80%" />
+							<el-tree
+								ref="treeRef"
+								class="filter-tree"
+								:data="deptData"
+								:props="deptProps"
+								default-expand-all
+								:filter-node-method="deptFilterNode"
+								@node-click="handleNodeClick"
+							/>
+						</el-scrollbar>
+					</el-aside>
+				</el-card>
+			</el-col>
+			<el-col :span="20">
+				<el-card shadow="hover">
+					<div class="system-user-search mb15">
+						<el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
+							<el-form-item label="关键字" prop="keyWords">
+								<el-input
+									v-model="tableData.param.keyWords"
+									placeholder="请输入用户账号或姓名"
+									clearable
+									size="default"
+									style="width: 240px"
+									@keyup.enter.native="userList"
+								/>
+							</el-form-item>
+							<el-form-item label="手机号码" prop="mobile">
+								<el-input
+									v-model="tableData.param.mobile"
+									placeholder="请输入手机号码"
+									clearable
+									size="default"
+									style="width: 240px"
+									@keyup.enter.native="userList"
+								/>
+							</el-form-item>
+							<el-form-item label="状态" prop="status" style="width: 200px">
+								<el-select v-model="tableData.param.status" placeholder="用户状态" clearable size="default" style="width: 240px">
+									<el-option label="启用" :value="1" />
+									<el-option label="禁用" :value="0" />
+								</el-select>
+							</el-form-item>
+							<el-form-item label="创建时间" prop="dateRange">
+								<el-date-picker
+									v-model="tableData.param.dateRange"
+									size="default"
+									style="width: 240px"
+									value-format="YYYY-MM-DD"
+									type="daterange"
+									range-separator="-"
+									start-placeholder="开始日期"
+									end-placeholder="结束日期"
+								></el-date-picker>
+							</el-form-item>
+							<el-form-item>
+								<el-button size="default" type="primary" class="ml10" @click="userList">
+									<el-icon>
+										<ele-Search />
+									</el-icon>
+									查询
+								</el-button>
+								<el-button size="default" @click="resetQuery(queryRef)">
+									<el-icon>
+										<ele-Refresh />
+									</el-icon>
+									重置
+								</el-button>
+								<el-button size="default" type="success" class="ml10" @click="onOpenAddUser">
+									<el-icon>
+										<ele-FolderAdd />
+									</el-icon>
+									新增用户
+								</el-button>
+								<el-button size="default" type="danger" class="ml10" @click="onRowDel(null)">
+									<el-icon>
+										<ele-Delete />
+									</el-icon>
+									删除用户
+								</el-button>
+							</el-form-item>
+						</el-form>
+					</div>
+					<el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange">
+						<el-table-column type="selection" width="55" align="center" />
+						<el-table-column type="index" label="序号" width="60" />
+						<el-table-column prop="userName" label="账户名称" show-overflow-tooltip></el-table-column>
+						<el-table-column prop="userNickname" label="用户昵称" show-overflow-tooltip></el-table-column>
+						<el-table-column prop="dept.deptName" label="部门" show-overflow-tooltip></el-table-column>
+						<el-table-column prop="TenantId" label="租户" show-overflow-tooltip></el-table-column>
+						<el-table-column label="角色" align="center" prop="roleInfo" :show-overflow-tooltip="true">
+							<template #default="scope">
+								<span v-for="(item, index) of scope.row.roleInfo" :key="'role-' + index"> {{ item.name + '   ' }} </span>
+							</template>
+						</el-table-column>
+						<el-table-column prop="mobile" label="手机号" show-overflow-tooltip></el-table-column>
+						<el-table-column prop="userStatus" label="用户状态" show-overflow-tooltip>
+							<template #default="scope">
+								<el-switch
+									v-model="scope.row.userStatus"
+									inline-prompt
+									:active-value="1"
+									:inactive-value="0"
+									active-text="启"
+									inactive-text="禁"
+									@change="handleStatusChange(scope.row)"
+								>
+								</el-switch>
+							</template>
+						</el-table-column>
+						<el-table-column prop="createdAt" label="创建时间" show-overflow-tooltip></el-table-column>
+						<el-table-column label="操作" width="200">
+							<template #default="scope">
+								<el-button size="small" text type="primary" @click="onOpenEditUser(scope.row)">修改</el-button>
+								<el-button size="small" text type="primary" @click="onRowDel(scope.row)">删除</el-button>
+								<el-button size="small" text type="primary" @click="handleResetPwd(scope.row)">重置</el-button>
+							</template>
+						</el-table-column>
+					</el-table>
+					<pagination
+						v-show="tableData.total > 0"
+						:total="tableData.total"
+						v-model:page="tableData.param.pageNum"
+						v-model:limit="tableData.param.pageSize"
+						@pagination="userList"
+					/>
+				</el-card>
+			</el-col>
+		</el-row>
+		<EditUser ref="editUserRef" :dept-data="deptData" :gender-data="sys_user_sex" @getUserList="userList" />
 	</div>
 </template>
 
 <script lang="ts">
-import {toRefs, reactive, onMounted, ref, defineComponent, watch, getCurrentInstance} from 'vue';
-import {ElMessageBox, ElMessage, ElTree,FormInstance} from 'element-plus';
-import { Search } from '@element-plus/icons-vue'
+import { toRefs, reactive, onMounted, ref, defineComponent, watch, getCurrentInstance } from 'vue';
+import { ElMessageBox, ElMessage, ElTree, FormInstance } from 'element-plus';
+import { Search } from '@element-plus/icons-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 {
-  ids:number[];
-  deptProps:{};
-  deptData:any[];
+	ids: number[];
+	deptProps: {};
+	deptData: any[];
 	tableData: {
 		data: any[];
 		total: number;
@@ -161,11 +157,11 @@ interface TableDataState {
 		param: {
 			pageNum: number;
 			pageSize: number;
-      deptId:string;
-      mobile:string;
-      status:string;
-      keyWords:string;
-      dateRange: string[];
+			deptId: string;
+			mobile: string;
+			status: string;
+			keyWords: string;
+			dateRange: string[];
 		};
 	};
 }
@@ -174,103 +170,103 @@ export default defineComponent({
 	name: 'systemUser',
 	components: { EditUser },
 	setup() {
-    const {proxy} = <any>getCurrentInstance();
-    const {sys_user_sex} = proxy.useDict('sys_user_sex')
+		const { proxy } = <any>getCurrentInstance();
+		const { sys_user_sex } = proxy.useDict('sys_user_sex');
 		const editUserRef = ref();
 		const queryRef = ref();
-    const filterText = ref('');
-    const treeRef = ref<InstanceType<typeof ElTree>>();
-    const search = Search
+		const filterText = ref('');
+		const treeRef = ref<InstanceType<typeof ElTree>>();
+		const search = Search;
 		const state = reactive<TableDataState>({
-      ids:[],
-      deptProps:{
-        id:"deptId",
-        children: "children",
-        label: "deptName"
-      },
-      deptData:[
-        {
-          label: '集团总部',
-          children: [
-            {
-              label: '曲靖分部',
-              children: [
-                {
-                  label: '总经办',
-                },
-                {
-                  label: '市场部',
-                },
-                {
-                  label: '研发部',
-                },
-              ],
-            },
-          ],
-        },
-      ],
+			ids: [],
+			deptProps: {
+				id: 'deptId',
+				children: 'children',
+				label: 'deptName',
+			},
+			deptData: [
+				{
+					label: '集团总部',
+					children: [
+						{
+							label: '曲靖分部',
+							children: [
+								{
+									label: '总经办',
+								},
+								{
+									label: '市场部',
+								},
+								{
+									label: '研发部',
+								},
+							],
+						},
+					],
+				},
+			],
 			tableData: {
 				data: [],
 				total: 0,
 				loading: false,
 				param: {
-          pageNum: 1,
-          pageSize: 10,
-          deptId:'',
-          mobile:'',
-          status:'',
-          keyWords:'',
-          dateRange:[]
+					pageNum: 1,
+					pageSize: 10,
+					deptId: '',
+					mobile: '',
+					status: '',
+					keyWords: '',
+					dateRange: [],
 				},
 			},
 		});
 		// 初始化表格数据
 		const initTableData = () => {
-      getDeptTree().then((res:any)=>{
-        state.deptData = res.data.deps
-      })
-      userList();
+			getDeptTree().then((res: any) => {
+				state.deptData = res.data.deps;
+			});
+			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 = () => {
-      editUserRef.value.openDialog();
+			editUserRef.value.openDialog();
 		};
 		// 打开修改用户弹窗
-		const onOpenEditUser = (row:any) => {
+		const onOpenEditUser = (row: any) => {
 			editUserRef.value.openDialog(row);
 		};
 		// 删除用户
-		const onRowDel = (row:any) => {
-      let msg = '你确定要删除所选用户？';
-      let ids:number[] = [] ;
-      if(row){
-        msg = `此操作将永久删除用户：“${row.userName}”，是否继续?`
-        ids = [row.id]
-      }else{
-        ids = state.ids
-      }
-      if(ids.length===0){
-        ElMessage.error('请选择要删除的数据。');
-        return
-      }
-      ElMessageBox.confirm(msg, '提示', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-          .then(() => {
-            deleteUser(ids).then(()=>{
-              ElMessage.success('删除成功');
-              userList();
-            })
-          })
-          .catch(() => {});
+		const onRowDel = (row: any) => {
+			let msg = '你确定要删除所选用户？';
+			let ids: number[] = [];
+			if (row) {
+				msg = `此操作将永久删除用户：“${row.userName}”，是否继续?`;
+				ids = [row.id];
+			} else {
+				ids = state.ids;
+			}
+			if (ids.length === 0) {
+				ElMessage.error('请选择要删除的数据。');
+				return;
+			}
+			ElMessageBox.confirm(msg, '提示', {
+				confirmButtonText: '确认',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(() => {
+					deleteUser(ids).then(() => {
+						ElMessage.success('删除成功');
+						userList();
+					});
+				})
+				.catch(() => {});
 		};
 		// 分页改变
 		const onHandleSizeChange = (val: number) => {
@@ -284,77 +280,82 @@ export default defineComponent({
 		onMounted(() => {
 			initTableData();
 		});
-    watch(filterText, (val) => {
-      treeRef.value!.filter(val)
-    });
-    const deptFilterNode = (value: string, data:any) => {
-      if (!value) return true;
-      return data.deptName.includes(value)
-    };
-    // 多选框选中数据
-    const handleSelectionChange = (selection:any[])=> {
-      state.ids = selection.map(item => item.id)
-    };
-    // 节点单击事件
-    const handleNodeClick = (data:any) => {
-      state.tableData.param.deptId = data.deptId;
-      userList();
-    };
-    /** 重置密码按钮操作 */
-    const handleResetPwd = (row:any)=> {
-      ElMessageBox.prompt('请输入"' + row.userName + '"的新密码', "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消"
-      }).then(({ value }) => {
-        if(!value || value==''){
-          ElMessage.success('密码不能为空');
-          return
-        }
-        resetUserPwd(row.id, value).then(() => {
-            ElMessage.success("修改成功，新密码是：" + value);
-        });
-      }).catch(() => {});
-    };
-    // 用户状态修改
-    const handleStatusChange = (row:any)=> {
-      let text = row.userStatus === 1 ? "启用" : "停用";
-      ElMessageBox.confirm('确认要"' + text + '"："' + row.userName + '"用户吗?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function() {
-        return changeUserStatus(row.id, row.userStatus);
-      }).then(() => {
-        ElMessage.success(text + "成功");
-      }).catch(function() {
-        row.userStatus =row.userStatus === 0 ?1 : 0;
-      });
-    };
-    /** 重置按钮操作 */
-    const resetQuery = (formEl: FormInstance | undefined) => {
-      if (!formEl) return
-      formEl.resetFields()
-      userList()
-    };
+		watch(filterText, (val) => {
+			treeRef.value!.filter(val);
+		});
+		const deptFilterNode = (value: string, data: any) => {
+			if (!value) return true;
+			return data.deptName.includes(value);
+		};
+		// 多选框选中数据
+		const handleSelectionChange = (selection: any[]) => {
+			state.ids = selection.map((item) => item.id);
+		};
+		// 节点单击事件
+		const handleNodeClick = (data: any) => {
+			state.tableData.param.deptId = data.deptId;
+			userList();
+		};
+		/** 重置密码按钮操作 */
+		const handleResetPwd = (row: any) => {
+			ElMessageBox.prompt('请输入"' + row.userName + '"的新密码', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+			})
+				.then(({ value }) => {
+					if (!value || value == '') {
+						ElMessage.success('密码不能为空');
+						return;
+					}
+					resetUserPwd(row.id, value).then(() => {
+						ElMessage.success('修改成功，新密码是：' + value);
+					});
+				})
+				.catch(() => {});
+		};
+		// 用户状态修改
+		const handleStatusChange = (row: any) => {
+			let text = row.userStatus === 1 ? '启用' : '停用';
+			ElMessageBox.confirm('确认要"' + text + '"："' + row.userName + '"用户吗?', '警告', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(function () {
+					return changeUserStatus(row.id, row.userStatus);
+				})
+				.then(() => {
+					ElMessage.success(text + '成功');
+				})
+				.catch(function () {
+					row.userStatus = row.userStatus === 0 ? 1 : 0;
+				});
+		};
+		/** 重置按钮操作 */
+		const resetQuery = (formEl: FormInstance | undefined) => {
+			if (!formEl) return;
+			formEl.resetFields();
+			userList();
+		};
 		return {
-      queryRef,
+			queryRef,
 			editUserRef,
 			onOpenAddUser,
 			onOpenEditUser,
 			onRowDel,
 			onHandleSizeChange,
 			onHandleCurrentChange,
-      deptFilterNode,
-      filterText,
-      treeRef,
-      search,
-      sys_user_sex,
-      userList,
-      handleSelectionChange,
-      handleNodeClick,
-      handleResetPwd,
-      handleStatusChange,
-      resetQuery,
+			deptFilterNode,
+			filterText,
+			treeRef,
+			search,
+			sys_user_sex,
+			userList,
+			handleSelectionChange,
+			handleNodeClick,
+			handleResetPwd,
+			handleStatusChange,
+			resetQuery,
 			...toRefs(state),
 		};
 	},