解决冲突

src/app/routes/order-management/components/bulk/bulk.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-28 13:59:36
+ * @LastEditTime : 2022-03-01 13:26:59
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -32,11 +32,11 @@
         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl [acl-ability]="['ORDER-BULK-search']"
+        <button nz-button nzType="primary" [nzLoading]="loading" (click)="search()" acl [acl-ability]="['ORDER-BULK-search']"
           >查询</button
         >
-        <button nz-button nzType="primary" [disabled]="service.http.loading">导出</button>
+        <button nz-button nzType="primary" [disabled]="loading">导出</button>
-        <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
+        <button nz-button [disabled]="loading" (click)="resetSF()">重置</button>
         <button nz-button nzType="link" (click)="expandToggle()">
           {{ !_$expand ? '展开' : '收起' }}
           <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@@ -63,8 +63,8 @@
       [scroll]="{ x: '2000px' }"
       [data]="service.$api_get_listBulkPage"
       [columns]="columns"
-      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+      [req]="{  process: beforeReq }"
-      [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+      [res]="{ reName: { list: 'data.records', total: 'data.total' } , process: afterRes}"
       [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
       [loading]="service.http.loading"
     >
@@ -125,8 +125,8 @@
       [bordered]="true"
       [data]="service.$api_get_listChangeApply"
       [columns]="columnsFloat"
-      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: changeParams }"
+      [req]="{  process: beforeReq }"
-      [res]="{ reName: { list: 'data', total: 'data.total' } }"
+      [res]="{ reName: { list: 'data.records', total: 'data.total' } , process: afterRes}"
       [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
     >
       <ng-template st-row="order" let-item let-index="index">

src/app/routes/order-management/components/bulk/bulk.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { STColumn, STComponent } from '@delon/abc/st';
+import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
 import { NzModalService } from 'ng-zorro-antd/modal';
@@ -27,6 +27,7 @@ export class OrderManagementBulkComponent implements OnInit {
   isVisibleEvaluate = false;
   isVisible = false;
   _$expand = false;
+  loading: boolean = true;
   changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录
   changeViewId: any; // 查看运费变更记录id - 用于查看
   ViewCause: any; // 变更运费查看数据
@@ -44,20 +45,6 @@ export class OrderManagementBulkComponent implements OnInit {
   columnsFloatView: STColumn[] = [];
   demoValue: any;
   resourceStatus: any;
-  datass: any = [
-    {
-      one: '1',
-      two: '1',
-      three: '1',
-      id: 1
-    },
-    {
-      one: '2',
-      two: '2',
-      three: '2',
-      id: 2
-    }
-  ];
   tabs = {
     cancelQuantity: 0,
     receivedQuantity: 0,
@@ -94,6 +81,34 @@ export class OrderManagementBulkComponent implements OnInit {
       }
     };
   }
+  beforeReq = (requestOptions: STRequestOptions) => {
+    const a: any = {};
+    if (this.resourceStatus) {
+      a.billStatus = this.resourceStatus;
+    }
+    const params: any = Object.assign({}, this.sf?.value || {});
+    delete params._$expand;
+    if (this.sf) {
+      Object.assign(requestOptions.body, {
+        ...a,
+        ...params,
+        createTime: {
+          start: this.sf?.value?.createTime?.[0] || '',
+          end: this.sf?.value?.createTime?.[1] || ''
+        }
+      });
+    }
+    this.loading = true;
+    return requestOptions;
+  };
+  afterRes = (data: any[], rawData?: any) => {
+    console.log(data)
+    this.loading = false
+    return data.map(item => ({
+      ...item,
+      disabled: item.billStatus !== '4' 
+    }));
+  };
   get selectedRows() {
     return this.st?.list.filter(item => item.checked) || [];
   }

src/app/routes/order-management/components/vehicle/vehicle.component.html

@@ -32,9 +32,9 @@
         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
-        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()"  acl  [acl-ability]="['ORDER-VEHICLE-search']">查询</button>
+        <button nz-button nzType="primary" [nzLoading]="loading" (click)="search()"  acl  [acl-ability]="['ORDER-VEHICLE-search']">查询</button>
-        <button nz-button nzType="primary" [disabled]="service.http.loading">导出</button>
+        <button nz-button nzType="primary" [disabled]="loading">导出</button>
-        <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
+        <button nz-button [disabled]="loading" (click)="resetSF()">重置</button>
         <button nz-button nzType="link" (click)="expandToggle()">
           {{ !_$expand ? '展开' : '收起' }}
           <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@@ -62,8 +62,8 @@
       [scroll]="{ x: '1200px' }"
       [data]="service.$api_get_listWholePage"
       [columns]="columns"
-      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+      [req]="{  process: beforeReq }"
-      [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+      [res]="{ reName: { list: 'data.records', total: 'data.total' } , process: afterRes}"
       [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
     >
       <ng-template st-row="billCode" let-item let-index="index">

src/app/routes/order-management/components/vehicle/vehicle.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
-import { STColumn, STComponent } from '@delon/abc/st';
+import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
 import { ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
@@ -28,6 +28,7 @@ export class OrderManagementVehicleComponent implements OnInit {
   isVisibleView = false;
   isVisibleEvaluate = false;
   isVisible = false;
+  loading: boolean = true;
   changeId: any;       // 主页面查看运费变更记录id - 用于运费变更记录
   changeViewId: any;  // 查看运费变更记录id - 用于查看
   ViewCause: any;  // 变更运费查看数据
@@ -103,6 +104,33 @@ resourceStatus: any;
       },
      };
   }
+  beforeReq = (requestOptions: STRequestOptions) => {
+    const a:any = {};
+    if(this.resourceStatus) {
+      a.billStatus = this.resourceStatus;
+     }
+    const params: any = Object.assign({}, this.sf?.value || {});
+    delete params._$expand;
+    if (this.sf) {
+      Object.assign(requestOptions.body, {
+        ...a,
+        ...params,
+        createTime: {
+          start: this.sf?.value?.createTime?.[0] || '',
+          end: this.sf?.value?.createTime?.[1] || '',
+        },
+      });
+    }
+    this.loading = true;
+    return requestOptions;
+  };
+  afterRes = (data: any[], rawData?: any) => {
+    console.log(data)
+    this.loading = false
+    return data.map(item => ({
+      ...item,
+    }));
+  };
   get selectedRows() {
     return this.st?.list.filter((item) => item.checked) || [];
   }

src/app/routes/supply-management/components/bulk/bulk.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-25 15:22:19
+ * @LastEditTime : 2022-03-01 13:13:29
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\bulk\\bulk.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -32,8 +32,8 @@
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
         <button nz-button nzType="primary" [nzLoading]="loading" (click)="search()"  acl  [acl-ability]="['SUPPLY-INDEX-bulkSearch']">查询</button>
-        <button nz-button nzType="primary" [nzLoading]="loading">导入</button>
+        <button nz-button nzType="primary" [disabled]="loading">导入</button>
-        <button nz-button [nzLoading]="loading" (click)="resetSF()">重置</button>
+        <button nz-button [disabled]="loading" (click)="resetSF()">重置</button>
         <button nz-button nzType="link" (click)="expandToggle()">
           {{ !_$expand ? '展开' : '收起' }}
           <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>

src/app/routes/supply-management/components/vehicle/vehicle.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-25 15:22:22
+ * @LastEditTime : 2022-03-01 13:12:12
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\vehicle\\vehicle.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -31,8 +31,8 @@
         [acl-ability]="['SUPPLY-INDEX-vehicleSearch']"
         >查询</button
       >
-      <button nz-button nzType="primary" [nzLoading]="loading">导出</button>
+      <button nz-button nzType="primary" [disabled]="loading">导出</button>
-      <button nz-button [nzLoading]="loading" (click)="resetSF()">重置</button>
+      <button nz-button [disabled]="loading" (click)="resetSF()">重置</button>
       <button nz-button nzType="link" (click)="expandToggle()">
         {{ !_$expand ? '展开' : '收起' }}
         <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>