From 17208922ad80d303ad66e33d53b4b7ec3e796fb0 Mon Sep 17 00:00:00 2001 From: qsh <> Date: Tue, 10 Dec 2024 17:17:14 +0800 Subject: [PATCH] sc --- src/api/pers/employee.js | 7 +- src/components/Editor/src/Editor.vue | 40 ++-- .../Finance/Salary/Comp/DialogSalary.vue | 28 ++- src/views/Home/FalseDiligenceReport/index.vue | 3 + src/views/Home/Salary/index.vue | 20 +- .../Appraise/Components/DialogAppraise.vue | 183 ++++++++++++++++ src/views/Kpi/Appraise/index.vue | 147 +++++++++++++ src/views/Kpi/Score/index.vue | 205 ++++++++++++++++++ .../Pers/Employee/Comp/DialogEmployee.vue | 26 +++ src/views/Pers/Employee/index.vue | 1 + 10 files changed, 629 insertions(+), 31 deletions(-) create mode 100644 src/views/Kpi/Appraise/Components/DialogAppraise.vue create mode 100644 src/views/Kpi/Appraise/index.vue create mode 100644 src/views/Kpi/Score/index.vue diff --git a/src/api/pers/employee.js b/src/api/pers/employee.js index ad2bfcf..bc12147 100644 --- a/src/api/pers/employee.js +++ b/src/api/pers/employee.js @@ -5,6 +5,11 @@ export const createEmployee = (data) => { return request.post({ url: '/admin-api/oa/employee/create', data, isSubmitForm: true }) } +// 分页 +export const getEmployeeSimpleList = (params) => { + return request.get({ url: '/admin-api/oa/employee/list-all-simple', params }) +} + // 修改 export const updateEmployee = (data) => { return request.put({ url: '/admin-api/oa/employee/update', data }) @@ -30,7 +35,7 @@ export const deleteEmployee = (id) => { return request.delete({ url: '/admin-api/oa/employee/delete', params: { id } }) } -// 详情 +// 获取钉钉id export const getDingUserId = (params) => { return request.get({ url: '/admin-api/oa/employee/getDingTalkUserIdByMobile', params }) } diff --git a/src/components/Editor/src/Editor.vue b/src/components/Editor/src/Editor.vue index a75ef4a..33affc4 100644 --- a/src/components/Editor/src/Editor.vue +++ b/src/components/Editor/src/Editor.vue @@ -24,7 +24,27 @@ const props = defineProps({ default: () => undefined }, readonly: propTypes.bool.def(false), - modelValue: propTypes.string.def('') + modelValue: propTypes.string.def(''), + toolbarConfig: { + type: Object, + default: () => ({ + excludeKeys: [ + 'insertVideo', // 网络视频 + 'insertImage', // 网络图片 + 'insertLink', // 链接 + 'codeBlock', // 代码块 + 'headerSelect', // 标题 + 'blockquote', // 引用 + 'fontFamily', // 字体 + 'todo', // 代办 + 'group-indent', // 缩进 + 'emotion', // 表情 + 'undo', // 撤销 + 'redo', // 重做 + 'fullScreen' + ] + }) + } }) const emit = defineEmits(['change', 'update:modelValue']) @@ -212,24 +232,6 @@ const editorStyle = computed(() => { } }) -const toolbarConfig = ref({ - excludeKeys: [ - 'insertVideo', // 网络视频 - 'insertImage', // 网络图片 - 'insertLink', // 链接 - 'codeBlock', // 代码块 - 'headerSelect', // 标题 - 'blockquote', // 引用 - 'fontFamily', // 字体 - 'todo', // 代办 - 'group-indent', // 缩进 - 'emotion', // 表情 - 'undo', // 撤销 - 'redo', // 重做 - 'fullScreen' - ] -}) - // 回调函数 const handleChange = (editor: IDomEditor) => { emit('change', editor) diff --git a/src/views/Finance/Salary/Comp/DialogSalary.vue b/src/views/Finance/Salary/Comp/DialogSalary.vue index a633eaa..a7ec392 100644 --- a/src/views/Finance/Salary/Comp/DialogSalary.vue +++ b/src/views/Finance/Salary/Comp/DialogSalary.vue @@ -18,8 +18,13 @@ - - + + @@ -49,6 +54,11 @@ + + + + + @@ -57,16 +67,11 @@ 应扣 - + @@ -86,6 +91,11 @@ + + + + + diff --git a/src/views/Home/FalseDiligenceReport/index.vue b/src/views/Home/FalseDiligenceReport/index.vue index 4935c25..c1fca50 100644 --- a/src/views/Home/FalseDiligenceReport/index.vue +++ b/src/views/Home/FalseDiligenceReport/index.vue @@ -268,6 +268,9 @@ async function getList() { } else { tableList.value = data.list.map((it, index) => ({ ...it, + userDingAttendanceRespVOList: it.userDingAttendanceRespVOList.sort((pre, cur) => + pre.employeeName.localeCompare(cur.employeeName) + ), id: index + 1, edit: it.status == 1 ? '2' : '0' })) diff --git a/src/views/Home/Salary/index.vue b/src/views/Home/Salary/index.vue index 490a7c4..1f38c4a 100644 --- a/src/views/Home/Salary/index.vue +++ b/src/views/Home/Salary/index.vue @@ -57,7 +57,7 @@ - + - + + + +