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.ts

@@ -119,21 +119,6 @@ export class ProcessListComponent implements OnInit {
         del: false,
       };
     }
-    if (
-      e?.get('deadline') &&
-      new Date() > new Date(e?.get('deadline')) &&
-      e?.get('status') == '400'
-    ) {
-      return {
-        title: '已结束',
-        color: 'gold',
-        strat: false,
-        stop: false,
-        end: false,
-        del: true,
-        collect:true
-      };
-    }
     if(e?.get('collectStartData') && new Date() < new Date(e?.get('collectStartData'))){
       return {
         title: '待收集',
@@ -157,6 +142,21 @@ export class ProcessListComponent implements OnInit {
         collect:true
       };
     }
+    if (
+      e?.get('deadline') &&
+      new Date() > new Date(e?.get('deadline')) &&
+      e?.get('status') == '400'
+    ) {
+      return {
+        title: '已结束',
+        color: 'gold',
+        strat: false,
+        stop: false,
+        end: false,
+        del: true,
+        collect:true
+      };
+    }
     if (e?.get('status') == '400') {
       return {
         title: '已完成',

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

@@ -109,6 +109,29 @@ export class ProcessListComponent implements OnInit {
         del: false,
       };
     }
+    if(e?.get('collectStartData') && new Date() < new Date(e?.get('collectStartData'))){
+      return {
+        title: '待收集',
+        color: 'default',
+        strat: false,
+        stop: false,
+        end: false,
+        del: false,
+        collect:true
+      };
+    }
+    if(e?.get('collectStartData') && new Date() > new Date(e?.get('collectStartData')) 
+    && new Date() < e?.get('collectEndData')){
+      return {
+        title: '收集中',
+        color: 'orange',
+        strat: false,
+        stop: false,
+        end: false,
+        del: false,
+        collect:true
+      };
+    }
     if (
       e?.get('deadline') &&
       new Date() > new Date(e?.get('deadline')) &&