This commit is contained in:
zhoutianchi
2026-01-15 11:23:00 +08:00
parent f8b618a13a
commit 8bdd7985d3
24 changed files with 215 additions and 212 deletions

View File

@@ -329,9 +329,9 @@
<el-select v-model="dataForm.wishMajorOne" filterable clearable placeholder="" size="small" style="width: 100%" >
<el-option
v-for="item in planMajorList"
:key="item.zydm"
:label="item.zymc"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -343,9 +343,9 @@
<el-select v-model="dataForm.wishMajorTwo" filterable clearable placeholder="" size="small" style="width: 100%" >
<el-option
v-for="item in planMajorList"
:key="item.zydm"
:label="item.zymc"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -357,9 +357,9 @@
<el-select v-model="dataForm.wishMajorThree" filterable clearable placeholder="" size="small" style="width: 100%" >
<el-option
v-for="item in planMajorList"
:key="item.zydm"
:label="item.zymc"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -371,9 +371,9 @@
<el-select v-model="dataForm.confirmedMajor" filterable clearable placeholder="" size="small" style="width: 100%" :disabled="type==1 ? false : true" @change="changeM(dataForm.confirmedMajor)">
<el-option
v-for="item in planMajorList"
:key="item.zydm"
:label="item.zymc+' || '+item.xyNum"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName+' || '+item.xyNum"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -385,9 +385,9 @@
<el-select v-model="dataForm.twoMajor" filterable clearable placeholder="" size="small" style="width: 100%" @change="changeM(dataForm.twoMajor)">
<el-option
v-for="item in twoMajorList"
:key="item.zydm"
:label="item.zymc+' || '+item.xyNum"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName+' || '+item.xyNum"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -395,9 +395,9 @@
<el-select v-model="dataForm.threeMajor" filterable clearable placeholder="" size="small" style="width: 100%" @change="changeM(dataForm.threeMajor)">
<el-option
v-for="item in threeMajorList"
:key="item.zydm"
:label="item.zymc+' || '+item.xyNum"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName+' || '+item.xyNum"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -405,9 +405,9 @@
<el-select v-model="dataForm.fourMajor" filterable clearable placeholder="" size="small" style="width: 100%" @change="changeM(dataForm.fourMajor)">
<el-option
v-for="item in fourMajorList"
:key="item.zydm"
:label="item.zymc+' || '+item.xyNum"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName+' || '+item.xyNum"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -415,9 +415,9 @@
<el-select v-model="dataForm.fiveMajor" filterable clearable placeholder="" size="small" style="width: 100%" @change="changeM(dataForm.fiveMajor)">
<el-option
v-for="item in fiveMajorList"
:key="item.zydm"
:label="item.zymc+' || '+item.xyNum"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName+' || '+item.xyNum"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -425,9 +425,9 @@
<el-select v-model="dataForm.sixMajor" filterable clearable placeholder="" size="small" style="width: 100%" @change="changeM(dataForm.sixMajor)">
<el-option
v-for="item in sixMajorList"
:key="item.zydm"
:label="item.zymc+' || '+item.xyNum"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName+' || '+item.xyNum"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -435,9 +435,9 @@
<el-select v-model="dataForm.sevenMajor" filterable clearable placeholder="" size="small" style="width: 100%" @change="changeM(dataForm.sevenMajor)">
<el-option
v-for="item in sevenMajorList"
:key="item.zydm"
:label="item.zymc+' || '+item.xyNum"
:value="item.zydm">
:key="item.majorCode"
:label="item.majorName+' || '+item.xyNum"
:value="item.majorCode">
</el-option>
</el-select>
</el-form-item>
@@ -802,7 +802,7 @@ const dataRule = {
// 初始化
const init = (id: string | null, typeParam: number) => {
dataForm.id = id || ""
dataForm.id = id || null
type.value = typeParam
visible.value = true
canSubmit.value = true
@@ -880,17 +880,17 @@ const init = (id: string | null, typeParam: number) => {
}
// 根据年制分组
planMajorList.value.forEach((item: any) => {
if (item.xz == '2') {
if (item.learnYear == '2') {
twoMajorList.value.push(item)
} else if (item.xz == '3') {
} else if (item.learnYear == '3') {
threeMajorList.value.push(item)
} else if (item.xz == '4') {
} else if (item.learnYear == '4') {
fourMajorList.value.push(item)
} else if (item.xz == '5') {
} else if (item.learnYear == '5') {
fiveMajorList.value.push(item)
} else if (item.xz == '6') {
} else if (item.learnYear == '6') {
sixMajorList.value.push(item)
} else if (item.xz == '7') {
} else if (item.learnYear == '7') {
sevenMajorList.value.push(item)
}
})
@@ -1022,17 +1022,17 @@ const changeEducation = () => {
}
// 根据年制分组
planMajorList.value.forEach((item: any) => {
if (item.xz == '2') {
if (item.learnYear == '2') {
twoMajorList.value.push(item)
} else if (item.xz == '3') {
} else if (item.learnYear == '3') {
threeMajorList.value.push(item)
} else if (item.xz == '4') {
} else if (item.learnYear == '4') {
fourMajorList.value.push(item)
} else if (item.xz == '5') {
} else if (item.learnYear == '5') {
fiveMajorList.value.push(item)
} else if (item.xz == '6') {
} else if (item.learnYear == '6') {
sixMajorList.value.push(item)
} else if (item.xz == '7') {
} else if (item.learnYear == '7') {
sevenMajorList.value.push(item)
}
})
@@ -1096,13 +1096,13 @@ const gzAuditChange = () => {
if (type.value != 0 && (dataForm.confirmedMajor == undefined || dataForm.confirmedMajor == "")) {
// 根据折算分匹配录取专业
planMajorList.value.forEach((e: any) => {
if (e.zydm == dataForm.wishMajorOne && (parseFloat(e.xyNum) > 0)) {
if (e.majorCode == dataForm.wishMajorOne && (parseFloat(e.xyNum) > 0)) {
dataForm.confirmedMajor = dataForm.wishMajorOne
}
})
if (dataForm.confirmedMajor) {
planMajorList.value.forEach((e: any) => {
if (e.zydm == dataForm.wishMajorTwo && (parseFloat(e.xyNum) > 0)) {
if (e.majorCode == dataForm.wishMajorTwo && (parseFloat(e.xyNum) > 0)) {
dataForm.confirmedMajor = dataForm.wishMajorOne
}
})
@@ -1110,7 +1110,7 @@ const gzAuditChange = () => {
if (dataForm.confirmedMajor) {
planMajorList.value.forEach((e: any) => {
if (e.zydm == dataForm.wishMajorThree && (parseFloat(e.xyNum) > 0)) {
if (e.majorCode == dataForm.wishMajorThree && (parseFloat(e.xyNum) > 0)) {
dataForm.confirmedMajor = dataForm.wishMajorOne
}
})
@@ -1130,13 +1130,13 @@ const jsZSF = () => {
dataForm.correctedScore = String(Math.floor(score / parseFloat(String(dataForm.fullScore)) + fjf))
// 根据折算分匹配录取专业
planMajorList.value.forEach((e: any) => {
if (dataForm.correctedScore >= e.scoreLine && e.zydm == dataForm.wishMajorOne && (parseFloat(e.xyNum) > 0)) {
if (dataForm.correctedScore >= e.scoreLine && e.majorCode == dataForm.wishMajorOne && (parseFloat(e.xyNum) > 0)) {
dataForm.confirmedMajor = dataForm.wishMajorOne
}
})
if (dataForm.confirmedMajor == "") {
planMajorList.value.forEach((e: any) => {
if (dataForm.correctedScore >= e.scoreLine && e.zydm == dataForm.wishMajorTwo && (parseFloat(e.xyNum) > 0)) {
if (dataForm.correctedScore >= e.scoreLine && e.majorCode == dataForm.wishMajorTwo && (parseFloat(e.xyNum) > 0)) {
dataForm.confirmedMajor = dataForm.wishMajorTwo
}
})
@@ -1144,7 +1144,7 @@ const jsZSF = () => {
if (dataForm.confirmedMajor == "") {
planMajorList.value.forEach((e: any) => {
if (dataForm.correctedScore >= e.scoreLine && e.zydm == dataForm.wishMajorThree && (parseFloat(e.xyNum) > 0)) {
if (dataForm.correctedScore >= e.scoreLine && e.majorCode == dataForm.wishMajorThree && (parseFloat(e.xyNum) > 0)) {
dataForm.confirmedMajor = dataForm.wishMajorThree
}
})
@@ -1201,7 +1201,7 @@ const changeM = (id: string) => {
dataForm.confirmedMajor = id
// 是初中生并且是中德班
planMajorList.value.forEach((e: any) => {
if (dataForm.confirmedMajor == e.zydm && e.isZd == "1" && dataForm.degreeOfEducation == "1") {
if (dataForm.confirmedMajor == e.majorCode && e.isZd == "1" && dataForm.degreeOfEducation == "1") {
flag = true
}
})