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

src/app/core/startup/startup.service.ts

@@ -34,6 +34,7 @@ export class StartupService {
     private coreSrv: CoreService
   ) {
     iconSrv.addIcon(...ICONS_AUTO, ...ICONS);
+    this.settingService.setLayout('fixSiderbar', true);
   }
 
   // TODO: 退出登录时需要清理用户信息
@@ -95,7 +96,7 @@ export class StartupService {
     // ACL：设置权限为全量
     this.aclService.setFull(false);
     // 初始化菜单
-    if(menuData){
+    if (menuData) {
       this.menuService.add(menuData);
     }
     // 设置页面标题的后缀

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

@@ -44,7 +44,7 @@
         <se label="费用类型" required>
           {{ costInfo?.feetypeLabel }}
         </se>
-        <se label="应付核销" required> {{ costInfo?.hrmoney}}</se>
+        <se label="应付核销" required> {{ costInfo?.hrmoney | currency}}</se>
         <se label="费用备注">
           {{ costInfo?.hrremarks }}
         </se>
@@ -114,7 +114,7 @@
         </ng-template>
       </st>
     </nz-tab>
-    <nz-tab nzTitle="收款信息">
+    <nz-tab nzTitle="收款信息"  *ngIf="!textStatus">
       <st #st [scroll]="{ x: '2000px' }" [data]="costInfo?.ficoAhxLList" [columns]="columns.collection"
         [page]="{ show: false }" [loading]="service.http.loading" [scroll]="{ x: '1200px', y: '370px' }">
         <ng-template st-row="ahxmoney" let-item let-index="index">

src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts

@@ -54,10 +54,10 @@ export class CostManagementDetailComponent implements OnInit {
         { title: '费用科目', index: 'feeSubName', className: 'text-left', width: 200 },
         {
           title: '税率',
-          index: 'hrvatrate',
+          index: 'arvatrate',
           className: 'text-right',
           width: 200,
-          format: item => `${item.hrvatrate ? ((item.hrvatrate as number) * 100).toFixed(2) : 0}%`
+          format: item => `${item.arvatrate ? ((item.arvatrate as number) * 100).toFixed(2) : 0}%`
         },
         { title: '费用金额', render: 'hrvatmoney', className: 'text-right', width: 200 },
         { title: '收/付款金额', render: 'armoney', className: 'text-right', width: 200 },

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

@@ -29,7 +29,7 @@
                 {{headerInfo?.ltdAccountId}}
             </se>
             <se label="应付已核销" required>
-                {{headerInfo?.payMoney}}
+                {{headerInfo?.payMoney | currency}}
             </se>
         </div>
         <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="150" col="1">
@@ -37,7 +37,7 @@
                 {{headerInfo?.payDate}}
             </se>
             <se label="收款账户" required>
-                {{headerInfo?.ltdaccountId}}
+                 {{headerInfo?.hrBankName}} -  {{headerInfo?.hrBankCode}} 
             </se>
             <se label="确认日期" required>
                 {{headerInfo?.payDate}}
@@ -51,7 +51,7 @@
                 {{headerInfo?.payModeLabel}}
             </se>
             <se label="付款类型" required>
-                {{headerInfo?.payType}}
+                {{headerInfo?.payTypeLabel}}
             </se>
             <se label="付款金额" required>
                 {{headerInfo?.payMoney |currency}}

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

@@ -204,7 +204,7 @@ export class CancellationInvoiceComponent implements OnInit {
     const modal = this.nzModalService.create({
       nzTitle: '推送开票',
       nzContent: PushInvoiceComponent,
-      nzComponentParams: { id: item.id },
+      nzComponentParams: { id: item.vatappHId },
       nzWidth: 1200,
       nzOnOk: () => {
         this.service.request(this.service.$api_push_invoic, { id: item.id }).subscribe(res => {
@@ -314,22 +314,22 @@ export class CancellationInvoiceComponent implements OnInit {
   private initST(): STColumn[] {
     return [
       { title: '', index: 'key', type: 'checkbox', fixed: 'left', width: 50, className: 'text-center' },
-      { title: '分票编号', render: 'vatinvcode', width: 160 },
+      { title: '分票编号', render: 'vatinvcode', width: 200 },
       {
         title: '申请编号',
         index: 'vatappHCode',
-        width: 120,
+        width: 150,
         type: 'link',
         click: item => this.router.navigate(['/ticket/invoice-requested/detail/' + item?.vatappHId])
       },
       { title: '申请时间', index: 'createTime', type: 'date', width: 150 },
-      { title: '网络货运人', index: 'ltdName', width: 120 },
+      { title: '网络货运人', index: 'ltdName', width: 160 },
-      { title: '购买人', index: 'artoname', width: 90 },
+      { title: '购买人', index: 'artoname', width: 160 },
       { title: '订单数', index: 'ordlines', width: 90, className: 'text-right' },
       {
         title: '价税合计',
         index: 'vatmoney',
-        width: 120,
+        width: 140,
         type: 'widget',
         className: 'text-right font-weight-bold',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatmoney }) }
@@ -337,7 +337,7 @@ export class CancellationInvoiceComponent implements OnInit {
       {
         title: '金额',
         index: 'vatnotax',
-        width: 100,
+        width: 140,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) }
@@ -345,27 +345,28 @@ export class CancellationInvoiceComponent implements OnInit {
       {
         title: '税率',
         index: 'billvatrate',
-        width: 90,
+        width: 120,
         className: 'text-right',
         format: item => `${item.billvatrate ? ((item.billvatrate as number) * 100).toFixed(2) : 0}%`
       },
       {
         title: '税额',
         index: 'vattax',
-        width: 90,
+        width: 140,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vattax }) }
       },
-      { title: '服务名称', index: 'vatname', width: 100 },
+      { title: '服务名称', index: 'vatname', width: 120 },
-      { title: '销货清单', index: 'isdetail', width: 90, type: 'enum', enum: { 1: '是', 0: '否' }, className: 'text-center' },
+      { title: '销货清单', index: 'isdetail', width: 120, type: 'enum', enum: { 1: '是', 0: '否' }, className: 'text-center' },
       { title: '票面备注', index: 'remarks', width: 250 },
       { title: '其他要求', index: 'otherremarks', width: 100 },
       {
         title: '操作',
-        width: '100px',
+        width: '120px',
         fixed: 'right',
         buttons: [
+          { type: 'divider' },
           {
             text: '查看明细',
             click: item =>

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

@@ -4,42 +4,42 @@
             {{info?.artoName}}
         </se>
         <se label="纳税号">
-            {{info?.artotaxno}}
+            {{info?.taxNumber}}
         </se>
         <se label="地址">
-            {{info?.artoadd}}
+            {{info?.registerAddr}}
         </se>
         <se label="电话">
-            {{info?.artotel}}
+            {{info?.registerPhone}}
         </se>
         <se label="开户行">
-            {{info?.artobank}}
+            {{info?.bankName}}
         </se>
         <se label="银行账户">
-            {{info?.artoacc}}
+            {{info?.bankAccount}}
         </se>
         <se label="票面备注">
-            {{info?.remarks}}
+            {{info?.vatremarks}}
         </se>
     </div>
     <div nz-col nzSpan="12" se-container [labelWidth]="100" col="1">
         <se label="销售方">
-            {{info?.shipperId}}
+            {{info?.ltdidName}}
         </se>
         <se label="申请编号">
-            {{info?.vatinvcode}}
+            {{info?.vatappcode}}
         </se>
         <se label="订单数">
-            {{info?.ordlines}}笔
+            {{info?.vatinvBillNum}}笔
         </se>
         <se label="价税合计">
-            {{info?.vatmoney}}元
+            {{info?.vatinvHNumAmount | currency}}元
         </se>
         <se label="服务名称">
-            {{info?.vatname}}
+            {{info?.vatnameLabel}}
         </se>
         <se label="销货清单">
-            {{info?.isdetail}}
+            {{info?.isdetail?'是':'否'}}
         </se>
         <se label="其他要求">
             {{info?.otherremarks}}

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

@@ -13,7 +13,7 @@ import { TicketService } from '../../../services/ticket.service';
 export class PushInvoiceComponent implements OnInit {
   @ViewChild('st', { static: false })
   st!: STComponent;
-  columns: STColumn[] = this.initST();
+  columns!: STColumn[];
 
   info: any = {};
   id!: number;
@@ -22,6 +22,9 @@ export class PushInvoiceComponent implements OnInit {
 
   ngOnInit(): void {
     this.loadHeader(this.id);
+    setTimeout(() => {
+      this.columns = this.initST();
+    }, 100);
   }
 
   beforeReq = (requestOptions: STRequestOptions) => {

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

@@ -41,7 +41,7 @@
     </div> -->
   </div>
 
-  <st #st [data]="service.$api_get_invoice_page" [columns]="columns" [req]="{ process: beforeReq }"
+  <st #st [data]="service.$api_get_invoice_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
     [loading]="service.http.loading" [scroll]="{ x: '1200px' }" (change)="stChange($event)">
     <ng-template st-row="no" let-item let-index="index">
       {{ item.no }}