From 3229f8275495ef8304f29ee1c8984502692ae4a0 Mon Sep 17 00:00:00 2001 From: weiyu Date: Sat, 7 May 2022 11:31:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bulk-publish/bulk-publish.component.html | 8 +- .../bulk-release-publish.component.html | 389 ++++++++---------- .../bulk-release-publish.component.less | 97 +++++ .../bulk-release-publish.component.ts | 42 +- 4 files changed, 296 insertions(+), 240 deletions(-) diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html index 8e7b3d7c..7bd237d5 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html @@ -106,7 +106,7 @@ + (ngModelChange)="i.setValue($event)" [nzPrecision]="2" style="width: 100%;border-radius: 4px 0 0 4px;"> @@ -135,19 +135,19 @@ + style="width: 100%;border-radius: 4px 0 0 4px;"> + style="width: 100%;border-radius: 4px 0 0 4px;"> + style="width: 100%;border-radius: 4px 0 0 4px;"> diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html index 20624310..a9b8a94f 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html @@ -5,233 +5,182 @@ - -
货源单设置
- - {{ i.value }} - - +
+ +
货源单设置
+ + {{ i.value }} + + - -
装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
- -
-
-
-
- - 装货地 - -
- - - -
- - - - 联系人 -
- - - - - - -
- -
-
-
-
- -
-
-
-
- - 卸货地 - -
- - - -
- - - - 联系人 -
- - - - - - -
- -
-
+ +
装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
- - - - -
货物信息
-
-
- - - - - - - - - - - - - -
- - - - - - - -

例如 付司机运费 = 重量*单价 = 999.99

-

保留小数，即 999.99

-

抹除小数，即 999.00

-

抹除个位，即 990.00

+
+
+
+
+ + 装货地 + +
+ + + +
+ + + + 联系人 +
+
+ + + + + + +
+
+ + +
+
+
+
+ +
+
+
+
+ + 卸货地 + +
+ + + +
+ + + + 联系人 +
+
+ + + + + + +
+
+ +
+
+
+ +
+ + + +
货物信息
+
+
+ + + + + + + + + + + -
- - - - - - - - - - - - - - - - - + + +
+ + + + + + + +

例如 付司机运费 = 重量*单价 = 999.99

+

保留小数，即 999.99

+

抹除小数，即 999.00

+

抹除个位，即 990.00

+ +
+ + + + + + + + + + + + + + + + + +
-
- + - -
补充信息
-
-
- - -
-
-
- -
-
-  天内支付运费 + +
补充信息
+
+
+ + +
+
+
+ +
+
+  天内支付运费 +
-
- - + + +
-
- + - -
- - - - -
- + +
+ + + + +
+ +
\ No newline at end of file diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.less b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.less index 6abb9df7..01ea397a 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.less +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.less @@ -46,3 +46,100 @@ input[type='number']::-webkit-outer-spin-button { margin: 0; -webkit-appearance: none; } + +.custom-style { + ::ng-deep { + .ant-card { + margin-bottom: 0; + } + + .ant-card-body { + padding-bottom: 0; + } + + .ant-card-bordered { + border: 0 none; + } + + .card-title { + display: flex; + align-items: center; + + >span { + margin-left: 8px; + font-size: 14px; + + em { + font-style: normal; + color: #E60012; + } + } + + &::before { + content: ''; + display: inline-block; + width: 2px; + height: 16px; + margin-right: 10px; + background: #E60012; + } + } + + .ant-btn-dangerous { + border-radius: 4px; + color: #CF3834; + border-color: rgba(207, 56, 52, 0.5); + } + + .icon-wrap { + display: flex; + justify-content: center; + height: 100%; + } + + .swap-icon { + background: url('/assets/images/frame.png') no-repeat 50% 50%; + cursor: pointer; + } + + .ant-input-affix-wrapper, + .ant-input, + .ant-picker, + .ant-select-selector, + .ant-input-number-input, + .ant-input-number { + border-radius: 4px ; + } + .ant-input-group-addon { + border-radius: 0 4px 4px 0; + } + .align-center { + .ant-btn { + height: 40px; + padding: 0 23px; + font-size: 16px; + border-radius: 3px; + } + } + .ant-select-arrow { + transform: scaleX(1.5) translateY(2px); + color: rgb(153,153,153); + font-size: 8px; + } + .ant-picker-suffix { + color: #333; + } + .btn-wrap { + margin-top: 20px; + padding-bottom: 20px; + } + .ant-alert { + padding: 6px 16px; + border-radius: 2px; + font-size: 14px; + } + .fc { + color: #f5222d; + } + } +} diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts index 789f2339..655daf5a 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts @@ -223,11 +223,8 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { }; this.ui1 = { '*': { - spanLabelFixed: 110, - grid: { span: 12 } - }, - $enterpriseInfoName: { - grid: { span: 24 } + spanLabelFixed: 115, + grid: { span: 8 } } }; } @@ -303,8 +300,14 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { }; this.ui3 = { '*': { - spanLabelFixed: 90, + spanLabelFixed: 115, grid: { span: 12 } + }, + $goodsNameId: { + spanLabelFixed: 10 + }, + $goodsTips: { + grid: { span: 24 } } }; } @@ -411,33 +414,37 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { }; this.ui4 = { '*': { - spanLabelFixed: 90, - grid: { span: 24 } + spanLabelFixed: 115, + grid: { span: 12 } }, $freightPrice: { grid: { span: 8 } }, $rule: { + spanLabelFixed: 10, grid: { span: 8 } }, $settlementBasis: { + spanLabelFixed: 10, grid: { span: 8 } }, $weight: { - grid: { lg: 8, md: 12, sm: 12, xs: 24 } + grid: { span: 4 } }, $volume: { - grid: { lg: 8, md: 12, sm: 12, xs: 24 } + spanLabelFixed: 10, + grid: { span: 4 } }, $number: { - grid: { lg: 8, md: 12, sm: 12, xs: 24 } + spanLabelFixed: 10, + grid: { span: 4 } }, $carModel: { - spanLabelFixed: 120, - grid: { span: 8 } + grid: { span: 6 } }, $carLength: { - grid: { span: 8 } + spanLabelFixed: 10, + grid: { span: 6 } } }; } @@ -527,7 +534,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { ui: { widget: 'textarea', placeholder: '请输入', - autosize: { minRows: 3, maxRows: 3 } + autosize: { minRows: 1, maxRows: 1 } } as SFTextareaWidgetSchema } }, @@ -535,7 +542,10 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { }; this.ui6 = { '*': { - spanLabelFixed: 90, + spanLabelFixed: 115, + grid: { span: 8 } + }, + $remarks: { grid: { span: 24 } } }; From 1d76809e3a034eaa540e7a69c0c6efe0792d338b Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Sat, 7 May 2022 13:29:42 +0800 Subject: [PATCH 2/2] UI --- proxy.conf.js | 2 +- src/app/global-config.module.ts | 1 + src/app/routes/commom/less/commom-table.less | 8 +-- .../fund-reporting.component.less | 5 -- .../fund-reporting.component.spec.ts | 24 -------- .../freight/list/list.component.html | 42 ++++++++++--- .../components/freight/list/list.component.ts | 60 ++++++++++--------- 7 files changed, 72 insertions(+), 70 deletions(-) delete mode 100644 src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.less delete mode 100644 src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.spec.ts diff --git a/proxy.conf.js b/proxy.conf.js index d58ece8c..21093efc 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/global-config.module.ts b/src/app/global-config.module.ts index faeed3b0..8ffa9a12 100644 --- a/src/app/global-config.module.ts +++ b/src/app/global-config.module.ts @@ -12,6 +12,7 @@ import { environment } from '@env/environment'; const alainConfig: AlainConfig = { st: { + bordered: true, req: { method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' } }, res: { reName: { list: 'data.records', total: 'data.total' } }, page: { show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000], toTop: false }, diff --git a/src/app/routes/commom/less/commom-table.less b/src/app/routes/commom/less/commom-table.less index 152d7534..ff5ea6f4 100644 --- a/src/app/routes/commom/less/commom-table.less +++ b/src/app/routes/commom/less/commom-table.less @@ -113,9 +113,9 @@ line-height: 21px; } - .text-truncate { - white-space: normal; - } + // .text-truncate { + // white-space: normal; + // } } } @@ -138,4 +138,4 @@ } } -.height_box{} \ No newline at end of file +.height_box {} \ No newline at end of file diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.less b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.less deleted file mode 100644 index 6009fbbf..00000000 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.less +++ /dev/null @@ -1,5 +0,0 @@ -:host { - .text-black { - color: #000; - } -} diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.spec.ts b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.spec.ts deleted file mode 100644 index fb500388..00000000 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { DatatableFundReportingComponent } from './fund-reporting.component'; - -describe('DatatableFundReportingComponent', () => { - let component: DatatableFundReportingComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [DatatableFundReportingComponent] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(DatatableFundReportingComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html index 018efd10..d8652768 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -26,15 +26,23 @@
-
- +
+
+ + +
+
    +
  • + 高级筛选 +
  • 新增企业
    • @@ -52,8 +60,7 @@ - -
    + @@ -68,16 +75,35 @@ - {{ item.contacter }}
    /{{item.mobile}} +

    + {{ item.contacter }} +

    +     + +

    + {{ item.customerServiceIdLabel }} +

    - {{ item.partnerName }}
    /{{item.partnerMobile}} +

    + {{ item.partnerName }} +

    - {{ item.channelName }}
    {{ item.channelMobile }} +

    + {{ item.channelName }} +

    diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index 2d8995c3..70185274 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { STChange, STColumn, STColumnBadge, STComponent, STData, STRequestOptions } from '@delon/abc/st'; -import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; +import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st'; +import { SFDateWidgetSchema } from '@delon/form'; import { DynamicSettingModalComponent, SearchDrawerService, ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { BasicTableComponent } from 'src/app/routes/commom'; @@ -24,6 +24,9 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen promotersTelephone = ''; loadingList = true; + + sfValue = { enterpriseName: '', contactName: '' }; + constructor( public service: UsermanageService, private modal: NzModalService, @@ -195,12 +198,6 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen initSF() { this.schema = { properties: { - expand: { - type: 'boolean', - ui: { - hidden: true - } - }, enterpriseName: { title: '企业名称', type: 'string', @@ -340,7 +337,7 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen { label: '全部', value: '' }, { label: '货主注册', value: 1 }, { label: '平台添加', value: 2 }, - { label: '数据迁移', value: 4 }, + { label: '数据迁移', value: 4 } ], default: '', ui: { @@ -377,24 +374,31 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen initST() { this.columns = [ { title: '', type: 'checkbox', className: 'text-center' }, - { title: '企业名称', render: 'enterpriseName', width: 350 }, - { title: '统一社会信用代码', className: 'text-center', render: 'unifiedSocialCreditCode', width: 200 }, + { + title: '企业名称', + index: 'enterpriseName', + width: 250, + type: 'link', + click: item => this.router.navigate(['./detail', item.id], { relativeTo: this.ar }) + }, + { title: '企业评分', className: 'text-center', render: 'score', width: 160 }, { title: '公司所在地', - className: 'text-center', index: 'province', width: 200, format: item => `${item.provinceName}${item.cityName}${item.areaName}` }, + { title: '管理员', render: 'contacter', width: 150 }, + { title: '统一社会信用代码', className: 'text-center', render: 'unifiedSocialCreditCode', width: 200 }, { title: '企业类型', className: 'text-center', index: 'enterpriseType', - width: 200, + width: 160, type: 'enum', enum: { 1: '物流企业', 2: '货运代理', 3: '生产型企业', 4: '贸易类企业', 5: '科技型企业', 6: '化学化工企业', 7: '其他' } }, - { title: '管理员', className: 'text-center', render: 'contacter', width: 150 }, + { title: '常用服务', className: 'text-center', @@ -405,14 +409,14 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen }, { title: '渠道销售', className: 'text-center', render: 'promotersTelephone', width: 150 }, { title: '合伙人', className: 'text-center', render: 'partnerName', width: 150 }, - { title: '客服人员', className: 'text-center', index: 'customerServiceIdLabel', width: 150 }, + { title: '客服人员', className: 'text-center', render: 'customerServiceIdLabel', width: 150 }, { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 }, { title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', - enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加', 4: '数据迁移' }, + enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加', 4: '数据迁移' }, width: 130 }, { title: '申请时间', className: 'text-center', index: 'createTime', width: 180, type: 'date' }, @@ -442,18 +446,18 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen }, { title: '操作', - width: '200px', - className: 'text-center block-td', + width: '180px', + className: 'text-center ', fixed: 'right', buttons: [ - { - text: '查看', - acl: { ability: ['USERCENTER-FREIGHT-LIST-view'] }, - click: item => { - this.router.navigate(['./detail', item.id], { relativeTo: this.ar }); - // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } }); - } - }, + // { + // text: '查看', + // acl: { ability: ['USERCENTER-FREIGHT-LIST-view'] }, + // click: item => { + // this.router.navigate(['./detail', item.id], { relativeTo: this.ar }); + // // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } }); + // } + // }, // { // acl: { ability: ['USERCENTER-FREIGHT-LIST-basicSetting'] }, // text: '基础设置', @@ -465,9 +469,9 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen click: item => this.showAccountDetail(item) }, { - text: '分配客服人员', + text: '分配客服', click: item => this.showService(item) - }, + } // { // text: '修改合伙人', // click: item => this.editPartner(item)