Merge branch 'master' of http://git.fmode.cn:3000/bin/edu-textbook

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

@@ -267,7 +267,7 @@
       <span>已选</span>
       <span class="styles_num__178Wa">{{ setOfCheckedId.size }}</span>
     </div>
-    <div class="batch-toolbar-actions">
+    <!-- <div class="batch-toolbar-actions">
       <div class="ant-space ant-space-horizontal ant-space-align-center">
         <div class="ant-space-item" style="margin-right: 16px">
           <button nz-button nzType="text" (click)="statusSelected('del')">
@@ -276,7 +276,7 @@
           </button>
         </div>
       </div>
-    </div>
+    </div> -->
     <div class="styles_cancel__AARoT">
       <button nz-button nzType="text" (click)="statusSelected('strat')">
         <span nz-icon nzType="caret-right" nzTheme="outline"></span>

projects/textbook/src/modules/nav-admin/page-process/process-list/process-list.component.scss

@@ -100,7 +100,7 @@
   display: flex;
   justify-content: center;
   bottom: 80px;
-  left: calc(50% - 376px);
+  left: calc(50% - 300px);
   -webkit-transform: translate(0);
   transform: translate(0);
   z-index: 99;

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

@@ -417,9 +417,10 @@ export class ProcessListComponent implements OnInit {
       strat: '开始',
       stop: '暂停',
       end: '结束',
+      del: '删除',
     };
     this.modal.confirm({
-      nzTitle: '批量删除',
+      nzTitle: `批量${map[type]}`,
       nzContent:
         type == 'del'
           ? `删除后数据不可恢复，请谨慎操作`
@@ -456,7 +457,7 @@ export class ProcessListComponent implements OnInit {
   async onStatusChange(
     data: Parse.Object,
     type: string,
-    end?: boolean
+    end?: boolean,
   ): Promise<void> {
     console.log(data, type);
     switch (type) {

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

@@ -68,6 +68,7 @@ export class PageProcessComponent implements OnInit {
         let query = new Parse.Query('EduProcess');
         query.include('branch', 'department');
         query.equalTo('objectId', id);
+        query.notEqualTo('isDeleted', true);
         let res = await query.first();
         if (res?.id) {
           let vrifly = await this.tbookSer.getEduProcess(

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

@@ -37,6 +37,7 @@ export class SubmittedComponent implements OnInit {
     this.activeRoute.paramMap.subscribe(async (params) => {
       let id = params.get('id');
       let query = new Parse.Query('EduProcess');
+      query.notEqualTo('isDeleted', true);
       query.include('department');
       query.equalTo('objectId', id);
       this.eduProcess = await query.first();