“吴震修改招生就业和学生空床位查询”

web/src/api/xg/xgss/dormBedStudent/dormBedStudent/index.ts

@@ -272,3 +272,16 @@ export const getClassUnoccupiedBedDetails = (classId?: string | number) => {
     params: { classId }
   });
 };
+
+/**
+ * 根据房间ID获取住在当前房间的所有学生信息
+ * 包含学生姓名、学号、性别、学院名称、专业名称、班级名称、床位编码、床位ID
+ * @param roomId 房间ID
+ */
+export const getRoomStudents = (roomId: string | number) => {
+  return request({
+    url: '/dormBedStudent/dormBedStudent/getRoomStudents',
+    method: 'get',
+    params: { roomId }
+  });
+};

web/src/api/zsjy/enrollment/types.ts

@@ -35,9 +35,9 @@ export interface EnrollmentInfoVO {
   phone1: string;
 
   /**
-   * 联系手机号码2
+   * 联系手机号码2（非必填）
    */
-  phone2: string;
+  phone2?: string;
 
   /**
    * 民族

web/src/views/zsjy/enrollment/apply.vue

@@ -358,7 +358,7 @@ const rules = {
     { required: true, message: '联系电话不能为空', trigger: 'blur' },
     { pattern: /^1[3-9]\d{9}$/, message: '手机号码格式不正确', trigger: 'blur' }
   ],
-  phone2: [{ pattern: /^1[3-9]\d{9}$/, message: '手机号码格式不正确', trigger: 'blur' }],
+  phone2: [{ pattern: /^$|^1[3-9]\d{9}$/, message: '手机号码格式不正确', trigger: 'blur' }],
   collegeName: [{ required: true, message: '所属学院不能为空', trigger: 'change' }],
   appliedMajor: [{ required: true, message: '报考专业不能为空', trigger: 'change' }],
   totalScoreFull: [{ type: 'number', min: 100, max: 1000, message: '中考满分应在100-1000之间', trigger: 'blur' }],

web/src/views/zsjy/enrollment/index.vue

@@ -1058,7 +1058,7 @@ const data = reactive<PageData<EnrollmentInfoForm, EnrollmentInfoQuery>>({
       { required: true, message: '联系电话不能为空', trigger: 'blur' },
       { pattern: /^1[3-9]\d{9}$/, message: '手机号码格式不正确', trigger: 'blur' }
     ],
-    phone2: [{ pattern: /^1[3-9]\d{9}$/, message: '手机号码格式不正确', trigger: 'blur' }],
+    phone2: [{ pattern: /^$|^1[3-9]\d{9}$/, message: '手机号码格式不正确', trigger: 'blur' }],
     appliedMajor: [{ required: true, message: '报考专业不能为空', trigger: 'change' }],
     totalScoreFull: [{ type: 'number', min: 100, max: 1000, message: '中考满分应在100-1000之间', trigger: 'blur' }],
     totalScore: [{ type: 'number', min: 0, message: '中考成绩不能小于0', trigger: 'blur' }],