From 62ff4d48abdf7ad3db3260ccbfe987f974020586 Mon Sep 17 00:00:00 2001
From: liweijie <liweijie@fengyingkj.top>
Date: Fri, 18 Sep 2026 20:31:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=A7=91=E4=B8=93=E4=B8=9A=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/roomroot/jwgl/entity/XKZYXX.java |  2 +-
 .../views/subjectMajor/discipline/index.vue   | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

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 0908546bb..ce9abefce 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 791d7f8bb..b9d1e95f9 100644
--- a/frontend/src/views/subjectMajor/discipline/index.vue
+++ b/frontend/src/views/subjectMajor/discipline/index.vue
@@ -70,7 +70,9 @@
         <el-table-column prop="xylb" label="学员类别" width="150" align="center" />
         <el-table-column prop="xnz" label="学年制" width="120" align="center" />
         <el-table-column prop="xqs" label="学期数" width="120" align="center" />
-        <el-table-column prop="zgzy" label="主干专业" align="center" />
+        <el-table-column label="主干专业" align="center">
+          <template slot-scope="{ row }">{{ normBool(row.zgzy) === true ? '是' : '否' }}</template>
+        </el-table-column>
         <el-table-column label="停用" width="100" align="center">
           <template slot-scope="{ row }">
             <el-tag :type="row.ty === 1 ? 'danger' : 'success'" size="mini">
@@ -217,7 +219,10 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="主干专业" prop="zgzy">
-              <el-input v-model="form.zgzy" placeholder="请输入主干专业" />
+              <el-select v-model="form.zgzy" placeholder="请选择主干专业" style="width: 100%">
+                <el-option label="是" :value="true" />
+                <el-option label="否" :value="false" />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -248,7 +253,7 @@
           <el-descriptions-item label="教学管理机构编号">{{ detailForm.jxgljgbh || '-' }}</el-descriptions-item>
           <el-descriptions-item label="学员类别">{{ detailForm.xylb || '-' }}</el-descriptions-item>
           <el-descriptions-item label="自定义分类">{{ detailForm.zdyfl || '-' }}</el-descriptions-item>
-          <el-descriptions-item label="主干专业">{{ detailForm.zgzy || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="主干专业">{{ normBool(detailForm.zgzy) === null ? '-' : (normBool(detailForm.zgzy) ? '是' : '否') }}</el-descriptions-item>
           <el-descriptions-item label="停用">
             <el-tag :type="detailForm.ty === 1 ? 'danger' : 'success'" size="mini">
               {{ 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(() => {})