Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

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: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,8 +28,8 @@
     <img style="height: 20px" [src]="item?.avatar" alt="" />
   </ng-template>
   <ng-template st-row="bankList" let-item let-index="index">
-    <nz-select [(ngModel)]="bankData" style="width: 200px">
-      <nz-option *ngFor="let i of item.bankList" [nzLabel]="i.bankCardNumber" [nzValue]="i.id"></nz-option>
+    <nz-select [(ngModel)]="bankData" style="width: 300px">
+      <nz-option *ngFor="let i of item.bankList" [nzLabel]="i.bankName + '/'+i.bankCardNumber" [nzValue]="i.id"></nz-option>
     </nz-select>
   </ng-template>
   <ng-template st-row="paymentMethodRate" let-item let-index="index">

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);
       }
     });
   }

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`;
   // // 生成提货单

src/app/routes/sys-setting/components/close-account/close-account.component.html

@@ -1,10 +1,10 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-24 15:38:08
- * @LastEditTime: 2021-12-27 11:21:35
- * @LastEditors: Please set LastEditors
+ * @LastEditTime : 2022-04-28 19:05:49
+ * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \tms-obc-web\src\app\routes\sys-setting\components\crm-management\crm-management.component.html
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\close-account\\close-account.component.html
 -->
 <page-header-wrapper title="结算客户管理">
 </page-header-wrapper>
@@ -16,7 +16,6 @@
       <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [loading]="false" (formSubmit)="st?.load(1)"
         (formReset)="resetSF()"></sf>
     </div>
-    edit
     <!-- 查询字段大于3个时，根据展开状态调整布局 -->
     <ng-container *ngIf="queryFieldCount > 4">
       <div nz-col [nzSpan]="_$expand ? 24 : 18">

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);
         }

src/app/routes/sys-setting/components/sms-template/sms-template.component.ts

@@ -1,4 +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';

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 {