update 提交规则

projects/textbook/src/app/textbook/textbook.component.ts

@@ -433,7 +433,7 @@ export class TextbookComponent implements OnInit {
       nzOkDanger: false,
       nzOnOk: async () => {
         if (data?.id) {
-          if (data?.get('status') != '102' || data?.get('status') != '300') {
+          if (data?.get('status') != '102' && data?.get('status') != '300') {
             this.message.warning('教材信息填写不完整');
             return;
           }

projects/textbook/src/modules/nav-province-contact/page-textbook/page-textbook.component.html

@@ -13,7 +13,7 @@
         *nzSpaceItem
         nz-button
         nzType="primary"
-        (click)="toUrl('/nav-province-contact/manage/submitted/' + tbookSer.profile.user.department?.objectId)"
+        (click)="toUrl('/nav-province-contact/manage/submitted/' + processId)"
       >
       提交推荐教材列表
       </button>

projects/textbook/src/modules/nav-province-contact/page-textbook/page-textbook.component.ts

@@ -63,6 +63,7 @@ export class PageTextbookComponent implements OnInit {
       export:true
     },
   };
+  processId?:string = ''
 
   constructor(
     public tbookSer: textbookServer,
@@ -70,19 +71,36 @@ export class PageTextbookComponent implements OnInit {
     private activeRoute: ActivatedRoute // private translate:TranslateService,
   ) {
     this.user = Parse.User.current();
-    this.className = this.EduTextbook.className;
-    this.fieldsArray = this.EduTextbook.fieldsArray;
-    this.queryParams = {
-      where: {
-        isDeleted: { $ne: true },
-        render: true,
-        discard: { $ne: true },
-        department: this.tbookSer.profile.user.department?.objectId,
-      },
-    };
+    // this.className = this.EduTextbook.className;
+    // this.fieldsArray = this.EduTextbook.fieldsArray;
+    // this.queryParams = {
+    //   where: {
+    //     isDeleted: { $ne: true },
+    //     render: true,
+    //     discard: { $ne: true },
+    //     department: this.tbookSer.profile.user.department?.objectId,
+    //   },
+    // };
   }
 
-  ngOnInit(): void {}
+  ngOnInit(): void {
+    this.getProcess()
+  }
+  async getProcess(){
+    let parentMap = await this.tbookSer.formatNode(
+      this.tbookSer?.profile?.user?.department?.objectId
+    );
+    if (!parentMap[1]?.key) return;
+    let query = new Parse.Query('EduProcess');
+    query.equalTo('department', parentMap[1]?.key);
+    query.lessThanOrEqualTo('startDate', new Date());
+    query.greaterThan('deadline', new Date());
+    query.notEqualTo('isDeleted', true);
+    query.notEqualTo('status', '100');
+    query.select('objectId');
+    let res = await query.first();
+    this.processId = res?.id;
+  }
   toUrl(url: string, params?: object) {
     if (params) {
       this.router.navigate([url, params]);

projects/textbook/src/modules/nav-province-contact/submitted/export-list/export-list.component.ts

@@ -17,7 +17,8 @@ export class ExportListComponent implements OnInit {
   eduProcess?:Parse.Object
   filterObj: any = {
     isCheck: false,
-    status:['200']
+    status:['200'],
+    btns:{}
   };
   constructor(private router: Router, private activeRoute: ActivatedRoute) {}