调整和教师端统一

src/components/LcglSpList/index.vue

@@ -20,7 +20,7 @@
           <view class="item-right">
             <text class="item-time" v-if="approver.approveTime">{{ formatTime(approver.approveTime) }}</text>
             <text class="item-status" :class="getStatusClass(approver.approveStatus)">
-              {{ getStatusText(approver.approveStatus) }}
+              {{ getStatusText(approver.approveStatus, approver.spType) }}
             </text>
           </view>
         </view>
@@ -42,7 +42,7 @@
 
 <script setup lang="ts">
 import dayjs from "dayjs";
-import { getByYwIdAndYwTypeApi } from "@/api/base/lcglApi";
+import { getByYwIdAndYwTypeApi } from "@/api/base/lcglSpApi";
 
 // 接收外部传入属性
 const props = withDefaults(defineProps<{
@@ -106,9 +106,11 @@ const loadApprovalProcess = async () => {
 // 获取默认用户名
 const getDefaultUserName = (spType: string) => {
   switch (spType) {
-    case 'SQ': return '家长';
-    case 'SP': return '教师';
-    case 'CC': return '家长';
+    case 'SQ': return '申请人';
+    case 'SP': return '审批人';
+    case 'CC': return '抄送人';
+    case 'DK': return '代课老师';
+    case 'JWC': return '教科处';
     default: return '未知';
   }
 };
@@ -119,16 +121,18 @@ const getSpTypeText = (spType: string) => {
     case 'SQ': return '申请人';
     case 'SP': return '审批人';
     case 'CC': return '抄送人';
+    case 'DK': return '代课老师';
+    case 'JWC': return '教科处';
     default: return '';
   }
 };
 
 // 获取状态文本
-const getStatusText = (status: string) => {
+const getStatusText = (spType: string, status: string) => {
   switch (status) {
     case 'apply': return '已申请';
-    case 'pending': return '待处理';
-    case 'approved': return '已同意';
+    case 'pending': return spType === 'CC' ? '待抄送' : '待处理';
+    case 'approved': return spType === 'CC' ? '已抄送' : '已同意';
     case 'rejected': return '已拒绝';
     case 'cc_sent': return '已抄送';
     default: return '未知';

src/pages/base/xk/tf/detail.vue

@@ -46,7 +46,7 @@ import PreviewImage from "@/components/PreviewImage/index.vue";
 import { getXkTfDetailByIdApi } from "@/api/base/xkApi";
 import { xxtsFindByIdApi } from "@/api/base/xxtsApi";
 const { loginByOpenId } = useUserStore();
-const { getTf } = useDataStore();
+const { getTf, getData } = useDataStore();
 
 const xkTf = ref<any>({});
 const xkTfQdList = ref<any>([]);
@@ -68,10 +68,22 @@ const initData = (tf: any, tfQdList: any[]) => {
 	jfPzList.value = jfPz.split(',') || [];
 };
 
+// 获取详情
+const loadData = async (id: string) => { 
+	const res = await getXkTfDetailByIdApi(id);
+	if (!res.result) {
+		uni.showToast({ title: '未找到数据', icon: 'none' });
+		goHome();
+	}
+	nextTick(() => {
+		initData(res.result.xkTf, res.result.xkTfQdList);
+	});
+};
+
 // 从待办加载
 const loadByDb = async (data: any) => { 
-// 检查登录状态
-const isLoggedIn = await loginByOpenId(data.openId);
+	// 检查登录状态
+	const isLoggedIn = await loginByOpenId(data.openId);
 	if (!isLoggedIn) {
 		console.log("用户未登录，跳过处理");
 		return;
@@ -81,15 +93,8 @@ const isLoggedIn = await loginByOpenId(data.openId);
 		const xxtsRes = await xxtsFindByIdApi({ id: data.id });
 		if (xxtsRes && xxtsRes.result) {
 			const xxts = xxtsRes.result;
-			// 根据主表ID去查询学生请假信息
-			const res = await getXkTfDetailByIdApi(xxts.xxzbId);
-			if (!res.result) {
-				uni.showToast({ title: '未找到数据', icon: 'none' });
-				goHome();
-			}
-			nextTick(() => {
-				initData(res.result.xkTf, res.result.xkTfQdList);
-			});
+			// 根据主表ID去查询信息
+			await loadData(xxts.xxzbId);
 		}
 	} catch (error) {
 		console.error("获取待办信息失败", error);
@@ -103,6 +108,8 @@ onLoad(async (data: any) => {
 	} else if (getTf && getTf.xkTf) {	
 		// 表示包含了退费信息
 		initData(getTf.xkTf, getTf.xkTfQdList);
+	} else if (getData && getData.id) {
+		await loadData(getData.id);
 	}
 });