From 2bc7800e9f02fed6652f6b0defe1d978f186e914 Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期一, 12 八月 2024 09:18:34 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Organize.Core/02-Employee/EmployeeMgrMainPanel.cs | 51 +++++++++++++++++----------------------------------
1 files changed, 17 insertions(+), 34 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Organize.Core/02-Employee/EmployeeMgrMainPanel.cs b/WinFrmUI/HStation.WinFrmUI.Organize.Core/02-Employee/EmployeeMgrMainPanel.cs
index c3c4283..9c2bf80 100644
--- a/WinFrmUI/HStation.WinFrmUI.Organize.Core/02-Employee/EmployeeMgrMainPanel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Organize.Core/02-Employee/EmployeeMgrMainPanel.cs
@@ -1,8 +1,7 @@
锘縰sing DevExpress.CodeParser;
using DevExpress.XtraEditors.TextEditController.Win32;
using DevExpress.XtraGrid;
-using HStation.Dto;
-using HStation.Model;
+using HStation.Vmo;
using HStation.WinFrmUI.Organize.Core._00_UserControl;
using HStation.WinFrmUI.Organize.Core._02_Employee;
using Mapster;
@@ -20,51 +19,32 @@
//ShowEmloyee();
}
- List<EmployeeViewModel> _AllEmployee = new List<EmployeeViewModel>();
+ List<HStation.Vmo.EmployeeMain> _AllEmployee = new List<HStation.Vmo.EmployeeMain>();
- private void DateShow()
+ private async void DateShow()
{
- HStation.Service.EmployeeMain _service = new();
+ HStation.BLL.EmployeeMain _service = new();
_AllEmployee.Clear();
- var _All = _service.GetAll();
- List<EmployeeViewModel> _AllDateSource = _All.Adapt<List<EmployeeMain>, List<EmployeeViewModel>>();
-
- foreach (EmployeeViewModel emp in _AllDateSource)
+ var _All = await _service.GetAll();
+ foreach (HStation.Vmo.EmployeeMain emp in _All)
{
- emp.StaffStatusLabel = emp.StaffStatus == 0 ? "绂昏亴" : "鍦ㄨ亴";
- emp.RequirePasswordResetLabel = emp.RequirePasswordReset == 0 ? "鍚�" : "鏄�";
- if (String.IsNullOrEmpty(emp.LastName))
- {
- emp.LastName = "鏆傛棤";
- }
_AllEmployee.Add(emp);
}
employeeViewModelBindingSource.DataSource = _AllEmployee;
this.employeeViewModelBindingSource.ResetBindings(false);
}
- //public void ShowEmloyee()
- //{
- // List<Model.EmployeeMain> all = _service.GetAll();
- // employeeViewModelBindingSource.DataSource = all;
- //}
//娣诲姞
- private async void BtnAdd_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private void BtnAdd_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- var dlg = new AddEmployeeDlg();
- dlg.ShowDialog();
- if (dlg.GetAddSuccessfully() != true)
+ var dlg = new AddEmployeeDlg();
+ if (dlg.ShowDialog() != DialogResult.OK)
{
return;
}
- var bll = new BLL.EmployeeMain();
- var NewAddemployeeDate = await bll.GetByID(dlg.GetNewAddEmloyeeId());
- EmployeeViewModel _NewAddemployeeDate = NewAddemployeeDate.Adapt<EmployeeMainDto, EmployeeViewModel>();
- _NewAddemployeeDate.StaffStatusLabel = _NewAddemployeeDate.StaffStatus == 0 ? "绂昏亴" : "鍦ㄨ亴";
- _NewAddemployeeDate.RequirePasswordResetLabel = _NewAddemployeeDate.RequirePasswordReset == 0 ? "鍚�" : "鏄�";
- _AllEmployee.Add(_NewAddemployeeDate);
+ DateShow();
this.employeeViewModelBindingSource.ResetBindings(false);
}
@@ -78,10 +58,13 @@
MessageBoxHelper.ShowWarning("璇烽�夋嫨鏁版嵁琛�");
return;
}
- dlg.SetDate(currentVm.ID);
- dlg.ShowDialog();
- DateShow();
- this.employeeViewModelBindingSource.ResetBindings(false);
+ dlg.IncomingData(currentVm);
+ if (dlg.ShowDialog() == DialogResult.OK)
+ {
+ DateShow();
+ this.employeeViewModelBindingSource.ResetBindings(false);
+ }
+
}
////鍒犻櫎
--
Gitblit v1.9.3