From 847fb7063af8e80bd864709ba8e97f06dc87ac4f Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 19 十一月 2025 10:02:48 +0800
Subject: [PATCH] 20251118 查看送货情况列表默认“未送货”和“配送中”的学校 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs | 85 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 80 insertions(+), 5 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs
index a1aad74..635df8e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs
@@ -48,6 +48,7 @@
OA_CarManageBll bll_OA_CarManageBll = null;
OA_PropertyCateBLL bll_OA_PropertyCateBLL = null;
OA_PropertyManageBLL bll_OA_PropertyManageBLL = null;
+ OA_ShebeiManageBLL bll_OA_ShebeiManageBLL = null;
OA_StaffPostBLL bll_OA_StaffPostBLL = null;
OA_StaffResumeBLL bll_OA_StaffResumeBLL = null;
OA_StaffPostLogBLL bll_OA_StaffPostLogBLL = null;
@@ -59,6 +60,7 @@
OA_WageManageBLL bll_OA_WageManageBLL = null;
OA_WageAwardPunishBLL bll_OA_WageAwardPunishBLL = null;
OA_CustomerAccessRecordBLL bll_OA_CustomerAccessRecordBLL = null;
+ OA_GongzuozhizeBLL bll_OA_GongzuozhizeBLL = null;
public string old_province = "";
public string old_city = "";
@@ -90,6 +92,7 @@
bll_OA_CarManageBll = new OA_CarManageBll();
bll_OA_PropertyCateBLL = new OA_PropertyCateBLL();
bll_OA_PropertyManageBLL = new OA_PropertyManageBLL();
+ bll_OA_ShebeiManageBLL = new OA_ShebeiManageBLL();
bll_OA_StaffPostBLL = new OA_StaffPostBLL();
bll_OA_StaffResumeBLL = new OA_StaffResumeBLL();
bll_OA_StaffPostLogBLL = new OA_StaffPostLogBLL();
@@ -101,6 +104,7 @@
bll_OA_WageManageBLL = new OA_WageManageBLL();
bll_OA_WageAwardPunishBLL = new OA_WageAwardPunishBLL();
bll_OA_CustomerAccessRecordBLL = new OA_CustomerAccessRecordBLL();
+ bll_OA_GongzuozhizeBLL = new OA_GongzuozhizeBLL();
}
protected void Page_Load(object sender, EventArgs e)
@@ -241,6 +245,22 @@
else if (Request["dateType"] == "propertyNamecheckname")
{
Response.Write(IsExitsPropertyNameCateName(Request["name"], Request["keyid"]));
+ }
+ else if (Request["dateType"] == "shebeiNamecheckname")
+ {
+ Response.Write(IsExitsShebeiNameCateName(Request["name"], Request["keyid"]));
+ }
+ else if (Request["dateType"] == "Gongzuozhizeckname")
+ {
+ if (string.IsNullOrEmpty(Request["name"]))
+ {
+ Response.Write(1);
+ }
+ else
+ {
+ Response.Write(IsExitsGongzuozhizeName(Request["name"], Request["keyid"]));
+ }
+
}
else if (Request["dateType"] == "resumeCateChange")
{
@@ -1282,14 +1302,42 @@
{
try
{
- if (CurrentUser.MemberType == "绠＄悊鍛�")
+ if (CurrentUser.MemberType == "绠＄悊鍛�" || !CurrentUser.StaffId.HasValue || CurrentUser.StaffId.Value == 0)
{
return "";
}
else
{
- Sys_Permissions_UserRoleRelation m_Sys_Permissions_UserRoleRelation = bll_Sys_Permissions_RoleBLL.SelectSys_Permissions_UserRoleRelation(CurrentUser.MemberId);
- return JsonHelper.GetJsonStringByObject(bll_Sys_Permissions_UserCaseBLL.GetNoExitCaseList(MenuPath, m_Sys_Permissions_UserRoleRelation.RoleId));
+ Sys_Permissions_UserRoleRelation m_Sys_Permissions_UserRoleRelation = bll_Sys_Permissions_RoleBLL.SelectSys_Permissions_UserRoleRelation(CurrentUser.MemberId);
+ MenuPath = MenuPath.Replace("..", "");
+ var sss = bll_Sys_Permissions_UserCaseBLL.GetNoExitCaseList(MenuPath, m_Sys_Permissions_UserRoleRelation.RoleId);
+
+ //sss = sss.Where(x => x.Keyid == 12121212121);
+ if (sss != null && sss.Count() > 0)
+ {
+ var aaaa = sss.FirstOrDefault();
+ var roleRel = bll_OA_FirmRoleBLL.SelectOA_StaffRoleRel(CurrentUser.StaffId);
+ if (roleRel != null)
+ {
+ var m_OA_FirmRolePermissionsRelList = bll_OA_FirmRoleBLL.SelectListByRoleId(roleRel.RoleId).Where(x=>x.MenuIdThree == aaaa.MenuId);
+ if (m_OA_FirmRolePermissionsRelList != null)
+ {
+ List<int?> Menus = new List<int?>();
+ foreach (var m_Sys_Permissions_Menu in m_OA_FirmRolePermissionsRelList)
+ {
+ // Menus.Add(m_Sys_Permissions_Menu.MenuIdOne + "-" + m_Sys_Permissions_Menu.MenuIdTwo + "-" + m_Sys_Permissions_Menu.MenuIdThree + "+" + "0");
+ string[] fucns = m_Sys_Permissions_Menu.FuncGroup.Split(',');
+ foreach (var item in fucns)
+ {
+ Menus.Add(item.ToInt32());
+ }
+ }
+ sss = sss.Where(x => !Menus.Contains(x.Keyid));
+ }
+ }
+ }
+
+ return JsonHelper.GetJsonStringByObject(sss);
}
}
catch (Exception ex)
@@ -1392,6 +1440,34 @@
public int IsExitsPropertyNameCateName(string Name, string Keyid)
{
return bll_OA_PropertyManageBLL.IsExitsName(Name, CurrentUser.MemberId, Keyid);
+ }
+
+ #endregion
+
+
+ #region 妫�娴嬭鏀跨墿鍝佹槸鍚﹂噸澶�
+
+ /// <summary>
+ /// 妫�娴嬭鏀跨墿鍝佹槸鍚﹂噸澶�
+ /// </summary>
+ /// <param name="Name"></param>
+ /// <param name="Keyid"></param>
+ /// <returns></returns>
+ public int IsExitsShebeiNameCateName(string Name, string Keyid)
+ {
+ return bll_OA_ShebeiManageBLL.IsExitsName(Name, CurrentUser.MemberId, Keyid);
+ }
+
+
+ /// <summary>
+ /// 妫�娴嬭鏀跨墿鍝佹槸鍚﹂噸澶�
+ /// </summary>
+ /// <param name="Name"></param>
+ /// <param name="Keyid"></param>
+ /// <returns></returns>
+ public int IsExitsGongzuozhizeName(string Name, string Keyid)
+ {
+ return bll_OA_GongzuozhizeBLL.IsExitsName(Name.ToInt32(), Keyid.ToInt32());
}
#endregion
@@ -1656,12 +1732,11 @@
OA_WageManage m_OA_WageManage = bll_OA_WageManageBLL.GetModelByMemberId(staffId);
DateTime? calculateTimeStart = (calculateTimeString.Replace("骞�", "-").Replace("鏈�", "-") + "1").ToDateTime2();
DateTime? calculateTimeEnd = calculateTimeStart.Value.AddMonths(1);
-
//濂栧姳鍜岀綒娆�
Pagination pa = new Pagination();
pa.PageSize = 500;
pa.PageIndex = 1;
- List<OA_WageAwardPunish> m_OA_WageAwardPunishList = bll_OA_WageAwardPunishBLL.SelectModelPageByWage(pa, CurrentUser.MemberId, null, m_OA_Staff.Name, calculateTimeString).ToList();
+ List<OA_WageAwardPunish> m_OA_WageAwardPunishList = bll_OA_WageAwardPunishBLL.SelectModelPageByWage(pa, CurrentUser.MemberId, null, m_OA_Staff.Name, calculateTimeString, calculateTimeString).ToList();
if (m_OA_WageAwardPunishList != null && m_OA_WageAwardPunishList.Count == 1)
{
m_OA_WagesRecord.RewardMoney = m_OA_WageAwardPunishList[0].RewardMoney ?? 0;
--
Gitblit v1.9.1