Ver código fonte

修改显示

lex 1 ano atrás
pai
commit
1bf6539223

+ 23 - 13
src/views/student-register/index.tsx

@@ -483,8 +483,13 @@ export default defineComponent({
         }
 
         // 判断新建学员是否上限了
+        console.log(
+          forms.studentItem.userId,
+          forms.studentList.length,
+          forms.multi_user_limit
+        );
         if (
-          !forms.studentItem.userId &&
+          forms.isRegister === 'create' &&
           forms.studentList.length >= forms.multi_user_limit
         ) {
           otherParams.showOtherMessage = `同一手机号最多创建${forms.multi_user_limit}个学生`;
@@ -690,17 +695,18 @@ export default defineComponent({
           });
           studentInfo.extra.gender = firstStudent.gender;
 
-          forms.isRegister = 'update';
-        } else {
-          forms.isRegister = 'create';
-          forms.isChangeSchool = false;
-          studentInfo.extra.nickname = '';
-          studentInfo.extra.currentGradeNum = '';
-          studentInfo.extra.currentClass = '';
-          studentInfo.extra.gender = 1;
-          forms.currentClassText = '';
-          forms.gradeNumText = '';
+          // forms.isRegister = 'update';
         }
+        //  else {
+        //   forms.isRegister = 'create';
+        //   forms.isChangeSchool = false;
+        //   studentInfo.extra.nickname = '';
+        //   studentInfo.extra.currentGradeNum = '';
+        //   studentInfo.extra.currentClass = '';
+        //   studentInfo.extra.gender = 1;
+        //   forms.currentClassText = '';
+        //   forms.gradeNumText = '';
+        // }
       } catch {
         //
       }
@@ -1837,13 +1843,17 @@ export default defineComponent({
           onConfirm={() => {
             otherParams.showOtherSchool = false;
             if (otherParams.otherType === 'nickname') {
-              forms.isRegister = 'update'; // 新建
+              forms.isRegister = 'update'; // 修改
               // 直接注册
               onSubmit();
             } else if (otherParams.otherType === 'change') {
               forms.isChangeSchool = true;
               // 直接注册
               onSubmit();
+            } else if (otherParams.otherType === 'limit') {
+              // 人数超限制
+              forms.isRegister = '';
+              forms.isChangeSchool = false;
             }
           }}
         />
@@ -1882,7 +1892,7 @@ export default defineComponent({
                   }
                 });
                 studentInfo.extra.gender = firstStudent.gender;
-                forms.isRegister = 'update';
+                // forms.isRegister = 'update';
               } else {
                 forms.isRegister = 'create';
                 forms.isChangeSchool = false;

+ 5 - 1
src/views/student-register/modal/select-student/index.module.less

@@ -8,7 +8,10 @@
 }
 
 .selectStudent {
-  padding: 0 20px 22px;
+  padding: 0 20px 0;
+  max-height: 400px;
+  overflow-x: hidden;
+  overflow-y: auto;
 
   .cell {
     display: flex;
@@ -66,6 +69,7 @@
 }
 
 .addStudentBtn {
+  margin: 0 20px 22px;
 
   .iconAdd {
     display: inline-block;

+ 14 - 15
src/views/student-register/modal/select-student/index.tsx

@@ -63,22 +63,21 @@ export default defineComponent({
               </div>
             </div>
           ))}
-
-          <div class={styles.addStudentBtn}>
-            <Button
-              block
-              color="linear-gradient( 135deg, #31C7FF 0%, #007AFE 100%)"
-              onClick={() => {
-                //
-                radioChecked.value = null;
-                emit('confirm', {});
-                emit('close');
-              }}>
-              <i class={styles.iconAdd}></i>
-              <span>新增学生</span>
-            </Button>
-          </div>
         </RadioGroup>
+        <div class={styles.addStudentBtn}>
+          <Button
+            block
+            color="linear-gradient( 135deg, #31C7FF 0%, #007AFE 100%)"
+            onClick={() => {
+              //
+              radioChecked.value = null;
+              emit('confirm', {});
+              emit('close');
+            }}>
+            <i class={styles.iconAdd}></i>
+            <span>新增学生</span>
+          </Button>
+        </div>
       </div>
     );
   }