From dbfd39c5120d863f17a5752746487cc8b0c000ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Thu, 28 Apr 2022 12:27:28 +0800 Subject: [PATCH 1/5] - --- .../bulk-detail/bulk-detail.component.html | 123 +++-- .../bulk-detail/bulk-detail.component.less | 2 +- .../vehicle-detail.component.html | 441 ++++++++++-------- .../vehicle-detail.component.less | 2 +- src/styles.less | 37 +- src/styles/common/global.less | 60 +++ src/styles/index.less | 6 +- src/styles/theme.less | 3 +- 8 files changed, 401 insertions(+), 273 deletions(-) create mode 100644 src/styles/common/global.less diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html index 00606c3d..601a0121 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html @@ -1,5 +1,5 @@
- + - - + + +
@@ -27,7 +27,7 @@
-
+
{{ i?.enterpriseProjectName }} {{ i?.deadlineTime }} {{ i?.createUserName }}/{{ i?.createUserPhone }} @@ -36,7 +36,35 @@
- + +
+ +

货源编码 : {{ i?.resourceCode }}

+
+
+
网络货运人：{{ i?.shipperAppUserName }}
+
+ + + +
+
+
+
+ 总费用：{{ i?.totalAmount | currency: '¥' }} +
+
+ +
+ {{ i?.enterpriseProjectName }} + {{ i?.deadlineTime }} + {{ i?.createUserName }}/{{ i?.createUserPhone }} + {{ i?.dispatchName }}/{{ i?.dispatchPhone }} + {{ i?.serviceTypeLabel }} +
@@ -51,33 +79,6 @@
- - - - - 货物信息 - - - {{item.goodsTypeName}} > {{item.goodsName}} - - - {{item.weight}}吨 / {{item.volume>=0?item.volume:'-'}}方 - - - {{i?.surplusWeight!==null?i?.surplusWeight:'--'}}吨 / {{i?.surplusVolume!==null?i?.surplusVolume:'-'}}方 - - - {{item.carModelLabel || '--'}} / {{item.carLengthLabel || '--'}}米 - - - - -

装货卸货信息 ( @@ -119,7 +120,39 @@

- + +
+ + 基本信息 +
+ + + + + {{item.goodsTypeName}} > {{item.goodsName}} + + + {{item.weight}}吨 / {{item.volume>=0?item.volume:'-'}}方 + + + {{i?.surplusWeight!==null?i?.surplusWeight:'--'}}吨 / {{i?.surplusVolume!==null?i?.surplusVolume:'-'}}方 + + + {{item.carModelLabel || '--'}} / {{item.carLengthLabel || '--'}}米 + + + + + + + + +
@@ -132,13 +165,13 @@ {{ item?.freightPrice | currency: '￥' }} {{ freightType[item?.freightType] }} - （附加费率{{i?.rate * 100 | number: '0.2-2'}}%） + （附加费率{{i?.rate * 100 | number: '0.2-2'}}%）
- + ({{ item?.count }}) @@ -157,7 +190,7 @@ --> - + {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }} @@ -166,7 +199,8 @@ {{ i?.supplementaryInformationVO?.receiptTypeLabel }} - {{ i?.supplementaryInformationVO?.receiptUserName ? i?.supplementaryInformationVO?.receiptUserName + '/' : '' }} {{ i?.supplementaryInformationVO?.phon }} + {{ i?.supplementaryInformationVO?.receiptUserName ? i?.supplementaryInformationVO?.receiptUserName + '/' : '' }} + {{ i?.supplementaryInformationVO?.phon }} {{ i?.supplementaryInformationVO?.area }} @@ -174,14 +208,13 @@ {{ i?.supplementaryInformationVO?.address }} - + {{ i?.supplementaryInformationVO?.remarks }} - - + diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less index 957a1f03..df21f696 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less @@ -3,7 +3,7 @@ min-height: 210px; p { - margin-bottom: .5em; + margin-bottom: 0; } } diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html index a570a0d1..bcb7cb4a 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html @@ -1,11 +1,46 @@ -
- - - - - + +
+ + + + + +
+ +

货源编码 : {{ i?.resourceCode }}

+
+
+
网络货运人：{{ i?.enterpriseInfoName }}
+
+ + + + +
+
+
+
+ 总费用：{{ i?.totalAmount | currency }} +
+
+ +
+ {{ i?.externalResourceCode }} + {{ i?.enterpriseProjectName }} + {{ i?.createUserName }}/{{ i?.createUserPhone }} + {{ i?.dispatchName }}/{{ i?.dispatchPhone }} + {{ i?.serviceTypeLabel }} +
+ + +

货源编码 : {{ i?.resourceCode }}

@@ -13,218 +48,214 @@
网络货运人：{{ i?.enterpriseInfoName }}
- - - - + + + +
-
+ + +
{{ i?.externalResourceCode }} {{ i?.enterpriseProjectName }} {{ i?.createUserName }}/{{ i?.createUserPhone }} {{ i?.dispatchName }}/{{ i?.dispatchPhone }} {{ i?.serviceTypeLabel }}
- - - -
-
- - - - - +
+
+ + + + + +
-
- + - - - 货物信息 - - - {{ item.goodsTypeName }} - {{ item.goodsName }} + +
+ + 基本信息 +
+ + + + + {{ item.goodsTypeName }} - {{ item.goodsName }} + + {{ item.weight }}吨,{{ item.volume }}方,{{ item.number }}件 + + + + + + {{ i?.carrierInformationVO?.driverName }} - {{ item.weight }}吨,{{ item.volume }}方,{{ item.number }}件 - - - - 承运信息 - - {{ i?.carrierInformationVO?.driverName }} + + {{ i?.carrierInformationVO?.driverTelephone }} + + + {{ i?.carrierInformationVO?.driverLicensePlate }} + + + + {{i?.carrierInformationVO.driverName || '--'}} / {{i?.carrierInformationVO.driverTelephone || '--'}} / + {{i?.carrierInformationVO.driverLicensePlate || '--'}} - - {{ i?.carrierInformationVO?.driverTelephone }} + + {{i?.driverCarModelLabel || '--'}} / {{(i?.driverCarLength || '--') +'米'}} / {{(i?.driverCarWeight || + '--')+'吨'}} - - {{ i?.carrierInformationVO?.driverLicensePlate }} - - -
-

装货卸货信息 - ( - - - ) - -

-
-
-
-
-
-
装
-
-

装货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}

-

联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}

-
-
-
-

装货时间：{{ i?.loadingTime }}

-
-
-
-
-
-
-
卸
-
-

卸货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}

-

联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}

-
-
-
-

卸货时间：{{ i?.unloadingTime }}

-
-
-
-
- - - - - - {{ i?.insuranceTypeLabel}} - - - {{i?.goodsValue !==null?(i?.goodsValue|currency)+'元':'-'}} - - - {{i?.insurancePremium!==null?(i?.insurancePremium |currency)+'元':'-'}} - - - - - - -
- {{ item?.totalAmount | currency }} - (含附加费） -
- - -
- {{ item?.price | currency }} -
- - -
-
-

- - - {{ i?.totalAmount | currency }} +
+

装货卸货信息 + ( + + + ) - （运费{{ i?.totalFreight | currency }}含附加运费 {{ i?.totalSurcharge | currency }}） -

-
车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}
+

+
+
+
+ +
+
+
装
+
+

装货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}

+

联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}

+
+
+
+ +

装货时间：{{ i?.loadingTime }}

+
+
+
+
+ +
+
+
卸
+
+

卸货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}

+

联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}

+
+
+
+ +

卸货时间：{{ i?.unloadingTime }}

+
+
+
-
- - - - - {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }} - - - {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }} - - {{ i?.supplementaryInformationVO?.receiptUserName || '-' }} / {{ i?.supplementaryInformationVO?.phon || '-' }} - - - {{ i?.supplementaryInformationVO?.area }} - - - {{ i?.supplementaryInformationVO?.address }} - - - {{ i?.supplementaryInformationVO?.remarks }} - - - - - - -
- {{ item?.operator }} {{ item?.telephone ? '/' + item?.telephone : '' }} + + + +
+ + 服务信息
- - - -
+ + + {{ i?.insuranceTypeLabel}} + + + {{i?.goodsValue !==null?(i?.goodsValue|currency)+'元':'-'}} + + + {{i?.insurancePremium!==null?(i?.insurancePremium |currency)+'元':'-'}} + + + + +
+ + 运费信息 + (到货后{{i?.paymentDays}}天内支付运费) +
+ + +
+ {{ item?.totalAmount | currency }} + (含附加费） +
+ + +
+ {{ item?.price | currency }} +
+ + +
+
+

+ + + {{ i?.totalAmount | currency }} + + （运费{{ i?.totalFreight | currency }}含附加运费 {{ i?.totalSurcharge | currency }}） +

+
车队长：{{ + i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}
+
+
+ + +
+ + 补充信息 +
+ + + {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }} + + + {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }} + + {{ + i?.supplementaryInformationVO?.receiptUserName || '-' }} / {{ i?.supplementaryInformationVO?.phon || '-' }} + + + {{ i?.supplementaryInformationVO?.area }} + + + {{ i?.supplementaryInformationVO?.address }} + + + {{ i?.supplementaryInformationVO?.remarks }} + + + + +
+ + 操作日志 +
+ + +
+ {{ item?.operator }} {{ item?.telephone ? '/' + item?.telephone : '' }} +
+ + + +
+ diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less index e963d1b7..172f5525 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less @@ -3,7 +3,7 @@ min-height: 210px; p { - margin-bottom: .5em; + margin-bottom: 5px; } } diff --git a/src/styles.less b/src/styles.less index c40ad1c0..527089dc 100644 --- a/src/styles.less +++ b/src/styles.less @@ -2,16 +2,17 @@ @import '~@delon/abc/index'; @import '~@delon/chart/index'; @import 'app/layout/pro/styles/index.less'; +@import './styles/common/global.less'; @import './styles/index'; @import './styles/theme'; .icon { - width : 18px; - fill : currentColor; - overflow : hidden; - font-size : 18px !important; - color : #ffffff; + width: 18px; + fill: currentColor; + overflow: hidden; + font-size: 18px !important; + color: #ffffff; margin-right: 10px; } @@ -19,13 +20,13 @@ /* 全局滚动条美化 */ *::-webkit-scrollbar { - width : (@layout-gutter); + width: (@layout-gutter); height: (@layout-gutter); } *::-webkit-scrollbar-thumb { - background : #d9d9d9; - cursor : pointer; + background: #d9d9d9; + cursor: pointer; border-radius: (@layout-gutter) / 2; } @@ -46,14 +47,14 @@ input[type="number"] { .break-word-all { word-break: break-all; - word-wrap : break-word; + word-wrap: break-word; } st { .block-td { .ant-divider-vertical { - display : none; - margin : 0; + display: none; + margin: 0; border-left: none; } @@ -66,9 +67,9 @@ st { } nz-range-picker { - width : 100%; + width: 100%; word-break: break-all; - word-wrap : break-word; + word-wrap: break-word; } .ant-select-tree .ant-select-tree-treenode-disabled { @@ -76,13 +77,13 @@ nz-range-picker { margin: 0; .ant-select-tree-checkbox-inner { - width : 0px; + width: 0px; border-color: #ffffff !important; } } .ant-select-tree-node-content-wrapper { - color : unset; + color: unset; cursor: not-allowed; } } @@ -93,13 +94,13 @@ nz-range-picker { margin: 0; .ant-select-tree-checkbox-inner { - width : 0px; + width: 0px; border-color: #ffffff !important; } } .ant-select-tree-node-content-wrapper { - color : unset; + color: unset; cursor: not-allowed; } } @@ -109,4 +110,4 @@ nz-range-picker { cdk-virtual-scroll-viewport { min-height: 54px; } -} \ No newline at end of file +} diff --git a/src/styles/common/global.less b/src/styles/common/global.less new file mode 100644 index 00000000..1c9488df --- /dev/null +++ b/src/styles/common/global.less @@ -0,0 +1,60 @@ +.detail-title { + display: flex; + align-items: center; + margin-bottom: 12px; + + + .sign { + width: 2px; + height: 16px; + background: #E60012; + display: inline-block; + margin-right: 10px; + } +} + +.divider-margin { + margin-top: 12px; + margin-bottom: 12px; +} + +.step-row { + width: 80%; + margin: 0 auto; + + .ant-steps-item-description { + font-size: 12px; + } +} + +.new-sv-container { + &.sv__horizontal { + .sv__label-width { + justify-content: left; + } + } +} + +.new-sf-container { + &.sf__horizontal .ant-form-item-label>label { + justify-content: left; + } +} + +.common-order-header { + display: flex; + justify-content: space-between; +} + +.common-grey { + color: #8A8E99; +} + +.nameBox { + display: flex; + align-items: baseline; + + .name { + margin: 0 10px 10px 0; + } +} diff --git a/src/styles/index.less b/src/styles/index.less index 7b1e6a6f..671364f1 100644 --- a/src/styles/index.less +++ b/src/styles/index.less @@ -1,9 +1,11 @@ /* You can add global styles to this file, and also import other style files */ @import './fix/index'; + + .error-color { - color: #ff4d4f; + color: #ff4d4f; } @primary-color: #F5222D; -@font-size-base: 15px; \ No newline at end of file +@font-size-base: 15px; diff --git a/src/styles/theme.less b/src/styles/theme.less index f5667bf2..1082d2fa 100644 --- a/src/styles/theme.less +++ b/src/styles/theme.less @@ -5,6 +5,7 @@ @import '../app/layout/pro/styles/theme-default.less'; @import './fix/theme-default.less'; + // ==========Custom brand visual color========== // ==========Custom brand visual color========== @@ -22,4 +23,4 @@ .ant-btn { border-radius: 4px; -} \ No newline at end of file +} From 8f2b5fa22cdcde075cd739bbfa0079bccde8ba9c Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 13:25:04 +0800 Subject: [PATCH 2/5] fix bug --- .../components/config/config.component.html | 13 ++-- .../components/config/config.component.ts | 73 +++++++++++++++++-- .../routes/sys-setting/sys-setting.module.ts | 4 +- 3 files changed, 76 insertions(+), 14 deletions(-) diff --git a/src/app/routes/sys-setting/components/config/config.component.html b/src/app/routes/sys-setting/components/config/config.component.html index aaea9add..65bdca2c 100644 --- a/src/app/routes/sys-setting/components/config/config.component.html +++ b/src/app/routes/sys-setting/components/config/config.component.html @@ -7,7 +7,7 @@
按照提现金额收取 - + %手续费
@@ -15,7 +15,7 @@
按照提现金额收取
客户 - + 天内没有交易订单的视为“沉默客户”
客户 - + 天内没有交易订单的视为“流失客户”
@@ -66,15 +66,13 @@
- - +
-
-
diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts index 544ca3bc..5c3b0261 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts @@ -28,6 +28,8 @@ export class DynamicSettingH5Component implements OnInit { @Input() configList: any = []; + @Input() + isCanSave = true; @Output() selectedEvent = new EventEmitter(); @Output() From ab323d0f8c70c5cf06fcd7fee72b9513b3ad0d03 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 13:43:30 +0800 Subject: [PATCH 4/5] fix bug --- proxy.conf.js | 4 +- .../components/config/config.component.ts | 38 +++++++++++-------- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 29173019..d12c4111 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-04-27 17:26:44 + * @LastEditTime : 2022-04-28 13:43:18 * @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/sys-setting/components/config/config.component.ts b/src/app/routes/sys-setting/components/config/config.component.ts index 5ddaa8ee..90340eca 100644 --- a/src/app/routes/sys-setting/components/config/config.component.ts +++ b/src/app/routes/sys-setting/components/config/config.component.ts @@ -111,11 +111,29 @@ export class PartnerSystemConfigComponent implements OnInit, OnChanges { // }; constructor(private service: SystemService) {} - ngOnChanges(changes: SimpleChanges): void { + ngOnChanges(changes: any): void { if (changes.configList) { - console.log(changes.configList); - console.log(changes.configList.currentValue); - + console.log(changes.configList.currentValue[0]?.remark); + this.personServe = changes.configList.currentValue[0]?.remark.personServe, // 个人提现手续费 + this.enterpriseServe= changes.configList.currentValue[0]?.remark.enterpriseServe, // 企业提现手续费 + this.auditValue= changes.configList.currentValue[0]?.remark.auditValue, // 提现审核 + this.auditTime= changes.configList.currentValue[0]?.remark.auditTime, // 审核时间 + this.silenceClient= changes.configList.currentValue[0]?.remark.silenceClient, // 沉默客户 + this.loseClient= changes.configList.currentValue[0]?.remark.loseClient // 流失客户 + this.everyDayData= changes.configList.currentValue[0]?.remark.everyDayData // 流失客户 + this.MonthDayData= changes.configList.currentValue[0]?.remark.MonthDayData // 流失客户 + if (this.auditTime == '2') { + this.auditTimeStatus = true; + // 每天 + if(this.everyDayData){ + this.everyDayData = this.everyDayData + } else if(this.MonthDay) { + // 每周 + this.MonthDayData = this.MonthDayData + } + } else { + this.auditTimeStatus = false; + } } } @@ -173,14 +191,12 @@ export class PartnerSystemConfigComponent implements OnInit, OnChanges { console.log(this.MonthDayData); } everyDayChange(type: any): void { - console.log(type); if (type) { this.MonthDay = false; this.TimeStatus = true; } } MonthDayChange(type: any): void { - console.log(type); if (type) { this.everyDay = false; this.TimeStatus = false; @@ -323,7 +339,6 @@ export class PartnerSystemConfigComponent implements OnInit, OnChanges { }); }; changeAuto(value: any) { - console.log(value); if (value == '2') { this.auditTimeStatus = true; } else { @@ -331,7 +346,6 @@ export class PartnerSystemConfigComponent implements OnInit, OnChanges { } } save() { - console.log(); let params : any = { personServe: this.personServe, // 个人提现手续费 enterpriseServe: this.enterpriseServe, // 企业提现手续费 @@ -343,21 +357,15 @@ export class PartnerSystemConfigComponent implements OnInit, OnChanges { if(this.auditTime == '2') { // 每天 if(this.everyDay){ - console.log(this.everyDayData); params.everyDayData = this.everyDayData } else if(this.MonthDay) { // 每周 params.MonthDayData = this.MonthDayData - console.log(this.MonthDayData); } } - console.log( JSON.stringify(params)); - console.log( this.configList); const pra = Object.assign({}, ...this.configList) pra.remark = JSON.stringify(params) - console.log(pra); - - this.service.request(this.service.$api_update_config_batch, pra).subscribe(res => { + this.service.request(this.service.$api_update_config_batch, [pra]).subscribe(res => { if (res) { this.service.msgSrv.success('修改配置成功'); setTimeout(() => { From 2f890e79bf1c639d32f4497864c89014d9990678 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 13:47:29 +0800 Subject: [PATCH 5/5] fix bug --- .../invoice-requested-detail.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts index 901d2adb..12c787a3 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts @@ -179,8 +179,10 @@ export class InvoiceRequestedDetailComponent implements OnInit { routeToOrder(item: any) { if (item.billType === '1') { this.router.navigate(['/order-management/vehicle/vehicle-detail/' + item.billHId]); - } else { + } else if (item.billType === '2'){ this.router.navigate(['/order-management/bulk/bulk-detail/' + item.billHId]); + } else if (item.billType === '3'){ + this.router.navigate(['/order-management/vehicle/vehicle-detail/' + item.billHId]); } }