From cdc839fb8f88e1d216f5600cb6c3b8c4cc4eb1fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Fri, 29 Apr 2022 15:00:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?UI=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bulk-detail/bulk-detail.component.less | 33 ----------------- .../vehicle-detail.component.html | 5 ++- .../vehicle-detail.component.less | 37 ------------------- .../bulk-detail/bulk-detail.component.less | 34 ----------------- .../vehicle-detail.component.less | 35 ------------------ .../vehicle-detail.component.html | 5 ++- src/styles/common/global.less | 2 +- 7 files changed, 7 insertions(+), 144 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.less b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.less index 2f8ec35b..7086580d 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.less +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.less @@ -32,38 +32,5 @@ padding-right: 100px; } - .handling-info { - min-height: 90px; - border: 1px solid #ccc; - .loading-row { - display: flex; - } - - .handling-info-icon { - width: 32px; - height: 32px; - margin-right: 24px; - color: #fff; - line-height: 32px; - text-align: center; - border-radius: 50%; - - &.loading-bg { - background-color: #50D4AB; - } - - &.unloaing-bg { - background: #F66F6A; - } - } - - .info { - flex: 1; - } - - .time-info { - margin-left: 56px; - } - } } diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index 77d86ed1..62179383 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -194,7 +194,8 @@ 运费信息 - + {{ item.price | currency }} @@ -228,7 +229,7 @@ 补充协议 - + 运费信息 （到货后{{i?.paymentDays}}天内支付运费） - - + + {{ item.price | currency }} diff --git a/src/styles/common/global.less b/src/styles/common/global.less index ebf343e7..c499a3a5 100644 --- a/src/styles/common/global.less +++ b/src/styles/common/global.less @@ -65,7 +65,7 @@ .handling-info { min-height: 100%; - border: 1px solid #ccc; + border: 1px solid #EAECEF; .loading-row { display: flex; From 17904dcf6c704c12d3755515cdae5e558d86985f Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 29 Apr 2022 15:08:34 +0800 Subject: [PATCH 2/2] fix bug --- .../sys-setting/sys-setting-routing.module.ts | 2 +- .../billing-order/billing-order.component.ts | 81 +++++++++++-------- 2 files changed, 47 insertions(+), 36 deletions(-) diff --git a/src/app/routes/sys-setting/sys-setting-routing.module.ts b/src/app/routes/sys-setting/sys-setting-routing.module.ts index c307b78d..2c2bec33 100644 --- a/src/app/routes/sys-setting/sys-setting-routing.module.ts +++ b/src/app/routes/sys-setting/sys-setting-routing.module.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-03 15:23:05 - * @LastEditTime : 2022-04-28 21:40:03 + * @LastEditTime : 2022-04-29 15:08:29 * @LastEditors : Shiming * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\sys-setting-routing.module.ts diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts index 7edcdb80..57ea5983 100644 --- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts +++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts @@ -20,14 +20,14 @@ export class BillingOrderComponent implements OnInit { _$expand = false; - constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router, private ar: ActivatedRoute) { } + constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router, private ar: ActivatedRoute) {} - ngOnInit(): void { } + ngOnInit(): void {} beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { Object.assign(requestOptions.body, { - ...this.sf?.value, + ...this.sf?.value }); } return requestOptions; @@ -77,34 +77,41 @@ export class BillingOrderComponent implements OnInit { serviceType: { title: '服务类型', type: 'string', - enum: [{ - label: '全部', - value: '' - },{ - label: '整车抢单', - value: 1 - },{ - label: '整车指派', - value: 2 - },{ - label: '大宗抢单', - value: 3 - },{ - label: '大宗指派', - value: 4 - },{ - label: '结算单', - value: 5 - }], + enum: [ + { + label: '全部', + value: '' + }, + { + label: '整车抢单', + value: 1 + }, + { + label: '整车指派', + value: 2 + }, + { + label: '大宗抢单', + value: 3 + }, + { + label: '大宗指派', + value: 4 + }, + { + label: '结算单', + value: 5 + } + ], ui: { - widget: 'select', + widget: 'select' } }, shipperAppUserName: { type: 'string', title: '货主名称', ui: { - placeholder: '请输入', + placeholder: '请输入' } }, vatappcode: { @@ -245,7 +252,7 @@ export class BillingOrderComponent implements OnInit { format: record => `${record.paymentMethodRate}%` }, { title: '货主名称', index: 'shipperAppUserName', width: '180px', className: 'text-center' }, - { title: '所属项目', index: 'enterpriseProjectName', width: '180px', className: 'text-center', }, + { title: '所属项目', index: 'enterpriseProjectName', width: '180px', className: 'text-center' }, { title: '服务类型', render: 'serviceType', @@ -260,30 +267,34 @@ export class BillingOrderComponent implements OnInit { title: '承运司机', index: 'driverName', className: 'text-center', - width: '120px', + width: '120px' }, { title: '车队长', className: 'text-center', width: '120px', - index: 'carCaptainName', + index: 'carCaptainName' }, - { title: '业务员', width: '100px', index: 'salesmanName', className: 'text-center', }, + { title: '业务员', width: '100px', index: 'salesmanName', className: 'text-center' }, // { title: '录单时间', index: 'recordTime', type: 'date', className: 'text-center', width: '150px' }, //TODO - { title: '装货时间', index: 'loadTime', type: 'date', width: '150px', className: 'text-center', }, - { title: '卸货时间', index: 'unloadTime', type: 'date', width: '150px', className: 'text-center', }, - { title: '订单完成时间', index: 'orderReceivingTime', type: 'date', width: 150, className: 'text-center', }, - { title: '支付完成时间', index: 'overallPaymentTime', type: 'date', width: 150, className: 'text-center', }, + { title: '装货时间', index: 'loadTime', type: 'date', width: '150px', className: 'text-center' }, + { title: '卸货时间', index: 'unloadTime', type: 'date', width: '150px', className: 'text-center' }, + { title: '订单完成时间', index: 'orderReceivingTime', type: 'date', width: 150, className: 'text-center' }, + { title: '支付完成时间', index: 'overallPaymentTime', type: 'date', width: 150, className: 'text-center' }, { title: '开票状态', index: 'sts', render: 'sts', className: 'text-center', width: 120 }, { title: '申请开票时间', index: 'vatappdate', type: 'date', className: 'text-center', width: 180 }, { title: '申请开票编号', index: 'vatappcode', className: 'text-center', width: 190 }, - { title: '分票编号', index: 'vatinvcode', width: '200px', className: 'text-center', }, - { title: '发票号码', index: 'invoiceno', width: 130, className: 'text-center', }, + { title: '分票编号', index: 'vatinvcode', width: '200px', className: 'text-center' }, + { title: '发票号码', index: 'invoiceno', width: 130, className: 'text-center' }, { title: '发票代码', index: 'invoiceno2', width: 130, className: 'text-center' }, { title: '开票日期', index: 'invoicedate', type: 'date', width: 150, className: 'text-center' }, // { title: '作废日期', index: 'invalidTime', type: 'date', width: 150 }, // TODO { - title: 'ETC开票金额', index: 'etcInvoiceMoney', className: 'text-center', width: 120, type: 'widget', + title: 'ETC开票金额', + index: 'etcInvoiceMoney', + className: 'text-center', + width: 120, + type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.etcInvoiceMoney }) } } ];