From 5b3c122613f3b1574a0a8a8546f0a57dadb167d3 Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期三, 14 八月 2024 09:40:00 +0800
Subject: [PATCH] 用户员工管理界面修改

---
 WinFrmUI/HStation.WinFrmUI.Organize.Core/00-UserControl/EmloyeeInfoCtrl.cs |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Organize.Core/00-UserControl/EmloyeeInfoCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Organize.Core/00-UserControl/EmloyeeInfoCtrl.cs
index 982bda2..ccee107 100644
--- a/WinFrmUI/HStation.WinFrmUI.Organize.Core/00-UserControl/EmloyeeInfoCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Organize.Core/00-UserControl/EmloyeeInfoCtrl.cs
@@ -22,22 +22,22 @@
         int staffstatus;
         public void ShowBangDingData(HStation.Vmo.EmployeeMain employee)//灞曠ず鏈帶浠舵暟鎹�
         {
+            //HStation.WinFrmUI.Organize.EmployeeViewModel _employee = new HStation.WinFrmUI.Organize.EmployeeViewModel(employee);
             NametextEdit.Text = employee.FirstName;//濮撳悕
             textEditBianHao.Text = employee.ErpCode;//缂栧彿
             ZhiWutextEdit.Text = employee.PositonName;//鑱屽姟
             DianHuatextEdit.Text = employee.Telephone;//鐢佃瘽
             textEditQianMing.Text = employee.DrawSignal;//绛惧悕
             YouXiangtextEdit.Text = employee.Email;//閭 
-            ChongZhiimageComboBoxEdit.SelectedIndex = employee.RequirePasswordReset;//閲嶇疆瀵嗙爜
-            if (employee.StaffStatus.ToString() == "鍦ㄨ亴")
+            ChongZhiimageComboBoxEdit.SelectedIndex = employee.RequirePasswordReset;
+            if (employee.StaffStatus == Vmo.eJobType.exist)
             {
-                 staffstatus = 1;
+                ZhuangTaiimageComboBoxEdit.SelectedIndex = 1;
             }
             else
             {
-                 staffstatus = 0;
+                ZhuangTaiimageComboBoxEdit.SelectedIndex = 0;
             }
-            ZhuangTaiimageComboBoxEdit.SelectedIndex = staffstatus;//鍦ㄨ亴鐘舵��
             EnglishNametextEdit.Text = employee.LastName;//濮撳悕 鑻辨枃
         }
 
@@ -76,6 +76,7 @@
             employee.FirstName = NametextEdit.Text;
             employee.ErpCode = textEditBianHao.Text;
             employee.PositonName = ZhiWutextEdit.Text;
+            employee.EmployeeID = _employee.EmployeeID;
             employee.Telephone = DianHuatextEdit.Text;
             employee.DrawSignal = textEditQianMing.Text;
             employee.Email = YouXiangtextEdit.Text;
@@ -111,7 +112,7 @@
                     return _employee;
                 }
                 //loginUserInfoCtrl.SetOffInput();//loginUserInfoCtrl鎺т欢鍙紪杈�
-                if (loginUserInfoCtrl.NewBindingData(_employee.LoginAccount, out error) == null)//鍑虹幇閿欒骞惰繑鍥瀗ull鍜岄敊璇�
+                if (loginUserInfoCtrl.NewBindingData(_employee.User, out error) == null)//鍑虹幇閿欒骞惰繑鍥瀗ull鍜岄敊璇�
                 {
                     return null;
                 }
@@ -132,7 +133,7 @@
                 }
                 else
                 {
-                    if (loginUserInfoCtrl.NewBindingData(_employee.LoginAccount, out error) != null)//鍑虹幇閿欒骞惰繑鍥瀗ull鍜岄敊璇�
+                    if (loginUserInfoCtrl.NewBindingData(_employee.User, out error) != null)//鍑虹幇閿欒骞惰繑鍥瀗ull鍜岄敊璇�
                     {
                         return null;
                     }
@@ -153,7 +154,7 @@
                 return;
             }
             ShowBangDingData(employee);
-            if (employee.LoginAccount != null)
+            if (employee.User != null)
             {
                 loginUserInfoCtrl.SetNoInput();
                 checkEditCreateLogin.Visible = false;

--
Gitblit v1.9.3