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" > - {{ student.jzxsgxmc }} - + --> ([]); 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); });