From e85d41d71488e928e9640869e47f8567e163f61a Mon Sep 17 00:00:00 2001
From: ywyonui <ywyonui@163.com>
Date: Mon, 23 Jun 2025 22:50:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=201=E3=80=81?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=95=8C=E9=9D=A2=E7=9A=84=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E5=AE=B6=E9=95=BF=E5=85=B3=E7=B3=BB=202=E3=80=81=E5=AD=A6?=
 =?UTF-8?q?=E7=94=9F=E8=AF=BE=E8=A1=A8=E6=8C=89=E5=91=A8=E5=87=A0=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=203=E3=80=81=E5=AD=A6=E7=94=9F=E6=88=90=E7=BB=A9?=
 =?UTF-8?q?=E7=9A=84=E5=AD=A6=E7=A7=91=E5=90=8D=E7=A7=B0=E6=8C=89id?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/base/class-schedule/index.vue |  4 ++-
 src/pages/base/grades/detail.vue        |  6 +++--
 src/pages/system/login/login.vue        | 36 ++++++++++++++-----------
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/pages/base/class-schedule/index.vue b/src/pages/base/class-schedule/index.vue
index 73fd0e4..028a80b 100644
--- a/src/pages/base/class-schedule/index.vue
+++ b/src/pages/base/class-schedule/index.vue
@@ -172,7 +172,9 @@ const selectDay = (index: number) => {
   drpkkbApi({
 	  bjId: getCurXs.bjId,
 	  xqId: xqId,
-	  rq: rqList.value[index].rq
+		rq: "",
+	  // rq: rqList.value[index].rq, // 暂时废弃，目前小学都按周几进行查询
+	  zj: rqList.value[index].zj
   }).then(res => {
     // 根据接口返回的result判断是否已报名
     if (res && res.resultCode === 1) {
diff --git a/src/pages/base/grades/detail.vue b/src/pages/base/grades/detail.vue
index b0b0927..59f2539 100644
--- a/src/pages/base/grades/detail.vue
+++ b/src/pages/base/grades/detail.vue
@@ -456,13 +456,15 @@ const buildXqKmKscjList = () => {
 
 const rebuildData = () => { 
   // 根据考试场次，分解对应的科目
-	let ksccKmmcList = getData.kmmc.split(",");
+	let ksccKmmcList = [];
 	let ksccKmIdList = getData.kmId.split(",");
   let ksfsList = [];
   let totalFs = 0.00;
 	kscjList.value = [];
   for (let i = 0; i < ksccKmIdList.length; i++) {
-    let km = { id: ksccKmIdList[i], kmmc: ksccKmmcList[i] };
+		let kmmc = srcKmList.value.find((item: any) => item.id === ksccKmIdList[i])?.kmmc;
+		ksccKmmcList.push(kmmc);
+    let km = { id: ksccKmIdList[i], kmmc: kmmc };
     let kmKscj = buildKmKscj(km, srcKsccKscjList.value);
     ksfsList.push(kmKscj.ksfs);
     totalFs += kmKscj.ksfs;
diff --git a/src/pages/system/login/login.vue b/src/pages/system/login/login.vue
index f464b95..1e2c776 100644
--- a/src/pages/system/login/login.vue
+++ b/src/pages/system/login/login.vue
@@ -63,7 +63,7 @@
                 inputAlign="right"
               ></u--input>
             </u-form-item>
-						<u-form-item
+		<!-- 				<u-form-item
 						  label="与学生关系"
 						  :prop="`students[${index}].jzxsgxId`"
 						  required
@@ -74,7 +74,7 @@
                 <view v-else>{{ student.jzxsgxmc }}</view>    
               </view>
   
-						</u-form-item>
+						</u-form-item> -->
             <u-form-item
               label="身份证号"
               :prop="`students[${index}].xssfzh`"
@@ -131,16 +131,17 @@ const dicVal = ref<number[]>([]);
 
 let formSchema: FormsSchema[] = [
   { title: "监护人信息" },
-  // {
-  //   field: "jzxsgxId",
-  //   label: "与学生关系",
-  //   component: "BasicPicker",
-  //   componentProps: {
-  //     rangeKey: "dictionaryValue",
-  //     savaKey: "dictionaryCode",
-  //     options: []
-  //   },
-  // },
+  {
+		field: "jzxsgxId",
+		label: "与学生关系",
+		component: "BasicPicker",
+		componentProps: {
+			api: dicApi,
+			param: { pid: 1622287061 },
+			rangeKey: "dictionaryValue",
+			savaKey: "dictionaryCode",
+		},
+  },
   {
     field: "jzxm",
     label: "家长姓名",
@@ -295,6 +296,9 @@ async function submit() {
   const formData = await getValue();
   showLoading({ title: "提交中" });
   try {
+		for (let i = 0; i < students.value.length; i++) {
+			students.value[i].jzxsgxId = formData.jzxsgxId;
+		}
     const res = await loginRegisterJzApi({
       xsList: students.value,
       ...formData,
@@ -314,10 +318,10 @@ async function submit() {
 }
 
 onMounted(async () => { 
-  const resDic = await dicApi({ pid: 1622287061 });
-  dicOptions.value = [resDic.result];
-  formSchema[1].componentProps.options = resDic.result;
-  setSchema(formSchema);
+  // const resDic = await dicApi({ pid: 1622287061 });
+  // dicOptions.value = [resDic.result];
+  // formSchema[1].componentProps.options = resDic.result;
+  // setSchema(formSchema);
 });