解决所有bug 优化table内容

src/views/basic/basicclass/form.vue

@@ -74,8 +74,8 @@
           <el-form-item label="班号" prop="classNo">
             <el-input 
               v-model="form.classNo" 
-              placeholder="请输入班号" 
-              clearable />
+            placeholder="自动填充班号" 
+            :disabled="true" />
           </el-form-item>
         </el-col>
 
@@ -92,8 +92,8 @@
           <el-form-item label="班级规范名称" prop="classProName">
             <el-input 
               v-model="form.classProName" 
-              placeholder="请输入班级规范名称" 
-              clearable />
+            placeholder="自动拼接班级规范名称" 
+            :disabled="true" />
           </el-form-item>
         </el-col>
 
@@ -101,8 +101,8 @@
           <el-form-item label="入学年份" prop="grade">
             <el-input 
               v-model="form.grade" 
-              placeholder="请输入入学年份" 
-              clearable />
+            placeholder="自动填充入学年份" 
+            :disabled="true" />
           </el-form-item>
         </el-col>
 
@@ -159,9 +159,9 @@
 </template>
 
 <script setup lang="ts" name="BasicClassDialog">
-import { ref, reactive, nextTick, onMounted } from 'vue'
+import { ref, reactive, nextTick, onMounted, watch, computed } from 'vue'
 import { useMessage } from "/@/hooks/message";
-import { getObj, addObj, putObj, getMajorNameList, getDeptList } from '/@/api/basic/basicclass'
+import { getDetail, addObj, putObj, getMajorNameList, getDeptList } from '/@/api/basic/basicclass'
 import { getTeacherBaseList } from '/@/api/professional/professionaluser/teacherbase'
 
 const emit = defineEmits(['refresh']);
@@ -173,6 +173,8 @@ const loading = ref(false)
 const majorList = ref<any[]>([])
 const deptList = ref<any[]>([])
 const teacherList = ref<any[]>([])
+const yearLast = ref('') // 年份后两位
+const majorName = ref('') // 专业名称
 
 // 提交表单数据
 const form = reactive({
@@ -243,6 +245,10 @@ const openDialog = (id?: string) => {
     preStuNum: 0,
     remark: ''
   })
+  
+  // 重置辅助变量
+  yearLast.value = ''
+  majorName.value = ''
 
   // 清除表单验证状态，不触发验证
   nextTick(() => {
@@ -269,11 +275,17 @@ const onSubmit = async () => {
 
   try {
     loading.value = true;
+    // 构建提交数据，将班主任工号放到 teacherNo 字段
+    const submitData = {
+      ...form,
+      teacherNo: form.teacherNos // 将 teacherNos 的值赋值给 teacherNo
+    };
+    
     if (form.id) {
-      await putObj(form);
+      await putObj(submitData);
       useMessage().success('编辑成功');
     } else {
-      await addObj(form);
+      await addObj(submitData);
       useMessage().success('新增成功');
     }
     visible.value = false;
@@ -286,9 +298,10 @@ const onSubmit = async () => {
 };
 
 // 获取详情
-const getBasicClassData = (id: string) => {
+const getBasicClassData = async (id: string) => {
   loading.value = true
-  getObj(id).then((res: any) => {
+  try {
+    const res = await getDetail(id)
     if (res.data) {
       Object.assign(form, {
         id: res.data.id || '',
@@ -304,17 +317,29 @@ const getBasicClassData = (id: string) => {
         preStuNum: res.data.preStuNum || 0,
         remark: res.data.remark || ''
       })
+      
+      // 设置辅助变量（编辑时不自动填充，保持原有数据）
+      if (res.data.enterDate && res.data.enterDate.length >= 4) {
+        yearLast.value = res.data.enterDate.substring(2, 4)
+      }
+      // 确保专业列表已加载后再设置专业名称
+      if (res.data.majorCode && majorList.value.length > 0) {
+        const major = majorList.value.find(item => item.majorCode === res.data.majorCode)
+        if (major) {
+          majorName.value = major.majorName || ''
+        }
+      }
     }
-  }).catch((err: any) => {
+  } catch (err: any) {
     console.error('获取详情失败', err)
     useMessage().error('获取详情失败')
-  }).finally(() => {
+  } finally {
     loading.value = false
     // 数据加载完成后，清除验证状态，避免触发验证
     nextTick(() => {
       dataFormRef.value?.clearValidate();
     });
-  })
+  }
 }
 
 // 获取专业列表
@@ -356,6 +381,59 @@ const getTeacherListData = async () => {
   }
 }
 
+// 拼接班级规范名称
+const montageClassProName = () => {
+  // 只在新增模式下自动填充，编辑模式下不覆盖已有数据
+  if (!form.id && yearLast.value && majorName.value) {
+    form.classProName = yearLast.value + majorName.value
+    if (form.classNo) {
+      form.classProName = yearLast.value + majorName.value + '(' + form.classNo + ')'
+    }
+    console.log('classProName', form.classProName)
+  }
+}
+
+// 监听入学日期,取年份后两位
+watch(() => form.enterDate, (newVal) => {
+  if (newVal && newVal.length >= 4) {
+    console.log('newdate:', newVal)
+    yearLast.value = newVal.substring(2, 4)
+    // 只在新增模式下自动填充入学年份
+    if (!form.id) {
+      form.grade = newVal.substring(0, 4)
+    }
+    montageClassProName()
+  }
+})
+
+// 监听班级代码,取后四位为班号
+watch(() => form.classCode, (newVal) => {
+  if (newVal) {
+    const length = newVal.length
+    if (length > 4) {
+      // 只在新增模式下自动填充班号，编辑模式下如果班号为空才填充
+      if (!form.id || !form.classNo) {
+        form.classNo = newVal.substring(length - 4, length)
+        montageClassProName()
+      }
+    }
+  }
+})
+
+// 监听专业代码变化，获取专业名称
+watch(() => form.majorCode, (newVal) => {
+  if (newVal) {
+    const major = majorList.value.find(item => item.majorCode === newVal)
+    if (major) {
+      majorName.value = major.majorName || ''
+      montageClassProName()
+    }
+  } else {
+    majorName.value = ''
+    montageClassProName()
+  }
+})
+
 // 初始化
 onMounted(() => {
   getMajorListData()