From c50c286df3108ce4a48674f15f29954fb3e4cb7f Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 22 十二月 2025 12:15:37 +0800
Subject: [PATCH] 送货计划增加“完成情况：全部、已送、未送”查询条件，默认“未送”
---
CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.cs | 59 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 35 insertions(+), 24 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.cs
index ef88746..73b61ba 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.cs
@@ -77,7 +77,7 @@
this.selDepartmentId.DataValueField = "Keyid";
this.selDepartmentId.DataBind();
- this.selRole.DataSource = bll_OA_FirmRoleBLL.SelectList(CurrentUser.MemberId);
+ this.selRole.DataSource = bll_OA_FirmRoleBLL.SelectList(CurrentUser.MemberId).Where(x=>x.IsUsed == true);
this.selRole.DataTextField = "RoleName";
this.selRole.DataValueField = "Keyid";
this.DataBind();
@@ -89,10 +89,12 @@
this.selSex.SelectedIndex = 0;
this.txtStaffUserName.Value = "";
this.txtSM_Post.Value = "";
- this.IsBusinessManager.SelectedValue = "False";
- this.IsAccountManager.SelectedValue = "False";
- this.BF_IsDriver.SelectedValue = "False";
- this.BF_IsDeliverManage.SelectedValue = "False";
+ //this.IsBusinessManager.SelectedValue = "False";
+ //this.IsAccountManager.SelectedValue = "False";
+ //this.BF_IsDriver.SelectedValue = "False";
+ //this.BF_IsDeliverManage.SelectedValue = "False";
+ //this.BF_IsBaoxiaozhuguan.SelectedValue = "False";
+ //this.BF_Isbaoxiaojingli.SelectedValue = "False";
this.txtMobieNum.Value = "";
this.txtSM_Money.Value = "";
@@ -150,7 +152,7 @@
this.selDepartmentId.DataValueField = "Keyid";
this.selDepartmentId.DataBind();
- this.selRole.DataSource = bll_OA_FirmRoleBLL.SelectList(CurrentUser.MemberId);
+ this.selRole.DataSource = bll_OA_FirmRoleBLL.SelectList(CurrentUser.MemberId).Where(x => x.IsUsed == true); ;
this.selRole.DataTextField = "RoleName";
this.selRole.DataValueField = "Keyid";
this.DataBind();
@@ -166,10 +168,12 @@
this.txtQQ.Value = m_OA_StaffResume.R_G_QQ;
this.txtEmail.Value = m_OA_StaffResume.R_G_Email;
this.selSex.Value = m_OA_StaffResume.R_G_Sex;
- this.IsBusinessManager.SelectedValue = "False";
- this.IsAccountManager.SelectedValue = "False";
- this.BF_IsDeliverManage.SelectedValue = "False";
- this.BF_IsDriver.SelectedValue = "False";
+ //this.IsBusinessManager.SelectedValue = "False";
+ //this.IsAccountManager.SelectedValue = "False";
+ //this.BF_IsDeliverManage.SelectedValue = "False";
+ //this.BF_IsBaoxiaozhuguan.SelectedValue = "False";
+ //this.BF_Isbaoxiaojingli.SelectedValue = "False";
+ //this.BF_IsDriver.SelectedValue = "False";
this.txtSM_Birthday.Value = m_OA_StaffResume.R_G_DocumentsType;
this.txtSM_IDCardNum.Value = m_OA_StaffResume.R_G_DocumentsNumber;
this.aSM_IDCardPic.Visible = false;
@@ -202,10 +206,12 @@
this.selSex.Value = m_OA_Staff.Sex;
this.selStatus.Value = m_OA_Staff.Status;
this.selDepartmentId.Value = m_OA_Staff.DepartmentId.ToString2();
- this.IsBusinessManager.SelectedValue = m_OA_Staff.IsBusinessManager ? "True" : "False";
- this.IsAccountManager.SelectedValue = m_OA_Staff.IsAccountManager ? "True" : "False";
- this.BF_IsDeliverManage.SelectedValue = m_OA_Staff.BF_IsDeliverManage ? "True" : "False";
- this.BF_IsDriver.SelectedValue = m_OA_Staff.BF_IsDriver ? "True" : "False";
+ //this.IsBusinessManager.SelectedValue = m_OA_Staff.IsBusinessManager ? "True" : "False";
+ //this.IsAccountManager.SelectedValue = m_OA_Staff.IsAccountManager ? "True" : "False";
+ //this.BF_IsDeliverManage.SelectedValue = m_OA_Staff.BF_IsDeliverManage ? "True" : "False";
+ //this.BF_IsBaoxiaozhuguan.SelectedValue = m_OA_Staff.BF_IsBaoxiaozhuguan ? "True" : "False";
+ //this.BF_Isbaoxiaojingli.SelectedValue = m_OA_Staff.BF_Isbaoxiaojingli ? "True" : "False";
+ //this.BF_IsDriver.SelectedValue = m_OA_Staff.BF_IsDriver ? "True" : "False";
this.selRole.Value = m_OA_StaffRoleRel.RoleId.ToString2();
this.txtName.Style.Add("display", "none");
@@ -273,8 +279,8 @@
}
if (!string.IsNullOrEmpty(m_OA_Staff.SM_CertificateType.Trim(',')))
{
- OldFileds = m_OA_Staff.SM_CertificateType.ToString2().Split(',');
- NowFileds = m_OA_Staff.SM_CertificatePic.ToString2().Split(',');
+ OldFileds = m_OA_Staff.SM_CertificateType.ToString2().Trim(',').Split(',');
+ NowFileds = m_OA_Staff.SM_CertificatePic.ToString2().Trim(',').Split(',');
}
OLDProvince = m_OA_Staff.SM_NowProvince.ToString2();
OLDCity = m_OA_Staff.SM_NowCity.ToString2();
@@ -287,10 +293,12 @@
}
else
{
- this.IsBusinessManager.SelectedValue = "False";
- this.IsAccountManager.SelectedValue = "False";
- this.BF_IsDriver.SelectedValue = "False";
- this.BF_IsDeliverManage.SelectedValue = "False";
+ //this.IsBusinessManager.SelectedValue = "False";
+ //this.IsAccountManager.SelectedValue = "False";
+ //this.BF_IsDriver.SelectedValue = "False";
+ //this.BF_IsDeliverManage.SelectedValue = "False";
+ //this.BF_IsBaoxiaozhuguan.SelectedValue = "False";
+ //this.BF_Isbaoxiaojingli.SelectedValue = "False";
}
}
}
@@ -381,10 +389,13 @@
m_OA_Staff.SM_EndWorkTime = nowTime;
}
- m_OA_Staff.IsBusinessManager = this.IsBusinessManager.SelectedValue.ToBoolean2();
- m_OA_Staff.IsAccountManager = this.IsAccountManager.SelectedValue.ToBoolean2();
- m_OA_Staff.BF_IsDeliverManage = this.BF_IsDeliverManage.SelectedValue.ToBoolean2();
- m_OA_Staff.BF_IsDriver = this.BF_IsDriver.SelectedValue.ToBoolean2();
+ //m_OA_Staff.IsBusinessManager = this.IsBusinessManager.SelectedValue.ToBoolean2();
+ //m_OA_Staff.IsAccountManager = this.IsAccountManager.SelectedValue.ToBoolean2();
+ //m_OA_Staff.BF_IsDeliverManage = this.BF_IsDeliverManage.SelectedValue.ToBoolean2();
+ //m_OA_Staff.BF_IsBaoxiaozhuguan = this.BF_IsBaoxiaozhuguan.SelectedValue.ToBoolean2();
+ //m_OA_Staff.BF_Isbaoxiaojingli = this.BF_Isbaoxiaojingli.SelectedValue.ToBoolean2();
+ //m_OA_Staff.BF_IsDriver = this.BF_IsDriver.SelectedValue.ToBoolean2();
+
m_OA_Staff.DepartmentId = this.selDepartmentId.Value.ToInt32();
m_OA_Staff.SM_SpouseName = this.txtSM_SpouseName.Value.ToString2();
--
Gitblit v1.9.1