Merge branch 'master' of http://49.232.152.146:6688/qangqi/dd_school

ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/performance/index.vue

@@ -99,26 +99,24 @@
       <el-form :model="achievementForm" :rules="achievementRules" ref="achievementForm" label-width="80px"
       <el-form :model="achievementForm" :rules="achievementRules" ref="achievementForm" label-width="80px"
         label-position="left">
         label-position="left">
         <el-row :gutter="30">
         <el-row :gutter="30">
-
           <el-col :span="12">
           <el-col :span="12">
-            <el-form-item label="学生姓名" prop="studentName">
-              <el-input v-model="achievementForm.studentName" placeholder="请输入学生姓名"
-                :disabled="nowType == 1 ? true : false"></el-input>
+            <el-form-item label="学号" prop="studentNumber">
+              <el-input v-model="achievementForm.studentNumber" placeholder="请输入学号"
+                :disabled="nowType == 1 ? true : false" @change="searchStudentInfo"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
-            <el-form-item label="班级" prop="className">
-              <el-input v-model="achievementForm.className" placeholder="请输入班级"
+            <el-form-item label="学生姓名" prop="studentName">
+              <el-input v-model="achievementForm.studentName" placeholder="请输入学生姓名"
                 :disabled="nowType == 1 ? true : false"></el-input>
                 :disabled="nowType == 1 ? true : false"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
         <el-row :gutter="30">
         <el-row :gutter="30">
-
           <el-col :span="12">
           <el-col :span="12">
-            <el-form-item label="学号" prop="studentNumber">
-              <el-input v-model="achievementForm.studentNumber" placeholder="请输入学号"
-                :disabled="nowType == 1 ? true : false" @change="searchStudentInfo"></el-input>
+            <el-form-item label="班级" prop="className">
+              <el-input v-model="achievementForm.className" placeholder="请输入班级"
+                :disabled="nowType == 1 ? true : false"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">

ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairStudentManage/index.vue

@@ -704,16 +704,16 @@ export default {
           { required: true, message: "身份证号不能为空", trigger: 'blur' },
           { required: true, message: "身份证号不能为空", trigger: 'blur' },
           { validator: this.validID, trigger: 'blur' }
           { validator: this.validID, trigger: 'blur' }
         ],
         ],
-        nation: [{ required: true, message: '民族不能为空', trigger: 'blur' }],
+        // nation: [{ required: true, message: '民族不能为空', trigger: 'blur' }],
         studentName: [{ required: true, message: '学生姓名不能为空', trigger: 'blur' }],
         studentName: [{ required: true, message: '学生姓名不能为空', trigger: 'blur' }],
-        birthday: [{ required: true, message: '出生日期不能为空', trigger: 'blur' }],
-        nativePlace: [{ required: true, message: '籍贯不能为空', trigger: 'blur' }],
-        sex: [{ required: true, message: '学生姓名不能为空', trigger: 'blur' }],
+        // birthday: [{ required: true, message: '出生日期不能为空', trigger: 'blur' }],
+        // nativePlace: [{ required: true, message: '籍贯不能为空', trigger: 'blur' }],
+        // sex: [{ required: true, message: '学生性别不能为空', trigger: 'blur' }],
         schoolNo: [{ required: true, message: '注册序号不能为空', trigger: 'blur' }],
         schoolNo: [{ required: true, message: '注册序号不能为空', trigger: 'blur' }],
-        studentType: [{ required: true, message: '学生类型不能为空', trigger: 'change' }],
-        studentStatus: [{ required: true, message: '学生状态不能为空', trigger: 'change' }],
+        // studentType: [{ required: true, message: '学生类型不能为空', trigger: 'change' }],
+        // studentStatus: [{ required: true, message: '学生状态不能为空', trigger: 'change' }],
         classAlias: [{ required: true, message: '班级不能为空', trigger: 'change' }],
         classAlias: [{ required: true, message: '班级不能为空', trigger: 'change' }],
-        provincialNumber: [{ required: true, message: '省学籍辅号不能为空', trigger: 'blur' }],
+        // provincialNumber: [{ required: true, message: '省学籍辅号不能为空', trigger: 'blur' }],
       },
       },
       // 班级编辑表单
       // 班级编辑表单
       classForm: {
       classForm: {