From 402bb51a417144c0ebaaaae8aebb9f31c39c9cc0 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 13 Apr 2022 15:57:02 +0800 Subject: [PATCH 01/50] fix bug --- .../bulk-detail/bulk-detail.component.html | 9 +++++---- .../bulk-detail/bulk-detail.component.ts | 4 +++- .../vehicle-detail.component.html | 9 +++++---- .../vehicle-detail.component.ts | 4 +++- .../release-publish.component.ts | 20 +++++++++++++++++++ 5 files changed, 36 insertions(+), 10 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 3380fdbe..d20c201a 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-04-08 14:06:21 + * @LastEditTime : 2022-04-13 15:56:56 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -222,9 +222,10 @@ - + +
您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您!
@@ -232,11 +233,11 @@
  • 系统识别:{{item?.complianceTypeName}}
  • {{item?.determineDetails}}，您可在企业端提交申诉材料或联系客服。
    • -
  • 2021-11-07 03:20:15
+
- + diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts index 86260c56..b37b16ff 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-04-11 22:31:18 + * @LastEditTime : 2022-04-13 15:53:43 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -64,6 +64,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit { trajectory = 'car'; mapList: any[] = []; //地图点位数据组 addressItems: any[] = []; //打点地址数据组 + warringList: any[] = []; //打点地址数据组 constructor( public route: ActivatedRoute, private msgSrv: NzMessageService, @@ -116,6 +117,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit { if (res) { console.log('异常预警'); console.log(res); + this.warringList = res } }); } diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index f9519e6c..73e04d2a 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-04-08 14:06:27 + * @LastEditTime : 2022-04-13 15:56:55 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -246,19 +246,20 @@ - + +
您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您!
如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈
  • 系统识别:{{ item?.complianceTypeName }}
  • {{ item?.determineDetails }}，您可在企业端提交申诉材料或联系客服。
    • -
  • 2021-11-07 03:20:15
+
- + diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts index db239095..ea0423ce 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-04-06 15:12:10 + * @LastEditTime : 2022-04-13 15:55:47 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -29,6 +29,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { mapList: any[] = []; //地图点位数据组 pois: any[] = []; addressItems: any[] = []; //打点地址数据组 + warringList: any[] = []; //打点地址数据组 abnormalList: any[] = []; i: any = { unLoadingPlaceList: [], @@ -108,6 +109,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { if (res) { console.log('异常预警'); console.log(res); + this.warringList = res } }); } 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 5eb7ad4a..6683e303 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 @@ -309,6 +309,9 @@ export class SupplyManagementReleasePublishComponent implements OnInit { errors: { required: '请填写货物名称' }, visibleIf: { goodsTypeName: (value: any) => value && value === '其它' + }, + blur: (value: any) => { + this.checkGoodsName(); } } } @@ -1237,4 +1240,21 @@ export class SupplyManagementReleasePublishComponent implements OnInit { } this.payChange(); } + + checkGoodsName() { + const name = this.sf3.getValue('/goodsName1'); + if (!name || name.trim().length === 0) { + return; + } + this.service.request(this.service.$api_checkGoodsName, name).subscribe(res => { + if (res === false) { + const modalRef = this.modalService.error({ + nzTitle: '货物名称含有违禁词，请重新输入！', + }); + modalRef.afterClose.subscribe(result => { + // this.sf3.setValue('/goodsName1', null); + }); + } + }); + } } From f0f611f0be4f47514c3e0ba29555cee73c6d0a03 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 13 Apr 2022 17:08:27 +0800 Subject: [PATCH 02/50] edit --- .../bulk-detail/bulk-detail.component.html | 101 +++++++++--------- .../bulk-detail/bulk-detail.component.ts | 6 +- .../vehicle-detail.component.html | 83 ++++++-------- .../vehicle-detail.component.ts | 12 ++- .../services/order-management.service.ts | 1 + 5 files changed, 97 insertions(+), 106 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 3380fdbe..2d5a6958 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -15,26 +15,18 @@ -
+

订单号: {{ i?.billCode }}

-
- - + acl [acl-ability]="['ORDER-BULK-DETAIL-cancelAnOrder']">取消订单 +
@@ -43,8 +35,9 @@ {{ i?.goodsResource?.shipperAppUserName }} {{ i?.goodsResource?.enterpriseProjectName }} {{ i?.goodsResource?.serviceTypeLabel }} - {{ i?.createUserName }} {{ i?.createUserPhone ? "/" + i?.createUserPhone : ''}} - {{ i?.goodsResource?.dispatchName }}{{ i?.goodsResource?.dispatchPhone ? "/" + i?.goodsResource?.dispatchPhone : ''}} + {{ i?.createUserName }} {{ i?.createUserPhone ? "/" + i?.createUserPhone : ''}} + {{ i?.goodsResource?.dispatchName }}{{ i?.goodsResource?.dispatchPhone ? "/" + + i?.goodsResource?.dispatchPhone : ''}} {{ i?.goodsResource?.resourceCode }} {{ i?.wayBill?.wayBillCode }} {{ i?.goodsResource?.paymentDays }} @@ -64,12 +57,8 @@
  - +
@@ -82,9 +71,11 @@ - {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 + + {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 {{ i?.carModel }}{{ i?.carLength ? "/" + i?.carLength : ''}} - {{ i?.driverName }}{{i?.driverPhone ? "/" + i?.driverPhone : ''}}{{ i?.carNo ? "/" + i?.carNo : ''}} + {{ i?.driverName }}{{i?.driverPhone ? "/" + i?.driverPhone : ''}}{{ i?.carNo ? "/" + i?.carNo : + ''}} {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨 {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方 - {{ i?.loadWeight }}吨，{{ i?.loadVolume }}方 - {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方 + {{ i?.loadWeight }}吨，{{ + i?.loadVolume }}方 + {{ i?.settlementWeight }}吨,{{ + i?.settlementVolume }}方
-

装货卸货信息 - ( +

装货卸货信息 + ( @@ -114,7 +105,7 @@
装

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

-

联系人：{{ item.appUserName }}{{ item.contractTelephone ? "/" + item.contractTelephone : '' }}

+

联系人：{{ item.appUserName }}{{ item.contractTelephone ? "/" + item.contractTelephone : '' }}

@@ -127,7 +118,7 @@
卸

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

-

联系人：{{ item.appUserName }}{{ item.contractTelephone ? "/" + item.contractTelephone : ''}}

+

联系人：{{ item.appUserName }}{{ item.contractTelephone ? "/" + item.contractTelephone : ''}}

@@ -137,11 +128,12 @@ -

{{i?.freightPrice}}{{i?.freightTypeLabel}}（{{ i?.settlementBasisLabel ? i?.settlementBasisLabel + '，' :' ' }}{{i?.ruleLabel}}）

+

{{i?.freightPrice}}{{i?.freightTypeLabel}}（{{ i?.settlementBasisLabel ? i?.settlementBasisLabel + '，' :' ' + }}{{i?.ruleLabel}}）

到付 - {{ item.price + item.surcharge | currency }} + {{ item.price + item.surcharge | currency }} {{ item.price | currency }} @@ -152,26 +144,30 @@
- 总计：{{ i?.totalAmount | currency }} （运费{{ i?.totalFreight | currency }}， + 总计：{{ i?.totalAmount | currency }} （运费{{ i?.totalFreight | + currency }}， 附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}%）
-
车队长：{{ i?.payeeName }}{{ i?.payeePhone ? "/" + i?.payeePhone : ''}}
+
车队长：{{ i?.payeeName }}{{ i?.payeePhone ? "/" + + i?.payeePhone : ''}}
 - 查看附件      - 补充协议 + 查看附件      + 补充协议 - + - + @@ -183,7 +179,8 @@ {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }} - {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} + {{ + i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} {{ i?.supplementaryInformationVO?.area }} @@ -206,11 +203,13 @@
- +
- + +
@@ -223,7 +222,7 @@ - +
您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您! @@ -236,17 +235,19 @@ - - + - + - +
暂无附件信息
@@ -255,4 +256,4 @@ - + \ No newline at end of file diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts index 86260c56..517cc02a 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts @@ -41,6 +41,10 @@ export class OrderManagementBulkeDetailComponent implements OnInit { { title: '时间', index: 'parkBte' }, { title: '地点', index: 'parkAdr' } ]; + logColumns3: STColumn[] = [ + { title: '时间', index: 'warningTime' }, + { title: '异常预警类型', index: 'warningTypeLabel' } + ]; logColumns: STColumn[] = [ { title: '款项', index: 'expenseCodeLabel' }, { title: '小计（元）', render: 'prices' }, @@ -67,7 +71,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit { constructor( public route: ActivatedRoute, private msgSrv: NzMessageService, - private service: OrderManagementService, + public service: OrderManagementService, private router: Router, private modal: NzModalService ) {} diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index f9519e6c..4266efe6 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -21,22 +21,12 @@
- - + acl [acl-ability]="['ORDER-VEHICLE-DETAIL-cancelAnOrder']">取消订单 +
@@ -46,8 +36,8 @@ {{ i?.goodsResource?.enterpriseProjectName }} {{ i?.goodsResource?.serviceTypeLabel }} {{ i?.createUserName }} {{ i?.createUserPhone ? '/' + i?.createUserPhone : '' }} - {{ i?.goodsResource?.dispatchName }}{{ i?.goodsResource?.dispatchPhone ? '/' + i?.goodsResource?.dispatchPhone : '' }} + {{ i?.goodsResource?.dispatchName }}{{ i?.goodsResource?.dispatchPhone ? '/' + + i?.goodsResource?.dispatchPhone : '' }} {{ i?.externalBillCode }} {{ i?.goodsResource?.resourceCode }} @@ -70,13 +60,9 @@
  - + [nzStatus]="item.displayStatus === 'SHOW' ? 'finish' : 'wait'">
@@ -93,16 +79,16 @@ - {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 + + {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 {{ i?.carModel }}{{ i?.carLength ? '/' + i?.carLength : '' }} - {{ i?.driverName }}{{ i?.driverPhone ? '/' + i?.driverPhone : '' }}{{ i?.carNo ? '/' + i?.carNo : '' }} + {{ i?.driverName }}{{ i?.driverPhone ? '/' + i?.driverPhone : '' }}{{ i?.carNo ? '/' + i?.carNo : + '' }} {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨
-

装货卸货信息 - ( +

装货卸货信息 + ( ) @@ -167,10 +153,12 @@
- 总计：{{ i?.totalAmount | currency }} （运费{{ i?.totalFreight | currency }}， + 总计：{{ i?.totalAmount | currency }} （运费{{ i?.totalFreight | + currency }}， 附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2) }}% ）
-
车队长：{{ i?.payeeName }}{{ i?.payeePhone ? '/' + i?.payeePhone : '' }}
+
车队长：{{ i?.payeeName }}{{ i?.payeePhone ? '/' + + i?.payeePhone : '' }}
@@ -185,7 +173,8 @@ - + + @@ -222,19 +211,13 @@
- +
- + +
@@ -258,21 +241,17 @@ - + - +
暂无附件信息
@@ -281,4 +260,4 @@ - + \ No newline at end of file diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts index db239095..b4f477e9 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts @@ -46,6 +46,10 @@ export class OrderManagementVehicleDetailComponent implements OnInit { { title: '时间', index: 'parkBte' }, { title: '地点', index: 'parkAdr' } ]; + logColumns3: STColumn[] = [ + { title: '时间', index: 'warningTime' }, + { title: '异常预警类型', index: 'warningTypeLabel' } + ]; logColumns: STColumn[] = [ { title: '款项', index: 'expenseCodeLabel' }, { title: '小计（元）', render: 'prices' }, @@ -61,7 +65,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { constructor( public route: ActivatedRoute, private msgSrv: NzMessageService, - private service: OrderManagementService, + public service: OrderManagementService, private router: Router, private modal: NzModalService ) {} @@ -80,8 +84,10 @@ export class OrderManagementVehicleDetailComponent implements OnInit { markerLabel: '装', color: 'blue', position: [res.startingPoint.longitude, res.startingPoint.latitude], - title: `发货地：${res.startingPoint.province}${res.startingPoint.city}${res.startingPoint.area || ''}${res.startingPoint.detailedAddress}`, - time: '计划出发时间：' +res.loadPlanTime + title: `发货地：${res.startingPoint.province}${res.startingPoint.city}${res.startingPoint.area || ''}${ + res.startingPoint.detailedAddress + }`, + time: '计划出发时间：' + res.loadPlanTime }, { markerLabel: '卸', diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index ea53eff2..c63771cd 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -188,6 +188,7 @@ export class OrderManagementService extends ShipperBaseService { // 查询异常预警表 $api_get_abnormalWarning = `/api/sdc/abnormalWarning/list/page`; + $api_get_order_abnormalWarning = `/api/sdc/abnormalWarning/getAbnormalWarningByBillId`; // 异步导出运营后台大宗订单列表 $api_get_asyncExportBulkList = `/api/sdc/billOperate/asyncExportBulkList`; From e8bc79ff9f1be6da49a9778b7cfd10eb868c89c2 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 13 Apr 2022 17:53:40 +0800 Subject: [PATCH 03/50] fix bug --- .../invoice-detail/invoice-detail.component.html | 6 +++--- .../invoice-requested-detail.component.html | 14 ++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html index 578086fb..9f09fdbf 100644 --- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html +++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html @@ -8,7 +8,7 @@
-
+
{{ headerInfo?.ltdName }} @@ -34,7 +34,7 @@ {{ headerInfo?.remarks }}
-
+
{{ headerInfo?.artoname }} @@ -57,7 +57,7 @@ {{headerInfo?.otherremarks || '-'}}
-
+
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html index 65c60264..0d2ad116 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html @@ -8,13 +8,12 @@
-
- +
+ + {{headerInfo?.ltdidName}} - - {{headerInfo?.vatappcode}} - + {{headerInfo?.vatinvHNum}} / {{headerInfo?.vatinvBillNum}} @@ -31,13 +30,16 @@ {{headerInfo?.provinceName}}{{headerInfo?.cityName}}{{headerInfo?.areaName}}{{headerInfo?.reciaddr}}
-
+
{{headerInfo?.artoName}} {{headerInfo?.taxNumber}} + + {{headerInfo?.vatappcode}} + {{headerInfo?.registerAddr}} From 75fc4c9919033dd03819d87cd33f14d83ab2f88b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 13 Apr 2022 17:55:10 +0800 Subject: [PATCH 04/50] fix bug --- .../components/bulk-detail/bulk-detail.component.html | 10 ---------- .../vehicle-detail/vehicle-detail.component.html | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 789d7ca7..eceae53e 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -221,13 +221,8 @@
-<<<<<<< HEAD - - -======= ->>>>>>> 6a150ee3a3c20c6bb0c0de19a1e105a166194445
@@ -241,14 +236,9 @@
-<<<<<<< HEAD - - -======= ->>>>>>> 6a150ee3a3c20c6bb0c0de19a1e105a166194445 diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index df43a137..658fb561 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 17:54:13 + * @LastEditTime : 2022-04-13 17:54:51 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> From 1d3f287e900695cacd2edaf0b841f206e88a1db6 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 13 Apr 2022 17:57:02 +0800 Subject: [PATCH 05/50] edit --- proxy.conf.js | 2 +- .../print-order-modal.component.html | 4 +- src/styles.less | 58 ++++++++++--------- 3 files changed, 35 insertions(+), 29 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 396f43cd..e6de13f2 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -20,7 +20,7 @@ module.exports = { // } '//api': { target: { - host: 'tms-api.yunduoxing.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/ticket-management/components/invoice-requested/print-order-modal/print-order-modal.component.html b/src/app/routes/ticket-management/components/invoice-requested/print-order-modal/print-order-modal.component.html index 119c6269..592208d6 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/print-order-modal/print-order-modal.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/print-order-modal/print-order-modal.component.html @@ -11,7 +11,7 @@ - + {{item.contact}}      {{item.tel}}
@@ -25,7 +25,7 @@ - + {{item.contact}}      {{item.tel}}
diff --git a/src/styles.less b/src/styles.less index 626d0385..c40ad1c0 100644 --- a/src/styles.less +++ b/src/styles.less @@ -66,41 +66,47 @@ st { } nz-range-picker { - width: 100%; - word-break: break-all; - word-wrap : break-word; + width : 100%; + word-break: break-all; + word-wrap : break-word; } .ant-select-tree .ant-select-tree-treenode-disabled { - .ant-select-tree-checkbox { - margin: 0; + .ant-select-tree-checkbox { + margin: 0; - .ant-select-tree-checkbox-inner { - width : 0px; - border-color: #ffffff !important; - } + .ant-select-tree-checkbox-inner { + width : 0px; + border-color: #ffffff !important; } + } - .ant-select-tree-node-content-wrapper { - color : unset; - cursor: not-allowed; - } + .ant-select-tree-node-content-wrapper { + color : unset; + cursor: not-allowed; + } } .area-tree-select { - .ant-select-tree .ant-select-tree-treenode-disabled { - .ant-select-tree-checkbox { - margin: 0; + .ant-select-tree .ant-select-tree-treenode-disabled { + .ant-select-tree-checkbox { + margin: 0; - .ant-select-tree-checkbox-inner { - width : 0px; - border-color: #ffffff !important; - } - } - - .ant-select-tree-node-content-wrapper { - color : unset; - cursor: not-allowed; - } + .ant-select-tree-checkbox-inner { + width : 0px; + border-color: #ffffff !important; + } } + + .ant-select-tree-node-content-wrapper { + color : unset; + cursor: not-allowed; + } + } +} + +.print_order_select { + cdk-virtual-scroll-viewport { + min-height: 54px; + } } \ No newline at end of file From 6919e5864bba7ec93f64104f239a5b25e91fd68a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 13 Apr 2022 17:58:24 +0800 Subject: [PATCH 06/50] fix bug --- .../routes/order-management/components/risk/risk.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/order-management/components/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts index 96aca287..898ad94a 100644 --- a/src/app/routes/order-management/components/risk/risk.component.ts +++ b/src/app/routes/order-management/components/risk/risk.component.ts @@ -88,7 +88,7 @@ export class OrderManagementRiskComponent implements OnInit { this.loading = false return data.map(item => ({ ...item, - disabled: item.auditStatus !== '1' + disabled: item.representationsStatus !== '2' })); }; search() { From 7f73ea243392b4f0778472ce5a3e59b972b028e4 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 13 Apr 2022 18:45:11 +0800 Subject: [PATCH 07/50] edit --- .../vehicle/components/list/list.component.ts | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts index ef828516..5a871858 100644 --- a/src/app/routes/vehicle/components/list/list.component.ts +++ b/src/app/routes/vehicle/components/list/list.component.ts @@ -184,22 +184,22 @@ export class VehicleComponentsListComponent implements OnInit { } } }, - isSelfs: { - type: 'string', - title: '是否入网', - enum: [ - { label: '全部', value: '' }, - { label: '是', value: 1 }, - { label: '否', value: 0 } - ], - ui: { - widget: 'select', - allowClear: true, - visibleIf: { - expand: (value: boolean) => value - } - } - } + // isSelfs: { + // type: 'string', + // title: '是否入网', + // enum: [ + // { label: '全部', value: '' }, + // { label: '是', value: 1 }, + // { label: '否', value: 0 } + // ], + // ui: { + // widget: 'select', + // allowClear: true, + // visibleIf: { + // expand: (value: boolean) => value + // } + // } + // } // putOnRecord: { // type: 'string', // title: '是否已备案', @@ -263,7 +263,7 @@ export class VehicleComponentsListComponent implements OnInit { 3: { text: '已到期', color: 'error' } } }, - { title: '是否入网', width: '200px', className: 'text-center', index: 'carOwner' }, + // { title: '是否入网', width: '200px', className: 'text-center', index: 'carOwner' }, { title: '所有人', width: '200px', className: 'text-center', index: 'carOwner' }, { title: '是否挂靠', width: '150px', className: 'text-center', render: 'isSelf' }, { title: '挂靠协议', width: '150px', className: 'text-center', render: 'approvalAuditStatus' }, From cb9d0ed5934d04c932ac7f0165366a14aaad855b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 13 Apr 2022 18:52:55 +0800 Subject: [PATCH 08/50] fix bug --- .../components/bulk-detail/bulk-detail.component.html | 9 +++++++-- .../components/bulk-detail/bulk-detail.component.ts | 10 +++++++++- .../vehicle-detail/vehicle-detail.component.html | 8 +++++++- .../vehicle-detail/vehicle-detail.component.ts | 10 +++++++++- .../services/order-management.service.ts | 4 +++- .../order-reporting/order-reporting.component.ts | 2 +- 6 files changed, 36 insertions(+), 7 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index eceae53e..a4195012 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -241,8 +241,13 @@ [page]="{ show: false, showSize: false }"> - - + + + {{item?.operator}}/{{item.telephone}} + + diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts index c2598a65..8fc20b1d 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 15:53:43 + * @LastEditTime : 2022-04-13 18:51:48 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -45,6 +45,11 @@ export class OrderManagementBulkeDetailComponent implements OnInit { { title: '时间', index: 'warningTime' }, { title: '异常预警类型', index: 'warningTypeLabel' } ]; + operateLogColums: STColumn[] = [ + { title: '内容', index: 'operationContent' }, + { title: '操作人', render: 'operator' }, + { title: '操作时间', index: 'operatorTimestamp' }, + ]; logColumns: STColumn[] = [ { title: '款项', index: 'expenseCodeLabel' }, { title: '小计（元）', render: 'prices' }, @@ -65,6 +70,9 @@ export class OrderManagementBulkeDetailComponent implements OnInit { } } ]; + get logParams() { + return { operateObject: this.i?.billCode, operateTypeList: ['3','8'] } + } trajectory = 'car'; mapList: any[] = []; //地图点位数据组 addressItems: any[] = []; //打点地址数据组 diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index 658fb561..ad1d29a0 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -247,7 +247,13 @@ [page]="{ show: false, showSize: false }"> - + + + {{item?.operator}}/{{item.telephone}} + + diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts index f15f9bde..3992467e 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 15:55:47 + * @LastEditTime : 2022-04-13 18:51:46 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -51,6 +51,11 @@ export class OrderManagementVehicleDetailComponent implements OnInit { { title: '时间', index: 'warningTime' }, { title: '异常预警类型', index: 'warningTypeLabel' } ]; + operateLogColums: STColumn[] = [ + { title: '内容', index: 'operationContent' }, + { title: '操作人', render: 'operator' }, + { title: '操作时间', index: 'operatorTimestamp' }, + ]; logColumns: STColumn[] = [ { title: '款项', index: 'expenseCodeLabel' }, { title: '小计（元）', render: 'prices' }, @@ -63,6 +68,9 @@ export class OrderManagementVehicleDetailComponent implements OnInit { index: 'paymentStatusLabel' } ]; + get logParams() { + return { operateObject: this.i?.billCode, operateTypeList: ['3','8'] } + } constructor( public route: ActivatedRoute, private msgSrv: NzMessageService, diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index c63771cd..f8cd497c 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 15:31:52 * @LastEditors : Shiming - * @LastEditTime : 2022-04-11 22:29:34 + * @LastEditTime : 2022-04-13 18:52:24 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -204,6 +204,8 @@ export class OrderManagementService extends ShipperBaseService { $api_abnormalWarning_asyncExport = `/api/sdc/abnormalWarning/asyncExport`; // 异步导出投诉管理导出 $api_asyncExportComplaintListDrv = `/api/sdc/complaint/operate/asyncExportComplaintListDrv`; + //操作日志 + public $api_get_log_list = `/api/mdc/pbc/operationLogRecords/getOperationLogRecordsList`; /** * 根据企业ID，获取企业历史网络货运人 * @returns diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts index 2cf91aeb..424f8f6f 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -261,7 +261,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { { title: '卸货地详细地址', index: 'unloadDetailedAddress', className: 'text-center', width: '180px' }, { title: '货主名称', index: 'shipperName', className: 'text-center', width: '180px' }, { title: '货主纳税人识别号', index: 'shipperProvinceCode', className: 'text-center', width: '180px' }, - { title: '录单时间', index: 'billCreateTime', className: 'text-center', width: '250px' }, + { title: '录单时间', index: 'recordTime', className: 'text-center', width: '250px' }, { title: '接单时间', index: 'wayBillCreateTime', className: 'text-center', width: '200px' }, { title: '发车时间', index: 'loadTime', className: 'text-center', width: '200px' }, { title: '到车时间', index: 'unloadTime', className: 'text-center', width: '150px' }, From fa27c4a60197dc736c48a669d1176ce404789ec6 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 13 Apr 2022 19:00:54 +0800 Subject: [PATCH 09/50] fix bug --- .../components/bulk-detail/bulk-detail.component.ts | 12 ++++++++---- .../vehicle-detail/vehicle-detail.component.html | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts index 8fc20b1d..cfe20fdf 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts @@ -4,14 +4,14 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 18:51:48 + * @LastEditTime : 2022-04-13 19:00:19 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ import { Router } from '@angular/router'; -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { STColumn } from '@delon/abc/st'; +import { STColumn, STComponent } from '@delon/abc/st'; import { _HttpClient } from '@delon/theme'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalService } from 'ng-zorro-antd/modal'; @@ -26,6 +26,7 @@ import format from 'date-fns/format'; }) export class OrderManagementBulkeDetailComponent implements OnInit { MapList: any[] = []; + @ViewChild('logSt') logSt!: STComponent; id = this.route.snapshot.params.id; billExpenses: any[] = []; //运费信息表格信息 pois: any[] = []; @@ -87,7 +88,6 @@ export class OrderManagementBulkeDetailComponent implements OnInit { ngOnInit(): void { console.log(this.route?.snapshot?.queryParams?.sts); - this.initData(); this.getTrajectory(); } @@ -116,6 +116,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit { time: '计划卸货时间：' + res.unloadPlanTime } ]; + } }); this.service.request(this.service.$api_listBillComplianceAbnormalByBillId, { id: this.id }).subscribe(res => { @@ -132,6 +133,9 @@ export class OrderManagementBulkeDetailComponent implements OnInit { this.warringList = res } }); + setTimeout(() => { + this.logSt.load(1); + }); } goBack() { diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index ad1d29a0..6af2afd4 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 17:54:51 + * @LastEditTime : 2022-04-13 19:00:48 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -232,7 +232,7 @@ -
+
您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您!
如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈
    From d232174098d46288d9d313dcd67d18aa58a161ab Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 13 Apr 2022 19:02:39 +0800 Subject: [PATCH 10/50] fix bug --- .../components/bulk-detail/bulk-detail.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index a4195012..5cd7cb57 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 15:56:56 + * @LastEditTime : 2022-04-13 19:02:35 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -221,10 +221,10 @@
- + -
+
您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您!
From a8fa9fd1af8365698e20fcc7cd2a44571bdb5e9f Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 13 Apr 2022 19:06:51 +0800 Subject: [PATCH 11/50] fix bug --- .../vehicle-detail.component.html | 14 +++++++------- .../vehicle-detail/vehicle-detail.component.ts | 18 +++++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index 6af2afd4..8fb28115 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 19:00:48 + * @LastEditTime : 2022-04-13 19:04:48 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -248,12 +248,12 @@ - - {{item?.operator}}/{{item.telephone}} - - + [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: logParams ,lazyLoad:true}" + [res]="{ reName: { list: 'data.records', total: 'data.total' } }"> + + {{item?.operator}}/{{item.telephone}} + + diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts index 3992467e..a113356d 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts @@ -4,13 +4,13 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 18:51:46 + * @LastEditTime : 2022-04-13 19:06:44 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { STColumn } from '@delon/abc/st'; +import { STColumn, STComponent } from '@delon/abc/st'; import { NzCardComponent } from 'ng-zorro-antd/card'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalService } from 'ng-zorro-antd/modal'; @@ -23,6 +23,7 @@ import { OrderManagementService } from '../../services/order-management.service' }) export class OrderManagementVehicleDetailComponent implements OnInit { id = this.route.snapshot.params.id; + @ViewChild('logSt') logSt!: STComponent; modalcontent: any; modalTitle: string = ''; trajectory = 'car'; @@ -68,9 +69,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { index: 'paymentStatusLabel' } ]; - get logParams() { - return { operateObject: this.i?.billCode, operateTypeList: ['3','8'] } - } + constructor( public route: ActivatedRoute, private msgSrv: NzMessageService, @@ -83,7 +82,9 @@ export class OrderManagementVehicleDetailComponent implements OnInit { this.initData(); this.getTrajectory(); } - + get logParams() { + return { operateObject: this.i?.billCode, operateTypeList: ['3','8'] } + } initData() { this.service.request(this.service.$api_get_getWholeBillDetail, { id: this.id }).subscribe(res => { if (res) { @@ -126,6 +127,9 @@ export class OrderManagementVehicleDetailComponent implements OnInit { this.warringList = res } }); + setTimeout(() => { + this.logSt.load(1); + }); } // 取消订单 cancellation() { From 023bfdf71d4af46f861de1e1f214f674a3d1b8a5 Mon Sep 17 00:00:00 2001 From: "xiaoxing.liu" Date: Wed, 13 Apr 2022 19:07:01 +0800 Subject: [PATCH 12/50] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/order-reporting/order-reporting.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts index af13dbb0..6a15cc8c 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts @@ -105,7 +105,7 @@ export class DatatableOrderReportingComponent implements OnInit { placeholder: '请输入', }, }, - enterpriseInfoId: { + networkTransporter: { title: '网络货运人', type: 'string', ui: { From 5e88772da782375f5eb0b150a4140ebd084d461c Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 13 Apr 2022 19:14:09 +0800 Subject: [PATCH 13/50] fix bug --- .../driver-account-detail.component.ts | 6 +++++- .../components/driver-account/driver-account.component.ts | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts index 3e73fb60..be4ff263 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts @@ -76,7 +76,11 @@ export class DriverAccountDetailComponent implements OnInit { stChange(e: STChange): void {} exportList() { - this.service.exportStart( { ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAccountBalanceDriverByOperatorPage,); + this.service.exportStart( { ...this.sf.value, pageSize: -1 , ltdId: this.params.ltdId, + projectId: this.params.projectId, + enterpriseId: this.params.enterpriseId, + roleId: this.params.roleId, + bankType: this.params.bankType,}, this.service.$api_get_exportAccountBalanceDriverByOperatorPage,); } goBack() { diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts index 99daad10..4892f27a 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts @@ -81,6 +81,8 @@ export class DriverAccountComponent implements OnInit { } exportList() { + console.log(this.sf.value); + this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_driver_account_page); } From 504f01d10e0e696f96a7e82e5a5e0205501d4f46 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 13 Apr 2022 19:15:21 +0800 Subject: [PATCH 14/50] fix bug --- .../driver-account-detail.component.ts | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts index be4ff263..bc954a6c 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts @@ -36,7 +36,7 @@ export class DriverAccountDetailComponent implements OnInit { projectId: this.params.projectId, enterpriseId: this.params.enterpriseId, roleId: this.params.roleId, - bankType: this.params.bankType, + bankType: this.params.bankType }); if (this.sf) { Object.assign(requestOptions.body, { @@ -76,11 +76,22 @@ export class DriverAccountDetailComponent implements OnInit { stChange(e: STChange): void {} exportList() { - this.service.exportStart( { ...this.sf.value, pageSize: -1 , ltdId: this.params.ltdId, - projectId: this.params.projectId, - enterpriseId: this.params.enterpriseId, - roleId: this.params.roleId, - bankType: this.params.bankType,}, this.service.$api_get_exportAccountBalanceDriverByOperatorPage,); + this.service.exportStart( + { + ...this.sf.value, + pageSize: -1, + ltdId: this.params.ltdId, + projectId: this.params.projectId, + enterpriseId: this.params.enterpriseId, + roleId: this.params.roleId, + bankType: this.params.bankType, + createTime: { + start: this.sf.value?.createTime?.[0] || '', + end: this.sf.value?.createTime?.[1] || '' + } + }, + this.service.$api_get_exportAccountBalanceDriverByOperatorPage + ); } goBack() { @@ -171,8 +182,8 @@ export class DriverAccountDetailComponent implements OnInit { { title: '交易时间', index: 'createTime', type: 'date', width: 150 }, { title: '流水号', index: 'channelPaySn', width: 170 }, { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center', width: 150 }, - { title: '交易单号', index: 'businessNumber' , width: 190}, - { title: '订单号', index: 'orderSn' , width: 190}, + { title: '交易单号', index: 'businessNumber', width: 190 }, + { title: '订单号', index: 'orderSn', width: 190 }, { title: '运单号', index: 'transportSn', width: 190 }, { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center', width: 150 }, { @@ -191,9 +202,9 @@ export class DriverAccountDetailComponent implements OnInit { className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) } }, - { title: '付款方', index: 'payName', width: 150}, + { title: '付款方', index: 'payName', width: 150 }, { title: '收款方', index: 'incomeName', width: 150 }, - { title: '备注', index: 'tradeContent' , width: 150}, + { title: '备注', index: 'tradeContent', width: 150 } ]; } } From bd95bcc71fd3d4bd3ee808593a9dd4f226e04d05 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 13 Apr 2022 19:30:50 +0800 Subject: [PATCH 15/50] fix bug --- .../components/bulk-detail/bulk-detail.component.ts | 12 +++++++----- .../vehicle-detail/vehicle-detail.component.ts | 9 +++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts index cfe20fdf..ce203d88 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 19:00:19 + * @LastEditTime : 2022-04-13 19:29:45 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -72,6 +72,8 @@ export class OrderManagementBulkeDetailComponent implements OnInit { } ]; get logParams() { + console.log(this.i?.billCode); + return { operateObject: this.i?.billCode, operateTypeList: ['3','8'] } } trajectory = 'car'; @@ -116,7 +118,9 @@ export class OrderManagementBulkeDetailComponent implements OnInit { time: '计划卸货时间：' + res.unloadPlanTime } ]; - + setTimeout(() => { + this.logSt.load(1); + }); } }); this.service.request(this.service.$api_listBillComplianceAbnormalByBillId, { id: this.id }).subscribe(res => { @@ -133,9 +137,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit { this.warringList = res } }); - setTimeout(() => { - this.logSt.load(1); - }); + } goBack() { diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts index a113356d..4dd0ddd8 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 19:06:44 + * @LastEditTime : 2022-04-13 19:30:46 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -111,6 +111,9 @@ export class OrderManagementVehicleDetailComponent implements OnInit { (data: any) => data.expenseCode === 'PRE' || data.expenseCode === 'RECE' || data.expenseCode === 'BACK' ); this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data: any) => data.displayStatus !== 'HIDE'); + setTimeout(() => { + this.logSt.load(1); + }); } }); this.service.request(this.service.$api_listBillComplianceAbnormalByBillId, { id: this.id }).subscribe(res => { @@ -127,9 +130,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { this.warringList = res } }); - setTimeout(() => { - this.logSt.load(1); - }); + } // 取消订单 cancellation() { From d5e8e5eb60e4a2159df067c73595a42cdc2c43d4 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 13 Apr 2022 19:54:31 +0800 Subject: [PATCH 16/50] fix bug --- .../bulk-detail/bulk-detail.component.html | 7 +++--- .../bulk-detail/bulk-detail.component.ts | 23 +++++++++++++++---- .../vehicle-detail.component.html | 6 +++-- .../vehicle-detail.component.ts | 23 +++++++++++++++---- .../logistics-time-line.component.html | 14 +++++++++-- 5 files changed, 56 insertions(+), 17 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 5cd7cb57..acf6fcff 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 19:02:35 + * @LastEditTime : 2022-04-13 19:38:36 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -241,13 +241,14 @@ [page]="{ show: false, showSize: false }"> - {{item?.operator}}/{{item.telephone}} - + --> + diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts index ce203d88..33757e8a 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 19:29:45 + * @LastEditTime : 2022-04-13 19:52:18 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -31,6 +31,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit { billExpenses: any[] = []; //运费信息表格信息 pois: any[] = []; abnormalList: any[] = []; + operationList: any; i: any; imges: any; totalObj: any; @@ -72,8 +73,6 @@ export class OrderManagementBulkeDetailComponent implements OnInit { } ]; get logParams() { - console.log(this.i?.billCode); - return { operateObject: this.i?.billCode, operateTypeList: ['3','8'] } } trajectory = 'car'; @@ -118,8 +117,21 @@ export class OrderManagementBulkeDetailComponent implements OnInit { time: '计划卸货时间：' + res.unloadPlanTime } ]; - setTimeout(() => { - this.logSt.load(1); + this.service.request(this.service.$api_get_log_list,{operateObject: this.i?.billCode, operateTypeList: ['3','8']}).subscribe(res => { + if (res) { + console.log('操作日志'); + console.log(res); + let a :any= [] + res.records.forEach((item: any) => { + a.push({ + value: `操作人： ${item.operator}
操作内容： ${ item.operationContent}`, + time: item.operatorTimestamp, + color: 'green' + }) + }) + console.log(a); + this.operationList = a; + } }); } }); @@ -130,6 +142,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit { this.abnormalList = res; } }); + this.service.request(this.service.$api_getAbnormalWarningByBillId, { id: this.id }).subscribe(res => { if (res) { console.log('异常预警'); diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index 8fb28115..ef545cc3 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -247,13 +247,15 @@ [page]="{ show: false, showSize: false }"> - {{item?.operator}}/{{item.telephone}} - + --> + + diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts index 4dd0ddd8..89713968 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 19:30:46 + * @LastEditTime : 2022-04-13 19:52:15 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -27,6 +27,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { modalcontent: any; modalTitle: string = ''; trajectory = 'car'; + operationList: any; mapList: any[] = []; //地图点位数据组 pois: any[] = []; addressItems: any[] = []; //打点地址数据组 @@ -107,13 +108,25 @@ export class OrderManagementVehicleDetailComponent implements OnInit { time: '计划卸货时间：' + res.unloadPlanTime } ]; + this.service.request(this.service.$api_get_log_list,{operateObject: this.i?.billCode, operateTypeList: ['3','8']}).subscribe(res => { + if (res) { + console.log('操作日志'); + console.log(res); + let a :any= [] + res.records.forEach((item: any) => { + a.push({ + value: `操作人： ${item.operator}
操作内容： ${ item.operationContent}`, + time: item.operatorTimestamp, + color: 'green' + }) + }) + console.log(a); + this.operationList = a; + } + }); this.billExpenses = this.i?.billExpenseDetails?.filter( (data: any) => data.expenseCode === 'PRE' || data.expenseCode === 'RECE' || data.expenseCode === 'BACK' ); - this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data: any) => data.displayStatus !== 'HIDE'); - setTimeout(() => { - this.logSt.load(1); - }); } }); this.service.request(this.service.$api_listBillComplianceAbnormalByBillId, { id: this.id }).subscribe(res => { diff --git a/src/app/shared/components/logistics-time-line/logistics-time-line.component.html b/src/app/shared/components/logistics-time-line/logistics-time-line.component.html index 5ab3688a..8a63e8bf 100644 --- a/src/app/shared/components/logistics-time-line/logistics-time-line.component.html +++ b/src/app/shared/components/logistics-time-line/logistics-time-line.component.html @@ -1,5 +1,15 @@ + - - + + \ No newline at end of file From d9b7901b759e94741cd414f06592cecf0d142009 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 13 Apr 2022 20:02:32 +0800 Subject: [PATCH 17/50] fix bug --- .../freight-account-detail.component.ts | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts index 3693361f..dd2fa6ca 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts +++ b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts @@ -83,7 +83,21 @@ export class FreightAccountDetailComponent implements OnInit { stChange(e: STChange): void {} exportList() { - this.service.exportStart( { ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAccountBalanceShipperByOperatorPage,); + this.service.exportStart( + { + ...this.sf.value, + pageSize: -1, + ltdId: this.params.ltdId, + projectId: this.params.projectId, + enterpriseId: this.params.enterpriseId, + roleId: this.params.roleId, + createTime: { + start: this.sf?.value.createTime?.[0] || '', + end: this.sf?.value.createTime?.[1] || '' + } + }, + this.service.$api_get_exportAccountBalanceShipperByOperatorPage + ); } goBack() { @@ -201,8 +215,8 @@ export class FreightAccountDetailComponent implements OnInit { { title: '交易单号', index: 'businessNumber', width: 170 }, { title: '订单号', index: 'orderSn', width: 170 }, { title: '运单号', index: 'transportSn', width: 170 }, - { title: '货主', index: 'enterpriseName' , width: 170}, - { title: '所属项目', index: 'projectName' , width: 170}, + { title: '货主', index: 'enterpriseName', width: 170 }, + { title: '所属项目', index: 'projectName', width: 170 }, { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center', width: 140 }, { title: '交易金额', @@ -220,7 +234,7 @@ export class FreightAccountDetailComponent implements OnInit { className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) } }, - { title: '付款方', index: 'payName' , width: 170}, + { title: '付款方', index: 'payName', width: 170 }, { title: '收款方', index: 'incomeName', width: 170 }, { title: '备注', index: 'tradeContent', width: 170 } ]; From 932db393cb063d1170368eb1bf5aa15fb4bd11a5 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 13 Apr 2022 20:07:08 +0800 Subject: [PATCH 18/50] fix bug --- .../abnormal-appear/abnormal-appear.component.html | 8 ++++---- .../abnormal-appear/abnormal-appear.component.less | 1 + .../abnormal-appear/abnormal-appear.component.ts | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html index d4ac94de..393c74d6 100644 --- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html +++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html @@ -1,7 +1,7 @@ @@ -230,8 +230,8 @@
如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈
    -
  • 系统识别:{{item?.complianceTypeName}}
    • -
  • {{item?.determineDetails}}，您可在企业端提交申诉材料或联系客服。
    • +
  • 系统识别:{{item?.complianceTypeName}}
    • +
  • {{item?.determineDetails}}
 diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index ef545cc3..dba53098 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 19:04:48 + * @LastEditTime : 2022-04-14 10:09:03 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -236,8 +236,8 @@
您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您!
如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈
    -
  • 系统识别:{{ item?.complianceTypeName }}
    • -
  • {{ item?.determineDetails }}，您可在企业端提交申诉材料或联系客服。
    • +
  • 系统识别:{{ item?.complianceTypeName }}
    • +
  • {{ item?.determineDetails }}
 From 3737d0e943bc790acc6898e9d443f855f297064a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 14 Apr 2022 10:19:07 +0800 Subject: [PATCH 26/50] fix bug --- .../components/complaint-detail/complaint-detail.component.ts | 2 +- .../components/vehicle-detail/vehicle-detail.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts index 1fec3254..33960128 100644 --- a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts +++ b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts @@ -63,7 +63,7 @@ export class OrderManagementComplaintDetailComponent implements OnInit { initSF() { this.schema = { properties: { - drvComplaintCauseLabel: { + shpComplaintCauseLabel: { title: '投诉原因', type: 'string', maxLength: 30, 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 4909c270..a570a0d1 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 @@ -190,7 +190,7 @@ （运费{{ i?.totalFreight | currency }}含附加运费 {{ i?.totalSurcharge | currency }}）

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

 From 3670c8e5159adfc8ff2fde3377f016d4123954dd Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 14 Apr 2022 10:27:13 +0800 Subject: [PATCH 27/50] fix bug --- .../complaint-detail/complaint-detail.component.ts | 13 +++++++++++++ .../components/complaint/complaint.component.ts | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts index 33960128..0c311e0e 100644 --- a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts +++ b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts @@ -37,6 +37,8 @@ export class OrderManagementComplaintDetailComponent implements OnInit { if (this.id) { this.getDetail(this.id); + console.log(this.ar.snapshot.queryParams.sts); + this.initSF(); this.initSTAudit() } @@ -68,6 +70,17 @@ export class OrderManagementComplaintDetailComponent implements OnInit { type: 'string', maxLength: 30, ui: { + hidden: this.ar.snapshot.queryParams.sts == 2, + widget: 'text', + change: (value, orgData) => console.log(value, orgData), + } as SFSelectWidgetSchema, + }, + drvComplaintCauseLabel: { + title: '投诉原因', + type: 'string', + maxLength: 30, + ui: { + hidden: this.ar.snapshot.queryParams.sts == 1, widget: 'text', change: (value, orgData) => console.log(value, orgData), } as SFSelectWidgetSchema, diff --git a/src/app/routes/order-management/components/complaint/complaint.component.ts b/src/app/routes/order-management/components/complaint/complaint.component.ts index 82e301a3..2d421c63 100644 --- a/src/app/routes/order-management/components/complaint/complaint.component.ts +++ b/src/app/routes/order-management/components/complaint/complaint.component.ts @@ -360,7 +360,8 @@ export class OrderManagementComplaintComponent implements OnInit { view(value: any) { this.router.navigate(['/order-management/complaint-detail/' + value.id], { queryParams: { - detail: JSON.stringify(value) + detail: JSON.stringify(value), + sts: this.selectedMainTabStatus } }); } From 8462c41b9cd423852c47f7b771b17bb5999aa3a1 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 14 Apr 2022 10:28:53 +0800 Subject: [PATCH 28/50] fix bug --- .../components/bulk-detail/bulk-detail.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts index 75b71007..b7711049 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts @@ -53,7 +53,7 @@ export class SupplyManagementBulkDetailComponent implements OnInit { } // 运单类型 settlementBasis: any = { - 1: '以收获为准', + 1: '以收货为准', 2: '以发货为准' } // 结算依据 From 177d1eefd5fbecf7096e8e503e6034966d6585f9 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 14 Apr 2022 10:33:24 +0800 Subject: [PATCH 29/50] fix bug --- .../order-management/components/bulk/bulk.component.ts | 6 ++++++ .../components/vehicle/vehicle.component.ts | 6 ++++++ 2 files changed, 12 insertions(+) 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 6ef8e789..90da4ed6 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -518,6 +518,12 @@ export class OrderManagementBulkComponent implements OnInit { className: 'text-left', render: 'loadingTime' }, + { + title: '录单时间', + className: 'text-left', + index: 'recordTime', + width: '170px' + }, { title: '创建时间', width: '180px', 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 4c380bd6..27494ac4 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -394,6 +394,12 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme className: 'text-left', render: 'loadingTime' }, + { + title: '录单时间', + className: 'text-left', + index: 'recordTime', + width: '170px' + }, { title: '创建时间', className: 'text-left', From 4006e70c3750818a99bd05ce3bcbcc96340da86f Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 14 Apr 2022 10:40:21 +0800 Subject: [PATCH 30/50] fix bug --- .../components/abnormal-gold/abnormal-gold.component.html | 3 +-- .../components/abnormal-gold/abnormal-gold.component.ts | 8 -------- .../recharge-record/recharge-record.component.ts | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html index 5353f411..04df021a 100644 --- a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html +++ b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-06 10:57:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-11 14:23:35 + * @LastEditTime : 2022-04-14 10:39:57 * @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\abnormal-gold\\abnormal-gold.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -36,7 +36,6 @@ - diff --git a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts index a0add6da..2affe91f 100644 --- a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts +++ b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts @@ -173,14 +173,6 @@ export class AbnormalGoldComponent implements OnInit { className: 'text-center', width: 120, buttons: [ - { - text: '清分', - click: item => this.clearingAction(item) - }, - { - text: '退款', - click: item => this.refund(item) - }, { text: '查看', click: item => this.router.navigate(['/financial-management/withdrawals-record/detail/1']) diff --git a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts index 52015766..f06bc8cb 100644 --- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts +++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts @@ -229,7 +229,7 @@ export class RechargeRecordComponent implements OnInit { bankType: item.bankType, rmYll: item.roleId, snglFlgCd: item.paySerialNumber2, - bussType: '06', + bussType: '05', ltdId: item.ltdId, accountType: item.accountType }) From b3cdcf5bff1bcbc22a92ce63f0646be0e74f700f Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 14 Apr 2022 10:53:51 +0800 Subject: [PATCH 31/50] fix bug --- .../order-management/components/bulk/bulk.component.html | 5 ++++- .../order-management/components/bulk/bulk.component.ts | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/app/routes/order-management/components/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html index 482bb68c..bced8f7d 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.html +++ b/src/app/routes/order-management/components/bulk/bulk.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-04-08 11:30:05 + * @LastEditTime : 2022-04-14 10:53:35 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -78,6 +78,9 @@
{{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}{{ item?.carNo ? "/" + item?.carNo : ''}}
+ +
{{ item.settlementWeight ? item.settlementWeight + '吨/ ': ''}} {{ item.settlementVolume ? item.settlementVolume + '方 ': ''}}
+
{{ item?.payeeName }}{{ item?.payeePhone ? "/" + item?.payeePhone : '' }}
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 90da4ed6..e4944856 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -491,12 +491,12 @@ export class OrderManagementBulkComponent implements OnInit { }, { title: '结算数量', - index: '结算数量', + render: 'settlementWeight', width: '170px', className: 'text-left', - format: (item: any) => - `${item.settlementWeight || '0'}吨/ - ${item.settlementVolume || '0'}方` + // format: (item: any) => + // `${item.settlementWeight || '0'}吨/ + // ${item.settlementVolume || '0'}方` }, { title: '承运司机', From e6a451c0a546d3ea31cd813e7ca2514d4c3e3f74 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 14 Apr 2022 11:41:20 +0800 Subject: [PATCH 32/50] fix bug --- proxy.conf.js | 4 +-- .../components/list/list.component.ts | 6 ++-- .../services/insurance-management.service.ts | 29 ++++++++++++++++++- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index e6de13f2..b8983842 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-09 16:39:20 + * @LastEditTime : 2022-04-14 11:38:39 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -20,7 +20,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/insurance-management/components/list/list.component.ts b/src/app/routes/insurance-management/components/list/list.component.ts index 2846e43a..4655ee58 100644 --- a/src/app/routes/insurance-management/components/list/list.component.ts +++ b/src/app/routes/insurance-management/components/list/list.component.ts @@ -501,8 +501,10 @@ export class insuranceManagementListComponent implements OnInit { // console.log(newUrl); // window.open(newUrl,'_self'); - - this.service.downloadFile(`${_record.policyUrl}`) + window.open(`${_record.newPolicyUrl}`); + // this.service.downloadFile(`${_record.newPolicyUrl}`) + + // const params = { // imgList: [_record.policyUrl], // index: 0 diff --git a/src/app/routes/insurance-management/services/insurance-management.service.ts b/src/app/routes/insurance-management/services/insurance-management.service.ts index 0482f606..413d2a7d 100644 --- a/src/app/routes/insurance-management/services/insurance-management.service.ts +++ b/src/app/routes/insurance-management/services/insurance-management.service.ts @@ -55,7 +55,34 @@ export class InsuranceManagementService extends ShipperBaseService { // } // a.remove(); } - + // getReceiptUrl(url: string, params: any) { + // const { bankType, snglFlgCd } = params; + // if (url) { + // if (params?.bankType === '1') { + // window.open(params?.receiptUrl); + // } else if (params?.bankType === '2') { + // window.open(url); + // // this.exportFile({ bankType, receiptUrl: url, bankSerialNumber: snglFlgCd }, this.$api_download_receipt_apply_byte); + // } + // } else { + // this.request(this.$api_download_receipt_apply, { ...params }).subscribe(res => { + // if (res?.receiptUrl) { + // if (bankType === '1') { + // window.open(res?.receiptUrl); + // } else if (bankType === '2') { + // window.open(res?.receiptUrl); + // // this.downloadFile(this.$api_download_receipt_apply_byte, { + // // bankType, + // // receiptUrl: res.receiptUrl, + // // bankSerialNumber: snglFlgCd + // // }); + // } + // } else { + // this.msgSrv.warning(res.statusMsg || '获取回单失败'); + // } + // }); + // } + // } constructor(public injector: Injector) { super(injector); } From 14c91d242bac2b22be67bb30c23bd25368f06f1c Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 14 Apr 2022 14:00:32 +0800 Subject: [PATCH 33/50] edit --- proxy.conf.js | 2 +- .../abnormal-gold.component.less | 37 ----------------- .../abnormal-gold/abnormal-gold.component.ts | 41 +++++++++++-------- 3 files changed, 25 insertions(+), 55 deletions(-) delete mode 100644 src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.less diff --git a/proxy.conf.js b/proxy.conf.js index b8983842..72b8c166 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -20,7 +20,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/financial-management/components/abnormal-gold/abnormal-gold.component.less b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.less deleted file mode 100644 index c5f2b1ea..00000000 --- a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.less +++ /dev/null @@ -1,37 +0,0 @@ -:host::ng-deep { - .search-box { - .ant-card-body { - padding-bottom: 18px; - } - } - - .content-box { - .ant-card-body { - padding-top: 0; - } - } - - nz-range-picker { - width: 100%; - } - - .ant-tabs-tab-btn { - padding-left : 16px; - padding-right: 16px; - } -} - -.expend-options { - margin-top: 0px; -} - - -@media (min-width: 1200px) { - .expend-options { - max-width: 400px; - position : absolute; - right : 0; - bottom : 25px; - } - -} \ No newline at end of file diff --git a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts index 2affe91f..6482bcfa 100644 --- a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts +++ b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts @@ -9,7 +9,7 @@ import { ClearingModalComponent } from './clearing-modal/clearing-modal.componen @Component({ selector: 'app-abnormal-gold', templateUrl: './abnormal-gold.component.html', - styleUrls: ['./abnormal-gold.component.less'] + styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] }) export class AbnormalGoldComponent implements OnInit { @ViewChild('st', { static: true }) @@ -101,7 +101,7 @@ export class AbnormalGoldComponent implements OnInit { ], ui: { widget: 'select', - placeholder: '请选择', + placeholder: '请选择' }, default: '' }, @@ -154,18 +154,25 @@ export class AbnormalGoldComponent implements OnInit { private initST(): STColumn[] { return [ - { title: '银行流水号', index: 'paySerialNumber', width: 150 }, - { title: '网络货运人', index: 'ltdId', width: 120 }, - { title: '银行类型', index: 'callNo', width: 100, type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' } }, - { title: '资金总账号', index: 'callNo', width: 120 }, - { title: '充值金额', index: 'rechargeAmount', width: 100 }, - { title: '付款账户', index: 'transferBankAccount', width: 100 }, - { title: '付款账号', index: 'transferBankCardNumber', width: 100 }, - { title: '付款银行', index: 'transferBankOpenName', width: 100 }, + { title: '银行流水号', index: 'paySerialNumber', width: 180 }, + { title: '网络货运人', index: 'ltdName', width: 220 }, + { title: '银行类型', index: 'bankTypeLabel', width: 100 }, + { title: '资金总账号', index: 'virtualAccount', width: 180 }, + { + title: '充值金额', + index: 'rechargeAmount', + width: 140, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.rechargeAmount }) } + }, + { title: '付款账户', index: 'transferBankAccount', width: 180 }, + { title: '付款账号', index: 'transferBankCardNumber', width: 180 }, + { title: '付款银行', index: 'transferBankOpenName', width: 220 }, { title: '转账时间', index: 'transferDate', type: 'date', width: 150 }, - { title: '转账备注', index: 'rechargeRemark', width: 100 }, - { title: '操作人', index: 'rechargeName', width: 90 }, - { title: '操作时间', index: 'callNo', type: 'date', width: 150 }, + { title: '转账备注', index: 'remark', width: 100 }, + { title: '操作人', index: 'rechargeName', width: 140 }, + { title: '操作时间', index: 'callNo', type: 'date', width: 160 }, { title: '状态', index: 'callNo', width: 90 }, { title: '操作', @@ -181,8 +188,8 @@ export class AbnormalGoldComponent implements OnInit { } ]; } - // 导出 - exprot() { - this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAbnormalAmountPage); - } + // 导出 + exprot() { + this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAbnormalAmountPage); + } } From faf399ca4460588a702fc1f1893fb41f1448f7b6 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 14 Apr 2022 14:10:28 +0800 Subject: [PATCH 34/50] edit --- .../transaction-flow/transaction-flow.component.ts | 14 ++++++++++++-- .../services/freight-account.service.ts | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts index 7f26b5ca..0e7987e9 100644 --- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts +++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts @@ -91,6 +91,16 @@ export class TransactionFlowComponent { placeholder: '请输入' } }, + orderSn: { + type: 'string', + title: '订单号', + ui: { + placeholder: '请输入', + visibleIf: { + expand: (value: boolean) => value + } + } + }, tradeType: { type: 'string', title: '交易类型', @@ -216,6 +226,7 @@ export class TransactionFlowComponent { { title: '流水号', index: 'transactionNumber', width: 180 }, { title: '交易类型', index: 'tradeTypeLabel', width: 120 }, { title: '关联单号', index: 'businessNumber', width: 150 }, + { title: '订单号', index: 'orderSn', width: 150 }, { title: '账户类型', index: 'accountTypeLabel', width: 130 }, { title: '账户名称', index: 'roleName', width: 180 }, { title: '所属项目', index: 'projectName', width: 140 }, @@ -262,7 +273,6 @@ export class TransactionFlowComponent { ]; } exportList() { - - this.service.exportStart( { ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAccountBalanceDetailPage,); + this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAccountBalanceDetailPage); } } diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts index 9056f8d9..c550bfde 100644 --- a/src/app/routes/financial-management/services/freight-account.service.ts +++ b/src/app/routes/financial-management/services/freight-account.service.ts @@ -173,7 +173,7 @@ export class FreightAccountService extends ShipperBaseService { const { bankType, snglFlgCd } = params; if (url) { if (params?.bankType === '1') { - window.open(params?.receiptUrl); + window.open(url); } else if (params?.bankType === '2') { window.open(url); // this.exportFile({ bankType, receiptUrl: url, bankSerialNumber: snglFlgCd }, this.$api_download_receipt_apply_byte); From 461bf39813afcf1f3611bfcf0ed913fa4b110745 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 14 Apr 2022 14:52:48 +0800 Subject: [PATCH 35/50] fix bug --- proxy.conf.js | 4 +- .../customindex/customindex.component.html | 10 ++--- .../customindex/customindex.component.ts | 2 +- .../datascreen/datascreen.component.html | 24 +++++------ .../datascreen/datascreen.component.less | 6 ++- .../datascreen/datascreen.component.ts | 22 +++++----- .../datascreen/map/map.component.ts | 20 +++++---- .../services/insurance-management.service.ts | 41 ++++++------------- .../components/risk/risk.component.ts | 4 +- 9 files changed, 61 insertions(+), 72 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index b8983842..6a0a73cf 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-14 11:38:39 + * @LastEditTime : 2022-04-14 14:40:51 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -20,7 +20,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/datatable/components/customtable/customindex/customindex.component.html b/src/app/routes/datatable/components/customtable/customindex/customindex.component.html index 9dfc91aa..19875e13 100644 --- a/src/app/routes/datatable/components/customtable/customindex/customindex.component.html +++ b/src/app/routes/datatable/components/customtable/customindex/customindex.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-06 13:20:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-06 20:24:20 + * @LastEditTime : 2022-04-14 14:37:25 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\customtable\\customindex\\customindex.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -12,19 +12,19 @@
- +
- +
- +
- +
diff --git a/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts b/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts index 27b8a1ff..5d8edf23 100644 --- a/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts +++ b/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts @@ -38,7 +38,7 @@ export class DatatableCustomindexComponent implements OnInit { { title: '未激活用户数', index: 'notActivationTotal', className: 'text-center' }, { title: '沉默用户数', index: 'silentTotal', className: 'text-center' }, { title: '流失用户数', index: 'drainTotal', className: 'text-center' }, - { title: '流失率', index: 'drainRate', className: 'text-center',format: (item: any) => {return (item?.drainRate)*100 + '%' }} + { title: '流失率', index: 'drainRate', className: 'text-center',format: (item: any) => {return ((item?.drainRate)*100).toFixed(2) + '%' }} ]; hzData: any; hhrData: any; diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.html b/src/app/routes/datatable/components/datascreen/datascreen.component.html index e614479a..2bad58ef 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-13 15:20:32 + * @LastEditTime : 2022-04-14 14:25:03 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -22,7 +22,7 @@

实时交易监控

-
+
@@ -45,13 +45,12 @@ - + - - - + +
+ +
+ - +
@@ -152,12 +153,11 @@ - + tr > th, .ant-table-tbody > tr > td, .ant-table tfoot > tr > th, .ant-table tfoot > tr > td { + padding: 0; + font-size: 12px; } } } \ No newline at end of file diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.ts b/src/app/routes/datatable/components/datascreen/datascreen.component.ts index 128e3f9e..ba2a32f4 100644 --- a/src/app/routes/datatable/components/datascreen/datascreen.component.ts +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.ts @@ -5,7 +5,7 @@ import { map } from 'rxjs/operators'; * @Author : Shiming * @Date : 2022-04-06 10:57:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 10:25:50 + * @LastEditTime : 2022-04-14 14:05:01 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -127,20 +127,20 @@ export class DatatableDatascreenComponent implements OnInit { */ initST() { this.columns = [ - { title: '序号', render: 'index', className: 'text-center', width: '70px', }, - { title: '发货地', index: 'loadAddress', className: 'text-center', width: '90px' }, - { title: '卸货地', index: 'dischargeAddress', className: 'text-center', width: '90px' }, - { title: '货物', index: 'goodsName', className: 'text-center', width: '90px' }, - { title: '数量', render: 'weight', className: 'text-center', width: '120px' } + { title: '序号', render: 'index', className: 'text-center', }, + { title: '发货地', index: 'loadAddress', className: 'text-center', }, + { title: '卸货地', index: 'dischargeAddress', className: 'text-center',}, + { title: '货物', index: 'goodsName', className: 'text-center', }, + { title: '数量', render: 'weight', className: 'text-center',} ]; } initOrderST() { this.orderColumns = [ - { title: '运单号', index: 'wayCode', className: 'text-center', width: '150px' }, - { title: '司机/车辆', index: 'carNo', className: 'text-center', width: '120px' }, - { title: '货主', index: 'shipperName', className: 'text-center', width: '200px' }, - { title: '时间', index: 'createTime', className: 'text-center', width: '200px' }, - { title: '异常预警', index: 'warningTypeLabel', className: 'text-center', width: '120px' } + { title: '运单号', index: 'wayCode', className: 'text-center', }, + { title: '司机/车辆', index: 'carNo', className: 'text-center', }, + { title: '货主', index: 'shipperName', className: 'text-center', }, + { title: '时间', index: 'createTime', className: 'text-center', }, + { title: '异常预警', index: 'warningTypeLabel', className: 'text-center',} ]; } diff --git a/src/app/routes/datatable/components/datascreen/map/map.component.ts b/src/app/routes/datatable/components/datascreen/map/map.component.ts index 23d25d80..739e2592 100644 --- a/src/app/routes/datatable/components/datascreen/map/map.component.ts +++ b/src/app/routes/datatable/components/datascreen/map/map.component.ts @@ -95,8 +95,8 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges, Afte if(res) { res.forEach((element: any) => { value.push({ - name: element.province, - value: element.weight, + '省份': element.province, + '订单数': element.weight, }); }); console.log(value); @@ -107,17 +107,19 @@ if (!(this.userData instanceof Array) || this.userData.length === 0) { } this.userDv = this.ds.createView().source(this.userData).transform({ geoDataView: this.worldMap, - field: 'name', + field: '省份', type: 'geo.region', as: ['longitude', 'latitude'] }).transform({ type: 'map', - callback: (obj: { trend: string; value: number }) => { - if(obj.value < 500) { + callback: (obj: { trend: string; 订单数: number }) => { + console.log(obj); + + if(obj.订单数 < 500) { obj.trend = '500以下'; - } else if(obj.value >= 500 && obj.value < 1000){ + } else if(obj.订单数 >= 500 && obj.订单数 < 1000){ obj.trend = '500-1000'; - } else if(obj.value >= 1000 ){ + } else if(obj.订单数 >= 1000 ){ obj.trend = '>1000'; } return obj; @@ -127,13 +129,13 @@ if (!(this.userData instanceof Array) || this.userData.length === 0) { this.userView.data(this.userDv.rows); this.userView.scale({ trend: { - alias: '蓝色地区数量' + alias: '订单交易数量' } }); console.log(this.userView); console.log('45545'); - this.userView.polygon().position('longitude*latitude').color('trend', ['#0a3f80', '#1b6aca', '#5d93d4']).tooltip('name*trend*value').style({fillOpacity: 0.85 }) + this.userView.polygon().position('longitude*latitude').color('trend', ['#0a3f80', '#1b6aca', '#5d93d4']).tooltip('省份*订单数').style({fillOpacity: 0.85 }) .animate({ leave: { animation: 'fade-out' diff --git a/src/app/routes/insurance-management/services/insurance-management.service.ts b/src/app/routes/insurance-management/services/insurance-management.service.ts index 413d2a7d..cd35b120 100644 --- a/src/app/routes/insurance-management/services/insurance-management.service.ts +++ b/src/app/routes/insurance-management/services/insurance-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 15:31:52 * @LastEditors : Shiming - * @LastEditTime : 2022-04-11 15:13:24 + * @LastEditTime : 2022-04-14 11:43:13 * @FilePath : \\tms-obc-web\\src\\app\\routes\\insurance-management\\services\\insurance-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -55,34 +55,17 @@ export class InsuranceManagementService extends ShipperBaseService { // } // a.remove(); } - // getReceiptUrl(url: string, params: any) { - // const { bankType, snglFlgCd } = params; - // if (url) { - // if (params?.bankType === '1') { - // window.open(params?.receiptUrl); - // } else if (params?.bankType === '2') { - // window.open(url); - // // this.exportFile({ bankType, receiptUrl: url, bankSerialNumber: snglFlgCd }, this.$api_download_receipt_apply_byte); - // } - // } else { - // this.request(this.$api_download_receipt_apply, { ...params }).subscribe(res => { - // if (res?.receiptUrl) { - // if (bankType === '1') { - // window.open(res?.receiptUrl); - // } else if (bankType === '2') { - // window.open(res?.receiptUrl); - // // this.downloadFile(this.$api_download_receipt_apply_byte, { - // // bankType, - // // receiptUrl: res.receiptUrl, - // // bankSerialNumber: snglFlgCd - // // }); - // } - // } else { - // this.msgSrv.warning(res.statusMsg || '获取回单失败'); - // } - // }); - // } - // } + getReceiptUrl(url: string, params: any) { + const { bankType, snglFlgCd } = params; + if (url) { + if (params?.bankType === '1') { + window.open(params?.receiptUrl); + } else if (params?.bankType === '2') { + window.open(url); + // this.exportFile({ bankType, receiptUrl: url, bankSerialNumber: snglFlgCd }, this.$api_download_receipt_apply_byte); + } + } + } constructor(public injector: Injector) { super(injector); } diff --git a/src/app/routes/order-management/components/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts index 898ad94a..400d1fb0 100644 --- a/src/app/routes/order-management/components/risk/risk.component.ts +++ b/src/app/routes/order-management/components/risk/risk.component.ts @@ -201,7 +201,7 @@ export class OrderManagementRiskComponent implements OnInit { } } as SFSelectWidgetSchema }, - shipperId: { + shipperAppUserName: { type: 'string', title: '托运人', ui: { @@ -218,7 +218,7 @@ export class OrderManagementRiskComponent implements OnInit { if (str) { return this.service .request(this.service.$api_enterpriceList, { enterpriseName: str }) - .pipe(map((res: any) => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum)))) + .pipe(map((res: any) => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.enterpriseName } as SFSchemaEnum)))) .toPromise(); } else { return of([]); From 540ea2ee588f807b569096420f40c13560379f90 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 14 Apr 2022 15:37:03 +0800 Subject: [PATCH 36/50] fix bug --- .../customindex/customindex.component.html | 14 +++++++------- .../customindex/customindex.component.ts | 4 +++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/app/routes/datatable/components/customtable/customindex/customindex.component.html b/src/app/routes/datatable/components/customtable/customindex/customindex.component.html index 19875e13..6606c383 100644 --- a/src/app/routes/datatable/components/customtable/customindex/customindex.component.html +++ b/src/app/routes/datatable/components/customtable/customindex/customindex.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-06 13:20:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-14 14:37:25 + * @LastEditTime : 2022-04-14 15:36:53 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\customtable\\customindex\\customindex.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -16,7 +16,7 @@
- +
@@ -32,24 +32,24 @@
- +
{return ((item?.drainRate)*100).toFixed(2) + '%' }} ]; hzData: any; - hhrData: any; + hhrData: any = { + total: 0 + }; sjData: any; clData: any; reportData: any = []; From 4a52639e791dbb916bc58c90716e977a7acd8b51 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 14 Apr 2022 15:44:41 +0800 Subject: [PATCH 37/50] fix bug --- .../customindex/customindex.component.html | 20 +++++++++---------- .../customindex/customindex.component.ts | 3 +++ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/app/routes/datatable/components/customtable/customindex/customindex.component.html b/src/app/routes/datatable/components/customtable/customindex/customindex.component.html index 6606c383..dece86a1 100644 --- a/src/app/routes/datatable/components/customtable/customindex/customindex.component.html +++ b/src/app/routes/datatable/components/customtable/customindex/customindex.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-06 13:20:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-14 15:36:53 + * @LastEditTime : 2022-04-14 15:43:56 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\customtable\\customindex\\customindex.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -12,19 +12,19 @@
- +
- +
- +
- +
@@ -32,24 +32,24 @@
- +
{ if (res) { + this.hhrData = res; + console.log(this.hhrData); + } }); this.service.request(this.service.$api_statistics_total, { type: 3 }).subscribe(res => { From bfbcb144aea74f9faa7f28dfc265e758f2593f83 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 14 Apr 2022 15:49:24 +0800 Subject: [PATCH 38/50] fix bug --- .../datascreen/datascreen.component.html | 53 ++++++++++--------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.html b/src/app/routes/datatable/components/datascreen/datascreen.component.html index 2bad58ef..625f4869 100644 --- a/src/app/routes/datatable/components/datascreen/datascreen.component.html +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.html @@ -4,25 +4,28 @@ * @Author : Shiming * @Date : 2022-04-06 10:57:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-14 14:25:03 + * @LastEditTime : 2022-04-14 15:48:32 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> -
-
-

运多星网络货运平台

-
-   - {{todayTime}} +
+
+

运多星网络货运平台

+
+   + {{ todayTime }}
- -

实时交易监控

+

实时交易监控

-
+
@@ -42,15 +45,15 @@ - - + + - + - -
- -
- + +
+ +
+ - +
@@ -153,11 +156,11 @@ - + - - {{ item?.driverName }}{{ item?.carNo ? '/' + item?.carNo : '' }} - + + {{ item?.driverName }}{{ item?.carNo ? '/' + item?.carNo : '' }} +
From c64ae3a93a87449c4b31b8f155fa8022202db5a2 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 14 Apr 2022 15:53:12 +0800 Subject: [PATCH 39/50] fix bug --- .../datatable/components/datascreen/datascreen.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.html b/src/app/routes/datatable/components/datascreen/datascreen.component.html index 625f4869..9468c1c8 100644 --- a/src/app/routes/datatable/components/datascreen/datascreen.component.html +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.html @@ -21,7 +21,7 @@
-

实时交易监控

From f395483903fa83d05b1b6e56eb6282f59a051547 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 14 Apr 2022 16:12:32 +0800 Subject: [PATCH 40/50] edit --- .../abnormal-gold-detail.component.html | 55 +++++++++++++++++++ .../abnormal-gold-detail.component.less | 0 .../abnormal-gold-detail.component.ts | 45 +++++++++++++++ .../abnormal-gold.component.html | 8 +-- .../abnormal-gold/abnormal-gold.component.ts | 20 +++++-- .../financial-managemen-routing.module.ts | 2 + .../financial-management.module.ts | 4 +- .../services/freight-account.service.ts | 3 + 8 files changed, 126 insertions(+), 11 deletions(-) create mode 100644 src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.html create mode 100644 src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.less create mode 100644 src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.ts diff --git a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.html b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.html new file mode 100644 index 00000000..4e5096af --- /dev/null +++ b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.html @@ -0,0 +1,55 @@ + + + + + + + +
+ + {{formData?.ltdName}} + + + {{formData?.bankTypeLabel}} + + + {{formData?.virtualAccount}} + + + {{formData?.transferBankAccount}} + + + {{formData?.rechargeAmount | currency}} + + + {{formData?.transferBankOpenName}} + + + {{formData?.rechargeStatusLabel}} + + + {{formData?.rechargeRemark}} + + + {{formData?.createTime}} + + + {{formData?.refundTime}} + + + {{formData?.paySerialNumber}} + + + {{formData?.paySerialNumber2}} + + + {{formData?.refundStatus==='3'?'查看回单':'暂无回单'}} + + + {{formData?.refundStatus==='3'?'查看回单':'暂无回单'}} + +
+ + \ No newline at end of file diff --git a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.less b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.less new file mode 100644 index 00000000..e69de29b diff --git a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.ts b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.ts new file mode 100644 index 00000000..1a7730c9 --- /dev/null +++ b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.ts @@ -0,0 +1,45 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { FreightAccountService } from '../../../services/freight-account.service'; + +@Component({ + selector: 'app-abnormal-gold-detail', + templateUrl: './abnormal-gold-detail.component.html', + styleUrls: ['./abnormal-gold-detail.component.less'] +}) +export class AbnormalGoldDetailComponent implements OnInit { + formData: any = {}; + + constructor(public service: FreightAccountService, private route: ActivatedRoute) { + const id = route.snapshot.params.id; + this.loadRefundDetail(id); + } + + ngOnInit(): void {} + + loadRefundDetail(id: string) { + this.service.request(this.service.$api_get_getAbnormalAmount_detail, { id }).subscribe(res => { + if (res) { + this.formData = res; + } + }); + } + + downBack() { + if (this.formData?.refundStatus !== '3') { + return; + } + this.service.getReceiptUrl(this.formData.receiptUrl, { + bankType: this.formData.bankType, + rmYll: this.formData.userId, + snglFlgCd: this.formData.coreSerNo, + bussType: '06', + ltdId: this.formData.ltdId, + accountType: this.formData.accountType + }); + } + + goBack() { + history.go(-1); + } +} diff --git a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html index 04df021a..593c1e97 100644 --- a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html +++ b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html @@ -16,7 +16,7 @@ @@ -35,9 +35,9 @@ - - - + + + { + Object.assign(requestOptions.body, { rechargeStatus: this.rechargeStatus }); if (this.sf) { Object.assign(requestOptions.body, { ...this.sf.value }); } return requestOptions; }; + changePaymentStatus(status: string) { + this.rechargeStatus = status; + this.st.load(1); + } + refund(item: any) { this.nzModalService.warning({ nzTitle: '确定要将该笔款项原路退回？', @@ -169,11 +176,12 @@ export class AbnormalGoldComponent implements OnInit { { title: '付款账户', index: 'transferBankAccount', width: 180 }, { title: '付款账号', index: 'transferBankCardNumber', width: 180 }, { title: '付款银行', index: 'transferBankOpenName', width: 220 }, - { title: '转账时间', index: 'transferDate', type: 'date', width: 150 }, - { title: '转账备注', index: 'remark', width: 100 }, - { title: '操作人', index: 'rechargeName', width: 140 }, - { title: '操作时间', index: 'callNo', type: 'date', width: 160 }, - { title: '状态', index: 'callNo', width: 90 }, + { title: '转账时间', index: 'createTime', type: 'date', width: 150 }, + { title: '转账备注', index: 'rechargeRemark', width: 180 }, + { title: '退款时间', index: 'refundTime', type: 'date', width: 150 }, + // { title: '操作人', index: 'rechargeName', width: 140 }, + // { title: '操作时间', index: 'callNo', type: 'date', width: 160 }, + { title: '状态', index: 'rechargeStatusLabel', width: 110 }, { title: '操作', fixed: 'right', @@ -182,7 +190,7 @@ export class AbnormalGoldComponent implements OnInit { buttons: [ { text: '查看', - click: item => this.router.navigate(['/financial-management/withdrawals-record/detail/1']) + click: item => this.router.navigate(['/financial-management/abnormal-gold/detail/' + item.id]) } ] } diff --git a/src/app/routes/financial-management/financial-managemen-routing.module.ts b/src/app/routes/financial-management/financial-managemen-routing.module.ts index e1a67109..cd54afa6 100644 --- a/src/app/routes/financial-management/financial-managemen-routing.module.ts +++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts @@ -32,6 +32,7 @@ import { PlatformAccountDetailComponent } from './components/platform-account/pl import { AdvanceCollectionComponent } from './components/advance-collection/advance-collection.component'; import { AdvanceCollectionDetailComponent } from './components/advance-collection/advance-collection-detail/advance-collection-detail.component'; import { RefundRecordComponent } from './components/refund-record/refund-record.component'; +import { AbnormalGoldDetailComponent } from './components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component'; const routes: Routes = [ { path: 'freight-account', component: FreightAccountComponent, data: { guard: { ability: ['FINANCIAL-FREIGHT-ACOUNT-list'] } } }, @@ -55,6 +56,7 @@ const routes: Routes = [ { path: 'cost-management/expenses-receivable/:id', component: ExpensesReceivableComponent }, { path: 'cost-management/expenses-payable/:id', component: ExpensesPayableComponent }, { path: 'abnormal-gold', component: AbnormalGoldComponent }, + { path: 'abnormal-gold/detail/:id', component: AbnormalGoldDetailComponent }, { path: 'payment-record', component: PaymentRecordComponent }, { path: 'transaction-flow', component: TransactionFlowComponent }, { path: 'payment-order', component: PaymentOrderComponent }, diff --git a/src/app/routes/financial-management/financial-management.module.ts b/src/app/routes/financial-management/financial-management.module.ts index 5844f4a2..c17c335d 100644 --- a/src/app/routes/financial-management/financial-management.module.ts +++ b/src/app/routes/financial-management/financial-management.module.ts @@ -35,6 +35,7 @@ import { PlatformAccountDetailComponent } from './components/platform-account/pl import { AdvanceCollectionComponent } from './components/advance-collection/advance-collection.component'; import { AdvanceCollectionDetailComponent } from './components/advance-collection/advance-collection-detail/advance-collection-detail.component'; import { RefundRecordComponent } from './components/refund-record/refund-record.component'; +import { AbnormalGoldDetailComponent } from './components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component'; const ROUTESCOMPONENTS = [ FreightAccountComponent, @@ -66,7 +67,8 @@ const ROUTESCOMPONENTS = [ ReceiptOrderDetailComponent, AdvanceCollectionComponent, AdvanceCollectionDetailComponent, - RefundRecordComponent + RefundRecordComponent, + AbnormalGoldDetailComponent ]; const NOTROUTECOMPONENTS = [DriverAccountDetailComponent, FreightAccountDetailComponent, ClearingModalComponent]; diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts index c550bfde..a58055d5 100644 --- a/src/app/routes/financial-management/services/freight-account.service.ts +++ b/src/app/routes/financial-management/services/freight-account.service.ts @@ -156,6 +156,9 @@ export class FreightAccountService extends ShipperBaseService { // 查询异常入金充值信息 $api_get_getAbnormalAmountPage = '/api/fcc/rechargeInfo/list/getAbnormalAmountPage'; + // 查询异常入金充值信息详情 + $api_get_getAbnormalAmount_detail = '/api/fcc/rechargeInfo/get'; + // 异步导出运营后台异常入金列表 $api_get_exportAbnormalAmountPage = '/api/fcc/rechargeInfo/exportAbnormalAmountPage'; // 异步导出运营后台退款记录列表 From 67ca5f4cb39c2210d70244eb9b4bdcaa4fc920c3 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 14 Apr 2022 16:19:54 +0800 Subject: [PATCH 41/50] fix bug --- .../datascreen/datascreen.component.html | 2 +- .../datascreen/datascreen.component.ts | 16 +++++++++++----- .../components/datascreen/map/map.component.ts | 13 +------------ 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.html b/src/app/routes/datatable/components/datascreen/datascreen.component.html index 9468c1c8..27fec9ba 100644 --- a/src/app/routes/datatable/components/datascreen/datascreen.component.html +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.html @@ -93,7 +93,7 @@
- +
diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.ts b/src/app/routes/datatable/components/datascreen/datascreen.component.ts index ba2a32f4..3c1448fd 100644 --- a/src/app/routes/datatable/components/datascreen/datascreen.component.ts +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.ts @@ -5,7 +5,7 @@ import { map } from 'rxjs/operators'; * @Author : Shiming * @Date : 2022-04-06 10:57:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-14 14:05:01 + * @LastEditTime : 2022-04-14 16:19:06 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -44,7 +44,7 @@ export class DatatableDatascreenComponent implements OnInit { monthData: G2TimelineData[] = []; monthData2:G2TimelineData[] =[]; - salesData2: Array = this.genData(); + salesData2: Array = []; constructor(public service: DataService) {} ngOnChanges(changes: any): void { console.log(changes); @@ -81,6 +81,7 @@ export class DatatableDatascreenComponent implements OnInit { this.service.request(this.service.$api_getAnnualTransactions).subscribe((res: any) => { this.allDeal = res; }); + this.initPillarData() this.service.request(this.service.$api_getTransactionAmount).subscribe((res: any) => { this.headDeal = res; }); @@ -105,8 +106,12 @@ export class DatatableDatascreenComponent implements OnInit { } }); } - public genData(): G2MiniAreaData[] { + genData(): any{ let value: any = []; + console.log('9999999'); + + // let value: any = [{city: '深圳市', weight: 5070.4} + // ,{city: '济宁市', weight: 338}]; this.service.request(this.service.$api_getShipmentRanking).subscribe((res: any) => { console.log(res); res.forEach((element: any) => { @@ -115,12 +120,13 @@ export class DatatableDatascreenComponent implements OnInit { y: element.weight }); }); + this.salesData2 = value }); console.log(value); - return value; } initPillarData(){ - this.curve.reRender() + // this.curve.reRender() + this.genData(); } /** * 初始化数据列表 diff --git a/src/app/routes/datatable/components/datascreen/map/map.component.ts b/src/app/routes/datatable/components/datascreen/map/map.component.ts index 739e2592..90927785 100644 --- a/src/app/routes/datatable/components/datascreen/map/map.component.ts +++ b/src/app/routes/datatable/components/datascreen/map/map.component.ts @@ -22,7 +22,7 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges, Afte constructor(private service: DataService, private ngZone: NgZone) {} ngAfterViewInit(): void { this.map.el.nativeElement.style.height = this.map.el.nativeElement.clientWidth + 'px' - this.chart.render(); + this.chart?.render(); } ngOnChanges(changes: SimpleChanges): void { @@ -35,7 +35,6 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges, Afte ngOnInit(): void {} reRender() { - console.log('5454545'); setTimeout(() => { this.chart.render(); }, 1000); @@ -75,7 +74,6 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges, Afte this.chart.legend('trend', { position: 'left' }); - console.log('8888'); // 绘制世界地图背景 this.ds = new DataSet(); @@ -99,7 +97,6 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges, Afte '订单数': element.weight, }); }); - console.log(value); this.userData = value if (!(this.userData instanceof Array) || this.userData.length === 0) { @@ -113,7 +110,6 @@ if (!(this.userData instanceof Array) || this.userData.length === 0) { }).transform({ type: 'map', callback: (obj: { trend: string; 订单数: number }) => { - console.log(obj); if(obj.订单数 < 500) { obj.trend = '500以下'; @@ -132,9 +128,6 @@ if (!(this.userData instanceof Array) || this.userData.length === 0) { alias: '订单交易数量' } }); - console.log(this.userView); - console.log('45545'); - this.userView.polygon().position('longitude*latitude').color('trend', ['#0a3f80', '#1b6aca', '#5d93d4']).tooltip('省份*订单数').style({fillOpacity: 0.85 }) .animate({ leave: { @@ -147,10 +140,6 @@ if (!(this.userData instanceof Array) || this.userData.length === 0) { } }) }); - - console.log('9999'); - - } } From cca5e0238497df2b9dd8a97492c05b5cfc36ff5a Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 14 Apr 2022 16:25:58 +0800 Subject: [PATCH 42/50] edit --- .../individual-declare.component.ts | 45 ++++++++++--------- .../cancellation-invoice.component.ts | 20 ++++++--- 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts index 4dd8bb7d..65af6ff6 100644 --- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts +++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts @@ -161,7 +161,10 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { ui: { placeholder: '请选择', widget: 'select', - containsAllLabel: true + containsAllLabel: true, + visibleIf: { + _$expand: (value: boolean) => value + } }, default: '' }, @@ -271,39 +274,39 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { } /** - *撤销 + *更正 * @param record 记录实例 */ recall() { if (this.selectedRows.length === 0) { - this.openWainingModal('请选择需要撤回的数据'); + this.openWainingModal('请选择需要更正的数据'); return; } - this.modal.confirm({ - nzTitle: '撤回提示', - nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？', - nzOkText: '确定', - nzCancelText: '取消', - nzOnOk: () => { - this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { - if (res) { - this.service.msgSrv.success('撤销成功'); - this.search(); - } - }); - } - }); + // this.modal.confirm({ + // nzTitle: '撤回提示', + // nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？', + // nzOkText: '确定', + // nzCancelText: '取消', + // nzOnOk: () => { + // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { + // if (res) { + // this.service.msgSrv.success('撤销成功'); + // this.search(); + // } + // }); + // } + // }); } /** - *撤销 + *修改 * @param record 记录实例 */ uploadSetting() { if (this.selectedRows.length === 0) { - this.openWainingModal('请选择需要更新的数据！'); + this.openWainingModal('请选择需要修改的数据！'); return; } - this.isVisible = true + // this.isVisible = true } /** @@ -370,7 +373,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { */ upload() { if (this.selectedRows.length === 0) { - this.openWainingModal('请选择需要上传的数据'); + this.openWainingModal('请选择需要申报的数据'); return; } // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts index 39e8bd93..a9d95464 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts @@ -39,17 +39,23 @@ export class CancellationInvoiceComponent implements OnInit { beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { Object.assign(requestOptions.body, { - ...this.sf.value, - createTime: { - start: this.sf.value.createTime?.[0] || '', - end: this.sf.value.createTime?.[1] || '' - } + ...this.sf.value }); + if (this.sf.value.createTime) { + Object.assign(requestOptions.body, { + createTime: { + start: this.sf.value.createTime?.[0] || '', + end: this.sf.value.createTime?.[1] || '' + } + }); + } } if (this.resourceStatus) { Object.assign(requestOptions.body, { sts: this.resourceStatus }); + } else { + delete requestOptions.body.sts; } return requestOptions; }; @@ -339,7 +345,7 @@ export class CancellationInvoiceComponent implements OnInit { click: item => this.router.navigate(['/ticket/invoice-requested/detail/' + item?.vatappHId]) }, { title: '申请时间', index: 'createTime', type: 'date', width: 150 }, - { title: '发票类型', index: 'vatapptypeLabel', width: 150 }, + { title: '发票类型', index: 'vatapptypeLabel', width: 150 }, { title: '网络货运人', index: 'ltdName', width: 220 }, { title: '购买人', index: 'artoname', width: 220 }, { title: '订单数', index: 'ordlines', width: 90, className: 'text-right' }, @@ -401,7 +407,7 @@ export class CancellationInvoiceComponent implements OnInit { text: '手工开票
', iif: item => item.sts != '3', click: item => this.requestedAction(item) - }, + } // { // text: '推送开票
', // iif: item => item.sts === '1', From bf21ac030b346c061c76dbf05007435eef06a5b0 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 14 Apr 2022 16:31:50 +0800 Subject: [PATCH 43/50] edit --- .../voucher-summary/voucher-summary.component.html | 4 ++-- .../voucher-summary/voucher-summary.component.ts | 10 +++++++--- .../services/freight-account.service.ts | 2 ++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html index 0c1d57e9..5f5f53c7 100644 --- a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html +++ b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html @@ -22,8 +22,8 @@ [class.expend-options]="_$expand"> -
- +
- +
司机姓名：张三/13812345678
是否确认要将该司机的起征点同步调整为超过15万？
@@ -88,4 +75,4 @@ - + \ No newline at end of file From 2ef736324b5f3d8170663cec3308e337b87fd6a2 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 14 Apr 2022 16:39:27 +0800 Subject: [PATCH 46/50] edit --- .../individual-collect/individual-collect.component.html | 4 ++-- .../components/order-reporting/order-reporting.component.html | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html index 17ea49f8..139be577 100644 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html +++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html @@ -18,8 +18,8 @@ [compact]="true" [button]="'none'">
- +
- +
\ No newline at end of file diff --git a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.ts b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.ts index 1a7730c9..af5d81dd 100644 --- a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.ts +++ b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.ts @@ -25,15 +25,15 @@ export class AbnormalGoldDetailComponent implements OnInit { }); } - downBack() { + downBack(bussType: string, receiptUrl: string) { if (this.formData?.refundStatus !== '3') { return; } - this.service.getReceiptUrl(this.formData.receiptUrl, { + this.service.getReceiptUrl(receiptUrl, { bankType: this.formData.bankType, rmYll: this.formData.userId, snglFlgCd: this.formData.coreSerNo, - bussType: '06', + bussType, ltdId: this.formData.ltdId, accountType: this.formData.accountType });