From 50d433602441964d905abe6e516ad258ba66627d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 21 十一月 2025 12:06:16 +0800
Subject: [PATCH] 送货单修改这几个地方,第一个,那个表格最上面那根线条和左边那根线条看粗细不一致,太细了, 感觉像打出来像断笔画。这是一个。第二个, 中间空的太多。我刚才打印打了两张送货单,他都打印的是两页, 相当于说跳了一行一行空白的第二页,第二页是白字的嘛,中间空的太多,中间不空那么多。 好,第三,那个左右的页边距,你们可能只有。

---
 CY_ECommercePlatform/CY.BLL/CY.BLL.csproj                                              |    2 
 CY_ECommercePlatform/CY.Model/OA/OA_GongzuoneirongCate.cs                              |  131 ++
 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateList.aspx.designer.cs     |   53 +
 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateEdit.aspx.cs              |   96 ++
 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongEdit.aspx                     |  188 ++++
 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateList.aspx                 |  130 ++
 CY_ECommercePlatform/CY.BLL/OA/OA_GongzuoneirongBLL.cs                                 |  110 ++
 CY_ECommercePlatform/CY.Model/OA/OA_Gongzuoneirong.cs                                  |  111 ++
 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongList.aspx.designer.cs         |   89 +
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiAdd.aspx                |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx.cs            |    5 
 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateEdit.aspx.designer.cs     |   62 +
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetailshuju.aspx    |   60 
 CY_ECommercePlatform/AbstractFactory/Factory.cs                                        |   14 
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx.designer.cs   |    9 
 CY_ECommercePlatform/CY.SQLDAL/OA/OA_GongzuoneirongCateDAL.cs                          |  232 +++++
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.cs      |   12 
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetailshuju.aspx.cs |   14 
 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateList.aspx.cs              |   94 ++
 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongList.aspx.cs                  |  117 ++
 CY_ECommercePlatform/CY.BLL/OA/OA_GongzuoneirongCateBLL.cs                             |   87 +
 CY_ECommercePlatform/CY.Model/CY.Model.csproj                                          |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx         |   59 
 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongEdit.aspx.cs                  |  201 ++++
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs          |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateEdit.aspx                 |   69 +
 CY_ECommercePlatform/CY.IDAL/OA/IOA_GongzuoneirongDAL.cs                               |   48 +
 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongList.aspx                     |  182 +++
 CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrder.cs                                   |   16 
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx                |    2 
 CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj                                      |   32 
 CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj                                        |    2 
 CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj                                            |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs            |   12 
 CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs                        |   45 
 CY_ECommercePlatform/CY.SQLDAL/OA/OA_GongzuoneirongDAL.cs                              |  272 +++++
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx               |   15 
 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongEdit.aspx.designer.cs         |   89 +
 CY_ECommercePlatform/CY.IDAL/OA/IOA_GongzuoneirongCateDAL.cs                           |   38 
 39 files changed, 2,621 insertions(+), 85 deletions(-)

diff --git a/CY_ECommercePlatform/AbstractFactory/Factory.cs b/CY_ECommercePlatform/AbstractFactory/Factory.cs
index b36705b..94a1923 100644
--- a/CY_ECommercePlatform/AbstractFactory/Factory.cs
+++ b/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,
diff --git a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
index 5a19570..1435e45 100644
--- a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
+++ b/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" />
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_GongzuoneirongBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_GongzuoneirongBLL.cs
new file mode 100644
index 0000000..0f4b4fb
--- /dev/null
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_GongzuoneirongBLL.cs
@@ -0,0 +1,110 @@
+锘縰sing 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);
+        }
+
+        
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_GongzuoneirongCateBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_GongzuoneirongCateBLL.cs
new file mode 100644
index 0000000..0dcc461
--- /dev/null
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_GongzuoneirongCateBLL.cs
@@ -0,0 +1,87 @@
+锘縰sing 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);
+        }
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj b/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
index 85cc90e..f1c618f 100644
--- a/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
+++ b/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" />
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_GongzuoneirongCateDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_GongzuoneirongCateDAL.cs
new file mode 100644
index 0000000..8a04e55
--- /dev/null
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_GongzuoneirongCateDAL.cs
@@ -0,0 +1,38 @@
+锘縰sing 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);
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_GongzuoneirongDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_GongzuoneirongDAL.cs
new file mode 100644
index 0000000..b3e57d1
--- /dev/null
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_GongzuoneirongDAL.cs
@@ -0,0 +1,48 @@
+锘縰sing 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);
+
+
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.Model/CY.Model.csproj b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
index a17f760..1d619cf 100644
--- a/CY_ECommercePlatform/CY.Model/CY.Model.csproj
+++ b/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" />
diff --git a/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrder.cs b/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrder.cs
index 6ae4683..e6f6550 100644
--- a/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrder.cs
+++ b/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;
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Gongzuoneirong.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Gongzuoneirong.cs
new file mode 100644
index 0000000..c3f68f8
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Gongzuoneirong.cs
@@ -0,0 +1,111 @@
+锘縰sing 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
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_GongzuoneirongCate.cs b/CY_ECommercePlatform/CY.Model/OA/OA_GongzuoneirongCate.cs
new file mode 100644
index 0000000..daa3c35
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_GongzuoneirongCate.cs
@@ -0,0 +1,131 @@
+锘縰sing 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
+}
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj b/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
index 5d0cc10..abe96e2 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
+++ b/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" />
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_GongzuoneirongCateDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_GongzuoneirongCateDAL.cs
new file mode 100644
index 0000000..54a3008
--- /dev/null
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_GongzuoneirongCateDAL.cs
@@ -0,0 +1,232 @@
+锘縰sing 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;
+            }
+        }
+	}
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_GongzuoneirongDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_GongzuoneirongDAL.cs
new file mode 100644
index 0000000..857177f
--- /dev/null
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_GongzuoneirongDAL.cs
@@ -0,0 +1,272 @@
+锘縰sing 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;
+            }
+        }
+
+        
+
+         
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index 5a575d6..dc8c698 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/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>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiAdd.aspx
index e94eaea..a54ea3e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiAdd.aspx
+++ b/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>
              
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs
index 7f31a0d..652efc7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs
+++ b/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;
+                    //}
 
                 }
 
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx
index c6082cf..12d3e7a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx
+++ b/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 });
         }
 
         //鎵归噺鍒犻櫎
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx
index e98219f..ba1c868 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx
+++ b/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" >
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx.cs
index 8c037bf..45cd58f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx.cs
+++ b/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);
+            }
 
 
 
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx.designer.cs
index b7bd303..f7af666 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx.designer.cs
+++ b/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>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selstatus;
+
+        /// <summary>
         /// btn_Submit 鎺т欢銆�
         /// </summary>
         /// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx
index 1159f0c..4b57f83 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx
+++ b/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>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.cs
index dc55424..b4334d6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.cs
+++ b/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>";
             }
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetailshuju.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetailshuju.aspx
index 134fefa..5470380 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetailshuju.aspx
+++ b/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>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetailshuju.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetailshuju.aspx.cs
index 5072c7b..5b3d3fc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetailshuju.aspx.cs
+++ b/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>";
 
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
index 31d51da..5cb53b7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
+++ b/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);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs
index 635df8e..af96671 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs
+++ b/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 鏍规嵁鑱屼綅绫诲埆鑾峰彇鍏ㄩ儴鑱屼綅
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateEdit.aspx
new file mode 100644
index 0000000..3f2a815
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateEdit.aspx
@@ -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>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateEdit.aspx.cs
new file mode 100644
index 0000000..6da9c7b
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateEdit.aspx.cs
@@ -0,0 +1,96 @@
+锘縰sing 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);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateEdit.aspx.designer.cs
new file mode 100644
index 0000000..872cb67
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateEdit.aspx.designer.cs
@@ -0,0 +1,62 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.work
+{
+
+
+    public partial class GongzuoneirongCateEdit
+    {
+
+        /// <summary>
+        /// Head1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+        /// <summary>
+        /// CMSHead1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// txtCarNumbera 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtCarNumbera;
+
+        /// <summary>
+        /// btn_submit 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btn_submit;
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateList.aspx
new file mode 100644
index 0000000..7e5d29c
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateList.aspx
@@ -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>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateList.aspx.cs
new file mode 100644
index 0000000..cfd008d
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateList.aspx.cs
@@ -0,0 +1,94 @@
+锘縰sing 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();
+        }
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateList.aspx.designer.cs
new file mode 100644
index 0000000..13df7c0
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongCateList.aspx.designer.cs
@@ -0,0 +1,53 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.work
+{
+
+
+    public partial class GongzuoneirongCateList
+    {
+
+        /// <summary>
+        /// CMSHead1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// RepClientList 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Repeater RepClientList;
+
+        /// <summary>
+        /// UCPager1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::CY.WebForm.Pages.common.UCPager UCPager1;
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongEdit.aspx
new file mode 100644
index 0000000..052e96b
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongEdit.aspx
@@ -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;
+        }
+
+
+
+
+        //涓篠elect鏂板杩囨护鍔熻兘
+        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>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongEdit.aspx.cs
new file mode 100644
index 0000000..9bf971d
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongEdit.aspx.cs
@@ -0,0 +1,201 @@
+锘縰sing 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));
+            }
+
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongEdit.aspx.designer.cs
new file mode 100644
index 0000000..2ba2077
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongEdit.aspx.designer.cs
@@ -0,0 +1,89 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.work
+{
+
+
+    public partial class GongzuoneirongEdit
+    {
+
+        /// <summary>
+        /// Head1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+        /// <summary>
+        /// CMSHead1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// selBumen 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selBumen;
+
+        /// <summary>
+        /// selZerenren 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selZerenren;
+
+        /// <summary>
+        /// txtCarNumbera 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtCarNumbera;
+
+        /// <summary>
+        /// selCateId 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selCateId;
+
+        /// <summary>
+        /// btn_submit 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btn_submit;
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongList.aspx
new file mode 100644
index 0000000..025576a
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongList.aspx
@@ -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">
+                        璐d换浜猴細
+                    </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">
+                                 璐d换浜�
+                            </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>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongList.aspx.cs
new file mode 100644
index 0000000..0ad2a1a
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongList.aspx.cs
@@ -0,0 +1,117 @@
+锘縰sing 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();
+        }
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongList.aspx.designer.cs
new file mode 100644
index 0000000..07bf829
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuoneirongList.aspx.designer.cs
@@ -0,0 +1,89 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.work
+{
+
+
+    public partial class GongzuoneirongList
+    {
+
+        /// <summary>
+        /// Head1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+        /// <summary>
+        /// CMSHead1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// selZerenren 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selZerenren;
+
+        /// <summary>
+        /// txtName 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtName;
+
+        /// <summary>
+        /// btn_Submit 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btn_Submit;
+
+        /// <summary>
+        /// RepClientList 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Repeater RepClientList;
+
+        /// <summary>
+        /// UCPager1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::CY.WebForm.Pages.common.UCPager UCPager1;
+    }
+}

--
Gitblit v1.9.1