From 545d674d445abdfed7b0ca608e967875b6b9923e Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Tue, 18 Jan 2022 09:51:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/bulk/bulk.component.ts         |  4 +--
 .../components/vehicle/vehicle.component.ts   |  2 +-
 .../audit/detail/detail.component.html        |  4 +--
 .../list/detail/detail.component.html         |  4 +--
 .../vehicle/components/list/list.component.ts |  2 +-
 .../components/bulk/bulk.component.html       |  4 +--
 .../components/bulk/bulk.component.ts         | 23 +++++++++++--
 .../components/vehicle/vehicle.component.html |  8 ++---
 .../components/vehicle/vehicle.component.ts   | 34 +++++++++++--------
 9 files changed, 54 insertions(+), 31 deletions(-)

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 ed4d1d0a..6872bd64 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@@ -249,7 +249,7 @@ tabs = {
                   .request(this.service.$api_get_getCarLicenseListByCarNo, {
                     carNo: q
                   })
-                  .pipe(map((res: any) => (res?.records as any[]).map(i => ({ label: i.carNo, value: i.id } as SFSchemaEnum))))
+                  .pipe(map((res: any) => (res?.records as any[]).map(i => ({ label: i.carNo, value: i.appUserId } as SFSchemaEnum))))
                   .toPromise();
               } else {
                 return of([]);
@@ -273,7 +273,7 @@ tabs = {
                 return this.service
                   .request(this.service.$api_get_getDriverInfo, { keyword: q,
                   model: 1, type: 2 })
-                  .pipe(map((res) => (res as any[]).map((i) => ({ label: i.name, value: i.id } as SFSchemaEnum))))
+                  .pipe(map((res) => (res as any[]).map((i) => ({ label: i.name, value: i.userId } as SFSchemaEnum))))
                   .toPromise();
               } else {
                 return of([]);
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 1abe9d9f..ccd123d4 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -269,7 +269,7 @@ resourceStatus: any;
                 return this.service
                   .request(this.service.$api_get_getDriverInfo, { keyword: q,
                   model: 1, type: 2 })
-                  .pipe(map((res) => (res as any[]).map((i) => ({ label: i.name, value: i.id } as SFSchemaEnum))))
+                  .pipe(map((res) => (res as any[]).map((i) => ({ label: i.name, value: i.userId } as SFSchemaEnum))))
                   .toPromise();
               } else {
                 return of([]);
diff --git a/src/app/routes/vehicle/components/audit/detail/detail.component.html b/src/app/routes/vehicle/components/audit/detail/detail.component.html
index c2776a84..53fcbf10 100644
--- a/src/app/routes/vehicle/components/audit/detail/detail.component.html
+++ b/src/app/routes/vehicle/components/audit/detail/detail.component.html
@@ -118,7 +118,7 @@
         [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"></nz-date-picker>
       </sv>
     <sv label="行驶证签发机关">
-      <input nz-input type="text" [(ngModel)]="detailData.driverLicenseSigningOrg" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+      <input nz-input style="width: '300px'" type="text" [(ngModel)]="detailData.driverLicenseSigningOrg" [readonly]="!isEdit" [nzBorderless]="!isEdit"
       [placeholder]="isEdit?'':'-'">
     </sv>
   </sv-container>
@@ -153,7 +153,7 @@
       [placeholder]="isEdit?'':'-'">
     </sv>
     <sv label="所有人">
-      <input nz-input type="text" [(ngModel)]="detailData.carOwner" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+      <input nz-input style="width: '300px'" type="text" [(ngModel)]="detailData.carOwner" [readonly]="!isEdit" [nzBorderless]="!isEdit"
       [placeholder]="isEdit?'':'-'">
     </sv>
   </sv-container>
diff --git a/src/app/routes/vehicle/components/list/detail/detail.component.html b/src/app/routes/vehicle/components/list/detail/detail.component.html
index 6be63703..e1bcaa06 100644
--- a/src/app/routes/vehicle/components/list/detail/detail.component.html
+++ b/src/app/routes/vehicle/components/list/detail/detail.component.html
@@ -109,7 +109,7 @@
           [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"></nz-date-picker>
         </sv>
       <sv label="行驶证签发机关">
-        <input nz-input type="text" [(ngModel)]="detailData.driverLicenseSigningOrg" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+        <input style="width: '300px'" nz-input type="text" [(ngModel)]="detailData.driverLicenseSigningOrg" [readonly]="!isEdit" [nzBorderless]="!isEdit"
         [placeholder]="isEdit?'':'-'">
       </sv>
     </sv-container>
@@ -144,7 +144,7 @@
         [placeholder]="isEdit?'':'-'">
       </sv>
       <sv label="所有人">
-        <input nz-input type="text" [(ngModel)]="detailData.carOwner" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+        <input style="width: '300px'" nz-input type="text" [(ngModel)]="detailData.carOwner" [readonly]="!isEdit" [nzBorderless]="!isEdit"
         [placeholder]="isEdit?'':'-'">
       </sv>
     </sv-container>
diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts
index e83259e5..69734c2c 100644
--- a/src/app/routes/vehicle/components/list/list.component.ts
+++ b/src/app/routes/vehicle/components/list/list.component.ts
@@ -182,7 +182,7 @@ export class VehicleComponentsListComponent implements OnInit {
         },
         roadTransportStatus: {
           type: 'string',
-          title: '驾驶证到期状态',
+          title: '道运证到期状态',
           enum: [
             { label: '正常', value: 1 },
             { label: '即将到期', value: 2 },
diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.html b/src/app/routes/waybill-management/components/bulk/bulk.component.html
index 28de8525..423ba4d3 100644
--- a/src/app/routes/waybill-management/components/bulk/bulk.component.html
+++ b/src/app/routes/waybill-management/components/bulk/bulk.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2022-01-13 16:14:43
+ * @LastEditTime: 2022-01-17 20:39:18
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html
@@ -71,7 +71,7 @@
       <ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
         <div *ngIf="item.billExpenseDetailVOList.length > 0">
           <p *ngFor="let data of item.billExpenseDetailVOList">
-            {{ data.costCodeLabel }}：{{ data.price }}
+            {{ data.costCodeLabel }}：{{ data.price |currency }}
             <span style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
           </p>
         </div>
diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.ts b/src/app/routes/waybill-management/components/bulk/bulk.component.ts
index 9cb4a7d1..d032010a 100644
--- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts
@@ -105,9 +105,26 @@ tabs = {
           type: 'string',
           title: '货源编号'
         },
-        no1: {
+        shipperAppUserId: {
           type: 'string',
-          title: '货主'
+          title: '货主',
+          ui: {
+            widget: 'select',
+            serverSearch: true,
+            searchDebounceTime: 300,
+            searchLoadingText: '搜索中...',
+            onSearch: (q: any) => {
+              console.log(q)
+              if (!!q) {
+                return this.service
+                  .request(this.service.$api_enterpriceList, { enterpriseName: q})
+                  .pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
+                  .toPromise();
+              } else {
+                return of([]);
+              }
+            },
+          } as SFSelectWidgetSchema,
         },
         loadingPlace: {
           type: 'string',
@@ -362,7 +379,7 @@ tabs = {
       {
         title: '运费明细',
         width: '220px',
-        className: 'text-left',
+        className: 'text-right',
         render: 'billExpenseDetailVOList'
       },
       { title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-left' },
diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html
index d8683432..97f7b535 100644
--- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2022-01-13 16:14:58
+ * @LastEditTime: 2022-01-17 20:13:41
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html
@@ -60,14 +60,14 @@
       <ng-template st-row="billExpenseDetailVOList2" let-item let-index="index">
         <div *ngIf="item.billExpenseDetailVOList.length > 0">
           <p *ngFor="let data of item.billExpenseDetailVOList">
-            {{ data.costCodeLabel }}：{{ data.price }}
+            {{ data.costCodeLabel }}：{{ data.price | currency }}
           </p>
         </div>
       </ng-template>
       <ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
         <div *ngIf="item.billExpenseDetailVOList.length > 0">
           <p *ngFor="let data of item.billExpenseDetailVOList">
-            {{ data.costCodeLabel }}：{{ data.price }}
+            {{ data.costCodeLabel }}：{{ data.price | currency}}
             <span style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
           </p>
         </div>
@@ -84,7 +84,7 @@
         </div>
       </ng-template>
       <ng-template st-row="wayBill" let-item let-index="index">
-        <a [routerLink]="'/waybill-management/vehicle-detail/'+item.id">{{item.wayBillCode}}</a>
+        <a [routerLink]="'/waybill-management/vehicle-detail/'+item.id">{{item.billCode}}</a>
       </ng-template>
       <ng-template st-row="goodsInfos" let-item let-index="index">
         <div>{{item?.goodsInfos?.goodsName}}</div>
diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
index 5eb56cd6..b63b2932 100644
--- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
@@ -64,14 +64,20 @@ export class WaybillManagementVehicleComponent implements OnInit {
    * 查询参数
    */
   get reqParams() {
-    const a: any = {};
+    const a:any = {};
     if (this.resourceStatus) {
       a.wayBillStatus = this.resourceStatus;
     }
-    return {
+    const params: any = Object.assign({}, this.sf?.value || {});
+    delete params._$expand;
+    return { 
       ...a,
-      ...this.sf?.value
-    };
+      ...params,
+      createTime: {
+        start: this.sf?.value?.createTime?.[0] || '',
+        end: this.sf?.value?.createTime?.[1] || '',
+      },
+     };
   }
   get selectedRows() {
     return this.st?.list.filter(item => item.checked) || [];
@@ -150,7 +156,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
               if (!!q) {
                 return this.service
                   .request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 1 })
-                  .pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.id } as SFSchemaEnum))))
+                  .pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.appUserId } as SFSchemaEnum))))
                   .toPromise();
               } else {
                 return of([]);
@@ -175,7 +181,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
                   .request(this.service.$api_get_getCarLicenseListByCarNo, {
                     carNo: q
                   })
-                  .pipe(map((res: any) => (res?.records as any[]).map(i => ({ label: i.carNo, value: i.carNo } as SFSchemaEnum))))
+                  .pipe(map((res: any) => (res?.records as any[]).map(i => ({ label: i.carNo, value: i.id } as SFSchemaEnum))))
                   .toPromise();
               } else {
                 return of([]);
@@ -198,7 +204,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
               if (!!q) {
                 return this.service
                   .request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 2 })
-                  .pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.id } as SFSchemaEnum))))
+                  .pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.userId } as SFSchemaEnum))))
                   .toPromise();
               } else {
                 return of([]);
@@ -214,7 +220,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
           type: 'string',
           ui: {
             widget: 'dict-select',
-            params: { dictKey: 'payment:status' },
+            params: { dictKey: 'overall:payment:status' },
             containAllLable: true,
             visibleIf: {
               _$expand: (value: boolean) => value
@@ -249,7 +255,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
             }
           }
         },
-        enterpriseInfoName: {
+        enterpriseInfoId: {
           type: 'string',
           title: '网络货运人',
           ui: {
@@ -320,17 +326,17 @@ export class WaybillManagementVehicleComponent implements OnInit {
       {
         title: '货主出价',
         width: '250px',
-        className: 'text-left',
+        className: 'text-right',
         render: 'billExpenseDetailVOList2'
       },
       {
         title: '费用明细',
         width: '250px',
-        className: 'text-left',
+        className: 'text-right',
         render: 'billExpenseDetailVOList'
       },
-      { title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-left' },
-      { title: '货主', index: 'shipperAppUserName', width: '150px', className: 'text-left' },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
+      { title: '货主', index: 'shipperAppUserName', width: '200px', className: 'text-left' },
       { title: '关联订单号', render: 'wayBill', width: '180px', className: 'text-left' },
       { title: '装货地', index: 'loadingPlace', width: '180px', className: 'text-left' },
       {
@@ -541,7 +547,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
     this.isVisibleEvaluate = true;
   }
   getGoodsSourceStatistical() {
-    this.service.request(this.service.$api_get_getWholeStatistics).subscribe(res => {
+    this.service.request(this.service.$api_get_getWholeStatistics, this.reqParams).subscribe(res => {
       if (res) {
         let totalCount = 0;
         res.forEach((ele: any) => {