|
@@ -285,7 +285,7 @@ async function selectDate(date) {
|
|
|
selectedDate.value = date;
|
|
selectedDate.value = date;
|
|
|
try {
|
|
try {
|
|
|
const user = getCurrentUser() || currentUser || {};
|
|
const user = getCurrentUser() || currentUser || {};
|
|
|
- const userId = (user && user.raw && user.raw.userId) || (user && user.id) || "";
|
|
|
|
|
|
|
+ const userId = (user && user.raw && user.raw.userId) || (user && user.raw && user.raw.id) || (user && user.id) || "";
|
|
|
dailyDetail.value = await queryDailyAttendance(userId, date);
|
|
dailyDetail.value = await queryDailyAttendance(userId, date);
|
|
|
} catch (error) {
|
|
} catch (error) {
|
|
|
uni.showToast({ title: error.message || "日期详情加载失败", icon: "none" });
|
|
uni.showToast({ title: error.message || "日期详情加载失败", icon: "none" });
|
|
@@ -294,7 +294,7 @@ async function selectDate(date) {
|
|
|
|
|
|
|
|
async function loadShiftInfo() {
|
|
async function loadShiftInfo() {
|
|
|
const user = getCurrentUser() || currentUser || {};
|
|
const user = getCurrentUser() || currentUser || {};
|
|
|
- const userId = (user && user.raw && user.raw.userId) || (user && user.id) || "";
|
|
|
|
|
|
|
+ const userId = (user && user.raw && user.raw.userId) || (user && user.raw && user.raw.id) || (user && user.id) || "";
|
|
|
const result = await queryAttendanceRule(userId);
|
|
const result = await queryAttendanceRule(userId);
|
|
|
ruleStatus.value = result.status;
|
|
ruleStatus.value = result.status;
|
|
|
ruleBlockedReason.value = result.blockedReason || '';
|
|
ruleBlockedReason.value = result.blockedReason || '';
|