送货单修改这几个地方，第一个，那个表格最上面那根线条和左边那根线条看粗细不一致，太细了， 感觉像打出来像断笔画。这是一个。第二个， 中间空的太多。我刚...

username@email.com

2025-11-21 50d433602441964d905abe6e516ad258ba66627d

 CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs

@@ -60,6 +60,10 @@
        OA_WageManageBLL bll_OA_WageManageBLL = null;
        OA_WageAwardPunishBLL bll_OA_WageAwardPunishBLL = null;
        OA_CustomerAccessRecordBLL bll_OA_CustomerAccessRecordBLL = null;
        OA_GongzuozhizeBLL bll_OA_GongzuozhizeBLL = null;
        OA_GongzuoneirongBLL bll_OA_GongzuoneirongBLL = null;

        OA_GongzuoneirongCateBLL bll_OA_GongzuoneirongCateBLL = null;

        public string old_province = "";
        public string old_city = "";
@@ -103,6 +107,9 @@
            bll_OA_WageManageBLL = new OA_WageManageBLL();
            bll_OA_WageAwardPunishBLL = new OA_WageAwardPunishBLL();
            bll_OA_CustomerAccessRecordBLL = new OA_CustomerAccessRecordBLL();
            bll_OA_GongzuozhizeBLL = new OA_GongzuozhizeBLL();
            bll_OA_GongzuoneirongCateBLL = new OA_GongzuoneirongCateBLL();
            bll_OA_GongzuoneirongBLL = new OA_GongzuoneirongBLL();
        }

        protected void Page_Load(object sender, EventArgs e)
@@ -240,6 +247,10 @@
            {
                Response.Write(IsExitsPropertyCateName(Request["name"], Request["keyid"]));
            }
            else if (Request["dateType"] == "GongzuoneirongCatecheckname")
            {
                Response.Write(IsExitsGongzuoneirongCatecheckName(Request["name"], Request["keyid"]));
            }
            else if (Request["dateType"] == "propertyNamecheckname")
            {
                Response.Write(IsExitsPropertyNameCateName(Request["name"], Request["keyid"]));
@@ -247,6 +258,30 @@
            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"] == "Gongzuoneirongckname")
            {
                if (string.IsNullOrEmpty(Request["name"]))
                {
                    Response.Write(1);
                }
                else
                {
                    Response.Write(IsExitsGongzuoneirongName(Request["name"], Request["keyid"],Request["neirong"]));
                }

            }
            else if (Request["dateType"] == "resumeCateChange")
            {
@@ -1413,6 +1448,18 @@
            return bll_OA_PropertyCateBLL.IsExitsName(Name, CurrentUser.MemberId, Keyid);
        }


        /// <summary>
        /// 检测行政物品分类是否重复
        /// </summary>
        /// <param name="Name"></param>
        /// <param name="Keyid"></param>
        /// <returns></returns>
        public int IsExitsGongzuoneirongCatecheckName(string Name, string Keyid)
        {
            return bll_OA_GongzuoneirongCateBLL.IsExitsName(Name, CurrentUser.MemberId, Keyid);
        }

        #endregion

        #region 检测行政物品是否重复
@@ -1442,6 +1489,30 @@
        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());
        }


        /// <summary>
        /// 检测行政物品是否重复
        /// </summary>
        /// <param name="Name"></param>
        /// <param name="Keyid"></param>
        /// <returns></returns>
        public int IsExitsGongzuoneirongName(string Name, string Keyid,string txtCarNumbera)
        {
            return bll_OA_GongzuoneirongBLL.IsExitsName(Name.ToInt32(), Keyid.ToInt32(), txtCarNumbera);
        }

        #endregion
@@ -1706,12 +1777,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;