fix bug

proxy.conf.js

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-10 13:41:21
+ * @LastEditTime : 2022-05-11 10:12:55
  * @FilePath     : \\tms-obc-web\\proxy.conf.js
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */

src/app/routes/partner/recorded/components/record/record.component.html

@@ -1,13 +1,26 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-29 17:28:23
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-05-11 10:11:53
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\recorded\\components\\record\\record.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <page-header-wrapper [title]="''"></page-header-wrapper>
 <nz-card class="search-box" nzBordered>
   <div nz-row nzGutter="8">
     <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-      <sf #sf [schema]="searchSchema"
+      <sf
-        [ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24,gutter:15 } }}" [compact]="true"
+        #sf
-        [button]="'none'"></sf>
+        [schema]="searchSchema"
+        [ui]="{ '*': { spanLabelFixed: 90, grid: { lg: 8, md: 12, sm: 12, xs: 24, gutter: 15 } } }"
+        [compact]="true"
+        [button]="'none'"
+      ></sf>
     </div>
-    <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
+    <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand" class="text-right">
-      class="text-right">
       <button nz-button nzType="primary" (click)="search()">查询</button>
       <button nz-button (click)="resetSF()">重置</button>
       <button nz-button acl [acl-ability]="['RECORDED-LIST-export']"> 导出</button>
@@ -29,11 +42,10 @@
   </nz-tabset>
 
   <ng-template #extraTemplate>
-    <div class="d-flex align-items-center ">
+    <div class="d-flex align-items-center">
       <div class="mr-md">
         已选择
-        <strong class="text-red">{{ selectedRows.length }}</strong> 条数据，累计入账 <strong class="text-red">{{
+        <strong class="text-red">{{ selectedRows.length }}</strong> 条数据，累计入账 <strong class="text-red">{{ totalCallNo }}</strong>
-          totalCallNo }}</strong>
         <!-- <a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a> -->
       </div>
       <button nz-button (click)="this.auditAction(null)" acl [acl-ability]="['RECORDED-LIST-audit']">审核</button>
@@ -41,25 +53,38 @@
   </ng-template>
 
   <div class="table-content">
-    <st #st [data]="service.$api_get_recorded_page" [columns]="columns"
+    <st
-      [req]="{  method: 'POST', allInBody: true,process: beforeReq}" [loading]="service.http.loading"
+      #st
-      [scroll]="{ x:'1200px' }" (change)="stChange($event)"
+      [data]="service.$api_get_recorded_page"
+      [columns]="columns"
+      [req]="{ method: 'POST', allInBody: true, process: beforeReq }"
+      [loading]="service.http.loading"
+      [scroll]="{ x: '1200px' }"
+      (change)="stChange($event)"
       [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: afterRes }"
-      [page]="{ show: true,  pageSizes:  [10, 20, 50, 100, 200, 500] }">
+      [page]="{ show: true, pageSizes: [10, 20, 50, 100, 200, 500] }"
+    >
       <ng-template st-row="bankCardNumber" let-item let-index="index" let-column="column">
-        {{ item.bankName }} <br> {{ item.bankCardNumber }}
+        {{ item.bankName }} <br />
+        {{ item.bankCardNumber }}
       </ng-template>
     </st>
-    <div class=" text-md" *ngIf="st?.list?.length !== 0 ">
+    <div class="text-md" *ngIf="st?.list?.length !== 0">
-      <span class="mr-md">合伙人数：<label
+      <span class="mr-md"
-          class="text-red-dark font-weight-bold">{{totalInfo?.invoiceAmountSum}}</label></span>
+        >合伙人数：<label class="text-red-dark font-weight-bold">{{ totalInfo?.invoiceAmountSum }}</label></span
-      <span class="mr-md">入账笔数：<label class="text-red-dark font-weight-bold">{{totalInfo?.count}}</label></span>
+      >
-      <span class="mr-md">开票金额：<label
+      <span class="mr-md"
-          class="text-red-dark font-weight-bold">{{totalInfo?.invoiceEntryNum}}</label></span>
+        >入账笔数：<label class="text-red-dark font-weight-bold">{{ totalInfo?.count }}</label></span
-      <span class="mr-md">代缴个税：<label
+      >
-          class="text-red-dark font-weight-bold">{{totalInfo?.taxPersonalSum}}</label></span>
+      <span class="mr-md"
-      <span class="mr-md">入账金额：<label
+        >开票金额：<label class="text-red-dark font-weight-bold">{{ totalInfo?.invoiceEntryNum }}</label></span
-          class="text-red-dark font-weight-bold">{{totalInfo?.recordedAmountSum}}</label></span>
+      >
+      <span class="mr-md"
+        >代缴个税：<label class="text-red-dark font-weight-bold">{{ totalInfo?.taxPersonalSum }}</label></span
+      >
+      <span class="mr-md"
+        >入账金额：<label class="text-red-dark font-weight-bold">{{ totalInfo?.recordedAmountSum }}</label></span
+      >
     </div>
   </div>
 </nz-card>
@@ -68,8 +93,13 @@
   <div nz-row nzGutter="8">
     <div nz-col nzSpan="24" se-container [labelWidth]="80">
       <se [col]="1" label="备注">
-        <textarea nz-input rows="3" [(ngModel)]="msg" placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
+        <textarea
-          style="width: 325px;margin-left: 14px;"></textarea>
+          nz-input
+          rows="3"
+          [(ngModel)]="msg"
+          placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
+          style="width: 325px; margin-left: 14px"
+        ></textarea>
       </se>
     </div>
   </div>

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

@@ -1,3 +1,13 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-28 20:27:08
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-05-11 10:41:19
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\input-invoice\\input-invoice-detail\\input-invoice-detail.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <page-header-wrapper [title]="'收票信息'" [logo]="logo">
   <ng-template #logo>
     <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
@@ -10,26 +20,26 @@
   <div nz-row nzGutter="8">
     <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="150" col="1">
       <se label="网络货运人" required>
-                {{headerInfo?.ltdid}}
+        {{ headerInfo?.ltdName }}
       </se>
       <se label="发票日期" required>
-                {{headerInfo?.invdate}}
+        {{ headerInfo?.invdate }}
       </se>
     </div>
     <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
       <se label="销售方" required>
-                {{headerInfo?.hrtoName}}
+        {{ headerInfo?.hrtoName }}
       </se>
       <se label="发票号" required>
-                {{headerInfo?.invoiceno}}
+        {{ headerInfo?.invoiceno }}
       </se>
     </div>
     <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
       <se label="收票类型" required>
-                {{headerInfo?.invtype}}
+        {{ headerInfo?.invtype }}
       </se>
       <se label="收票备注">
-                {{headerInfo?.remarks}}
+        {{ headerInfo?.remarks }}
       </se>
     </div>
   </div>
@@ -38,12 +48,15 @@
 <nz-card class="search-box" nzBordered>
   <div nz-row nzGutter="8">
     <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-            <sf #sf [schema]="searchSchema"
+      <sf
-                [ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
+        #sf
-                [button]="'none'"></sf>
+        [schema]="searchSchema"
+        [ui]="{ '*': { spanLabelFixed: 90, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
+        [compact]="true"
+        [button]="'none'"
+      ></sf>
     </div>
-        <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
+    <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand" class="text-right">
-            class="text-right">
       <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
       <button nz-button (click)="resetSF()">重置</button>
       <button nz-button nzType="link" (click)="expandToggle()">
@@ -55,13 +68,25 @@
 </nz-card>
 
 <nz-card class="content-box" nzBordered>
-    <st #st [data]="service.$api_get_input_invoice_detail_page" [columns]="columns" size="small"
+  <st
+    #st
+    [data]="service.$api_get_input_invoice_detail_page"
+    [columns]="columns"
+    size="small"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-        [loading]="false" [scroll]="{ x:'1200px',y: '200px' }">
+    [loading]="false"
+    [scroll]="{ x: '1200px', y: '200px' }"
+  >
     <ng-template st-row="billHCode" let-item let-index="index" let-column="column">
-            {{index+1}}
+      {{ index + 1 }}
+    </ng-template>
+    <ng-template st-row="invmoney" let-item let-index="index" let-column="column">
+      {{ item.invmoney | currency }}
+    </ng-template>
+    <ng-template st-row="invtax" let-item let-index="index" let-column="column">
+      {{ item.invtax | currency }}
     </ng-template>
   </st>
 </nz-card>

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

@@ -144,8 +144,8 @@ export class InputInvoiceDetailComponent implements OnInit {
       { title: '订单日期', index: 'billTime', width: 150 },
       { title: '结算客户', index: 'cnoName', width: 90 },
       { title: '费用科目', index: 'feesubname', width: 100 },
-      { title: '收票金额', index: 'invmoney', width: 140 },
+      { title: '收票金额', render: 'invmoney', width: 140 },
-      { title: '收票税额', index: 'invtax', width: 100 }
+      { title: '收票税额', render: 'invtax', width: 100 }
     ];
   }
 }