From f51548a2997ee4cf23c7e678d5f7e5dd73c13b42 Mon Sep 17 00:00:00 2001
From: ywyonui <ywyonui@163.com>
Date: Tue, 16 Sep 2025 14:05:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=87=AA=E5=8A=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=B6=88=E6=81=AF=E5=BE=85=E5=8A=9E=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=EF=BC=8C=E5=8D=B3=E4=B8=9A=E5=8A=A1=E6=95=B0=E6=8D=AE=E6=9C=89?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E7=BB=93=E6=9E=9C=EF=BC=8C=E5=88=99=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=9B=B4=E6=96=B0=E4=B8=BA=E5=B7=B2=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base/server.ts              | 15 ---------------
 src/api/base/xxtsApi.ts             | 12 +++++++++++-
 src/pages/base/message/index.vue    |  2 +-
 src/pages/base/xs/qj/sp.vue         |  5 ++++-
 src/pages/view/routine/xk/tf/sp.vue | 18 ++++++++++++++----
 src/utils/qjPageUtils.ts            | 18 ++++++++++++++++--
 src/utils/xkTfPageUtils.ts          | 18 ++++++++++++++++--
 7 files changed, 62 insertions(+), 26 deletions(-)

diff --git a/src/api/base/server.ts b/src/api/base/server.ts
index cd47a4b..92aba44 100644
--- a/src/api/base/server.ts
+++ b/src/api/base/server.ts
@@ -158,21 +158,6 @@ 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/getDetail", params);
diff --git a/src/api/base/xxtsApi.ts b/src/api/base/xxtsApi.ts
index 07c515a..6da5c75 100644
--- a/src/api/base/xxtsApi.ts
+++ b/src/api/base/xxtsApi.ts
@@ -1,6 +1,16 @@
-import { get } from "@/utils/request";
+import { get, post } from "@/utils/request";
 
 // 根据ID获取消息推送详情
 export const xxtsFindByIdApi = async (params: any) => {
   return await get("/api/xxts/findById", params);
+};
+
+// 获取消息推送列表（替代待办）
+export const xxtsListApi = async (params: any) => {
+  return await get("/api/xxts/findPage", params);
+};
+
+// 添加更新消息推送
+export const xxtsSaveApi = async (params: any) => {
+  return await post("/api/xxts/save", params);
 };
\ No newline at end of file
diff --git a/src/pages/base/message/index.vue b/src/pages/base/message/index.vue
index 412a4b8..5498cb9 100644
--- a/src/pages/base/message/index.vue
+++ b/src/pages/base/message/index.vue
@@ -43,7 +43,7 @@
 <script lang="ts" setup>
 import {ref, onMounted, onActivated} from "vue";
 import { useLayout } from "@/components/BasicListLayout/hooks/useLayout";
-import { xxtsListApi } from "@/api/base/server";
+import { xxtsListApi } from "@/api/base/xxtsApi";
 import { getTimeAgo } from "@/utils/dateUtils";
 import { useUserStore } from "@/store/modules/user";
 import { useDataStore } from "@/store/modules/data";
diff --git a/src/pages/base/xs/qj/sp.vue b/src/pages/base/xs/qj/sp.vue
index eadc3c9..c2423d4 100644
--- a/src/pages/base/xs/qj/sp.vue
+++ b/src/pages/base/xs/qj/sp.vue
@@ -77,7 +77,7 @@ import { xsQjFindByIdApi, xsQjSpApi } from "@/api/base/server";
 import { useUserStore } from "@/store/modules/user";
 import { useDataStore } from "@/store/modules/data";
 import { ref, nextTick } from "vue";
-import { xxtsFindByIdApi } from "@/api/base/server";
+import { xxtsFindByIdApi } from "@/api/base/xxtsApi";
 
 const { getJs, loginByOpenId } = useUserStore();
 const { getData, setXxts, setData, getXxts } = useDataStore();
@@ -197,6 +197,9 @@ onLoad(async (data: any) => {
         
         // 根据主表ID去查询学生请假信息
         const res = await xsQjFindByIdApi({ id: xxts.xxzbId });
+        const xsQj = res.result || {};
+        // TODO: 判断是否需要更新待办状态
+
         nextTick(() => {
           setData(res.result);
         });
diff --git a/src/pages/view/routine/xk/tf/sp.vue b/src/pages/view/routine/xk/tf/sp.vue
index 1f0ed81..eea89b5 100644
--- a/src/pages/view/routine/xk/tf/sp.vue
+++ b/src/pages/view/routine/xk/tf/sp.vue
@@ -27,7 +27,7 @@
 		</view>
 		<template #bottom>
 			<YwConfirm :api="xkTfSpApi" :params="spParams" 
-				@summit="submit" @reject="handleReject" />
+				@summit="submit" @reject="handleReject" v-if="xkTf.id" />
 		</template>
 	</BasicLayout>
 </template>
@@ -35,6 +35,7 @@
 <script setup lang="ts">
 import { onLoad } from "@dcloudio/uni-app";
 import { useUserStore } from "@/store/modules/user";
+import { useDataStore } from "@/store/modules/data";
 import { imagUrl } from "@/utils";
 import XkPayXs from "../components/XkPayXs/index.vue"
 import XkPaySuccessXkkc from "../components/XkPaySuccessXkkc/index.vue"
@@ -44,6 +45,7 @@ import YwConfirm from "@/pages/components/YwConfirm/index.vue";
 import { getXkTfDetailByIdApi, xkTfSpApi } from "@/api/base/xkTfApi";
 import { XkTfPageUtils } from "@/utils/xkTfPageUtils";
 const { getJs } = useUserStore();
+const { setTf, getXxts } = useDataStore();
 
 const curXs = ref<any>({});
 const xkTf = ref<any>({});
@@ -87,9 +89,16 @@ const loadData = async (id: string) => {
 		uni.showToast({ title: '未找到数据', icon: 'none' });
 		goHome();
 	}
-	nextTick(() => {
-		initData(res.result.xkTf, res.result.xs, res.result.xkTfQdList);
-	});
+	const data = res.result || {};
+	if (data.xkTf && data.xkTf.spResult != "A" && getXxts && getXxts.dbZt === "A") {
+		setTf(data);
+		uni.reLaunch({ url: '/pages/view/routine/xk/tf/detail' });
+		const flag = await XkTfPageUtils.updateXxts();
+	} else {
+		nextTick(() => {
+			initData(res.result.xkTf, res.result.xs, res.result.xkTfQdList);
+		});
+	}
 };
 
 const submit = async () => {
@@ -106,6 +115,7 @@ onLoad(async (data?: any) => {
 	if (!ret || !ret.success) {
 		return;
 	}
+	xkTf.value = {};
 	xkTfId.value = ret.xkTfId;
 	dbFlag.value = ret.dbFlag;
 	await loadData(xkTfId.value);
diff --git a/src/utils/qjPageUtils.ts b/src/utils/qjPageUtils.ts
index 3da8fde..b2558dd 100644
--- a/src/utils/qjPageUtils.ts
+++ b/src/utils/qjPageUtils.ts
@@ -1,4 +1,4 @@
-import { xxtsFindByIdApi } from "@/api/base/server";
+import { xxtsFindByIdApi, xxtsSaveApi } from "@/api/base/xxtsApi";
 import { useUserStore } from "@/store/modules/user";
 import { useDataStore } from "@/store/modules/data";
 
@@ -6,6 +6,7 @@ const { loginByOpenId } = useUserStore();
 const { getData, setXxts, setData, getXxts } = useDataStore();
 
 export const QjPageUtils = {
+  // 初始化校验
   async init(data?: any) {
     let ret = {
       success: true,
@@ -60,5 +61,18 @@ export const QjPageUtils = {
         return ret;
       }
     }
-  } 
+  },
+  // 检查待办状态是否需要更新
+  async updateXxts() { 
+    // 如果没有查询过消息推送，表示不是从待办进入的，不自动更新，
+    if (!getXxts || !getXxts.id) {
+      return false;
+    }
+    // 更新待办状态
+    await xxtsSaveApi({
+      id: getXxts.id,
+      dbZt: "B",
+    });
+    return true;
+  },
 }
\ No newline at end of file
diff --git a/src/utils/xkTfPageUtils.ts b/src/utils/xkTfPageUtils.ts
index 68aad25..fc10e0e 100644
--- a/src/utils/xkTfPageUtils.ts
+++ b/src/utils/xkTfPageUtils.ts
@@ -1,4 +1,4 @@
-import { xxtsFindByIdApi } from "@/api/base/server";
+import { xxtsFindByIdApi, xxtsSaveApi } from "@/api/base/xxtsApi";
 import { useUserStore } from "@/store/modules/user";
 import { useDataStore } from "@/store/modules/data";
 
@@ -6,6 +6,7 @@ const { loginByOpenId } = useUserStore();
 const { getData, setXxts, setData, getXxts } = useDataStore();
 
 export const XkTfPageUtils = {
+  // 初始化校验
   async init(data?: any) {
     let ret = {
       success: true,
@@ -60,5 +61,18 @@ export const XkTfPageUtils = {
         return ret;
       }
     }
-  } 
+  },
+  // 检查待办状态是否需要更新
+  async updateXxts() { 
+    // 如果没有查询过消息推送，表示不是从待办进入的，不自动更新，
+    if (!getXxts || !getXxts.id) {
+      return false;
+    }
+    // 更新待办状态
+    await xxtsSaveApi({
+      id: getXxts.id,
+      dbZt: "B",
+    });
+    return true;
+  },
 }
\ No newline at end of file