From d91dd1bb190e90d8c3b3515cd5e5c79e31e2f7fa Mon Sep 17 00:00:00 2001
From: ywyonui <ywyonui@163.com>
Date: Fri, 25 Jul 2025 13:52:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base/{qjApi.ts => jsQjApi.ts}         | 16 ++++-----
 src/pages.json                                | 14 ++++----
 src/pages/base/service/index.vue              |  2 +-
 src/pages/components/JsPicker/index.vue       |  1 -
 .../hr/{qj => jsQj}/components/jsQjDkEdit.vue | 24 ++++++++++++--
 .../hr/{qj => jsQj}/components/jsQjEdit.vue   | 33 ++++++++++++++++---
 .../hr/{qj => jsQj}/components/jsQjList.vue   |  4 +--
 .../{qj => jsQj}/components/progressList.vue  |  2 +-
 src/pages/view/hr/{qj => jsQj}/cxTj.vue       |  2 +-
 src/pages/view/hr/{qj => jsQj}/detail.vue     |  0
 src/pages/view/hr/{qj => jsQj}/dkQr.vue       |  2 +-
 src/pages/view/hr/{qj => jsQj}/index.vue      |  0
 src/pages/view/hr/{qj => jsQj}/jwcQr.vue      |  2 +-
 src/pages/view/hr/{qj => jsQj}/jwcXt.vue      |  2 +-
 src/pages/view/hr/{qj => jsQj}/sp.vue         |  2 +-
 15 files changed, 74 insertions(+), 32 deletions(-)
 rename src/api/base/{qjApi.ts => jsQjApi.ts} (74%)
 rename src/pages/view/hr/{qj => jsQj}/components/jsQjDkEdit.vue (92%)
 rename src/pages/view/hr/{qj => jsQj}/components/jsQjEdit.vue (86%)
 rename src/pages/view/hr/{qj => jsQj}/components/jsQjList.vue (96%)
 rename src/pages/view/hr/{qj => jsQj}/components/progressList.vue (98%)
 rename src/pages/view/hr/{qj => jsQj}/cxTj.vue (93%)
 rename src/pages/view/hr/{qj => jsQj}/detail.vue (100%)
 rename src/pages/view/hr/{qj => jsQj}/dkQr.vue (93%)
 rename src/pages/view/hr/{qj => jsQj}/index.vue (100%)
 rename src/pages/view/hr/{qj => jsQj}/jwcQr.vue (93%)
 rename src/pages/view/hr/{qj => jsQj}/jwcXt.vue (93%)
 rename src/pages/view/hr/{qj => jsQj}/sp.vue (93%)

diff --git a/src/api/base/qjApi.ts b/src/api/base/jsQjApi.ts
similarity index 74%
rename from src/api/base/qjApi.ts
rename to src/api/base/jsQjApi.ts
index 66a653b..9910371 100644
--- a/src/api/base/qjApi.ts
+++ b/src/api/base/jsQjApi.ts
@@ -7,42 +7,42 @@ import { get, post } from "@/utils/request";
  * 申请
  */
 export const jsQjSqApi = async (params: any) => {
-  return await post("/api/qj/sq", params);
+  return await post("/api/jsQj/sq", params);
 };
 
 /**
  * 审批
  */
 export const jsQjSpApi = async (params: any) => {
-  return await post("/api/qj/sp", params);
+  return await post("/api/jsQj/sp", params);
 };
 
 /**
  * 教务处确认
  */
 export const jsQjJwcQrApi = async (params: any) => {
-  return await post("/api/qj/jwc/qr", params);
+  return await post("/api/jsQj/jwc/qr", params);
 };
 
 /**
  * 教务处协调
  */
 export const jsQjJwcXtApi = async (params: any) => {
-  return await post("/api/qj/jwc/xt", params);
+  return await post("/api/jsQj/jwc/xt", params);
 };
 
 /**
  * 代课确认
  */
 export const jsQjDkQrApi = async (params: any) => {
-  return await post("/api/qj/dk/qr", params);
+  return await post("/api/jsQj/dk/qr", params);
 };
 
 /**
  * 查询请假信息
  */
 export const findQjById = async (params: any) => {
-  return await get("/api/qj/findById", params);
+  return await get("/api/jsQj/findById", params);
 };
 
 /**
@@ -57,14 +57,14 @@ export const getPkkbByJsRangeTimeApi = async (params: any) => {
  * 查询代课信息
  */
 export const findDkByIdApi = async (params: any) => {
-  return await get("/api/qjDk/findById", params);
+  return await get("/api/jsQjDk/findById", params);
 };
 
 /**
  * 查询请假列表
  */
 export const findQjListApi = async (params: any) => {
-  return await get("/api/qj/findPage", params);
+  return await get("/api/jsQj/findPage", params);
 };
 
 /**
diff --git a/src/pages.json b/src/pages.json
index 0a7fa50..36dccee 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -252,7 +252,7 @@
       }
     },
     {
-      "path": "pages/view/hr/qj/index",
+      "path": "pages/view/hr/jsQj/index",
       "style": {
         "navigationBarTitleText": "请假申请",
         "enablePullDownRefresh": false
@@ -273,42 +273,42 @@
       }
     },
     {
-      "path": "pages/view/hr/qj/detail",
+      "path": "pages/view/hr/jsQj/detail",
       "style": {
         "navigationBarTitleText": "请假详情",
         "enablePullDownRefresh": false
       }
     },
     {
-      "path": "pages/view/hr/qj/sp",
+      "path": "pages/view/hr/jsQj/sp",
       "style": {
         "navigationBarTitleText": "请假审批",
         "enablePullDownRefresh": false
       }
     },
     {
-      "path": "pages/view/hr/qj/cxTj",
+      "path": "pages/view/hr/jsQj/cxTj",
       "style": {
         "navigationBarTitleText": "请假重新提交",
         "enablePullDownRefresh": false
       }
     },
     {
-      "path": "pages/view/hr/qj/jwcQr",
+      "path": "pages/view/hr/jsQj/jwcQr",
       "style": {
         "navigationBarTitleText": "请假代课教务处确认",
         "enablePullDownRefresh": false
       }
     },
     {
-      "path": "pages/view/hr/qj/jwcXt",
+      "path": "pages/view/hr/jsQj/jwcXt",
       "style": {
         "navigationBarTitleText": "请假代课教务处协调",
         "enablePullDownRefresh": false
       }
     },
     {
-      "path": "pages/view/hr/qj/dkQr",
+      "path": "pages/view/hr/jsQj/dkQr",
       "style": {
         "navigationBarTitleText": "请假代课教师确认",
         "enablePullDownRefresh": false
diff --git a/src/pages/base/service/index.vue b/src/pages/base/service/index.vue
index 4b9c3c7..abe0daa 100644
--- a/src/pages/base/service/index.vue
+++ b/src/pages/base/service/index.vue
@@ -291,7 +291,7 @@ const sections = reactive<Section[]>([
         icon: "draftfill",
         text: "请假申请",
         show: true,
-        path: "/pages/view/hr/qj/index",
+        path: "/pages/view/hr/jsQj/index",
       },
       {
         id: "hr2",
diff --git a/src/pages/components/JsPicker/index.vue b/src/pages/components/JsPicker/index.vue
index d36c1e3..dffbf83 100644
--- a/src/pages/components/JsPicker/index.vue
+++ b/src/pages/components/JsPicker/index.vue
@@ -120,7 +120,6 @@ defineExpose({
 });
 
 onMounted(async () => {
-  console.log("排除列表：", props.excludeIds);
   const res = await getAllJs()
   jsListAll.value = res.result || [];
   rebuildJsList();
diff --git a/src/pages/view/hr/qj/components/jsQjDkEdit.vue b/src/pages/view/hr/jsQj/components/jsQjDkEdit.vue
similarity index 92%
rename from src/pages/view/hr/qj/components/jsQjDkEdit.vue
rename to src/pages/view/hr/jsQj/components/jsQjDkEdit.vue
index 80c3204..0ff3993 100644
--- a/src/pages/view/hr/qj/components/jsQjDkEdit.vue
+++ b/src/pages/view/hr/jsQj/components/jsQjDkEdit.vue
@@ -74,7 +74,7 @@
 
 <script setup lang="ts">
 import JsPicker from "@/pages/components/JsPicker/index.vue";
-import { getPkkbByJsRangeTimeApi } from "@/api/base/qjApi";
+import { getPkkbByJsRangeTimeApi } from "@/api/base/jsQjApi";
 import { useUserStore } from "@/store/modules/user";
 const { getJs } = useUserStore();
 
@@ -196,15 +196,35 @@ const changeJs = (selected: any, item: any) => {
   item.dkJsName = selected.label;
 }
 
+const validate = async () => { 
+  // 如果没有查询到代课信息，重新查询一遍，避免遗漏
+  if (!dkList.value || !dkList.value.length) {
+    await getPkkbList();
+  }
+  const list = dkList.value;
+  // 如果还是没有查询需要代课的数据，则返回true
+  if (!list || !list.length) {
+    return true;
+  }
+  // 遍历列表，判断是否有未选择的教师
+  for (let i = 0; i < list.length; i++) {
+    const item = list[i];
+    if (!item.dkJsId) {
+      return false;
+    }
+  }
+  return true;
+}
 
 // 暴露接口给ref调用
-function getDkList() {
+const getDkList = () => {
   return dkList.value;
 }
 
 // 暴露接口给外部调用
 defineExpose({
   getPkkbList,
+  validate,
   getDkList
 });
 </script>
diff --git a/src/pages/view/hr/qj/components/jsQjEdit.vue b/src/pages/view/hr/jsQj/components/jsQjEdit.vue
similarity index 86%
rename from src/pages/view/hr/qj/components/jsQjEdit.vue
rename to src/pages/view/hr/jsQj/components/jsQjEdit.vue
index 5a0fb63..3037565 100644
--- a/src/pages/view/hr/qj/components/jsQjEdit.vue
+++ b/src/pages/view/hr/jsQj/components/jsQjEdit.vue
@@ -22,7 +22,7 @@
 import JsQjDkEdit from "./jsQjDkEdit.vue"
 import { navigateBack } from "@/utils/uniapp";
 import { useForm } from "@/components/BasicForm/hooks/useForm";
-import { jsQjSqApi } from "@/api/base/qjApi";
+import { jsQjSqApi } from "@/api/base/jsQjApi";
 import { showToast } from "@/utils/uniapp";
 import dayjs from "dayjs";
 import { useUserStore } from "@/store/modules/user";
@@ -199,19 +199,42 @@ const submit = async () => {
     return;
   }
   const params = { ...fd };
+  if (fd.dkfs === 0) {
+    const flag = await dkRef.value.validate();
+    if (!flag) {
+      uni.showToast({
+        title: "请选择代课教师",
+        icon: "none",
+      });
+      return;
+    }
+    let dkList = dkRef.value.getDkList() || [];
+    if (dkList.length) {
+      params.dkList = dkList.map((item: any) => {
+        const newItem = {...item};
+        newItem.jsId = item.dkJsId;
+        newItem.jsName = item.dkJsName;
+        newItem.pkkbId = item.id;
+        newItem.dktime = item.dktime + " " + item.startTime + ":00";
+        newItem.id = "";
+        newItem.qjId = "";
+        return newItem;
+      });
+    } else {
+      params.dkList = [];
+    }
+  }
   if (props.data && props.data.id) {
     params.id = props.data.id;
   } else {
     params.id = null;
-    params.jsId = getJs.bzrId; // 班主任ID
-    params.xqId = getJs.xqId; // 学期ID
+    params.jsId = getJs.id;
   }
-  params.flag = 2;
   uni.showLoading({ title: "提交中..." });
   await jsQjSqApi(params).then(() => {
     showToast({ title: "提交成功", icon: "success" });
     uni.reLaunch({
-      url: "/pages/base/home/index"
+      url: "/pages/base/service/index"
     });
   });
   uni.hideLoading();
diff --git a/src/pages/view/hr/qj/components/jsQjList.vue b/src/pages/view/hr/jsQj/components/jsQjList.vue
similarity index 96%
rename from src/pages/view/hr/qj/components/jsQjList.vue
rename to src/pages/view/hr/jsQj/components/jsQjList.vue
index 7071b5f..51e8628 100644
--- a/src/pages/view/hr/qj/components/jsQjList.vue
+++ b/src/pages/view/hr/jsQj/components/jsQjList.vue
@@ -34,7 +34,7 @@
 
 <script setup lang="ts">
 import { useLayout } from "@/components/BasicListLayout/hooks/useLayout";
-import { findQjListApi } from "@/api/base/qjApi";
+import { findQjListApi } from "@/api/base/jsQjApi";
 import { useUserStore } from "@/store/modules/user";
 import { useDataStore } from "@/store/modules/data";
 const { getJs } = useUserStore();
@@ -54,7 +54,7 @@ const [register, { reload }] = useLayout({
 // 查看详情或新增处理函数
 const goToDetail = (item: any | null) => {
   setData(item);
-  let url = '/pages/view/hr/qj/detail'; // 使用新路径
+  let url = '/pages/view/hr/jsQj/detail'; // 使用新路径
   uni.navigateTo({ url });
 };
 </script>
diff --git a/src/pages/view/hr/qj/components/progressList.vue b/src/pages/view/hr/jsQj/components/progressList.vue
similarity index 98%
rename from src/pages/view/hr/qj/components/progressList.vue
rename to src/pages/view/hr/jsQj/components/progressList.vue
index 3bb2c55..e6f32d9 100644
--- a/src/pages/view/hr/qj/components/progressList.vue
+++ b/src/pages/view/hr/jsQj/components/progressList.vue
@@ -30,7 +30,7 @@
 </template>
 
 <script setup lang="ts">
-import { getQjActivitiHistoryApi } from "@/api/base/qjApi";
+import { getQjActivitiHistoryApi } from "@/api/base/jsQjApi";
 // 接收外部传入属性
 const props = withDefaults(defineProps<{
   procInstId: string
diff --git a/src/pages/view/hr/qj/cxTj.vue b/src/pages/view/hr/jsQj/cxTj.vue
similarity index 93%
rename from src/pages/view/hr/qj/cxTj.vue
rename to src/pages/view/hr/jsQj/cxTj.vue
index 4a155b0..ef6af9f 100644
--- a/src/pages/view/hr/qj/cxTj.vue
+++ b/src/pages/view/hr/jsQj/cxTj.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script setup lang="ts">
-import { findQjById } from '@/api/base/qjApi';
+import { findQjById } from '@/api/base/jsQjApi';
 import { onLoad } from '@dcloudio/uni-app';
 import { useDataStore } from "@/store/modules/data";
 const { setData } = useDataStore();
diff --git a/src/pages/view/hr/qj/detail.vue b/src/pages/view/hr/jsQj/detail.vue
similarity index 100%
rename from src/pages/view/hr/qj/detail.vue
rename to src/pages/view/hr/jsQj/detail.vue
diff --git a/src/pages/view/hr/qj/dkQr.vue b/src/pages/view/hr/jsQj/dkQr.vue
similarity index 93%
rename from src/pages/view/hr/qj/dkQr.vue
rename to src/pages/view/hr/jsQj/dkQr.vue
index 0438b49..9151666 100644
--- a/src/pages/view/hr/qj/dkQr.vue
+++ b/src/pages/view/hr/jsQj/dkQr.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script setup lang="ts">
-import { findQjById } from '@/api/base/qjApi';
+import { findQjById } from '@/api/base/jsQjApi';
 import { onLoad } from '@dcloudio/uni-app';
 import { useDataStore } from "@/store/modules/data";
 const { setData } = useDataStore();
diff --git a/src/pages/view/hr/qj/index.vue b/src/pages/view/hr/jsQj/index.vue
similarity index 100%
rename from src/pages/view/hr/qj/index.vue
rename to src/pages/view/hr/jsQj/index.vue
diff --git a/src/pages/view/hr/qj/jwcQr.vue b/src/pages/view/hr/jsQj/jwcQr.vue
similarity index 93%
rename from src/pages/view/hr/qj/jwcQr.vue
rename to src/pages/view/hr/jsQj/jwcQr.vue
index e6c8647..b04650d 100644
--- a/src/pages/view/hr/qj/jwcQr.vue
+++ b/src/pages/view/hr/jsQj/jwcQr.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script setup lang="ts">
-import { findQjById } from '@/api/base/qjApi';
+import { findQjById } from '@/api/base/jsQjApi';
 import { onLoad } from '@dcloudio/uni-app';
 import { useDataStore } from "@/store/modules/data";
 const { setData } = useDataStore();
diff --git a/src/pages/view/hr/qj/jwcXt.vue b/src/pages/view/hr/jsQj/jwcXt.vue
similarity index 93%
rename from src/pages/view/hr/qj/jwcXt.vue
rename to src/pages/view/hr/jsQj/jwcXt.vue
index ab3b68a..9fe3a78 100644
--- a/src/pages/view/hr/qj/jwcXt.vue
+++ b/src/pages/view/hr/jsQj/jwcXt.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script setup lang="ts">
-import { findQjById } from '@/api/base/qjApi';
+import { findQjById } from '@/api/base/jsQjApi';
 import { onLoad } from '@dcloudio/uni-app';
 import { useDataStore } from "@/store/modules/data";
 const { setData } = useDataStore();
diff --git a/src/pages/view/hr/qj/sp.vue b/src/pages/view/hr/jsQj/sp.vue
similarity index 93%
rename from src/pages/view/hr/qj/sp.vue
rename to src/pages/view/hr/jsQj/sp.vue
index e766e47..be19bc7 100644
--- a/src/pages/view/hr/qj/sp.vue
+++ b/src/pages/view/hr/jsQj/sp.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script setup lang="ts">
-import { findQjById } from '@/api/base/qjApi';
+import { findQjById } from '@/api/base/jsQjApi';
 import { onLoad } from '@dcloudio/uni-app';
 import { useDataStore } from "@/store/modules/data";
 const { setData } = useDataStore();