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

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

@@ -18,16 +18,16 @@
           {{ costInfo?.brmdate }}
         </se>
         <se label="收款方式" required>
-          {{ costInfo?.brmmode }}
+          {{ costInfo?.brmmodeLabel }}
         </se>
         <se label="银行类型">
-          {{ costInfo?.banktype }}
+          {{ costInfo?.banktypeLabel }}
         </se>
         <se label="付款人" required>
           {{ costInfo?.artoname }}
         </se>
         <se label="收款类型" required>
-          {{ costInfo?.brmtype }}
+          {{ costInfo?.brmtypeLabel }}
         </se>
         <se label="收款账户" required>
           {{ costInfo?.ltdaccountId }}

src/app/routes/financial-management/services/freight-account.service.ts

@@ -88,8 +88,8 @@ export class FreightAccountService extends ShipperBaseService {
 
   // 查询收款单抬头
   $api_get_receipt_page = '/api/fcc/ficoBrmH/list/page';
-  // 获取收款单抬头
+  // 收款单抬头信息
-  $api_get_receipt_header = '/api/fcc/ficoBrmH/get';
+  $api_get_receipt_header = '/api/fcc/ficoBrmH/getFicoPayHById';
   // 获取收款单抬头
   $api_get_receipt_detail = '/api/fcc/ficoBrmYsk/getListByBrmHid';
 

src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html

@@ -22,7 +22,7 @@
     </div>
 </nz-card>
 
-<nz-card class="content-box" nzBordered>
+<nz-card nzBordered>
     <div class="d-flex align-items-center mb-md">
         <button nz-button (click)="this.deletedInvoice()">作废发票</button>
         <button nz-button (click)="this.invoiceHongChong()">发票红冲</button>

src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.less

@@ -1,36 +0,0 @@
-:host::ng-deep {
-    .search-box {
-        .ant-card-body {
-            padding-bottom: 18px;
-        }
-    }
-
-    .content-box {
-        .ant-card-body {
-            padding-top: 16px;
-        }
-    }
-
-    nz-range-picker {
-        width: 100%;
-    }
-
-    .text-truncate {
-        white-space: normal;
-    }
-}
-
-.expend-options {
-    margin-top: 0px;
-}
-
-
-@media (min-width: 1200px) {
-    .expend-options {
-        max-width : 400px;
-        position  : absolute;
-        right     : 0;
-        bottom    : 25px;
-    }
-
-}

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

@@ -9,7 +9,7 @@ import { TicketService } from '../../services/ticket.service';
 @Component({
   selector: 'app-invoiced-list',
   templateUrl: './invoiced-list.component.html',
-  styleUrls: ['./invoiced-list.component.less']
+  styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
 })
 export class InvoicedListComponent implements OnInit {
   @ViewChild('st', { static: true })