update 教材提交

projects/textbook/src/modules/nav-author/components/attachment/attachment.component.ts

@@ -185,9 +185,9 @@ export class AttachmentComponent implements OnInit {
     //   msgList.push('申报单位承诺意见')
     //   isNull = true
     // }
-    if (isNull) {
-      // this.msg.create('error', `请上传完整 ${msgList.join()}`)
-    }
+    // if (isNull) {
+    //   this.msg.create('error', `请上传完整 ${msgList.join()}`)
+    // }
     return isNull
   }
 
@@ -230,7 +230,7 @@ export class AttachmentComponent implements OnInit {
       return
     })
     if (isVrifly) {
-      this.msg.warning('存在未填项')
+      // this.msg.warning('存在未填项')
       return true
     } else {
       return false
@@ -249,18 +249,16 @@ export class AttachmentComponent implements OnInit {
       examine: this.examine,
       // unitMaterial: this.unitMaterial,
     }
-    await this.saveEduTextbook(params, true);
+    let isPageNull = this.examineNull()//检查本页空项
+    let isIgnoreFiled = this.isIgnoreFiledNull()//检查数据空项
+    // console.log(isPageNull, isIgnoreFiled);
     if (event == 'pre') {//上一步
       this.state.emit({ type: 'pre' });
       return;
     }
-
+    await this.saveEduTextbook(params, (!isPageNull || !isIgnoreFiled));
     if (event == 'complete') {
       this.state.emit({ type: 'complete', textBook: this.eduTextbook });
-
-      let isPageNull = this.examineNull()//检查本页空项
-      let isIgnoreFiled = this.isIgnoreFiledNull()//检查数据空项
-
       if (isPageNull || isIgnoreFiled) {
       } else {
         this.eduTextbook.set('complete', true)
@@ -280,6 +278,7 @@ export class AttachmentComponent implements OnInit {
   }
 
   async saveEduTextbook(params: any, isComplete: boolean) {
+    console.log(isComplete);
     if (!this.eduTextbook) {
       this.msg.error('请先创建教材');
       return;