更新部分问题

projects/textbook/src/modules/login/account-info/account-info.component.ts

@@ -164,13 +164,13 @@ export class AccountInfoComponent implements OnInit {
         this.message.error('单位名称未选择或与单位类型不匹配，请重新选择');
         return;
       }
-      let a = /^1[3-9]\d{9}$/;
+      let a =
+      /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
       if (!String(this.validateForm.value.email).match(a)) {
         this.message.error('邮箱格式不正确');
         return;
       }
-      let m =
-        /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[1589]))\d{8}$/;
+      let m = /^1[3-9]\d{9}$/;
       if (!String(this.validateForm.value.phone).match(m)) {
         this.message.error('手机号格式不正确');
         return;

projects/textbook/src/modules/nav-admin/page-process/process-create/process-create.component.html

@@ -57,7 +57,7 @@
             >
             <nz-form-control
               class="val"
-              nzErrorTip="请填写推荐限额"
+              nzErrorTip="请填写正确的推荐限额"
               style="width: 100%"
             >
               <nz-input-group>
@@ -68,6 +68,7 @@
                   formControlName="num"
                   nzStatus=""
                   maxlength="3"
+                  min="0"
                 />
               </nz-input-group>
             </nz-form-control>

projects/textbook/src/modules/nav-admin/page-process/process-create/process-create.component.ts

@@ -189,9 +189,13 @@ export class ProcessCreateComponent implements OnInit {
     if (this.validateForm.valid) {
       this.save.emit({ isLoadling: true, save: false });
       let params = this.validateForm.value;
+      if(params.num < 0){
+        this.msg.warning('申报限额不能为负数');
+        return
+      }
       this.saveEduCollection(params);
     } else {
-      this.msg.warning('请填写完整信息');
+      this.msg.warning('填写信息不完整或不正确');
       Object.values(this.validateForm.controls).forEach((control) => {
         if (control.invalid) {
           control.markAsDirty();
@@ -360,6 +364,7 @@ export class ProcessCreateComponent implements OnInit {
     this.isVisible = false;
   }
   async handleOk(): Promise<void> {
+    this.save.emit({ isLoadling: true});
     let query = new Parse.Query('EduProcess');
     query.equalTo('department', this.department);
     query.notEqualTo('isDeleted', true);
@@ -385,5 +390,6 @@ export class ProcessCreateComponent implements OnInit {
     this.ngOnInit();
     this.msg.success('申报单位设置成功');
     this.isVisible = false;
+    this.save.emit({ isLoadling: true, save: true });
   }
 }