From ab6957990d4dce82b72cbb89cb90236642f24707 Mon Sep 17 00:00:00 2001 From: weiyu Date: Thu, 28 Apr 2022 19:00:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=B2=E5=BC=80=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/sms-template/sms-template.component.ts | 2 +- .../components/invoiced-list/invoiced-list.component.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts b/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts index 43d1df9c..26a9049f 100644 --- a/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts +++ b/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts @@ -1,5 +1,5 @@ -import { AfterViewInit, ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFSchema } from '@delon/form'; diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts index f45918ab..14c6bf69 100644 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts +++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts @@ -39,6 +39,7 @@ export class InvoicedListComponent implements OnInit { ngOnInit(): void {} beforeReq = (requestOptions: STRequestOptions) => { + Object.assign(requestOptions.body,{sts: '3'}) if (this.sf) { Object.assign(requestOptions.body, { ...this.sf.value, @@ -48,7 +49,7 @@ export class InvoicedListComponent implements OnInit { } }); } - return requestOptions; + return requestOptions ; }; stChange(e: STChange): void { From 674dba6cf8b68a2a65eb5a07c5f6bed70cb4f916 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 19:27:46 +0800 Subject: [PATCH 2/3] fix bug --- .../modify-captain.component.html | 4 ++-- .../modify-captain/modify-captain.component.ts | 18 +++++++++++++++++- .../services/order-management.service.ts | 5 ++++- .../close-account/close-account.component.html | 7 +++---- .../close-account/close-account.component.ts | 2 +- 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html index dee32307..88299e93 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html +++ b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-29 17:27:37 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:22:55 + * @LastEditTime : 2022-04-28 19:27:13 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-captain\\modify-captain.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -29,7 +29,7 @@ - + diff --git a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts index 7e3ab9d6..68d4bdc0 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts +++ b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-30 14:45:39 * @LastEditors : Shiming - * @LastEditTime : 2022-04-22 16:31:57 + * @LastEditTime : 2022-04-28 19:27:14 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-captain\\modify-captain.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -38,6 +38,21 @@ export class VehicleModifyCaptainComponent implements OnInit { this.initSF(); this.initST(); } + initData(id: string) { + // this.service.request(this.service.$api_getDriverBankInfoList, {roleId: id}).subscribe((res:any) => { + // console.log(res); + // if(res) { + // let List :any= [] + // res.forEach((element: any) => { + // List.push({ + // bankCardNumber: element.bankBranchName + '/'+element.bankCardNumber, + // value: element.id + // }) + // }); + // this.bankData = List + // } + // }) + } initSF() { this.schema = { properties: { @@ -120,6 +135,7 @@ export class VehicleModifyCaptainComponent implements OnInit { this.service.request(this.service.$api_get_getCarCaptainByMobile, params).subscribe((res: any) => { if (res) { this.dataList = [res]; + this.initData(res.appUserId); } }); } 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 f68ed55c..a684e125 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-22 17:14:39 + * @LastEditTime : 2022-04-28 19:19:01 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -222,6 +222,9 @@ export class OrderManagementService extends ShipperBaseService { // 订单上报推送 $api_manualOrderSubmission = '/api/sdc/billOperate/manualOrderSubmission'; + // 获取司机所有银行卡信息 + $api_getDriverBankInfoList= '/api/fcc/bankInfoDMC/getDriverBankInfoList'; + // // 生成卸货单 // public $api_createBillDischargeGoods = `/api/sdc/billOperate/createBillDischargeGoods`; // // 生成提货单 diff --git a/src/app/routes/sys-setting/components/close-account/close-account.component.html b/src/app/routes/sys-setting/components/close-account/close-account.component.html index 0dae990d..b29143f4 100644 --- a/src/app/routes/sys-setting/components/close-account/close-account.component.html +++ b/src/app/routes/sys-setting/components/close-account/close-account.component.html @@ -1,10 +1,10 @@ @@ -16,7 +16,6 @@ - edit
diff --git a/src/app/routes/sys-setting/components/close-account/close-account.component.ts b/src/app/routes/sys-setting/components/close-account/close-account.component.ts index 1472bf4e..c63b5418 100644 --- a/src/app/routes/sys-setting/components/close-account/close-account.component.ts +++ b/src/app/routes/sys-setting/components/close-account/close-account.component.ts @@ -188,7 +188,7 @@ this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } }; if(res) { this.formData = res; const List: any = []; - List.push({ label: res.enterpriseName, value: res.id }); + List.push({ label: res.enterpriseName, value: res.enterpriseId }); this.sfFre.getProperty('/enterpriseId')!.schema.enum = List; this.sfFre.getProperty('/enterpriseId')!.widget.reset(List); } From 4b69dc96fc136057956301fb9a5c420ecc9daea5 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 19:28:37 +0800 Subject: [PATCH 3/3] fix bug --- .../vehicle/modify-captain/modify-captain.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html index 88299e93..5604bdbf 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html +++ b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-29 17:27:37 * @LastEditors : Shiming - * @LastEditTime : 2022-04-28 19:27:13 + * @LastEditTime : 2022-04-28 19:28:16 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-captain\\modify-captain.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -28,7 +28,7 @@ - +