diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
new file mode 100644
index 0000000..e825628
--- /dev/null
+++ b/src/api/system/dept.ts
@@ -0,0 +1,59 @@
+import { http } from '@/utils/http/axios';
+
+/**
+ * @description: 部门列表
+ */
+export function getDeptList(params?) {
+  return http.request({
+    url: '/dept/list',
+    method: 'GET',
+    params,
+  });
+}
+/**
+ * @description: 根据ID获取详情
+ */
+export function getDeptDetail(userId) {
+  return http.request({
+    url: '/dept/detail/'+userId,
+    method: 'get',
+  });
+}
+/**
+ * @description: 添加部门
+ */
+export function deptAdd(data:any) {
+  return http.request({
+    url: '/dept/add',
+    method: 'POST',
+    data,
+  });
+}
+/**
+ * @description: 更新部门
+ */
+export function deptpdate(data:any) {
+  return http.request({
+    url: '/dept/update',
+    method: 'PUT',
+    data
+  });
+}
+/**
+ * @description: 删除部门
+ */
+export function deptDelete(userId) {
+  return http.request({
+    url: '/dept/delete/'+userId,
+    method: 'DELETE',
+  });
+}
+/**
+ * @description: 批量删除部门
+ */
+export function deptBatchDelete(userId) {
+  return http.request({
+    url: '/dept/batchDelete/'+userId,
+    method: 'DELETE',
+  });
+}
\ No newline at end of file
diff --git a/src/api/system/level.ts b/src/api/system/level.ts
new file mode 100644
index 0000000..b46ff50
--- /dev/null
+++ b/src/api/system/level.ts
@@ -0,0 +1,66 @@
+import { http } from '@/utils/http/axios';
+
+/**
+ * @description: 职级列表
+ */
+export function getLevelList(params?) {
+  return http.request({
+    url: '/level/page',
+    method: 'GET',
+    params,
+  });
+}
+export function getLevelAllList(params?) {
+  return http.request({
+    url: '/level/list',
+    method: 'GET',
+    params,
+  });
+}
+/**
+ * @description: 根据ID获取详情
+ */
+export function getLevelDetail(userId) {
+  return http.request({
+    url: '/level/detail/'+userId,
+    method: 'get',
+  });
+}
+/**
+ * @description: 添加职级
+ */
+export function levelAdd(data:any) {
+  return http.request({
+    url: '/level/add',
+    method: 'POST',
+    data,
+  });
+}
+/**
+ * @description: 更新职级
+ */
+export function levelUpdate(data:any) {
+  return http.request({
+    url: '/level/update',
+    method: 'PUT',
+    data
+  });
+}
+/**
+ * @description: 删除职级
+ */
+export function levelDelete(userId) {
+  return http.request({
+    url: '/level/delete/'+userId,
+    method: 'DELETE',
+  });
+}
+/**
+ * @description: 批量删除职级
+ */
+export function levelBatchDelete(userId) {
+  return http.request({
+    url: '/level/batchDelete/'+userId,
+    method: 'DELETE',
+  });
+}
\ No newline at end of file
diff --git a/src/api/system/position.ts b/src/api/system/position.ts
new file mode 100644
index 0000000..f064285
--- /dev/null
+++ b/src/api/system/position.ts
@@ -0,0 +1,66 @@
+import { http } from '@/utils/http/axios';
+
+/**
+ * @description: 岗位列表
+ */
+export function getPositionList(params?) {
+  return http.request({
+    url: '/position/page',
+    method: 'GET',
+    params,
+  });
+}
+export function getPositionAllList(params?) {
+  return http.request({
+    url: '/position/list',
+    method: 'GET',
+    params,
+  });
+}
+/**
+ * @description: 根据ID获取详情
+ */
+export function getPositionDetail(userId) {
+  return http.request({
+    url: '/position/detail/'+userId,
+    method: 'get',
+  });
+}
+/**
+ * @description: 添加岗位
+ */
+export function positionAdd(data:any) {
+  return http.request({
+    url: '/position/add',
+    method: 'POST',
+    data,
+  });
+}
+/**
+ * @description: 更新岗位
+ */
+export function positionUpdate(data:any) {
+  return http.request({
+    url: '/position/update',
+    method: 'PUT',
+    data
+  });
+}
+/**
+ * @description: 删除岗位
+ */
+export function positionDelete(userId) {
+  return http.request({
+    url: '/position/delete/'+userId,
+    method: 'DELETE',
+  });
+}
+/**
+ * @description: 批量删除岗位
+ */
+export function positionBatchDelete(userId) {
+  return http.request({
+    url: '/role/batchDelete/'+userId,
+    method: 'DELETE',
+  });
+}
\ No newline at end of file
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index b8922f3..8b5e06e 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -133,4 +133,26 @@ export function userBatchDelete(userId) {
     url: '/user/batchDelete/'+userId,
     method: 'DELETE',
   });
+}
+/**
+ * @description: 导出用户
+ */
+export function userExport() {
+  return http.request({
+    url: '/user/export',
+    method: 'GET',
+    responseType: 'blob'
+  });
+}
+/**
+ * @description: 城市列表
+ */
+export function getCityByList(params:any) {
+	return http.request({
+		url: '/city/list',
+		method: 'get',
+    params:{
+      ...params
+    }
+	});
 }
\ No newline at end of file
diff --git a/src/components/ChinaArea/index.vue b/src/components/ChinaArea/index.vue
new file mode 100644
index 0000000..4ece9a4
--- /dev/null
+++ b/src/components/ChinaArea/index.vue
@@ -0,0 +1,96 @@
+<template>
+	<el-cascader  :filterable="false" :props="cascaderProps" clearable :disabled="disabled" v-model="selectedOptions" @change="handleChange"/>
+</template>
+<script setup lang="ts" name="china-area">
+  import { ref,onMounted,computed } from 'vue'
+import type { CascaderProps } from 'element-plus'
+import {getCityByList} from "@/api/system/user";
+const emit = defineEmits(['update:modelValue', 'change']);
+const optionsData = ref();
+const mapData=ref({})
+const props = defineProps({
+	// 当前的值
+	modelValue: [String,Array],
+	// 类型 (二级联动，三级联动)
+	type: {
+		type: Number,
+		default: 3,
+	},
+	// 是否禁用
+	disabled: {
+		type: Boolean,
+		default: () => false,
+	},
+});
+
+const cascaderProps: CascaderProps = {
+  value: 'areaCode',
+  label: 'name',
+  leaf: 'hasChild',
+  lazy: true,
+  lazyLoad: function (node, resolve) {
+    let level = node.level
+    let value = node.value
+    getCityList(value ? value : 0, level, resolve)
+  }
+}
+
+const getCityList= (pid:any, level:any, resolve:any)=> {
+  getCityByList({pid}).then(data => {
+    for (let i = 0; i < data.length; i++) {
+      data[i].areaCode = parseInt(data[i].areaCode)
+      data[i].hasChild = level >= props.type-1 ? true : false
+    }
+    mapData.value[pid] = data
+    resolve(data ? data : [])
+  }).catch(e => {
+    resolve([])
+  });
+}
+
+const selectedOptions = computed({
+	get: () => {
+		return props.modelValue;
+	},
+	set: (val) => {
+		emit('update:modelValue', val);
+	},
+});
+
+const findListChild= (list:any, value:any)=>{
+  let child = null
+  for (let i = 0; i < list.length; i++) {
+    if (list[i].areaCode == value) {
+      child = list[i]
+      break;
+    }
+  }
+  return child
+}
+
+const handleChange = (value: String[]) => {
+  let receiveText = ''
+  if (value&&value.length>0) {
+    if (mapData.value[0]) {
+      for (let i = 0; i < value.length; i++) {
+        if (i === 0) {
+          let child = findListChild(mapData.value[0], value[i])
+          receiveText += child ? child.name : ''
+        } else {
+          let child = findListChild(mapData.value[value[i - 1]], value[i])
+          receiveText += child ? child.name : ''
+        }
+      }
+    }
+  }
+	emit('change', receiveText);
+};
+
+onMounted(() => {
+});
+</script>
+<style lang="scss">
+.el-cascader-menu{
+  background-color: #ffffff;
+}
+</style>
diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts
index 2f1508e..63ac051 100644
--- a/src/utils/http/axios/index.ts
+++ b/src/utils/http/axios/index.ts
@@ -41,7 +41,6 @@ const transform: AxiosTransform = {
       isTransformResponse,
       isReturnNativeResponse,
     } = options;
-
     // 是否返回原生响应头 比如：需要获取响应头时使用该属性
     if (isReturnNativeResponse) {
       return res;
@@ -52,11 +51,13 @@ const transform: AxiosTransform = {
       return res.data;
     }
 
-
     if (!res.data) {
       // return '[HTTP] Request has no return value';
       throw new Error('请求出错，请稍候重试');
     }
+    if(res.config.responseType=="blob"){
+      return res.data
+    }
     //  这里 code，result，message为 后台统一的字段，需要修改为项目自己的接口返回格式
     const { code, data, msg } = res.data;
     // 请求成功
diff --git a/src/views/system/user/edit.vue b/src/views/system/user/edit.vue
index 3894640..a521235 100644
--- a/src/views/system/user/edit.vue
+++ b/src/views/system/user/edit.vue
@@ -2,7 +2,7 @@
   <el-dialog
       v-model="props.visible"
       :title="props.userId?'编辑':'新增'"
-      width="500"
+      width="700"
       :close-on-click-modal="false"
       :before-close="dialogClose"
   >
@@ -11,9 +11,11 @@
         :model="formData"
         label-width="84px"
     >
+    <div class="flex">
       <el-form-item
           label="账号"
           prop="username"
+           class="flex-1"
           :rules="{ required: true, message: '请输入账号', trigger: 'blur' }"
       >
         <el-input
@@ -25,29 +27,31 @@
       </el-form-item>
       <el-form-item
           label="名称"
-          prop="nickname"
+          prop="realname"
+           class="flex-1"
           :rules="{ required: true, message: '请输入名称', trigger: 'blur' }"
       >
         <el-input
-            v-model="formData.nickname"
+            v-model="formData.realname"
             placeholder="请输入名称"
             clearable
         />
       </el-form-item>
-      <el-form-item
-          label="邮箱地址"
-          prop="email"
-          :rules="{ required: true, message: '请输入邮箱地址', trigger: 'blur' }"
-      >
-        <el-input
-            v-model="formData.email"
-            placeholder="请输入邮箱地址"
-            clearable
-        />
-      </el-form-item>
+    </div>
+    <div class="flex">
+      <el-form-item label="性别" prop="sex"  class="flex-1">
+              <el-radio-group v-model="formData.gender" name="gender">
+                <el-space>
+                  <el-radio :value="1">男</el-radio>
+                  <el-radio :value="2">女</el-radio>
+                  <el-radio :value="3">保密</el-radio>
+                </el-space>
+              </el-radio-group>
+            </el-form-item>
       <el-form-item
           label="角色"
           prop="roleIds"
+          class="flex-1"
           :rules="{ required: true, message: '请选择角色', trigger: 'change' }"
       >
         <el-select
@@ -60,16 +64,129 @@
         >
           <el-option v-if="isRoot" label="系统管理员" value="0" />
           <el-option
-              v-for="(item, index) in optionData.role"
+              v-for="(item, index) in optionData.roleList"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+    </div>
+    <div class="flex">
+      <el-form-item
+          label="手机号码"
+          prop="mobile"
+          class="flex-1"
+          :rules="{ required: true, message: '请输入手机号码', trigger: 'blur' }"
+      >
+        <el-input
+            v-model="formData.mobile"
+            placeholder="请输入手机号码"
+            clearable
+        />
+      </el-form-item>
+      <el-form-item
+          label="邮箱地址"
+          prop="email"
+          class="flex-1"
+          :rules="{ required: true, message: '请输入邮箱地址', trigger: 'blur' }"
+      >
+        <el-input
+            v-model="formData.email"
+            placeholder="请输入邮箱地址"
+            clearable
+        />
+      </el-form-item>
+    </div>
+    <div class="flex">
+      <el-form-item
+          label="部门"
+          prop="deptId"
+          class="flex-1"
+      >
+      <!-- <el-tree-select
+        v-model="formData.deptId"
+        :data="optionData.deptList"
+        :render-after-expand="false"
+      /> -->
+      <el-select
+            v-model="formData.deptId"
+            multiple
+            class="flex-1"
+            clearable
+            placeholder="请选择角色"
+        >
+          <el-option
+              v-for="(item, index) in optionData.deptList"
               :key="index"
               :label="item.name"
               :value="item.id"
           />
         </el-select>
       </el-form-item>
+      <el-form-item
+          label="职级"
+          prop="levelId"
+          class="flex-1"
+      >
+      <el-select
+            v-model="formData.levelId"
+            multiple
+            class="flex-1"
+            clearable
+            placeholder="请选择角色"
+        >
+          <el-option
+              v-for="(item, index) in optionData.levelList"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+    </div>
+    <div class="flex">
+      <el-form-item
+          label="岗位"
+          prop="positionId"
+          class="flex-1"
+      >
+      <el-select
+            v-model="formData.positionId"
+            multiple
+            class="flex-1"
+            clearable
+            placeholder="请选择角色"
+        >
+          <el-option
+              v-for="(item, index) in optionData.positionList"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+    </div>
+    <div class="flex">
+      <el-form-item label="所属区域" class="flex-1">
+       
+        
+        <chinaArea style="width: 100%" :type="4" v-model="formData.cityCode"></chinaArea>
+
+      </el-form-item>
+      <el-form-item label="详细地址" class="flex-1">
+        <el-input
+            v-model="formData.address"
+            placeholder="请输入详细地址"
+            clearable
+        />
+      </el-form-item>
+    </div>
+    <div class="flex">
       <el-form-item
           label="密码"
           prop="password"
+          class="flex-1"
           :rules="{ required: props.userId?false:true, message: '请输入密码', trigger: 'blur' }"
       >
         <el-input
@@ -84,6 +201,7 @@
       <el-form-item
           label="确认密码"
           prop="passwordConfirm"
+          class="flex-1"
           :rules="[{ required:  props.userId?false:true, message: '请输入密码', trigger: 'blur' },{validator:  props.userId?void(0):passwordConfirmValidator,trigger: 'blur'}]"
       >
         <el-input
@@ -94,7 +212,8 @@
             placeholder="请输入确认密码"
         />
       </el-form-item>
-
+    </div>
+    <div class="flex">
       <el-form-item label="管理员状态" v-if="!isRoot">
         <el-switch
             v-model="formData.userStatus"
@@ -102,7 +221,18 @@
             inactive-value="disable"
         />
       </el-form-item>
-
+    </div>
+    <div class="flex"></div>
+      <el-form-item label="头像" prop="images">
+              <BasicUpload
+                :action="`${uploadUrl}/api/upload/uploadFile`"
+                v-model:list="fileList"
+                :headers="uploadHeaders"
+                :data="{ name: 'avatar' }"
+                :limit="1"
+                @upload-change="uploadChange"
+              />
+            </el-form-item>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
@@ -117,12 +247,22 @@
 
 <script lang="ts" setup>
 import {getUserDetail,userAdd,userUpdate} from '@/api/system/user';
-import {computed, onMounted, reactive, shallowRef} from "vue";
+import { BasicUpload } from '@/components/Upload';
+import chinaArea  from '@/components/ChinaArea/index.vue';
+import {computed, onMounted, reactive, shallowRef,ref,unref} from "vue";
+import { getRoleAllList } from '@/api/system/role';
+import { getDeptList } from '@/api/system/dept';
+import { getLevelAllList } from '@/api/system/level';
+import { getPositionAllList } from '@/api/system/position';
 import {message} from "@/utils/auth";
 import {FormInstance} from "element-plus";
+
 const formRef = shallowRef<FormInstance>();
 import {useLockFn} from "@/utils/useLockFn";
-
+import { useGlobSetting } from '@/hooks/setting';
+import { useUserStore } from '@/store/modules/user';
+  const globSetting = useGlobSetting();
+const { uploadUrl } = globSetting;
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -133,27 +273,32 @@ const props = defineProps({
     type: Number,
     required: true,
     default: 0
-  },
-  roleList: {
-    type: Array,
-    default: []
   }
 });
 
 const emit = defineEmits(["success", "update:visible"]);
-
+const uploadHeaders = reactive({
+    authorization:useUserStore().getToken
+  });
 const formData = reactive({
   userId: 0,
   email:'',
   username: "",
-  nickname: "",
+  realname: "",
+  mobile:'',
+  gender:1,
   roleIds: [],
+  deptId:'',
+  levelId:'',
+  positionId:'',
+  address:'',
+  cityCode:'',
   avatar: "",
   password: "",
   passwordConfirm: "",
   userStatus: 'enable'
 });
-
+const fileList = ref([]);
 const passwordConfirmValidator = (
     rule: object,
     value: string,
@@ -193,11 +338,29 @@ const handleSubmit = async () => {
 const { isLock:subLoading,lockFn: submit } = useLockFn(handleSubmit);
 
 const optionData = reactive({
-  role:props.roleList
+  roleList:[],
+  deptList:[],
+  levelList:[],
+  positionList:[]
 });
 
+function uploadChange(list: string[]) {
+    console.log('🚀 ~ file: index.vue ~ line 118 ~ uploadChange ~ list', list);
+    formData.avatar = unref(list);
+  }
 
+const getAllDict = async () => {
+  let list = await getRoleAllList();
+  optionData.roleList = list ? list : [];
+  list = await getDeptList();
+  optionData.deptList = list ? list : [];
+  list = await getLevelAllList();
+  optionData.levelList = list ? list : [];
+  list = await getPositionAllList();
+  optionData.positionList = list ? list : [];
+};
 onMounted(() => {
+  getAllDict()
   if (props.userId) {
     setFormData({userId: props.userId});
   }
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 42d7ea9..eeb798e 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -37,6 +37,32 @@
               </template>
               删除
             </el-button>
+            <el-upload
+            ref="upload"
+            action="/api/user/import"
+            :headers="uploadHeaders"
+            :on-error="onError"
+            :on-success="onSuccess"
+            :before-upload="beforeUpload"
+            :limit="1"
+          >
+            <el-button type="danger">
+              <template #icon>
+                <el-icon class="el-input__icon">
+                  <Upload />
+                </el-icon>
+              </template>
+              导入
+            </el-button>
+          </el-upload>
+            <el-button type="danger" @click="handleExport" :loading="exportLoading" :disabled="exportLoading">
+              <template #icon>
+                <el-icon class="el-input__icon">
+                  <Download />
+                </el-icon>
+              </template>
+              导出
+            </el-button>
           </el-space>
         </template>
       </BasicTable>
@@ -44,7 +70,6 @@
     <editDialog
         v-if="editVisible"
         :userId="userId"
-        :roleList="roleList"
         v-model:visible="editVisible"
         @success="reloadTable"
     >
@@ -54,23 +79,33 @@
 
 <script lang="ts" setup>
   import { h, nextTick, reactive, ref, unref ,defineAsyncComponent,onMounted} from 'vue';
-  import { ColProps, ElMessage } from 'element-plus';
+  import { ColProps, ElMessage,  UploadInstance } from 'element-plus';
   import { BasicTable, TableAction } from '@/components/Table';
   import { BasicForm, useForm } from '@/components/Form/index';
-  import { getUserList,userDelete,userBatchDelete } from '@/api/system/user';
-  import {message,confirm} from "@/utils/auth";
-  import { getRoleAllList } from '@/api/system/role';
+  import { getUserList,userDelete,userBatchDelete,userExport } from '@/api/system/user';
+  import {message,confirm,loading, closeLoading} from "@/utils/auth";
   import { columns } from './columns';
   import { schemas } from './querySchemas';
+  import { useUserStore } from '@/store/modules/user';
+  import {
+    downloadByUrl,
+    downloadByData,
+    downloadByBase64,
+    downloadByOnlineUrl,
+  } from '@/utils/file/download';
   const userId =  ref(0);
   const basicTableRef = ref();
   const editVisible = ref(false)
-  const roleList = ref([])
   const selectionData = ref([])
   const tableData = ref();
+  const upload = ref<UploadInstance>();
+  const exportLoading=ref(false)
   const editDialog = defineAsyncComponent(() =>
     import('./edit.vue')
 )
+const uploadHeaders = reactive({
+    authorization:useUserStore().getToken
+  });
   const formParams = reactive({
     username: '',
     mobile: '',
@@ -169,32 +204,47 @@
     submitOnReset:true,
     schemas
   });
-
-
-  //删除
-  function openRemoveModal() {
-    lightOpenModal();
-  }
-
   //添加
   function addUser() {
     userId.value =0
     editVisible.value  = true
   }
-
-  //确认删除
-  function removeOkModal() {
-    lightSetSubLoading(true);
-    lightCloseModal();
-    reloadTable()
+const beforeUpload = (file: UploadFile) => {
+  const isLt2M = file.size / 1024 / 1024 < 200;
+  if (!isLt2M) {
+    message("大小不能超过200MB!", "error");
+    return false;
   }
-  const getAllDict = async () => {
-    const list = await getRoleAllList();
-    roleList.value = list ? list : [];
-  };
-  onMounted(() => {
-    getAllDict()
-  });
+  if (!/\.(xlsx|xls|XLSX|XLS)$/.test(file.name)) {
+    message("请上传.xlsx .xls", "error");
+    return false;
+  }
+  loading("上传中");
+  return true;
+};
+const onSuccess = (file: UploadFile) => {
+  upload.value!.clearFiles();
+  closeLoading();
+  if (file.code == 200) {
+    message("导入成功");
+    reloadTable()
+  } else {
+    message(file.msg ? file.msg : "导入失败", "error");
+  }
+};
+const onError = () => {
+  upload.value!.clearFiles();
+  closeLoading();
+  message("导入失败", "error");
+};
+//导出
+const handleExport = async()=>{
+  exportLoading.value=true
+  const data=await userExport()
+  downloadByData(data, '用户信息.xlsx');
+  message("导出成功");
+}
+
 </script>
 
 <style lang="scss" scoped></style>