diff --git a/BBWY.Client/Models/APIModel/Response/PurchaseOrder/AuditPurchaseOrderResponse.cs b/BBWY.Client/Models/APIModel/Response/PurchaseOrder/AuditPurchaseOrderResponse.cs
index 4b8bef83..fa6b81ac 100644
--- a/BBWY.Client/Models/APIModel/Response/PurchaseOrder/AuditPurchaseOrderResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/PurchaseOrder/AuditPurchaseOrderResponse.cs
@@ -19,5 +19,7 @@ namespace BBWY.Client.Models
public DateTime? PurchaseTime { get; set; }
public Platform? PurchasePlatform { get; set; }
+
+ public DateTime? OrderStartTime { get; set; }
}
}
diff --git a/BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditPayBill.cs b/BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditPayBill.cs
index 94059f41..7f46418d 100644
--- a/BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditPayBill.cs
+++ b/BBWY.Client/Models/FinancialTerminal/ProcurementAudit/AuditPayBill.cs
@@ -104,5 +104,18 @@ namespace BBWY.Client.Models
public string ErrorMessage { get => errorMessage; set { Set(ref errorMessage, value); } }
public DateTime? OrderStartTime { get; set; }
+
+ public override string ToString()
+ {
+ return $"{PayBillNo},{SourceMerchantOrderNo},{PayBillType},{PayTime},{OppositeAccount},{IncomeAmount},{ExpenditureAmount},{AuditCapitalType},{BelongShop},{RelationPurchaseOrderId},{RelationShopOrderId},{OrderStartTime},{PurchasePlatform},{Remark},{ErrorMessage}";
+ }
+
+ public static string ExportTitle
+ {
+ get
+ {
+ return "账单流水号,商家订单号,账单平台,支付时间,对方账户,收入金额,支出金额,资金类型,归属店铺,采购单号,销售单号,订单日期,采购平台,备注,异常信息";
+ }
+ }
}
}
diff --git a/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs b/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs
index 32534931..a353eb2f 100644
--- a/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs
+++ b/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs
@@ -262,6 +262,7 @@ namespace BBWY.Client.ViewModels
payBill.BelongShopId = relationPurchaseOrder.ShopId;
payBill.BelongShop = shopList.FirstOrDefault(s => s.ShopId == relationPurchaseOrder.ShopId)?.ShopName;
payBill.PurchasePlatform = relationPurchaseOrder.PurchasePlatform;
+ payBill.OrderStartTime = relationPurchaseOrder.OrderStartTime;
if (payBill.IncomeAmount > 0)
payBill.AuditCapitalType = AuditCapitalType.当月商品退款;
else
@@ -520,9 +521,23 @@ namespace BBWY.Client.ViewModels
{
if (ShowAuditPayBillList.Count == 0)
return;
- var list = ShowAuditPayBillList.Select(p => p.ToString()).ToList();
- list.Add("");
+ var shopNames = string.Join(',', SelectedDepartment.ShopList.Where(s => s.IsSelected).Select(s => s.ShopName));
+ var sfd = new SaveFileDialog() { FileName = $"{StartDate:yyyy-MM-dd}_{EndDate:yyyy-MM-dd}_{shopNames}_审计结果.csv" };
+ if (sfd.ShowDialog() != true)
+ return;
+ var path = sfd.FileName;
+ try
+ {
+ var list = ShowAuditPayBillList.Select(p => p.ToString()).ToList();
+ list.Insert(0, AuditPayBill.ExportTitle);
+ File.WriteAllLines(path, list, Encoding.UTF8);
+ MessageBox.Show("导出成功", "导出审计结果");
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.Message, "导出审计结果");
+ }
}
}
}
diff --git a/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml b/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml
index ce337f9d..b32e0133 100644
--- a/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml
+++ b/BBWY.Client/Views/FinancialTerminal/ProcurementAudit.xaml
@@ -178,7 +178,7 @@
-
+
@@ -218,7 +218,8 @@
-
+
+