diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.html b/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.html index 84980855..923e7ea7 100644 --- a/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.html +++ b/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.html @@ -18,16 +18,16 @@ {{ costInfo?.brmdate }} - {{ costInfo?.brmmode }} + {{ costInfo?.brmmodeLabel }} - {{ costInfo?.banktype }} + {{ costInfo?.banktypeLabel }} {{ costInfo?.artoname }} - {{ costInfo?.brmtype }} + {{ costInfo?.brmtypeLabel }} {{ costInfo?.ltdaccountId }} diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts index 1eb557a5..f8c5aad0 100644 --- a/src/app/routes/financial-management/services/freight-account.service.ts +++ b/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'; diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html index f573fae2..1a0169ca 100644 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html +++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html @@ -22,7 +22,7 @@ - +
diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.less b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.less deleted file mode 100644 index 0fed18b6..00000000 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.less +++ /dev/null @@ -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; - } - -} \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts index 1e3256bb..8d9a21ac 100644 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts +++ b/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 })