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

src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.html

@@ -11,8 +11,8 @@
         <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
             <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
             <button nz-button [disabled]="false" (click)="resetSF()">重置</button>
-            <button nz-button [disabled]="false"> 导出</button>
-            <button nz-button [disabled]="false"> 导出明细</button>
+            <!-- <button nz-button [disabled]="false"> 导出</button>
+            <button nz-button [disabled]="false"> 导出明细</button> -->
             <button nz-button nzType="link" (click)="expandToggle()">
                 {{ !_$expand ? '展开' : '收起' }}
                 <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>

src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts

@@ -217,7 +217,7 @@ export class VoucherListComponent implements OnInit {
         buttons: [
           {
             text: '浏览',
-            click: (item: any) => this.router.navigate(['/voucher-summary/list/detail/' + item.id])
+            click: (item: any) => this.router.navigate(['/financial-management/voucher-summary/list/detail/' + item.id])
           }
         ]
       }

src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts

@@ -48,6 +48,7 @@ export class ETCBlacklistComponent implements OnInit {
         ...this.sf.value
       });
     }
+    this.selectedRows = [];
     return requestOptions;
   };
 
@@ -226,7 +227,7 @@ export class ETCBlacklistComponent implements OnInit {
             }
           }
         },
-        params4: {
+        carNo: {
           title: '车牌号',
           type: 'string',
           ui: {
@@ -236,7 +237,7 @@ export class ETCBlacklistComponent implements OnInit {
             }
           }
         },
-        params5: {
+        carOwner: {
           title: '车辆所有人',
           type: 'string',
           ui: {

src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts

@@ -167,18 +167,18 @@ export class ETCInvoicedLogsComponent implements OnInit {
     return [
       { title: '发票号码', index: 'invoiceNum', width: 100, type: 'link', click: item => this.routeTo(item) },
       { title: '发票代码', index: 'invoiceCode', width: 130 },
-      { title: '订单号', index: 'billCode', width: 140 },
-      { title: '运单号', index: 'waybillCode', width: 140 },
+      { title: '订单号', index: 'billCode', width: 180 },
+      { title: '运单号', index: 'waybillCode', width: 180 },
       { title: '入站口', index: 'enStationName', width: 100 },
       { title: '出站口', index: 'exStationName', width: 100 },
       { title: '司机', render: 'call3No', width: 140 },
       { title: '车牌号', index: 'carNo', width: 100 },
-      { title: '里程（km）', index: 'mileage', width: 120 },
+      // { title: '里程（km）', index: 'mileage', width: 120 },
       { title: '交易id', index: 'tradeId', width: 200 },
       {
         title: '交易金额（元）',
         index: 'fee',
-        width: 130,
+        width: 150,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.fee }) }
@@ -195,7 +195,7 @@ export class ETCInvoicedLogsComponent implements OnInit {
       {
         title: '税额（元）',
         index: 'totalTaxAmount',
-        width: 120,
+        width: 150,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.totalTaxAmount }) }
@@ -203,15 +203,15 @@ export class ETCInvoicedLogsComponent implements OnInit {
       {
         title: '价税合计（元）',
         index: 'totalAmount',
-        width: 130,
+        width: 150,
         type: 'widget',
         className: 'text-right font-weight-bold',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.totalAmount }) }
       },
       { title: '交易时间', index: 'exTime', type: 'date', width: 150 },
       { title: '开票日期', index: 'invoiceMakeTime', type: 'date', width: 150 },
-      { title: '销售方', index: 'sellerName', width: 90 },
-      { title: '网络货运人', index: 'enterpriseInfoName', width: 120 }
+      { title: '销售方', index: 'sellerName', width: 150 },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: 220 }
     ];
   }
 }

src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts

@@ -223,6 +223,8 @@ export class ETCInvoicedRequestedComponent implements OnInit {
       { title: '卸货地', index: 'dischargePlace', width: '220px' },
       { title: '司机信息', render: 'call1No', width: '140px' },
       { title: '车辆信息', render: 'call1N2o', width: '200px' },
+      { title: '车牌颜色', index: 'licenseCarNOColor', width: '140px' },
+      { title: '车辆是否已备案', index: 'putOnRecord', width: '150px', type: 'enum', enum: { false: '否', true: '是' } },
       { title: '托运人', index: 'shipperAppUserName', width: '140px' },
       { title: '网络货运人', index: 'enterpriseInfoName', width: '220px' },
       { title: '接单时间', index: 'orderReceivingTime', type: 'date', width: '150px' },

src/app/routes/usercenter/components/freight/list/detail/detail.component.html

@@ -234,7 +234,9 @@
           [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
       </ng-container>
       <ng-template #enterpriseAddresselseTemplate>
-        <span style="word-break:break-all ">{{detailData.enterpriseAddress}}</span>
+        <span style="word-break:break-all "> {{ detailData?.fullRegionVO?.provinceName }}{{
+          detailData?.fullRegionVO?.cityName }}{{
+          detailData?.fullRegionVO?.areaName }}{{detailData.enterpriseAddress}}</span>
       </ng-template>
     </sv>
     <sv label="经营范围" col="1">
@@ -370,16 +372,16 @@
       {{partnerInfo.partnerEnterpriseName}}
     </sv>
     <sv label="手机号">
-      <input nz-input type="text" [(ngModel)]="partnerInfo.partnerContactMobile" [readonly]="!isEdit" [nzBorderless]="!isEdit"
-        [placeholder]="isEdit?'':'-'">
+      <input nz-input type="text" [(ngModel)]="partnerInfo.partnerContactMobile" [readonly]="!isEdit"
+        [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
     </sv>
     <sv label="管理员">
       <!-- <input nz-input type="text" [(ngModel)]="partnerInfo.partnerContactName + ' ' + partnerInfo.partnerContactMobile" [readonly]="!isEdit" [nzBorderless]="!isEdit"
         [placeholder]="isEdit?'':'-'"> -->
     </sv>
     <sv label="绑定时间">
-      <input nz-input type="text" [(ngModel)]="partnerInfo.enterprisePartnerRelTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
-        [placeholder]="isEdit?'':'-'">
+      <input nz-input type="text" [(ngModel)]="partnerInfo.enterprisePartnerRelTime" [readonly]="!isEdit"
+        [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
     </sv>
     <sv label="结算时间段">
       <input nz-input type="text" [(ngModel)]="partnerInfo.settStartTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
@@ -398,36 +400,38 @@
         [placeholder]="isEdit?'':'-'">
     </sv>
     <sv label="绑定时间">
-      <input nz-input type="text" [(ngModel)]="partnerInfo.enterpriseChannelRelTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
-        [placeholder]="isEdit?'':'-'">
+      <input nz-input type="text" [(ngModel)]="partnerInfo.enterpriseChannelRelTime" [readonly]="!isEdit"
+        [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
     </sv>
   </sv-container>
 </nz-card>
 <nz-card>
-<nz-tabset >
-  <nz-tab nzTitle="修改合伙人记录">
-    <st #st [data]="service.$api_findEnterpricePartnerRelLog" [columns]="columns"
-    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParamsCar }"
-    [res]="{ reName: { list: 'data'} }" [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }"
-    [loading]="service.http.loading">
-    <ng-template st-row="remark" let-item let-index="index">
-      <span *ngIf="item.remark" class="overflowText" nz-tooltip [nzTooltipTitle]="item.remark">{{ item.remark }}</span>
-      <span *ngIf="item.remark === null">--</span>
-    </ng-template>
-  </st>
-  </nz-tab>
-  <nz-tab nzTitle="修改渠道销售记录">
-    <st #st1 multiSort bordered [columns]="recordColumns" [ps]="20" [data]="service.$api_findEnterpriceChannelRelLog"
-    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
-    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-    [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading">
-    <ng-template st-row="remark" let-item let-index="index">
-      <span *ngIf="item.remark" class="overflowText" nz-tooltip [nzTooltipTitle]="item.remark">{{ item.remark }}</span>
-      <span *ngIf="item.remark === null">--</span>
-    </ng-template>
-</st>
-  </nz-tab>
-</nz-tabset>
+  <nz-tabset>
+    <nz-tab nzTitle="修改合伙人记录">
+      <st #st [data]="service.$api_findEnterpricePartnerRelLog" [columns]="columns"
+        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParamsCar }"
+        [res]="{ reName: { list: 'data'} }" [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }"
+        [loading]="service.http.loading">
+        <ng-template st-row="remark" let-item let-index="index">
+          <span *ngIf="item.remark" class="overflowText" nz-tooltip [nzTooltipTitle]="item.remark">{{ item.remark
+            }}</span>
+          <span *ngIf="item.remark === null">--</span>
+        </ng-template>
+      </st>
+    </nz-tab>
+    <nz-tab nzTitle="修改渠道销售记录">
+      <st #st1 multiSort bordered [columns]="recordColumns" [ps]="20" [data]="service.$api_findEnterpriceChannelRelLog"
+        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+        [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+        [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading">
+        <ng-template st-row="remark" let-item let-index="index">
+          <span *ngIf="item.remark" class="overflowText" nz-tooltip [nzTooltipTitle]="item.remark">{{ item.remark
+            }}</span>
+          <span *ngIf="item.remark === null">--</span>
+        </ng-template>
+      </st>
+    </nz-tab>
+  </nz-tabset>
 </nz-card>
 <ng-template #PopconfirmTempalte let-title="title" let-content="content">
   <div class="ant-popover-message">