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

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

@@ -258,6 +258,7 @@ export class WithdrawalsRecordComponent implements OnInit {
       { title: '提现银行账户', render: 'bankCardNumber', width: 180 },
       { title: '提现状态', index: 'refundStatusLabel', width: 100 },
       { title: '银行流水号', index: 'bankSerialNumber', width: 120 },
+      { title: '核心交易流水', index: 'coreSerNo', width: 120 },
       { title: '失败原因', index: 'failCause', width: 150 },
       {
         title: '操作',

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

@@ -131,7 +131,7 @@ export class FreightAccountService extends ShipperBaseService {
     const a = document.createElement('a');
     document.body.appendChild(a);
     a.href = objectUrl;
-    a.download = '面单.pdf';
+    a.download = '回单.pdf';
     if (isIE) {
       // 兼容IE11无法触发下载的问题
       (navigator as any).msSaveBlob(url, a.download);

src/app/routes/menu-manager/components/index/index.component.html

@@ -39,9 +39,12 @@
     </div>
   </ng-template>
 
-  <st #st [data]="service.$api_get_all" [columns]="columns"
+  <st #st [data]="service.$api_get_all" [columns]="columns" [expand]="expand" expandRowByClick
-    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' },process: beforeReq }"
+    [req]="{ method: 'POST',  reName: { pi: 'pageIndex', ps: 'pageSize' },params:{appId:selectedPlatform?.appId} }"
-    [res]="{ reName: { list: 'data' } }"
+    [res]="{ reName: { list: 'data' } }" [page]="{ show: false }" [loading]="service.http.loading"
-    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [scroll]="{ y: '370px' }" (change)="stChange($event)">
-    [loading]="service.http.loading" [scroll]="{ y: '370px' }" (change)="stChange($event)"></st>
+    <ng-template #expand let-item let-index="index" let-column="column">
+      {{ item.description }}
+    </ng-template>
+  </st>
 </nz-card>

src/app/routes/menu-manager/components/index/index.component.ts

@@ -47,8 +47,7 @@ export class MenuManagerComponentsIndexComponent implements OnInit {
       title: '创建时间',
       index: 'createTime',
       className: 'text-left',
-      type: 'date',
+      type: 'date'
-      sort: true
     },
     {
       title: '操作',

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

@@ -25,13 +25,13 @@
                 {{headerInfo?.invoicedate}}
             </se>
             <se label="价税合计">
-                {{headerInfo?.disvatnotax}}
+                {{headerInfo?.vatmoney}}
             </se>
             <se label="税额">
-                {{headerInfo?.disvattax}}
+                {{headerInfo?.vattax}}
             </se>
             <se label="票面备注">
-                {{headerInfo?.vatremarks}}
+                {{headerInfo?.remarks}}
             </se>
         </div>
         <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">