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

proxy.conf.js

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-20 11:12:31
+ * @LastEditTime : 2022-01-20 17:01:32
  * @FilePath     : \\tms-obc-web\\proxy.conf.js
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -20,7 +20,7 @@ module.exports = {
   // }
   '//api': {
     target: {
-      host: 'tms-api-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },

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

@@ -84,7 +84,8 @@
         {{ costInfo?.artocode}}/{{ costInfo?.artonames}}
       </ng-template>
       <ng-template st-row="hrvatmoney" let-item let-index="index">
-        {{ item.hrvatmoney | currency}}
+        <span *ngIf="!textStatus">{{  item.armoney | currency}}</span>
+        <span *ngIf="textStatus">{{  item.hrmoney | currency}}</span>
       </ng-template>
       <ng-template st-row="armoney" let-item let-index="index">
         {{ item.armoney | currency}}

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-30 19:36:30
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-20 10:20:32
+ * @LastEditTime : 2022-01-20 17:14:57
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\cost-management\\cost-management.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -19,8 +19,8 @@
     <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" 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 (click)="exportList()"> 导出</button>
+      <!-- <button nz-button (click)="exportList()"> 导出</button>
-      <button nz-button (click)="exportList()"> 导出明细</button>
+      <button nz-button (click)="exportList()"> 导出明细</button> -->
       <button nz-button nzType="link" (click)="expandToggle()">
         {{ !_$expand ? '展开' : '收起' }}
         <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@@ -51,7 +51,8 @@
       {{ item.hrmoney | currency}}
     </ng-template>
     <ng-template st-row="artocode" let-item let-index="index">
-      {{ item.artocode}}/{{ item.artonames}}
+     <span *ngIf="item.feetype == 1">{{ item.artocode}}/{{ item.artonames}}</span> 
+     <span *ngIf="item.feetype == 2">{{ item.hrtocode}}/{{ item.hrtonames}}</span> 
     </ng-template>
     <ng-template st-row="hrpaymoney" let-item let-index="index">
       {{ item.hrpaymoney | currency}}

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

@@ -1,3 +1,13 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-01-14 14:39:04
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-01-20 16:20:54
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\payable-order\\payable-order.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <page-header-wrapper [title]="'应付核销'">
 </page-header-wrapper>
 
@@ -12,8 +22,8 @@
             [class.expend-options]="_$expand">
             <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
             <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
-            <button nz-button [disabled]="service.http.loading"> 导出</button>
+            <!-- <button nz-button [disabled]="service.http.loading"> 导出</button>
-            <button nz-button [disabled]="service.http.loading"> 导出核销</button>
+            <button nz-button [disabled]="service.http.loading"> 导出核销</button> -->
             <button nz-button nzType="link" (click)="expandToggle()">
                 {{ !_$expand ? '展开' : '收起' }}
                 <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>

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

@@ -1,3 +1,13 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-01-19 16:54:07
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-01-20 16:57:24
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\payment-order\\payment-order-detail\\payment-order-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()">
@@ -13,13 +23,13 @@
                 {{headerInfo?.ltdName}}
             </se>
             <se label="收款人" required>
-                {{headerInfo?.hrToName}}
+                {{headerInfo?.payBankTypeLabel}}
             </se>
             <se label="付款账户" required>
                 {{headerInfo?.ltdAccountId}}
             </se>
             <se label="应付已核销" required>
-                {{headerInfo?.invdate}}
+                {{headerInfo?.payMoney}}
             </se>
         </div>
         <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
@@ -27,10 +37,10 @@
                 {{headerInfo?.payDate}}
             </se>
             <se label="收款账户" required>
-                {{headerInfo?.hrBankNo}}
+                {{headerInfo?.payBankTypeLabel}}
             </se>
             <se label="确认日期" required>
-                {{headerInfo?.payDate2}}
+                {{headerInfo?.payDate}}
             </se>
             <se label="付款备注">
                 {{headerInfo?.payRemarks}}
@@ -41,7 +51,7 @@
                 {{headerInfo?.payModeLabel}}
             </se>
             <se label="付款类型" required>
-                {{headerInfo?.payTypeLabel}}
+                {{headerInfo?.payType}}
             </se>
             <se label="付款金额" required>
                 {{headerInfo?.payMoney |currency}}

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

@@ -40,6 +40,7 @@ export class PaymentOrderDetailComponent implements OnInit {
     if (this.sf) {
       Object.assign(requestOptions.body, {
         ...this.sf.value,
+        payHId: this.id,
         billTime: {
           start: this.sf.value.billTime?.[0] || null,
           end: this.sf.value.billTime?.[1] || null
@@ -49,6 +50,10 @@ export class PaymentOrderDetailComponent implements OnInit {
           end: this.sf.value.feedate?.[1] || null
         }
       });
+    } else {
+      Object.assign(requestOptions.body, {
+        payHId: this.id,
+      });
     }
     return requestOptions;
   };
@@ -81,13 +86,13 @@ export class PaymentOrderDetailComponent implements OnInit {
             hidden: true
           }
         },
-        feeHCode: {
+        // feeHCode: {
-          type: 'string',
+        //   type: 'string',
-          title: '费用单号',
+        //   title: '费用单号',
-          ui: {
+        //   ui: {
-            placeholder: '请输入'
+        //     placeholder: '请输入'
-          }
+        //   }
-        },
+        // },
         billHCode: {
           type: 'string',
           title: '订单号',
@@ -102,26 +107,23 @@ export class PaymentOrderDetailComponent implements OnInit {
             placeholder: '请输入'
           }
         },
-        feedate: {
+        // feedate: {
-          title: '费用日期',
+        //   title: '费用日期',
-          type: 'string',
+        //   type: 'string',
-          ui: {
+        //   ui: {
-            widget: 'sl-from-to-search',
+        //     widget: 'sl-from-to-search',
-            format: 'yyyy-MM-dd',
+        //     format: 'yyyy-MM-dd',
-            visibleIf: {
+        //     visibleIf: {
-              expand: (value: boolean) => value
+        //       expand: (value: boolean) => value
-            }
+        //     }
-          } as SFDateWidgetSchema
+        //   } as SFDateWidgetSchema
-        },
+        // },
         billTime: {
           title: '订单日期',
           type: 'string',
           ui: {
             widget: 'sl-from-to-search',
             format: 'yyyy-MM-dd',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           } as SFDateWidgetSchema
         },
         cno: {
@@ -144,8 +146,8 @@ export class PaymentOrderDetailComponent implements OnInit {
   private initST(): STColumn[] {
     return [
       { title: '序号', render: 'billHCode', width: 80 },
-      { title: '费用号', index: 'feeHCode', width: 100 },
+      // { title: '费用号', index: 'feeHCode', width: 100 },
-      { title: '费用日期', index: 'feedate', type: 'date', width: 150 },
+      // { title: '费用日期', index: 'feedate', type: 'date', width: 150 },
       { title: '订单号', index: 'billHCode', width: 100 },
       { title: '订单日期', index: 'billTime', width: 150 },
       { title: '结算客户', index: 'cnoName', width: 90 },

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

@@ -12,8 +12,8 @@
             [class.expend-options]="_$expand">
             <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
             <button nz-button (click)="resetSF()">重置</button>
-            <button nz-button nzType="primary" > 导出</button>
+            <!-- <button nz-button nzType="primary" > 导出</button>
-            <button nz-button nzType="primary" > 导出明细</button>
+            <button nz-button nzType="primary" > 导出明细</button> -->
             <button nz-button nzType="link" (click)="expandToggle()">
                 {{ !_$expand ? '展开' : '收起' }}
                 <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@@ -25,8 +25,8 @@
 <nz-card class="content-box" nzBordered>
 
     <div class="d-flex align-items-center mb-md mt-md">
-        <button nz-button (click)="this.addInvoice()" nzType="primary">添加付款</button>
+        <!-- <button nz-button (click)="this.addInvoice()" nzType="primary">添加付款</button>
-        <button nz-button (click)="this.addInvoice()" nzType="primary">导入付款</button>
+        <button nz-button (click)="this.addInvoice()" nzType="primary">导入付款</button> -->
         <div class="ml-md">
             已选择
             <strong class="text-primary">{{ selectedRows.length }}</strong> 张单

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

@@ -235,15 +235,15 @@ export class PaymentOrderComponent implements OnInit {
         width: 120,
         type: 'widget',
         className: 'text-right',
-        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.paymoney }) }
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.payMoney }) }
       },
-      { title: '付款类型', index: 'payTypeLabel', width: 130 },
+      { title: '付款类型', index: 'payType', width: 130 },
       { title: '付款方式', index: 'payModeLabel', width: 130 },
       { title: '结算客户', index: 'shipperId', width: 160 },
       { title: '收款人', index: 'hrToName', width: 150 },
       { title: '应付已核销', index: 'callNo', width: 150 },
-      { title: '确认日期', index: 'payDate2', type: 'date', className: 'text-center', width: 150 },
+      { title: '确认日期', index: 'payDate', type: 'date', className: 'text-center', width: 150 },
-      { title: '创建时间', index: 'createTime', type: 'date', className: 'text-center', width: 150 },
+      { title: '创建时间', index: 'payDate', type: 'date', className: 'text-center', width: 150 },
       { title: '创建人', index: 'createUserId', width: 160 },
       { title: '付款备注', index: 'payRemarks', width: 200 },
       {
@@ -256,9 +256,9 @@ export class PaymentOrderComponent implements OnInit {
             text: '浏览',
             click: item => this.router.navigate(['/financial-management/payment-order/detail/' + item.id])
           },
-          {
+          // {
-            text: '修改',
+          //   text: '修改',
-          }
+          // }
         ]
       }
     ];

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

@@ -59,7 +59,7 @@
 
 <nz-card class="content-box" nzBordered>
   <nz-tabset>
-    <nz-tab nzTitle="核销信息">
+    <!-- <nz-tab nzTitle="核销信息">
       <st #st [scroll]="{ x: '2000px' }" [data]="[]" [columns]="columns.cost" [page]="{ show: false }"
         [loading]="service.http.loading" [scroll]="{ x: '1200px', y: '370px' }">
         <ng-template st-row="hrvatmoney" let-item let-index="index">
@@ -74,7 +74,7 @@
         <ng-template st-row="no" let-item let-index="index" let-column="column">
         </ng-template>
       </st>
-    </nz-tab>
+    </nz-tab> -->
     <nz-tab nzTitle="预收信息">
       <st #st [scroll]="{ x: '2000px' }" [data]="service.$api_get_receipt_detail" [columns]="columns.requested"
         [req]="{ method: 'POST', allInBody: true, process: beforeReq }" [res]="{ reName: { list: 'data' } }"

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

@@ -24,8 +24,8 @@
     <div nz-col [nzXl]="_$expand ? 24 : 7" [nzLg]="24" [nzSm]="24" [nzXs]="24" 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="primary"> 导出</button>
+      <!-- <button nz-button nzType="primary"> 导出</button>
-      <button nz-button nzType="primary"> 导出核销</button>
+      <button nz-button nzType="primary"> 导出核销</button> -->
       <button nz-button nzType="link" (click)="expandToggle()">
         {{ !_$expand ? '展开' : '收起' }}
         <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@@ -36,8 +36,8 @@
 
 <nz-card class="content-box" nzBordered>
   <div class="d-flex align-items-center mb-md mt-md">
-    <button nz-button (click)="this.addInvoice()" nzType="primary">添加收款</button>
+    <!-- <button nz-button (click)="this.addInvoice()" nzType="primary">添加收款</button>
-    <button nz-button (click)="this.addInvoice()" nzType="primary">导入收款</button>
+    <button nz-button (click)="this.addInvoice()" nzType="primary">导入收款</button> -->
     <div class="ml-md">
       已选择
       <strong class="text-primary">{{ selectedRows.length }}</strong> 张单

src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts

@@ -269,9 +269,9 @@ export class ReceiptOrderComponent implements OnInit {
             text: '浏览',
             click: item => this.router.navigate(['/financial-management/receipt-order/detail/' + item.id])
           },
-          {
+          // {
-            text: '核销'
+          //   text: '核销'
-          }
+          // }
         ]
       }
     ];

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

@@ -1,32 +1,50 @@
-<page-header-wrapper [title]="'应收核销'">
+<!--
-</page-header-wrapper>
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-01-14 14:39:04
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-01-20 16:20:10
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\receivable-order\\receivable-order.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-row nzGutter="8">
-        <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+    <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-            <sf #sf [schema]="searchSchema"
+      <sf
-                [ui]="{ '*': { spanLabelFixed: 110,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
+        #sf
-                [button]="'none'"></sf>
+        [schema]="searchSchema"
-        </div>
+        [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
-        <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
+        [compact]="true"
-            [class.expend-options]="_$expand">
+        [button]="'none'"
-            <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+      ></sf>
-            <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
-            <button nz-button [disabled]="service.http.loading"> 导出</button>
-            <button nz-button [disabled]="service.http.loading"> 导出核销</button>
-            <button nz-button nzType="link" (click)="expandToggle()">
-                {{ !_$expand ? '展开' : '收起' }}
-                <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
-            </button>
-        </div>
     </div>
+    <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right" [class.expend-options]="_$expand">
+      <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+      <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
+      <!-- <button nz-button [disabled]="service.http.loading"> 导出</button>
+            <button nz-button [disabled]="service.http.loading"> 导出核销</button> -->
+      <button nz-button nzType="link" (click)="expandToggle()">
+        {{ !_$expand ? '展开' : '收起' }}
+        <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+      </button>
+    </div>
+  </div>
 </nz-card>
 
 <nz-card class="content-box" nzBordered>
-    <st #st [data]="service.$api_get_fico_page" [columns]="columns"
+  <st
-        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
+    #st
-        [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [data]="service.$api_get_fico_page"
-        [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [columns]="columns"
-        [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)">
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
-    </st>
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [loading]="service.http.loading"
+    [scroll]="{ x: '1200px', y: '370px' }"
+    (change)="stChange($event)"
+  >
+  </st>
 </nz-card>

src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts

@@ -276,9 +276,9 @@ export class ReceivableOrderComponent implements OnInit {
             click: item =>
               this.router.navigate(['/financial-management/receivable-order/detail/' + item.id], { queryParams: { billHId: item.billHId } })
           },
-          {
+          // {
-            text: '核销'
+          //   text: '核销'
-          }
+          // }
         ]
       }
     ];

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

@@ -1,3 +1,13 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-01-18 09:51:21
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-01-20 17:03:34
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\voucher-management\\voucher-detail\\voucher-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()">
@@ -9,10 +19,10 @@
 <nz-card>
     <div se-container labelWidth="150" gutter="32" col="3">
         <se-title class="text-center font-weight-bold text-xl">记账凭证
-            <button nz-button nzType="primary" [nzLoading]="service.http.loading" style="float: right;">打印</button>
+            <!-- <button nz-button nzType="primary" [nzLoading]="service.http.loading" style="float: right;">打印</button> -->
         </se-title>
         <se label="帐套" required>
-            {{info?.vcltdcode}}
+            {{info?.ltdId}}
         </se>
         <se label="凭证类型" required>
             {{info?.vctype}}
@@ -46,7 +56,7 @@
             {{info?.remarks}}
         </sv>
         <sv label="凭证流水号">
-            {{info?.createUserId}}
+            {{info?.id}}
         </sv>
         <sv label="创建人">
             {{info?.createUserId}}

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

@@ -11,7 +11,7 @@ import { FreightAccountService } from '../../../services/freight-account.service
 export class VoucherDetailComponent implements OnInit {
   columns: STColumn[] = [
     { title: '摘要', index: 'remarks' },
-    { title: '会计科目', index: 'subname' },
+    { title: '会计科目', index: 'subcode' },
     { title: '辅助核算', render: 'auxVOList' },
     { title: '币种', index: 'currency', className: 'text-center' },
     {

src/app/routes/financial-management/components/voucher-management/voucher-management.component.html

@@ -11,8 +11,8 @@
         <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
             <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
             <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
-            <button nz-button [disabled]="service.http.loading"> 导出</button>
+            <!-- <button nz-button [disabled]="service.http.loading"> 导出</button>
-            <button nz-button [disabled]="service.http.loading"> 导出明细</button>
+            <button nz-button [disabled]="service.http.loading"> 导出明细</button> -->
             <button nz-button nzType="link" (click)="expandToggle()">
                 {{ !_$expand ? '展开' : '收起' }}
                 <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@@ -24,13 +24,13 @@
 <nz-card class="content-box" nzBordered>
 
     <div class="d-flex align-items-center mb-md mt-md">
-        <button nz-button nzType="primary">新建凭证</button>
+        <!-- <button nz-button nzType="primary">新建凭证</button>
         <button nz-button nzType="primary">凭证导入</button>
         <div class="ml-md">
             已选择
             <strong class="text-primary">{{ selectedRows.length }}</strong> 张发票
             <a *ngIf="selectedRows.length > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
-        </div>
+        </div> -->
     </div>
 
     <st #st [data]="service.$api_get_fico_vch_page" [columns]="columns"

src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts

@@ -1,3 +1,13 @@
+/*
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-01-18 15:57:44
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-01-20 17:18:16
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\voucher-management\\voucher-management.component.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
 import { CurrencyPipe } from '@angular/common';
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
@@ -283,11 +293,11 @@ export class VoucherManagementComponent implements OnInit {
   private initST(): STColumn[] {
     return [
       { title: '', index: 'key', type: 'checkbox', width: 60, className: 'text-center', fixed: 'left' },
-      { title: '凭证号', index: 'id', type: 'link', width: 150 },
+      { title: '凭证号', index: 'id', type: 'link', width: 200 },
-      { title: '帐套', index: 'vcltdid', width: 150 },
+      { title: '帐套', index: 'ltdId', width: 200 },
-      { title: '凭证时间', index: 'vctime', type: 'date', width: 150 },
+      { title: '凭证时间', index: 'vctime', type: 'date', width: 200 },
-      { title: '凭证类型', index: 'vctypeLabel', width: 150 },
+      { title: '凭证类型', index: 'vctype', width: 200 },
-      { title: '序号', index: 'invmoney', width: 150, format: _ => '1' },
+      { title: '序号', index: 'invmoney', width: 200, format: _ => '1' },
       { title: '摘要', index: 'remarks', width: 300 },
       { title: '币种', index: 'currency', width: 100 },
       {
@@ -320,15 +330,15 @@ export class VoucherManagementComponent implements OnInit {
             text: '浏览',
             click: (item: any) => this.router.navigate(['/financial-management/voucher-management/detail/' + item.id])
           },
-          {
+          // {
-            text: '修改'
+          //   text: '修改'
-          },
+          // },
-          {
+          // {
-            text: '删除'
+          //   text: '删除'
-          },
+          // },
-          {
+          // {
-            text: '提交'
+          //   text: '提交'
-          }
+          // }
         ]
       }
     ];

src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts

@@ -186,7 +186,7 @@ export class VoucherListComponent implements OnInit {
       { title: '凭证号', index: 'id', type: 'link', width: 150 },
       { title: '帐套', index: 'vcltdid', width: 150 },
       { title: '凭证时间', index: 'vctime', type: 'date', width: 150 },
-      { title: '凭证类型', index: 'vctypeLabel', width: 150 },
+      { title: '凭证类型', index: 'vctype', width: 150 },
       { title: '序号', index: 'invmoney', width: 150, format: _ => '1' },
       { title: '摘要', index: 'remarks', width: 300 },
       { title: '币种', index: 'currency', width: 100 },

src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html

@@ -1,3 +1,13 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-01-18 15:57:44
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-01-20 15:23:44
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\voucher-summary\\voucher-summary.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <page-header-wrapper [title]="'凭证汇总'">
 </page-header-wrapper>
 
@@ -11,9 +21,9 @@
         <div nz-col [nzXl]="_$expand ? 24 : 8" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
             <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
             <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
-            <button nz-button nzType="primary" [disabled]="service.http.loading"> 导出</button>
+            <!-- <button nz-button nzType="primary" [disabled]="service.http.loading"> 导出</button>
             <button nz-button nzType="primary" [disabled]="service.http.loading"> 导出明细</button>
-            <button nz-button nzType="primary" [disabled]="service.http.loading"> 导出凭证</button>
+            <button nz-button nzType="primary" [disabled]="service.http.loading"> 导出凭证</button> -->
             <button nz-button nzType="link" (click)="expandToggle()">
                 {{ !_$expand ? '展开' : '收起' }}
                 <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>

src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts

@@ -919,12 +919,12 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
     }
     this.totalFees = res?.freightPrice || '0';
     this.sf7data = {
-      stateReceipt: res?.supplementaryInformationVO?.stateReceipt,
+      stateReceipt: res?.stateReceipt,
       receiptType: res?.receiptType || '',
-      receiptUserName: res?.supplementaryInformationVO?.receiptUserName || '',
+      receiptUserName: res?.receiptUserName || '',
-      receiptAddressArea: res?.supplementaryInformationVO?.receiptAddressArea || '',
+      receiptAddressArea: res?.receiptAddressArea || '',
-      receiptUserPhone: res?.supplementaryInformationVO?.receiptUserPhone || '',
+      receiptUserPhone: res?.receiptUserPhone || '',
-      receiptAddress: res?.supplementaryInformationVO?.receiptAddress || '',
+      receiptAddress: res?.receiptAddress || '',
       paymentDays: res?.paymentDays || '',
       remarks: res?.remarks || ''
     };

src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts

@@ -1048,12 +1048,12 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
     //   remarks: res?.remarks
     // };
     this.sf6data = {
-      stateReceipt: res?.supplementaryInformationVO?.stateReceipt,
+      stateReceipt: res?.stateReceipt,
       receiptType: res?.receiptType || '',
-      receiptUserName: res?.supplementaryInformationVO?.receiptUserName || '',
+      receiptUserName: res?.receiptUserName || '',
-      receiptAddressArea: res?.supplementaryInformationVO?.receiptAddressArea || '',
+      receiptAddressArea: res?.receiptAddressArea || '',
-      receiptUserPhone: res?.supplementaryInformationVO?.receiptUserPhone || '',
+      receiptUserPhone: res?.receiptUserPhone || '',
-      receiptAddress: res?.supplementaryInformationVO?.receiptAddress || '',
+      receiptAddress: res?.receiptAddress || '',
       remarks: res?.supplementaryInformationVO?.remarks || ''
     };
     // if (this.PageStatus === '整车修改') {

src/app/routes/sys-setting/components/announcement-message/announcement-message.component.html

@@ -0,0 +1,80 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-01-19 10:47:46
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-01-20 15:52:07
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\announcement-message\\announcement-message.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+
+<page-header-wrapper title="公告信息管理"> </page-header-wrapper>
+
+<nz-card>
+  <div nz-row nzGutter="8">
+    <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
+    <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
+      <sf
+        #sf
+        [schema]="schema"
+        [ui]="ui"
+        [mode]="'search'"
+        [loading]="service.http.loading"
+        (formSubmit)="st?.load(1)"
+        (formReset)="resetSF()"
+      ></sf>
+    </div>
+
+    <!-- 查询字段大于3个时，根据展开状态调整布局 -->
+    <ng-container *ngIf="queryFieldCount > 4">
+      <div nz-col [nzSpan]="_$expand ? 24 : 18">
+        <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
+      </div>
+      <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.expend-options]="_$expand" class="text-right">
+        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+        <button nz-button [disabled]="service.http.loading" nzType="primary">导出</button>
+        <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
+        <button nz-button nzType="link" (click)="expandToggle()">
+          {{ !_$expand ? '展开' : '收起' }}
+          <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+        </button>
+      </div>
+    </ng-container>
+  </div>
+</nz-card>
+
+<nz-card class="content-box">
+  <div class="d-flex justify-content-end mb-sm mt-sm">
+    <div>
+      <button nz-button nzType="primary" (click)="roleAction('', 1)">新增公告</button>
+    </div>
+  </div>
+  <st
+    #st
+    [data]="service.$api_getAnnouncementInfoList_page"
+    [columns]="columns"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [loading]="service.http.loading"
+    (change)="stChange($event)"
+  >
+    <ng-template st-row="customerType" let-item let-index="index">
+      <div>
+        <span *ngIf="item?.customerType == 1">客户</span>
+        <span *ngIf="item?.customerType == 2">供应商</span>
+      </div>
+    </ng-template>
+  </st>
+</nz-card>
+
+<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" [nzTitle]="editText" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
+  <ng-container *nzModalContent>
+    <sf #sfFre [schema]="addSchema" [ui]="ui2" [formData]="formData" [compact]="false" [button]="'none'"> </sf>
+  </ng-container>
+  <ng-template #nzModalFooter>
+    <button nz-button nzType="primary" (click)="handleCancel()" [disabled]="">取消</button>
+    <button nz-button nzType="default" (click)="handleOK()">确 定</button>
+  </ng-template>
+</nz-modal>

src/app/routes/sys-setting/components/announcement-message/announcement-message.component.less

@@ -0,0 +1,13 @@
+:host::ng-deep{
+    .search-box{
+        .ant-card-body{
+            padding-bottom: 18px;
+        }
+    }
+
+    .content-box{
+        .ant-card-body{
+            padding-top: 14px;
+        }
+    }
+}

src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts

@@ -0,0 +1,257 @@
+import { Component, OnInit, ViewChild, Type } from '@angular/core';
+import { STComponent, STColumn, STChange } from '@delon/abc/st';
+import { SFComponent, SFDateWidgetSchema, SFRadioWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
+import { EAEnvironmentService, ShipperBaseService } from '@shared';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { of } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { SystemService } from '../../services/system.service';
+
+@Component({
+  selector: 'app-sys-setting-components-announcement-message',
+  templateUrl: './announcement-message.component.html',
+  styleUrls: ['./announcement-message.component.less']
+})
+export class AnnouncementMessageComponent implements OnInit {
+  @ViewChild('st', { static: true })
+  st!: STComponent;
+  @ViewChild('sf', { static: false }) sf!: SFComponent;
+  @ViewChild('sfFre', { static: false }) sfFre!: SFComponent;
+  ui: SFUISchema = {};
+  ui2: SFUISchema = {};
+  schema: SFSchema = {};
+  addSchema: SFSchema = {};
+  _$expand = false;
+  editText = '';
+  formData :any;
+  isVisible = false;
+  edit = false;
+  editId = false;
+
+  columns: STColumn[] = [
+    { title: '公告标题', index: 'announcementTitle' },
+    { title: '发布平台', index: 'appName' },
+    { title: '创建时间', index: 'createTime' },
+    { title: '发送时间', index: 'sendTime' },
+    { title: '公告内容', index: 'announcementContent' },
+    {
+      title: '操作',
+      buttons: [
+        {
+          text: '编辑',
+          click: item => this.roleAction(item, 2)
+        },
+        {
+          text: '删除',
+          click: item => this.deleteAction(item)
+        },
+      ]
+    }
+  ];
+
+  selectedRows: any[] = [];
+
+  get reqParams (){ 
+    return {
+    ...this.sf?.value,
+    createTime: {
+      start: this.sf?.value?.createTime?.[0] || '',
+      end: this.sf?.value?.createTime?.[1] || ''
+    }
+  }};
+
+  constructor(
+    public service: SystemService, 
+    private nzModalService: NzModalService,
+    public shipperservice: ShipperBaseService,
+    private envSrv: EAEnvironmentService,
+    ) {}
+
+  ngOnInit(): void {
+    this.initSF()
+    this.initSFFre()
+  }
+
+  stChange(e: STChange): void {
+    switch (e.type) {
+      case 'checkbox':
+        this.selectedRows = e.checkbox!;
+        break;
+      case 'filter':
+        this.st.load();
+        break;
+    }
+  }
+    /**
+  * 伸缩查询条件
+  */
+     expandToggle(): void {
+      this._$expand = !this._$expand;
+      this.sf?.setValue('/_$expand', this._$expand);
+    }
+    /**
+   * 查询字段个数
+   */
+     get queryFieldCount(): number {
+      return Object.keys(this.schema?.properties || {}).length;
+    }
+  initSF(){
+  this.schema = {
+    properties: {
+      _$expand: { type: 'boolean', ui: { hidden: true } },
+      announcementTitle: {
+        type: 'string',
+        title: '按钮名称',
+        ui: { placeholder: '请输入' }
+      },
+      createTime: {
+        title: '创建时间',
+        type: 'string',
+        ui: {
+          widget: 'date',
+          mode: 'range',
+          format: 'yyyy-MM-dd',
+          allowClear: true,
+        } as SFDateWidgetSchema
+      },
+    }
+    
+  };
+  this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
+  }
+  initSFFre() {
+  this.addSchema = {
+    properties: {
+      appIdList: {
+        type: 'string',
+        title: '发布平台',
+        enum: [
+          { label: '运营后台', value: this.envSrv.env.appId },
+          // { label: '货主后台', value: this.envSrv.env.HzappId },
+          // { label: '司机端', value: this.envSrv.env.sjappId }
+        ],
+        ui: {
+          widget: 'select',
+          mode: 'multiple',
+          errors: { required: '请选择' },
+          placeholder: '请选择'
+        }
+      },
+      announcementTitle: {
+        type: 'string',
+        title: '公告标题',
+        ui: { placeholder: '请输入' }
+      },
+      announcementContent: {
+        type: 'string',
+        title: '公告内容',
+        ui: { placeholder: '请输入' }
+      },
+      sendTime: {
+        title: '发送时间',
+        type: 'string',
+        format: 'date-time',
+        ui: {
+          allowClear: true,
+        }
+      },
+  },
+  required: ['name', 'i18n', 'text']
+  };
+this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
+}
+  roleAction(value: any,item?: any) {
+    if(item === 1) {
+      this.edit = false;
+      this.editText = '新增';
+      this.formData = {};
+    } else {
+      this.service.request(this.service.$api_getButtonInfo_one, {id: value.id}).subscribe((res: any) => {
+        console.log(res)
+        if(res) {
+          this.formData = res;
+        }
+      })
+      this.edit = true;
+      this.editId = value.id;
+      this.editText = '编辑';
+    }
+   this.isVisible = true;
+  }
+
+  deleteAction(item?: any) {
+    this.nzModalService.error({
+      nzTitle: '确认删除？',
+      nzClosable: false,
+      nzCancelText: '取消',
+      nzOnOk: () => {
+        this.service.request(this.service.$api_settlementCustomer_deletebatch, [item.id]).subscribe(res => {
+          if (res) {
+            this.service.msgSrv.success('删除成功！');
+            this.st.reload(1)
+          }
+        })
+      }
+    });
+  }
+
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+  }
+  handleCancel() {
+    this.isVisible = false
+  }
+
+  handleOK() {
+    console.log(this.sfFre.value)
+    if(!this.sfFre.valid) {
+      this.service.msgSrv.warning('请正确填写完整！')
+      return
+    }
+    var c = new Date(this.sfFre.value.sendTime);
+    this.sfFre.value.sendTime =
+      c.getFullYear() +
+      '-' +
+      this.addPreZero(c.getMonth() + 1) +
+      '-' +
+      this.addPreZero(c.getDate()) +
+      ' ' +
+      this.addPreZero(c.getHours()) +
+      ':' +
+      this.addPreZero(c.getMinutes()) +
+      ':' +
+      this.addPreZero(c.getSeconds());
+    const params ={
+      ...this.sfFre.value
+    }
+    if(this.editId) {
+      params.id = this.editId
+      console.log(params)
+      this.service.request(this.service.$api_addAnnouncementInfo, params).subscribe((res:any) => {
+        if(res) {
+         this.service.msgSrv.success('保存成功！')
+         this.isVisible = false
+         this.st.reload();
+        }
+      })
+    } else {
+      this.service.request(this.service.$api_modifyAnnouncementInfo, params).subscribe((res:any) => {
+        if(res) {
+         this.service.msgSrv.success('保存成功！')
+         this.isVisible = false
+         this.st.reload();
+        }
+        }
+      )}
+}
+  addPreZero(num: any) {
+    if (num < 10) {
+      return '0' + num;
+    } else {
+      return num;
+    }
+  }
+}

src/app/routes/sys-setting/services/system.service.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-20 17:18:43
- * @LastEditTime : 2022-01-19 11:09:26
+ * @LastEditTime : 2022-01-20 15:46:46
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\services\\system.service.ts
@@ -144,6 +144,20 @@ export class SystemService extends BaseService {
   // 删除按钮信息(id)
   $api_deletebatchButton = '/api/mdc/cuc/buttonInfo/deletebatchButton';
 
+
+  // 根据条件获取公告列表
+  $api_getAnnouncementInfoList_page = '/api/mdc/pbc/announcementInfo/getAnnouncementInfoList';
+  // 获取公告信息详情
+  $api_getAnnouncementInfoById_detail = '/api/mdc/pbc/announcementInfo/getAnnouncementInfoById';
+  // 删除公告信息
+  $api_delete_deleteAnnouncementInfoById = '/api/mdc/pbc/announcementInfo/deleteAnnouncementInfoById';
+  // 编辑公告信息
+  $api_modifyAnnouncementInfo = '/api/mdc/pbc/announcementInfo/modifyAnnouncementInfo';
+  // 新增公告信息
+  $api_addAnnouncementInfo = '/api/mdc/pbc/announcementInfo/addAnnouncementInfo';
+ 
+
+
   $api_getRoleTemplateInfo: string = '';
   $api_getFunctionButtonInfo: string = '';
   $api_getFunctionDataInfo: string = '';

src/app/routes/sys-setting/sys-setting-routing.module.ts

@@ -26,6 +26,7 @@ import { SystemSupplyLogsComponent } from './components/system-supply-logs/syste
 import { SystemWaybillLogsComponent } from './components/system-waybill-logs/system-waybill-logs.component';
 import { UserLogsComponent } from './components/user-logs/user-logs.component';
 import { VersionLogsComponent } from './components/version-logs/version-logs.component';
+import { AnnouncementMessageComponent } from './components/announcement-message/announcement-message.component';
 
 const routes: Routes = [
   { path: 'staff-management', component: StaffManagementComponent },
@@ -46,6 +47,7 @@ const routes: Routes = [
   { path: 'system-supply-logs', component: SystemSupplyLogsComponent },
   { path: 'system-waybill-logs', component: SystemWaybillLogsComponent },
   { path: 'btn-management', component: BtnManagementComponent },
+  { path: 'announcement-message', component: AnnouncementMessageComponent },
 ];
 
 @NgModule({

src/app/routes/sys-setting/sys-setting.module.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-03 15:23:05
- * @LastEditTime : 2022-01-19 10:53:26
+ * @LastEditTime : 2022-01-20 15:35:53
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\sys-setting.module.ts
@@ -35,6 +35,7 @@ import { CloseAccountComponent } from './components/close-account/close-account.
 import { SystemSupplyLogsComponent } from './components/system-supply-logs/system-supply-logs.component';
 import { SystemWaybillLogsComponent } from './components/system-waybill-logs/system-waybill-logs.component';
 import { BtnManagementComponent } from './components/btn-management/btn-management.component';
+import { AnnouncementMessageComponent } from './components/announcement-message/announcement-message.component';
 
 const COMPONENTS = [
   StaffManagementComponent,
@@ -54,7 +55,8 @@ const COMPONENTS = [
   CloseAccountComponent,
   SystemSupplyLogsComponent,
   SystemWaybillLogsComponent,
-  BtnManagementComponent
+  BtnManagementComponent,
+  AnnouncementMessageComponent
 ];
 const NOTROUTECOMPONENTS = [
   BuyerTranspowerComponent,

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

@@ -327,23 +327,23 @@ export class CancellationInvoiceComponent implements OnInit {
             iif: item => item.sts != '3',
             click: item => this.requestedAction(item)
           },
-          {
+          // {
-            text: '推送开票',
+          //   text: '推送开票',
-            iif: item => item.sts != '3',
+          //   iif: item => item.sts != '3',
-            click: item => this.pushInvoiceAction(item)
+          //   click: item => this.pushInvoiceAction(item)
-          },
+          // },
-          {
+          // {
-            text: '移除',
+          //   text: '移除',
-            click: item => this.batchRemove(item)
+          //   click: item => this.batchRemove(item)
-          },
+          // },
-          {
+          // {
-            text: '确认'
+          //   text: '确认'
-            // click: item => this.rejectAction(item)
+          //   // click: item => this.rejectAction(item)
-          },
+          // },
-          {
+          // {
-            text: '撤回',
+          //   text: '撤回',
-            click: item => this.batchWithdraw(item)
+          //   click: item => this.batchWithdraw(item)
-          }
+          // }
         ]
       }
     ];

src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts

@@ -29,12 +29,12 @@ export class ETCInvoicedLogsComponent implements OnInit {
       Object.assign(requestOptions.body, {
         ...this.sf.value,
         exTime: {
-          start: this.sf.value.exTime?.[0] || null,
+          start: this.sf.value.exTime?.[0] || '',
-          end: this.sf.value.exTime?.[1] || null
+          end: this.sf.value.exTime?.[1] || ''
         },
         invoiceMakeTime: {
-          start: this.sf.value.invoiceMakeTime?.[0] || null,
+          start: this.sf.value.invoiceMakeTime?.[0] || '',
-          end: this.sf.value.invoiceMakeTime?.[1] || null
+          end: this.sf.value.invoiceMakeTime?.[1] || ''
         }
       });
     }

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

@@ -63,7 +63,7 @@
                 <button nz-button nzType="primary" (click)="saveInvoices()">保 存</button>
             </ng-container>
             <ng-template #elseTemplate>
-                <button nz-button nzType="primary" (click)="isEdit = true">修改</button>
+                <!-- <button nz-button nzType="primary" (click)="isEdit = true">修改</button> -->
             </ng-template>
         </div>
     </div>
@@ -83,7 +83,7 @@
                     <button nz-button nzType="primary" [nzLoading]="service.http.loading"
                         (click)="orderST?.load(1)">查询</button>
                     <button nz-button (click)="resetSF(1)">重置</button>
-                    <button nz-button> 导出</button>
+                    <!-- <button nz-button> 导出</button> -->
                 </div>
             </div>
 

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

@@ -46,9 +46,9 @@
                 <a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
             </div>
             <button nz-button (click)="this.batchRequested()">开票</button>
-            <button nz-button (click)="this.rejectAction(selectedRows)">驳回</button>
+            <!-- <button nz-button (click)="this.rejectAction(selectedRows)">驳回</button>
             <button nz-button (click)="changePice(selectedRows)">修改地址</button>
-            <button nz-button (click)="printOrder(selectedRows)">打印面单</button>
+            <button nz-button (click)="printOrder(selectedRows)">打印面单</button> -->
         </div>
     </ng-template>
 

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

@@ -415,13 +415,13 @@ export class InvoiceRequestedComponent implements OnInit {
         buttons: [
           { type: 'divider' },
           {
-            text: '开票',
+            text: '开票<br/>',
             click: item => this.requestedInvoiceAction(item)
           },
-          {
+          // {
-            text: '驳回<br/>',
+          //   text: '驳回<br/>',
-            click: item => this.rejectAction([item])
+          //   click: item => this.rejectAction([item])
-          },
+          // },
           {
             text: '订单明细<br/>',
             click: item => this.router.navigate(['/ticket/invoice-requested/detail/' + item?.id])
@@ -430,10 +430,10 @@ export class InvoiceRequestedComponent implements OnInit {
             text: '查看原因<br/>',
             click: item => this.showReason(item)
           },
-          {
+          // {
-            text: '下载对账单'
+          //   text: '下载对账单'
-            // click: item => this.rejectAction(item)
+          //   // click: item => this.rejectAction(item)
-          }
+          // }
         ]
       }
     ];

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

@@ -1,59 +1,69 @@
-<page-header-wrapper [title]="'已开发票'">
+<page-header-wrapper [title]="'已开发票'"> </page-header-wrapper>
-</page-header-wrapper>
-
 
 <nz-card class="search-box" nzBordered>
-    <div nz-row nzGutter="8">
+  <div nz-row nzGutter="8">
-        <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+    <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"
-        </div>
+        [ui]="{ '*': { spanLabelFixed: 90, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
-        <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
+        [compact]="true"
-            class="text-right">
+        [button]="'none'"
-            <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+      ></sf>
-            <button nz-button (click)="resetSF()">重置</button>
-            <button nz-button> 导出</button>
-            <button nz-button nzType="link" (click)="expandToggle()">
-                {{ !_$expand ? '展开' : '收起' }}
-                <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
-            </button>
-        </div>
     </div>
+    <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand" 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> 导出</button> -->
+      <button nz-button nzType="link" (click)="expandToggle()">
+        {{ !_$expand ? '展开' : '收起' }}
+        <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+      </button>
+    </div>
+  </div>
 </nz-card>
 
 <nz-card nzBordered>
-    <div class="d-flex align-items-center mb-md">
+  <div class="d-flex align-items-center mb-md">
-        <button nz-button (click)="this.deletedInvoice()">作废发票</button>
+    <!-- <button nz-button (click)="this.deletedInvoice()">作废发票</button>
-        <button nz-button (click)="this.invoiceHongChong()">发票红冲</button>
+    <button nz-button (click)="this.invoiceHongChong()">发票红冲</button> -->
-        <div class="ml-md">
+    <!-- <div class="ml-md">
-            已选择
+      已选择
-            <strong class="text-red">{{ selectedRows.length }}</strong> 条数据&nbsp;&nbsp; 开票金额总计 <strong
+      <strong class="text-red">{{ selectedRows.length }}</strong> 条数据&nbsp;&nbsp; 开票金额总计
-                class="text-red">{{
+      <strong class="text-red">{{ totalCallNo }}</strong>
-                totalCallNo }}</strong>
+      <a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
-            <a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
+    </div> -->
-        </div>
+  </div>
-    </div>
 
-    <st #st [data]="service.$api_get_invoice_page" [columns]="columns"
+  <st
-        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
+    #st
-        [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [data]="service.$api_get_invoice_page"
-        [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [columns]="columns"
-        [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)">
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
-        <ng-template st-row="no" let-item let-index="index">
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-            {{item.no}}
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-            <a>预览发票</a>
+    [loading]="service.http.loading"
-        </ng-template>
+    [scroll]="{ x: '1200px', y: '370px' }"
-        <ng-template st-row="expresscompany" let-item let-index="index" let-column="column">
+    (change)="stChange($event)"
-            {{ item.expresscompany }} <br> {{ item.expressno }}
+  >
-        </ng-template>
+    <ng-template st-row="no" let-item let-index="index">
-    </st>
+      {{ item.no }}
+      <a>预览发票</a>
+    </ng-template>
+    <ng-template st-row="vatrate" let-item let-index="index">
+      0.09
+      </ng-template>
+    <ng-template st-row="expresscompany" let-item let-index="index" let-column="column">
+      {{ item.expresscompany }} <br />
+      {{ item.expressno }}
+    </ng-template>
+  </st>
 </nz-card>
 
 <ng-template #logosticsLogsModal>
-    <p class="mb-xl">
+  <p class="mb-xl">
-        顺丰快递: {{routesInfo?.mailNo}}
+    顺丰快递: {{ routesInfo?.mailNo }}
-        <nz-tag [nzColor]="'#2db7f5'" class="ml-md">已签收</nz-tag>
+    <nz-tag [nzColor]="'#2db7f5'" class="ml-md">已签收</nz-tag>
-    </p>
+  </p>
-    <app-logistics-time-line [data]="routesInfo?.routes"></app-logistics-time-line>
+  <app-logistics-time-line [data]="routesInfo?.routes"></app-logistics-time-line>
 </ng-template>

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

@@ -210,14 +210,14 @@ export class InvoicedListComponent implements OnInit {
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) }
       },
-      { title: '税率', index: 'vatrate', className: 'text-right', width: 90 },
+      { title: '税率', render: 'vatrate', className: 'text-right', width: 90 },
       {
         title: '税额',
-        index: 'disvattax',
+        index: 'vattax',
         width: 90,
         type: 'widget',
         className: 'text-right',
-        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.disvattax }) }
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vattax }) }
       },
       { title: '开票日期', index: 'invoicedate', type: 'date', width: 150 },
       {

src/assets/mocks/menu-data.json

@@ -484,6 +484,10 @@
                 "text": "按钮管理设置",
                 "link": "/system/btn-management"
               },
+              {
+                "text": "公告信息管理",
+                "link": "/system/announcement-message"
+              },
               {
                 "text": "车型车长配置",
                 "link": "/system/cart-config"

src/environments/environment.service.ts

@@ -1,8 +1,8 @@
 /*
  * @Author: Maple
  * @Date: 2021-03-22 09:50:07
- * @LastEditors: Do not edit
+ * @LastEditors  : Shiming
- * @LastEditTime: 2021-05-27 11:37:17
+ * @LastEditTime : 2022-01-20 16:54:57
  * @Description:全局环境服务
  */
 import { Injectable } from '@angular/core';
@@ -11,8 +11,12 @@ import { Injectable } from '@angular/core';
   providedIn: 'root',
 })
 export class EnvironmentService {
-  // 应用ID
+  // 运多星运营管理后台应用ID
   private appId = `5800BF51DC9A494489700F09E3B81520`;
+  // 运多星货主后台应用ID
+  private HzappId = `A48F72F0A304427F921794BAD86B3522`;
+  // 运多星司机应用ID
+  private sjappId = `AB5EDFE8A46D46EBA69F2CBB6C94D226`;
   // 租户ID
   private tenantId = `1352892699355607041`;
   private env: { appId: string; tenantId: string } = { appId: this.appId, tenantId: this.tenantId };