diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index fc943cd..75d3554 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -49,4 +49,12 @@ export function delDept(deptId) {
     url: '/system/dept/' + deptId,
     method: 'delete'
   })
-}
\ No newline at end of file
+}
+
+// 更新所有部门的坐标信息
+export function coordinatesUpdate() {
+  return request({
+    url: '/system/dept/coordinatesUpdate',
+    method: 'get'
+  })
+}
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 088f09d..499d24b 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -2,21 +2,11 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="部门名称" prop="deptName">
-        <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入部门名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.deptName" placeholder="请输入部门名称" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="部门状态" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_normal_disable"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+          <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -27,35 +17,19 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:dept:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:dept:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-sort"
-          size="mini"
-          @click="toggleExpandAll"
-        >展开/折叠</el-button>
+        <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['system:dept:import']">导入</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-edit" size="mini" @click="handlePoint" v-hasPermi="['system:dept:point']">更新坐标</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table
-      v-if="refreshTable"
-      v-loading="loading"
-      :data="deptList"
-      row-key="deptId"
-      :default-expand-all="isExpandAll"
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-    >
+    <el-table v-loading="loading" :data="deptList" >
+      <el-table-column prop="orgCode" label="行政区划代码" width="150"></el-table-column>
       <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
       <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
       <el-table-column prop="status" label="状态" width="100">
@@ -70,32 +44,17 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:dept:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-plus"
-            @click="handleAdd(scope.row)"
-            v-hasPermi="['system:dept:add']"
-          >新增</el-button>
-          <el-button
-            v-if="scope.row.parentId != 0"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:dept:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleLook(scope.row)" v-hasPermi="['system:dept:query']">查看</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dept:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)" v-hasPermi="['system:dept:add']">新增</el-button>
+          <el-button v-if="scope.row.parentId != 0" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
+    <!-- 分页插件 -->
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList"/>
+
     <!-- 添加或修改部门对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
@@ -154,14 +113,59 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+
+
+    <!-- 导入EXCEL组件 -->
+    <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>
+
+    <!-- 查看部门对话框 -->
+    <el-dialog :title="title" :visible.sync="viewOpen" width="800px" append-to-body>
+      <el-descriptions id="printDetail" :column="descColumn" border :labelStyle="{width: `${descLabelWidth}%`}" :contentStyle="{width: `${(100 / descColumn) - descLabelWidth}%`}">
+        <el-descriptions-item label="父部门id">{{ form.parentId }}</el-descriptions-item>
+        <el-descriptions-item label="部门名称">{{ form.deptName }}</el-descriptions-item>
+        <el-descriptions-item label="显示顺序">{{ form.orderNum }}</el-descriptions-item>
+        <el-descriptions-item label="负责人">{{ form.leader }}</el-descriptions-item>
+        <el-descriptions-item label="联系电话">{{ form.phone }}</el-descriptions-item>
+        <el-descriptions-item label="邮箱">{{ form.email }}</el-descriptions-item>
+        <el-descriptions-item label="部门状态"><el-tooltip effect="light" :content="form.status" placement="right"><dict-tag :options="dict.type.dictType" :value="form.status"/></el-tooltip></el-descriptions-item>
+        <el-descriptions-item label="删除标志">{{ form.delFlag }}</el-descriptions-item>
+        <el-descriptions-item label="部门导入代码">{{ form.importCode }}</el-descriptions-item>
+        <el-descriptions-item label="行政区划代码">{{ form.orgCode }}</el-descriptions-item>
+        <el-descriptions-item label="经度">{{ form.longitude }}</el-descriptions-item>
+        <el-descriptions-item label="纬度">{{ form.latitude }}</el-descriptions-item>
+      </el-descriptions>
+      <!-- 弹框操作按钮 -->
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="doPrint">打 印</el-button>
+        <el-button @click="cancelDetail">关 闭</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept"
+import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild, coordinatesUpdate } from "@/api/system/dept"
 import Treeselect from "@riophae/vue-treeselect"
 import "@riophae/vue-treeselect/dist/vue-treeselect.css"
-
+import { getToken } from "@/utils/auth"
 export default {
   name: "Dept",
   dicts: ['sys_normal_disable'],
@@ -172,6 +176,8 @@ export default {
       loading: true,
       // 显示搜索条件
       showSearch: true,
+      // 总条数
+      total: 0,
       // 表格树数据
       deptList: [],
       // 部门树选项
@@ -184,10 +190,23 @@ export default {
       isExpandAll: true,
       // 重新渲染表格状态
       refreshTable: true,
+      // 详情组件列数
+      descColumn: 2,
+      // 详情组件Label所占百分比, 最大={100 / descColumn}. 内容所占百分比={100 / descColumn - descLabelWidth}
+      descLabelWidth: 15,
+      // 对话框显示只读的详情
+      viewOpen: false,
       // 查询参数
       queryParams: {
-        deptName: undefined,
-        status: undefined
+        deptName: null,
+        status: null,
+        pageNum: 1,
+        pageSize: 10,
+        // 查询排序
+        orderByColumn: "orgCode",
+        isAsc: "asc",
+        // 翻译字典
+        //toTranslateDict: "1",
       },
       // 表单参数
       form: {},
@@ -216,7 +235,23 @@ export default {
             trigger: "blur"
           }
         ]
-      }
+      },
+      // EXCEL导入
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/system/dept/importData"
+      },
+
     }
   },
   created() {
@@ -227,7 +262,8 @@ export default {
     getList() {
       this.loading = true
       listDept(this.queryParams).then(response => {
-        this.deptList = this.handleTree(response.data, "deptId")
+        this.deptList = response.rows
+        this.total = response.total
         this.loading = false
       })
     },
@@ -247,6 +283,9 @@ export default {
       this.open = false
       this.reset()
     },
+    cancelDetail() {
+      this.viewOpen = false
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -263,6 +302,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      this.queryParams.pageNum = 1
       this.getList()
     },
     /** 重置按钮操作 */
@@ -270,6 +310,15 @@ export default {
       this.resetForm("queryForm")
       this.handleQuery()
     },
+    /** 查看按钮操作 */
+    handleLook(row) {
+      const deptId = row.deptId || this.ids
+      getDept(deptId).then(response => {
+        this.form = response.data;
+        this.viewOpen = true;
+        this.title = "查看部门";
+      });
+    },
     /** 新增按钮操作 */
     handleAdd(row) {
       this.reset()
@@ -334,7 +383,126 @@ export default {
         this.getList()
         this.$modal.msgSuccess("删除成功")
       }).catch(() => {})
-    }
+    },
+    /* 导入EXCEL组件 */
+    handleImport() {
+      this.upload.title = "部门导入"
+      this.upload.open = true
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      this.download('system/dept/importTemplate', {
+      }, `dept_template.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()
+    },
+    // 更新所有部门的坐标信息
+    handlePoint() {
+      const loading = this.$loading({
+        lock: true,
+        text: '正在更新',
+        spinner: 'el-icon-loading',
+        background: 'rgba(255,255,255,0.76)'
+      });
+      this.$confirm("是否确认更新所有部门的坐标信息?", "警告", {
+        confirmButtonTest: "确定",
+        cancelButtonTest: "取消",
+        type: "warning"
+      }).then(function () {
+        return coordinatesUpdate();
+      }).then((res) => {
+        loading.close();
+        this.getList();
+        this.msgSuccess(res.msg);
+      }).catch(e => {
+        loading.close();
+        this.msgError('更新失败');
+      });
+    },
+    /** 打印表单 */
+    doPrint() {
+      const originalTitle = document.title;
+      try {
+        document.title = this.title || '通用附件详情';
+        const printElement = document.getElementById('printDetail');
+        const printFrame = document.createElement('iframe');
+        printFrame.style.position = 'absolute';
+        printFrame.style.width = '0';
+        printFrame.style.height = '0';
+        printFrame.style.border = 'none';
+        printFrame.style.left = '-9999px';
+        printFrame.onload = function() {
+          try {
+            const frameDoc = printFrame.contentDocument || printFrame.contentWindow.document;
+            const contentClone = printElement.cloneNode(true);
+            const style = document.createElement('style');
+            style.innerHTML = `
+                      @page {
+                        size: auto;
+                        margin: 10mm;
+                      }
+                      body {
+                        font-family: Arial, sans-serif;
+                        line-height: 1.5;
+                        margin: 0;
+                        padding: 0;
+                      }
+                      .el-descriptions {
+                        width: 100% !important;
+                      }
+                      .el-descriptions-item__label {
+                        width: ${this.descLabelWidth}% !important;
+                      }
+                      .el-descriptions-item__content {
+                        width: ${(100 / this.descColumn) - this.descLabelWidth}% !important;
+                      }
+                      /* 确保图片在打印时显示完整 */
+                      img, .el-image {
+                        max-width: 100% !important;
+                        height: auto !important;
+                      }
+                    `;
+            frameDoc.head.appendChild(style);
+            frameDoc.body.appendChild(contentClone);
+            setTimeout(() => {
+              printFrame.contentWindow.focus();
+              printFrame.contentWindow.print();
+              setTimeout(() => {
+                document.body.removeChild(printFrame);
+                document.title = originalTitle;
+              }, 1000);
+            }, 500);
+          } catch (e) {
+            document.body.removeChild(printFrame);
+            document.title = originalTitle;
+            this.$message.error('打印过程中发生错误');
+          }
+        };
+        document.body.appendChild(printFrame);
+      } catch (e) {
+        document.title = originalTitle;
+        this.$message.error('打印过程中发生错误');
+      }
+    },
+    /** 打印按钮操作 */
+    handlePrint() {
+      printDept(this.queryParams).then(response => {})
+    },
+
   }
 }
 </script>