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

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:52:15
+ * @LastEditTime : 2022-04-28 19:49:17
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -112,8 +112,6 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
           .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({
@@ -122,7 +120,6 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
                   color: 'green'
                 });
               });
-              console.log(a);
               this.operationList = a;
             }
           });
@@ -133,15 +130,11 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
     });
     this.service.request(this.service.$api_listBillComplianceAbnormalByBillId, { id: this.id }).subscribe(res => {
       if (res) {
-        console.log('风险详情');
-        console.log(res);
         this.abnormalList = res;
       }
     });
     this.service.request(this.service.$api_getAbnormalWarningByBillId, { id: this.id }).subscribe(res => {
       if (res) {
-        console.log('异常预警');
-        console.log(res);
         this.warringList = res;
       }
     });

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