hebo/zhxy-jsd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整请假和待办处理

Browse Source
This commit is contained in:
ywyonui 2025-08-01 20:11:36 +08:00
parent 16f7aaefdd
commit b0a8ead56a
11 changed files with 270 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/api/base/server.ts
View File

@ -159,6 +159,21 @@ export const dbBlApi = async (params: any) => {
return await post("/api/db/bl", params);
};
// 获取消息推送列表（替代待办）
export const xxtsListApi = async (params: any) => {
return await get("/api/xxts/findPage", params);
};
// 处理消息推送（替代待办处理）
export const xxtsBlApi = async (params: any) => {
return await post("/api/xxts/bl", params);
};
// 根据ID获取消息推送详情
export const xxtsFindByIdApi = async (params: any) => {
return await get("/api/xxts/findById", params);
};
// 查询学生请假信息
export const xsQjFindByIdApi = async (params: any) => {
return await get("/api/xsQj/findById", params);

23
src/pages/base/message/index.vue
View File

@ -22,15 +22,15 @@
<template #default="{ data }">
<view class="white-bg-color r-md p-15 mb-15 flex-row" @click="goToDetail(data)">
<view class="card-left">
<view class="card-title">{{ data.dbBt }}</view>
<view class="card-desc" v-html="data.dbZy"></view>
<view class="card-title">{{ data.xxbt }}</view>
<view class="card-desc" v-html="data.xxzy"></view>
<view class="card-meta">
<text>{{ data.createdTime }}</text>
<text>{{ getTimeAgo(data.createdTime) }}</text>
<text>{{ data.xxtstime }}</text>
<text>{{ getTimeAgo(data.xxtstime) }}</text>
</view>
</view>
<view class="card-right" v-if="dbLxMap[data.dbLx]">
<view class="tag" :class="dbLxMap[data.dbLx].className">{{ dbLxMap[data.dbLx].label }}</view>
<view class="card-right" v-if="dbLxMap[data.xxlx]">
<view class="tag" :class="dbLxMap[data.xxlx].className">{{ dbLxMap[data.xxlx].label }}</view>
</view>
</view>
</template>
@ -41,14 +41,14 @@
<script lang="ts" setup>
import {ref, onMounted} from "vue";
import { useLayout } from "@/components/BasicListLayout/hooks/useLayout";
import { dbListApi } from "@/api/base/server";
import { xxtsListApi } from "@/api/base/server";
import { getTimeAgo } from "@/utils/dateUtils";
import { useUserStore } from "@/store/modules/user";
import { useDataStore } from "@/store/modules/data";
import { useDicStore } from "@/store/modules/dic";
const { findByPid } = useDicStore();
const { setDb } = useDataStore();
const { getUser } = useUserStore();
const { setDb, setXxts } = useDataStore();
const { getJs } = useUserStore();
const dbLxMap = ref<any>({});
@ -76,7 +76,7 @@ const fetchDbLxMap = async () => {
};
const [register, {reload, setParam}] = useLayout({
api: dbListApi,
api: xxtsListApi,
componentProps: {
auto: false
},
@ -87,7 +87,7 @@ const currentTab = ref('A'); // 0: 待办, 1: 已办
const fetchListData = async (tabIndex: string) => {
setParam({
dbZt: tabIndex,
userId: getUser.id
jsrId: getJs.id
});
reload();
};
@ -108,6 +108,7 @@ onMounted(() => {
const goToDetail = (data: any) => {
if (data && data.id) {
setDb(data);
setXxts(data); // 同时设置xxts数据，以便兼容微信工作号跳转
uni.navigateTo({
url: data.mobileUrl
});

66
src/pages/base/xs/qj/sp.vue
View File

@ -4,7 +4,7 @@
<!-- 请假信息卡片 -->
<view class="info-card">
<view class="card-header">
<text class="applicant-name" v-if="dbFlag">{{ dbData.dbZy }}</text>
<text class="applicant-name" v-if="dbFlag">{{ xxtsData.dbZy }}</text>
<text class="applicant-name" v-else>学生{{ qjData.xsxm }}的请假申请</text>
</view>
<view class="divider"></view>
@ -70,9 +70,14 @@
import { onLoad } from "@dcloudio/uni-app";
import { useForm } from "@/components/BasicForm/hooks/useForm";
import { navigateBack } from "@/utils/uniapp";
import { xsQjFindByIdApi, xsQjSpApi, dbBlApi } from "@/api/base/server";
import { xsQjFindByIdApi, xsQjSpApi } from "@/api/base/server";
import { useDataStore } from "@/store/modules/data";
const { getData, getDb, setData } = useDataStore();
import { useUserStore } from "@/store/modules/user";
import { ref, nextTick } from "vue";
import { xxtsFindByIdApi, xxtsBlApi } from "@/api/base/server";
const { getData, setXxts, setData, getXxts } = useDataStore();
const { getJs } = useUserStore();
const dbFlag = ref(false);
@ -110,20 +115,22 @@ const [register, { getValue }] = useForm({
// 请假基础数据
const qjData = computed(() => getData || {});
const dbData = computed(() => getDb || {});
const xxtsData = computed(() => getXxts || {});
const submit = async () => {
const data = await getValue();
const params = { ...qjData.value };
params.flag = data.flag;
params.comment = data.comment;
const params = {
qjId: qjData.value.id,
jsId: getJs.id,
spStatus: 2,
spYj: "同意",
};
uni.showLoading({
title: "提交中...",
});
const res = await xsQjSpApi(params);
// 如果是待办项，更新待办项状态
if (dbFlag.value) {
await dbBlApi({ id: dbData.value.id });
await xxtsBlApi({ id: xxtsData.value.id });
}
uni.hideLoading();
navigateBack();
@ -133,10 +140,43 @@ onLoad(async (data: any) => {
// 从待办过来的，需要从后端获取数据
if (data && data.from && data.from == "db") {
dbFlag.value = true;
const res = await xsQjFindByIdApi({ id: data.id });
nextTick(() => {
setData(res.result);
});
try {
// 优先从后端根据url中的id去查询Xxts
const xxtsRes = await xxtsFindByIdApi({ id: data.id });
if (xxtsRes && xxtsRes.result) {
const xxts = xxtsRes.result;
// 检查待办状态
if (xxts.dbZt === "B") {
setData({ id: xxts.xxzbId });
let url = "/pages/base/xs/qj/detail";
uni.navigateTo({ url });
return;
}
setXxts(xxts);
// 根据主表ID去查询学生请假信息
const res = await xsQjFindByIdApi({ id: xxts.xxzbId });
nextTick(() => {
setData(res.result);
});
}
} catch (error) {
console.error("获取待办信息失败", error);
// 如果获取Xxts失败，回退到原来的逻辑
const xxtsData = getXxts();
if (xxtsData && xxtsData.dbZt === "B") {
setData({ id: data.id });
let url = "/pages/base/xs/qj/detail";
uni.navigateTo({ url });
return;
}
const res = await xsQjFindByIdApi({ id: data.id });
nextTick(() => {
setData(res.result);
});
}
} else {
dbFlag.value = false;
}

6
src/pages/view/hr/jsQj/components/jsQjDetail.vue
View File

@ -7,7 +7,7 @@
<!-- 请假信息卡片 -->
<view class="info-card">
<view class="card-header">
<text class="applicant-name" v-if="dbFlag">{{ qjData.dbZy }}</text>
<text class="applicant-name" v-if="dbFlag">{{ qjData.xxzy }}</text>
<text class="applicant-name" v-else
>教师{{ qjData.jsName }}的请假申请</text
>
@ -90,7 +90,7 @@
import { findDkPageApi, findQjById } from "@/api/base/jsQjApi";
import { useDataStore } from "@/store/modules/data";
import ProgressList from "./progressList.vue";
const { getDb } = useDataStore();
const { getXxts } = useDataStore();
// 接收外部传入属性
const props = withDefaults(
@ -174,7 +174,7 @@ const init = async () => {
});
}
if (props.dbFlag) {
qjData.value.dbZy = getDb.dbZy;
qjData.value.xxzy = getXxts.xxzy;
}
notifyParentLoaded();
};

6
src/pages/view/hr/jsQj/components/jsQjEdit.vue
View File

@ -52,6 +52,12 @@ let formData = ref<any>({
jsId: getJs.id,
});
if (typeof props.data.dkfs === "string") {
nextTick(() => {
formData.value.dkfs = parseInt(props.data.dkfs);
})
}
const [register, { setValue, getValue }] = useForm({
schema: [
{

48
src/pages/view/hr/jsQj/cxTj.vue
View File

@ -6,10 +6,11 @@
<script setup lang="ts">
import { findQjById } from "@/api/base/jsQjApi";
import { xxtsFindByIdApi } from "@/api/base/server";
import { useDataStore } from "@/store/modules/data";
import { onLoad } from "@dcloudio/uni-app";
import JsQjEdit from "./components/jsQjEdit.vue";
const { setData, getData, getDb } = useDataStore();
const { setData, getData, setXxts, getXxts } = useDataStore();
const dbFlag = ref(false);
@ -19,16 +20,43 @@ onLoad(async (data: any) => {
// 从待办过来的，需要从后端获取数据
if (data && data.from && data.from == "db") {
dbFlag.value = true;
if (getDb.dbZt === "B") {
setData({ id: data.id });
let url = "/pages/view/hr/jsQj/detail"; // 使用新路径
uni.navigateTo({ url });
return;
try {
// 优先从后端根据url中的id去查询Xxts
const xxtsRes = await xxtsFindByIdApi({ id: data.id });
if (xxtsRes && xxtsRes.result) {
const xxts = xxtsRes.result;
// 检查待办状态
if (xxts.dbZt === "B") {
setData({ id: xxts.xxzbId }); // 使用消息推送中的主表ID
let url = "/pages/view/hr/jsQj/detail";
uni.navigateTo({ url });
return;
}
setXxts(xxts);
// 根据主表ID去查询请假信息
const res = await findQjById({ id: xxts.xxzbId });
nextTick(() => {
setData(res.result);
});
}
} catch (error) {
console.error("获取待办信息失败", error);
// 如果获取Xxts失败，回退到原来的逻辑
const xxtsData = getXxts();
if (xxtsData && xxtsData.dbZt === "B") {
setXxts(xxtsData);
let url = "/pages/view/hr/jsQj/detail";
uni.navigateTo({ url });
return;
}
const res = await findQjById({ id: data.id });
nextTick(() => {
setData(res.result);
});
}
const res = await findQjById({ id: data.id });
nextTick(() => {
setData(res.result);
});
} else {
dbFlag.value = false;
}

48
src/pages/view/hr/jsQj/dkQr.vue
View File

@ -89,6 +89,7 @@
<script setup lang="ts">
import { jsQjDkQrApi } from "@/api/base/jsQjApi";
import { xxtsFindByIdApi } from "@/api/base/server";
import { useDataStore } from "@/store/modules/data";
import { useUserStore } from "@/store/modules/user";
import { navigateBack } from "@/utils/uniapp";
@ -96,7 +97,7 @@ import { onLoad } from "@dcloudio/uni-app";
import { ref } from "vue";
import JsQjDetail from "./components/jsQjDetail.vue";
const { getJs } = useUserStore();
const { setData, getData, getDb } = useDataStore();
const { setData, getData, setXxts, getXxts } = useDataStore();
const dkList = ref<any>([]);
const qjData = ref<any>({});
@ -125,10 +126,10 @@ const loadQjData = (data: any) => {
};
const loadDkList = (data: any) => {
// dbGlId是逗号分隔的字符串，需拆分为数组后判断
if (!getDb.dbGlId) {
getDb.dbGlId = "";
if (!getXxts.xxglId) {
getXxts.xxglId = "";
}
const idArr = getDb.dbGlId.split(",");
const idArr = getXxts.xxglId.split(",");
dkList.value = [];
data.map((dk: any) => {
if (idArr.includes(String(dk.id))) {
@ -188,14 +189,39 @@ const handleReject = async () => {
onLoad(async (data: any) => {
// 从待办过来的，需要从后端获取数据
if (data && data.from && data.from == "db") {
qjId.value = data.id;
dkId.value = data.dkId;
dbFlag.value = true;
if (getDb.dbZt === "B") {
setData({ id: data.id });
let url = "/pages/view/hr/jsQj/detail"; // 使用新路径
uni.navigateTo({ url });
return;
try {
// 优先从后端根据url中的id去查询Xxts
const xxtsRes = await xxtsFindByIdApi({ id: data.id });
if (xxtsRes && xxtsRes.result) {
const xxts = xxtsRes.result;
// 检查待办状态
if (xxts.dbZt === "B") {
setData({ id: xxts.xxzbId });
let url = "/pages/view/hr/jsQj/detail";
uni.navigateTo({ url });
return;
}
setXxts(xxts);
// 使用消息推送中的主表ID和关联表ID
qjId.value = xxts.xxzbId;
dkId.value = xxts.xxglId;
}
} catch (error) {
console.error("获取待办信息失败", error);
// 如果获取Xxts失败，回退到原来的逻辑
qjId.value = data.id;
dkId.value = data.dkId;
const xxtsData = getXxts();
if (xxtsData && xxtsData.dbZt === "B") {
setData({ id: data.id });
let url = "/pages/view/hr/jsQj/detail";
uni.navigateTo({ url });
return;
}
}
} else {
qjId.value = getData.id;

41
src/pages/view/hr/jsQj/jwcQr.vue
View File

@ -69,6 +69,7 @@
<script setup lang="ts">
import { jsQjJwcQrApi, jsQjZbApi } from "@/api/base/jsQjApi";
import { xxtsFindByIdApi } from "@/api/base/server";
import JsPicker from "@/pages/components/JsPicker/index.vue";
import { useDataStore } from "@/store/modules/data";
import { useUserStore } from "@/store/modules/user";
@ -77,7 +78,7 @@ import { onLoad } from "@dcloudio/uni-app";
import { ref } from "vue";
import JsQjDetail from "./components/jsQjDetail.vue";
const { getJs } = useUserStore();
const { setData, getData, getDb } = useDataStore();
const { setData, getData, setXxts, getXxts } = useDataStore();
const dbFlag = ref(false);
@ -161,7 +162,7 @@ const handleTransfer = async () => {
const params: any = {
qjId: qjId.value,
jsId: getJs.id,
dbId: getDb.id,
dbId: getXxts.id,
zbJsId: zbJs.value.value,
zbJsxm: zbJs.value.label,
};
@ -182,13 +183,37 @@ const handleTransfer = async () => {
onLoad(async (data: any) => {
// 从待办过来的，需要从后端获取数据
if (data && data.from && data.from == "db") {
qjId.value = data.id;
dbFlag.value = true;
if (getDb.dbZt === "B") {
setData({ id: data.id });
let url = "/pages/view/hr/jsQj/detail"; // 使用新路径
uni.navigateTo({ url });
return;
try {
// 优先从后端根据url中的id去查询Xxts
const xxtsRes = await xxtsFindByIdApi({ id: data.id });
if (xxtsRes && xxtsRes.result) {
const xxts = xxtsRes.result;
// 检查待办状态
if (xxts.dbZt === "B") {
setData({ id: xxts.xxzbId });
let url = "/pages/view/hr/jsQj/detail";
uni.navigateTo({ url });
return;
}
setXxts(xxts);
// 使用消息推送中的主表ID
qjId.value = xxts.xxzbId;
}
} catch (error) {
console.error("获取待办信息失败", error);
// 如果获取Xxts失败，回退到原来的逻辑
qjId.value = data.id;
const xxtsData = getXxts();
if (xxtsData && xxtsData.dbZt === "B") {
setData({ id: data.id });
let url = "/pages/view/hr/jsQj/detail";
uni.navigateTo({ url });
return;
}
}
} else {
qjId.value = getData.id;

41
src/pages/view/hr/jsQj/jwcXt.vue
View File

@ -48,15 +48,16 @@
<script setup lang="ts">
import { jsQjJwcXtApi } from "@/api/base/jsQjApi";
import { xxtsFindByIdApi } from "@/api/base/server";
import { useDataStore } from "@/store/modules/data";
import { useUserStore } from "@/store/modules/user";
import { navigateBack, showToast } from "@/utils/uniapp";
import { onLoad } from "@dcloudio/uni-app";
import { ref } from "vue";
import { ref, nextTick } from "vue";
import JsQjDetail from "./components/jsQjDetail.vue";
import JsQjDkEdit from "./components/jsQjDkEdit.vue";
const { getJs } = useUserStore();
const { setData, getData, getDb } = useDataStore();
const { setData, getData, setXxts, getXxts } = useDataStore();
const dkRef = ref<any>(null);
@ -129,13 +130,37 @@ const submit = async () => {
onLoad(async (data: any) => {
// 从待办过来的，需要从后端获取数据
if (data && data.from && data.from == "db") {
qjId.value = data.id;
dbFlag.value = true;
if (getDb.dbZt === "B") {
setData({ id: data.id });
let url = "/pages/view/hr/jsQj/detail"; // 使用新路径
uni.navigateTo({ url });
return;
try {
// 优先从后端根据url中的id去查询Xxts
const xxtsRes = await xxtsFindByIdApi({ id: data.id });
if (xxtsRes && xxtsRes.result) {
const xxts = xxtsRes.result;
// 检查待办状态
if (xxts.dbZt === "B") {
setData({ id: xxts.xxzbId });
let url = "/pages/view/hr/jsQj/detail";
uni.navigateTo({ url });
return;
}
setXxts(xxts);
// 使用消息推送中的主表ID
qjId.value = xxts.xxzbId;
}
} catch (error) {
console.error("获取待办信息失败", error);
// 如果获取Xxts失败，回退到原来的逻辑
qjId.value = data.id;
const xxtsData = getXxts();
if (xxtsData && xxtsData.dbZt === "B") {
setData({ id: data.id });
let url = "/pages/view/hr/jsQj/detail";
uni.navigateTo({ url });
return;
}
}
} else {
qjId.value = getData.id;

39
src/pages/view/hr/jsQj/sp.vue
View File

@ -47,6 +47,7 @@
<script setup lang="ts">
import { jsQjSpApi } from "@/api/base/jsQjApi";
import { xxtsFindByIdApi } from "@/api/base/server";
import { useDataStore } from "@/store/modules/data";
import { useUserStore } from "@/store/modules/user";
import { navigateBack } from "@/utils/uniapp";
@ -54,7 +55,7 @@ import { onLoad } from "@dcloudio/uni-app";
import { ref } from "vue";
import JsQjDetail from "./components/jsQjDetail.vue";
const { getJs } = useUserStore();
const { setData, getData, getDb } = useDataStore();
const { setData, getData, setXxts, getXxts } = useDataStore();
const dbFlag = ref(false);
@ -113,13 +114,37 @@ const handleReject = async () => {
onLoad(async (data: any) => {
// 从待办过来的，需要从后端获取数据
if (data && data.from && data.from == "db") {
qjId.value = data.id;
dbFlag.value = true;
if (getDb.dbZt === "B") {
setData({ id: data.id });
let url = "/pages/view/hr/jsQj/detail"; // 使用新路径
uni.navigateTo({ url });
return;
try {
// 优先从后端根据url中的id去查询Xxts
const xxtsRes = await xxtsFindByIdApi({ id: data.id });
if (xxtsRes && xxtsRes.result) {
const xxts = xxtsRes.result;
// 检查待办状态
if (xxts.dbZt === "B") {
setData({ id: xxts.xxzbId });
let url = "/pages/view/hr/jsQj/detail";
uni.navigateTo({ url });
return;
}
setXxts(xxts);
// 使用消息推送中的主表ID
qjId.value = xxts.xxzbId;
}
} catch (error) {
console.error("获取待办信息失败", error);
// 如果获取Xxts失败，回退到原来的逻辑
qjId.value = data.id;
const xxtsData = getXxts();
if (xxtsData && xxtsData.dbZt === "B") {
setData({ id: data.id });
let url = "/pages/view/hr/jsQj/detail";
uni.navigateTo({ url });
return;
}
}
} else {
qjId.value = getData.id;

7
src/store/modules/data.ts
View File

@ -5,6 +5,7 @@ export const useDataStore = defineStore({
state: () => ({
data: {},
db: {},
xxts: {}, // 添加xxts字段
global: {},
file: {},
}),
@ -15,6 +16,9 @@ export const useDataStore = defineStore({
getDb(): any {
return this.db;
},
getXxts(): any {
return this.xxts;
},
getGlobal(): any {
return this.global;
},
@ -29,6 +33,9 @@ export const useDataStore = defineStore({
setDb(data: any) {
this.db = data;
},
setXxts(data: any) {
this.xxts = data;
},
setGlobal(data: any) {
this.global = data;
},