From a7e05ebe00fdcb649c012e5afc4a42a8d631e824 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 02 四月 2025 08:38:24 +0800
Subject: [PATCH] 删除客户管理查询条件中的“客户编号” 完成 新增订单---黑白印件 的后道工序最右边增加一个“口 竖式”，同前面套号、压痕一样，默认不勾选，是竖式的业务经理自己下单时勾选 完成提交外协付款申请时，增加上传审批证明的上传图片功能，可以添加多张图片；查询列表中增加“付款状态：全部、已付款、未付款”查询条件，默认全部；“完工状态”改为默认未完工 完成请示批复----付款申请 中也要向上面的需求一样，增加上传审批证明的上传图片功能，可以添加多张图片 完成在“请示批复”中进行“批复”操作的时候要能查看上传的审批图片 完成包装要求”要显示在打印的订单中 完成包装要求”要显示在打印的订单中 完成收据联单的新增订单中，纸张选无碳纸时，不显示“品牌”、“克重”，在联数的后面增加颜色选择：“颜色：上白下红”（匹配联数）订单管理中的“订单状态”删除，删除后新增两个状态：“完工状态：全部、未完工、已完工”和“送货状态：全部、已送货、未送货” 完成请示批复中默认“未批复” 完成请示批复中默认“未批复” 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.cs | 55 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 33 insertions(+), 22 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..5051c20 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");
@@ -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