From 181d85c7ebd5eca34de8b777cb9427bb254c324c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Mon, 18 Apr 2022 09:22:21 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E8=BF=90=E8=B4=B9?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/bulk/bulk.component.ts | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index e4944856..6504791e 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -60,7 +60,7 @@ export class OrderManagementBulkComponent implements OnInit { public shipperservice: ShipperBaseService, private router: Router, private ar: ActivatedRoute, - ) {} + ) { } /** * 查询参数 @@ -108,7 +108,7 @@ export class OrderManagementBulkComponent implements OnInit { this.loading = false return data.map(item => ({ ...item, - disabled: item.billStatus !== '4' + disabled: item.billStatus !== '4' })); }; get selectedRows() { @@ -185,14 +185,14 @@ export class OrderManagementBulkComponent implements OnInit { type: 'string', title: '订单号', ui: { - placeholder: '最多100个单号，空号隔开', + placeholder: '最多100个单号，空号隔开', } }, wayBillCode: { type: 'string', title: '运单号', ui: { - placeholder: '最多100个单号，空号隔开', + placeholder: '最多100个单号，空号隔开', } }, resourceCode: { @@ -212,7 +212,7 @@ export class OrderManagementBulkComponent implements OnInit { _$expand: (value: boolean) => value }, onSearch: (q: any) => { - let str =q.replace(/^\s+|\s+$/g,""); + let str = q.replace(/^\s+|\s+$/g, ""); if (str) { return this.service .request(this.service.$api_enterpriceList, { enterpriseName: str }) @@ -469,7 +469,7 @@ export class OrderManagementBulkComponent implements OnInit { width: '180px', className: 'text-left', format: (item: any) => - `${item?.goodsName}/ + `${item?.goodsName}/ ${item?.weight || '0'}吨/ ${item?.volume || '0'}方/ ${item?.goodsNumber || '0'}件` @@ -559,7 +559,10 @@ export class OrderManagementBulkComponent implements OnInit { { text: '变更运费', click: _record => this.updateFreight(_record), - iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus != '2', + iif: _record => { + const flag = _record.mybidDetailInfo.find((item: any) => item?.expenseCode === 'TRA' && item?.paymentStatus === '4'); + return _record.billStatus !== '1' && _record.billStatus !== '6' && !flag; + }, acl: { ability: ['ORDER-BULK-FreightChangeBulkDetail'] }, }, { @@ -857,6 +860,6 @@ export class OrderManagementBulkComponent implements OnInit { } // 导出 exprot() { - this.service.exportStart({ ...this.reqParams, pageSize: -1 },this.service.$api_get_asyncExportBulkList); + this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportBulkList); } } From 82169c54e1b4139a70a1b2166c575fdea6666614 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 18 Apr 2022 09:53:08 +0800 Subject: [PATCH 2/6] edit --- .../customer/customer.component.html | 64 +++++++------- .../customer/customer.component.less | 13 +-- .../compliance/customer/customer.component.ts | 86 +++++++++++-------- 3 files changed, 90 insertions(+), 73 deletions(-) diff --git a/src/app/routes/datatable/components/compliance/customer/customer.component.html b/src/app/routes/datatable/components/compliance/customer/customer.component.html index 91c993cd..72e8b283 100644 --- a/src/app/routes/datatable/components/compliance/customer/customer.component.html +++ b/src/app/routes/datatable/components/compliance/customer/customer.component.html @@ -11,35 +11,39 @@ - -
-
- - - - - - -
- - -
- +
+
+ + +
+
+ + + + + + +
+ + +
+
+
+ +
- - - {{ item.freightPrice | currency }} - - - + + + + {{ item.freightPrice | currency }} + + + \ No newline at end of file diff --git a/src/app/routes/datatable/components/compliance/customer/customer.component.less b/src/app/routes/datatable/components/compliance/customer/customer.component.less index 6b4b1cba..6946d442 100644 --- a/src/app/routes/datatable/components/compliance/customer/customer.component.less +++ b/src/app/routes/datatable/components/compliance/customer/customer.component.less @@ -1,11 +1,14 @@ -.chooseBox{ +.chooseBox { display: flex; + float : right; } -.timeBox{ + +.timeBox { display: flex; - margin: 0 0 0 10px; + margin : 0 0 0 10px; } -.dateBox{ + +.dateBox { display: inline-block; - margin: 0 0 0 10px; + margin : 0 0 0 10px; } \ No newline at end of file diff --git a/src/app/routes/datatable/components/compliance/customer/customer.component.ts b/src/app/routes/datatable/components/compliance/customer/customer.component.ts index 72bd8ee4..48adcd1a 100644 --- a/src/app/routes/datatable/components/compliance/customer/customer.component.ts +++ b/src/app/routes/datatable/components/compliance/customer/customer.component.ts @@ -1,6 +1,6 @@ import { SFComponent } from '@delon/form'; /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2022-03-30 13:55:41 @@ -12,7 +12,7 @@ import { SFComponent } from '@delon/form'; import { Component, OnInit, ViewChild } from '@angular/core'; import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; import { SFSchema } from '@delon/form'; -import { ModalHelper, _HttpClient ,DatePipe} from '@delon/theme'; +import { ModalHelper, _HttpClient, DatePipe } from '@delon/theme'; import { DataService } from '../../../services/data.service'; import { differenceInCalendarDays } from 'date-fns'; @@ -21,19 +21,18 @@ import { differenceInCalendarDays } from 'date-fns'; templateUrl: './customer.component.html', styleUrls: ['./customer.component.less'], providers: [DatePipe] - }) export class DatatableComplianceCustomerComponent implements OnInit { - @ViewChild('sf', {static: false}) sf!: SFComponent + @ViewChild('sf', { static: false }) sf!: SFComponent; mode = 'year'; type = 1; date: any = null; defineDate = []; - time: any = ['2022'] + time: any = ['2022']; dateFormat = 'yyyy'; dateNext: any = null; modeNext = 'year'; - timeNext: any = ['2022-01-01 00:00:00'] + timeNext: any = ['2022-01-01 00:00:00']; today = new Date(); searchSchema: SFSchema = { properties: { @@ -49,13 +48,22 @@ export class DatatableComplianceCustomerComponent implements OnInit { type: 'string', title: '合伙人名称' }, + no4: { + type: 'string', + title: '', + ui: { + class: 'text-right', + widget: 'custom', + grid: { xxl: 9, xl: 24, lg: 24, md: 24, sm: 24, xs: 24 } + } + } } }; @ViewChild('st') private readonly st!: STComponent; columns: STColumn[] = [ - { title: '公司名称', index: 'enterpriseName' ,}, - { title: '注册时间', index: 'registerTime' }, - { title: '客户类型', width: '100px', index: 'customerType' }, + { title: '公司名称', index: 'enterpriseName' }, + { title: '注册时间', index: 'registerTime' }, + { title: '客户类型', width: '100px', index: 'customerType' }, { title: '业务员', index: 'salesmanName' }, { title: '合伙人', index: 'partnerName' }, { title: '订单数', index: 'billCounts' }, @@ -68,53 +76,55 @@ export class DatatableComplianceCustomerComponent implements OnInit { { title: '运费代收单数', index: 'freightRepPayCounts' }, { title: '手机直付', index: 'updatedAt' }, { title: '汇款单数', index: 'updatedAt' }, - { title: '及时付款', index: 'timelyPayPer' }, - + { title: '及时付款', index: 'timelyPayPer' } ]; - constructor(private http: _HttpClient, private modal: ModalHelper,public service: DataService,private datePipe: DatePipe) { } - /** + constructor(private http: _HttpClient, private modal: ModalHelper, public service: DataService, private datePipe: DatePipe) {} + /** * 查询参数 */ - get reqParams() { - if (this.mode === 'year') { - this.type = 1 - } else if (this.mode === 'month') { - this.type = 2 - } else if (this.mode === 'date') { - this.type = 3 - } else { - this.type = 4 - } - const params: any = Object.assign({}, this.sf?.value || {}); - params.type = this.type - params.queryTime = this.time - delete params._$expand; - return { ...params }; + get reqParams() { + if (this.mode === 'year') { + this.type = 1; + } else if (this.mode === 'month') { + this.type = 2; + } else if (this.mode === 'date') { + this.type = 3; + } else { + this.type = 4; } - ngOnInit(): void { } + const params: any = Object.assign({}, this.sf?.value || {}); + params.type = this.type; + params.queryTime = this.time; + delete params._$expand; + return { ...params }; + } + ngOnInit(): void {} onChange(result: any) { if (this.mode === 'year') { - this.time = [this.datePipe.transform(this.date, 'yyyy') + '-01-01 00:00:00'] + this.time = [this.datePipe.transform(this.date, 'yyyy') + '-01-01 00:00:00']; } else if (this.mode === 'month') { - this.time = [this.datePipe.transform(this.date, 'yyyy-MM') + '-01 00:00:00'] + this.time = [this.datePipe.transform(this.date, 'yyyy-MM') + '-01 00:00:00']; } else if (this.mode === 'date') { - this.time = [this.datePipe.transform(this.date, 'yyyy-MM-dd') + ' 00:00:00'] + this.time = [this.datePipe.transform(this.date, 'yyyy-MM-dd') + ' 00:00:00']; } else { - this.time = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd') + '00:00:00', this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') + ' 00:00:00'] + this.time = [ + this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd') + '00:00:00', + this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') + ' 00:00:00' + ]; } this.st.reload({ ...this.reqParams }); } changeData() { if (this.mode === 'year') { - this.dateFormat = 'yyyy' + this.dateFormat = 'yyyy'; } else if (this.mode === 'month') { - this.dateFormat = 'yyyy-MM' + this.dateFormat = 'yyyy-MM'; } else { - this.dateFormat = 'yyyy-MM-dd' + this.dateFormat = 'yyyy-MM-dd'; } } disabledDate = (current: Date): boolean => - // Can not select days before today and today - differenceInCalendarDays(current, this.today) > 0; + // Can not select days before today and today + differenceInCalendarDays(current, this.today) > 0; } From f6084ea1e6d3707b753b0eccda6f7025d79c0f81 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 18 Apr 2022 10:09:04 +0800 Subject: [PATCH 3/6] edit --- .../components/order-reporting/order-reporting.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html index c577b27c..447d37b7 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html @@ -90,7 +90,7 @@
-
{{item?.orderAmount | currency :' '}}
+
{{item?.orderAmount | currency }}
 From 2005110dcb62a14692166104d45a16aca783cc1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Mon, 18 Apr 2022 10:14:24 +0800 Subject: [PATCH 4/6] - --- .../abnormal-appear/abnormal-appear.component.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts index 11f3354e..5f02d97d 100644 --- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts +++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts @@ -45,6 +45,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit { columns: STColumn[] = [ { title: '异常编号', index: 'exceptionCode', width: '180px', className: 'text-left' }, + { title: '异常类型', index: 'exceptionTypeLabel', width: '180px', className: 'text-left' }, { title: '关联运单号', index: 'wayBillCode', width: '180px', className: 'text-left' }, { title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' }, { title: '货主', index: 'shipperAppUserName', width: '250px', className: 'text-left' }, @@ -57,6 +58,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit { ]; columns2: STColumn[] = [ { title: '异常编号', index: 'exceptionCode', width: '180px', className: 'text-left' }, + { title: '异常类型', index: 'exceptionTypeLabel', width: '180px', className: 'text-left' }, { title: '关联运单号', index: 'wayBillCode', width: '180px', className: 'text-left' }, { title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-left' }, { title: '货主', index: 'shipperAppUserName', width: '180px', className: 'text-left' }, @@ -71,22 +73,22 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit { { title: '回复时间', index: 'replyTime', width: '180px', className: 'text-left' } ]; resourceStatus: number | undefined; - + get reqParams() { return { ...this.sf?.value, - replyStatus: this.resourceStatus || 0 + replyStatus: this.resourceStatus || 0 }; } get reqParams2() { return { ...this.sf?.value, - replyStatus:this.resourceStatus || 1 + replyStatus: this.resourceStatus || 1 }; } - constructor(public service: WaybillManagementServe, private nzModalService: NzModalService, public shipperSrv: ShipperBaseService) {} + constructor(public service: WaybillManagementServe, private nzModalService: NzModalService, public shipperSrv: ShipperBaseService) { } ngOnInit(): void { this.initSF(); @@ -217,7 +219,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit { } selectChange(e: number) { console.log(e); - this.resourceStatus = e ; + this.resourceStatus = e; setTimeout(() => { this?.st?.load(1); this?.st2?.load(1); From df934dbddd2f4cdddad47098275bba5b9c44d826 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 18 Apr 2022 10:53:13 +0800 Subject: [PATCH 5/6] edit --- .../etc-invoiced-requested/etc-invoiced-requested.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts index 7955bc1a..08ea0663 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts @@ -223,7 +223,7 @@ export class ETCInvoicedRequestedComponent implements OnInit { { title: '卸货地', index: 'dischargePlace', width: '220px' }, { title: '司机信息', render: 'call1No', width: '140px' }, { title: '车辆信息', render: 'call1N2o', width: '200px' }, - { title: '车牌颜色', index: 'licenseCarNOColor', width: '140px' }, + { title: '车牌颜色', index: 'licenseCarNOColorLabel', width: '140px' }, { title: '车辆是否已备案', index: 'putOnRecord', width: '150px', type: 'enum', enum: { false: '否', true: '是' } }, { title: '托运人', index: 'shipperAppUserName', width: '140px' }, { title: '网络货运人', index: 'enterpriseInfoName', width: '220px' }, From d4e27d47ebce04e08838b164f7f8b7fff16b3fcf Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 18 Apr 2022 10:55:32 +0800 Subject: [PATCH 6/6] edit --- .../etc-invoiced-requested/etc-invoiced-requested.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts index 08ea0663..ca47acbf 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts @@ -224,7 +224,7 @@ export class ETCInvoicedRequestedComponent implements OnInit { { title: '司机信息', render: 'call1No', width: '140px' }, { title: '车辆信息', render: 'call1N2o', width: '200px' }, { title: '车牌颜色', index: 'licenseCarNOColorLabel', width: '140px' }, - { title: '车辆是否已备案', index: 'putOnRecord', width: '150px', type: 'enum', enum: { false: '否', true: '是' } }, + { title: '车辆是否已备案', index: 'putOnRecord', width: '150px', type: 'enum', enum: { false: '是', true: '否' } }, { title: '托运人', index: 'shipperAppUserName', width: '140px' }, { title: '网络货运人', index: 'enterpriseInfoName', width: '220px' }, { title: '接单时间', index: 'orderReceivingTime', type: 'date', width: '150px' },