From 8fa9be8f9d3226b33441b3f5e11c9a7f232dd874 Mon Sep 17 00:00:00 2001
From: zlwu <704541015@qq.com>
Date: Wed, 30 Jul 2025 16:18:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xg/xgss/sslxx/dormBuilding/index.vue      |   4 +-
 .../xg/xsjcxx/stuMsgAudit/stuMsgDialog.vue    |  17 +-
 .../stuMsgSupply/stuMsgDetailDialog.vue       | 160 ++++++++++++-----
 .../xg/xsjcxx/stuMsgSupply/stuMsgDialog.vue   | 165 ++++++++++++------
 4 files changed, 246 insertions(+), 100 deletions(-)

diff --git a/web/src/views/xg/xgss/sslxx/dormBuilding/index.vue b/web/src/views/xg/xgss/sslxx/dormBuilding/index.vue
index 509ab8fe..6ab770fc 100644
--- a/web/src/views/xg/xgss/sslxx/dormBuilding/index.vue
+++ b/web/src/views/xg/xgss/sslxx/dormBuilding/index.vue
@@ -72,9 +72,9 @@
               >删除</el-button
             >
           </el-col>
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['sslxx:dormBuilding:export']">导出</el-button>
-          </el-col>
+          </el-col> -->
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
diff --git a/web/src/views/xg/xsjcxx/stuMsgAudit/stuMsgDialog.vue b/web/src/views/xg/xsjcxx/stuMsgAudit/stuMsgDialog.vue
index 1946ebd5..f07a3345 100644
--- a/web/src/views/xg/xsjcxx/stuMsgAudit/stuMsgDialog.vue
+++ b/web/src/views/xg/xsjcxx/stuMsgAudit/stuMsgDialog.vue
@@ -135,7 +135,7 @@
               </el-row>
             </el-col>
             <el-col :span="8">
-              <el-form-item prop="photo_url">
+              <el-form-item prop="photo_url" class="photo-form-item">
                 <template #label>
                   <div class="photo-label-container">
                     <span>学生照片</span>
@@ -2735,6 +2735,19 @@ const handleClose = () => {
   gap: 8px;
 }
 
+/* 学生照片表单项样式 - 覆盖默认的标签样式 */
+.photo-form-item :deep(.el-form-item__label) {
+  white-space: nowrap !important;
+  overflow: visible !important;
+  text-overflow: unset !important;
+  display: flex !important;
+  align-items: center !important;
+  gap: 4px !important;
+  min-width: auto !important;
+  max-width: none !important;
+  height: 130px !important; /* 与照片容器高度一致 */
+}
+
 /* 照片帮助图标样式 */
 .photo-help-icon {
   color: #8c939d;
@@ -2777,7 +2790,7 @@ const handleClose = () => {
   align-items: center;
   gap: 4px;
   min-width: 0;
-  max-width: 140px; /* 限制最大宽度 */
+  max-width: 140px;
 }
 
 /* 确保标签内容不换行 */
diff --git a/web/src/views/xg/xsjcxx/stuMsgSupply/stuMsgDetailDialog.vue b/web/src/views/xg/xsjcxx/stuMsgSupply/stuMsgDetailDialog.vue
index 64b9b854..c7a70321 100644
--- a/web/src/views/xg/xsjcxx/stuMsgSupply/stuMsgDetailDialog.vue
+++ b/web/src/views/xg/xsjcxx/stuMsgSupply/stuMsgDetailDialog.vue
@@ -199,8 +199,9 @@
             <el-col :span="8">
               <el-form-item label="户口类型" prop="householdRegisterType">
                 <el-select v-model="form.householdRegisterType" placeholder="请选择户口类型" disabled>
-                  <el-option label="农业" value="农业" />
-                  <el-option label="非农业" value="非农业" />
+                  <!-- <el-option label="农业" value="农业" />
+                  <el-option label="非农业" value="非农业" /> -->
+                  <el-option v-for="dict in house_hold_register_type" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -251,10 +252,11 @@
             <el-col :span="8">
               <el-form-item label="婚姻状况" prop="maritalStatus">
                 <el-select v-model="form.maritalStatus" placeholder="请选择婚姻状况" disabled>
-                  <el-option label="未婚" value="1" />
+                  <!-- <el-option label="未婚" value="1" />
                   <el-option label="已婚" value="2" />
                   <el-option label="离异" value="3" />
-                  <el-option label="丧偶" value="4" />
+                  <el-option label="丧偶" value="4" /> -->
+                  <el-option v-for="dict in marital_status" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -280,24 +282,27 @@
             <el-col :span="8">
               <el-form-item label="是否贫困生" prop="isPoorStudent">
                 <el-select v-model="form.isPoorStudent" placeholder="请选择" disabled>
-                  <el-option label="否" :value="0" />
-                  <el-option label="是" :value="1" />
+                  <!-- <el-option label="否" :value="0" />
+                  <el-option label="是" :value="1" /> -->
+                  <el-option v-for="dict in sys_yesno" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="是否少数民族" prop="isMinority">
                 <el-select v-model="form.isMinority" placeholder="请选择" disabled>
-                  <el-option label="否" :value="0" />
-                  <el-option label="是" :value="1" />
+                  <!-- <el-option label="否" :value="0" />
+                  <el-option label="是" :value="1" /> -->
+                  <el-option v-for="dict in sys_yesno" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="是否孤儿" prop="isOrphan">
                 <el-select v-model="form.isOrphan" placeholder="请选择" disabled>
-                  <el-option label="否" :value="0" />
-                  <el-option label="是" :value="1" />
+                  <!-- <el-option label="否" :value="0" />
+                  <el-option label="是" :value="1" /> -->
+                  <el-option v-for="dict in sys_yesno" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -306,8 +311,9 @@
             <el-col :span="8">
               <el-form-item label="是否留守儿童" prop="isLeftBehindChild">
                 <el-select v-model="form.isLeftBehindChild" placeholder="请选择" disabled>
-                  <el-option label="否" :value="0" />
-                  <el-option label="是" :value="1" />
+                  <!-- <el-option label="否" :value="0" />
+                  <el-option label="是" :value="1" /> -->
+                  <el-option v-for="dict in sys_yesno" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -322,8 +328,9 @@
             <el-col :span="8">
               <el-form-item label="是否低保" prop="isLowIncome">
                 <el-select v-model="form.isLowIncome" placeholder="请选择" disabled>
-                  <el-option label="否" :value="0" />
-                  <el-option label="是" :value="1" />
+                  <!-- <el-option label="否" :value="0" />
+                  <el-option label="是" :value="1" /> -->
+                  <el-option v-for="dict in sys_yesno" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -332,8 +339,9 @@
             <el-col :span="8">
               <el-form-item label="是否有助学贷款" prop="hasLoan">
                 <el-select v-model="form.hasLoan" placeholder="请选择" disabled>
-                  <el-option label="否" :value="0" />
-                  <el-option label="是" :value="1" />
+                  <!-- <el-option label="否" :value="0" />
+                  <el-option label="是" :value="1" /> -->
+                  <el-option v-for="dict in sys_yesno" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -449,10 +457,11 @@
             <el-col :span="8">
               <el-form-item label="家庭经济状况" prop="familyEconomicStatus">
                 <el-select v-model="form.familyEconomicStatus" placeholder="请选择家庭经济状况" disabled>
-                  <el-option label="富裕" value="富裕" />
+                  <!-- <el-option label="富裕" value="富裕" />
                   <el-option label="一般" value="一般" />
                   <el-option label="困难" value="困难" />
-                  <el-option label="特困" value="特困" />
+                  <el-option label="特困" value="特困" /> -->
+                  <el-option v-for="dict in xg_family_economic" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -482,11 +491,12 @@
             <el-col :span="8">
               <el-form-item label="血型" prop="bloodType">
                 <el-select v-model="form.bloodType" placeholder="请选择血型" disabled>
-                  <el-option label="A型" value="A" />
+                  <!-- <el-option label="A型" value="A" />
                   <el-option label="B型" value="B" />
                   <el-option label="AB型" value="AB" />
                   <el-option label="O型" value="O" />
-                  <el-option label="未知" value="未知" />
+                  <el-option label="未知" value="未知" /> -->
+                  <el-option v-for="dict in xg_blood_type" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -500,18 +510,20 @@
             <el-col :span="8">
               <el-form-item label="是否残疾" prop="isDisabled">
                 <el-select v-model="form.isDisabled" placeholder="请选择" disabled>
-                  <el-option label="否" :value="0" />
-                  <el-option label="是" :value="1" />
+                  <!-- <el-option label="否" :value="0" />
+                  <el-option label="是" :value="1" /> -->
+                  <el-option v-for="dict in sys_yesno" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="残疾类型" prop="disabilityType">
                 <el-select v-model="form.disabilityType" placeholder="请选择残疾类型" disabled>
-                  <el-option label="视力残疾" value="1" />
+                  <!-- <el-option label="视力残疾" value="1" />
                   <el-option label="听力残疾" value="2" />
                   <el-option label="智力残疾" value="3" />
-                  <el-option label="其他残疾" value="9" />
+                  <el-option label="其他残疾" value="9" /> -->
+                  <el-option v-for="dict in disability_type" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -574,11 +586,12 @@
             <el-col :span="8">
               <el-form-item label="学历层次" prop="academicLevel">
                 <el-select v-model="form.academicLevel" placeholder="请选择学历层次" style="width: 100%" disabled>
-                  <el-option label="中级工" value="1" />
+                  <!-- <el-option label="中级工" value="1" />
                   <el-option label="高级工" value="2" />
                   <el-option label="预备技师" value="3" />
                   <el-option label="技师" value="4" />
-                  <el-option label="中高职一体" value="5" />
+                  <el-option label="中高职一体" value="5" /> -->
+                  <el-option v-for="dict in zsjy_education_level" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -609,19 +622,21 @@
             <el-col :span="8">
               <el-form-item label="培养方式" prop="trainingType">
                 <el-select v-model="form.trainingType" placeholder="请选择培养方式" disabled>
-                  <el-option label="全日制" value="全日制" />
+                  <!-- <el-option label="全日制" value="全日制" />
                   <el-option label="在职" value="在职" />
                   <el-option label="函授" value="函授" />
-                  <el-option label="夜大" value="夜大" />
+                  <el-option label="夜大" value="夜大" /> -->
+                  <el-option v-for="dict in xg_training_mode" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="录取类别" prop="admissionCategory">
                 <el-select v-model="form.admissionCategory" placeholder="请选择录取类别" disabled>
-                  <el-option label="统招" value="统招" />
+                  <!-- <el-option label="统招" value="统招" />
                   <el-option label="自主招生" value="自主招生" />
-                  <el-option label="专项计划" value="专项计划" />
+                  <el-option label="专项计划" value="专项计划" /> -->
+                  <el-option v-for="dict in admission_category" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -630,19 +645,21 @@
             <el-col :span="8">
               <el-form-item label="学籍状态" prop="studentStatus">
                 <el-select v-model="form.studentStatus" placeholder="请选择学籍状态" disabled>
-                  <el-option label="在籍" value="1" />
+                  <!-- <el-option label="在籍" value="1" />
                   <el-option label="休学" value="2" />
                   <el-option label="复学" value="3" />
                   <el-option label="退学" value="4" />
-                  <el-option label="毕业" value="5" />
+                  <el-option label="毕业" value="5" /> -->
+                  <el-option v-for="dict in student_status" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="是否住校" prop="isBoarder">
                 <el-select disabled v-model="form.isBoarder" placeholder="请选择">
-                  <el-option label="否" :value="0" />
-                  <el-option label="是" :value="1" />
+                  <!-- <el-option label="否" :value="0" />
+                  <el-option label="是" :value="1" /> -->
+                  <el-option v-for="dict in sys_yesno" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -726,19 +743,47 @@ import request from '@/utils/request';
 const { proxy } = getCurrentInstance() as any;
 
 // 字典数据
-const { wenhuachengdu, xg_political_status, sys_user_sex, xg_nation, sys_question_category, sys_item_enable, sys_item_required, sys_item_delete } =
-  toRefs<any>(
-    proxy?.useDict(
-      'wenhuachengdu',
-      'xg_political_status',
-      'sys_user_sex',
-      'xg_nation',
-      'sys_question_category',
-      'sys_item_enable',
-      'sys_item_required',
-      'sys_item_delete'
-    )
-  );
+const {
+  house_hold_register_type,
+  marital_status,
+  sys_yesno,
+  xg_family_economic,
+  xg_blood_type,
+  disability_type,
+  zsjy_education_level,
+  xg_training_mode,
+  admission_category,
+  student_status,
+  wenhuachengdu,
+  xg_political_status,
+  sys_user_sex,
+  xg_nation,
+  sys_question_category,
+  sys_item_enable,
+  sys_item_required,
+  sys_item_delete
+} = toRefs<any>(
+  proxy?.useDict(
+    'house_hold_register_type',
+    'marital_status',
+    'sys_yesno',
+    'xg_family_economic',
+    'xg_blood_type',
+    'disability_type',
+    'zsjy_education_level',
+    'xg_training_mode',
+    'admission_category',
+    'student_status',
+    'wenhuachengdu',
+    'xg_political_status',
+    'sys_user_sex',
+    'xg_nation',
+    'sys_question_category',
+    'sys_item_enable',
+    'sys_item_required',
+    'sys_item_delete'
+  )
+);
 // Props 定义
 interface Props {
   visible: boolean;
@@ -901,9 +946,30 @@ const getUserHistoryData = async (batchId: number) => {
     if (res && res.code === 200 && res.data) {
       console.log('获取到历史数据:', res.data);
 
+      // // 将历史数据填充到表单中
+      // const historyData = res.data;
       // 将历史数据填充到表单中
       const historyData = res.data;
 
+      // 将是否字段的数值转换为字符串
+      const booleanFields = [
+        'isPoorStudent',
+        'isMinority',
+        'isOrphan',
+        'isLeftBehindChild',
+        'isSingleChild',
+        'isLowIncome',
+        'hasLoan',
+        'isDisabled',
+        'isBoarder'
+      ];
+
+      booleanFields.forEach((field) => {
+        if (historyData[field] !== undefined && historyData[field] !== null) {
+          historyData[field] = String(historyData[field]);
+        }
+      });
+
       // 遍历历史数据，将非空字段赋值给表单
       Object.keys(historyData).forEach((key) => {
         if (historyData[key] !== null && historyData[key] !== undefined && historyData[key] !== '') {
diff --git a/web/src/views/xg/xsjcxx/stuMsgSupply/stuMsgDialog.vue b/web/src/views/xg/xsjcxx/stuMsgSupply/stuMsgDialog.vue
index 0c4699cb..6b2da8ae 100644
--- a/web/src/views/xg/xsjcxx/stuMsgSupply/stuMsgDialog.vue
+++ b/web/src/views/xg/xsjcxx/stuMsgSupply/stuMsgDialog.vue
@@ -204,8 +204,9 @@
             <el-col :span="8">
               <el-form-item label="户口类型" prop="householdRegisterType">
                 <el-select v-model="form.householdRegisterType" placeholder="请选择户口类型">
-                  <el-option label="农业" value="农业" />
-                  <el-option label="非农业" value="非农业" />
+                  <!-- <el-option label="农业" value="农业" />
+                  <el-option label="非农业" value="非农业" /> -->
+                  <el-option v-for="dict in house_hold_register_type" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -255,10 +256,11 @@
             <el-col :span="8">
               <el-form-item label="婚姻状况" prop="maritalStatus">
                 <el-select v-model="form.maritalStatus" placeholder="请选择婚姻状况">
-                  <el-option label="未婚" value="1" />
+                  <!-- <el-option label="未婚" value="1" />
                   <el-option label="已婚" value="2" />
                   <el-option label="离异" value="3" />
-                  <el-option label="丧偶" value="4" />
+                  <el-option label="丧偶" value="4" /> -->
+                  <el-option v-for="dict in marital_status" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -284,24 +286,27 @@
             <el-col :span="8">
               <el-form-item label="是否贫困生" prop="isPoorStudent">
                 <el-select v-model="form.isPoorStudent" placeholder="请选择">
-                  <el-option label="否" :value="0" />
-                  <el-option label="是" :value="1" />
+                  <!-- <el-option label="否" :value="0" />
+                  <el-option label="是" :value="1" /> -->
+                  <el-option v-for="dict in sys_yesno" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="是否少数民族" prop="isMinority">
                 <el-select v-model="form.isMinority" placeholder="请选择">
-                  <el-option label="否" :value="0" />
-                  <el-option label="是" :value="1" />
+                  <!-- <el-option label="否" :value="0" />
+                  <el-option label="是" :value="1" /> -->
+                  <el-option v-for="dict in sys_yesno" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="是否孤儿" prop="isOrphan">
                 <el-select v-model="form.isOrphan" placeholder="请选择">
-                  <el-option label="否" :value="0" />
-                  <el-option label="是" :value="1" />
+                  <!-- <el-option label="否" :value="0" />
+                  <el-option label="是" :value="1" /> -->
+                  <el-option v-for="dict in sys_yesno" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -310,24 +315,27 @@
             <el-col :span="8">
               <el-form-item label="是否留守儿童" prop="isLeftBehindChild">
                 <el-select v-model="form.isLeftBehindChild" placeholder="请选择">
-                  <el-option label="否" :value="0" />
-                  <el-option label="是" :value="1" />
+                  <!-- <el-option label="否" :value="0" />
+                  <el-option label="是" :value="1" /> -->
+                  <el-option v-for="dict in sys_yesno" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="是否独生子女" prop="isSingleChild">
                 <el-select v-model="form.isSingleChild" placeholder="请选择">
-                  <el-option label="否" :value="0" />
-                  <el-option label="是" :value="1" />
+                  <!-- <el-option label="否" :value="0" />
+                  <el-option label="是" :value="1" /> -->
+                  <el-option v-for="dict in sys_yesno" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="是否低保" prop="isLowIncome">
                 <el-select v-model="form.isLowIncome" placeholder="请选择">
-                  <el-option label="否" :value="0" />
-                  <el-option label="是" :value="1" />
+                  <!-- <el-option label="否" :value="0" />
+                  <el-option label="是" :value="1" /> -->
+                  <el-option v-for="dict in sys_yesno" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -336,8 +344,9 @@
             <el-col :span="8">
               <el-form-item label="是否有助学贷款" prop="hasLoan">
                 <el-select v-model="form.hasLoan" placeholder="请选择">
-                  <el-option label="否" :value="0" />
-                  <el-option label="是" :value="1" />
+                  <!-- <el-option label="否" :value="0" />
+                  <el-option label="是" :value="1" /> -->
+                  <el-option v-for="dict in sys_yesno" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -453,10 +462,11 @@
             <el-col :span="8">
               <el-form-item label="家庭经济状况" prop="familyEconomicStatus">
                 <el-select v-model="form.familyEconomicStatus" placeholder="请选择家庭经济状况">
-                  <el-option label="富裕" value="富裕" />
+                  <!-- <el-option label="富裕" value="富裕" />
                   <el-option label="一般" value="一般" />
                   <el-option label="困难" value="困难" />
-                  <el-option label="特困" value="特困" />
+                  <el-option label="特困" value="特困" /> -->
+                  <el-option v-for="dict in xg_family_economic" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -486,11 +496,12 @@
             <el-col :span="8">
               <el-form-item label="血型" prop="bloodType">
                 <el-select v-model="form.bloodType" placeholder="请选择血型">
-                  <el-option label="A型" value="A" />
+                  <!-- <el-option label="A型" value="A" />
                   <el-option label="B型" value="B" />
                   <el-option label="AB型" value="AB" />
                   <el-option label="O型" value="O" />
-                  <el-option label="未知" value="未知" />
+                  <el-option label="未知" value="未知" /> -->
+                  <el-option v-for="dict in xg_blood_type" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -504,18 +515,20 @@
             <el-col :span="8">
               <el-form-item label="是否残疾" prop="isDisabled">
                 <el-select v-model="form.isDisabled" placeholder="请选择">
-                  <el-option label="否" :value="0" />
-                  <el-option label="是" :value="1" />
+                  <!-- <el-option label="否" :value="0" />
+                  <el-option label="是" :value="1" /> -->
+                  <el-option v-for="dict in sys_yesno" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="残疾类型" prop="disabilityType">
                 <el-select v-model="form.disabilityType" placeholder="请选择残疾类型">
-                  <el-option label="视力残疾" value="1" />
+                  <!-- <el-option label="视力残疾" value="1" />
                   <el-option label="听力残疾" value="2" />
                   <el-option label="智力残疾" value="3" />
-                  <el-option label="其他残疾" value="9" />
+                  <el-option label="其他残疾" value="9" /> -->
+                  <el-option v-for="dict in disability_type" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -578,11 +591,12 @@
             <el-col :span="8">
               <el-form-item label="学历层次" prop="academicLevel">
                 <el-select v-model="form.academicLevel" placeholder="请选择学历层次" style="width: 100%" disabled>
-                  <el-option label="中级工" value="1" />
+                  <!-- <el-option label="中级工" value="1" />
                   <el-option label="高级工" value="2" />
                   <el-option label="预备技师" value="3" />
                   <el-option label="技师" value="4" />
-                  <el-option label="中高职一体" value="5" />
+                  <el-option label="中高职一体" value="5" /> -->
+                  <el-option v-for="dict in zsjy_education_level" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -613,19 +627,21 @@
             <el-col :span="8">
               <el-form-item label="培养方式" prop="trainingType">
                 <el-select v-model="form.trainingType" placeholder="请选择培养方式">
-                  <el-option label="全日制" value="全日制" />
+                  <!-- <el-option label="全日制" value="全日制" />
                   <el-option label="在职" value="在职" />
                   <el-option label="函授" value="函授" />
-                  <el-option label="夜大" value="夜大" />
+                  <el-option label="夜大" value="夜大" /> -->
+                  <el-option v-for="dict in xg_training_mode" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="录取类别" prop="admissionCategory">
                 <el-select v-model="form.admissionCategory" placeholder="请选择录取类别">
-                  <el-option label="统招" value="统招" />
+                  <!-- <el-option label="统招" value="统招" />
                   <el-option label="自主招生" value="自主招生" />
-                  <el-option label="专项计划" value="专项计划" />
+                  <el-option label="专项计划" value="专项计划" /> -->
+                  <el-option v-for="dict in admission_category" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -634,19 +650,21 @@
             <el-col :span="8">
               <el-form-item label="学籍状态" prop="studentStatus">
                 <el-select v-model="form.studentStatus" placeholder="请选择学籍状态">
-                  <el-option label="在籍" value="1" />
+                  <!-- <el-option label="在籍" value="1" />
                   <el-option label="休学" value="2" />
                   <el-option label="复学" value="3" />
                   <el-option label="退学" value="4" />
-                  <el-option label="毕业" value="5" />
+                  <el-option label="毕业" value="5" /> -->
+                  <el-option v-for="dict in student_status" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="是否住校" prop="isBoarder">
                 <el-select disabled v-model="form.isBoarder" placeholder="请选择">
-                  <el-option label="否" :value="0" />
-                  <el-option label="是" :value="1" />
+                  <!-- <el-option label="否" :value="0" />
+                  <el-option label="是" :value="1" /> -->
+                  <el-option v-for="dict in sys_yesno" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -730,19 +748,47 @@ import request from '@/utils/request';
 const { proxy } = getCurrentInstance() as any;
 
 // 字典数据
-const { wenhuachengdu, xg_political_status, sys_user_sex, xg_nation, sys_question_category, sys_item_enable, sys_item_required, sys_item_delete } =
-  toRefs<any>(
-    proxy?.useDict(
-      'wenhuachengdu',
-      'xg_political_status',
-      'sys_user_sex',
-      'xg_nation',
-      'sys_question_category',
-      'sys_item_enable',
-      'sys_item_required',
-      'sys_item_delete'
-    )
-  );
+const {
+  house_hold_register_type,
+  marital_status,
+  sys_yesno,
+  xg_family_economic,
+  xg_blood_type,
+  disability_type,
+  zsjy_education_level,
+  xg_training_mode,
+  admission_category,
+  student_status,
+  wenhuachengdu,
+  xg_political_status,
+  sys_user_sex,
+  xg_nation,
+  sys_question_category,
+  sys_item_enable,
+  sys_item_required,
+  sys_item_delete
+} = toRefs<any>(
+  proxy?.useDict(
+    'house_hold_register_type',
+    'marital_status',
+    'sys_yesno',
+    'xg_family_economic',
+    'xg_blood_type',
+    'disability_type',
+    'zsjy_education_level',
+    'xg_training_mode',
+    'admission_category',
+    'student_status',
+    'wenhuachengdu',
+    'xg_political_status',
+    'sys_user_sex',
+    'xg_nation',
+    'sys_question_category',
+    'sys_item_enable',
+    'sys_item_required',
+    'sys_item_delete'
+  )
+);
 // Props 定义
 interface Props {
   visible: boolean;
@@ -905,9 +951,30 @@ const getUserHistoryData = async (batchId: number) => {
     if (res && res.code === 200 && res.data) {
       console.log('获取到历史数据:', res.data);
 
+      // 将历史数据填充到表单中
+      // const historyData = res.data;
       // 将历史数据填充到表单中
       const historyData = res.data;
 
+      // 将是否字段的数值转换为字符串
+      const booleanFields = [
+        'isPoorStudent',
+        'isMinority',
+        'isOrphan',
+        'isLeftBehindChild',
+        'isSingleChild',
+        'isLowIncome',
+        'hasLoan',
+        'isDisabled',
+        'isBoarder'
+      ];
+
+      booleanFields.forEach((field) => {
+        if (historyData[field] !== undefined && historyData[field] !== null) {
+          historyData[field] = String(historyData[field]);
+        }
+      });
+
       // 遍历历史数据，将非空字段赋值给表单
       Object.keys(historyData).forEach((key) => {
         if (historyData[key] !== null && historyData[key] !== undefined && historyData[key] !== '') {