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 @@
{{info.signingCompany}}
-
+
劳动合同签订公司:
- {{info.entryTime}}
+ {{info.signingCompany}}
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 @@
- 批量导入员工档案
+
+ 批量导入员工档案
+
@@ -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)