1
This commit is contained in:
@@ -49,9 +49,9 @@
|
||||
<el-select v-model="dataForm.confirmedMajor" filterable clearable placeholder="" size="small" style="width: 100%" :disabled="type != 1" @change="changeM(dataForm.confirmedMajor)">
|
||||
<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>
|
||||
@@ -63,9 +63,9 @@
|
||||
<el-select v-model="dataForm.newConfirmedMajor" filterable placeholder="" size="small" style="width: 100%" @change="changeCM(dataForm.newConfirmedMajor)">
|
||||
<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>
|
||||
@@ -242,7 +242,7 @@ const changeCM = (id: string) => {
|
||||
if (id) {
|
||||
let flag = false
|
||||
planMajorList.value.forEach((e: any) => {
|
||||
if (dataForm.newConfirmedMajor == e.zydm && e.isZd == "1" && String(dataForm.degreeOfEducation) == "1") {
|
||||
if (dataForm.newConfirmedMajor == e.majorCode && e.isZd == "1" && String(dataForm.degreeOfEducation) == "1") {
|
||||
flag = true
|
||||
}
|
||||
})
|
||||
@@ -264,7 +264,7 @@ const changeM = (id: string) => {
|
||||
// 是初中生并且是中德班
|
||||
let flag = false
|
||||
planMajorList.value.forEach((e: any) => {
|
||||
if (dataForm.confirmedMajor == e.zydm && e.isZd == "1" && String(dataForm.degreeOfEducation) == "1") {
|
||||
if (dataForm.confirmedMajor == e.majorCode && e.isZd == "1" && String(dataForm.degreeOfEducation) == "1") {
|
||||
flag = true
|
||||
}
|
||||
})
|
||||
@@ -315,7 +315,7 @@ const dataFormSubmit = async () => {
|
||||
|
||||
// 初始化方法
|
||||
const init = (id: string | null) => {
|
||||
dataForm.id = id || ""
|
||||
dataForm.id = id || null
|
||||
visible.value = true
|
||||
canSubmit.value = true
|
||||
initData()
|
||||
|
||||
Reference in New Issue
Block a user