a

src/views/recruit/recruitstudentsignup/detaiform.vue

@@ -14,7 +14,7 @@
         <el-row :gutter="20" class="form-row">
           <el-col :span="24">
             <el-form-item label="招生计划" prop="groupId">
-              <el-select v-model="dataForm.groupId" filterable :disabled="!dataForm.id ? false : true"
+              <el-select v-model="dataForm.groupId" filterable :disabled="dataForm.id"
                          placeholder="请选择招生计划" class="w-full">
                 <el-option
                   v-for="item in planList"
@@ -50,7 +50,8 @@
               v-model="dataForm.idNumber" 
               placeholder="身份证号"
               maxlength="20"
-              v-input-filter="'idcard'">
+              v-input-filter="'idcard'"
+              :disabled="!isEdit">
             </el-input>
           </el-form-item>
         </el-col>
@@ -644,8 +645,8 @@
         <el-button @click="visible = false">取消</el-button>
         <el-button type="primary" @click="dataFormSubmit('0')" v-auth="'recruit_recruitstudentsignup_add'"  v-if="canSubmit&&!dataForm.id">保存并送审</el-button>
         <el-button type="primary" @click="dataFormSubmit('0')" v-auth="'recruit_recruitstudentsignup_edit'"  v-if="canSubmit&&dataForm.id">保存</el-button>
-        <el-button type="primary" @click="dataFormSubmit('20')" v-auth="'signup_info_exam'" v-if="canSubmit&&dataForm.id">确认录取</el-button>
-        <el-button type="danger" plain @click="dataFormSubmit('-20')" v-auth="'signup_info_exam'" v-if="canSubmit&&dataForm.id">驳回录取</el-button>
+        <el-button type="success" icon="CircleCheck" @click="dataFormSubmit('20')" v-auth="'signup_info_exam'" v-if="canSubmit&&dataForm.id">确认录取</el-button>
+        <el-button type="danger" icon="CircleClose" @click="dataFormSubmit('-20')" v-auth="'signup_info_exam'" v-if="canSubmit&&dataForm.id">驳回录取</el-button>
       </div>
     </template>
 
@@ -666,7 +667,7 @@ import { areaList, areaSonList } from "/@/api/recruit/recruitstudentschool"
 import { list as scoreList } from "/@/api/recruit/recruitstudentplancorrectscoreconfig"
 import { queryAllTeacher } from "/@/api/professional/professionaluser/teacherbase"
 import { getNationalList } from "/@/api/basic/basicnation"
-import { verifyIdCardAll, verifyAdmissionNumber, verifyPhone } from '/@/utils/toolsValidate'
+import { verifyAdmissionNumber, verifyPhone } from '/@/utils/toolsValidate'
 import { AUDIT_STATUS_LIST, getStatusConfig } from '/@/config/global'
 
 const message = useMessage()
@@ -838,17 +839,7 @@ const dataRule = reactive({
           {required: true, message: '证件类型不能为空', trigger: 'change'}
         ],
         idNumber: [
-          {required: true, message: '身份证不能为空', trigger: 'change'},
-          {
-            validator: (rule: any, value: any, callback: any) => {
-              if (value && !verifyIdCardAll(value)) {
-                callback(new Error('请输入正确的身份证号码'))
-              } else {
-                callback()
-              }
-            },
-            trigger: 'blur'
-          }
+          {required: true, message: '身份证不能为空', trigger: 'change'}
         ],
         examRegistrationNumbers: [
           {required: true, message: '准考证号不能为空', trigger: 'change'},
@@ -863,6 +854,10 @@ const dataRule = reactive({
             trigger: 'blur'
           }
         ],
+        score: [] as any[],
+        fullScore: [] as any[],
+        jsOtherCity: [] as any[],
+        otherProvince: [] as any[],
         residenceProvince: [
           {required: true, message: '户口所在地不能为空', trigger: 'change'}
         ],
@@ -915,7 +910,7 @@ const dataRule = reactive({
 })
 
 // 初始化
-const init = (id: string | null, typeParam: number) => {
+const init = (id: string | null, typeParam: number, groupId?: string) => {
   dataForm.id = id || null
   type.value = typeParam
   isEdit.value = typeParam == 1 ? true : false
@@ -925,6 +920,10 @@ const init = (id: string | null, typeParam: number) => {
   isShow.value = true
   nextTick(() => {
     dataFormRef.value?.resetFields()
+    // 新增时，如果传入了 groupId，设置到表单中
+    if (!id && groupId) {
+      dataForm.groupId = groupId
+    }
     // 初始化地区数据
     areaProvinceList.value = []
     areaCityList.value = []
@@ -1340,18 +1339,8 @@ const dataFormSubmit = (state: string) => {
     submitTitle = "确认保存并提交该学生的报名信息么？"
   } else {
     // 编辑模式
-    if(state){
-      if (state == "-20") {
-        submitTitle = "确认驳回该学生的报名申请么？"
-      } else {
-        if (!dataForm.confirmedMajor) {
-          ElNotification.error({
-            title: '错误',
-            message: '请选择录取专业'
-          })
-          return
-        }
-      }
+    if (state == "-20") {
+      submitTitle = "确认驳回该学生的报名申请么？"
     }
   }