From 7e0259a0ccbe2f7e04dcfcf0e826dc28be9e060f Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 20 Jan 2022 17:04:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 proxy.conf.js                                      |  2 +-
 .../voucher-detail/voucher-detail.component.html   | 14 ++++++++++++--
 .../voucher-detail/voucher-detail.component.ts     |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/proxy.conf.js b/proxy.conf.js
index 0c568287..e6c40845 100644
--- a/proxy.conf.js
+++ b/proxy.conf.js
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-20 16:57:38
+ * @LastEditTime : 2022-01-20 17:01:32
  * @FilePath     : \\tms-obc-web\\proxy.conf.js
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
diff --git a/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.html b/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.html
index 552fa829..bc8e7369 100644
--- a/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.html
+++ b/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,7 +19,7 @@
 <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?.ltdId}}
@@ -46,7 +56,7 @@
             {{info?.remarks}}
         </sv>
         <sv label="凭证流水号">
-            {{info?.createUserId}}
+            {{info?.id}}
         </sv>
         <sv label="创建人">
             {{info?.createUserId}}
diff --git a/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.ts b/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.ts
index 1c4f072c..ebf64601 100644
--- a/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.ts
+++ b/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' },
     {