diff --git a/src/api/system/userInfo.js b/src/api/system/userInfo.js
index d5aecb9..06e7a2a 100644
--- a/src/api/system/userInfo.js
+++ b/src/api/system/userInfo.js
@@ -4,18 +4,18 @@ import { parseStrEmpty } from "@/utils/bonus";
 // 查询用户列表
 export function listUser(query) {
   return request({
-    url: '/system/user/getUserList',
+    url: '/system/user/list',
     method: 'get',
     params: query
   })
 }
 
 // 查询用户详细
-export function getUserById(query) {
+export function getUserById(data) {
     return request({
-      url: '/system/user/getUserById',
-      method: 'get',
-      params: query
+      url: '/system/user/getUsersById',
+      method: 'post',
+      data: data
     })
   }
 
@@ -32,16 +32,34 @@ export function addUser(data) {
 export function updateUser(data) {
   return request({
     url: '/system/user/updateUser',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
 
 // 删除用户
-export function delUser(userId) {
+export function delUser(data) {
   return request({
-    url: '/system/user/delUser/' + userId,
-    method: 'delete'
+    url: '/system/user/delUser',
+    method: 'post',
+    data: data
+  })
+}
+// 导出用户
+export function exportUser(data) {
+  return request({
+    url: '/system/user/export',
+    method: 'post',
+    data: data
+  })
+}
+ 
+
+// 角色下拉
+export function getSelectRole(query) {
+  return request({
+    url: '/system/user/getSelectRole',
+    method: 'get',
+    params: query
   })
 }
- 
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 4de851a..44487f2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -15,6 +15,7 @@ import router from './router'
 import directive from './directive' // directive
 import plugins from './plugins' // plugins
 import { download } from '@/utils/request'
+import { downloadFile } from '@/utils/download'
 
 import './assets/icons' // icon
 import './permission' // permission control
@@ -51,6 +52,7 @@ Vue.prototype.addDateRange = addDateRange
 Vue.prototype.selectDictLabel = selectDictLabel
 Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.download = download
+Vue.prototype.downloadFile = downloadFile
 Vue.prototype.handleTree = handleTree
 
 // 全局组件挂载
diff --git a/src/views/components/countryMap.vue b/src/views/components/countryMap.vue
index a746ab4..3916e8b 100644
--- a/src/views/components/countryMap.vue
+++ b/src/views/components/countryMap.vue
@@ -4,7 +4,7 @@
             <div id="mapEcharts"></div>
         </div>
 
-        <el-dialog title="人员信息" :visible.sync="open" width="1300px" append-to-body>
+        <el-dialog :title="title" :visible.sync="open" width="1300px" append-to-body>
             <el-form ref="dialogQueryForm" :model="dialogQueryForm" :inline="true"  size="small" label-width="80px">
                 <el-form-item label="姓名" prop="userName">
                     <el-input
@@ -28,8 +28,8 @@
                 <el-table-column label="序号" type="index" width="55" align="center" />
                 <el-table-column label="姓名" align="center" prop="userName" />
                 <el-table-column label="所属部门" align="center" prop="orgName" :show-overflow-tooltip="true" />
-                <el-table-column label="岗位" align="center" prop="toWorkAttCurrentTime" :show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="手机号" align="center" prop="toWorkAttCurrentTime" :show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="岗位" align="center" prop="postName" :show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="手机号" align="center" prop="phone" :show-overflow-tooltip="true"></el-table-column>
             </el-table>
 
             <pagination
@@ -39,12 +39,7 @@
             :limit.sync="dialogQueryForm.pageSize"
             @pagination="getDialogList"
             />
-
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="cancel">确 定</el-button>
-                <el-button @click="cancel">取 消</el-button>
-            </div>
-            </el-dialog>
+        </el-dialog>
         
     </div>
 </template>
@@ -54,7 +49,7 @@
 import * as echarts from 'echarts'
 import mapChinaJson from '@/utils/mapJson/china.json'
 import { listDept } from "@/api/system/dept";
-import { getAttDayReportDetailsList } from "@/api/report/dayReport";
+import { listUser} from "@/api/system/userInfo";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";   
 export default {
@@ -107,6 +102,7 @@ export default {
 ,           deptOptions:[],
             loading:false,
             open:false,
+            title:'人员信息',
             dialogList:[],
             
         }
@@ -410,14 +406,15 @@ export default {
         },
         openDialog(item){
             this.open=true;
-            this.dialogQueryForm.orgId = item.orgId
+            this.dialogQueryForm.orgId = item.orgId;
+            this.title = item.orgName+'人员信息';
             this.getDialogList()
         },
         cancel(){
             this.open=false;
         },
         getDialogList() {
-          getAttDayReportDetailsList(this.dialogQueryForm).then(response => {
+            listUser(this.dialogQueryForm).then(response => {
             this.dialogList = response.rows;
             this.dialogTotal = response.total; 
           });
diff --git a/src/views/process/leaveImport/index.vue b/src/views/process/leaveImport/index.vue
index 4da7881..9f99ae2 100644
--- a/src/views/process/leaveImport/index.vue
+++ b/src/views/process/leaveImport/index.vue
@@ -82,15 +82,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="所属部门:" prop="orgId">
-              <el-select v-model="form.orgId" disabled style="width: 100%;">
+            <el-form-item label="所属部门:" prop="orgName">
+              <el-input v-model="form.orgName" :readonly="true" />
+              <!-- <el-select v-model="form.orgId" disabled style="width: 100%;">
                 <el-option 
                   v-for="item in orgList"
                   :key="item.id"
                   :label="item.name"
                   :value="item.id"
                 />
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -102,7 +103,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="请假类型:" prop="leaveType">
-              <el-select v-model="form.orgId" disabled style="width: 100%;">
+              <el-select v-model="form.leaveType" disabled style="width: 100%;">
                 <el-option 
                   v-for="item in leaveTypeList"
                   :key="item.id"
@@ -159,8 +160,8 @@
             <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的数据
           </div> -->
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <!-- <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
-            @click="importTemplate">下载模板</el-link> -->
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+            @click="importTemplate">下载模板</el-link>
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -172,7 +173,7 @@
 </template>
 
 <script>
- import { listHoliday,getHoliday,delHoliday,addHoliday,updateHoliday,changeHolidayStatus } from "@/api/process/rest";
+ import { listHoliday,getHoliday,exportHoliday } from "@/api/process/rest";
 import Treeselect from "@riophae/vue-treeselect";
 import { getToken } from "@/utils/auth";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -358,9 +359,10 @@ export default {
  
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/dict/type/export', {
-        ...this.queryParams
-      }, `type_${new Date().getTime()}.xlsx`)
+        this.queryParams.exportType="查询";
+        exportHoliday(this.queryParams).then(res => {
+          this.downloadFile({ fileName: `请假单_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
+        })
     },
     /** 导入按钮操作 */
     handleImport() {
@@ -369,8 +371,8 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-      this.download('system/user/importTemplate', {
-      }, `user_template_${new Date().getTime()}.xlsx`)
+      // this.download('system/user/importTemplate', {
+      // }, `user_template_${new Date().getTime()}.xlsx`)
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
diff --git a/src/views/process/outApply/index.vue b/src/views/process/outApply/index.vue
index 4ae334a..b0d6d6e 100644
--- a/src/views/process/outApply/index.vue
+++ b/src/views/process/outApply/index.vue
@@ -206,7 +206,6 @@
 
 <script>
 import { listHoliday,getHoliday,delHoliday,addHoliday,updateHoliday,changeHolidayStatus,exportHoliday } from "@/api/process/rest";
- import { downloadFile } from '@/utils/download'
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
@@ -463,7 +462,7 @@ export default {
     handleExport() {
         this.queryParams.exportType="查询";
         exportHoliday(this.queryParams).then(res => {
-          downloadFile({ fileName: `临时外出_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
+          this.downloadFile({ fileName: `临时外出_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
         })
     },
 
diff --git a/src/views/process/outExam/index.vue b/src/views/process/outExam/index.vue
index c58484b..175c5f6 100644
--- a/src/views/process/outExam/index.vue
+++ b/src/views/process/outExam/index.vue
@@ -355,7 +355,7 @@ export default {
     handleExport() {
         this.queryParams.exportType="审批";
         exportHoliday(this.queryParams).then(res => {
-          downloadFile({ fileName: `临时外出_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
+          this.downloadFile({ fileName: `临时外出_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
         })
     },
 
diff --git a/src/views/process/restApply/index.vue b/src/views/process/restApply/index.vue
index 920ef72..1f70c4e 100644
--- a/src/views/process/restApply/index.vue
+++ b/src/views/process/restApply/index.vue
@@ -210,7 +210,6 @@
   <script>
   import { listHoliday,getHoliday,delHoliday,addHoliday,updateHoliday,changeHolidayStatus,exportHoliday } from "@/api/process/rest";
   import Treeselect from "@riophae/vue-treeselect";
-  import { downloadFile } from '@/utils/download'
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
   export default {
     name: "rules",
@@ -454,7 +453,7 @@
       handleExport() {
         this.queryParams.exportType="查询";
         exportHoliday(this.queryParams).then(res => {
-          downloadFile({ fileName: `轮休_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
+          this.downloadFile({ fileName: `轮休_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
         })
       },
  
diff --git a/src/views/process/restExam/index.vue b/src/views/process/restExam/index.vue
index 63bb9c6..e916a41 100644
--- a/src/views/process/restExam/index.vue
+++ b/src/views/process/restExam/index.vue
@@ -174,7 +174,6 @@
 
 <script>
 import { checkListHoliday,getHoliday,changeHolidayStatus,exportHoliday } from "@/api/process/rest";
-import { downloadFile } from '@/utils/download'
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
@@ -358,7 +357,7 @@ export default {
     handleExport() {
       this.queryParams.exportType="审批";
       exportHoliday(this.queryParams).then(res => {
-        downloadFile({ fileName: `轮休_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
+        this.downloadFile({ fileName: `轮休_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
       })
     },
 
diff --git a/src/views/system/userInfo/index.vue b/src/views/system/userInfo/index.vue
index 3575afa..5ab41f6 100644
--- a/src/views/system/userInfo/index.vue
+++ b/src/views/system/userInfo/index.vue
@@ -21,23 +21,17 @@
   
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
-          <el-button
-            type="primary"
-            plain
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleAdd"
+          <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
           >新增</el-button>
         </el-col>
         <el-col :span="1.5">
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
+          <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           >导出</el-button>
         </el-col>
+        <el-col :span="1.5">
+          <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport"
+          >导入</el-button>
+        </el-col>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
   
@@ -47,12 +41,12 @@
             <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="姓名" align="center" prop="dictId" />
-        <el-table-column label="所属部门" align="center" prop="userName" :show-overflow-tooltip="true" />
-        <el-table-column label="岗位" align="center" prop="userName" :show-overflow-tooltip="true"/>
-        <el-table-column label="人员角色" align="center" prop="status" :show-overflow-tooltip="true" />
-        <el-table-column label="手机号(登录名称)" align="center" prop="remark" :show-overflow-tooltip="true" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="姓名" align="center" prop="userName" />
+        <el-table-column label="所属部门" align="center" prop="orgName" :show-overflow-tooltip="true" />
+        <el-table-column label="岗位" align="center" prop="postName" :show-overflow-tooltip="true"/>
+        <el-table-column label="人员角色" align="center" prop="roleName" :show-overflow-tooltip="true" />
+        <el-table-column label="手机号(登录名称)" align="center" prop="phone" :show-overflow-tooltip="true" />
+        <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button
               size="mini"
@@ -86,29 +80,31 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="所属部门" prop="orgId">
-                      <treeselect v-model="form.orgId" :options="deptOptions" :normalizer="normalizer" placeholder="选择所属部门"/>
+                    <el-form-item label="所属部门" prop="orgIds">
+                      <treeselect v-model="form.orgIds" :multiple="true" :flat="true" :options="deptOptions" :normalizer="normalizer" placeholder="选择所属部门"/>
                     </el-form-item>
                 </el-col>
             </el-row>
 
             <el-row>
                 <el-col :span="12">
-                    <el-form-item label="岗位名称" prop="postName">
-                        <el-input v-model="form.postName" placeholder="请输入岗位名称" maxlength="20"/>
+                    <el-form-item label="岗位名称" prop="postIds">
+                        <el-select v-model="form.postIds" multiple  placeholder="人员岗位" clearable>
+                          <el-option v-for="dict in dict.type.post_list" :key="dict.value" :label="dict.label"
+                          :value="dict.value"></el-option>
+                        </el-select>
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="人员角色" prop="roles">
-                        <el-input v-model="form.roles" placeholder="请输入人员角色" maxlength="20"/>
-                        <!-- <el-select v-model="form.roles" placeholder="人员角色" clearable>
+                    <el-form-item label="人员角色" prop="roleIds">
+                        <el-select v-model="form.roleIds" multiple  placeholder="人员角色" clearable>
                             <el-option
-                            v-for="item in statusList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
+                            v-for="item in roleList"
+                            :key="item.roleId"
+                            :label="item.roleName"
+                            :value="item.roleId"
                             />
-                        </el-select> -->
+                        </el-select>
                     </el-form-item>
                 </el-col>
             </el-row>
@@ -127,18 +123,42 @@
           <el-button @click="cancel">取 消</el-button>
         </div>
       </el-dialog>
+
+
+      <!-- 用户导入对话框 -->
+      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+        <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+          :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+          :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+          <i class="el-icon-upload"></i>
+          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+          <div class="el-upload__tip text-center" slot="tip">
+            <div class="el-upload__tip" slot="tip">
+              <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+            </div>
+            <span>仅允许导入xls、xlsx格式文件。</span>
+            <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+              @click="importTemplate">下载模板</el-link>
+          </div>
+        </el-upload>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+      </el-dialog>
+
+
     </div>
   </template>
   
   <script>
-  import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-  import { listUser } from "@/api/system/userInfo";
+  import { listUser, getUserById, delUser, addUser, updateUser, getSelectRole, exportUser } from "@/api/system/userInfo";
   import { listDept } from "@/api/system/dept";
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";   
   export default {
     name: "Dict",
-    dicts: ['sys_normal_disable'],
+    dicts: ['post_list'],
     components: { Treeselect },
     data() {
       return {
@@ -168,6 +188,7 @@
           userName: undefined,
           orgId: undefined,
         },
+        roleList:[],
         // 表单参数
         form: {},
         // 表单校验
@@ -175,30 +196,53 @@
           userName: [
             { required: true, message: "人员姓名不能为空", trigger: "blur" }
           ],
-          orgId: [
+          orgIds: [
             { required: true, message: "所属部门不能为空", trigger: "blur" }
           ],
-          postName: [
+          postIds: [
             { required: true, message: "岗位名称不能为空", trigger: "blur" }
           ],
-          roles: [
+          roleIds: [
             { required: true, message: "人员角色不能为空", trigger: "blur" }
           ],
           phone: [
+            { required: true, message: "手机号码不能为空", trigger: "blur" },
             {
               pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
               message: "请输入正确的手机号码",
               trigger: "blur"
             }
           ],
-        }
+        },
+        // 用户导入参数
+        upload: {
+          // 是否显示弹出层（用户导入）
+          open: false,
+          // 弹出层标题（用户导入）
+          title: "",
+          // 是否禁用上传
+          isUploading: false,
+          // 是否更新已经存在的用户数据
+          updateSupport: 0,
+          // 设置上传的请求头部
+          headers: { Authorization: "Bearer " + getToken() },
+          // 上传的地址
+          url: process.env.VUE_APP_BASE_API + "/system/user/excelUpload"
+        },
       };
     },
     created() {
-      // this.getList();
+      this.getList();
       this.getDeptList();
+      this.getRoleList();
+      console.log(this.dict.type.post_list)
     },
     methods: {
+      getRoleList(){
+        getSelectRole().then(response => {
+            this.roleList = response.data
+        });
+      },
       getDeptList(){
         listDept().then(response => {
             this.deptOptions = this.handleTree(response.data, "id");
@@ -233,11 +277,10 @@
       // 表单重置
       reset() {
         this.form = {
-          dictId: undefined,
           userName: undefined,
-          dictType: undefined,
-          status: "0",
-          remark: undefined
+          orgIds:[],
+          roleIds:[],
+          postIds:[],
         };
         this.resetForm("form");
       },
@@ -259,32 +302,37 @@
       },
       // 多选框选中数据
       handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.dictId)
+        this.ids = selection.map(item => item.userId)
         this.single = selection.length!=1
         this.multiple = !selection.length
       },
       /** 修改按钮操作 */
       handleUpdate(row) {
         this.reset();
-        const dictId = row.dictId || this.ids
-        getType(dictId).then(response => {
-          this.form = response.data;
+        let param={
+          userId:row.userId
+        }
+        getUserById(param).then(response => {
+          this.form = response.data[0];
+          let arr = this.form.postIds.map(item=>{return item.toString()})
+          this.$set(this.form,'postIds',arr)
           this.open = true;
           this.title = "编辑人员";
+          this.$forceUpdate()
         });
       },
       /** 提交按钮 */
       submitForm: function() {
         this.$refs["form"].validate(valid => {
           if (valid) {
-            if (this.form.dictId != undefined) {
-              updateType(this.form).then(response => {
+            if (this.form.userId != undefined) {
+              updateUser(this.form).then(response => {
                 this.$modal.msgSuccess("修改成功");
                 this.open = false;
                 this.getList();
               });
             } else {
-              addType(this.form).then(response => {
+              addUser(this.form).then(response => {
                 this.$modal.msgSuccess("新增成功");
                 this.open = false;
                 this.getList();
@@ -295,9 +343,11 @@
       },
       /** 删除按钮操作 */
       handleDelete(row) {
-        const dictIds = row.dictId || this.ids;
+        let param={
+          userId:row.userId
+        }
         this.$modal.confirm('是否确认删除？').then(function() {
-          return delType(dictIds);
+          return delUser(param);
         }).then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
@@ -305,10 +355,36 @@
       },
       /** 导出按钮操作 */
       handleExport() {
-        this.download('system/dict/type/export', {
-          ...this.queryParams
-        }, `type_${new Date().getTime()}.xlsx`)
+        exportUser().then(res => {
+          this.downloadFile({ fileName: `临时外出_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
+        })
       },
+      /** 导入按钮操作 */
+      handleImport() {
+        this.upload.title = "用户导入";
+        this.upload.open = true;
+      },
+      /** 下载模板操作 */
+      importTemplate() {
+        // this.download('system/user/importTemplate', {
+        // }, `user_template_${new Date().getTime()}.xlsx`)
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+        this.upload.isUploading = true;
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+        this.upload.open = false;
+        this.upload.isUploading = false;
+        this.$refs.upload.clearFiles();
+        this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+        this.getList();
+      },
+      // 提交上传文件
+      submitFileForm() {
+        this.$refs.upload.submit();
+      }
     }
   };
   </script>
\ No newline at end of file