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

src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html

@@ -9,7 +9,7 @@
 <nz-card class="search-box">
     <div nz-row>
         <div nz-col nzSpan="24">
-            <se-container col="3" labelWidth="100">
+            <se-container col="3" labelWidth="120">
                 <se-title class="mb-md" style="font-size: 18px">基本信息</se-title>
                 <se label="网络货运人" required>
                     {{ costInfo?.ltdName }}

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

@@ -166,9 +166,9 @@ export class PaymentRecordComponent implements OnInit {
         payType: {
           type: 'string',
           title: '支付类型',
-          enum: [{ label: '全部', value: '' }],
           ui: {
-            widget: 'select',
+            widget: 'dict-select',
+            params: { dictKey: 'paybill:type' },
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
@@ -250,7 +250,7 @@ export class PaymentRecordComponent implements OnInit {
       {
         title: '运费明细',
         render: 'amountDetails',
-        width: 160,
+        width: 160
         // format: item => {
         //   (item.amountDetails as Array<any>).forEach(detail => {
         //     detail.surcharge = detail.price + (detail.surcharge || 0);

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

@@ -26,7 +26,7 @@
         <nz-tab nzTitle="全部"></nz-tab>
         <nz-tab nzTitle="待处理"></nz-tab>
         <nz-tab nzTitle="待确认"></nz-tab>
-        <nz-tab nzTitle="已确认"></nz-tab>
+        <!-- <nz-tab nzTitle="已确认"></nz-tab> -->
     </nz-tabset>
     <ng-template #extraTemplate>
         <div class="d-flex align-items-center">

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

@@ -385,11 +385,11 @@ export class CancellationInvoiceComponent implements OnInit {
             iif: item => item.sts === '1',
             click: item => this.pushInvoiceAction(item)
           },
-          {
+          // {
-            text: '作废发票',
+          //   text: '作废发票',
-            iif: item => item.sts === '3',
+          //   iif: item => item.sts === '3',
-            click: item => this.removeInvocie(item)
+          //   click: item => this.removeInvocie(item)
-          }
+          // }
           // {
           //   text: '确认'
           //   // click: item => this.rejectAction(item)