车辆接口更新

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:22:55
+ * @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()">
@@ -27,7 +37,7 @@
                 {{headerInfo?.payDate}}
             </se>
             <se label="收款账户" required>
-                {{headerInfo?.hrBankNo}}
+                {{headerInfo?.payBankTypeLabel}}
             </se>
             <se label="确认日期" required>
                 {{headerInfo?.payDate2}}

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;
   };

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-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-            <sf #sf [schema]="searchSchema"
-                [ui]="{ '*': { spanLabelFixed: 110,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="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-row nzGutter="8">
+    <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+      <sf
+        #sf
+        [schema]="searchSchema"
+        [ui]="{ '*': { spanLabelFixed: 110, 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="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"
-        [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]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)">
-    </st>
-</nz-card>
+  <st
+    #st
+    [data]="service.$api_get_fico_page"
+    [columns]="columns"
+    [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]="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/sys-setting/components/announcement-message/announcement-message.component.ts

@@ -30,6 +30,7 @@ export class AnnouncementMessageComponent implements OnInit {
 
   columns: STColumn[] = [
     { title: '公告标题', index: 'announcementTitle' },
+    { title: '发布平台', index: 'appName' },
     { title: '创建时间', index: 'createTime' },
     { title: '发送时间', index: 'sendTime' },
     { title: '公告内容', index: 'announcementContent' },
@@ -209,18 +210,47 @@ this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
       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;
     }
-    this.service.request(this.service.$api_saveButtonInfo, params).subscribe((res:any) => {
-      if(res) {
-       this.service.msgSrv.success('保存成功！')
-       this.isVisible = false
-       this.st.reload();
-      }
-    })
   }
 }