From 7775b39bc612c70cc3ce04528c710ef09c3c2b60 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Mon, 17 Jan 2022 21:07:42 +0800
Subject: [PATCH] edit

---
 proxy.conf.js                                 |  2 +-
 .../voucher-detail.component.html             | 20 ++++++-------
 .../voucher-detail.component.ts               |  1 -
 .../voucher-management.component.ts           | 29 +++++++------------
 .../summary-detail.component.html             | 12 ++++----
 5 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/proxy.conf.js b/proxy.conf.js
index db8ca3fd..54a93979 100644
--- a/proxy.conf.js
+++ b/proxy.conf.js
@@ -24,7 +24,7 @@ module.exports = {
   // }
   '//api': {
     target: {
-      host: 'tms-api-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },
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 2b649160..8d8fe5dc 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
@@ -27,7 +27,7 @@
         <ng-template #footerTpl let-s>
             <ng-container *ngIf="st.count > 0">
                 <div style="display: flex;justify-content: flex-end;">
-                    <div style="flex: 1;" class="text-left">合计：</div>
+                    <div style="flex: 1;" class="text-right font-weight-bold text-md">合计：</div>
                     <div style="width: 150px;" class="text-right">{{info?.drmoney | currency}}</div>
                     <div style="width: 150px;" class="text-right">{{info?.crmoney | currency}}</div>
                 </div>
@@ -36,21 +36,21 @@
 
         <ng-template st-row="auxVOList" let-item let-index="index" let-column="column">
             <ng-container *ngFor="let auxVO of item.auxVOList">
-                {{ auxVO.auxLabel }}: {{ auxVO.auxValue }} <br> 
+                {{ auxVO.auxLabel }}: {{ auxVO.auxValue }} <br>
             </ng-container>
         </ng-template>
     </st>
 
-    <div se-container labelWidth="150" gutter="32" col="3" class="mt-md">
-        <se label="摘要">
+    <sv-container labelWidth="150" gutter="32" class="mt-md">
+        <sv label="摘要">
             {{info?.remarks}}
-        </se>
-        <se label="凭证流水号">
+        </sv>
+        <sv label="凭证流水号">
             {{info?.createUserId}}
-        </se>
-        <se label="创建人">
+        </sv>
+        <sv label="创建人">
             {{info?.createUserId}}
-        </se>
-    </div>
+        </sv>
+    </sv-container>
 
 </nz-card>
\ No newline at end of file
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 3f65b793..11243e2b 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
@@ -47,7 +47,6 @@ export class VoucherDetailComponent implements OnInit {
       if (res) {
         this.info = res;
       }
-      console.log(res);
     });
   }
 
diff --git a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts
index 2a8963bf..a9a5cea6 100644
--- a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts
+++ b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts
@@ -167,20 +167,15 @@ export class VoucherManagementComponent implements OnInit {
         vctype: {
           type: 'string',
           title: '凭证类型',
-          enum: [
-            { value: null, label: '全部' },
-            { value: 'WLW', label: 'WLW' },
-            { value: 'CH', label: 'CH' },
-            { value: 'YHY', label: 'YHY' },
-            { value: 'KP', label: 'KP' }
-          ],
           ui: {
-            widget: 'select',
+            widget: 'dict-select',
+            params: { dictKey: 'credential:type' },
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
             }
-          }
+          },
+          default: ''
         },
         subid: {
           type: 'string',
@@ -195,7 +190,7 @@ export class VoucherManagementComponent implements OnInit {
           }
         },
         drmoney: {
-          type: 'number',
+          type: 'string',
           title: '借方金额',
           ui: {
             placeholder: '请输入',
@@ -205,7 +200,7 @@ export class VoucherManagementComponent implements OnInit {
           }
         },
         crmoney: {
-          type: 'number',
+          type: 'string',
           title: '贷方金额',
           ui: {
             placeholder: '请输入',
@@ -229,19 +224,15 @@ export class VoucherManagementComponent implements OnInit {
         sts: {
           type: 'string',
           title: '凭证状态',
-          enum: [
-            { value: null, label: '全部' },
-            { value: 0, label: '新建' },
-            { value: 1, label: '待审核' },
-            { value: 2, label: '已通过' }
-          ],
           ui: {
-            widget: 'select',
+            widget: 'dict-select',
+            params: { dictKey: 'credential:status' },
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
             }
-          }
+          },
+          default: ''
         },
         importncnotes: {
           type: 'string',
diff --git a/src/app/routes/financial-management/components/voucher-summary/summary-detail/summary-detail.component.html b/src/app/routes/financial-management/components/voucher-summary/summary-detail/summary-detail.component.html
index 3434680b..ef27c5b2 100644
--- a/src/app/routes/financial-management/components/voucher-summary/summary-detail/summary-detail.component.html
+++ b/src/app/routes/financial-management/components/voucher-summary/summary-detail/summary-detail.component.html
@@ -37,13 +37,13 @@
         </ng-template>
     </st>
 
-    <div se-container labelWidth="150" gutter="32" col="2" class="mt-md">
-        <se label="摘要">
+    <sv-container labelWidth="150" gutter="32" col="2" class="mt-md">
+        <sv label="摘要">
             收取服务费XXXX
-        </se>
-        <se label="汇总凭证号">
+        </sv>
+        <sv label="凭证流水号">
             VC202112120001
-        </se>
-    </div>
+        </sv>
+    </sv-container>
 
 </nz-card>
\ No newline at end of file