From 228adb1656dcb14656b4e709f6dc6bbcb4981c5e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 30 Mar 2022 14:18:28 +0800 Subject: [PATCH] fix bug --- .../order-reporting.component.ts | 126 +++++++----------- .../services/tax-management.service.ts | 5 +- 2 files changed, 54 insertions(+), 77 deletions(-) diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts index 6c7f6126..75f60d81 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -1,9 +1,11 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { STColumn, STComponent, STData } from '@delon/abc/st'; -import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; +import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; import { ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; +import { of } from 'rxjs'; +import { map } from 'rxjs/operators'; import { TaxManagementService } from '../../services/tax-management.service'; // import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component'; // import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component'; @@ -34,6 +36,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { public service: TaxManagementService, private router: Router, private ar: ActivatedRoute, + public shipperservice: ShipperBaseService, private modal: NzModalService, public shipperSrv: ShipperBaseService ) { @@ -102,26 +105,31 @@ export class TaxManagementOrderReportingComponent implements OnInit { placeholder: '请输入', }, }, - enterpriseInfoId: { - title: '网络货运人', + shipperAppUserId: { type: 'string', - ui: { - placeholder: '请选择', - widget: 'select', - asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false), - - allowClear: true - } - }, - externalResourceCode: { title: '货主', - type: 'string', ui: { - placeholder: '请输入', + widget: 'select', + serverSearch: true, + searchDebounceTime: 300, + searchLoadingText: '搜索中...', + allowClear: true, visibleIf: { - _$expand: (value: boolean) => value, + _$expand: (value: boolean) => value }, - } + onSearch: (q: any) => { + let str =q.replace(/^\s+|\s+$/g,""); + if (str) { + return this.service + .request(this.service.$api_enterpriceList, { enterpriseName: str }) + .pipe(map((res: any) => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum)))) + .toPromise(); + } else { + return of([]); + } + }, + + } as SFSelectWidgetSchema }, driverName: { title: '承运司机', @@ -143,7 +151,19 @@ export class TaxManagementOrderReportingComponent implements OnInit { }, } }, - serviceType: { + carNo3: { + title: '收款人', + type: 'string', + maxLength: 9, + ui: { + placeholder: '请输入', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } + }, + + serviceType2: { title: '上传状态', type: 'string', ui: { @@ -169,6 +189,19 @@ export class TaxManagementOrderReportingComponent implements OnInit { }, } }, + enterpriseInfoId: { + type: 'string', + title: '网络货运人', + ui: { + widget: 'select', + placeholder: '请选择', + allowClear: true, + visibleIf: { + _$expand: (value: boolean) => value + }, + asyncData: () => this.shipperservice.getNetworkFreightForwarder() + } + }, createTime: { title: '上传时间', type: 'string', @@ -181,32 +214,8 @@ export class TaxManagementOrderReportingComponent implements OnInit { }, } as SFDateWidgetSchema, }, - createTime1: { - title: '运单生成时间', - type: 'string', - ui: { - widget: 'sl-from-to', - type: 'date', - format: 'yyyy-MM-dd', - visibleIf: { - _$expand: (value: boolean) => value, - }, - } as SFDateWidgetSchema, - }, - createTime2: { - title: '发货时间', - type: 'string', - ui: { - widget: 'sl-from-to', - type: 'date', - format: 'yyyy-MM-dd', - visibleIf: { - _$expand: (value: boolean) => value, - }, - } as SFDateWidgetSchema, - }, createTime3: { - title: '收货时间', + title: '结束时间', type: 'string', ui: { widget: 'sl-from-to', @@ -217,39 +226,6 @@ export class TaxManagementOrderReportingComponent implements OnInit { }, } as SFDateWidgetSchema, }, - - loadingPlace: { - title: '车辆轨迹', - type: 'string', - enum: [ - { label: '全部', value: '' }, - { label: '有', value: '1' }, - { label: '无', value: '0' } - ], - ui: { - placeholder: '请选择', - widget: 'select', - visibleIf: { - _$expand: (value: boolean) => value, - }, - } - }, - loadingPlace1: { - title: '司机轨迹', - type: 'string', - enum: [ - { label: '全部', value: '' }, - { label: '有', value: '1' }, - { label: '无', value: '0' } - ], - ui: { - placeholder: '请选择', - widget: 'select', - visibleIf: { - _$expand: (value: boolean) => value, - }, - } - }, }, }; this.ui = { diff --git a/src/app/routes/tax-management/services/tax-management.service.ts b/src/app/routes/tax-management/services/tax-management.service.ts index cce4c4d7..93821ee1 100644 --- a/src/app/routes/tax-management/services/tax-management.service.ts +++ b/src/app/routes/tax-management/services/tax-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-27 10:30:56 * @LastEditors : Shiming - * @LastEditTime : 2022-03-30 14:05:39 + * @LastEditTime : 2022-03-30 14:18:01 * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\services\\tax-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -20,7 +20,8 @@ import { EAFileUtil } from 'src/app/shared/utils/file.util'; providedIn: 'root', }) export class TaxManagementService extends BaseService { - + // 获取货主企业列表 + public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; // 查询运营报表 $api_listOperationalReportPage = `/api/sdc/report/listOperationalReportPage`; $api_order_reporting_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表