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

username@email.com

2025-11-21 50d433602441964d905abe6e516ad258ba66627d

送货单修改这几个地方，第一个，那个表格最上面那根线条和左边那根线条看粗细不一致，太细了，
感觉像打出来像断笔画。这是一个。第二个，
中间空的太多。我刚才打印打了两张送货单，他都打印的是两页，
相当于说跳了一行一行空白的第二页，第二页是白字的嘛，中间空的太多，中间不空那么多。
好，第三，那个左右的页边距，你们可能只有。

右边可能只有这个7mm，左边可能只有10mm左右，
都留个1点1.5公分，15mm，
好，马上再调。

好，还有一个就是那个送货人和送货时间使劲往右边移，哎，签到字就行了。
大概在对到32开纯拼本儿那个位置嘛，再一两个作业本儿的那个空空。使劲往右边移。

完成

查询条件中增加“送货状态”，同查看送货情况中的状态一样，默认也一样

 CY_ECommercePlatform/AbstractFactory/Factory.cs

@@ -278,6 +278,8 @@
            OBJECT_PATH.Add(DALInterface.IOA_ShebeiManageDAL, "OA_ShebeiManageDAL");
            OBJECT_PATH.Add(DALInterface.IOA_ShebeiWeixiuDAL, "OA_ShebeiWeixiuDAL");
            OBJECT_PATH.Add(DALInterface.IOA_GongzuozhizeDAL, "OA_GongzuozhizeDAL");
            OBJECT_PATH.Add(DALInterface.IOA_GongzuoneirongCateDAL, "OA_GongzuoneirongCateDAL");
            OBJECT_PATH.Add(DALInterface.IOA_GongzuoneirongDAL, "OA_GongzuoneirongDAL"); 
            OBJECT_PATH.Add(DALInterface.IOA_KaipiaonewDAL, "OA_KaipiaonewDAL");
            OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderDAL, "CoreCmsPlanOrderDAL");
            OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderItemDAL, "CoreCmsPlanOrderItemDAL");
@@ -986,6 +988,18 @@


        /// <summary>
        /// 工作内容分类
        /// </summary>
        IOA_GongzuoneirongCateDAL = 1951,

        /// <summary>
        /// 工作内容
        /// </summary>
        IOA_GongzuoneirongDAL = 1952,
        


        /// <summary>
        /// 开票申请
        /// </summary>
        IOA_KaipiaonewDAL = 1932,

 CY_ECommercePlatform/CY.BLL/CY.BLL.csproj

@@ -178,11 +178,13 @@
    <Compile Include="OA\OA_DocumentDicBLL.cs" />
    <Compile Include="OA\OA_DriverRecordBLL.cs" />
    <Compile Include="OA\OA_FukuanshenqingBLL.cs" />
    <Compile Include="OA\OA_GongzuoneirongBLL.cs" />
    <Compile Include="OA\OA_KaipiaoJineQuerenBLL.cs" />
    <Compile Include="OA\OA_KaipiaonewBLL.cs" />
    <Compile Include="OA\OA_KaipiaonewcuishouBLL.cs" />
    <Compile Include="OA\OA_KaipiaonewhuikuanBLL.cs" />
    <Compile Include="OA\OA_KaipiaoshenqingBLL.cs" />
    <Compile Include="OA\OA_GongzuoneirongCateBLL.cs" />
    <Compile Include="OA\OA_ShebeiCateBLL.cs" />
    <Compile Include="OA\OA_PropertyCateBLL.cs" />
    <Compile Include="OA\OA_GongzuozhizeBLL.cs" />

 CY_ECommercePlatform/CY.BLL/OA/OA_GongzuoneirongBLL.cs

New file
@@ -0,0 +1,110 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using CY.IDAL;
using CY.Model;
using AbstractFactory;
using CY.IBaseDAL;
using CY.Infrastructure.DESEncrypt;
using CY.Infrastructure.Query;

namespace CY.BLL
{
    public class OA_GongzuoneirongBLL
    {
        IOA_GongzuoneirongDAL iOA_GongzuoneirongDAL = null;

        public OA_GongzuoneirongBLL()
        {
            iOA_GongzuoneirongDAL = Factory.GetDALByInterfaceName(DALInterface.IOA_GongzuoneirongDAL) as IOA_GongzuoneirongDAL;
        }

        /// <summary>
        /// 添加
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public bool InsertModel(Model.OA_Gongzuoneirong model)
        {
            return iOA_GongzuoneirongDAL.InserModel(model);
        }

        /// <summary>
        /// 更新
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public bool UpdateModel(Model.OA_Gongzuoneirong model)
        {

            return iOA_GongzuoneirongDAL.UpdateModel(model);
        }

        /// <summary>
        /// 删除
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public bool DeleteModel(Model.OA_Gongzuoneirong model)
        {

            return iOA_GongzuoneirongDAL.DeleteModel(model);
        }

        /// <summary>
        /// 根据编号获得信息
        /// </summary>
        /// <param name="Keyid">编号</param>
        /// <returns></returns>
        public OA_Gongzuoneirong GetModelByKeyid(int? Keyid)
        {
            return iOA_GongzuoneirongDAL.GetModelByKeyid(Keyid);
        }

        /// <summary>
        /// 获取物品分类
        /// </summary>
        /// <param name="_MemberId"></param>
        /// <returns></returns>
        public IEnumerable<Model.OA_GongzuoneirongCate> GetDataByType(Guid _MemberId)
        {
            return iOA_GongzuoneirongDAL.GetDataByType(_MemberId);
        }

        /// <summary>
        /// 分页查询
        /// </summary>
        /// <param name="pagination"></param>
        /// <returns></returns>
        public IEnumerable<Model.OA_Gongzuoneirong> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid _MemberId, string Gongzuozhize, int? Zerenren)
        {
            return iOA_GongzuoneirongDAL.SelectModelPage(pagination, _MemberId, Gongzuozhize, Zerenren);
        }


        /// <summary>
        /// 查询全部
        /// </summary>
        /// <param name="pagination"></param>
        /// <returns></returns>
        public IEnumerable<Model.OA_Gongzuoneirong> SelectAllModel(Query query)
        {
            return iOA_GongzuoneirongDAL.SelectAllModel( query);
        }

        /// <summary>
        /// 检测物品是否重复
        /// </summary>
        /// <param name="Name"></param>
        /// <param name="MemberId"></param>
        /// <param name="Keyid"></param>
        /// <returns></returns>
        public int IsExitsName(int? Zerenren, int? Keyid, string neirong)
        {
            return iOA_GongzuoneirongDAL.IsExitsName( Zerenren, Keyid, neirong);
        }

        
    }
}

 CY_ECommercePlatform/CY.BLL/OA/OA_GongzuoneirongCateBLL.cs

New file
@@ -0,0 +1,87 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using CY.IDAL;
using CY.Model;
using AbstractFactory;
using CY.IBaseDAL;
using CY.Infrastructure.DESEncrypt;
using CY.Infrastructure.Query;

namespace CY.BLL
{
    public class OA_GongzuoneirongCateBLL
    {
        IOA_GongzuoneirongCateDAL iOA_GongzuoneirongCateDAL = null;

        public OA_GongzuoneirongCateBLL()
        {
            iOA_GongzuoneirongCateDAL = Factory.GetDALByInterfaceName(DALInterface.IOA_GongzuoneirongCateDAL) as IOA_GongzuoneirongCateDAL;
        }

        /// <summary>
        /// 添加
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public bool InsertModel(Model.OA_GongzuoneirongCate model)
        {
            return iOA_GongzuoneirongCateDAL.InserModel(model);
        }

        /// <summary>
        /// 更新
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public bool UpdateModel(Model.OA_GongzuoneirongCate model)
        {

            return iOA_GongzuoneirongCateDAL.UpdateModel(model);
        }

        /// <summary>
        /// 删除
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public bool DeleteModel(Model.OA_GongzuoneirongCate model)
        {

            return iOA_GongzuoneirongCateDAL.DeleteModel(model);
        }

        /// <summary>
        /// 根据编号获得信息
        /// </summary>
        /// <param name="Keyid">编号</param>
        /// <returns></returns>
        public OA_GongzuoneirongCate GetModelByKeyid(int? Keyid)
        {
            return iOA_GongzuoneirongCateDAL.GetModelByKeyid(Keyid);
        }

        /// <summary>
        /// 分页查询
        /// </summary>
        /// <param name="pagination"></param>
        /// <returns></returns>
        public IEnumerable<Model.OA_GongzuoneirongCate> SelectModelPage(Infrastructure.Query.Pagination pagination,Guid _MemberId,string _Name,int? _Status,DateTime? _BeginLastUpdateTime,DateTime? _EndLastUpdateTime,string _Operator,string _Remark)
        {
            return iOA_GongzuoneirongCateDAL.SelectModelPage(pagination, _MemberId, _Name, _Status,_BeginLastUpdateTime,_EndLastUpdateTime, _Operator, _Remark);
        }

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

 CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj

@@ -169,10 +169,12 @@
    <Compile Include="OA\IOA_DeliverPlanPaicheDAL.cs" />
    <Compile Include="OA\IOA_DriverRecordDAL.cs" />
    <Compile Include="OA\IOA_FukuanshenqingDAL.cs" />
    <Compile Include="OA\IOA_GongzuoneirongDAL.cs" />
    <Compile Include="OA\IOA_KaipiaoJineQuerenDAL.cs" />
    <Compile Include="OA\IOA_KaipiaonewcuishouDAL.cs" />
    <Compile Include="OA\IOA_KaipiaonewDAL.cs" />
    <Compile Include="OA\IOA_KipiaoshenqingDAL.cs" />
    <Compile Include="OA\IOA_GongzuoneirongCateDAL.cs" />
    <Compile Include="OA\IOA_ShebeiCateDAL.cs" />
    <Compile Include="OA\IOA_GongzuozhizeDAL.cs" />
    <Compile Include="OA\IOA_ShebeiWeixiuDAL.cs" />

 CY_ECommercePlatform/CY.IDAL/OA/IOA_GongzuoneirongCateDAL.cs

New file
@@ -0,0 +1,38 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using CY.IBaseDAL;
using CY.Model;

namespace CY.IDAL
{
    /// <summary>
    ///行政物品分类-数据库操作接口
    /// </summary>
    public interface IOA_GongzuoneirongCateDAL : ICommonDAL, IPaging<OA_GongzuoneirongCate>, IGetAllModel<OA_GongzuoneirongCate>
    {
        /// <summary>
        /// 根据编号获得信息
        /// </summary>
        /// <param name="Keyid">编号</param>
        /// <returns></returns>
        OA_GongzuoneirongCate GetModelByKeyid(int? Keyid);

        /// <summary>
        /// 分页查询
        /// </summary>
        /// <param name="pagination"></param>
        /// <returns></returns>
        IEnumerable<Model.OA_GongzuoneirongCate> SelectModelPage(Infrastructure.Query.Pagination pagination,Guid _MemberId,string _Name,int? _Status,DateTime? _BeginLastUpdateTime,DateTime? _EndLastUpdateTime,string _Operator,string _Remark);

        /// <summary>
        /// 检测物品分类是否重复
        /// </summary>
        /// <param name="Name"></param>
        /// <param name="MemberId"></param>
        /// <param name="Keyid"></param>
        /// <returns></returns>
        int IsExitsName(string Name, Guid MemberId, string Keyid);
    }
}

 CY_ECommercePlatform/CY.IDAL/OA/IOA_GongzuoneirongDAL.cs

New file
@@ -0,0 +1,48 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using CY.IBaseDAL;
using CY.Model;

namespace CY.IDAL
{
    /// <summary>
    ///行政物品管理-数据库操作接口
    /// </summary>
    public interface IOA_GongzuoneirongDAL : ICommonDAL, IPaging<OA_Gongzuoneirong>, IGetAllModel<OA_Gongzuoneirong>
    {
        /// <summary>
        /// 根据编号获得信息
        /// </summary>
        /// <param name="Keyid">编号</param>
        /// <returns></returns>
        OA_Gongzuoneirong GetModelByKeyid(int? Keyid);

        /// <summary>
        /// 分页查询
        /// </summary>
        /// <param name="pagination"></param>
        /// <returns></returns>
        IEnumerable<Model.OA_Gongzuoneirong> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid _MemberId,  string Gongzuozhize, int? Zerenren);

        /// <summary>
        /// 检测责任人是否重复
        /// </summary>
        /// <param name="Name"></param>
        /// <param name="MemberId"></param>
        /// <param name="Keyid"></param>
        /// <returns></returns>
        int IsExitsName( int? Zerenren, int? Keyid, string neirong);


        /// <summary>
        /// 获取物品分类
        /// </summary>
        /// <param name="_MemberId"></param>
        /// <returns></returns>
        IEnumerable<Model.OA_GongzuoneirongCate> GetDataByType(Guid _MemberId);


    }
}

 CY_ECommercePlatform/CY.Model/CY.Model.csproj

@@ -240,6 +240,7 @@
    <Compile Include="OA\OA_FirmRole.cs" />
    <Compile Include="OA\OA_FirmRolePermissionsRel.cs" />
    <Compile Include="OA\OA_Fukuanshenqing.cs" />
    <Compile Include="OA\OA_Gongzuoneirong.cs" />
    <Compile Include="OA\OA_GoodsInfo.cs" />
    <Compile Include="OA\OA_IntentionCustomer.cs" />
    <Compile Include="OA\OA_IntentionCustomerExtend.cs" />
@@ -253,6 +254,7 @@
    <Compile Include="OA\OA_OrderWorkListRelation.cs" />
    <Compile Include="OA\OA_OutOfStorage.cs" />
    <Compile Include="OA\OA_Procurement.cs" />
    <Compile Include="OA\OA_GongzuoneirongCate.cs" />
    <Compile Include="OA\OA_ShebeiCate.cs" />
    <Compile Include="OA\OA_PropertyCate.cs" />
    <Compile Include="OA\OA_Gongzuozhize.cs" />

 CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrder.cs

@@ -252,6 +252,16 @@

        public int? Bianhao { get; set; }


        /// <summary>
        /// 编号
        /// </summary>


        public int? DeliverState { get; set; }



        #endregion Model

        #region Visiter
@@ -407,6 +417,12 @@
                this.Bianhao = isChange ? MyConvert.ConvertToInt32(value) : Bianhao;
                theValue = this.Bianhao;
            }

            else if ("DeliverState".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 23)
            {
                this.DeliverState = isChange ? MyConvert.ConvertToInt32(value) : DeliverState;
                theValue = this.DeliverState;
            }
            

            return theValue;

 CY_ECommercePlatform/CY.Model/OA/OA_Gongzuoneirong.cs

New file
@@ -0,0 +1,111 @@
using System;
using CY.Infrastructure.Domain;
using CY.Infrastructure.Common;
namespace CY.Model
{
    /// <summary>
    ///行政物品管理
    /// </summary>
    [Serializable]
    public partial class OA_Gongzuoneirong : IAggregateRoot
    {
        public OA_Gongzuoneirong()
        {
        }
        #region Model
       


        public int? Keyid { get; set; }
        public Guid? MemberId { get; set; }
        public string Gongzuozhize { get; set; }

        

        public int? Zerenren { get; set; }

        public string ZerenrenName { get; set; }

        public DateTime? LastUpdateTime { get; set; }


        public string Updator { get; set; }

        public DateTime? CreateTime { get; set; }


        public string Creator { get; set; }



        #endregion Model

        #region Visiter
        /// <summary>
        /// 属性访问器
        /// </summary>
        /// <param name="name">属性名</param>
        /// <param name="index">索引</param>
        /// <param name="isChange">是否将指定属性设置为传入值</param>
        /// <param name="value">需要赋予的值</param>
        /// <returns>与名称对应的属性值</returns>
        public object Visiter(string name, int? index = -1, bool isChange = false, object value = null)
        {
            object theValue = null;
            if ("Keyid".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 1)
            {
                this.Keyid = isChange ? MyConvert.ConvertToInt(value) : Keyid;
                theValue = this.Keyid;
            }
            else if ("MemberId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 2)
            {
                this.MemberId = isChange ? MyConvert.ConvertToGuid(value) : MemberId;
                theValue = this.MemberId;
            }
            else if ("Gongzuozhize".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 4)
            {
                this.Gongzuozhize = isChange ? MyConvert.ConvertToString(value) : Gongzuozhize;
                theValue = this.Gongzuozhize;
            }

            else if ("Zerenren".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 16)
            {
                this.Zerenren = isChange ? MyConvert.ConvertToInt(value) : Zerenren;
                theValue = this.Zerenren;
            }


            else if ("ZerenrenName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 17)
            {
                this.ZerenrenName = isChange ? MyConvert.ConvertToString(value) : ZerenrenName;
                theValue = this.ZerenrenName;
            }


            else if ("LastUpdateTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 9)
            {
                this.LastUpdateTime = isChange ? MyConvert.ConvertToDateTime(value) : LastUpdateTime;
                theValue = this.LastUpdateTime;
            }
            else if ("Updator".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 10)
            {
                this.Updator = isChange ? MyConvert.ConvertToString(value) : Updator;
                theValue = this.Updator;
            }
            else if ("CreateTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 9)
            {
                this.CreateTime = isChange ? MyConvert.ConvertToDateTime(value) : CreateTime;
                theValue = this.CreateTime;
            }
            else if ("Creator".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 10)
            {
                this.Creator = isChange ? MyConvert.ConvertToString(value) : Creator;
                theValue = this.Creator;
            }


            return theValue;
        }
        #endregion Visiter
    }
}

 CY_ECommercePlatform/CY.Model/OA/OA_GongzuoneirongCate.cs

New file
@@ -0,0 +1,131 @@
using System;
using CY.Infrastructure.Domain;
using CY.Infrastructure.Common;
namespace CY.Model{
        /// <summary>
     ///行政物品分类
     /// </summary>
        [Serializable]
    public partial class OA_GongzuoneirongCate : IAggregateRoot
    {
         public OA_GongzuoneirongCate()
        { }
         #region Model
                   private int? _keyid;    
                private Guid _memberid;    
                private string _name;    
                private int? _status;    
                private DateTime? _lastupdatetime;    
                private string _operator;    
                private string _remark;    
				
          /// <summary>
        /// 主键
        /// </summary>		
        public int? Keyid
        {
            get{ return _keyid; }
            set{ _keyid = value; }
        }        
        /// <summary>
        /// 会员编号
        /// </summary>		
        public Guid MemberId
        {
            get{ return _memberid; }
            set{ _memberid = value; }
        }        
        /// <summary>
        /// 名称
        /// </summary>		
        public string Name
        {
            get{ return _name; }
            set{ _name = value; }
        }        
        /// <summary>
        /// 状态
        /// </summary>		
        public int? Status
        {
            get{ return _status; }
            set{ _status = value; }
        }        
        /// <summary>
        /// 最后修改时间
        /// </summary>		
        public DateTime? LastUpdateTime
        {
            get{ return _lastupdatetime; }
            set{ _lastupdatetime = value; }
        }        
        /// <summary>
        /// 操作人
        /// </summary>		
        public string Operator
        {
            get{ return _operator; }
            set{ _operator = value; }
        }        
        /// <summary>
        /// 备注
        /// </summary>		
        public string Remark
        {
            get{ return _remark; }
            set{ _remark = value; }
        }        
                #endregion Model

        #region Visiter
        /// <summary>
        /// 属性访问器
        /// </summary>
        /// <param name="name">属性名</param>
        /// <param name="index">索引</param>
        /// <param name="isChange">是否将指定属性设置为传入值</param>
        /// <param name="value">需要赋予的值</param>
        /// <returns>与名称对应的属性值</returns>
        public object Visiter(string name, int? index = -1, bool isChange = false, object value = null)
        {
            object theValue = null;
              if ("Keyid".Equals(name,StringComparison.CurrentCultureIgnoreCase) || index == 1)
            { 
                this.Keyid = isChange ? MyConvert.ConvertToInt(value) : Keyid;
                theValue = this.Keyid;
            }       
         else if ("MemberId".Equals(name,StringComparison.CurrentCultureIgnoreCase) || index == 2)
            { 
                this.MemberId = isChange ? MyConvert.ConvertToGuid(value) : MemberId;
                theValue = this.MemberId;
            }       
         else if ("Name".Equals(name,StringComparison.CurrentCultureIgnoreCase) || index == 3)
            { 
                this.Name = isChange ? MyConvert.ConvertToString(value) : Name;
                theValue = this.Name;
            }       
         else if ("Status".Equals(name,StringComparison.CurrentCultureIgnoreCase) || index == 4)
            { 
                this.Status = isChange ? MyConvert.ConvertToInt(value) : Status;
                theValue = this.Status;
            }       
         else if ("LastUpdateTime".Equals(name,StringComparison.CurrentCultureIgnoreCase) || index == 5)
            { 
                this.LastUpdateTime = isChange ? MyConvert.ConvertToDateTime(value) : LastUpdateTime;
                theValue = this.LastUpdateTime;
            }       
         else if ("Operator".Equals(name,StringComparison.CurrentCultureIgnoreCase) || index == 6)
            { 
                this.Operator = isChange ? MyConvert.ConvertToString(value) : Operator;
                theValue = this.Operator;
            }       
         else if ("Remark".Equals(name,StringComparison.CurrentCultureIgnoreCase) || index == 7)
            { 
                this.Remark = isChange ? MyConvert.ConvertToString(value) : Remark;
                theValue = this.Remark;
            }       
                    return theValue;
        }
        #endregion Visiter
}
}

 CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj

@@ -193,11 +193,13 @@
    <Compile Include="OA\OA_DocumentDicDAL.cs" />
    <Compile Include="OA\OA_DriverRecordDAL.cs" />
    <Compile Include="OA\OA_FukuanshenqingDAL.cs" />
    <Compile Include="OA\OA_GongzuoneirongDAL.cs" />
    <Compile Include="OA\OA_KaipiaoJineQuerenDAL.cs" />
    <Compile Include="OA\OA_KaipiaonewcuishouDAL.cs" />
    <Compile Include="OA\OA_KaipiaonewDAL.cs" />
    <Compile Include="OA\OA_KaipiaonewhuikuanDAL.cs" />
    <Compile Include="OA\OA_KipiaoshenqingDAL.cs" />
    <Compile Include="OA\OA_GongzuoneirongCateDAL.cs" />
    <Compile Include="OA\OA_ShebeiCateDAL.cs" />
    <Compile Include="OA\OA_PropertyCateDAL.cs" />
    <Compile Include="OA\OA_GongzuozhizeDAL.cs" />

 CY_ECommercePlatform/CY.SQLDAL/OA/OA_GongzuoneirongCateDAL.cs

New file
@@ -0,0 +1,232 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using CY.IDAL;
using System.Data.SqlClient;
using System.Data;
using CY.Model;
using System.Transactions;
namespace CY.SQLDAL
{
         //行政物品分类
        public class OA_GongzuoneirongCateDAL:IOA_GongzuoneirongCateDAL
    {
         private Database _dataBase = null;

        public OA_GongzuoneirongCateDAL()
        {
            _dataBase = new Database();
        }
        
        public OA_GongzuoneirongCateDAL(Database dataBase)
        {
            _dataBase = dataBase;
        }
	
        /// <summary>
        /// 新增
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
        {
            Model.OA_GongzuoneirongCate trueModel = model as Model.OA_GongzuoneirongCate;
            if (trueModel == null)
            {
                return false;
            }
            IList<SqlParameter> sqlParms = new List<SqlParameter>()
            {                new SqlParameter("@MemberId", trueModel.MemberId) ,            
                            new SqlParameter("@Name", trueModel.Name) ,            
                            new SqlParameter("@Status", trueModel.Status) ,            
                            new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,            
                            new SqlParameter("@Operator", trueModel.Operator) ,            
                            new SqlParameter("@Remark", trueModel.Remark)             
                     };
            string sql = "Insert Into OA_GongzuoneirongCate ([MemberId],[Name],[Status],[LastUpdateTime], [Operator])"
                                             + " Values (@MemberId,@Name,@Status, @LastUpdateTime, @Operator )";

            try
            {
                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
            }
            catch (Exception ex)
            {
                throw ex;
            }
            return true;
        }
		
        /// <summary>
        /// 修改
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public bool UpdateModel(Infrastructure.Domain.IAggregateRoot model)
        {
            Model.OA_GongzuoneirongCate trueModel = model as Model.OA_GongzuoneirongCate;
            if (trueModel == null)
            {
                return false;
            }
            IList<SqlParameter> sqlParms = new List<SqlParameter>()
            {                new SqlParameter("@Keyid", trueModel.Keyid) ,            
                            new SqlParameter("@MemberId", trueModel.MemberId) ,            
                            new SqlParameter("@Name", trueModel.Name) ,            
                            new SqlParameter("@Status", trueModel.Status) ,            
                            new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,            
                            new SqlParameter("@Operator", trueModel.Operator) ,            
                            new SqlParameter("@Remark", trueModel.Remark)             
                     };
            string sql = "Update OA_GongzuoneirongCate Set [MemberId]=@MemberId,[Name]=@Name,[Status]=@Status, [LastUpdateTime]=@LastUpdateTime, [Operator]=@Operator,[Remark]=@Remark  where [Keyid] =@Keyid ";

            try
            {
                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
            }
            catch (Exception ex)
            {
                throw ex;
            }
            return true;
        }
		
        /// <summary>
        /// 删除
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public bool DeleteModel(Infrastructure.Domain.IAggregateRoot model)
        {
            Model.OA_GongzuoneirongCate trueModel = model as Model.OA_GongzuoneirongCate;
            if (trueModel == null)
            {
                return false;
            }
            IList<SqlParameter> sqlParms = new List<SqlParameter>()
                {
                    new SqlParameter("@Keyid",trueModel.Keyid)
                };
            string sql = "Delete OA_GongzuoneirongCate Where [Keyid] = @Keyid ";


            try
            {
                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
            }
            catch (Exception ex)
            {
                throw ex;
            }

            return true;
        }
         
        /// <summary>
        /// 分页查询
        /// </summary>
        /// <param name="query"></param>
        /// <param name="pagination"></param>
        /// <returns></returns>
        public IEnumerable<Model.OA_GongzuoneirongCate> SelectModelPage(Infrastructure.Query.Query query, Infrastructure.Query.Pagination pagination)
        {
            throw new NotImplementedException();
        }

        /// <summary>
        /// 单个查询
        /// </summary>
        /// <param name="query"></param>
        /// <returns></returns>
        public IEnumerable<Model.OA_GongzuoneirongCate> SelectAllModel(Infrastructure.Query.Query query)
        {
            throw new NotImplementedException();
        }

        /// <summary>
        /// 根据编号获得信息
        /// </summary>
        /// <param name="Keyid">编号</param>
        /// <returns></returns>
        public OA_GongzuoneirongCate GetModelByKeyid(int? Keyid)
        {
            try
            {
                if (Keyid == null || Keyid < 0)
                    return null;//错误数据返会空 

                IList<OA_GongzuoneirongCate> result = _dataBase.SelectModel<OA_GongzuoneirongCate>(" * ", " OA_GongzuoneirongCate ", string.Format(" Keyid='{0}'", Keyid)) as IList<OA_GongzuoneirongCate>;//执行查询

                return (null == result || result.Count == 0) ? null : result[0];//返回结果
            }
            catch (Exception ex)
            {
                throw ex;
            }
        }
        
        /// <summary>
        /// 分页查询
        /// </summary>
        /// <param name="pagination"></param>
        /// <returns></returns>
        public IEnumerable<Model.OA_GongzuoneirongCate> SelectModelPage(Infrastructure.Query.Pagination pagination,Guid _MemberId,string _Name,int? _Status,DateTime? _BeginLastUpdateTime,DateTime? _EndLastUpdateTime,string _Operator,string _Remark)
        {
            try
            {
                string condition = " 1=1 ";
                 
                        if (_MemberId != Guid.Empty)
                        condition += " and MemberId = '" + _MemberId + "'";
             
                        if (!string.IsNullOrEmpty(_Name))
                        condition += " and Name = '" + _Name + "'";
             
                        if (_Status.HasValue)
                        condition += " and Status = '" + _Status + "'";
             
                            if (_BeginLastUpdateTime.HasValue)
                    condition += string.Format(" and CAST(LastUpdateTime AS DATE) >='{0}'", _BeginLastUpdateTime);

                if (_EndLastUpdateTime.HasValue)
                    condition += string.Format(" and CAST(LastUpdateTime AS DATE) <='{0}'", _EndLastUpdateTime);
             
                        if (!string.IsNullOrEmpty(_Operator))
                        condition += " and Operator = '" + _Operator + "'";
             
                        if (!string.IsNullOrEmpty(_Remark))
                        condition += " and Remark = '" + _Remark + "'";
            
                return _dataBase.SelectModelPage<Model.OA_GongzuoneirongCate>(pagination, " * ", " OA_GongzuoneirongCate ", " Keyid desc", " Keyid desc ", condition);
            }
            catch (Exception ex)
            {
                throw ex;
            }
        }

        /// <summary>
        /// 检测物品分类是否重复
        /// </summary>
        /// <param name="Name"></param>
        /// <param name="MemberId"></param>
        /// <param name="Keyid"></param>
        /// <returns></returns>
        public int IsExitsName(string Name, Guid MemberId, string Keyid)
        {
            try
            {
                IList<OA_CarManage> result = _dataBase.SelectModel<OA_CarManage>("*", "OA_GongzuoneirongCate", " Name = '" + Name + "' and MemberId ='" + MemberId + "' and Keyid <> '" + Keyid + "'") as IList<OA_CarManage>;//执行查询
                if (null == result || result.Count == 0)
                    return 0;
                else
                    return 1;
            }
            catch (Exception ex)
            {
                throw ex;
            }
        }
    }
}

 CY_ECommercePlatform/CY.SQLDAL/OA/OA_GongzuoneirongDAL.cs

New file
@@ -0,0 +1,272 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using CY.IDAL;
using System.Data.SqlClient;
using System.Data;
using CY.Model;
using System.Transactions;
namespace CY.SQLDAL
{
    //行政物品管理
    public class OA_GongzuoneirongDAL : IOA_GongzuoneirongDAL
    {
        private Database _dataBase = null;

        public OA_GongzuoneirongDAL()
        {
            _dataBase = new Database();
        }

        public OA_GongzuoneirongDAL(Database dataBase)
        {
            _dataBase = dataBase;
        }

        /// <summary>
        /// 新增
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
        {
            Model.OA_Gongzuoneirong trueModel = model as Model.OA_Gongzuoneirong;
            if (trueModel == null)
            {
                return false;
            }
           

            IList<SqlParameter> sqlParms = new List<SqlParameter>()
            {               new SqlParameter("@MemberId", trueModel.MemberId) ,
                            new SqlParameter("@Gongzuozhize", trueModel.Gongzuozhize) ,
                                        new SqlParameter("@Zerenren",trueModel.Zerenren.HasValue?trueModel.Zerenren.Value:0 ) ,
                                            new SqlParameter("@ZerenrenName", string.IsNullOrEmpty(trueModel.ZerenrenName)?"":trueModel.ZerenrenName) ,


          new SqlParameter("@CreateTime", trueModel.CreateTime) ,
                            new SqlParameter("@Creator", trueModel.Creator) ,

                            new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,
                            new SqlParameter("@Updator", trueModel.Updator) ,

                     };
            string sql = "Insert Into OA_Gongzuoneirong ([MemberId],[Gongzuozhize],[Zerenren],[ZerenrenName],[CreateTime],[Creator],[LastUpdateTime],[Updator])"
                                            + " Values (@MemberId,@Gongzuozhize,@Zerenren,@ZerenrenName,@CreateTime,@Creator,@LastUpdateTime,@Updator )";

            try
            {
                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
            }
            catch (Exception ex)
            {
                throw ex;
            }
            return true;
        }

        /// <summary>
        /// 修改
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public bool UpdateModel(Infrastructure.Domain.IAggregateRoot model)
        {
            Model.OA_Gongzuoneirong trueModel = model as Model.OA_Gongzuoneirong;
            if (trueModel == null)
            {
                return false;
            }
            

            IList<SqlParameter> sqlParms = new List<SqlParameter>()
            {                new SqlParameter("@Keyid", trueModel.Keyid) ,
                             new SqlParameter("@MemberId", trueModel.MemberId) ,
                            new SqlParameter("@Gongzuozhize", trueModel.Gongzuozhize) ,
                                        new SqlParameter("@Zerenren",trueModel.Zerenren.HasValue?trueModel.Zerenren.Value:0 ) ,
                                            new SqlParameter("@ZerenrenName", string.IsNullOrEmpty(trueModel.ZerenrenName)?"":trueModel.ZerenrenName) ,


          

                            new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,
                            new SqlParameter("@Updator", trueModel.Updator) ,
                     };
            string sql = "Update OA_Gongzuoneirong Set [MemberId]=@MemberId,[Gongzuozhize]=@Gongzuozhize,[Zerenren]=@Zerenren,[ZerenrenName]=@ZerenrenName, [LastUpdateTime]=@LastUpdateTime, [Updator]=@Updator  where [Keyid] =@Keyid ";

            try
            {
                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
            }
            catch (Exception ex)
            {
                throw ex;
            }
            return true;
        }

        /// <summary>
        /// 删除
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public bool DeleteModel(Infrastructure.Domain.IAggregateRoot model)
        {
            Model.OA_Gongzuoneirong trueModel = model as Model.OA_Gongzuoneirong;
            if (trueModel == null)
            {
                return false;
            }
            IList<SqlParameter> sqlParms = new List<SqlParameter>()
                {
                    new SqlParameter("@Keyid",trueModel.Keyid)
                };
            string sql = "Delete OA_Gongzuoneirong Where [Keyid] = @Keyid ";


            try
            {
                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
            }
            catch (Exception ex)
            {
                throw ex;
            }

            return true;
        }

        /// <summary>
        /// 分页查询
        /// </summary>
        /// <param name="query"></param>
        /// <param name="pagination"></param>
        /// <returns></returns>
        public IEnumerable<Model.OA_Gongzuoneirong> SelectModelPage(Infrastructure.Query.Query query, Infrastructure.Query.Pagination pagination)
        {
            throw new NotImplementedException();
        }

        /// <summary>
        /// 单个查询
        /// </summary>
        /// <param name="query"></param>
        /// <returns></returns>
        public IEnumerable<Model.OA_Gongzuoneirong> SelectAllModel(Infrastructure.Query.Query query)
        {
            return _dataBase.SelectModel<Model.OA_Gongzuoneirong>(" * ", " OA_Gongzuoneirong ") as IList<Model.OA_Gongzuoneirong>;//执行查询
        }

        /// <summary>
        /// 根据编号获得信息
        /// </summary>
        /// <param name="Keyid">编号</param>
        /// <returns></returns>
        public OA_Gongzuoneirong GetModelByKeyid(int? Keyid)
        {
            try
            {
                if (Keyid == null || Keyid < 0)
                    return null;//错误数据返会空 

                IList<OA_Gongzuoneirong> result = _dataBase.SelectModel<OA_Gongzuoneirong>(" * ", " OA_Gongzuoneirong ", string.Format(" Keyid='{0}'", Keyid)) as IList<OA_Gongzuoneirong>;//执行查询

                return (null == result || result.Count == 0) ? null : result[0];//返回结果
            }
            catch (Exception ex)
            {
                throw ex;
            }
        }


        /// <summary>
        /// 获取物品分类
        /// </summary>
        /// <param name="_MemberId"></param>
        /// <returns></returns>
        public IEnumerable<Model.OA_GongzuoneirongCate> GetDataByType(Guid _MemberId)
        {
            try
            {
                string condition = " 1=1 ";

                if (_MemberId != Guid.Empty)
                    condition += " and MemberId = '" + _MemberId + "'";

                return _dataBase.SelectModel<Model.OA_GongzuoneirongCate>(" * ", " OA_GongzuoneirongCate ", condition);
            }
            catch (Exception ex)
            {
                throw ex;
            }
        }

        /// <summary>
        /// 分页查询
        /// </summary>
        /// <param name="pagination"></param>
        /// <returns></returns>
        public IEnumerable<Model.OA_Gongzuoneirong> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid _MemberId, string Gongzuozhize, int? Zerenren)
        {
            try
            {
                string condition = " 1=1 ";

                if (_MemberId != Guid.Empty)
                    condition += " and a.MemberId = '" + _MemberId + "'";

                 

                if (!string.IsNullOrEmpty(Gongzuozhize))
                    condition += " and a.Gongzuozhize like '%" + Gongzuozhize + "%'";

                if (Zerenren.HasValue)
                    condition += " and a.Zerenren = '" + Zerenren + "'";

              

                return _dataBase.SelectModelPage<Model.OA_Gongzuoneirong>(pagination, " a.*  ", " OA_Gongzuoneirong a ", " a.Zerenren", " Zerenren ", condition);
            }
            catch (Exception ex)
            {
                throw ex;
            }
        }

        /// <summary>
        /// 检测物品是否重复
        /// </summary>
        /// <param name="Name"></param>
        /// <param name="MemberId"></param>
        /// <param name="Keyid"></param>
        /// <returns></returns>
        public int IsExitsName(int? Zerenren, int? Keyid, string neirong)
        {
            try
            {
                string where = " Zerenren = " + Zerenren + " and Gongzuozhize='"+ neirong + "'";

                if (Keyid.HasValue)
                {
                    where += " and Keyid <> " + Keyid + " ";
                }

                IList<OA_CarManage> result = _dataBase.SelectModel<OA_CarManage>("*", "OA_Gongzuoneirong", where) as IList<OA_CarManage>;//执行查询
                if (null == result || result.Count == 0)
                    return 0;
                else
                    return 1;
            }
            catch (Exception ex)
            {
                throw ex;
            }
        }

        

         
    }
}

 CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj

@@ -2819,6 +2819,8 @@
    <Content Include="Pages\work\BaoxiaoFukuanList.aspx" />
    <Content Include="Pages\work\BaoxiaoPiliangReply.aspx" />
    <Content Include="Pages\work\BaoxiaoReplyList.aspx" />
    <Content Include="Pages\work\GongzuoneirongList.aspx" />
    <Content Include="Pages\work\GongzuoneirongEdit.aspx" />
    <Content Include="Pages\work\MyvisitDetail.aspx" />
    <Content Include="Pages\work\MyPlanAdd.aspx" />
    <Content Include="Pages\work\MyPlanList.aspx" />
@@ -2843,6 +2845,8 @@
    <Content Include="Pages\work\RequestReplyList.aspx" />
    <Content Include="Pages\work\GongzuozhizeList.aspx" />
    <Content Include="Pages\work\GongzuozhizeEdit.aspx" />
    <Content Include="Pages\work\GongzuoneirongCateEdit.aspx" />
    <Content Include="Pages\work\GongzuoneirongCateList.aspx" />
    <Content Include="Pages\work\WorkPlanAdd.aspx" />
    <Content Include="Pages\work\WorkPlanDetail.aspx" />
    <Content Include="Pages\work\WorkPlanList.aspx" />
@@ -9330,6 +9334,20 @@
    <Compile Include="Pages\work\BaoxiaoReplyList.aspx.designer.cs">
      <DependentUpon>BaoxiaoReplyList.aspx</DependentUpon>
    </Compile>
    <Compile Include="Pages\work\GongzuoneirongList.aspx.cs">
      <DependentUpon>GongzuoneirongList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="Pages\work\GongzuoneirongList.aspx.designer.cs">
      <DependentUpon>GongzuoneirongList.aspx</DependentUpon>
    </Compile>
    <Compile Include="Pages\work\GongzuoneirongEdit.aspx.cs">
      <DependentUpon>GongzuoneirongEdit.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="Pages\work\GongzuoneirongEdit.aspx.designer.cs">
      <DependentUpon>GongzuoneirongEdit.aspx</DependentUpon>
    </Compile>
    <Compile Include="Pages\work\MyvisitDetail.aspx.cs">
      <DependentUpon>MyvisitDetail.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -9498,6 +9516,20 @@
    <Compile Include="Pages\work\GongzuozhizeEdit.aspx.designer.cs">
      <DependentUpon>GongzuozhizeEdit.aspx</DependentUpon>
    </Compile>
    <Compile Include="Pages\work\GongzuoneirongCateEdit.aspx.cs">
      <DependentUpon>GongzuoneirongCateEdit.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="Pages\work\GongzuoneirongCateEdit.aspx.designer.cs">
      <DependentUpon>GongzuoneirongCateEdit.aspx</DependentUpon>
    </Compile>
    <Compile Include="Pages\work\GongzuoneirongCateList.aspx.cs">
      <DependentUpon>GongzuoneirongCateList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="Pages\work\GongzuoneirongCateList.aspx.designer.cs">
      <DependentUpon>GongzuoneirongCateList.aspx</DependentUpon>
    </Compile>
    <Compile Include="Pages\work\WorkPlanAdd.aspx.cs">
      <DependentUpon>WorkPlanAdd.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>

 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiAdd.aspx

@@ -168,7 +168,7 @@
                    问题描述：
                </td>
                <td style=" text-align:left;" colspan="3">
                    <textarea id="txtRemark" name="txtRemark" runat="server" style="width: 692px; height: 30px;"  maxlength="200"  class="req" ></textarea>
                    <textarea id="txtRemark" name="txtRemark" runat="server" style="width: 692px; height: 30px;"  maxlength="1000"  class="req" ></textarea>
                </td>
            </tr>
             

 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs

@@ -212,12 +212,12 @@
                    {
                        yanzheng = true;
                    }
                    var weifahuonums = weifahuonumss[i].ToInt32();
                    if(fahuo.Value > weifahuonums.Value)
                    {
                        JavaScript.MessageBox((i+1)+"行发货数量大于未发货数量", this);
                        return;
                    }
                    //var weifahuonums = weifahuonumss[i].ToInt32();
                    //if(fahuo.Value > weifahuonums.Value)
                    //{
                    //    JavaScript.MessageBox((i+1)+"行发货数量大于未发货数量", this);
                    //    return;
                    //}

                }


 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx

@@ -58,7 +58,7 @@

        //删除
        function onDele(keyid) {
            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPrint.aspx?orderId=" + keyid, Title: "打印送货单", Width: 800, Height: 900 });
            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPrint.aspx?orderId=" + keyid, Title: "打印送货单", Width: 900, Height: 900 });
        }

        //批量删除

 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx

@@ -136,15 +136,28 @@
                    <td>
                        <input id='txtxuexiao' runat="server" maxlength='50' />
                    </td>
                     <td class="ali03 " >
                    送货状态：
                </td>
                <td>
                     <select id="selstatus" keepdefaultstyle='true' runat="server" >
                            <option selected="selected" value="">全部</option>
                            <option value="0">未配送</option>
                            <option value="1">配送中</option>
                            <option value="2">已配送</option>
                        </select>
                </td>
                    <td class="ali03">
                          <asp:Button ID="btn_Submit" Text="查询" runat="server" OnClick="btn_Search_Click" />&nbsp;
                    </td>


                     </tr>
                       <tr>
                     
                    
                      
                    <td colspan="5">
                    <td colspan="6">
                       <input type="button" value='批量空白送货单' onclick="onDeles('<%=orderid %>')" /> &nbsp;<input type="button" value='批量打印送货单' onclick="onDelesdayin('<%=orderid %>')" /> 
                         <input type="hidden" runat="server" id="hideOrderId" />
                        送货人： <select keepdefaultstyle='true' id='selSonghuoren' runat="server" >

 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx.cs

@@ -69,6 +69,11 @@
            {
                coreCmsPlanOrders = coreCmsPlanOrders.Where(x => x.shipAddress.Contains(xuexiao));
            }
            var status = this.selstatus.Value.Trim().ToInt32(); ;
            if (status.HasValue)
            {
                coreCmsPlanOrders = coreCmsPlanOrders.Where(x => x.DeliverState == status);
            }




 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx.designer.cs

@@ -60,6 +60,15 @@
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtxuexiao;

        /// <summary>
        /// selstatus 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selstatus;

        /// <summary>
        /// btn_Submit 控件。
        /// </summary>
        /// <remarks>

 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx

@@ -30,19 +30,31 @@
                <ItemTemplate>
       <div class='dbody'>              
                     <style type="text/css">
        .dbody { margin: 0; margin-left: auto; margin-right: auto; }
       .dbody { margin: 0; margin-left: 0px; margin-right: 0px; width:90%; margin-left: auto; margin-right: auto;}
        .dtitle { text-align: center; font-size: 19px; font-weight: bold; margin-top: 10px; margin-bottom: 10px; }
        .dbody table { width: 100%; font-size: 12px; margin-top: 5px;  }  /* border: 1px solid #dddddd;border-top: 1px #999999 solid;*/
          .dtitlea { text-align: left; font-size: 19px;  margin-top: 10px; margin-bottom: 10px; }
        .dbody table { width: 100%; font-size: 12px; margin-top: 5px;margin-left: auto; margin-right: auto;  }  /* border: 1px solid #dddddd;border-top: 1px #999999 solid;*/
        .dbody table th, .dbody table td { font-weight: normal; height: 20px; line-height: 20px; vertical-align: middle;/* border: 1px solid #999999;*/ border-top: 0; }
        .dbody table th { background-color: #E0EDF6; font-weight: bold; }
        .dbody table td { border-left: 0; padding-left:2px; }
         .dbody table td { border-left: 0; padding-left:0px; }
        .left {text-align: left; }
        #div_tool { text-align: center; }
        #myTable {
  border-collapse: collapse; /* 确保边框融合 */
}

#myTable td, #myTable th {
  border: 1px solid black; /* 设置边框为1px纯黑 */
}

    </style>
           
                    <table border="0" cellpadding="0" cellspacing="0" style="border: 0;">
                         <tr>
                              <td class='left'colspan="8">
                             &nbsp;
                                   <div class='dtitlea'>
                                <%#Eval("Bianhao")%> </div>
                           
                        </td>
                    </tr>
                         <tr>
@@ -69,7 +81,7 @@
                    </tr>
                    <tr>
                        <td class='left' colspan="4">
                            学校：  <%#Eval("shipAddress")%> (<%#Eval("Bianhao")%>)
                            学校：<%#Eval("shipAddress")%>  
                        </td>
                         
                        <td class='left'  colspan="4">
@@ -89,14 +101,11 @@
                       
                        
                    </tr>
  <tr>
                        <td   colspan="8">
  </table>
                           <%=biaotou %>
                        </td>
                      
                    </tr>
                       

                          
                 <table border="0" cellpadding="0" cellspacing="0" style="border: 0;">          

                    <tr>
                        <td colspan='8'>
@@ -108,7 +117,7 @@
                            收货人：  &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;  &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&nbsp; &nbsp; &nbsp; &nbsp;联系电话：
                        </td>
                        <td class='left' colspan="4">
                            &nbsp; &nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
                            &nbsp; &nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;  &nbsp; &nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
                        </td>
                        <td class='left'colspan="1">
                             送货人：<%=selSonghuoren %>
@@ -119,10 +128,10 @@
                          <td class='left'colspan="3">
                           收货单位：（盖章） 
                        </td>
                         <td class='left'colspan="2">
                         <td class='left'colspan="4">
                          
                        </td>
                        <td class='left' colspan="3">
                        <td class='left' colspan="1">
                        送货时间： <%=txtBeginDate %>
                        </td>
                    </tr>
@@ -151,30 +160,18 @@
                             &nbsp;
                        </td>
                    </tr>
                        <tr>
                              <td class='left'colspan="8">
                             &nbsp;
                        </td>
                    </tr>
                        <tr>
                              <td class='left'colspan="8">
                             &nbsp;
                        </td>
                    </tr>
                        <tr>
                              <td class='left'colspan="8">
                             &nbsp;
                        </td>
                    </tr>
                        
                        
                       
                   </table>
              </div>
      <%#(Container.ItemIndex !=  (countss-1)&& ((Container.ItemIndex+1)%2==0 || selChicun == "1" ))?"<div class=\"page-break\"></div>":"" %> 
 

                </ItemTemplate>
            </asp:Repeater>
            
       
    </div>
  
    </form>
</body>
</html>

 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.cs

@@ -151,15 +151,15 @@
            {
                int i = 1;

                biaotou = "<table border=\"1\" cellpadding=\"0\" cellspacing=\"0\" style=\"border-collapse: collapse;width: 98%; \"><tr>";
                biaotou = "<table id=\"myTable\"   cellpadding=\"0\" cellspacing=\"0\" style=\"border-collapse: collapse;width: 98%; \"><tr>";
                foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
                {
                    biaotou += " <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"> " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </td> ";
                    biaotou += " <td style=\"text-align:center;height: 40px;\"> " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </td> ";


                    if (i%8==0)
                    {
                        biaotou += " </tr> <tr><td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td>  </tr>";//<td style=\"text-align:center;border: 1px solid #999999;\"></td>
                        biaotou += " </tr> <tr><td style=\"text-align:center;height: 40px;\"></td> <td style=\"text-align:center;height: 40px;\"></td> <td style=\"text-align:center;height: 40px;\"></td> <td style=\"text-align:center;height: 40px;\"></td> <td style=\"text-align:center;height: 40px;\"></td> <td style=\"text-align:center;height: 40px;\"></td> <td style=\"text-align:center;height: 40px;\"></td> <td style=\"text-align:center;height: 40px;\"></td>  </tr>";//<td style=\"text-align:center;\"></td>
                    }

                    if (i % 8 == 0 && i != inquiryWorkBookModels.Count())
@@ -171,11 +171,11 @@
                    {
                        for (int j=0;j<8;j++)
                        {
                            biaotou += " <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\">&nbsp; &nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</td> ";
                            biaotou += " <td style=\"text-align:center;height: 40px;\">&nbsp; &nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</td> ";
                            i = i + 1;
                            if (i % 8 == 0)
                            {
                                biaotou += " </tr><tr><td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td>  </tr>";//<td style=\"text-align:center;border: 1px solid #999999;\"></td>
                                biaotou += " </tr><tr><td style=\"text-align:center;height: 40px;\"></td> <td style=\"text-align:center;height: 40px;\"></td> <td style=\"text-align:center;height: 40px;\"></td> <td style=\"text-align:center;height: 40px;\"></td> <td style=\"text-align:center;height: 40px;\"></td> <td style=\"text-align:center;height: 40px;\"></td> <td style=\"text-align:center;height: 40px;\"></td> <td style=\"text-align:center;height: 40px;\"></td>  </tr>";//<td style=\"text-align:center;\"></td>
                                break;
                            }
                        }
@@ -185,7 +185,7 @@
                    i++;
                }

                biaotou += " <tr> <td  style=\"text-align:center;border: 1px solid #999999;height: 40px;\"> 验收意见</td >  <td  style=\"text-align:left;border: 1px solid #999999;height: 40px;\"  colspan=\"7\">  产品质量：<input type=\"checkbox\" />非常满意 <input type=\"checkbox\" />满意<input type=\"checkbox\" />一般<input type=\"checkbox\" />不满意<br/> 配送服务：<input type=\"checkbox\" />非常满意 <input type=\"checkbox\" />满意<input type=\"checkbox\" />一般<input type=\"checkbox\" />不满意<br/>其他意见：<br/></td></tr>";
                biaotou += " <tr> <td  style=\"text-align:center;height: 40px;\"> 验收意见</td >  <td  style=\"text-align:left;height: 40px;\"  colspan=\"7\">  产品质量：<input type=\"checkbox\" />非常满意 <input type=\"checkbox\" />满意<input type=\"checkbox\" />一般<input type=\"checkbox\" />不满意<br/> 配送服务：<input type=\"checkbox\" />非常满意 <input type=\"checkbox\" />满意<input type=\"checkbox\" />一般<input type=\"checkbox\" />不满意<br/>其他意见：<br/></td></tr>";

                biaotou += "</table>";
            }

 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetailshuju.aspx

@@ -26,23 +26,35 @@
        <div id='div_tool' printparams='0,2100,2970,"A4"'>
        </div>
       
            <asp:Repeater runat="server" ID='rptOrder'>
          <asp:Repeater runat="server" ID='rptOrder'>
                <ItemTemplate>
       <div class='dbody'>              
                     <style type="text/css">
        .dbody { margin: 0; margin-left: auto; margin-right: auto; }
        .dbody { margin: 0; margin-left: 0px; margin-right: 0px; width:90%; margin-left: auto; margin-right: auto;}
        .dtitle { text-align: center; font-size: 19px; font-weight: bold; margin-top: 10px; margin-bottom: 10px; }
        .dbody table { width: 100%; font-size: 12px; margin-top: 5px;  }  /* border: 1px solid #dddddd;border-top: 1px #999999 solid;*/
         .dtitlea { text-align: left; font-size: 19px; margin-top: 10px; margin-bottom: 10px; }
        .dbody table { width: 100%; font-size: 12px; margin-top: 5px; margin-left: auto; margin-right: auto; }  /* border: 1px solid #dddddd;border-top: 1px #999999 solid;*/
        .dbody table th, .dbody table td { font-weight: normal; height: 20px; line-height: 20px; vertical-align: middle;/* border: 1px solid #999999;*/ border-top: 0; }
        .dbody table th { background-color: #E0EDF6; font-weight: bold; }
        .dbody table td { border-left: 0; padding-left:2px; }
        .dbody table td { border-left: 0; padding-left:0px; }
        .left {text-align: left; }
        #div_tool { text-align: center; }

         #myTable {
  border-collapse: collapse; /* 确保边框融合 */
}

#myTable td, #myTable th {
  border: 1px solid black; /* 设置边框为1px纯黑 */
}

    </style>
             
                    <table border="0" cellpadding="0" cellspacing="0" style="border: 0;">
                         <tr>
                              <td class='left'colspan="8">
                             &nbsp;
                             <div class='dtitlea'>
                                <%#Eval("Bianhao")%> </div>
                        </td>
                    </tr>
                         <tr>
@@ -69,7 +81,7 @@
                    </tr>
                    <tr>
                        <td class='left' colspan="4">
                            学校：  <%#Eval("shipAddress")%> (<%#Eval("Bianhao")%>)
                           学校：<%#Eval("shipAddress")%>  
                        </td>
                         
                        <td class='left'  colspan="4">
@@ -89,12 +101,9 @@
                       
                        
                    </tr>
  <tr>
                        <td   colspan="8">
  </table>
                          <%#Eval("biaoge")%>
                        </td>
                      
                    </tr>
                          <table border="0" cellpadding="0" cellspacing="0" style="border: 0;">          

                          

@@ -108,7 +117,7 @@
                            收货人：  &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;  &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&nbsp; &nbsp; &nbsp; &nbsp;联系电话：
                        </td>
                        <td class='left' colspan="4">
                            &nbsp; &nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
                            &nbsp; &nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;  &nbsp; &nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
                        </td>
                        <td class='left'colspan="1">
                             送货人：<%=selSonghuoren %>
@@ -119,10 +128,10 @@
                          <td class='left'colspan="3">
                           收货单位：（盖章） 
                        </td>
                         <td class='left'colspan="2">
                         <td class='left'colspan="4">
                          
                        </td>
                        <td class='left' colspan="3">
                        <td class='left' colspan="1">
                        送货时间：<%=txtBeginDate %>
                        </td>
                    </tr>
@@ -151,30 +160,19 @@
                             &nbsp;
                        </td>
                    </tr>
                        <tr>
                              <td class='left'colspan="8">
                             &nbsp;
                        </td>
                    </tr>
                        <tr>
                              <td class='left'colspan="8">
                             &nbsp;
                        </td>
                    </tr>
                        <tr>
                              <td class='left'colspan="8">
                             &nbsp;
                        </td>
                    </tr>
                        
                         
                      
                       
                   </table>
            </div>
      <%#(Container.ItemIndex !=  (countss-1)&& ((Container.ItemIndex+1)%2==0 || selChicun == "1" ))?"<div class=\"page-break\"></div>":"" %> 
 
  
                </ItemTemplate>
            </asp:Repeater>
            
       
    </div>
  
    </form>
</body>
</html>

 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetailshuju.aspx.cs

@@ -156,7 +156,7 @@

            foreach (var coreCmsPlanOrder in coreCmsPlanOrders)
            {
                biaotou = "<table border=\"1\" cellpadding=\"0\" cellspacing=\"0\" style=\"border-collapse: collapse;width: 98%; \"><tr>";
                biaotou = "<table  id=\"myTable\"   cellpadding=\"0\" cellspacing=\"0\" style=\"border-collapse: collapse;width: 98%; \"><tr>";
                biaowei = "";
                var  cmsPlanOrderItems =    bll_CoreCmsPlanOrderItemBLL.GetModelsByOrderid(coreCmsPlanOrder.id).Where(x => x.nums > 0).OrderBy(x => x.specification).ThenBy(x => x.name).ToList();
                int i = 1;
@@ -164,12 +164,12 @@

                foreach (var cmsPlanOrderItem in cmsPlanOrderItems)
                {
                    biaotou += " <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"> " + cmsPlanOrderItem.specification + cmsPlanOrderItem.name + " </td> ";
                    biaotou += " <td style=\"text-align:center;height: 40px;\"> " + cmsPlanOrderItem.specification + cmsPlanOrderItem.name + " </td> ";

                    biaowei += " <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"> " + cmsPlanOrderItem.nums + " </td> ";
                    biaowei += " <td style=\"text-align:center;height: 40px;\"> " + cmsPlanOrderItem.nums + " </td> ";
                    if (i % 8 == 0)
                    {
                        biaotou += " </tr> <tr>"+ biaowei + "  </tr>";//<td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td>
                        biaotou += " </tr> <tr>"+ biaowei + "  </tr>";//<td style=\"text-align:center;height: 40px;\"></td>
                        biaowei = "";
                    }

@@ -182,8 +182,8 @@
                    {
                        for (int j = 0; j < 8; j++)
                        {
                            biaotou += " <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\">&nbsp; &nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</td> ";
                            biaowei += " <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\">&nbsp; &nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</td> ";
                            biaotou += " <td style=\"text-align:center;height: 40px;\">&nbsp; &nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</td> ";
                            biaowei += " <td style=\"text-align:center;height: 40px;\">&nbsp; &nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</td> ";
                            i = i + 1;
                            if (i % 8 == 0)
                            {
@@ -197,7 +197,7 @@
                }

               
                biaotou += " <tr> <td  style=\"text-align:center;border: 1px solid #999999;height: 40px;\"> 验收意见</td >  <td  style=\"text-align:left;border: 1px solid #999999;height: 40px;\"  colspan=\"7\">  产品质量：<input type=\"checkbox\" />非常满意 <input type=\"checkbox\" />满意<input type=\"checkbox\" />一般<input type=\"checkbox\" />不满意<br/> 配送服务：<input type=\"checkbox\" />非常满意 <input type=\"checkbox\" />满意<input type=\"checkbox\" />一般<input type=\"checkbox\" />不满意<br/>其他意见：<br/></td></tr>";
                biaotou += " <tr> <td  style=\"text-align:center;height: 40px;\"> 验收意见</td >  <td  style=\"text-align:left;height: 40px;\"  colspan=\"7\">  产品质量：<input type=\"checkbox\" />非常满意 <input type=\"checkbox\" />满意<input type=\"checkbox\" />一般<input type=\"checkbox\" />不满意<br/> 配送服务：<input type=\"checkbox\" />非常满意 <input type=\"checkbox\" />满意<input type=\"checkbox\" />一般<input type=\"checkbox\" />不满意<br/>其他意见：<br/></td></tr>";

                biaotou += "</table>";


 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs

@@ -249,7 +249,7 @@



            biaowei = "   <td style=\"text-align:center\"> 合计 </td><td style=\"text-align:center\">  </td> <td style=\"text-align:center\">  </td> ";
            biaowei = "   <td style=\"text-align:center\"> "+ PlanOrderid.Count +" </td><td style=\"text-align:center\">  </td> <td style=\"text-align:center\">  </td> ";
            foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
            {
                var nums = cmsPlanOrderItems.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt && PlanOrderid.Contains(x.orderId)).Sum(x => x.nums);

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

@@ -61,6 +61,9 @@
        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 = "";
@@ -105,6 +108,8 @@
            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)
@@ -242,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"]));
@@ -261,6 +270,18 @@
                    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")
            {
@@ -1427,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 检测行政物品是否重复
@@ -1470,6 +1503,18 @@
            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

        #region 根据职位类别获取全部职位

 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateEdit.aspx

New file
@@ -0,0 +1,69 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="GongzuoneirongCateEdit.aspx.cs" Inherits="CY.WebForm.Pages.work.GongzuoneirongCateEdit" %>

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

<html xmlns="http://www.w3.org/1999/xhtml">
<head id="Head1" runat="server">
    <title>行政物品分类</title>
    <uc:CMSHead ID="CMSHead1" runat="server" />
    <script type="text/javascript">
        function CheckStaff() {
            var IsCanSubmit = undefined;
            var Name = $.trim($("#txtCarNumbera").val());
            if (Name != "") {
                $.ajax({
                    url: "/Pages/common/CommonAjax.aspx",
                    type: "POST",
                    dataType: "html",
                    data: { dateType: "GongzuoneirongCatecheckname", name: Name, keyid: '<%=Request["keyid"] %>' },
                    global: false,
                    cache: false,
                    async: false,
                    success: function (data) {
                        if (data == "1") {
                            IsCanSubmit = false;
                        } else {
                            IsCanSubmit = true;
                        }
                    }
                });
                if (!IsCanSubmit) {
                    alertMsg("此分类已存在，如有相同，请注意区分添加");
                    return false;
                }
            } else {
                alertMsg("请填写分类名称");
                return false;
            }
            return true;
        }

        $(function () {
            $("#txtCarNumber").blur(function () {
                CheckStaff();
            });
        });
    </script>
</head>
<body>
    <form id="form1" class="form2" runat="server">
    <div>
        <table class="tableStyle" style="margin: 10px auto; line-height:40px;" cellpadding="0" cellspacing="0">
            <tr>
                <td class="ali03">
                    分类名称：
                </td>
                <td>
                     <textarea id="txtCarNumbera" runat="server" style="width: 390px; height: 50px;" class="req" msg="请输入请示内容" MaxLength="500" ></textarea>
                </td>
            </tr>
            <tr>
                <td colspan="2" style="text-align: center;">
                    <asp:Button ID="btn_submit" runat="server" OnClick="btn_submit_form" OnClientClick="if(CheckStaff())return true;else return false; " Text="提交" />
                </td>
            </tr>
        </table>
    </div>
    </form>
</body>
</html>

 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateEdit.aspx.cs

New file
@@ -0,0 +1,96 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using System.Data;
using System.Data.SqlClient;
using CY.Model;
using CY.BLL;
using CY.Infrastructure.Common;
using CY.BLL.Sys;
using CY.BLL.EC;
using CY.Infrastructure.DESEncrypt;
using CY.Infrastructure.Query;

namespace CY.WebForm.Pages.work
{
    //吴辉
    //行政物品分类
    public partial class GongzuoneirongCateEdit : BasePage
    {
        Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
        OA_GongzuoneirongCateBLL oA_WorkReminderBll = null;

        public GongzuoneirongCateEdit()
        {
            bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
            oA_WorkReminderBll = new OA_GongzuoneirongCateBLL();
        }

        //页面加载
        protected void Page_Load(object sender, EventArgs e)
        {
            if (!IsPostBack)
            {
                InitData();
            }
        }

        //数据加载
        public void InitData()
        {
            OA_GongzuoneirongCate m_OA_GongzuoneirongCate = oA_WorkReminderBll.GetModelByKeyid(Request["keyid"].ToInt32());
            if (m_OA_GongzuoneirongCate != null)
            {
                this.txtCarNumbera.Value = m_OA_GongzuoneirongCate.Name;
            }
        }

        //表单提交
        protected void btn_submit_form(object sender, EventArgs e)
        {
            try
            {
                DateTime nowTime = DateTime.Now;
                OA_GongzuoneirongCate m_OA_GongzuoneirongCate = oA_WorkReminderBll.GetModelByKeyid(Request["keyid"].ToInt32());
                if (m_OA_GongzuoneirongCate == null)
                {
                    m_OA_GongzuoneirongCate = new OA_GongzuoneirongCate();
                    m_OA_GongzuoneirongCate.MemberId = CurrentUser.MemberId;
                    m_OA_GongzuoneirongCate.Status = 1;
                    m_OA_GongzuoneirongCate.Remark = "";
                }
                m_OA_GongzuoneirongCate.Name = this.txtCarNumbera.Value;
                m_OA_GongzuoneirongCate.Operator = CurrentUser.ShortName;
                m_OA_GongzuoneirongCate.LastUpdateTime = nowTime;

                if (Request["keyid"].ToInt32() > 0)
                {
                    if (oA_WorkReminderBll.UpdateModel(m_OA_GongzuoneirongCate))
                        JavaScript.MessageBox("更新成功", this, true, true);
                    else
                        JavaScript.MessageBox("更新失败", this);
                }
                else
                {
                    if (oA_WorkReminderBll.InsertModel(m_OA_GongzuoneirongCate))
                    {
                        txtCarNumbera.Value = "";
                        JavaScript.MessageBox("新增成功", this, false, true);
                    }
                    else
                    {
                        JavaScript.MessageBox("操作失败", this);
                    }
                }
            }
            catch (Exception ex)
            {
                PAGEHandleException(ex);
                JavaScript.MessageBox("操作失败", this);
            }
        }
    }
}

 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateEdit.aspx.designer.cs

New file
@@ -0,0 +1,62 @@
//------------------------------------------------------------------------------
// <自动生成>
//     此代码由工具生成。
//
//     对此文件的更改可能导致不正确的行为，如果
//     重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------

namespace CY.WebForm.Pages.work
{


    public partial class GongzuoneirongCateEdit
    {

        /// <summary>
        /// Head1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlHead Head1;

        /// <summary>
        /// CMSHead1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;

        /// <summary>
        /// form1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;

        /// <summary>
        /// txtCarNumbera 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtCarNumbera;

        /// <summary>
        /// btn_submit 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Button btn_submit;
    }
}

 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateList.aspx

New file
@@ -0,0 +1,130 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="GongzuoneirongCateList.aspx.cs" Inherits="CY.WebForm.Pages.work.GongzuoneirongCateList" %>

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
    <title>设备分类管理</title>
    <uc:CMSHead ID="CMSHead1" runat="server" />
    <script type="text/javascript">
        //修改
        function onEdit(keyid) {
            top.Dialog.open({ URL: "/Pages/work/GongzuoneirongCateEdit.aspx?keyid=" + keyid, Title: "设备分类修改", Width: 500, Height: 430 });
        }

        //添加
        function addModel() {
            top.Dialog.open({ URL: "/Pages/work/GongzuoneirongCateEdit.aspx", Title: "新增设备分类", Width: 500, Height: 430 });
        }

        //删除
        function onDele(keyid) {
            top.Dialog.confirm("确定要删除该设备分类吗？", function () {
                window.location = "/Pages/work/GongzuoneirongCateList.aspx?delete=" + keyid;
            });
        }

        //批量删除
        function onAllDelete() {
            var deleteKeyIds = "";
            $(":checkbox").each(
                function () {
                    if ($(this).is(":checked")) {
                        deleteKeyIds += $(this).val() + ",";
                    }
                }
            )
            if (deleteKeyIds == "") {
                top.Dialog.alert("请选择要删除的设备分类", function () {
                });
                return;
            }
            else {
                deleteKeyIds = deleteKeyIds.substring(0, deleteKeyIds.length - 1);
                top.Dialog.confirm("确定要删除所选设备分类吗？", function () {
                    window.location = "/Pages/work/GongzuoneirongCateList.aspx?deleteKeyIds=" + deleteKeyIds;
                });
            }
        }
        $(function () {
            $(".AlreadyReply").remove();
        });
    </script>
    <style type="text/css">
        .AlreadyReply { display: none; }
    </style>
</head>
<body>
    <form id="form1" runat="server">
    <div id="scrollContent">
        <div class="box_tool_min ">
            <div class="center">
                <div class="left">
                    <div class="right">
                        <div class="padding_top5 padding_left10">
                            <a href="javascript:;" onclick="addModel()" class="aaddModel" menu_member_case_id="case_addModel" menu_member_case_name="新增分类"><span class="icon_add">新增分类</span></a>
                            <div class="box_tool_line">
                            </div>
                            <a href="javascript:;" onclick="onAllDelete()" menu_member_case_id="case_onAllDeleteList" menu_member_case_name="批量删除"><span class="icon_delete">批量删除</span></a>
                            <div class="clear">
                            </div>
                        </div>
                    </div>
                </div>
            </div>
            <div class="clear">
            </div>
        </div>
        <div>
            <asp:Repeater ID="RepClientList" runat="server">
                <HeaderTemplate>
                    <table class="tableStyle">
                        <tr>
                            <th width="25">
                            </th>
                            <th width="30" style="text-align: center">
                                编号
                            </th>
                            <th style="text-align: center">
                                分类名称
                            </th>
                            <th style="text-align: center" width="150" >
                                更新时间
                            </th>
                            <th style="text-align: center" width="100" >
                                操作
                            </th>
                        </tr>
                </HeaderTemplate>
                <ItemTemplate>
                    <tr>
                        <td>
                            <input type="checkbox" value='<%#Eval("Keyid")%>' />
                        </td>
                        <td style="text-align: center">
                            <%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
                        </td>
                        <td style="text-align: center">
                            <%#Eval("Name")%>
                        </td>
                        <td style="text-align: center">
                            <%#Eval("LastUpdateTime")%>
                        </td>
                        <td class="Operate " style="text-align: center">
                            <span menu_member_case_id="case_CarEdit" menu_member_case_name="修改" onclick="onEdit('<%#Eval("Keyid")%>')">修改</span>
                            <span menu_member_case_id="case_CarDele" menu_member_case_name="删除" onclick="onDele('<%#Eval("Keyid")%>')">删除</span>
                        </td>
                    </tr>
                </ItemTemplate>
                <FooterTemplate>
                    </table>
                </FooterTemplate>
            </asp:Repeater>
            <div id="page">
                <uc:UCPager ID="UCPager1" runat="server" />
            </div>
        </div>
    </div>
    </form>
</body>
</html>

 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateList.aspx.cs

New file
@@ -0,0 +1,94 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using CY.BLL;
using CY.BLL.Sys;
using CY.Model;
using CY.Infrastructure.Query;
using CY.Infrastructure.Common;

namespace CY.WebForm.Pages.work
{
    //吴辉
    //行政物品分类管理
    public partial class GongzuoneirongCateList : BasePage
    {
        Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
        OA_GongzuoneirongCateBLL bll_OA_GongzuoneirongCateBLL = null;

        //初始化
        public GongzuoneirongCateList()
        {
            bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
            bll_OA_GongzuoneirongCateBLL = new OA_GongzuoneirongCateBLL();
        }

        //页面加载
        protected void Page_Load(object sender, EventArgs e)
        {
            UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
            if (!IsPostBack)
            {
                BindList();
            }
            if (Request["delete"] != null)
            {
                OA_GongzuoneirongCate model = bll_OA_GongzuoneirongCateBLL.GetModelByKeyid(Request["delete"].ToInt32());
                if (model != null && model.Keyid != null)
                {
                    bll_OA_GongzuoneirongCateBLL.DeleteModel(model);
                    JavaScript.MessageBox("删除成功", this);
                    Response.Redirect("/Pages/work/GongzuoneirongCateList.aspx");
                }
                else
                    JavaScript.MessageBox("删除失败", this);
            }

            if (Request["deleteKeyIds"] != null)
            {
                List<int> deleteKeyIdList = new List<int>();
                string deleteKeyIds = Request["deleteKeyIds"].ToString().Trim(',');
                string[] keyIdArry = deleteKeyIds.Split(',');
                foreach (string keyId in keyIdArry)
                {
                    OA_GongzuoneirongCate model = bll_OA_GongzuoneirongCateBLL.GetModelByKeyid(keyId.ToInt32());
                    if (model.Keyid != null && model != null)
                        bll_OA_GongzuoneirongCateBLL.DeleteModel(model);
                    else
                    {
                        JavaScript.MessageBox("删除失败", this);
                        return;
                    }
                }
                JavaScript.MessageBox("删除成功", this);
                Response.Redirect("/Pages/work/GongzuoneirongCateList.aspx");
            }
        }

        //绑定数据
        private void BindList()
        {
            Pagination pa = new Pagination();
            pa.PageSize = UCPager1.AspNetPager.PageSize;
            pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
            this.RepClientList.DataSource = bll_OA_GongzuoneirongCateBLL.SelectModelPage(pa, CurrentUser.MemberId, "",null,null,null,"","");
            this.RepClientList.DataBind();
            UCPager1.AspNetPager.RecordCount = pa.RecordCount;
        }

        //分页事件
        protected void AspNetPager1_PageChanged(object src, EventArgs e)
        {
            BindList();
        }

        //查询事件
        protected void btn_Search_Click(object src, EventArgs e)
        {
            BindList();
        }
    }
}

 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateList.aspx.designer.cs

New file
@@ -0,0 +1,53 @@
//------------------------------------------------------------------------------
// <自动生成>
//     此代码由工具生成。
//
//     对此文件的更改可能导致不正确的行为，如果
//     重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------

namespace CY.WebForm.Pages.work
{


    public partial class GongzuoneirongCateList
    {

        /// <summary>
        /// CMSHead1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;

        /// <summary>
        /// form1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;

        /// <summary>
        /// RepClientList 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Repeater RepClientList;

        /// <summary>
        /// UCPager1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::CY.WebForm.Pages.common.UCPager UCPager1;
    }
}

 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongEdit.aspx

New file
@@ -0,0 +1,188 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="GongzuoneirongEdit.aspx.cs" Inherits="CY.WebForm.Pages.work.GongzuoneirongEdit" %>

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head id="Head1" runat="server">
    <title>行政设备</title>
    <uc:CMSHead ID="CMSHead1" runat="server" />
    <script type="text/javascript">
        function CheckStaff() {
            var IsCanSubmit = undefined;
            var Name = $.trim($("#selZerenren").val());
            var txtCarNumbera = $.trim($("#txtCarNumbera").val());
            if (txtCarNumbera != "") {
                $.ajax({
                    url: "/Pages/common/CommonAjax.aspx",
                    type: "POST",
                    dataType: "html",
                    data: { dateType: "Gongzuoneirongckname", name: Name, neirong: txtCarNumbera, keyid: '<%=Request["keyid"] %>' },
                    global: false,
                    cache: false,
                    async: false,
                    success: function (data) {
                        if (data == "1") {
                            IsCanSubmit = false;
                        } else {
                            IsCanSubmit = true;
                        }
                    }
                });
                if (!IsCanSubmit) {
                    alertMsg("此员工的该工作内容已存在");
                    return false;
                }
            } else {
                alertMsg("请填写内容");
                return false;
            }
            return true;
        }




        //为Select新增过滤功能
        function SelectAddSearch() {
            $("select[SelInputHtml='True']").each(function (i, v) {
                $(this).unbind("blur");
                var old = $(this).html();
                var oldObject = $(this).clone();
                var sign = "selectS" + i;
                $(v).attr("sign", sign);

                var inputClass = "input_" + sign;
                var html = "<span style='margin-left:10px'>过滤：</span><input type='text' class='" + inputClass + "' style='width:80px;height:18px;line-height:18px;'/>";
                $(v).after(html);
                $("." + inputClass).blur(function () {
                    var nowval = $(this).val().trim();
                    var output = "";
                    if (nowval == "" || nowval == null) {
                        output = old;
                    } else {
                        output += "<option value=''>请选择</option>";
                        var valueArr = new Array();
                        oldObject.find("option").each(function (ii, vv) {

                            var value = $.trim($(vv).attr("value"));
                            var text = $.trim($(vv).text());

                            if (text.indexOf(nowval) >= 0)
                                valueArr.push(value + "|||" + text);
                        });
                        for (var ss in valueArr) {
                            var s = valueArr[ss];
                            if (s.split("|||").length == 2) {
                                var value1 = s.split("|||")[0];
                                var text1 = s.split("|||")[1];
                                output += "<option value='" + value1 + "'>" + text1 + "</option>";
                            }
                        }
                    }
                    $(v).html(output);
                });
            });
        }


        $(function () {

            SelectAddSearch();


            
        });



        function ChangeThisType(obj) {
            $("#selZerenren").html("");
            $.ajax({
                url: "/Pages/work/GongzuoneirongEdit.aspx",
                type: "POST",
                dataType: "html",
                data: { TypeName: $(obj).val(), Target: "change" },
                global: false,
                cache: false,
                success: function (data) {
                    var myobj = eval('(' + data + ')');
                    if (myobj != null && myobj.length > 0) {
                        for (var i = 0; i < myobj.length; i++) {
                            var city_keyid = myobj[i].Keyid;
                            var city_name = myobj[i].Name;
                            var option = "";
                            option = "<option value = '" + city_keyid + "'>" + city_name + "</option>";
                            $(option).appendTo($("#selZerenren"));
                        }
                    }
                }
            });
        }


        function changeselCateId(obj) {
            if ($(obj).val() == "") {
                $("#txtCarNumbera").val("");
            } else {
                $("#txtCarNumbera").val($(obj).find("option:selected").text());
            }
            
            
            
        }

       
    </script>
</head>
<body>
    <form id="form1" class="form2" runat="server">
    <div>
        <table class="tableStyle" style="margin: 10px auto;" cellpadding="0" cellspacing="0">
             <tr>
                <td class="ali03">
                    部门：
                </td>
                <td >
                    <select id="selBumen" runat="server" keepdefaultstyle="true"     style=" width:100px;"  onchange="ChangeThisType(this);" >
                        <option value="">请选择</option>
                    </select>
                </td>
            </tr>
             <tr>
                <td class="ali03">
                    职工姓名：
                </td>
                <td >
                    <select id="selZerenren" runat="server" keepdefaultstyle="true"  selinputhtml="True"  class="sreq" style=" width:100px;"  >
                        <option value="">请选择</option>
                    </select>
                </td>
            </tr>
            <tr>
                <td class="ali03">
                    工作职责：
                </td>
                <td>
                     <textarea id="txtCarNumbera" runat="server" style="width: 390px; height: 50px;" class="req" msg="请输入请示内容" MaxLength="200" ></textarea>
                </td>
            </tr>
            <tr>
                <td class="ali03">
                    选择工作职责：
                </td>
                <td>
                    <select id="selCateId" runat="server" keepdefaultstyle="true"  style="width: 250px;"  selinputhtml="True" onchange="changeselCateId(this);" >
                        <option value="">请选择</option>
                    </select>
                </td>
            </tr>
           
            <tr>
                <td colspan="2" style="text-align: center;">
                    <asp:Button ID="btn_submit" runat="server" OnClick="btn_submit_form" OnClientClick="if(CheckStaff())return true;else return false; " Text="提交" />
                </td>
            </tr>
        </table>
    </div>
    </form>
</body>
</html>

 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongEdit.aspx.cs

New file
@@ -0,0 +1,201 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using System.Data;
using System.Data.SqlClient;
using CY.Model;
using CY.BLL;
using CY.Infrastructure.Common;
using CY.BLL.Sys;
using CY.BLL.EC;
using CY.Infrastructure.DESEncrypt;
using CY.Infrastructure.Query;

namespace CY.WebForm.Pages.work
{
    //吴辉
    //行政物品
    public partial class GongzuoneirongEdit : BasePage
    {
        OA_GongzuoneirongBLL bll_OA_GongzuoneirongBLL = null;
        OA_StaffBLL bll_OA_StaffBLL = null;
        OA_DepartmentBll bll_OA_DepartmentBll = null;

        public GongzuoneirongEdit()
        {
            bll_OA_GongzuoneirongBLL = new OA_GongzuoneirongBLL();
            bll_OA_StaffBLL = new OA_StaffBLL();
            bll_OA_DepartmentBll = new OA_DepartmentBll();
        }

        //页面加载
        protected void Page_Load(object sender, EventArgs e)
        {

            try
            {
                switch (Request["Target"])
                {

                    case "change":
                        Response.Write(reLoadAccountName(Request["TypeName"].ToString2()));
                        break;


                    default:
                        if (!IsPostBack)
                        {

                            this.selCateId.DataSource = bll_OA_GongzuoneirongBLL.GetDataByType(CurrentUser.MemberId);
                            this.selCateId.DataTextField = "Name";
                            this.selCateId.DataValueField = "Keyid";
                            this.selCateId.DataBind();
                            this.selCateId.Items.Insert(0, new ListItem("请选择", ""));
                            this.selCateId.Value = "";

                            this.selZerenren.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null);
                            this.selZerenren.DataTextField = "Name";
                            this.selZerenren.DataValueField = "Keyid";
                            this.selZerenren.DataBind();
                            //this.selZerenren.Items.Insert(0, new ListItem("全部", ""));
                            //this.selZerenren.Value = "";

                            Pagination pa = new Pagination();
                            pa.PageSize = 500;
                            pa.PageIndex = 1;
                            this.selBumen.DataSource = bll_OA_DepartmentBll.SelectModelPage(pa, CurrentUser.MemberId, "", "启用");
                            this.selBumen.DataTextField = "Name";
                            this.selBumen.DataValueField = "Keyid";
                            this.selBumen.DataBind();
                            this.selBumen.Items.Insert(0, new ListItem("全部", ""));
                            this.selBumen.Value = "";

                            InitData();
                        }
                        return;
                }
            }
            catch (Exception ex)
            {
                PAGEHandleException(ex);
                Response.Clear();
                //Response.Write("-1");
                Response.Write(ex.Message);
            }
            Response.End();


           
        }

        //数据加载
        public void InitData()
        {
            OA_Gongzuoneirong m_OA_Gongzuoneirong = bll_OA_GongzuoneirongBLL.GetModelByKeyid(Request["keyid"].ToInt32());
            if (m_OA_Gongzuoneirong != null)
            {
                
                this.txtCarNumbera.Value = m_OA_Gongzuoneirong.Gongzuozhize;
                
                this.selZerenren.Value = m_OA_Gongzuoneirong.Zerenren.HasValue? m_OA_Gongzuoneirong.Zerenren.ToString():"";
            }
            
        }

        //表单提交
        protected void btn_submit_form(object sender, EventArgs e)
        {
            try
            {
                //if (string.IsNullOrEmpty(this.txtAllNum.Value) || string.IsNullOrEmpty(this.txtReceiveNum.Value))
                //{
                //    JavaScript.MessageBox("物品总数量和已领取数量均不能为空", this);
                //    return;
                //}

                //if (this.txtAllNum.Value.ToInt32() < this.txtReceiveNum.Value.ToInt32())
                //{
                //    JavaScript.MessageBox("已领取数量不能大于总数量",this);
                //    return;
                //}

                DateTime nowTime = DateTime.Now;
                OA_Gongzuoneirong m_OA_Gongzuoneirong = bll_OA_GongzuoneirongBLL.GetModelByKeyid(Request["keyid"].ToInt32());
                if (m_OA_Gongzuoneirong == null)
                {
                    m_OA_Gongzuoneirong = new OA_Gongzuoneirong();
                    m_OA_Gongzuoneirong.MemberId = CurrentUser.MemberId;
                  
                  
                }
               
                m_OA_Gongzuoneirong.Gongzuozhize = this.txtCarNumbera.Value;
               

                m_OA_Gongzuoneirong.Zerenren = this.selZerenren.Value.ToInt32();
                var a_Staff = bll_OA_StaffBLL.GetModelByKeyid(m_OA_Gongzuoneirong.Zerenren);
                if (a_Staff != null)
                {
                    m_OA_Gongzuoneirong.ZerenrenName = a_Staff.Name;
                }
                else
                {
                    m_OA_Gongzuoneirong.ZerenrenName = "";
                }
               
                m_OA_Gongzuoneirong.Updator = CurrentUser.ShortName;
                m_OA_Gongzuoneirong.LastUpdateTime = nowTime;
               

                if (Request["keyid"].ToInt32() > 0)
                {
                    if (bll_OA_GongzuoneirongBLL.UpdateModel(m_OA_Gongzuoneirong))
                    {
                        JavaScript.MessageBox("更新成功", this, true, true);
                    }
                       
                    else
                        JavaScript.MessageBox("更新失败", this);
                }
                else
                {
                    m_OA_Gongzuoneirong.Creator = CurrentUser.ShortName;
                    m_OA_Gongzuoneirong.CreateTime = nowTime;
                    if (bll_OA_GongzuoneirongBLL.InsertModel(m_OA_Gongzuoneirong))
                    {
                        this.txtCarNumbera.Value="";
                        this.selCateId.Value = "";
                        JavaScript.MessageBox("新增成功", this, false, true);
                    }
                       
                    else
                        JavaScript.MessageBox("操作失败", this);
                }
            }
            catch (Exception ex)
            {
                PAGEHandleException(ex);
                JavaScript.MessageBox("操作失败", this);
            }
        }


        protected string reLoadAccountName(string selAcoountType)
        {
            
            if (!string.IsNullOrEmpty(selAcoountType))
            {
                return JsonHelper.GetJsonStringByObject(bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId,false,false).Where(x =>  x.DepartmentId == selAcoountType.ToInt32()));
            }
            else
            {
                return JsonHelper.GetJsonStringByObject(bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false));
            }


        }
    }
}

 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongEdit.aspx.designer.cs

New file
@@ -0,0 +1,89 @@
//------------------------------------------------------------------------------
// <自动生成>
//     此代码由工具生成。
//
//     对此文件的更改可能导致不正确的行为，如果
//     重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------

namespace CY.WebForm.Pages.work
{


    public partial class GongzuoneirongEdit
    {

        /// <summary>
        /// Head1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlHead Head1;

        /// <summary>
        /// CMSHead1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;

        /// <summary>
        /// form1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;

        /// <summary>
        /// selBumen 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selBumen;

        /// <summary>
        /// selZerenren 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selZerenren;

        /// <summary>
        /// txtCarNumbera 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtCarNumbera;

        /// <summary>
        /// selCateId 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selCateId;

        /// <summary>
        /// btn_submit 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Button btn_submit;
    }
}

 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongList.aspx

New file
@@ -0,0 +1,182 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="GongzuoneirongList.aspx.cs" Inherits="CY.WebForm.Pages.work.GongzuoneirongList" %>

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head id="Head1" runat="server">
    <title>工作内容管理</title>
    <uc:CMSHead ID="CMSHead1" runat="server" />
    <script type="text/javascript">
        //修改
        function onEdit(keyid) {
            top.Dialog.open({ URL: "/Pages/work/GongzuoneirongEdit.aspx?keyid=" + keyid, Title: "工作内容修改", Width: 500, Height: 430 });
        }

        //添加
        function addModel() {
            top.Dialog.open({ URL: "/Pages/work/GongzuoneirongEdit.aspx", Title: "工作内容新增", Width: 500, Height: 430 });
        }

        //删除
        function onDele(keyid) {
            top.Dialog.confirm("确定要报废该工作内容吗？", function () {
                window.location = "/Pages/work/GongzuoneirongList.aspx?delete=" + keyid;
            });
        }
        //打印盘点表
        function PrintCorATable() {
            var keyid = "";
            $(".SelectCheck:checked").each(function (ii, vv) {
                keyid = keyid + "," + $(vv).attr("value_cid");
            });
            if (keyid == "")
                alertMsg("未选中任何工作内容");
            else {
                openWindowTransferData("/Pages/work/PrintCheckTable.aspx", "Keyid", keyid);
            }
        }

        //批量删除
        function onAllDelete() {
            var deleteKeyIds = "";
            $(":checkbox").each(
                function () {
                    if ($(this).is(":checked")) {
                        deleteKeyIds += $(this).val() + ",";
                    }
                }
            )
            if (deleteKeyIds == "") {
                top.Dialog.alert("请选择要删除的工作内容", function () {
                });
                return;
            }
            else {
                deleteKeyIds = deleteKeyIds.substring(0, deleteKeyIds.length - 1);
                top.Dialog.confirm("确定要删除所选工作内容吗？", function () {
                    window.location = "/Pages/work/GongzuoneirongList.aspx?deleteKeyIds=" + deleteKeyIds;
                });
            }
        }
        $(function () {
            $(".AlreadyReply").remove();
        });
    </script>
    <style type="text/css">
        .AlreadyReply { display: none; }
    </style>
</head>
<body>
    <form id="form1" runat="server">
    <div id="scrollContent">
    <div class="box1" paneltitle="功能面板" roller="false">
            <table class="TableNewStyle">
                <tr>
                      
                     <td class="ali03">
                        责任人：
                    </td>
                    <td>
                        <select id="selZerenren" runat="server" keepdefaultstyle="true">
                            <option value="">全部</option>
                        </select>
                    </td>
                     
                    <td class="ali03">
                        工作内容：
                    </td>
                    <td>
                        <input type="text" id="txtName" runat="server" />
                    </td>
                   
                     
                    <td>
                        <asp:Button ID="btn_Submit" Text="查询" runat="server" OnClick="btn_Search_Click" />
                    </td>
                </tr>
            </table>
        </div>
        <div class="box_tool_min ">
            <div class="center">
                <div class="left">
                    <div class="right">
                        <div class="padding_top5 padding_left10">
                            <a href="javascript:;" onclick="addModel()" class="addModel" menu_member_case_id="case_addModel" menu_member_case_name="新增工作内容"><span class="icon_add">新增工作内容</span></a>
                            <div class="box_tool_line">
                            </div>
                            <a href="javascript:;" onclick="onAllDelete()" menu_member_case_id="case_onAllDeleteList" menu_member_case_name="批量删除"><span class="icon_delete">批量删除</span></a>
                           <%-- <div class="box_tool_line">
                            </div>
                            <a href="javascript:;" onclick="PrintCorATable()"><span class="icon_reply">打印盘点表</span></a>--%>
                            <div class="clear">
                            </div>
                        </div>
                    </div>
                </div>
            </div>
            <div class="clear">
            </div>
        </div>
        <div>
            <asp:Repeater ID="RepClientList" runat="server">
                <HeaderTemplate>
                    <table class="tableStyle">
                        <tr>
                            <th width="25">
                            </th>
                            <th width="30" style="text-align: center">
                                编号
                            </th>
                            
                            <th style="text-align: center">
                                工作内容 
                            </th>
                             
                            
                            <th style="text-align: center" width="60">
                                 责任人
                            </th>
                              
                          
                            <th style="text-align: center" width="100">
                                操作
                            </th>
                        </tr>
                </HeaderTemplate>
                <ItemTemplate>
                    <tr>
                        <td>
                            <input type="checkbox" class="SelectCheck" value='<%#Eval("Keyid")%>' value_cid="<%#Eval("Keyid")%>"/>
                        </td>
                        <td style="text-align: center">
                            <%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
                        </td>
                        
                        <td title=" <%#Eval("Gongzuozhize")%> "  >
                            <%#Eval("Gongzuozhize")%> 
                        </td>
                          
                        <td style="text-align: center">
                            <%#Eval("ZerenrenName")%>
                        </td>
                         
                        <td class="Operate " style="text-align: center">
                             <span menu_member_case_id="case_CarEdit" menu_member_case_name="修改" onclick="onEdit('<%#Eval("Keyid")%>')">修改</span>


                              <span menu_member_case_id="case_Shanchu" menu_member_case_name="删除" onclick="onDele('<%#Eval("Keyid")%>')">删除</span>
                           
                        </td>
                    </tr>
                </ItemTemplate>
                <FooterTemplate>
                    </table>
                </FooterTemplate>
            </asp:Repeater>
            <div id="page">
                <uc:UCPager ID="UCPager1" runat="server" />
            </div>
        </div>
    </div>
    </form>
</body>
</html>

 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongList.aspx.cs

New file
@@ -0,0 +1,117 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using CY.BLL;
using CY.BLL.Sys;
using CY.Model;
using CY.Infrastructure.Query;
using CY.Infrastructure.Common;

namespace CY.WebForm.Pages.work
{
    //吴辉
    //行政物品管理
    public partial class GongzuoneirongList : BasePage
    {
        
        OA_GongzuoneirongBLL bll_OA_GongzuoneirongBLL = null;
        OA_StaffBLL bll_OA_StaffBLL = null;
        
        //初始化
        public GongzuoneirongList()
        {
           
            bll_OA_GongzuoneirongBLL = new OA_GongzuoneirongBLL();
            bll_OA_StaffBLL = new OA_StaffBLL();
            
        }

        //页面加载
        protected void Page_Load(object sender, EventArgs e)
        {
            UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
            if (!IsPostBack)
            {
                InitData();
                BindList();
            }
            if (Request["delete"] != null)
            {
                OA_Gongzuoneirong model = bll_OA_GongzuoneirongBLL.GetModelByKeyid(Request["delete"].ToInt32());
                if (model != null && model.Keyid != null)
                {
                   
                    bll_OA_GongzuoneirongBLL.DeleteModel(model);
                    JavaScript.MessageBox("删除成功", this);
                    Response.Redirect("/Pages/work/GongzuoneirongList.aspx");
                }
                else
                    JavaScript.MessageBox("删除失败", this);
            }

            if (Request["deleteKeyIds"] != null)
            {
                List<int> deleteKeyIdList = new List<int>();
                string deleteKeyIds = Request["deleteKeyIds"].ToString().Trim(',');
                string[] keyIdArry = deleteKeyIds.Split(',');
                foreach (string keyId in keyIdArry)
                {
                    OA_Gongzuoneirong model = bll_OA_GongzuoneirongBLL.GetModelByKeyid(keyId.ToInt32());
                    if (model.Keyid != null && model != null)
                        bll_OA_GongzuoneirongBLL.DeleteModel(model);
                    else
                    {
                        JavaScript.MessageBox("删除失败", this);
                        return;
                    }
                }
                JavaScript.MessageBox("删除成功", this);
                Response.Redirect("/Pages/work/GongzuoneirongList.aspx");
            }
        }

        //绑定分类
        private void InitData()
        {
            


            this.selZerenren.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId,null, null);
            this.selZerenren.DataTextField = "Name";
            this.selZerenren.DataValueField = "Keyid";
            this.selZerenren.DataBind();
            this.selZerenren.Items.Insert(0, new ListItem("全部", ""));
            this.selZerenren.Value = "";
            
        }

        //绑定数据
        private void BindList()
        {
            Pagination pa = new Pagination();
            pa.PageSize = 50;
            pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
            var Gongzuoneirongs = bll_OA_GongzuoneirongBLL.SelectModelPage(pa, CurrentUser.MemberId,   this.txtName.Value, this.selZerenren.Value.ToInt32());
             
            
            this.RepClientList.DataSource = Gongzuoneirongs;
            this.RepClientList.DataBind();
            UCPager1.AspNetPager.RecordCount = pa.RecordCount;
        }

        //分页事件
        protected void AspNetPager1_PageChanged(object src, EventArgs e)
        {
            BindList();
        }

        //查询事件
        protected void btn_Search_Click(object src, EventArgs e)
        {
            BindList();
        }
    }
}

 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongList.aspx.designer.cs

New file
@@ -0,0 +1,89 @@
//------------------------------------------------------------------------------
// <自动生成>
//     此代码由工具生成。
//
//     对此文件的更改可能导致不正确的行为，如果
//     重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------

namespace CY.WebForm.Pages.work
{


    public partial class GongzuoneirongList
    {

        /// <summary>
        /// Head1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlHead Head1;

        /// <summary>
        /// CMSHead1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;

        /// <summary>
        /// form1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;

        /// <summary>
        /// selZerenren 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selZerenren;

        /// <summary>
        /// txtName 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtName;

        /// <summary>
        /// btn_Submit 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Button btn_Submit;

        /// <summary>
        /// RepClientList 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.Repeater RepClientList;

        /// <summary>
        /// UCPager1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::CY.WebForm.Pages.common.UCPager UCPager1;
    }
}