diff --git a/src/api/person/person.js b/src/api/person/person.js
index e9927ff..707e55c 100644
--- a/src/api/person/person.js
+++ b/src/api/person/person.js
@@ -9,7 +9,9 @@ const personApi = {
quit: 'person/quit',
resetPwd: 'person/resetPwd',
setAdmin: 'person/setAdmin',
- changeLogPage: '/person/changeLog/pageList'
+ changeLogPage: '/person/changeLog/pageList',
+ exportList: '/person/exportList',
+ importList: '/person/importList'
}
export function personAddOrUpdate (params) {
@@ -75,3 +77,17 @@ export function personChangeLogPage (params) {
params: params
})
}
+export function personExport (params) {
+ return request({
+ url: personApi.exportList,
+ method: 'get',
+ params: params
+ })
+}
+export function personImport (params) {
+ return request({
+ url: personApi.importList,
+ method: 'post',
+ params: params
+ })
+}
diff --git a/src/components/DbUeditor/index.vue b/src/components/DbUeditor/index.vue
index e53c434..68ca48c 100644
--- a/src/components/DbUeditor/index.vue
+++ b/src/components/DbUeditor/index.vue
@@ -15,7 +15,7 @@
id: 'ueditor' + Math.random(),
editorConfig: {
UEDITOR_HOME_URL: '/static/plugins/ueditor/',
- serverUrl: '/api/sys/ueditor/config',
+ serverUrl: '/dawa/sys/ueditor/config',
},
}
},
@@ -44,7 +44,7 @@
handler: function (config) {
const defaults = {
UEDITOR_HOME_URL: '/static/plugins/ueditor/',
- serverUrl: '/api/sys/ueditor/config',
+ serverUrl: '/dawa/sys/ueditor/config',
}
this.editorConfig = { ...defaults, ...config }
},
diff --git a/src/views/org/OrgList.vue b/src/views/org/OrgList.vue
index 0f80ef1..2e6a5bd 100644
--- a/src/views/org/OrgList.vue
+++ b/src/views/org/OrgList.vue
@@ -67,8 +67,8 @@
data () {
return {
// 查询参数
- queryParam: { orgType: 1 },
expandedRowKeys: [],
+ orgType: 1,
// 表头
columns: [
{
@@ -90,7 +90,7 @@
],
// 加载数据方法 必须为 Promise 对象
loadData: parameter => {
- return orgList(Object.assign(parameter, this.queryParam)).then((res) => {
+ return orgList(Object.assign(parameter, { orgType: this.orgType })).then((res) => {
const orgList = listToTree(res.data, [], rootParentId)
// 默认展开目录级
orgList.forEach(item => {
@@ -114,11 +114,11 @@
methods: {
tabsCallback (key) {
if (key === '1') {
- this.queryParam.orgType = 1
+ this.orgType = 1
this.$refs.table1.refresh(true)
}
if (key === '2') {
- this.queryParam.orgType = 2
+ this.orgType = 2
this.$refs.table2.refresh(true)
}
},
@@ -129,14 +129,23 @@
orgDel({ id: record.id, deleteReason: '' }).then((res) => {
if (res.code === 200) {
this.$message.success('删除成功')
- this.$refs.table.refresh(true)
+
+ if (this.orgType === 1) {
+ this.$refs.table1.refresh(true)
+ } else {
+ this.$refs.table2.refresh(true)
+ }
} else {
this.$message.error('删除失败:' + res.msg)
}
})
},
handleOk () {
- this.$refs.table.refresh()
+ if (this.orgType === 1) {
+ this.$refs.table1.refresh()
+ } else {
+ this.$refs.table2.refresh()
+ }
}
}
}
diff --git a/src/views/person/PersonForm.vue b/src/views/person/PersonForm.vue
index 76b4496..b9388a4 100644
--- a/src/views/person/PersonForm.vue
+++ b/src/views/person/PersonForm.vue
@@ -169,7 +169,7 @@
:wrapperCol="wrapperCol"
has-feedback
>
-
+
@@ -304,8 +304,8 @@
// age: data.age,
// sex: data.sex,
phone: data.phone,
- jobs: parseInt(data.jobs),
- workType: parseInt(data.workType),
+ jobs: data.jobs ? parseInt(data.jobs) : undefined,
+ workType: data.workType ? parseInt(data.workType) : undefined,
degreeId: data.degreeId,
orgId: data.orgId,
orgName: data.orgName
diff --git a/src/views/person/PersonList.vue b/src/views/person/PersonList.vue
index 95184f2..1ca100c 100644
--- a/src/views/person/PersonList.vue
+++ b/src/views/person/PersonList.vue
@@ -1,125 +1,137 @@
-
-
-
-
-
-
-
- {{ orgType === 1 ? '切换到项目组' : '切换到人员管理' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- {queryParam = {}, this.loadData()}">重置
-
-
-
-
-
-
-
-
新增人员
-
-
- 转移部门
- 离职
-
- 设置管理员
-
-
-
-
-
-
-
-
- 学员
- 管理员
-
+
+
+
+
+
+
-
-
-
- {{ record.registerDate | moment('YYYY-MM-DD') }}
-
+
+ {{ orgType === 1 ? '切换到项目组' : '切换到人员管理' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ {queryParam = {}, this.loadData()}">重置
+
+
+
+
+
+
+
+
新增人员
-
- 详情
-
-
-
- 更多
-
-
-
-
- 编辑
-
-
- resetPwd(record)">
- 重置密码
-
-
-
- 添加证书
-
-
- personDelete(record)">
- 删除
-
-
-
-
-
-
+
+ 转移部门
+ 离职
+ 设置管理员
+ 导出
+ 批量导入
+
+
-
-
-
+
-
-
-
+
+
+
+
+ {{ record.registerDate | moment('YYYY-MM-DD') }}
+
+
+
+ 详情
+
+
+
+ 更多
+
+
+
+
+ 编辑
+
+
+ resetPwd(record)">
+ 重置密码
+
+
+
+ 添加证书
+
+
+ personDelete(record)">
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+