From 14cccf079662c052b2e04d30b9d9082ada1272ff Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 23 八月 2024 10:01:16 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Organize.Core/02-Employee/EmployeeMgrMainPanel.cs | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Organize.Core/02-Employee/EmployeeMgrMainPanel.cs b/WinFrmUI/HStation.WinFrmUI.Organize.Core/02-Employee/EmployeeMgrMainPanel.cs
index 9c2bf80..c38d910 100644
--- a/WinFrmUI/HStation.WinFrmUI.Organize.Core/02-Employee/EmployeeMgrMainPanel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Organize.Core/02-Employee/EmployeeMgrMainPanel.cs
@@ -26,26 +26,27 @@
HStation.BLL.EmployeeMain _service = new();
_AllEmployee.Clear();
var _All = await _service.GetAll();
+
foreach (HStation.Vmo.EmployeeMain emp in _All)
{
+ //HStation.WinFrmUI.Organize.EmployeeViewModel All = new HStation.WinFrmUI.Organize.EmployeeViewModel(emp);
_AllEmployee.Add(emp);
}
- employeeViewModelBindingSource.DataSource = _AllEmployee;
- this.employeeViewModelBindingSource.ResetBindings(false);
+ employeeModelBindingSource.DataSource = _AllEmployee;
+ this.employeeModelBindingSource.ResetBindings(false);
}
-
-
+
//娣诲姞
private void BtnAdd_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- var dlg = new AddEmployeeDlg();
+ var dlg = new AddEmployeeDlg();
if (dlg.ShowDialog() != DialogResult.OK)
{
return;
}
DateShow();
- this.employeeViewModelBindingSource.ResetBindings(false);
+ this.employeeModelBindingSource.ResetBindings(false);
}
//缂栬緫
@@ -53,6 +54,7 @@
{
var dlg = new UpdateEmployeeDlg();
var currentVm = this.gridView1.GetCurrentViewModel(_AllEmployee);
+ //var a =currentVm.ErpCode;
if (currentVm == null)
{
MessageBoxHelper.ShowWarning("璇烽�夋嫨鏁版嵁琛�");
@@ -62,11 +64,36 @@
if (dlg.ShowDialog() == DialogResult.OK)
{
DateShow();
- this.employeeViewModelBindingSource.ResetBindings(false);
+ this.employeeModelBindingSource.ResetBindings(false);
}
}
+ private void gridView1_CustomUnboundColumnData(object sender, DevExpress.XtraGrid.Views.Base.CustomColumnDataEventArgs e)
+ {
+ if (e.Column == colStaffStatus)
+ {
+ var employee = e.Row as HStation.Vmo.EmployeeMain;
+ if (employee == null)
+ {
+ return;
+ }
+
+ e.Value = employee.StaffStatus == eJobType.exist ? "鍦ㄨ亴" : "绂昏亴";
+ }
+ if(e.Column == colRequirePasswordReset)
+ {
+ var employee = e.Row as HStation.Vmo.EmployeeMain;
+ if (employee == null)
+ {
+ return;
+ }
+ e.Value = employee.RequirePasswordReset == 1 ? "鏄�" : "鍚�";
+ }
+
+
+ }
+
////鍒犻櫎
//private async void BtnDelete_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
//{
--
Gitblit v1.9.3