diff --git a/src/api/pers/attendancePlan.js b/src/api/pers/attendancePlan.js
new file mode 100644
index 0000000..2e27ad3
--- /dev/null
+++ b/src/api/pers/attendancePlan.js
@@ -0,0 +1,36 @@
+import request from '@/config/axios'
+
+// 创建
+export const createPlan = (data) => {
+ return request.post({ url: '/admin-api/oa/attendance-setting/create', data, isSubmitForm: true })
+}
+
+// 修改
+export const updatePlan = (data) => {
+ return request.put({ url: '/admin-api/oa/attendance-setting/update', data })
+}
+
+// 修改状态
+export const updatePlanStatus = (data) => {
+ return request.put({ url: '/admin-api/oa/attendance-setting/status/update', data })
+}
+
+// 分页
+export const getPlanPage = (params) => {
+ return request.get({ url: '/admin-api/oa/attendance-setting/page', params })
+}
+
+// 列表
+export const getPlanSimpleList = (params) => {
+ return request.get({ url: '/admin-api/oa/attendance-setting/simple-list', params })
+}
+
+// 详情
+export const getPlanDetail = (id) => {
+ return request.get({ url: '/admin-api/oa/attendance-setting/get', params: { id } })
+}
+
+// 删除
+export const deletePlan = (id) => {
+ return request.delete({ url: '/admin-api/oa/attendance-setting/delete', params: { id } })
+}
diff --git a/src/api/pers/employee.js b/src/api/pers/employee.js
new file mode 100644
index 0000000..a4c63ce
--- /dev/null
+++ b/src/api/pers/employee.js
@@ -0,0 +1,31 @@
+import request from '@/config/axios'
+
+// 创建
+export const createEmployee = (data) => {
+ return request.post({ url: '/admin-api/oa/employee/create', data, isSubmitForm: true })
+}
+
+// 修改
+export const updateEmployee = (data) => {
+ return request.put({ url: '/admin-api/oa/employee/update', data })
+}
+
+// 修改状态
+export const updateEmployeeStatus = (data) => {
+ return request.put({ url: '/admin-api/oa/employee/status/update', data })
+}
+
+// 分页
+export const getEmployeePage = (params) => {
+ return request.get({ url: '/admin-api/oa/employee/page', params })
+}
+
+// 详情
+export const getEmployeeDetail = (id) => {
+ return request.get({ url: '/admin-api/oa/employee/get', params: { id } })
+}
+
+// 删除
+export const deleteEmployee = (id) => {
+ return request.delete({ url: '/admin-api/oa/employee/delete', params: { id } })
+}
diff --git a/src/api/system/app/index.js b/src/api/system/app/index.js
new file mode 100644
index 0000000..79a98f2
--- /dev/null
+++ b/src/api/system/app/index.js
@@ -0,0 +1,5 @@
+import request from '@/config/axios'
+
+export const getSimpleAppList = async () => {
+ return await request.get({ url: '/admin-api/system/serviceInstance/simple-list' })
+}
diff --git a/src/api/system/library/index.js b/src/api/system/library/index.js
deleted file mode 100644
index 3dedfcf..0000000
--- a/src/api/system/library/index.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import request from '@/config/axios'
-
-// 查询知识库列表
-export const getLibraryPage = (params) => {
- return request.get({ url: '/admin-api/crm/knowledge-lib/page', params })
-}
-
-// 查询知识库详情
-export const getLibrary = (id) => {
- return request.get({ url: '/admin-api/crm/knowledge-lib/get?id=' + id })
-}
-
-// 新增知识库
-export const createLibrary = (data) => {
- return request.post({ url: '/admin-api/crm/knowledge-lib/create', data })
-}
-
-// 修改知识库
-export const updateLibrary = (data) => {
- return request.put({ url: '/admin-api/crm/knowledge-lib/update', data })
-}
-
-// 删除知识库
-export const deleteLibrary = (id) => {
- return request.delete({ url: '/admin-api/crm/knowledge-lib/delete?id=' + id })
-}
diff --git a/src/api/system/library/resource.js b/src/api/system/library/resource.js
deleted file mode 100644
index 633244f..0000000
--- a/src/api/system/library/resource.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import request from '@/config/axios'
-
-// 查询资源列表
-export const getResourcePage = (params) => {
- return request.get({ url: '/admin-api/crm/knowledge-lib-info/page', params })
-}
-
-// 查询资源详情
-export const getResource = (id) => {
- return request.get({ url: '/admin-api/crm/knowledge-lib-info/get?id=' + id })
-}
-
-// 新增资源
-export const createResource = (data) => {
- return request.post({ url: '/admin-api/crm/knowledge-lib-info/create', data })
-}
-
-// 修改资源
-export const updateResource = (data) => {
- return request.put({ url: '/admin-api/crm/knowledge-lib-info/update', data })
-}
-
-// 删除资源
-export const deleteResource = (id) => {
- return request.delete({ url: '/admin-api/crm/knowledge-lib-info/delete?id=' + id })
-}
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 4877020..9b02f25 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -213,7 +213,7 @@ export const fenToYuan = (amount: string | number): number => {
export const removeNullField = (obj: Object) => {
for (const key in obj) {
if (Object.prototype.hasOwnProperty.call(obj, key)) {
- if (obj[key] == '') {
+ if (obj[key] === '' || obj[key] === null || obj[key] === undefined) {
delete obj[key]
}
}
diff --git a/src/views/Home/Salary/index.vue b/src/views/Home/Salary/index.vue
index 79187b9..5e4dbd9 100644
--- a/src/views/Home/Salary/index.vue
+++ b/src/views/Home/Salary/index.vue
@@ -84,6 +84,19 @@
{{ row.jbgz }}
+
+
+
+ {{ row.jiangjin }}
+
+
-
diff --git a/src/views/Pers/Employee/Comp/DialogEmployee.vue b/src/views/Pers/Employee/Comp/DialogEmployee.vue
index 2ca006e..4a22916 100644
--- a/src/views/Pers/Employee/Comp/DialogEmployee.vue
+++ b/src/views/Pers/Employee/Comp/DialogEmployee.vue
@@ -9,8 +9,8 @@
>
-
-
+
+
@@ -35,8 +35,8 @@
-
-
+
+
@@ -54,36 +54,38 @@
-
+
-
+
@@ -123,8 +125,10 @@
diff --git a/src/views/Pers/Setting/Comp/DialogPlan.vue b/src/views/Pers/Setting/Comp/DialogPlan.vue
index f3c1da4..8927ad5 100644
--- a/src/views/Pers/Setting/Comp/DialogPlan.vue
+++ b/src/views/Pers/Setting/Comp/DialogPlan.vue
@@ -12,19 +12,18 @@
-