From abdd1a1d8802a93ad9307b0b42020beae9147f62 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 30 十月 2025 08:44:30 +0800
Subject: [PATCH] 把这个放到开票管理中，就是财务管理的付款未票啊，付款未开票啊，把它放到开票管理中，同时在后面加一个开票说明，这个就有。经办人自己填，就是这个好久开开不开得到那个个进度。
---
CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs
index fca4f88..77c263d 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;
@@ -90,6 +91,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();
@@ -241,6 +243,10 @@
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"] == "resumeCateChange")
{
@@ -1282,7 +1288,7 @@
{
try
{
- if (CurrentUser.MemberType == "绠＄悊鍛�")
+ if (CurrentUser.MemberType == "绠＄悊鍛�" || !CurrentUser.StaffId.HasValue || CurrentUser.StaffId.Value == 0)
{
return "";
}
@@ -1420,6 +1426,22 @@
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);
}
#endregion
@@ -1684,12 +1706,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