From 639f780ba338f3fec711ceb3af16ff333027a287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Fri, 6 May 2022 10:43:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../captain-detail.component.html | 106 ++-- .../driver/detail/detail.component.html | 424 ++++++++------ .../freight/list/detail/detail.component.html | 520 ++++++++++-------- .../freight/user/detail/detail.component.html | 130 +++-- .../freight/user/detail/detail.component.less | 11 +- 5 files changed, 717 insertions(+), 474 deletions(-) diff --git a/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html b/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html index 0e8b40a9..bbc32cbc 100644 --- a/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html +++ b/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html @@ -36,10 +36,39 @@ - -
- - 个人信息 + +
+
+
+ + 个人信息 + + +
+
+ + + + + + + + + +
+
+
+ + + + + + + + + +
+ - - - -
- - + +
+ + +
- - 银行结算信息（暂无银行信息） - - - {{ item.bankName }} - - - {{ item?.bankCardNumber }} - - +
+
+ + 银行结算信息 + （暂无银行信息） +
+ + + + + {{ item.bankName }} + + + {{ item?.bankCardNumber }} + + - + +
@@ -147,4 +185,4 @@ - \ No newline at end of file + diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.html b/src/app/routes/usercenter/components/driver/detail/detail.component.html index 46f78375..9add6b62 100644 --- a/src/app/routes/usercenter/components/driver/detail/detail.component.html +++ b/src/app/routes/usercenter/components/driver/detail/detail.component.html @@ -39,10 +39,60 @@ - -
- - 个人信息 + +
+
+
+ + 个人信息 + + + + + + + +
+
+ + + + + + + + + +
+
+
+ + + + + + + + + + + + + - + + + + + + + + + - -
- - - - -
- - + +
+ + + + +
+ + +
- -
- - 驾驶证信息 +
+
+
+ + 驾驶证信息 + + +
+
+ + + + + + + + + +
+
+
+ + + + + + + + + + + + + + - + + + + + + + + + + - - - - - - {{driverDetail.signingOrganization}} - - - - - - - - - + + + + + + {{driverDetail.signingOrganization}} + + + + + + + +
+
+
+
+ + 从业资格证信息 + + +
- 从业资格证信息 + @@ -262,73 +356,95 @@
- - - 载具信息 - - - {{ carDatail?.carNo }} - - - {{ carDatail?.carNoColorLabel }} - - - {{ carDatail?.carModelLabel }} - - - {{ carDatail?.carLengthLabel ? carDatail?.carLengthLabel +'米' :'' }} - - - {{ carDatail?.isDefault?'是':'否' }} - - - {{ carDatail?.isSelf?'否':'是' }} - - - - - - - - - - - - - +
+
+ + 载具信息 + （暂无载具信息） +
+ + + + + {{ carDatail?.carNo }} + + + {{ carDatail?.carNoColorLabel }} + + + {{ carDatail?.carModelLabel }} + + + {{ carDatail?.carLengthLabel ? carDatail?.carLengthLabel +'米' :'' }} + + + {{ carDatail?.isDefault?'是':'否' }} + + + {{ carDatail?.isSelf?'否':'是' }} + + + + + + + + + + + + + - + +
- - 银行结算信息 （暂无银行信息） - - - - {{ item.bankName }} - - - {{ item?.bankCardNumber }} - - - - - - - 服务评级 +
+
+ + 银行结算信息 + （暂无银行信息） +
+ + + + + {{ item.bankName }} + + + {{ item?.bankCardNumber }} + + + +
+
+
+ + 服务评级 (暂无评级) - - - - - +
+ + + + + + +
- - 关联企业 +
+
+ + 关联企业 +
- +
@@ -383,4 +499,4 @@
- \ No newline at end of file + diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html index 4449618b..befa6692 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html @@ -114,10 +114,11 @@ - - - - + +
+
+ + 企业基本信息 @@ -130,251 +131,296 @@ -

- 四要素验证： - - - -

- - - - - - - {{detailData.enterpriseName}} - - - - - - - - {{detailData.unifiedSocialCreditCode}} - - - - +

+ 四要素验证： + + + +

+ + + + + + + {{detailData.enterpriseName}} + + + + + + + + {{detailData.unifiedSocialCreditCode}} + + + + - - - - - - - - - - - - - - - - {{detailData?.registrationCapital}} - - 万元 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - {{ detailData?.fullRegionVO?.provinceName }}{{ detailData?.fullRegionVO?.cityName }}{{ - detailData?.fullRegionVO?.areaName }} - - - - - - - - {{ detailData?.fullRegionVO?.provinceName }}{{ - detailData?.fullRegionVO?.cityName }}{{ - detailData?.fullRegionVO?.areaName }}{{detailData.enterpriseAddress}} - - - - - + + + + + + {{detailData?.registrationCapital}} + + 万元 + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ detailData?.fullRegionVO?.provinceName }}{{ detailData?.fullRegionVO?.cityName }}{{ + detailData?.fullRegionVO?.areaName }} + + + + + + + + {{ detailData?.fullRegionVO?.provinceName }}{{ + detailData?.fullRegionVO?.cityName }}{{ + detailData?.fullRegionVO?.areaName }}{{detailData.enterpriseAddress}} + + + + + + + + {{detailData.businessScope}} + + + + - - - {{detailData.businessScope}} - - - - - - - - - - - - - - - - - 法人信息 + + + + + + + + + + +
+
+
+ + 法人信息 - - - - - - - - - - - - - - - - - - - - -
+
+ + + + + + + + + + + - + *ngIf="!isEdit && !detailData?.legalPersonIdentityVO?.validEndTime && detailData.legalPersonIdentityVO.validStartTime"> + - + + + -
- - - - - 企业管理员信息 + + +
+ + + + +
+ + +
+
+
+ + 企业管理员信息 - - - - - - {{detailData.adminUserInfo?.mobile}} - - - - - -
- - - - -
- - - - - - 企业开票信息 - - - - - - {{detailData.createBank}} - - - - - - - - - - - + + + + - - - {{detailData.registerAddress}} - - - - - - 服务评级 + + + {{detailData.adminUserInfo?.mobile}} + + + + + +
+ + + + +
+ + +
+
+
+ + 企业开票信息 +
+ + + + + + + + {{detailData.createBank}} + + + + + + + + + + + + + + {{detailData.registerAddress}} + + + +
+
+
+ + 服务评级 (暂无评级) - - - - - +
+ + + + + + +
+ + + + + + + + + + - + + - + + + + -
- - - - - 关联企业 + + +
+ + + + +
+ + +
+ +
+
+ + 关联企业 +
+ + - +
@@ -159,4 +201,4 @@ - \ No newline at end of file + diff --git a/src/app/routes/usercenter/components/freight/user/detail/detail.component.less b/src/app/routes/usercenter/components/freight/user/detail/detail.component.less index e30f5583..7f9dfbd0 100644 --- a/src/app/routes/usercenter/components/freight/user/detail/detail.component.less +++ b/src/app/routes/usercenter/components/freight/user/detail/detail.component.less @@ -3,7 +3,7 @@ :host { ::ng-deep { .user-info { - display : flex; + display: flex; font-size: 16px; .enterprise-name { @@ -11,9 +11,9 @@ } img { - width : 64px; - height : 64px; - margin-right : 15px; + width: 64px; + height: 64px; + margin-right: 15px; border-radius: 50%; } @@ -22,4 +22,5 @@ } } } -} \ No newline at end of file + +} From 803aa860c0b118c7fbb921403f21bdab6a958f96 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 6 May 2022 11:10:13 +0800 Subject: [PATCH 2/3] fix bug --- .../components/dataindex/dataindex.component.ts | 14 ++++++++++---- .../withdrawals-detail.component.ts | 2 ++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/app/routes/datatable/components/dataindex/dataindex.component.ts b/src/app/routes/datatable/components/dataindex/dataindex.component.ts index fb428f1e..d79f23d9 100644 --- a/src/app/routes/datatable/components/dataindex/dataindex.component.ts +++ b/src/app/routes/datatable/components/dataindex/dataindex.component.ts @@ -77,8 +77,10 @@ export class DatatableDataindexComponent implements OnInit { // 订单类型比例 this.service.request(this.service.$api_getBillTypeProportion).subscribe(res => { if (res) { - this.billTypeDatas = this.formatCoordinateData(res); - this.initBillChart(this.g2custom['el'].nativeElement as any); + const billTypeDatas2 = this.formatCoordinateData(res); + console.log(billTypeDatas2); + + this.initBillChart(this.g2custom['el'].nativeElement as any,billTypeDatas2); } }); // 大区业绩完成情况 @@ -98,6 +100,8 @@ export class DatatableDataindexComponent implements OnInit { this.service.request(this.service.$api_getWayBillDirectProportion).subscribe(res => { if (res) { const billTypeDatas = this.formatCoordinateData(res.map((item: any) => ({ ...item, billType: item.wayBillType }))); + console.log(billTypeDatas); + this.initBillChart(this.BillDirectProportion['el'].nativeElement as any, billTypeDatas); } }); @@ -141,7 +145,7 @@ export class DatatableDataindexComponent implements OnInit { chart.scale('percent', { formatter: val => { - val = val * 100 + '%'; + val = (val * 100 ).toFixed(0)+ '%'; return val; } }); @@ -198,7 +202,7 @@ export class DatatableDataindexComponent implements OnInit { .label('percent', percent => { return { content: data => { - return ` ${percent * 100}%`; + return (percent * 100).toFixed(0)+`%`; }, style: { fontSize: 14 } }; @@ -498,6 +502,8 @@ export class DatatableDataindexComponent implements OnInit { percent: Number((item.quantity / total).toFixed(2)) }); }); + console.log(rs); + return rs; } diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts index b247d051..5178117b 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts @@ -236,7 +236,9 @@ export class WithdrawalsDetailComponent implements OnInit { width: 140 }, { title: '运费明细', render: 'amountDetails', className: 'text-right', width: 150 }, + { title: '网络货运人', index: 'ltdName', className: 'text-left', width: 200 }, { title: '货主', index: 'enterpriseInfoName', className: 'text-left', width: 200 }, + { title: '项目名称', index: 'enterpriseProjectName', className: 'text-left', width: 200 }, { title: '订单号', render: 'billId', width: 200 }, { title: '运单号', render: 'wayBillId', width: 200 }, { title: '货源编号', index: 'resourceCode', width: 200 }, From 124ac15afe076bf6255f058b097b82aee49d03be Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 6 May 2022 14:22:26 +0800 Subject: [PATCH 3/3] fix bug --- proxy.conf.js | 4 +-- .../index/partner-list.component.html | 12 ++++++++- .../partner-audit-modal.component.html | 2 +- .../partner-audit-modal.component.ts | 27 ++++++++++++++++--- 4 files changed, 38 insertions(+), 7 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 91fa74fc..173ce85b 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-05 15:22:17 + * @LastEditTime : 2022-05-06 13:46:07 * @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/partner/partner-list/components/index/partner-list.component.html b/src/app/routes/partner/partner-list/components/index/partner-list.component.html index bce2f3b2..cba079c7 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.html +++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.html @@ -1,3 +1,13 @@ + @@ -48,7 +58,7 @@
{{selectItem?.enterpriseName || selectItem?.contactName}} - {{selectItem?.channelId}} + {{selectItem?.channelIdLabel}} diff --git a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.html b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.html index fc8043d6..ab4970e6 100644 --- a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.html +++ b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.html @@ -1,5 +1,5 @@
- +
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 5756e136..5c7ed101 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 @@ -15,11 +15,30 @@ export class PartnerAuditModalComponent implements OnInit { @Input() info: any; schema!: SFSchema; + formData: any; sourcePage = ''; constructor(private nzModalService: NzModalService, public service: PartnerListService, private modal: NzModalRef) {} ngOnInit(): void { + console.log(this.info); this.initSF(this.info); + + if(this.info.channelId) { + const value = [{ + label: this.info.channelIdLabel, + value: this.info.channelId, + }] + setTimeout(() => { + if(this.sf) { + console.log('888'); + + // this.sf.getProperty('/channelId')!.schema.enum = value; + // this.sf.getProperty('/channelId')!.widget.reset(value); + this.sf.setValue('/channelId', this.info.channelId); + } + }) + + } } initSF(user: any) { @@ -30,13 +49,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: '审核结果', @@ -68,7 +87,7 @@ export class PartnerAuditModalComponent implements OnInit { required: ' ' } }, - default: '' + default: user.channelId }, approvalOpinion: { title: '备注', @@ -90,6 +109,8 @@ export class PartnerAuditModalComponent implements OnInit { }, required: ['channelId', 'approvalOpinion'] }; + console.log('666'); + } sure() {