From 202566144f71809c192255caf5e79f687a2aeb0f Mon Sep 17 00:00:00 2001
From: xiongchengqiang <xiongchengqiang@linzikg.com>
Date: Thu, 21 May 2020 10:41:02 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=B0=83=E8=AF=95=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=8E=A5=E5=8F=A3;fix:=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86bug;todo:=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9A=82=E6=9C=AA=E8=B0=83=E9=80=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api_staff.js                          |  9 ++---
 .../archives/componments/professional.vue     |  4 +--
 src/views/modules/staff/manage/index.vue      | 36 +++++++++++++++++--
 3 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/src/api/api_staff.js b/src/api/api_staff.js
index 0c1fffe..26a3a91 100644
--- a/src/api/api_staff.js
+++ b/src/api/api_staff.js
@@ -24,10 +24,7 @@ export const apiEmployeessItuation = data => {
   return http({ url: '/lz_management/staff/info/statistical', method: 'get', params: data })
 }
 
-/**
- * 文件上传
- */
-// 文件上传列表
-export const apiSysOssList = params => {
-  return http({ url: '/lz_management/sys/oss/list', method: 'get', params })
+// 文件上传
+export const apiUploadFile = params => {
+  return http({ url: '/lz_management/staff/info/batchImport', method: 'post', data: params })
 }
diff --git a/src/views/modules/staff/archives/componments/professional.vue b/src/views/modules/staff/archives/componments/professional.vue
index a229fc2..6cef8d2 100644
--- a/src/views/modules/staff/archives/componments/professional.vue
+++ b/src/views/modules/staff/archives/componments/professional.vue
@@ -33,9 +33,9 @@
       <span class="contant-name">{{info.signingCompany}}</span>
     </div>
 
-    <div class="contant" v-if="info.entryTime">
+    <div class="contant" v-if="info.signingCompany">
       <span class="contant-label">劳动合同签订公司：</span>
-      <span class="contant-name">{{info.entryTime}}</span>
+      <span class="contant-name">{{info.signingCompany}}</span>
     </div>
 
     <div class="contant" v-if="info.jobBeginTime">
diff --git a/src/views/modules/staff/manage/index.vue b/src/views/modules/staff/manage/index.vue
index cf4e3ad..b15d3cd 100644
--- a/src/views/modules/staff/manage/index.vue
+++ b/src/views/modules/staff/manage/index.vue
@@ -41,7 +41,17 @@
             </el-form>
             <el-form :inline="true">
               <el-form-item>
-                <el-button type="primary" icon="el-icon-plus">批量导入员工档案</el-button>
+                <el-upload
+                  class="upload-demo"
+                  action="/"
+                  :auto-upload="false"
+                  :show-file-list="false"
+                  :on-change="handleChange"
+                  accept=".xlsx, .csv"
+                  :disabled="isUploading"
+                >
+                  <el-button type="primary" :loading="isUploading" icon="el-icon-plus">批量导入员工档案</el-button>
+                </el-upload>
               </el-form-item>
             </el-form>
           </div>
@@ -122,7 +132,8 @@ import menuTree from '@/components/menu-tree'
 import basis from './componments/basis.vue'
 import professional from './componments/professional'
 import education from './componments/education'
-import { apiOrganizationList, apiEmployeesList } from '@/api/api_staff'
+import { apiOrganizationList, apiEmployeesList, apiUploadFile } from '@/api/api_staff'
+
 export default {
   components: {
     menuTree,
@@ -132,6 +143,7 @@ export default {
   },
   data () {
     return {
+      isUploading: false, // 上传状态
       activeName: 'first',
       dialogVisible: false,
       defaultProps: {
@@ -173,6 +185,19 @@ export default {
     this.handleGetTableList(this.current)
   },
   methods: {
+    // 上传文件
+    async handleChange (file) {
+      let data = new FormData()
+      data.append('filename', file)
+      this.isUploading = true
+      let result = await apiUploadFile(data)
+      this.isUploading = false
+      if (result.code === 0) {
+
+      } else {
+        this.$message.error(result.msg)
+      }
+    },
     async getEmployeesInfo (data) {
       this.dialogVisible = true
 
@@ -188,6 +213,7 @@ export default {
     handleNodeClick (data) {
       // highlight - current
       this.query.departmentId = data.departmentId
+      this.getTable()
       console.log('data', data)
     },
     // 获取侧边架构列表
@@ -238,6 +264,12 @@ export default {
       console.log(tab, event)
     },
     async handleView (data) {
+      this.$message({
+        message: '编辑暂未开放',
+        showClose: true,
+        type: 'warning'
+      })
+      return
       console.log('data: ', data)
       this.activeName = 'first'
       await this.getEmployeesInfo(data.staffId)