车辆对接

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

@@ -1,12 +1,11 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-28 16:32:53
+ * @LastEditTime: 2021-12-29 14:44:43
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.html
 -->
-<nz-affix [nzOffsetTop]="10">
 <page-header-wrapper [title]="''" [logo]="logo" [content]="headerContent">
   <ng-template #logo>
     <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
@@ -53,8 +52,7 @@
     </div>
   </ng-template>
 </page-header-wrapper>
-</nz-affix>
+<nz-card nzTitle="运单进度" #distannce1 >
-<nz-card nzTitle="运单进度" #distannce1>
   <div class="approval-status">
     <div style="width: 60%; margin: 0 auto">
         <nz-steps [nzCurrent]="approvalLsit?.length + 1" nzLabelPlacement="vertical">
@@ -66,7 +64,7 @@
   </div>
 </nz-card>
 
-<nz-card nzTitle="基本信息" #distannce2 >
+<nz-card nzTitle="基本信息" #distannce2  >
   <sv-container col="1">
     <sv-title>货物信息</sv-title>
     <sv label="网络货运人">

src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.less

@@ -77,4 +77,8 @@
           margin-left: 56px;
         }
       }
+      .target-fix {
+        display: block;
+        margin-top: 290px;
+      }
 }

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

@@ -2,7 +2,7 @@ import { ViewChild } from '@angular/core';
 /*
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-28 16:22:50
+ * @LastEditTime: 2021-12-29 14:42:04
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.ts
@@ -112,7 +112,9 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
 
   goDistance(elf: NzCardComponent) {
     if (elf) {
-      elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' , yOffset : 400  });
+      elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' , });
+      // elf['elementRef'].nativeElement.className = 'target-fix'
     }
+    console.log(elf)
   }
 }

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-27 13:25:08
+ * @LastEditTime: 2021-12-29 15:00:48
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html
@@ -212,6 +212,15 @@
 </nz-modal>
 <ng-template #extraTemplate>
   <div>
+    <button  nz-button nzType="primary"(click)="modifyRate()">
+修改附加费率
+</button> 
+    <button   nz-button nzType="primary"(click)="modifyFreightPeople()">
+修改网络货运人
+</button> 
+    <button  nz-button nzType="primary"(click)="modifyRate()">
+修改车队长
+</button> 
     <button  nz-button nzType="primary" nzGhost nz-popconfirm
 [nzPopconfirmTitle]="enable" (nzOnConfirm)="userAction()" nzPopconfirmPlacement="bottomRight">
 批量签收

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

@@ -14,6 +14,8 @@ import { VehicleSureArriveComponent } from '../../modal/vehicle/sure-arrive/sure
 import { VehicleSureDepartComponent } from '../../modal/vehicle/sure-depart/sure-depart.component';
 import { VehicleUpdateFreightComponent } from '../../modal/vehicle/update-freight/update-freight.component';
 import { OrderManagementService } from '../../services/order-management.service';
+import { VehicleModifyRateComponent } from '../../modal/vehicle/modify-rate/modify-rate.component';
+import { VehicleFreightPeopleComponent } from '../../modal/vehicle/freight-people/freight-people.component';
 
 
 @Component({
@@ -590,21 +592,82 @@ resourceStatus: any;
           nzWidth: 580,
           nzContent: VehicleUpdateFreightComponent,
           nzComponentParams: { data: { ...data, id: item.id } },
-          nzOnOk: sin => {
+          nzFooter: null,
-            this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {
+          // nzOnOk: sin => {
-              if (res) {
+          //   this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {
-                this.service.msgSrv.success('变更运费成功');
+          //     if (res) {
-                modal.destroy();
+          //       this.service.msgSrv.success('变更运费成功');
-                this.st.reload();
+          //       modal.destroy();
-              }
+          //       this.st.reload();
-            });
+          //     }
-            return false;
+          //   });
-          }
+          //   return false;
+          // }
         });
         modal.afterClose.subscribe(_ => this.st.reload());
       }
     });
   }
+  /**
+   *修改附加费率
+   */
+   modifyRate() {
+    let params: any[] = [];
+    this.selectedRows.forEach(item => {
+      params.push(item.id);
+    });
+    if(params.length  === 0) {
+      this.service.msgSrv.error('请先选择订单！')
+      return
+    }
+        const modal = this.modal.create({
+          nzTitle: '修改附加费率',
+          nzWidth: 600,
+          nzContent: VehicleModifyRateComponent,
+          nzComponentParams: { data: { ids: params } },
+          nzFooter: null,
+          // nzOnOk: sin => {
+          //   this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {
+          //     if (res) {
+          //       this.service.msgSrv.success('变更运费成功');
+          //       modal.destroy();
+          //       this.st.reload();
+          //     }
+          //   });
+          //   return false;
+          // }
+        });
+  }
+      /**
+   *修改网络货运人
+   */
+   modifyFreightPeople() {
+    let params: any[] = [];
+    this.selectedRows.forEach(item => {
+      params.push(item.id);
+    });
+    if(params.length  === 0) {
+      this.service.msgSrv.error('请先选择订单！')
+      return
+    }
+        const modal = this.modal.create({
+          nzTitle: '修改网络货运人',
+          nzWidth: 600,
+          nzContent: VehicleFreightPeopleComponent,
+          nzComponentParams: { data: { ids: params } },
+          nzFooter: null,
+          // nzOnOk: sin => {
+          //   this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {
+          //     if (res) {
+          //       this.service.msgSrv.success('变更运费成功');
+          //       modal.destroy();
+          //       this.st.reload();
+          //     }
+          //   });
+          //   return false;
+          // }
+        });
+  }
   
   //  *确认签收
    
@@ -656,8 +719,10 @@ resourceStatus: any;
       this.selectedRows.forEach(item => {
         params.push(item.id);
       });
-      console.log(this.selectedRows)
+      if(params.length  === 0) {
-      console.log(params)
+        this.service.msgSrv.error('请先选择订单！')
+        return
+      }
       this.service.request(this.service.$api_get_batchSignWholeOrder, params).subscribe(res => {
         if (res) {
           console.log(res);

src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.html

@@ -0,0 +1,14 @@
+<!--
+ * @Author: your name
+ * @Date: 2021-12-15 13:17:42
+ * @LastEditTime: 2021-12-29 15:12:09
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\order-management\modal\vehicle\update-freight\update-freight.component.html
+-->
+<nz-alert nzType="info" [nzMessage]="'已选择' + data?.ids?.length + '已选择条订单'" nzShowIcon></nz-alert>
+<sf style="margin-top: 15px;" #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>
+<div class="modal-footer">
+  <button nz-button type="button" (click)="close()">关闭</button>
+  <button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [disabled]="sf.valid">确定</button>
+</div>

src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.less

@@ -0,0 +1,7 @@
+    .left_btn {
+         width: 50px;
+        height: 32px; 
+         padding-left: 8px;
+         line-height:32px; 
+         background-color: #d7d7d7;
+    }

src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts

@@ -0,0 +1,81 @@
+/*
+ * @Author: your name
+ * @Date: 2021-12-14 14:03:07
+ * @LastEditTime: 2021-12-29 17:02:54
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\order-management\modal\bulk\update-freight\update-freight.component.ts
+ */
+import { Component, Input, OnInit, ViewChild } from '@angular/core';
+import {
+  SFComponent, SFSchema, SFUISchema
+} from '@delon/form';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+import { OrderManagementService } from '../../../services/order-management.service';
+import { ShipperBaseService } from './../../../../../shared/services/business/shipper-base.service';
+
+@Component({
+  selector: 'app-order-management-vehicle-freight-people',
+  templateUrl: './freight-people.component.html',
+  styleUrls: ['./freight-people.component.less']
+})
+export class VehicleFreightPeopleComponent implements OnInit {
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  schema: SFSchema = {};
+  ui: SFUISchema = {};
+
+  aggreechecked = false;
+
+  @Input()
+  data: any;
+
+  constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public service: OrderManagementService, private service2: ShipperBaseService) {}
+
+  ngOnInit(): void {
+    console.log(this.data)
+    this.initSF(this.data);
+  }
+  initSF(data: any) {
+    this.schema = {
+      enterpriseInfoName: {
+        type: 'string',
+        title: '网络货运人',
+        ui: {
+          widget: 'select',
+          placeholder: '请选择',
+          visibleIf: {
+            _$expand: (value: boolean) => value,
+          },
+          allowClear: true,
+          asyncData: () => this.service2.getNetworkFreightForwarder(),
+        },
+      },
+      required: ['enterpriseInfoName']
+    };
+    this.ui = {
+      '*': {
+        spanLabelFixed: 100,
+        grid: { span: 16 }
+      }
+    };
+  }
+
+  save(value: any): void {
+ 
+    const params = {
+    };
+
+    this.service.request(this.service.$api_get_insertFreightChangeWhole, params).subscribe((res: any) => {
+      if (res) {
+        this.modal.destroy();
+        this.service.msgSrv.success('变更运费成功');
+      }
+    });
+  }
+
+  close(): void {
+    this.modal.destroy();
+  }
+
+}

src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html

@@ -0,0 +1,14 @@
+<!--
+ * @Author: your name
+ * @Date: 2021-12-15 13:17:42
+ * @LastEditTime: 2021-12-29 15:12:09
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\order-management\modal\vehicle\update-freight\update-freight.component.html
+-->
+<nz-alert nzType="info" [nzMessage]="'已选择' + data?.ids?.length + '已选择条订单'" nzShowIcon></nz-alert>
+<sf style="margin-top: 15px;" #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>
+<div class="modal-footer">
+  <button nz-button type="button" (click)="close()">关闭</button>
+  <button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [disabled]="sf.valid">确定</button>
+</div>

src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.less

@@ -0,0 +1,7 @@
+    .left_btn {
+         width: 50px;
+        height: 32px; 
+         padding-left: 8px;
+         line-height:32px; 
+         background-color: #d7d7d7;
+    }

src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts

@@ -0,0 +1,92 @@
+import { preloaderFinished } from '@delon/theme';
+/*
+ * @Author: your name
+ * @Date: 2021-12-14 14:03:07
+ * @LastEditTime: 2021-12-29 15:02:47
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\order-management\modal\bulk\update-freight\update-freight.component.ts
+ */
+import { Component, Input, OnInit, ViewChild } from '@angular/core';
+import {
+  SFComponent,
+  SFCustomWidgetSchema,
+  SFNumberWidgetSchema,
+  SFRadioWidgetSchema,
+  SFSchema,
+  SFSelectWidgetSchema,
+  SFTextareaWidgetSchema,
+  SFUISchema
+} from '@delon/form';
+import { _HttpClient } from '@delon/theme';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+import { OrderManagementService } from '../../../services/order-management.service';
+
+@Component({
+  selector: 'app-order-management-vehicle-modify-rate',
+  templateUrl: './modify-rate.component.html',
+  styleUrls: ['./modify-rate.component.less']
+})
+export class VehicleModifyRateComponent implements OnInit {
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  schema: SFSchema = {};
+  ui: SFUISchema = {};
+
+  aggreechecked = false;
+
+  @Input()
+  data: any;
+
+  constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public service: OrderManagementService) {}
+
+  ngOnInit(): void {
+    console.log(this.data)
+    this.initSF(this.data);
+  }
+  initSF(data: any) {
+    const info = {
+      prePay: data.list?.filter((item: any) => item.costCode === 'PRE')[0],
+      toPay: data.list?.filter((item: any) => item.costCode === 'RECE')[0],
+      receiptPay: data.list?.filter((item: any) => item.costCode === 'BACK')[0]
+    };
+    this.schema = {
+      properties: {
+        prePay: {
+          type: 'number',
+          title: '附加费率',
+          ui: {
+            unit: '%',
+            widgetWidth: 200,
+            precision: 2,
+          } as SFNumberWidgetSchema
+        },
+      },
+      required: ['prePay']
+    };
+    this.ui = {
+      '*': {
+        spanLabelFixed: 100,
+        grid: { span: 16 }
+      }
+    };
+  }
+
+  save(value: any): void {
+ 
+    const params = {
+    };
+
+    this.service.request(this.service.$api_get_insertFreightChangeWhole, params).subscribe((res: any) => {
+      if (res) {
+        this.modal.destroy();
+        this.service.msgSrv.success('变更运费成功');
+      }
+    });
+  }
+
+  close(): void {
+    this.modal.destroy();
+  }
+
+}

src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html

@@ -1,3 +1,11 @@
+<!--
+ * @Author: your name
+ * @Date: 2021-12-15 13:17:42
+ * @LastEditTime: 2021-12-29 14:48:31
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\order-management\modal\vehicle\update-freight\update-freight.component.html
+-->
 <sf #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>
 <nz-divider></nz-divider>
 <div>

src/app/routes/order-management/order-management.module.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-23 17:13:28
+ * @LastEditTime: 2021-12-29 16:49:32
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\order-management\order-management.module.ts
@@ -27,6 +27,8 @@ import { SureDepartComponent } from './modal/bulk/sure-depart/sure-depart.compon
 import { UpdateFreightComponent } from './modal/bulk/update-freight/update-freight.component';
 import { OneCarOrderCancelComponent } from './modal/vehicle/cancel/cancel.component';
 import { VehicleConfirReceiptComponent } from './modal/vehicle/confir-receipt/confir-receipt.component';
+import { VehicleFreightPeopleComponent } from './modal/vehicle/freight-people/freight-people.component';
+import { VehicleModifyRateComponent } from './modal/vehicle/modify-rate/modify-rate.component';
 import { VehicleSureArriveComponent } from './modal/vehicle/sure-arrive/sure-arrive.component';
 import { VehicleSureDepartComponent } from './modal/vehicle/sure-depart/sure-depart.component';
 import { VehicleUpdateFreightComponent } from './modal/vehicle/update-freight/update-freight.component';
@@ -53,7 +55,9 @@ const COMPONENTS: Type<void>[] = [
   OrderManagementRiskDetailComponent,
   OneCarOrderCancelComponent,
   OrderManagementVehicleDetailChangeComponent,
-  OrderManagementBulkDetailChangeComponent
+  OrderManagementBulkDetailChangeComponent,
+  VehicleModifyRateComponent,
+  VehicleFreightPeopleComponent
 ];
 
 @NgModule({

src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts

@@ -122,11 +122,13 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
           title: '货主',
           type: 'string',
           maxLength: 30,
+          enum: [],
           ui: {
             widget: 'select',
             serverSearch: true,
             searchDebounceTime: 300,
             searchLoadingText: '搜索中...',
+            
             onSearch: (q: any) => {
               if (!!q) {
                 return this.service
@@ -757,8 +759,17 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
   // 初始化信息
   dataR (res: any) {
     // this.dataList = res;
+      if(res?.shipperAppUserName) {
+        const List: any = []
+        this.service.request(this.service.$api_enterpriceList, { enterpriseName: res?.shipperAppUserName}).subscribe((res) => {
+          console.log(res)
+          res?.forEach((element: any) => {
+            List.push({ label: element.enterpriseName, value: element.id } )
+          });
+        })
+        this.schema1.shipperAppUserId.enum = List
+      }
     this.sf1data = {
-      // shipperAppUserName: res?.shipperAppUserName ,
       enterpriseProjectId: res?.enterpriseProjectId  ,
       enterpriseInfoName: res?.enterpriseInfoName  ,
       externalResourceCode: res?.externalResourceCode  ,

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

@@ -27,8 +27,7 @@
       </div>
       <nz-divider></nz-divider>
       <div sv-container *ngIf="i">
-        <sv label="外部货源号"><a>{{ i?.externalResourceCode }} <i class="mr-xs" nz-icon nzType="edit" nzTheme="outline"
+        <sv label="外部货源号">{{ i?.externalResourceCode }} </sv>
-              (click)="editEnternalSn(i)"></i></a></sv>
         <sv label="项目">{{i?.enterpriseProjectId}}</sv>
         <sv label="录单员">{{i?.createUserId}}</sv>
         <sv label="调度员">{{i?.dispatchName}} 18100000000 </sv>

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

@@ -343,7 +343,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
       //   type: 'enum',
       //   enum: { '1': '抢单', '2': '指派' }
       // },
-      { title: '货主', index: 'shipperAppUserNmae', width: '120px' },
+      { title: '货主', index: 'shipperAppUserName', width: '120px' },
       {
         title: '项目名称',
         index: 'enterpriseProjectName',

src/app/routes/sys-setting/components/crm-management/crm-management.component.ts

@@ -29,7 +29,6 @@ export class CrmManagementComponent implements OnInit {
     { title: '客户名称', index: 'customerName' },
     { title: '客户简称', index: 'customerShortName' },
     { title: '客户编码', index: 'customerCode' },
-    { title: '客户类型', render: 'customerType' },
     {
       title: '操作',
       buttons: [
@@ -92,17 +91,6 @@ export class CrmManagementComponent implements OnInit {
         title: '客户简称',
         ui: { placeholder: '请输入' }
       },
-      customerType: {
-        type: 'string',
-        title: '客户类型',
-        enum: [
-          { label: '客户', value: 1 },
-          { label: '供应商', value: 2 },
-        ],
-        ui: { 
-          widget: 'select'
-         }
-      },
       customerCode: {
         type: 'string',
         title: '客户编码',
@@ -134,20 +122,8 @@ export class CrmManagementComponent implements OnInit {
         title: '客户编码',
         ui: { placeholder: '请输入' }
       },
-      customerType: {
-        type: 'string',
-        title: '客户类型',
-        enum: [
-          { label: '客户', value: 1 },
-          { label: '供应商', value: 2 },
-        ],
-        ui: {
-          widget: 'radio',
-        } as SFRadioWidgetSchema,
-        default: 1,
-      },
   },
-  required: ['customerName', 'customerShortName', 'customerType', 'customerCode']
+  required: ['customerName', 'customerShortName', 'customerCode']
   };
 this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
 }

src/app/routes/sys-setting/services/system.service.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-20 17:18:43
- * @LastEditTime: 2021-12-27 14:09:14
+ * @LastEditTime: 2021-12-29 16:53:47
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\sys-setting\services\system.service.ts
@@ -45,38 +45,38 @@ export class SystemService extends BaseService {
   $api_update_dict = '/api/mdc/pbc/dictItems/update';
 
   // 获取CRM客户信息表
-  $api_get_crmCustomer = '/api/mdc/crmCustomer/get';
+  $api_get_crmCustomer = '/api/mdc/cuc/crmCustomer/get';
   // 查询CRM客户信息表
-  $api_get_crmCustomer_page = '/api/mdc/crmCustomer/list/page';
+  $api_get_crmCustomer_page = '/api/mdc/cuc/crmCustomer/list/page';
   // 保存CRM客户信息表
-  $api_save_crmCustomer = '/api/mdc/crmCustomer/save';
+  $api_save_crmCustomer = '/api/mdc/cuc/crmCustomer/save';
   // 删除CRM客户信息表
-  $api_deletebatch_crmCustomer = '/api/mdc/crmCustomer/deletebatch';
+  $api_deletebatch_crmCustomer = '/api/mdc/cuc/crmCustomer/deletebatch';
 
   // 获取某个应用的所有菜单
   $api_getAllFunctionInfoByAppId: string = '/api/mdc/cuc/functionInfo/getAllFunctionInfoByAppId';
 
   // 查询网络货运信息表
-  $api_networkTransporter_page = '/api/mdc/networkTransporter/list/page';
+  $api_networkTransporter_page = '/api/mdc/cuc/networkTransporter/list/page';
   // 获取网络货运信息表(id)
-  $api_get_networkTransporter = '/api/mdc/networkTransporter/get';
+  $api_get_networkTransporter = '/api/mdc/cuc/networkTransporter/get';
   // 批量获取网络货运信息
-  $api_findNetworkTransporterByIds = '/api/mdc/networkTransporter/findNetworkTransporterByIds';
+  $api_findNetworkTransporterByIds = '/api/mdc/cuc/networkTransporter/findNetworkTransporterByIds';
   // 查找所有网络货运信息(下拉)
-  $api_networkTransporter_findAll = '/api/mdc/networkTransporter/findAll';
+  $api_networkTransporter_findAll = '/api/mdc/cuc/networkTransporter/findAll';
   // 删除网络货运信息表
-  $api_networkTransporter_deletebatch = '/api/mdc/networkTransporter/deletebatch';
+  $api_networkTransporter_deletebatch = '/api/mdc/cuc/networkTransporter/deletebatch';
   // 保存网络货运信息表
-  $api_networkTransporter_save = '/api/mdc/networkTransporter/save';
+  $api_networkTransporter_save = '/api/mdc/cuc/networkTransporter/save';
 
   // 查询结算客户表
-  $api_settlementCustomer_page = '/api/mdc/settlementCustomer/list/page';
+  $api_settlementCustomer_page = '/api/mdc/cuc/settlementCustomer/list/page';
   // 获取结算客户表
-  $api_settlementCustomer_get = '/api/mdc/settlementCustomer/get';
+  $api_settlementCustomer_get = '/api/mdc/cuc/settlementCustomer/get';
   // 保存结算客户表
-  $api_settlementCustomer_save = '/api/mdc/settlementCustomer/save';
+  $api_settlementCustomer_save = '/api/mdc/cuc/settlementCustomer/save';
   // 删除结算客户表
-  $api_settlementCustomer_deletebatch = '/api/mdc/settlementCustomer/deletebatch';
+  $api_settlementCustomer_deletebatch = '/api/mdc/cuc/settlementCustomer/deletebatch';
   // 获取货主企业列表
   public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
 

src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts

@@ -38,7 +38,9 @@ export class InvoiceRequestedDetailComponent implements OnInit {
     this.loadHeadInfo();
   }
 
-  ngOnInit(): void {}
+  ngOnInit(): void {
+    console.log(this.route.snapshot)
+  }
 
   loadHeadInfo() {
     this.service.request(this.service.$api_get_invoice_requested_header_detail, { vatappHId: this.vatappHId }).subscribe(res => {

src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html

@@ -1,3 +1,11 @@
+<!--
+ * @Author: your name
+ * @Date: 2021-12-29 13:12:35
+ * @LastEditTime: 2021-12-29 16:15:24
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\ticket-management\components\invoice-requested\invoice-requested.component.html
+-->
 <page-header-wrapper [title]="'开票申请'">
 </page-header-wrapper>
 
@@ -21,8 +29,8 @@
     </div>
 </nz-card>
 
-<nz-card class="content-box" nzBordered>
+<nz-card class="content-box" nzBordered  >
-    <nz-tabset [nzTabBarExtraContent]="extraTemplate">
+    <nz-tabset [nzTabBarExtraContent]="extraTemplate" (nzSelectedIndexChange)="selectChange($event)">
         <nz-tab nzTitle="待受理"></nz-tab>
         <nz-tab nzTitle="处理中"></nz-tab>
         <nz-tab nzTitle="已拒绝"></nz-tab>
@@ -42,12 +50,20 @@
         </div>
     </ng-template>
 
+    <st
+    #st
+    size="small"
+    [bordered]="true"
+    [scroll]="{ x: '2000px' }"
+    [data]="service.$api_get_invoice_requested_page"
+    [columns]="columns"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [loadingDelay]="500"
+    [loading]="service.http.loading"
+    >
 
-    <st #st [data]="service.$api_get_invoice_requested_page" [columns]="columns"
-        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
-        [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-        [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-        [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)">
         <ng-template st-row="vatappcode" let-item let-index="index" let-column="column">
             {{ item.vatappcode }} <br> <label class="text-primary">待受理</label>
         </ng-template>

src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts

@@ -1,3 +1,4 @@
+import { query } from '@angular/animations';
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
@@ -19,38 +20,52 @@ export class InvoiceRequestedComponent implements OnInit {
   sf!: SFComponent;
   @ViewChild('rejectModal', { static: false })
   rejectModal!: any;
+  resourceStatus!: any;
   columns: STColumn[] = this.initST();
   searchSchema: SFSchema = this.initSF();
 
   _$expand = false;
 
-  selectedRows: any[] = [];
   totalCallNo = 0;
   constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
 
   ngOnInit(): void {}
 
-  beforeReq = (requestOptions: STRequestOptions) => {
+  get reqParams()  {
-    if (this.sf) {
+    // if (this.sf) {
-      Object.assign(requestOptions.body, {
+    //   Object.assign(requestOptions.body, {
-        ...this.sf.value,
+    //     ...this.sf.value,
-        createTime: {
+    //     sts: this?.resourceStatus,
-          start: this.sf.value.createTime?.[0] || null,
+    //     createTime: {
-          end: this.sf.value.createTime?.[1] || null
+    //       start: this.sf.value.createTime?.[0] || null,
-        }
+    //       end: this.sf.value.createTime?.[1] || null
-      });
+    //     }
+    //   });
+    // }
+    const a:any = {};
+    if(this.resourceStatus) {
+      a.sts = this.resourceStatus 
     }
-    return requestOptions;
+    return {
+      ...a,
+      ...this.sf?.value,
+      createTime: {
+        start: this.sf?.value?.createTime?.[0] || null,
+        end: this.sf?.value?.createTime?.[1] || null
+      }
+    };
   };
-
+  get selectedRows() {
-  stChange(e: STChange): void {
+    return this.st?.list.filter((item) => item.checked) || [];
-    switch (e.type) {
-      case 'checkbox':
-        this.selectedRows = e.checkbox!;
-        this.totalCallNo = this.selectedRows.reduce((total, cv) => total + cv.callNo, 0);
-        break;
-    }
   }
+  // stChange(e: STChange): void {
+  //   switch (e.type) {
+  //     case 'checkbox':
+  //       this.selectedRows = e.checkbox!;
+  //       this.totalCallNo = this.selectedRows.reduce((total, cv) => total + cv.callNo, 0);
+  //       break;
+  //   }
+  // }
 
   rejectAction(item: any[]) {
     const modal = this.nzModalService.create({
@@ -330,7 +345,7 @@ export class InvoiceRequestedComponent implements OnInit {
           },
           {
             text: '订单明细',
-            click: item => this.router.navigate(['/ticket/invoice-requested/detail/' + item.vatappcode])
+            click: item => this.orderDetail(item)
           },
           {
             text: '下载对账单'
@@ -340,4 +355,20 @@ export class InvoiceRequestedComponent implements OnInit {
       }
     ];
   }
+  orderDetail(item: any){
+    console.log(item)
+    this.router.navigate(['/ticket/invoice-requested/detail/' + item?.id,
+    {
+      queryParams: { vatappHId : item?.id }
+    }
+  ])
+  }
+  selectChange(e: any) {
+    console.log(e)
+    this.resourceStatus = e;
+    this.initST();
+    setTimeout(() => {
+      this.st.load();
+    }, 500);
+  }
 }

src/app/routes/ticket-management/components/invoice-requested/requested-detail/requested-detail.component.ts

@@ -10,6 +10,7 @@ export class RequestedDetailComponent implements OnInit {
   constructor() { }
 
   ngOnInit(): void {
+    
   }
 
 }

src/app/routes/ticket-management/services/ticket.service.ts

@@ -1,3 +1,11 @@
+/*
+ * @Author: your name
+ * @Date: 2021-12-29 13:12:35
+ * @LastEditTime: 2021-12-29 15:44:27
+ * @LastEditors: your name
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\ticket-management\services\ticket.service.ts
+ */
 import { Injectable, Injector } from '@angular/core';
 import { ShipperBaseService } from '@shared';