diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XKZYXX.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XKZYXX.java
index 0908546b..ce9abefc 100644
--- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XKZYXX.java
+++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/entity/XKZYXX.java
@@ -84,7 +84,7 @@ public class XKZYXX {
/** 主干专业 */
@TableField("主干专业")
- private String zgzy;
+ private Boolean zgzy;
/** 规范名称 */
@TableField("规范名称")
diff --git a/frontend/src/views/subjectMajor/discipline/index.vue b/frontend/src/views/subjectMajor/discipline/index.vue
index 791d7f8b..b9d1e95f 100644
--- a/frontend/src/views/subjectMajor/discipline/index.vue
+++ b/frontend/src/views/subjectMajor/discipline/index.vue
@@ -70,7 +70,9 @@
-
+
+ {{ normBool(row.zgzy) === true ? '是' : '否' }}
+
@@ -217,7 +219,10 @@
-
+
+
+
+
@@ -248,7 +253,7 @@
{{ detailForm.jxgljgbh || '-' }}
{{ detailForm.xylb || '-' }}
{{ detailForm.zdyfl || '-' }}
- {{ detailForm.zgzy || '-' }}
+ {{ normBool(detailForm.zgzy) === null ? '-' : (normBool(detailForm.zgzy) ? '是' : '否') }}
{{ detailForm.ty === 1 ? '是' : '否' }}
@@ -321,7 +326,7 @@ export default {
jxgljgbh: [{ required: true, message: '请输入教学管理机构编号', trigger: 'blur' }],
xylb: [{ required: true, message: '请选择学员类别', trigger: 'change' }],
zdyfl: [{ required: true, message: '请输入自定义分类', trigger: 'blur' }],
- zgzy: [{ required: true, message: '请输入主干专业', trigger: 'blur' }]
+ zgzy: [{ required: true, message: '请选择主干专业', trigger: 'change' }]
},
trainingTypeOptions: [],
trainingLevelOptions: [],
@@ -434,7 +439,7 @@ export default {
f.zdyfl = major.zdyfl || ''
f.gfmc = major.gfmc || ''
const zgzy = this.normBool(major.zgzy)
- f.zgzy = zgzy === null ? '' : (zgzy ? '是' : '否')
+ f.zgzy = zgzy === null ? false : zgzy
f.bz = major.zybz || ''
},
@@ -459,7 +464,7 @@ export default {
xylb: '',
zdyfl: '',
jsonzd: '',
- zgzy: '',
+ zgzy: false,
bz: ''
}
},
@@ -549,7 +554,7 @@ export default {
xylb: data.xylb || '',
zdyfl: data.zdyfl || '',
jsonzd: data.jsonzd || '',
- zgzy: data.zgzy || '',
+ zgzy: data.zgzy,
bz: data.bz || ''
}
}).catch(() => {})