From 97fde5d6b9b02d39afc754ddc0326626a936ac58 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 24 Feb 2022 17:36:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/vehicle/vehicle.component.html | 59 +++++++++---- .../freight-config.component.html | 67 +++++++++++---- .../freight-config.component.ts | 86 +++++++++++++++---- .../insurance-table.component.html | 4 +- .../insurance-table.component.ts | 13 ++- 5 files changed, 167 insertions(+), 62 deletions(-) diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.html b/src/app/routes/supply-management/components/vehicle/vehicle.component.html index 533fd632..2d93d4c2 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.html @@ -13,12 +13,24 @@
- +
- + - - + + +
- +
- +
- + + - \ No newline at end of file + diff --git a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html index 86543345..bcc338a4 100644 --- a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html +++ b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html @@ -1,23 +1,56 @@ + - +
-
- -
-
- - - -
+
+ +
+
+ + + + +
- - - - \ No newline at end of file + + + + diff --git a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts index 31f5486b..fb001c08 100644 --- a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts +++ b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router, ActivatedRoute } from '@angular/router'; import { STColumn, STComponent, STRequestOptions, STData } from '@delon/abc/st'; -import { SFUISchema, SFSchema, SFComponent } from '@delon/form'; +import { SFUISchema, SFSchema, SFComponent, SFDateWidgetSchema } from '@delon/form'; import { ShipperBaseService, DynamicSettingModalComponent } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { AccountDetailComponent } from 'src/app/shared/components/account-detail/account-detail.component'; @@ -17,7 +17,7 @@ export class FreightConfigComponent implements OnInit { columns: STColumn[] = this.initST(); @ViewChild('st', { static: false }) st!: STComponent; @ViewChild('sf', { static: false }) sf!: SFComponent; - + _$expand = false; constructor(public service: UsermanageService, private modal: NzModalService, public shipperservice: ShipperBaseService) {} ngOnInit() { @@ -28,7 +28,11 @@ export class FreightConfigComponent implements OnInit { Object.assign(requestOptions.body, { listSource: 1 }); if (this.sf) { Object.assign(requestOptions.body, { - ...this.sf.value + ...this.sf.value, + createTime: { + start: this.sf?.value.effectiveDate[0], + end: this.sf?.value.effectiveDate[1] + } }); } return requestOptions; @@ -82,18 +86,25 @@ export class FreightConfigComponent implements OnInit { } this.service.downloadFile(this.service.$api_export_enterprise, params); } - + /** + * 伸缩查询条件 + */ + expandToggle(): void { + this._$expand = !this._$expand; + this.sf?.setValue('/_$expand', this._$expand); + } /** * 重置表单 */ - resetSF() { + resetSF(): void { this.sf.reset(); - this.st.reload(); + this._$expand = false; } private initSF(): SFSchema { return { properties: { + _$expand: { type: 'boolean', ui: { hidden: true } }, enterpriseName: { title: '企业名称', type: 'string', @@ -111,22 +122,47 @@ export class FreightConfigComponent implements OnInit { allowClear: true, asyncData: () => this.shipperservice.getNetworkFreightForwarder() } - } + }, + goodsSurchargeRatio: { + title: '货源单费率', + type: 'string', + ui: { + placeholder: '请输入', + showRequired: false + } + }, + contractSurchargeRatio: { + title: '合同单费率', + type: 'string', + ui: { + placeholder: '请输入', + showRequired: false, + visibleIf: { + _$expand: (value: boolean) => value + }, + } + }, + effectiveDate: { + title: '注册时间', + type: 'string', + ui: { + widget: 'date', + mode: 'range', + format: 'yyyy-MM-dd', + visibleIf: { + _$expand: (value: boolean) => value, + }, + allowClear: true, + } as SFDateWidgetSchema, + }, } }; } initST(): STColumn[] { return [ - { title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 160 }, - { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 160 }, - { - title: '合同单费率', - className: 'text-right', - index: 'contractSurchargeRatio', - width: 140, - format: item => `${item.contractSurchargeRatio}%` - }, + { title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 250 }, + { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 250 }, { title: '货源单费率', className: 'text-right', @@ -134,10 +170,17 @@ export class FreightConfigComponent implements OnInit { width: 140, format: item => `${item.goodsSurchargeRatio}%` }, + { + title: '合同单费率', + className: 'text-right', + index: 'contractSurchargeRatio', + width: 140, + format: item => `${item.contractSurchargeRatio}%` + }, { title: '合同单业务量（元）', index: 'contractQuota', - width: 100, + width: 180, type: 'widget', className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.contractQuota }) } @@ -145,14 +188,21 @@ export class FreightConfigComponent implements OnInit { { title: '货源单业务量（元）', index: 'goodsQuota', - width: 100, + width: 180, type: 'widget', className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.goodsQuota }) } }, + { + title: '注册时间', + index: 'createTime', + width: 180, + className: 'text-right', + }, { title: '操作', width: '110px', + fixed: 'right', className: 'text-center', buttons: [ { diff --git a/src/app/shared/components/insurance-table/insurance-table.component.html b/src/app/shared/components/insurance-table/insurance-table.component.html index f70d03ab..aa1dd8a6 100644 --- a/src/app/shared/components/insurance-table/insurance-table.component.html +++ b/src/app/shared/components/insurance-table/insurance-table.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-25 20:18:52 * @LastEditors : Shiming - * @LastEditTime : 2022-02-14 10:14:19 + * @LastEditTime : 2022-02-24 17:35:11 * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\insurance-table\\insurance-table.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -70,7 +70,7 @@
- 删除 diff --git a/src/app/shared/components/insurance-table/insurance-table.component.ts b/src/app/shared/components/insurance-table/insurance-table.component.ts index d239cdd1..030e3d81 100644 --- a/src/app/shared/components/insurance-table/insurance-table.component.ts +++ b/src/app/shared/components/insurance-table/insurance-table.component.ts @@ -64,7 +64,7 @@ export class InsuranceTableComponent implements OnInit { }; this.ui = { '*': { - spanLabelFixed: 140, + spanLabelFixed: 160, grid: { span: 24 } }, $freightPrice: { @@ -141,12 +141,11 @@ export class InsuranceTableComponent implements OnInit { deleteRow(index: number) { console.log(index); - this.data = this.data.filter((d, i) => { - console.log(d); - console.log(i); - index !== i; - }); - console.log(this.data); + var newArr = this.data.concat(); + newArr.splice(this.data.length-1,1) + // this.data = this.data.pop() + console.log(newArr); + this.data = [...newArr]; } save() {