From 9786d950e7f225aadff141da766585d979ab3a57 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Sun, 29 May 2022 05:55:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=AE=A1=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcurementAudit/AuditShopOrder.cs | 10 + BBWY.Client/Resources/Themes/Generic.xaml | 3 + .../ProcurementAuditViewModel.cs | 278 ++++++++++++++++-- .../FinancialTerminal/ProcurementAudit.xaml | 64 +++- 4 files changed, 332 insertions(+), 23 deletions(-) diff --git a/BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditShopOrder.cs b/BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditShopOrder.cs index 47698d71..9f561f8d 100644 --- a/BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditShopOrder.cs +++ b/BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditShopOrder.cs @@ -30,6 +30,11 @@ namespace BBWY.Client.Models /// public DateTime CreateTime { get; set; } + /// + /// 支付时间 + /// + public DateTime? PayTime { get; set; } + /// /// 联系电话 /// @@ -44,6 +49,11 @@ namespace BBWY.Client.Models /// 收货人 /// public string ContactName { get; set; } + + /// + /// 商家备注 + /// + public string VenderRemark { get; set; } /// /// 关联的采购单号 diff --git a/BBWY.Client/Resources/Themes/Generic.xaml b/BBWY.Client/Resources/Themes/Generic.xaml index 7853ca8f..f75c12c2 100644 --- a/BBWY.Client/Resources/Themes/Generic.xaml +++ b/BBWY.Client/Resources/Themes/Generic.xaml @@ -279,6 +279,9 @@ + + @@ -107,6 +115,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +