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

src/app/routes/financial-management/components/payment-order/payment-order.component.html

@@ -8,8 +8,7 @@
                 [ui]="{ '*': { spanLabelFixed: 110,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
                 [button]="'none'"></sf>
         </div>
-        <div nz-col [nzXl]="_$expand ? 24 : 7" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
+        <div nz-col [nzXl]="_$expand ? 24 : 7" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
-            [class.expend-options]="_$expand">
             <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
             <button nz-button (click)="resetSF()">重置</button>
             <!-- <button nz-button nzType="primary" > 导出</button>

src/app/routes/financial-management/components/payment-order/payment-order.component.ts

@@ -108,16 +108,16 @@ export class PaymentOrderComponent implements OnInit {
           },
           default: null
         },
-        orderS2n: {
+        // orderS2n: {
-          type: 'string',
+        //   type: 'string',
-          title: '付款状态',
+        //   title: '付款状态',
-          ui: {
+        //   ui: {
-            widget: 'dict-select',
+        //     widget: 'dict-select',
-            containsAllLable: true,
+        //     containsAllLable: true,
-            params: { dictKey: 'refund:apply:status' },
+        //     params: { dictKey: 'refund:apply:status' },
-            placeholder: '请选择'
+        //     placeholder: '请选择'
-          }
+        //   }
-        },
+        // },
         paytype: {
           type: 'string',
           title: '付款类型',
@@ -126,9 +126,6 @@ export class PaymentOrderComponent implements OnInit {
             containsAllLable: true,
             params: { dictKey: 'pay:type' },
             placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           }
         },
         paymode: {
@@ -237,7 +234,7 @@ export class PaymentOrderComponent implements OnInit {
     return [
       { title: '', index: 'key', type: 'checkbox', fixed: 'left', className: 'text-center' },
       { title: '付款单号', index: 'payCode', type: 'link', width: 180 },
-      { title: '网络货运人', index: 'ltdName', width: 160 },
+      { title: '网络货运人', index: 'ltdName', width: 180 },
       { title: '要求付款日期', index: 'payDate', type: 'date', className: 'text-center', width: 150 },
       {
         title: '付款金额',
@@ -252,7 +249,7 @@ export class PaymentOrderComponent implements OnInit {
       { title: '结算客户', index: 'cnoName', width: 160 },
       { title: '收款人', index: 'hrToLabel', width: 150 },
       { title: '应付已核销', index: 'ishrhxLabel', width: 150 },
-      { title: '确认日期', index: 'payDate', type: 'date', className: 'text-center', width: 150 },
+      { title: '确认日期', index: 'payDate2', type: 'date', className: 'text-center', width: 150 },
       { title: '创建时间', index: 'payDate', type: 'date', className: 'text-center', width: 150 },
       { title: '创建人', index: 'createUserIdLabel', width: 160 },
       { title: '付款备注', index: 'payRemarks', width: 200 },

src/app/routes/financial-management/components/payment-record/payment-record.component.html

@@ -36,9 +36,8 @@
             {{ item.orderPaymentCode }} <br> <a>{{ item.paymentStatusLabel }}</a>
         </ng-template>
         <ng-template st-row="amountDetails" let-item let-index="index" let-column="column">
-           {{item.costName}}:{{ item.price | currency }}<br />
+            <ng-container *ngFor="let detail of item.amountDetails">
-            <ng-container *ngIf="item.payType==='1'">
+                {{detail.costName}}:{{ detail.price | currency }}<br />
-                附加费: {{ item.surcharge| currency }}
             </ng-container>
         </ng-template>
         <ng-template st-row="billCode" let-item let-index="index" let-column="column">

src/app/routes/financial-management/components/payment-record/payment-record.component.ts

@@ -251,16 +251,14 @@ export class PaymentRecordComponent implements OnInit {
         title: '运费明细',
         render: 'amountDetails',
         width: 160,
-        format: item => {
+        // format: item => {
-          let surcharge = 0;
+        //   (item.amountDetails as Array<any>).forEach(detail => {
-          (item.amountDetails as Array<any>).forEach(detail => {
+        //     detail.surcharge = detail.price + (detail.surcharge || 0);
-            surcharge += detail.surcharge || 0;
+        //   });
-          });
+        //   console.log(item.amountDetails);
-          item.surcharge = surcharge.toFixed(2);
+
-          item.price = item.amountDetails?.[0]?.price || 0;
+        //   return '';
-          item.costName = item.amountDetails?.[0]?.costName;
+        // }
-          return '';
-        }
       },
       {
         title: '支付类型',

src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts

@@ -79,8 +79,6 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
   initData() {
     this.service.request(this.service.$api_get_getWholeBillDetail, { id: this.id }).subscribe(res => {
       if (res) {
-        console.log(res);
-
         this.i = res;
         this.pois = [
           {
@@ -90,7 +88,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
             title: res.startingPoint.detailedAddress
           },
           {
-            markerLabel: '终',
+            markerLabel: '卸',
             color: 'red',
             position: [res.endPoint.longitude, res.endPoint.latitude],
             title: res.endPoint.detailedAddress

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

@@ -42,7 +42,7 @@
       <button nz-button nzType="primary" (click)="roleAction('',1)">新增结算客户</button>
     </div>
   </div>
-  <st #st [data]="service.$api_settlementCustomer_page" [columns]="columns" [req]="{ params: reqParams }"
+  <st #st [data]="service.$api_settlementCustomer_page" [columns]="columns" [req]="{ params: reqParams }" [page]="{}"
     [loading]="service.http.loading" [scroll]="{ y: '370px' }" (change)="stChange($event)">
     <ng-template st-row="customerType" let-item let-index="index">
       <div>

src/app/routes/sys-setting/components/network-freight/network-freight.component.html

@@ -55,7 +55,7 @@
     [scroll]="{ x: '2000px' }"
     [data]="service.$api_networkTransporter_page"
     [columns]="columns"
-    [req]="{ params: reqParams }"
+    [req]="{ params: reqParams }" [page]="{}"
     [loading]="service.http.loading"
     (change)="stChange($event)"
   >

src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.html

@@ -51,7 +51,6 @@
 <st #st size="small" [bordered]="true" [scroll]="{x:'800px',y: '300px' }" [data]="service.$api_ficoVatinv_Detail"
     [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
-    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ }" [loading]="service.http.loading"
-    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    class="mt-md">
-    [loading]="service.http.loading" class="mt-md">
 </st>

src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html

@@ -85,7 +85,7 @@
         </div>
       </div>
 
-      <st #orderST [scroll]="{ x: '1200px' }" [data]="service.$api_get_invoice_order_detail" [columns]="orderColumns"
+      <st #orderST [scroll]="{ x: '1200px' }" [data]="service.$api_get_invoice_order_detail" [columns]="orderColumns" [page]="{}"
         size="small" bordered="true" [req]="{ process: beforeReq }" [loading]="service.http.loading"
         [scroll]="{ x: '1200px', y: '250px' }"></st>
     </nz-tab>
@@ -103,11 +103,11 @@
         </div>
       </div>
 
-      <st #costST [data]="service.$api_get_invoice_cost_detail" [columns]="costColumns" size="small" bordered="true"
+      <st #costST [data]="service.$api_get_invoice_cost_detail" [columns]="costColumns" size="small" bordered="true" [page]="{}"
         [req]="{  process: beforeReq }" [loading]="service.http.loading" [scroll]="{ x: '1200px', y: '250px' }"></st>
     </nz-tab>
     <nz-tab nzTitle="发票明细">
-      <st #invoiceST [data]="service.$api_get_invoice_details" [columns]="invoiceColumns" size="small" bordered="true"
+      <st #invoiceST [data]="service.$api_get_invoice_details" [columns]="invoiceColumns" size="small" bordered="true" [page]="{}"
         [req]="{ process: beforeReq }" [loading]="service.http.loading" [scroll]="{ x: '1200px', y: '250px' }">
         <ng-template st-row="vatname" let-item let-index="index">
           <nz-select *ngIf="isEdit" [ngModel]="item.owner"

src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.ts

@@ -16,9 +16,11 @@ const CONFIG = amapConf;
 export class AmapPathSimplifierComponent implements OnInit, OnChanges {
   aMap: any;
   pathSimplifierIns: any;
+  geocoder: any;
   navigator: any;
   infoWindow: any;
   markerList: any;
+  SimpleMarker: any;
   @Input()
   pathList: any = [];
   @Input()
@@ -34,6 +36,7 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges {
 
   @Input()
   pois: any = [];
+  private _pois: any = [];
 
   constructor(public service: BaseService) {}
   ngOnChanges(changes: SimpleChanges): void {
@@ -42,20 +45,23 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges {
       this.setPathIndex(this.selectedIndex);
     }
     if (changes?.MapList?.currentValue && this?.pathSimplifierIns && changes.MapList?.currentValue.length > 0) {
-      // console.log(this.MapList);
+      console.log(this.MapList);
       this.pathList = [
         {
           name: '路线1',
-          points: changes?.MapList?.currentValue
+          points: changes.MapList?.currentValue
         }
       ];
       this.setData(this.pathList);
       this.setPathIndex(this.selectedIndex);
+      this.getPoiByPositon(this.MapList[this.MapList?.length - 1]?.lnglat);
     }
-    if (changes?.pois?.currentValue && this?.markerList && changes.pois?.currentValue.length > 0) {
+    if (changes?.pois?.currentValue) {
       // console.log(this.pois);
-      this.pois = changes?.pois?.currentValue;
+      this._pois = changes?.pois?.currentValue;
-      this.markerList.render(this.pois);
+      if (this?.markerList && this._pois.length > 0) {
+        this.markerList.render(this._pois);
+      }
     }
   }
   ngOnInit(): void {
@@ -74,7 +80,8 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges {
       plugins: [
         // 需要使用的的插件列表，如比例尺'AMap.Scale'等
         'AMap.PathSimplifier',
-        'AMap.InfoWindow'
+        'AMap.InfoWindow',
+        'AMap.Geocoder'
       ],
       AMapUI: {
         version: CONFIG.AMapUIVersion,
@@ -91,6 +98,9 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges {
           this.infoWindow = new AMap.InfoWindow({
             offset: new AMap.Pixel(0, -40)
           });
+          this.geocoder = new AMap.Geocoder({
+            radius: 1000 //范围，默认：500
+          });
           // this.service.msgSrv.info('地图加载完成 !');
           this.pathInit();
           this.setPOIS();
@@ -122,7 +132,7 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges {
           //point
           return pathData.name + '，' + pathData.points[pointIndex].name;
         }
-        return pathData.name + '，点数量' + pathData.points?.length;
+        return '';
       },
       renderOptions: {
         renderAllPointsIfNumberBelow: 10 //绘制路线节点，如不需要可设置为-1
@@ -159,7 +169,7 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges {
             recycledMarker.setIconStyle(dataItem.iconStyle);
             return recycledMarker;
           }
-
+          this.SimpleMarker = SimpleMarker;
           //返回一个新的Marker
           return new SimpleMarker({
             //普通文本
@@ -185,9 +195,9 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges {
         }
       });
 
-      if (this.pois?.length > 0) {
+      if (this._pois?.length > 0) {
         //展示该数据
-        this.markerList.render(this.pois);
+        this.markerList.render(this._pois);
       }
     });
   }
@@ -213,10 +223,60 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges {
     }
   }
 
+  /** 根据经纬度获取地址信息 */
+  getPoiByPositon(position: Array<string>) {
+    this.geocoder.getAddress(position, (status: any, result: any) => {
+      if (status === 'complete' && result.info === 'OK') {
+        // result中对应详细地理坐标信息
+        this._pois = [...this.pois, { markerLabel: '终', color: 'red', position: position, title: result.regeocode.formattedAddress }];
+        if (this.markerList) {
+          this.markerList.render(this._pois);
+        }
+        // this.setPOI({ markerLabel: '终', color: 'red', position: position });
+      }
+    });
+  }
+
+  /**
+   * 选中标点，设置窗口信息
+   * @param location
+   */
   selectedPOI(location: any) {
     this.infoWindow.setContent(`地址: <pre>${location.title}</pre>`);
     this.infoWindow.open(this.aMap, location.position);
     this.infoWindow.setPosition(location.position);
     this.aMap.setCenter(location.position);
   }
+
+  /**
+   * 增加标记点
+   * @param poi
+   */
+  setPOI(poi: POI) {
+    AMapUI.loadUI(['overlay/SimpleMarker'], (SimpleMarker: any) => {
+      //启动页面
+      new SimpleMarker({
+        //普通文本
+        iconLabel: {
+          //普通文本
+          innerHTML: poi.markerLabel,
+          //设置样式
+          style: {
+            color: '#fff',
+            fontSize: '110%',
+            marginTop: '2px'
+          }
+        },
+        iconStyle: poi.color,
+        map: this.aMap,
+        position: poi.position
+      });
+    });
+  }
+}
+
+export interface POI {
+  markerLabel: string;
+  color: string;
+  position: Array<string>;
 }

src/styles/compact.less

@@ -1,5 +1,5 @@
 .alain-pro__sider-logo h1{
-    font-size: 15px;
+    font-size: 15px !important;
 }
 .page-header__title{
     display: none;