车辆对接

2022-01-12 14:56:09 +08:00
parent 0352cd2f08
commit c7eeba9ba9
15 changed files with 126 additions and 103 deletions
--- a/src/app/routes/commom/less/box.less
+++ b/src/app/routes/commom/less/box.less
@ -16,8 +16,8 @@
    }

    .ant-tabs-tab-btn {
-        padding-left : 16px;
        padding-right: 16px;
+        padding-left : 16px;
    }

    .text-truncate {
--- a/src/app/routes/commom/less/expend-but.less
+++ b/src/app/routes/commom/less/expend-but.less
@ -1,13 +1,13 @@
 .expend-options {
-    margin-top: 0px;
+    margin-top: 0;
 }


@media (min-width: 1200px) {
    .expend-options {
-        max-width: 450px;
        position : absolute;
        right    : 0;
        bottom   : 25px;
+        max-width: 450px;
    }
 }
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@ -185,7 +185,7 @@ tabs = {
          } as SFSelectWidgetSchema
        },

-        carNo: { 
+        carNo: {
          title: '车牌号',
          type: 'string',
          ui: {
@ -199,17 +199,17 @@ tabs = {
                  .request(this.service.$api_get_getCarLicenseListByCarNo, {
                    carNo: q
                  })
-                  .pipe(map((res: any[]) => (res 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.carNo } as SFSchemaEnum))))
                  .toPromise();
              } else {
                return of([]);
              }
            },
            visibleIf: {
-              _$expand: (value: boolean) => value,
-            },
-          } as SFSelectWidgetSchema,
-         },
+              _$expand: (value: boolean) => value
+            }
+          } as SFSelectWidgetSchema
+        },
         payeeId: {
          title: '车队长',
          type: 'string',
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@ -199,7 +199,7 @@ resourceStatus: any;
          } as SFSelectWidgetSchema
        },

-        carNo: { 
+        carNo: {
          title: '车牌号',
          type: 'string',
          ui: {
@ -213,17 +213,17 @@ resourceStatus: any;
                  .request(this.service.$api_get_getCarLicenseListByCarNo, {
                    carNo: q
                  })
-                  .pipe(map((res: any[]) => (res 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.carNo } as SFSchemaEnum))))
                  .toPromise();
              } else {
                return of([]);
              }
            },
            visibleIf: {
-              _$expand: (value: boolean) => value,
-            },
-          } as SFSelectWidgetSchema,
-         },
+              _$expand: (value: boolean) => value
+            }
+          } as SFSelectWidgetSchema
+        },
         payeeId: {
          title: '车队长',
          type: 'string',
--- a/src/app/routes/order-management/services/order-management.service.ts
+++ b/src/app/routes/order-management/services/order-management.service.ts
@ -37,7 +37,7 @@ export class OrderManagementService extends ShipperBaseService {
  //  整车详情
  $api_get_getWholeBillDetail = `/api/sdc/billOperate/getWholeBillDetail`;
      // 根据车牌号查询车辆信息
-  $api_get_getCarLicenseListByCarNo= `/api/mdc/cuc/carLicenseAudit/operate/getCarLicenseListByCarNo`;
+  $api_get_getCarLicenseListByCarNo= `/api/mdc/cuc/carLicense/findCarLicenseByCarNo`;

    //  查询大宗订单列表
    $api_get_listBulkPage = `/api/sdc/billOperate/listBulkPage`;
--- a/src/app/routes/vehicle/components/audit/audit.component.ts
+++ b/src/app/routes/vehicle/components/audit/audit.component.ts
@ -75,33 +75,31 @@ export class VehicleComponentsAuditComponent implements OnInit {
            hidden: true,
          },
        },
-        carNo: { 
+        carNo: {
          title: '车牌号',
          type: 'string',
          ui: {
            widget: 'select',
            serverSearch: true,
-            searchDebounceTime: 250,
+            searchDebounceTime: 300,
            searchLoadingText: '搜索中...',
            onSearch: (q: any) => {
              if (!!q) {
                return this.service
-                  .request(this.service.$api_get_getCarLicenseListByCarNo_audit, {
+                  .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.carNo } as SFSchemaEnum))))
                  .toPromise();
              } else {
                return of([]);
              }
            },
-          } as SFSelectWidgetSchema,
-         },
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          } as SFSelectWidgetSchema
+        },
        carNoColor: {
          type: 'string',
          title: '车牌颜色',
--- a/src/app/routes/vehicle/components/list/list.component.ts
+++ b/src/app/routes/vehicle/components/list/list.component.ts
@ -71,13 +71,13 @@ export class VehicleComponentsListComponent implements OnInit {
            hidden: true,
          },
        },
-        carNo: { 
+        carNo: {
          title: '车牌号',
          type: 'string',
          ui: {
            widget: 'select',
            serverSearch: true,
-            searchDebounceTime: 250,
+            searchDebounceTime: 300,
            searchLoadingText: '搜索中...',
            onSearch: (q: any) => {
              if (!!q) {
@ -85,19 +85,17 @@ export class VehicleComponentsListComponent 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.carNo } as SFSchemaEnum))))
                  .toPromise();
              } else {
                return of([]);
              }
            },
-          } as SFSelectWidgetSchema,
-         },
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          } as SFSelectWidgetSchema
+        },
        carNoColor: {
          type: 'string',
          title: '车牌颜色',
--- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
+++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
@ -166,30 +166,30 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
          }
        } as SFSelectWidgetSchema
      },
-      customerCode: {
+      carNo: {
        title: '车牌号',
-          type: 'string',
-          ui: {
-            widget: 'select',
-            serverSearch: true,
-            searchDebounceTime: 300,
-            searchLoadingText: '搜索中...',
-            onSearch: (q: any) => {
-              if (!!q) {
-                return this.service
-                  .request(this.service.$api_get_getCarLicenseListByCarNo, {
-                    carNo: q
-                  })
-                  .pipe(map((res: any[]) => (res as any[]).map((i) => ({ label: i.carNo, value: i.carNo } as SFSchemaEnum))))
-                  .toPromise();
-              } else {
-                return of([]);
-              }
-            },
-            visibleIf: {
-              _$expand: (value: boolean) => value,
-            },
-          } as SFSelectWidgetSchema,
+        type: 'string',
+        ui: {
+          widget: 'select',
+          serverSearch: true,
+          searchDebounceTime: 300,
+          searchLoadingText: '搜索中...',
+          onSearch: (q: any) => {
+            if (!!q) {
+              return this.service
+                .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))))
+                .toPromise();
+            } else {
+              return of([]);
+            }
+          },
+          visibleIf: {
+            _$expand: (value: boolean) => value
+          }
+        } as SFSelectWidgetSchema
      },
      reportingTime: {
        title: '上报时间',
--- 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: 2021-12-28 10:01:51
+ * @LastEditTime: 2022-01-12 14:53:26
 * @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
@ -69,8 +69,11 @@
        </div>
      </ng-template>
      <ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
-        <div *ngFor="let i of item?.billExpenseDetailVOList; let ii = index">
-          <span >{{i?.costName}}：{{i?.price}}</span>
+        <div *ngIf="item.billExpenseDetailVOList.length > 0">
+          <p *ngFor="let data of item.billExpenseDetailVOList">
+            {{ data.costCodeLabel }}：{{ data.price }}
+            <span style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
+          </p>
        </div>
      </ng-template>
      <ng-template st-row="wayBill" let-item let-index="index">
--- a/src/app/routes/waybill-management/components/bulk/bulk.component.less
+++ b/src/app/routes/waybill-management/components/bulk/bulk.component.less
@ -1,7 +1,13 @@
-    .left_btn {
-         width: 50px;
-        height: 32px; 
-         padding-left: 8px;
-         line-height:32px; 
-         background-color: #d7d7d7;
-    }
+
+    :host ::ng-deep{
+     ::ng-deep nz-range-picker{
+         width: 100%;
+     }
+     .left_btn {
+          width: 50px;
+         height: 32px; 
+          padding-left: 8px;
+          line-height:32px; 
+          background-color: #d7d7d7;
+     }
+ }
--- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts
@ -147,7 +147,7 @@ tabs = {
            },
          } as SFSelectWidgetSchema,
        },
-        carNo: { 
+        carNo: {
          title: '车牌号',
          type: 'string',
          ui: {
@ -161,17 +161,17 @@ tabs = {
                  .request(this.service.$api_get_getCarLicenseListByCarNo, {
                    carNo: q
                  })
-                  .pipe(map((res: any[]) => (res 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.carNo } as SFSchemaEnum))))
                  .toPromise();
              } else {
                return of([]);
              }
            },
            visibleIf: {
-              _$expand: (value: boolean) => value,
-            },
-          } as SFSelectWidgetSchema,
-         },
+              _$expand: (value: boolean) => value
+            }
+          } as SFSelectWidgetSchema
+        },
         payeeId: {
          title: '车队长',
          type: 'string',
@ -350,25 +350,25 @@ tabs = {
      { title: '', type: 'checkbox', width: '50px', className: 'text-center' },
      {
        title: '运单号',
-        width: '100px',
+        width: '180px',
        className: 'text-center',
        render: 'wayBillCode'
      },
      {
        title: '运费明细',
-        width: '100px',
+        width: '150px',
        className: 'text-center',
        render: 'billExpenseDetailVOList'
      },
-      { title: '网络货运人', index: 'enterpriseInfoName', width: '120px', className: 'text-center' },
-      { title: '货主', index: 'shipperAppUserName', width: '120px', className: 'text-center' },
-      { title: '关联订单号', render: 'wayBill', width: '120px', className: 'text-center' },
-      { title: '货源编号', index: 'resourceCode', width: '120px', className: 'text-center' },
-      { title: '装货地', index: 'loadingPlace', width: '120px', className: 'text-center' },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-center' },
+      { title: '货主', index: 'shipperAppUserName', width: '180px', className: 'text-center' },
+      { title: '关联订单号', render: 'wayBill', width: '180px', className: 'text-center' },
+      { title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-center' },
+      { title: '装货地', index: 'loadingPlace', width: '180px', className: 'text-center' },
      {
        title: '卸货地',
        className: 'text-center',
-        width: '120px',
+        width: '180px',
        index: 'dischargePlace'
      },
     {
@ -416,7 +416,7 @@ tabs = {
      },
      {
        title: '创建时间',
-        width: '130px',
+        width: '180px',
        className: 'text-center',
        index: 'createTime',
      },
--- 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: 2021-12-22 11:31:50
+ * @LastEditTime: 2022-01-12 14:51:05
 * @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
@ -52,10 +52,25 @@
      [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
      [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
      [loading]="service.http.loading">
-      <ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
+      <!-- <ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
        <div *ngFor="let i of item?.billExpenseDetailVOList; let ii = index">
          <span>{{i?.costName}}：{{i?.price}}</span>
        </div>
+      </ng-template> -->
+      <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 }}
+          </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 }}
+            <span style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
+          </p>
+        </div>
      </ng-template>
      <ng-template st-row="wayBillCode" let-item let-index="index">
        <a [routerLink]="'/waybill-management/vehicle-detail/'+item.id">{{item.wayBillCode}}</a>
--- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.less
+++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.less
@ -1,2 +1,5 @@
-:host {
+:host ::ng-deep{
+    ::ng-deep nz-range-picker{
+        width: 100%;
+    }
 }
--- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
@ -170,7 +170,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
                  .request(this.service.$api_get_getCarLicenseListByCarNo, {
                    carNo: q
                  })
-                  .pipe(map((res: any[]) => (res 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.carNo } as SFSchemaEnum))))
                  .toPromise();
              } else {
                return of([]);
@ -307,31 +307,31 @@ export class WaybillManagementVehicleComponent implements OnInit {
      },
      {
        title: '货主出价',
-        width: '100px',
+        width: '250px',
        className: 'text-center',
-        index: 'resourceCode'
+        render: 'billExpenseDetailVOList2'
      },
      {
        title: '货源编号',
-        width: '100px',
+        width: '150px',
        className: 'text-center',
        index: 'resourceCode'
      },
      {
-        title: '运费明细',
-        width: '100px',
+        title: '费用明细',
+        width: '250px',
        className: 'text-center',
        render: 'billExpenseDetailVOList'
      },
-      { title: '网络货运人', index: 'enterpriseInfoName', width: '120px', className: 'text-center' },
-      { title: '货主', index: 'shipperAppUserName', width: '120px', className: 'text-center' },
-      { title: '关联订单号', render: 'wayBill', width: '120px', className: 'text-center' },
-      { title: '装货地', index: 'loadingAddressArr', width: '120px', className: 'text-center' },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-center' },
+      { title: '货主', index: 'shipperAppUserName', width: '150px', className: 'text-center' },
+      { title: '关联订单号', render: 'wayBill', width: '180px', className: 'text-center' },
+      { title: '装货地', index: 'loadingPlace', width: '180px', className: 'text-center' },
      {
        title: '卸货地',
        className: 'text-center',
-        width: '120px',
-        index: 'unloadingAddressArr'
+        width: '180px',
+        index: 'dischargePlace'
      },
      {
        title: '货物信息',
@ -359,7 +359,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
      },
      {
        title: '创建时间',
-        width: '130px',
+        width: '180px',
        className: 'text-center',
        index: 'createTime'
      },
--- a/src/app/routes/waybill-management/services/waybill-management.service.ts
+++ b/src/app/routes/waybill-management/services/waybill-management.service.ts
@ -2,7 +2,7 @@ import { WaybillManagementBulkComponent } from './../components/bulk/bulk.compon
 /*
 * @Author: your name
 * @Date: 2021-12-07 14:52:29
- * @LastEditTime: 2022-01-11 19:07:29
+ * @LastEditTime: 2022-01-12 14:34:04
 * @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\waybill-management\services\waybill-management.service.ts
@ -35,7 +35,7 @@ export class WaybillManagementServe extends BaseService {
    $api_get_getBulkStatistics = `/api/sdc/wayBillOperate/getBulkStatistics`;

      // 根据车牌号查询车辆信息
-  $api_get_getCarLicenseListByCarNo= `/api/mdc/cuc/carLicenseAudit/operate/getCarLicenseListByCarNo`;
+  $api_get_getCarLicenseListByCarNo= `/api/mdc/cuc/carLicense/findCarLicenseByCarNo`;
  
      // 大宗确认发车
  $api_get_insertBulkStartCarInfo= `/api/sdc/wayBillOperate/insertBulkStartCarInfo`;