Merge branch 'master' of http://119.29.194.155:8894/zwq/zhxy-jzd

src/api/base/server.ts

@@ -89,7 +89,12 @@ export const getByJlIdApi = async (params: any) => {
 
 // 推送清单相关API
 // 根据接龙ID获取学生信息
-export const jlzxFindByJlParamsApi = async (params: { jlId: string }) => {
+export const jlzxFindByJlParamsApi = async (params: { 
+  jlId: string; 
+  njId?: string; 
+  njmcId?: string; 
+  bjId?: string; 
+}) => {
   return await get("/api/jlzx/findByJlParams", params);
 };
 

src/pages/base/jl/detail.vue

@@ -90,6 +90,11 @@ const isLoading = ref(false);
 const studentList = ref<any[]>([]);
 const descExpanded = ref(false);
 
+// 新增参数
+const njId = ref<string>("");
+const njmcId = ref<string>("");
+const bjId = ref<string>("");
+
 // 签名相关
 const signCompRef = ref<any>(null);
 const signTitle = ref<string>("签名");
@@ -157,11 +162,11 @@ async function onRelayClick() {
 // 提交接龙
 async function submitRelay() {
   const params: any = {
-    jl_id: noticeId.value,
+    jlId: noticeId.value,
     xsId: currentStudent.value?.id,
   };
   if (sign_file.value) {
-    params.qm_file = sign_file.value;
+    params.qmFile = sign_file.value;
   }
   showLoading('提交中...');
   try {
@@ -182,7 +187,14 @@ async function submitRelay() {
 // 刷新学生完成状态
 async function refreshStudentList() {
   try {
-    const stuRes = await jlzxFindByJlParamsApi({ jlId: noticeId.value });
+    const params: any = { jlId: noticeId.value };
+    
+    // 添加筛选参数
+    if (njId.value) params.njId = njId.value;
+    if (njmcId.value) params.njmcId = njmcId.value;
+    if (bjId.value) params.bjId = bjId.value;
+    
+    const stuRes = await jlzxFindByJlParamsApi(params);
     studentList.value = stuRes?.rows || stuRes?.result || [];
   } catch (e) {
     uni.showToast({ title: "刷新学生状态失败", icon: "none" });
@@ -190,14 +202,19 @@ async function refreshStudentList() {
 }
 
 onLoad(async (options) => {
-  if (options && options.id) {
-    noticeId.value = options.id;
+  if (options && options.jlId) {
+    noticeId.value = options.jlId;
+    
+    // 接收新的参数
+    if (options.njId) njId.value = options.njId;
+    if (options.njmcId) njmcId.value = options.njmcId;
+    if (options.bjId) bjId.value = options.bjId;
+    
     isLoading.value = true;
     if (options.openId) {
       // 检查登录状态
       const isLoggedIn = await userStore.loginByOpenId(options.openId);
       if (!isLoggedIn) {
-        console.log("用户未登录，跳过处理");
         return;
       }
     }
@@ -210,7 +227,14 @@ onLoad(async (options) => {
     }
     // 2. 获取学生完成状态
     try {
-      const stuRes = await jlzxFindByJlParamsApi({ jlId: noticeId.value });
+      const params: any = { jlId: noticeId.value };
+      
+      // 添加筛选参数
+      if (njId.value) params.njId = njId.value;
+      if (njmcId.value) params.njmcId = njmcId.value;
+      if (bjId.value) params.bjId = bjId.value;
+      
+      const stuRes = await jlzxFindByJlParamsApi(params);
       studentList.value = stuRes?.rows || stuRes?.result || [];
     } catch (e) {
       uni.showToast({ title: "加载学生状态失败", icon: "none" });

src/pages/base/jl/index.vue

@@ -155,10 +155,23 @@ watch(dataList, (val) => {
 
 // 跳转到接龙反馈（detail）页
 const goToFeedback = (data: any) => {
-  // 优先使用 jlId，如果没有则使用 id
-  const jlId = data.jlId || data.id;
+
+  // 传递所有必要的参数
+  const params = {
+    jlId: data.jlId,
+    njId: data.njId,
+    njmcId: data.njmcId,
+    bjId: data.bjId
+  };
+  
+  // 构建查询字符串
+  const queryString = Object.keys(params)
+    .filter(key => params[key as keyof typeof params])
+    .map(key => `${key}=${encodeURIComponent(params[key as keyof typeof params])}`)
+    .join('&');
+  
   uni.navigateTo({
-    url: `/pages/base/jl/detail?id=${jlId}`,
+    url: `/pages/base/jl/detail?${queryString}`,
   });
 };