From a6f7d87d65ca70ca1b8536b836d63da6692d8698 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 6 May 2022 16:29:27 +0800 Subject: [PATCH 01/19] fix bug --- .../partner-audit-modal.component.ts | 31 ++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts index 5c7ed101..d9b46fc3 100644 --- a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts +++ b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts @@ -2,6 +2,7 @@ import { Component, Input, OnInit, ViewChild } from '@angular/core'; import { SFComponent, SFSchema, SFValue } from '@delon/form'; import { ModalHelper } from '@delon/theme'; import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; +import { map } from 'rxjs/operators'; import { PartnerListService } from '../../services/partner-list.service'; @Component({ @@ -22,6 +23,7 @@ export class PartnerAuditModalComponent implements OnInit { ngOnInit(): void { console.log(this.info); this.initSF(this.info); + // asyncData: () => this.service.getChannel(), if(this.info.channelId) { const value = [{ @@ -30,14 +32,30 @@ export class PartnerAuditModalComponent implements OnInit { }] setTimeout(() => { if(this.sf) { - console.log('888'); - - // this.sf.getProperty('/channelId')!.schema.enum = value; - // this.sf.getProperty('/channelId')!.widget.reset(value); + this.sf.getProperty('/channelId')!.schema.enum = value; + this.sf.getProperty('/channelId')!.widget.reset(value); this.sf.setValue('/channelId', this.info.channelId); } }) + } else { + console.log() + this.service.getChannel().pipe(map(data => { + console.log(data); + + })) + this.service.getChannel().subscribe((res) => { + console.log(res); + const value :any= res; + setTimeout(() => { + if(this.sf) { + this.sf.getProperty('/channelId')!.schema.enum = value; + this.sf.getProperty('/channelId')!.widget.reset(value); + this.sf.setValue('/channelId', value); + } + }) + }) + } } @@ -49,13 +67,13 @@ export class PartnerAuditModalComponent implements OnInit { ui: { hidden: true }, - // default: this.info.isPass + default: this.info.isPass }, staffName: { title: '合伙人名称', type: 'string', ui: { widget: 'text' }, - // default: user.enterpriseName + default: user.enterpriseName }, status: { title: '审核结果', @@ -78,7 +96,6 @@ export class PartnerAuditModalComponent implements OnInit { widget: 'select', placeholder: '请选择', allowClear: true, - asyncData: () => this.service.getChannel(), hidden: this.info.isPass === false, visibleIf: { status: value => value From 2713ff9b3b2a9d40817b849ce0d3c70d5a8cfd78 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 6 May 2022 16:37:20 +0800 Subject: [PATCH 02/19] fix bug --- .../components/rebate-setting/rebate-setting.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html index c0655917..2d7ed4b7 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-24 20:09:49 * @LastEditors : Shiming - * @LastEditTime : 2022-03-29 11:14:08 + * @LastEditTime : 2022-05-06 16:37:06 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\rebate-setting.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -23,7 +23,7 @@ >
- +
From f465578e7fbfd187a7343b1d8e4bed14d77ba7a8 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 6 May 2022 17:02:32 +0800 Subject: [PATCH 03/19] fix bug --- proxy.conf.js | 4 ++-- .../index/partner-list.component.ts | 2 +- .../list/detail/detail.component.ts | 20 +++++++++++-------- .../services/business/shipper-base.service.ts | 9 +++++++-- 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index d58ece8c..28e2be41 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-05-06 16:05:45 + * @LastEditTime : 2022-05-06 16:57:23 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -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/routes/partner/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts index a72ff7af..2d7a60ef 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts +++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts @@ -55,7 +55,7 @@ export class PartnerListComponent { }; loadSelectOptions() { - this.service.getRebateConfig().subscribe(res => { + this.service.getRebateConfig({stateLocked: 1}).subscribe(res => { if (res) { console.log(res); diff --git a/src/app/routes/vehicle/components/list/detail/detail.component.ts b/src/app/routes/vehicle/components/list/detail/detail.component.ts index 418b62b2..66707ca1 100644 --- a/src/app/routes/vehicle/components/list/detail/detail.component.ts +++ b/src/app/routes/vehicle/components/list/detail/detail.component.ts @@ -203,14 +203,18 @@ export class VehicleComponentsListDetailComponent implements OnInit { *查看评价 */ viewEvaluate(item: any) { - console.log(item); - this.st.reload(); - this.getDetailList(); - const params = { - imgList: [item.carProtocal], - index: 0 - }; - this.nzImageService.preview([{ src: item.carProtocal}]); + // console.log(item); + // this.st.reload(); + // this.getDetailList(); + // const params = { + // imgList: [item.carProtocal], + // index: 0 + // }; + // this.nzImageService.preview([{ src: item.carProtocal}]); + this.modal.createStatic(VehicleImgViewComponent, { i: item }).subscribe(() => { + this.st.reload(); + this.getDetailList(); + }); } /** *查看评价 diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts index 804c531a..ff9837af 100644 --- a/src/app/shared/services/business/shipper-base.service.ts +++ b/src/app/shared/services/business/shipper-base.service.ts @@ -383,8 +383,13 @@ export class ShipperBaseService extends BaseService { * 获取全部返佣配置 * @returns */ - getRebateConfig() { - const params = {}; + getRebateConfig(value?: any) { + const params:any = {}; + if(value) { + params.stateLocked = 1 + } + console.log(params); + return this.request(this.$api_get_rebate_config, params, 'POST').pipe( map(res => { if (res) { From 9c3d26fb81cc44044ac9bd92647cdcb82ad3d271 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 6 May 2022 17:19:16 +0800 Subject: [PATCH 04/19] fix bug --- proxy.conf.js | 4 ++-- .../withdrawals-record.component.ts | 6 ++++++ .../withdrawals-record.component.ts | 11 +++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 28e2be41..1bd3c8df 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-05-06 16:57:23 + * @LastEditTime : 2022-05-06 17:09:51 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts index 24d45038..8491ea1d 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts @@ -83,6 +83,12 @@ export class WithdrawalsRecordComponent extends BasicTableComponent { if (item) { params = [item.id]; } else { + console.log(this.selectedRows); + + if (this.selectedRows.length <= 0) { + this.service.msgSrv.error('请选择提现单！'); + return; + } params = this.selectedRows.map(node => node.id); } const modal = this.nzModalService.create({ diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts index 3c579f38..5a26c0ba 100644 --- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts @@ -107,6 +107,11 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni if (item) { params = [item.id]; } else { + + if (this.selectedRows.length <= 0) { + this.service.msgSrv.error('请选择提现单！'); + return; + } params = this.selectedRows.map(node => node.id); } const modal = this.nzModalService.create({ @@ -117,6 +122,10 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni label: '拒绝', type: 'default', onClick: () => { + if (!this.msg || this.msg.trim().length === 0) { + this.service.msgSrv.warning('请填写拒绝原因 '); + return false; + } this.service .request(this.service.$api_disagree_refund, { refundApplicationId: params, @@ -129,6 +138,8 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni this.st.load(1); } }); + return false; + } }, { From 5803d5943e298d407fae9304101e43636ab4e23f Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 6 May 2022 17:26:48 +0800 Subject: [PATCH 05/19] fix bug --- .../withdrawals-record.component.ts | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts index 5a26c0ba..4b48ec35 100644 --- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts @@ -247,18 +247,14 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni accountType: { type: 'string', title: '账户类型', - enum: [ - {label: '全部', value: ''}, - {label: '个人合伙人', value: '4'}, - {label: '企业合伙人', value: '5'} - ], - ui: { - widget: 'select', - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value + ui: { + widget: 'dict-select', + params: { dictKey: 'bank:type' }, + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } } - } }, ltdId: { type: 'string', From 4fbaaf7d2b9b658ad12ebdf092d53db88fc54c44 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 6 May 2022 17:31:06 +0800 Subject: [PATCH 06/19] fix bug --- .../routes/order-management/components/bulk/bulk.component.ts | 2 +- .../order-management/components/vehicle/vehicle.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 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 63c7932e..0dd9918b 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -297,7 +297,7 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements widget: 'select', placeholder: '请选择', allowClear: true, - asyncData: () => this.shipperservice.getNetworkEnterpriseName() + asyncData: () => this.shipperservice.getNetworkFreightForwarder() } }, serviceType: { diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 7411341a..7bec1594 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -304,7 +304,7 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme widget: 'select', placeholder: '请选择', allowClear: true, - asyncData: () => this.shipperservice.getNetworkEnterpriseName() + asyncData: () => this.shipperservice.getNetworkFreightForwarder() } }, // goodsNameId: { From ad0ad744d77077a9ab163428fc4d836a542d0d7c Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 6 May 2022 17:38:28 +0800 Subject: [PATCH 07/19] fix bug --- .../withdrawals-record.component.html | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html index 4317c033..0249bbd6 100644 --- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html +++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html @@ -1,3 +1,13 @@ +
@@ -34,7 +44,7 @@
已选择 {{ selectedRows.length }} 条数据   累计提现 {{ - totalCallNo }} + totalCallNo | currency }}
From e24f32c97ee78e473515e73310e0690df84f40c3 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 6 May 2022 17:42:55 +0800 Subject: [PATCH 08/19] fix bug --- .../components/network-freight/new/new.component.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts index b8736ed2..5792a7bf 100644 --- a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts +++ b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts @@ -354,9 +354,7 @@ export class NetworkFreightNewComponent implements OnInit { type: 'string', title: '行业', enum: [ - { label: '大陆身份证', value: 0 }, - { label: '港澳居民通行证', value: 1 }, - { label: '香港居民通行证', value: 2 } + { label: '道路运输业', value: 54}, ], default: 0, ui: { From 7679d5cd27eab516299a11cc945772c777cb9614 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 6 May 2022 17:49:20 +0800 Subject: [PATCH 09/19] fix bug --- .../partner-list/components/index/partner-list.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts index 2d7a60ef..427c6c58 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts +++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts @@ -468,7 +468,7 @@ export class PartnerListComponent { width: 140, type: 'badge', badge: { - 0: { text: '启用', color: 'success' }, + 0: { text: '正常', color: 'success' }, 1: { text: '冻结', color: 'error' } } }, From b1fd90dd0d7cb657f3f1d6611edefbc5972f076e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 09:59:14 +0800 Subject: [PATCH 10/19] fix bug --- .../datascreen/curve/curve.component.ts | 4 ++-- .../datascreen/datascreen.component.html | 6 +++--- .../components/freight/list/list.component.html | 4 ++-- .../components/freight/list/list.component.ts | 16 ++++++++-------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/app/routes/datatable/components/datascreen/curve/curve.component.ts b/src/app/routes/datatable/components/datascreen/curve/curve.component.ts index b6cd6e92..d0552d34 100644 --- a/src/app/routes/datatable/components/datascreen/curve/curve.component.ts +++ b/src/app/routes/datatable/components/datascreen/curve/curve.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-07 17:57:23 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 10:22:35 + * @LastEditTime : 2022-05-07 09:46:55 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\curve\\curve.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -108,7 +108,7 @@ export class DatatableCustomindexCurveMinComponent implements OnInit,OnChanges { this.chart.axis('temperature', { label: { formatter: (val: any) => { - return val + '万'; + return val; }, }, }); diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.html b/src/app/routes/datatable/components/datascreen/datascreen.component.html index e66a7862..8142b1e1 100644 --- a/src/app/routes/datatable/components/datascreen/datascreen.component.html +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-06 10:57:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-19 14:01:38 + * @LastEditTime : 2022-05-07 09:43:16 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -30,7 +30,7 @@ - + @@ -45,7 +45,7 @@ - + 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..d54aba9f 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -38,12 +38,12 @@
  • 新增企业
    • - +
    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..d415d0bd 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -468,14 +468,14 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen text: '分配客服人员', click: item => this.showService(item) }, - // { - // text: '修改合伙人', - // click: item => this.editPartner(item) - // }, - // { - // text: '修改渠道销售', - // click: item => this.editSale(item) - // } + { + text: '修改合伙人', + click: item => this.editPartner(item) + }, + { + text: '修改渠道销售', + click: item => this.editSale(item) + } ] } ]; From c6f2356b07576690fa0eb752c4e66f67edecdf7f Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 10:16:36 +0800 Subject: [PATCH 11/19] fix bug --- .../compliance/index/curve/curve.component.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/app/routes/datatable/components/compliance/index/curve/curve.component.ts b/src/app/routes/datatable/components/compliance/index/curve/curve.component.ts index 0dbacb97..20d3cb1a 100644 --- a/src/app/routes/datatable/components/compliance/index/curve/curve.component.ts +++ b/src/app/routes/datatable/components/compliance/index/curve/curve.component.ts @@ -1,3 +1,13 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-04-28 20:27:07 + * @LastEditors : Shiming + * @LastEditTime : 2022-05-07 10:16:08 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\compliance\\index\\curve\\curve.component.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { Component, ElementRef, Input, NgZone, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core'; import { G2MiniAreaClickItem } from '@delon/chart/mini-area'; @@ -69,7 +79,7 @@ export class ComplianceCurveComponent implements OnInit,OnChanges { this.chart.axis('proportion', { label: { formatter: (val: any) => { - return val*100+ ' %'; + return (val*100).toFixed(0)+ ' %'; }, }, }); From 6c9148677564a391ccf27c67132783cdbe1aea70 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 10:37:22 +0800 Subject: [PATCH 12/19] fix bug --- proxy.conf.js | 2 +- .../components/network-freight/new/new.component.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 1bd3c8df..28ccca86 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-05-06 17:09:51 + * @LastEditTime : 2022-05-07 10:35:23 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ diff --git a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts index 5792a7bf..fc135f18 100644 --- a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts +++ b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts @@ -350,7 +350,7 @@ export class NetworkFreightNewComponent implements OnInit { } } }, - certificateType2: { + industry: { type: 'string', title: '行业', enum: [ @@ -666,6 +666,7 @@ export class NetworkFreightNewComponent implements OnInit { 'unifiedSocialCreditCode', 'enterpriseName', 'enterpriseAddressCode', + 'industry', 'enterpriseAddress', 'registrationCapital', 'enterpriseRegistrationTime', From 9b07dc9d36ccfec76b078c38d329c828e005903b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 10:38:07 +0800 Subject: [PATCH 13/19] fix bug --- .../components/freight/list/list.component.html | 4 ++-- .../components/freight/list/list.component.ts | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) 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 d54aba9f..018efd10 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -38,12 +38,12 @@
  • 新增企业
    • -
  • + 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 d415d0bd..2d8995c3 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -468,14 +468,14 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen text: '分配客服人员', click: item => this.showService(item) }, - { - text: '修改合伙人', - click: item => this.editPartner(item) - }, - { - text: '修改渠道销售', - click: item => this.editSale(item) - } + // { + // text: '修改合伙人', + // click: item => this.editPartner(item) + // }, + // { + // text: '修改渠道销售', + // click: item => this.editSale(item) + // } ] } ]; From 250ba40253891cc36565f9aeeac01acac1143f39 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 10:39:09 +0800 Subject: [PATCH 14/19] fix bug --- .../components/freight/list/list.component.html | 4 ++-- .../components/freight/list/list.component.ts | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) 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..d54aba9f 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -38,12 +38,12 @@
  • 新增企业
    • - + 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..d415d0bd 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -468,14 +468,14 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen text: '分配客服人员', click: item => this.showService(item) }, - // { - // text: '修改合伙人', - // click: item => this.editPartner(item) - // }, - // { - // text: '修改渠道销售', - // click: item => this.editSale(item) - // } + { + text: '修改合伙人', + click: item => this.editPartner(item) + }, + { + text: '修改渠道销售', + click: item => this.editSale(item) + } ] } ]; From 9cb9dc80218667e3f8190062b94b414b2ef3ce1f Mon Sep 17 00:00:00 2001 From: weiyu Date: Sat, 7 May 2022 11:07:43 +0800 Subject: [PATCH 15/19] =?UTF-8?q?=E4=BC=98=E5=8C=96UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bulk-publish/bulk-publish.component.html | 342 ++++++------ .../bulk-publish/bulk-publish.component.less | 101 +++- .../bulk-publish/bulk-publish.component.ts | 34 +- .../onecar-publish.component.html | 487 +++++++++--------- .../onecar-publish.component.less | 102 +++- .../onecar-publish.component.ts | 69 ++- .../release-publish.component.html | 468 ++++++++--------- .../release-publish.component.less | 103 +++- .../release-publish.component.ts | 67 ++- .../billing-order.component.html | 8 - .../billing-order/billing-order.component.ts | 2 +- src/assets/images/frame.png | Bin 0 -> 710 bytes 12 files changed, 1071 insertions(+), 712 deletions(-) create mode 100644 src/assets/images/frame.png 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 fc4ad284..8e7b3d7c 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 @@ -5,179 +5,187 @@ - -
    货源单设置
    - -     +
    + +
    货源单设置
    + +     - -
    装卸货信息预计公里数：{{ 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-publish/bulk-publish.component.less b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less index a2ab5fbc..45705916 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less @@ -11,10 +11,10 @@ .sf3 { .goods_Tips_item { .goods_tips { - width: calc(50% - 45px); + width: calc(50% - 57px); .ant-alert { - padding: 0 0 0 2px; + margin-bottom: 5px; } } @@ -79,3 +79,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-publish/bulk-publish.component.ts b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts index 733bddf3..2a4d764b 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts @@ -203,7 +203,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { this.ui1 = { '*': { spanLabelFixed: 115, - grid: { span: 12 } + grid: { span: 8 } } }; } @@ -293,9 +293,12 @@ export class SupplyManagementBulkPublishComponent implements OnInit { }; this.ui3 = { '*': { - spanLabelFixed: 90, + spanLabelFixed: 115, grid: { span: 12 } }, + $goodsNameId: { + spanLabelFixed: 10 + }, $goodsTips: { grid: { span: 24 } } @@ -406,33 +409,37 @@ export class SupplyManagementBulkPublishComponent 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 } } }; } @@ -522,7 +529,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { ui: { widget: 'textarea', placeholder: '请输入', - autosize: { minRows: 3, maxRows: 3 } + autosize: { minRows: 1, maxRows: 1 } } as SFTextareaWidgetSchema } }, @@ -538,7 +545,10 @@ export class SupplyManagementBulkPublishComponent implements OnInit { }; this.ui7 = { '*': { - spanLabelFixed: 90, + spanLabelFixed: 115, + grid: { span: 8 } + }, + $remarks: { grid: { span: 24 } } }; diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html index 73a34d9a..41bf1dcf 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html @@ -5,264 +5,271 @@ - -
    货源单设置
    - -     +
    + +
    货源单设置
    + +     - -
    装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
    + +
    装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时 +
    -
    -
    -
    -
    - - 装货地 - -
    - - - - - + +
    +
    +
    + + 装货地 + +
    + + + + + +
    +     +     + + 联系人 +
    +
    + + + + + + +
    +     +
    +
    +
    +
    + +
    +
    +
    +
    +
    + +
    +
    +
    +
    + + 卸货地 + +
    + + + + + +
    +     +     + + 联系人 +
    +
    + + + + + + +
    +
    +     +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    + + 装货时间 + + +
    +
    +
    - 联系人 -
    - - - - - - -
    -     -
    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    - - 卸货地 - -
    - - - - - -
    + 卸货时间 + +     - - 联系人 -
    - - - - - - -
    -     -
    -
    -
    -
    - -
    -
    -
    -
    - - 装货时间 - - - - -
    -
    -
    - - 卸货时间 - - - - + + + + + +
    货物信息
    +
    +
    + + + + + + 国家法规及行政命令禁限运货物不能托运 + 《禁运物品说明》 + + +
    - - -     + + + + + + + + + + + + + + + + + +
    + + +
    +     +     + - -
    货物信息
    -
    -
    - - - - - - 国家法规及行政命令禁限运货物不能托运 - 《禁运物品说明》 - - - -
    -
    - - - - - - - - - - - - - - - - - -
    - - + +
    服务信息
    +
    +
    + + +  货源曝光率 +10   +  车源匹配率 +10 + + +  货源曝光率 +20   +  车源匹配率 +20 + + + + + + + + ①香港、澳门、台湾、西藏、新疆不予承保，②单次运输保额仅限200万元以内，③保险详细内容及注意事项请见《保险告知函》 +
    - - - - - -
    服务信息
    -
    -
    - - -  货源曝光率 +10   -  车源匹配率 +10 - - -  货源曝光率 +20   -  车源匹配率 +20 - - - - - - - - ①香港、澳门、台湾、西藏、新疆不予承保，②单次运输保额仅限200万元以内，③保险详细内容及注意事项请见《保险告知函》 -
    -
    -     + - -
    补充信息
    -
    -
    - + +
    补充信息
    +
    +
    + +
    -
    - + - -
    运费信息
    -
    -
    - - - - - - - - - - - - - - {{ i.value | currency }} - {{ i.value | currency }}（费率：{{ currentRate | number: - '0.2-4' }}%） - {{ i.value | currency }} - -
    -
    - + +
    运费信息
    +
    +
    + + + + + + + + + + + + + + {{ i.value | currency }} + {{ i.value | currency }}（费率：{{ currentRate | number: + '0.2-4' }}%） + {{ i.value | currency }} + +
    +
    + +
    +
    +  天内支付运费 +
    -
    -  天内支付运费 -
    -
    - - + + +
    -
    - - -
    - - - - -
    -     + + +
    + + + + +
    +     +
    \ No newline at end of file diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less index a445eacf..5376d908 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less @@ -5,16 +5,16 @@ } nz-date-picker { - width: 94.3%; + width: 100%; } .sf3 { .goods_Tips_item { .goods_tips { - width: calc(50% - 45px); + width: calc(50% - 57px); .ant-alert { - padding: 0 0 0 2px; + margin-bottom: 5px; } } @@ -84,3 +84,99 @@ input[type='number']::-webkit-outer-spin-button { margin-left: 10px; color: aqua; } +.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; + } + } +} \ No newline at end of file diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts index b99d9d75..4d823afa 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts @@ -246,16 +246,10 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.ui1 = { '*': { spanLabelFixed: 115, - grid: { span: 12 } + grid: { span: 8 } }, $enterpriseInfoName: { - grid: { span: 12 } - }, - $shipperAppUserId: { - grid: { span: 12 } - }, - $enterpriseProjectId: { - grid: { span: 12 } + grid: { span: 8 } } }; } @@ -345,9 +339,12 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { }; this.ui3 = { '*': { - spanLabelFixed: 90, + spanLabelFixed: 115, grid: { span: 12 } }, + $goodsNameId: { + spanLabelFixed: 10 + }, $goodsTips: { grid: { span: 24 } } @@ -416,14 +413,14 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { } } }, - hidenField: { - type: 'string', - title: '', - default: ' ', - ui: { - widget: 'text' - } - }, + // hidenField: { + // type: 'string', + // title: '', + // default: ' ', + // ui: { + // widget: 'text' + // } + // }, insurancePackagedGoods: { type: 'string', title: '货物包装', @@ -460,7 +457,25 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.ui4 = { '*': { spanLabelFixed: 115, - grid: { span: 8 } + grid: { span: 12 } + }, + $weight: { + grid: { span: 4 } + }, + $volume: { + spanLabelFixed: 10, + grid: { span: 4 } + }, + $number: { + spanLabelFixed: 10, + grid: { span: 4 } + }, + $carModel: { + grid: { span: 6 } + }, + $carLength: { + spanLabelFixed: 10, + grid: { span: 6 } } }; } @@ -545,16 +560,16 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.ui5 = { '*': { spanLabelFixed: 115, - grid: { span: 12 } + grid: { span: 8 } }, $type1: { - grid: { span: 24 } + grid: { span: 8 } }, $type2: { - grid: { span: 24 } + grid: { span: 8 } }, $freeInsurance1: { - grid: { span: 24 } + grid: { span: 24} }, $freeInsurance2: { grid: { span: 24 } @@ -656,7 +671,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { ui: { widget: 'textarea', placeholder: '请输入', - autosize: { minRows: 3, maxRows: 3 } + autosize: { minRows: 1, maxRows: 1 } } as SFTextareaWidgetSchema } }, @@ -664,7 +679,10 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { }; this.ui6 = { '*': { - spanLabelFixed: 90, + spanLabelFixed: 125, + grid: { span: 8 } + }, + $remarks: { grid: { span: 24 } } }; @@ -705,6 +723,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.ui7 = { '*': { spanLabelFixed: 115, + grid: { span: 8 } + }, + $paymentDays: { grid: { span: 24 } } }; diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.html b/src/app/routes/supply-management/components/release-publish/release-publish.component.html index efdb686f..f1c553d4 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.html +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.html @@ -5,261 +5,265 @@ - -
    货源单设置
    - - {{ i.value }} - -     +
    + +
    货源单设置
    + + {{ i.value }} + +     - -
    装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
    + +
    装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime + }}小时 +
    -
    -
    -
    -
    - - 装货地 - -
    - - - - - + +
    +
    +
    + + 装货地 + +
    + + + + + +
    +     +     + + 联系人 +
    +
    + + + + + + +
    - -     - - 联系人 -
    - - - - - - -
    -     -
    -
    -
    -
    -
    +
    +
    +
    -
    -
    -
    - +
    +
    + +
    -
    -
    -
    - - 卸货地 - -
    - - - - - +
    +
    + + 卸货地 + +
    + + + + + +
    +     +     + + 联系人 +
    +
    + + + + + + +
    - -     - - 联系人 -
    - - - - - - -
    -     -
    -
    -
    -
    -
    +
    +
    +
    -
    -
    -
    - - 装货时间 - - - - +
    +
    + + 装货时间 + + + + +
    +
    +
    + + 卸货时间 + + + + +
    -
    -
    - - 卸货时间 - - - - + + + + + +
    货物信息
    +
    +
    + + + + + + 国家法规及行政命令禁限运货物不能托运 + 《禁运物品说明》 + + +
    - - -     + + + + + + + + + + + + + + + + + +
    + + +
    +     +     + - -
    货物信息
    -
    -
    - - - - - - 国家法规及行政命令禁限运货物不能托运 - 《禁运物品说明》 - - - -
    -
    - - - - - - - - - - - - - - - - - -
    - - + +
    服务信息
    +
    +
    + + +  货源曝光率 +10   +  车源匹配率 +10 + + +  货源曝光率 +20   +  车源匹配率 +20 + + + + + + + + ①香港、澳门、台湾、西藏、新疆不予承保，②单次运输保额仅限200万元以内，③保险详细内容及注意事项请见《保险告知函》 +
    - - - - - -
    服务信息
    -
    -
    - - -  货源曝光率 +10   -  车源匹配率 +10 - - -  货源曝光率 +20   -  车源匹配率 +20 - - - - - - - - ①香港、澳门、台湾、西藏、新疆不予承保，②单次运输保额仅限200万元以内，③保险详细内容及注意事项请见《保险告知函》 -
    -
    -     - -
    补充信息
    -
    -
    - - + + +
    补充信息
    +
    +
    + + +
    -
    - + - -
    运费信息
    -
    -
    - - - - - - - - - - - - - - {{ i.value | currency }} - {{ i.value | currency }}（费率：{{ currentRate | number: - '0.2-4' }}%） - {{ i.value | currency }} - -
    -
    - + +
    运费信息
    +
    +
    + + + + + + + + + + + + + + {{ i.value | currency }} + {{ i.value | currency }}（费率：{{ currentRate | number: + '0.2-4' }}%） + {{ i.value | currency }} + +
    +
    + +
    +
    +  天内支付运费 +
    -
    -  天内支付运费 -
    -
    - - + + +
    -
    - - -
    - - -
    -     + + +
    + + +
    +     +
    \ No newline at end of file diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.less b/src/app/routes/supply-management/components/release-publish/release-publish.component.less index b34cbcc9..acb1655a 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.less +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.less @@ -5,16 +5,16 @@ } nz-date-picker { - width: 94.3%; + width: 100%; } .sf3 { .goods_Tips_item { .goods_tips { - width: calc(50% - 45px); + width: calc(50% - 57px); .ant-alert { - padding: 0 0 0 2px; + margin-bottom: 5px; } } @@ -78,3 +78,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; + } + } +} \ No newline at end of file diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts index b17688c4..9bd0c8c3 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts @@ -227,19 +227,19 @@ export class SupplyManagementReleasePublishComponent implements OnInit { this.ui1 = { '*': { spanLabelFixed: 115, - grid: { span: 12 } + grid: { span: 8 } }, $enterpriseInfoName: { - grid: { span: 12 } + grid: { span: 8 } }, $shipperAppUserId: { - grid: { span: 12 } + grid: { span: 8 } }, $enterpriseProjectId: { - grid: { span: 12 } + grid: { span: 8 } }, $dispatchId: { - grid: { span: 12 } + grid: { span: 8 } } }; } @@ -332,6 +332,9 @@ export class SupplyManagementReleasePublishComponent implements OnInit { spanLabelFixed: 115, grid: { span: 12 } }, + $goodsNameId: { + spanLabelFixed: 10 + }, $goodsTips: { grid: { span: 24 } } @@ -400,14 +403,14 @@ export class SupplyManagementReleasePublishComponent implements OnInit { } } }, - hidenField: { - type: 'string', - title: '', - default: ' ', - ui: { - widget: 'text' - } - }, + // hidenField: { + // type: 'string', + // title: '', + // default: ' ', + // ui: { + // widget: 'text' + // } + // }, insurancePackagedGoods: { type: 'string', title: '货物包装', @@ -444,7 +447,25 @@ export class SupplyManagementReleasePublishComponent implements OnInit { this.ui4 = { '*': { spanLabelFixed: 115, - grid: { span: 8 } + grid: { span: 12 } + }, + $weight: { + grid: { span: 4 } + }, + $volume: { + spanLabelFixed: 10, + grid: { span: 4 } + }, + $number: { + spanLabelFixed: 10, + grid: { span: 4 } + }, + $carModel: { + grid: { span: 6 } + }, + $carLength: { + spanLabelFixed: 10, + grid: { span: 6 } } }; } @@ -528,16 +549,16 @@ export class SupplyManagementReleasePublishComponent implements OnInit { this.ui5 = { '*': { spanLabelFixed: 115, - grid: { span: 12 } + grid: { span: 8 } }, $type1: { - grid: { span: 24 } + grid: { span: 8 } }, $type2: { - grid: { span: 24 } + grid: { span: 8 } }, $freeInsurance1: { - grid: { span: 24 } + grid: { span: 24} }, $freeInsurance2: { grid: { span: 24 } @@ -626,7 +647,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { ui: { widget: 'textarea', placeholder: '请输入', - autosize: { minRows: 3, maxRows: 3 } + autosize: { minRows: 1, maxRows: 1 } } as SFTextareaWidgetSchema } }, @@ -634,7 +655,10 @@ export class SupplyManagementReleasePublishComponent implements OnInit { }; this.ui6 = { '*': { - spanLabelFixed: 90, + spanLabelFixed: 125, + grid: { span: 8 } + }, + $remarks: { grid: { span: 24 } } }; @@ -675,6 +699,9 @@ export class SupplyManagementReleasePublishComponent implements OnInit { this.ui7 = { '*': { spanLabelFixed: 115, + grid: { span: 8 } + }, + $paymentDays: { grid: { span: 24 } } }; diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html index e6588a35..a910e29d 100644 --- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html +++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html @@ -25,14 +25,6 @@ - - 待受理 - 处理中 - 已完成 - 已拒绝 - 已撤销 - 已作废 - {{item.billTypeLabel + item.serviceTypeLabel}} 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 57ea5983..05b9d0f9 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 @@ -281,7 +281,7 @@ export class BillingOrderComponent implements OnInit { { 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: 'stsLabel', 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' }, diff --git a/src/assets/images/frame.png b/src/assets/images/frame.png new file mode 100644 index 0000000000000000000000000000000000000000..d816e711c615b630b340ee5ad979aa45260cd4a8 GIT binary patch literal 710 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`Z7>k44ofy`glX(f`Y!C1WaRt&0 z4*wYv{xf9#XDIm3kOpQH{%6Sj&yf9}Ap^_+O6C7&$N`Jw!9;)xfFcksgaoRA=mK(q zQV=dg3MdX_K-kC(h&Y-okc%b)*9a3&ZU1rx=yIEqAirP+77iW(5eaD-c?D$^bq#GD zeFF~S3{#&PYKPNC) zN=O^0c#)+%gzSI*(;!nAZs5Vwr!sq*;^c{7aHyw%ia4!*>=$CK6QijdFR zV+NCL=4=dbc_OK%7hLM{S^c~B!OMag_w5_g1t)Hh&=nAzI8*z9t8|QL6b{m-*G}(~1Jz z4{y0pBJUUc(fP5BzoMqe+?d>ltM6R=>wjbF@%76aBkf$o^&8%Wv%FZxD9eAlH1kf+ zBc6!+awo3TtmR3s`8IhL|58K#zP)T~@5}etZ^-wa77{Lh-{%D=4SKrzxvX Date: Sat, 7 May 2022 11:09:39 +0800 Subject: [PATCH 16/19] fix bug --- .../audit/detail/detail.component.html | 40 +++++++++++++++++-- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/src/app/routes/vehicle/components/audit/detail/detail.component.html b/src/app/routes/vehicle/components/audit/detail/detail.component.html index 40eb67d3..9728c26b 100644 --- a/src/app/routes/vehicle/components/audit/detail/detail.component.html +++ b/src/app/routes/vehicle/components/audit/detail/detail.component.html @@ -70,7 +70,20 @@
    - 车辆基础信息 +

    + 车辆基础信息 + +

    @@ -147,7 +160,20 @@
    - 行驶证信息 +

    + 行驶证信息 + +

    @@ -243,7 +269,15 @@

    道路运输证信息

    车辆基础信息

    行驶证信息 +

    @@ -173,6 +176,9 @@ +

    From 3229f8275495ef8304f29ee1c8984502692ae4a0 Mon Sep 17 00:00:00 2001 From: weiyu Date: Sat, 7 May 2022 11:31:59 +0800 Subject: [PATCH 19/19] =?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 } } };