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/01-EmployeeViewModel/EmployeeViewModel.cs | 163 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 96 insertions(+), 67 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Organize.Core/01-EmployeeViewModel/EmployeeViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Organize.Core/01-EmployeeViewModel/EmployeeViewModel.cs
index d8c0819..312227c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Organize.Core/01-EmployeeViewModel/EmployeeViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Organize.Core/01-EmployeeViewModel/EmployeeViewModel.cs
@@ -2,80 +2,109 @@
namespace HStation.WinFrmUI.Organize
{
- public class EmployeeViewModel
+ public class EmployeeViewModel : EmployeeMain
{
public EmployeeViewModel()
{ }
- public EmployeeViewModel(EmployeeMain rhs)
- {
- this.ErpCode = rhs.ErpCode;//缂栧彿
- this.ProfilePhotoFilePath = rhs.ProfilePhotoFilePath;//澶村儚
- this.PositonName = rhs.PositonName;//鑱屼綅鍚�
- this.FirstName = rhs.FirstName; //濮撳悕锛堣嫳鏂囧氨鏄涓�涓悕锛�
- this.LastName = rhs.LastName;//濮撳悕锛堣嫳鏂囧氨鏄渶鍚庣殑鍚嶏級
- //this.StaffStatus = rhs.StaffStatus; //鍦ㄨ亴鐘舵��1鍦ㄨ亴 0绂昏亴
- this.Telephone = rhs.Telephone;//鎵嬫満鍙�
- //this.RequirePasswordReset = rhs.RequirePasswordReset;//鐧诲綍鏃舵槸鍚﹀繀椤婚噸缃瘑鐮�
- this.Email = rhs.Email;//鐢靛瓙閭
- this.DrawSignal = rhs.DrawSignal;//绛惧悕
- this.LoginAccount = rhs.LoginAccount;//鐧诲綍鐢ㄦ埛
- this.StaffStatus = rhs.StaffStatus ;
- //this.StaffStatus = rhs.StaffStatus == 0 ? "绂昏亴" : "鍦ㄨ亴";
- this.RequirePasswordReset = rhs.RequirePasswordReset == 0 ? "鍚�" : "鏄�";
+ public EmployeeViewModel(EmployeeMain rhs)
+ {
+ this.ErpCode = rhs.ErpCode;//缂栧彿
+ this.ProfilePhotoFilePath = rhs.ProfilePhotoFilePath;//澶村儚
+ this.PositonName = rhs.PositonName;//鑱屼綅鍚�
+ this.FirstName = rhs.FirstName; //濮撳悕锛堣嫳鏂囧氨鏄涓�涓悕锛�
+ this.LastName = rhs.LastName;//濮撳悕锛堣嫳鏂囧氨鏄渶鍚庣殑鍚嶏級
+ //this.StaffStatus = rhs.StaffStatus; //鍦ㄨ亴鐘舵��1鍦ㄨ亴 0绂昏亴
+ this.Telephone = rhs.Telephone;//鎵嬫満鍙�
+ this.Email = rhs.Email;//鐢靛瓙閭
+ this.DrawSignal = rhs.DrawSignal;//绛惧悕
+ this.User = rhs.User;//鐧诲綍鐢ㄦ埛
+ this.AddTime = rhs.AddTime;//娣诲姞鏃堕棿
+ this.AddUser = rhs.AddUser;//娣诲姞鐢ㄦ埛
+ this.LastModifyTime = rhs.LastModifyTime;//鏈�鍚庝慨鏀规椂闂�
+ this.LastModifyUser = rhs.LastModifyUser;//鏈�鍚庝慨鏀圭敤鎴�
+ this.SortCode = rhs.SortCode;//鎺掑簭鐮�
+ this.StaffStatus = rhs.StaffStatus == eJobType.exist ? "绂昏亴" : "鍦ㄨ亴";
+ this.RequirePasswordReset = rhs.RequirePasswordReset == 0 ? "鍚�" : "鏄�";
}
- //public string StaffStatusLabel { get; set; }
- public string RequirePasswordResetLabel { get; set; }
- /// <summary>
- /// ID
- /// </summary>
- public long ID { get; set; }
- /// <summary>
- /// 缂栧彿
- /// </summary>
- public string ErpCode { get; set; }
- /// <summary>
- /// 澶村儚
- /// </summary>
- public string ProfilePhotoFilePath { get; set; }
- /// <summary>
- /// 鑱屼綅鍚�
- /// </summary>
- public string PositonName { get; set; }
- /// <summary>
- /// 濮撳悕锛堣嫳鏂囧氨鏄涓�涓悕锛�
- /// </summary>
- public string FirstName { get; set; }
- /// <summary>
- /// 鍦ㄨ亴鐘舵�� 1鍦ㄨ亴 0绂昏亴
- /// </summary>
- public eJobType StaffStatus { get; set; }
- /// <summary>
- /// 鎵嬫満鍙�
- /// </summary>
- public string Telephone { get; set; }
- /// <summary>
- /// 濮撳悕锛堣嫳鏂囧悕锛屾墠浼氱敤鍒帮級
- /// </summary>
- public string LastName { get; set; }
- /// <summary>
- /// 鐧诲綍鏃舵槸鍚﹀繀椤婚噸缃瘑鐮�
- /// </summary>
- public string RequirePasswordReset { get; set; }
- /// <summary>
- /// 鍥剧焊涓婄殑绛惧悕
- /// </summary>
- public string DrawSignal { get; set; }
- /// <summary>
- /// 鐢靛瓙閭
- /// </summary>
- public string Email { get; set; }
- /// <summary>
- /// 鐧诲綍鐢ㄦ埛
- /// </summary>
- public UserLoginAccount LoginAccount { get; set; }
+ /// <summary>
+ /// ID
+ /// </summary>
+ public long ID { get; set; }
+ /// <summary>
+ /// 缂栧彿
+ /// </summary>
+ public string ErpCode { get; set; }
+ /// <summary>
+ /// 澶村儚
+ /// </summary>
+ public string ProfilePhotoFilePath { get; set; }
+ /// <summary>
+ /// 鑱屼綅鍚�
+ /// </summary>
+ public string PositonName { get; set; }
+ /// <summary>
+ /// 濮撳悕锛堣嫳鏂囧氨鏄涓�涓悕锛�
+ /// </summary>
+ public string FirstName { get; set; }
+ /// <summary>
+ /// 鍦ㄨ亴鐘舵�� 1鍦ㄨ亴 0绂昏亴
+ /// </summary>
+ public string StaffStatus { get; set; }
+ /// <summary>
+ /// 鎵嬫満鍙�
+ /// </summary>
+ public string Telephone { get; set; }
+ /// <summary>
+ /// 濮撳悕锛堣嫳鏂囧悕锛屾墠浼氱敤鍒帮級
+ /// </summary>
+ public string LastName { get; set; }
+ /// <summary>
+ /// 鐧诲綍鏃舵槸鍚﹀繀椤婚噸缃瘑鐮�
+ /// </summary>
+ public string RequirePasswordReset { get; set; }
+ /// <summary>
+ /// 鍥剧焊涓婄殑绛惧悕
+ /// </summary>
+ public string DrawSignal { get; set; }
+ /// <summary>
+ /// 鐢靛瓙閭
+ /// </summary>
+ public string Email { get; set; }
+ /// <summary>
+ /// 鐧诲綍鐢ㄦ埛
+ /// </summary>
+ public Yw.Vmo.User User { get; set; }
+
+
+ /// <summary>
+ /// 娣诲姞鏃堕棿
+ /// </summary>
+ public DateTime AddTime { get; set; }
+
+ /// <summary>
+ /// 娣诲姞鐢ㄦ埛
+ /// </summary>
+ public string AddUser { get; set; }
+
+ /// <summary>
+ /// 鏈�鍚庝慨鏀圭敤鎴�
+ /// </summary>
+ public string LastModifyUser { get; set; }
+
+ /// <summary>
+ /// 鏈�鍚庝慨鏀规椂闂�
+ /// </summary>
+ public string LastModifyTime { get; set; }
+
+ /// <summary>
+ /// 鎺掑簭鐮�
+ /// </summary>
+ public int SortCode { get; set; }
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3