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 @@ - + {{ row.baseSalary }} - + + + + {{ row.standardMeritsSalary }} + + + ({ ...it, + userSalaryGrantRespVOList: it.userSalaryGrantRespVOList.sort((pre, cur) => + pre.name.localeCompare(cur.name) + ), id: index + 1, edit: it.status == 1 ? '2' : '0' })) diff --git a/src/views/Kpi/Appraise/Components/DialogAppraise.vue b/src/views/Kpi/Appraise/Components/DialogAppraise.vue new file mode 100644 index 0000000..a93f750 --- /dev/null +++ b/src/views/Kpi/Appraise/Components/DialogAppraise.vue @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 全选 + + + + {{ item.name }} + + + + + + + + + + 取 消 + 保 存 + + + + + + + + diff --git a/src/views/Kpi/Appraise/index.vue b/src/views/Kpi/Appraise/index.vue new file mode 100644 index 0000000..9e0f417 --- /dev/null +++ b/src/views/Kpi/Appraise/index.vue @@ -0,0 +1,147 @@ + + + + + + + + + 搜索 + 重置 + + 新增 + + + + + + + + + + + + + + + + + + + + + + {{ row.checkEmployees?.length || 0 }} + + + + + + 修改 + + + 删除 + + + + + + + + + + + + + diff --git a/src/views/Kpi/Score/index.vue b/src/views/Kpi/Score/index.vue new file mode 100644 index 0000000..31392e4 --- /dev/null +++ b/src/views/Kpi/Score/index.vue @@ -0,0 +1,205 @@ + + + + + + + + + 搜索 + + + + + + 当前周期已封存,不可修改当月绩效考核 + + 当前周期未封存,可选择修改当月绩效考核,两秒内不操作将自动保存考核结果 + + + + + + + + + + + + + + + + + + + + {{ row.score }} + + + + + + {{ row.remark }} + + + + + + + + + + + + + diff --git a/src/views/Pers/Employee/Comp/DialogEmployee.vue b/src/views/Pers/Employee/Comp/DialogEmployee.vue index bda0485..6a7737c 100644 --- a/src/views/Pers/Employee/Comp/DialogEmployee.vue +++ b/src/views/Pers/Employee/Comp/DialogEmployee.vue @@ -143,12 +143,34 @@ + + + + + + + + + + @@ -194,6 +216,7 @@ const formRules = ref({ const formRef = ref() // 表单 Ref const attendanceSettingIdOptions = ref([]) const instanceIdsOptions = ref([]) +const employeeOptions = ref([]) /** 打开弹窗 */ const open = async (type, id) => { @@ -221,6 +244,9 @@ function getOptions() { getPlanSimpleList().then((data) => { attendanceSettingIdOptions.value = data }) + EmployeeApi.getEmployeeSimpleList({ status: 0 }).then((data) => { + employeeOptions.value = data + }) } /** 提交表单 */ diff --git a/src/views/Pers/Employee/index.vue b/src/views/Pers/Employee/index.vue index 2cc4d8b..6ce0ff7 100644 --- a/src/views/Pers/Employee/index.vue +++ b/src/views/Pers/Employee/index.vue @@ -36,6 +36,7 @@ +