From 30655c4219b1eedb22cf650c2072c06bfe19af60 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 3 Dec 2024 16:05:36 +0800
Subject: [PATCH] sc
---
src/api/home/falseDiligence.js | 2 +-
src/api/pers/employee.js | 5 +++
src/views/Home/FalseDiligenceReport/index.vue | 22 +++++++++---
src/views/Home/Salary/index.vue | 1 +
.../Pers/Employee/Comp/DialogEmployee.vue | 34 +++++++++++++++++--
src/views/Profile/Index.vue | 6 ++--
src/views/Profile/components/BasicInfo.vue | 21 +++++++-----
7 files changed, 72 insertions(+), 19 deletions(-)
diff --git a/src/api/home/falseDiligence.js b/src/api/home/falseDiligence.js
index 20c2efe..0418552 100644
--- a/src/api/home/falseDiligence.js
+++ b/src/api/home/falseDiligence.js
@@ -12,7 +12,7 @@ export const syncFalseDiligence = async (params) => {
// 修改考勤数据
export const updateFalseDiligence = async (data) => {
- return await request.put({ url: '/admin-api/oa/dingtalk/attendance/update', data })
+ return await request.put({ url: '/admin-api/oa/dingtalk/attendance/batchUpdate', data })
}
// 封存考勤数据
diff --git a/src/api/pers/employee.js b/src/api/pers/employee.js
index a4c63ce..ad2bfcf 100644
--- a/src/api/pers/employee.js
+++ b/src/api/pers/employee.js
@@ -29,3 +29,8 @@ export const getEmployeeDetail = (id) => {
export const deleteEmployee = (id) => {
return request.delete({ url: '/admin-api/oa/employee/delete', params: { id } })
}
+
+// 详情
+export const getDingUserId = (params) => {
+ return request.get({ url: '/admin-api/oa/employee/getDingTalkUserIdByMobile', params })
+}
diff --git a/src/views/Home/FalseDiligenceReport/index.vue b/src/views/Home/FalseDiligenceReport/index.vue
index e6d822d..4935c25 100644
--- a/src/views/Home/FalseDiligenceReport/index.vue
+++ b/src/views/Home/FalseDiligenceReport/index.vue
@@ -81,6 +81,19 @@
{{ row.reallyWorkDay }}
+
+
+
+ {{ row.compensatoryLeaveDay }}
+
+
0) {
if (columnIndex === 0) {
- return [1, 12]
- } else if (columnIndex == 12 && row.id) {
+ return [1, 13]
+ } else if (columnIndex == 13 && row.id) {
return [1, 1]
} else {
return [0, 0]
@@ -313,9 +326,7 @@ async function handleSave(row) {
text: `假勤数据保存中，请稍后...`,
background: 'rgba(0, 0, 0, 0.7)'
})
- await FalseDiligenceApi.updateFalseDiligence({
- userDingAttendanceSaveReqVO: row.userDingAttendanceRespVOList
- })
+ await FalseDiligenceApi.updateFalseDiligence(row.userDingAttendanceRespVOList)
globalLoading.value.close()
message.success('保存成功！')
getList()
@@ -332,6 +343,7 @@ async function handleSealup(row) {
await FalseDiligenceApi.saveFalseDiligence({
period: row.period
})
+ message.success('封存成功！')
// 刷新列表
await getList()
} catch (err) {
diff --git a/src/views/Home/Salary/index.vue b/src/views/Home/Salary/index.vue
index d15ca54..490a7c4 100644
--- a/src/views/Home/Salary/index.vue
+++ b/src/views/Home/Salary/index.vue
@@ -431,6 +431,7 @@ async function handleSealup(row) {
grantIdList: row.userSalaryGrantRespVOList.map((it) => it.grantId),
period: row.period
})
+ message.success('封存成功！')
// 刷新列表
await getList()
} catch (err) {
diff --git a/src/views/Pers/Employee/Comp/DialogEmployee.vue b/src/views/Pers/Employee/Comp/DialogEmployee.vue
index a4ae876..bda0485 100644
--- a/src/views/Pers/Employee/Comp/DialogEmployee.vue
+++ b/src/views/Pers/Employee/Comp/DialogEmployee.vue
@@ -5,7 +5,7 @@
v-loading="formLoading"
:model="formData"
:rules="formRules"
- label-width="80px"
+ label-width="100px"
>
@@ -69,8 +69,9 @@
@@ -127,11 +128,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -253,4 +271,16 @@ const resetForm = () => {
}
formRef.value?.resetFields()
}
+
+async function getDingdingUserId() {
+ try {
+ if (!formData.value.ddPhone) {
+ formData.value.dingUserId = undefined
+ return
+ }
+ const data = await EmployeeApi.getDingUserId({ mobile: formData.value.ddPhone })
+ formData.value.dingUserId = data
+ } finally {
+ }
+}
diff --git a/src/views/Profile/Index.vue b/src/views/Profile/Index.vue
index 6a31f15..2f78c27 100644
--- a/src/views/Profile/Index.vue
+++ b/src/views/Profile/Index.vue
@@ -22,16 +22,16 @@
-
+