diff --git a/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs b/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs index c2aa0c9c..43255f89 100644 --- a/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs +++ b/BBWY.Client/ViewModels/FinancialTerminal/ProcurementAuditViewModel.cs @@ -28,7 +28,6 @@ namespace BBWY.Client.ViewModels //private bool isShowPurchaseOrderPanel; //private bool isShowShopOrderPanel; private bool onlyException; - private ShopService shopService; private PurchaseOrderService purchaseOrderService; private Department selectedDepartment; private DateTime startDate; @@ -139,28 +138,19 @@ namespace BBWY.Client.ViewModels public ICommand ImportJDShopOrderCommand { get; set; } - public ProcurementAuditViewModel(ShopService shopService, PurchaseOrderService purchaseOrderService, GlobalContext globalContext) + public ProcurementAuditViewModel(PurchaseOrderService purchaseOrderService, GlobalContext globalContext) { this.globalContext = globalContext; AuditFileList = new ObservableCollection(); AuditCommand = new RelayCommand(Audit); ClearAuditCommand = new RelayCommand(ClearAudit); ImportAliPayBillCommand = new RelayCommand(ImportAliPayBill); - this.shopService = shopService; this.purchaseOrderService = purchaseOrderService; DepartmentList = new ObservableCollection(); AuditFileList = new ObservableCollection(); AuditPayBillList = new List(); - //AuditPurchaseOrderList = new List(); - //AuditShopOrderList = new List(); ShowAuditPayBillList = new ObservableCollection(); - //ShowAuditPurchaseOrderList = new ObservableCollection(); - //ShowAuditShopOrderList = new ObservableCollection(); - - //AuditFileList.Add(new AuditFile() { FileName = "支付宝账单20220527.csv", AuditFileType = AuditFileType.账单 }); - //AuditFileList.Add(new AuditFile() { FileName = "1688采购单20220527.csv", AuditFileType = AuditFileType.采购单 }); - //AuditFileList.Add(new AuditFile() { FileName = "支付宝账单20220527.csv", AuditFileType = AuditFileType.销售订单 }); LoadDepartment(); StartDate = DateTime.Now.Date; EndDate = DateTime.Now.Date; diff --git a/BBWY.Client/ViewModels/MainViewModel.cs b/BBWY.Client/ViewModels/MainViewModel.cs index 0aa0f357..0857fc25 100644 --- a/BBWY.Client/ViewModels/MainViewModel.cs +++ b/BBWY.Client/ViewModels/MainViewModel.cs @@ -88,7 +88,7 @@ namespace BBWY.Client.ViewModels WebView2Manager w2m) { this.w2m = w2m; - this.managerDepartment = new List() { "董事办", "财务部", "技术部" }; + this.managerDepartment = new List() { "董事办", "财务部", "技术部", "总经办" }; this.httpClientFactory = httpClientFactory; this.mdsApiService = mdsApiService; this.logisticsService = logisticsService;