From 847fb7063af8e80bd864709ba8e97f06dc87ac4f Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 19 十一月 2025 10:02:48 +0800
Subject: [PATCH] 20251118 查看送货情况列表默认“未送货”和“配送中”的学校  完成

---
 CY_ECommercePlatform/CY.Model/CY.Model.csproj                                 |    1 
 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuozhizeEdit.aspx              |  165 ++++++
 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuozhizeEdit.aspx.cs           |  195 ++++++++
 CY_ECommercePlatform/CY.BLL/CY.BLL.csproj                                     |    1 
 CY_ECommercePlatform/CY.Model/OA/OA_Gongzuozhize.cs                           |  111 ++++
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs |   39 +
 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuozhizeEdit.aspx.designer.cs  |   80 +++
 CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderDAL.cs                      |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuozhizeList.aspx              |  182 +++++++
 CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj                             |   16 
 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuozhizeList.aspx.designer.cs  |   89 +++
 CY_ECommercePlatform/CY.IDAL/OA/IOA_GongzuozhizeDAL.cs                        |   40 +
 CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj                               |    1 
 CY_ECommercePlatform/AbstractFactory/Factory.cs                               |    9 
 CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj                                   |    1 
 CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs               |   26 +
 CY_ECommercePlatform/CY.BLL/OA/OA_GongzuozhizeBLL.cs                          |  100 ++++
 CY_ECommercePlatform/CY.SQLDAL/OA/OA_GongzuozhizeDAL.cs                       |  249 ++++++++++
 CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuozhizeList.aspx.cs           |  117 ++++
 19 files changed, 1,417 insertions(+), 7 deletions(-)

diff --git a/CY_ECommercePlatform/AbstractFactory/Factory.cs b/CY_ECommercePlatform/AbstractFactory/Factory.cs
index e2a542d..b36705b 100644
--- a/CY_ECommercePlatform/AbstractFactory/Factory.cs
+++ b/CY_ECommercePlatform/AbstractFactory/Factory.cs
@@ -276,7 +276,8 @@
             OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderFahuoDAL, "CoreCmsPlanOrderFahuoDAL");
             OBJECT_PATH.Add(DALInterface.IOA_ShebeiCateDAL, "OA_ShebeiCateDAL");
             OBJECT_PATH.Add(DALInterface.IOA_ShebeiManageDAL, "OA_ShebeiManageDAL");
-            OBJECT_PATH.Add(DALInterface.IOA_ShebeiWeixiuDAL, "OA_ShebeiWeixiuDAL"); 
+            OBJECT_PATH.Add(DALInterface.IOA_ShebeiWeixiuDAL, "OA_ShebeiWeixiuDAL");
+            OBJECT_PATH.Add(DALInterface.IOA_GongzuozhizeDAL, "OA_GongzuozhizeDAL");
             OBJECT_PATH.Add(DALInterface.IOA_KaipiaonewDAL, "OA_KaipiaonewDAL");
             OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderDAL, "CoreCmsPlanOrderDAL");
             OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderItemDAL, "CoreCmsPlanOrderItemDAL");
@@ -979,6 +980,12 @@
 
 
         /// <summary>
+        /// 宸ヤ綔鑱岃矗
+        /// </summary>
+        IOA_GongzuozhizeDAL = 1950,
+
+
+        /// <summary>
         /// 寮�绁ㄧ敵璇�
         /// </summary>
         IOA_KaipiaonewDAL = 1932,
diff --git a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
index e99f05e..5a19570 100644
--- a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
+++ b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
@@ -185,6 +185,7 @@
     <Compile Include="OA\OA_KaipiaoshenqingBLL.cs" />
     <Compile Include="OA\OA_ShebeiCateBLL.cs" />
     <Compile Include="OA\OA_PropertyCateBLL.cs" />
+    <Compile Include="OA\OA_GongzuozhizeBLL.cs" />
     <Compile Include="OA\OA_ShebeiWeixiuBLL.cs" />
     <Compile Include="OA\OA_ShebeiManageBLL.cs" />
     <Compile Include="OA\OA_PropertyManageBLL.cs" />
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_GongzuozhizeBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_GongzuozhizeBLL.cs
new file mode 100644
index 0000000..3d13731
--- /dev/null
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_GongzuozhizeBLL.cs
@@ -0,0 +1,100 @@
+锘縰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_GongzuozhizeBLL
+    {
+        IOA_GongzuozhizeDAL iOA_GongzuozhizeDAL = null;
+
+        public OA_GongzuozhizeBLL()
+        {
+            iOA_GongzuozhizeDAL = Factory.GetDALByInterfaceName(DALInterface.IOA_GongzuozhizeDAL) as IOA_GongzuozhizeDAL;
+        }
+
+        /// <summary>
+        /// 娣诲姞
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool InsertModel(Model.OA_Gongzuozhize model)
+        {
+            return iOA_GongzuozhizeDAL.InserModel(model);
+        }
+
+        /// <summary>
+        /// 鏇存柊
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool UpdateModel(Model.OA_Gongzuozhize model)
+        {
+
+            return iOA_GongzuozhizeDAL.UpdateModel(model);
+        }
+
+        /// <summary>
+        /// 鍒犻櫎
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool DeleteModel(Model.OA_Gongzuozhize model)
+        {
+
+            return iOA_GongzuozhizeDAL.DeleteModel(model);
+        }
+
+        /// <summary>
+        /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="Keyid">缂栧彿</param>
+        /// <returns></returns>
+        public OA_Gongzuozhize GetModelByKeyid(int? Keyid)
+        {
+            return iOA_GongzuozhizeDAL.GetModelByKeyid(Keyid);
+        }
+
+        /// <summary>
+        /// 鍒嗛〉鏌ヨ
+        /// </summary>
+        /// <param name="pagination"></param>
+        /// <returns></returns>
+        public IEnumerable<Model.OA_Gongzuozhize> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid _MemberId, string Gongzuozhize, int? Zerenren)
+        {
+            return iOA_GongzuozhizeDAL.SelectModelPage(pagination, _MemberId, Gongzuozhize, Zerenren);
+        }
+
+
+        /// <summary>
+        /// 鏌ヨ鍏ㄩ儴
+        /// </summary>
+        /// <param name="pagination"></param>
+        /// <returns></returns>
+        public IEnumerable<Model.OA_Gongzuozhize> SelectAllModel(Query query)
+        {
+            return iOA_GongzuozhizeDAL.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)
+        {
+            return iOA_GongzuozhizeDAL.IsExitsName( Zerenren, 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 4e88652..85cc90e 100644
--- a/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
+++ b/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
@@ -174,6 +174,7 @@
     <Compile Include="OA\IOA_KaipiaonewDAL.cs" />
     <Compile Include="OA\IOA_KipiaoshenqingDAL.cs" />
     <Compile Include="OA\IOA_ShebeiCateDAL.cs" />
+    <Compile Include="OA\IOA_GongzuozhizeDAL.cs" />
     <Compile Include="OA\IOA_ShebeiWeixiuDAL.cs" />
     <Compile Include="OA\IOA_ShebeiManageDAL.cs" />
     <Compile Include="OA\IOA_ShejijijianDAL.cs" />
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_GongzuozhizeDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_GongzuozhizeDAL.cs
new file mode 100644
index 0000000..0700470
--- /dev/null
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_GongzuozhizeDAL.cs
@@ -0,0 +1,40 @@
+锘縰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_GongzuozhizeDAL : ICommonDAL, IPaging<OA_Gongzuozhize>, IGetAllModel<OA_Gongzuozhize>
+    {
+        /// <summary>
+        /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="Keyid">缂栧彿</param>
+        /// <returns></returns>
+        OA_Gongzuozhize GetModelByKeyid(int? Keyid);
+
+        /// <summary>
+        /// 鍒嗛〉鏌ヨ
+        /// </summary>
+        /// <param name="pagination"></param>
+        /// <returns></returns>
+        IEnumerable<Model.OA_Gongzuozhize> 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);
+
+        
+    }
+}
\ 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 773cbf7..a17f760 100644
--- a/CY_ECommercePlatform/CY.Model/CY.Model.csproj
+++ b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
@@ -255,6 +255,7 @@
     <Compile Include="OA\OA_Procurement.cs" />
     <Compile Include="OA\OA_ShebeiCate.cs" />
     <Compile Include="OA\OA_PropertyCate.cs" />
+    <Compile Include="OA\OA_Gongzuozhize.cs" />
     <Compile Include="OA\OA_ShebeiManage.cs" />
     <Compile Include="OA\OA_PropertyManage.cs" />
     <Compile Include="OA\OA_PropertyRecord.cs" />
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Gongzuozhize.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Gongzuozhize.cs
new file mode 100644
index 0000000..6b3fc2c
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Gongzuozhize.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_Gongzuozhize : IAggregateRoot
+    {
+        public OA_Gongzuozhize()
+        {
+        }
+        #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.SQLDAL/CY.SQLDAL.csproj b/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
index 8201313..5d0cc10 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
+++ b/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
@@ -200,6 +200,7 @@
     <Compile Include="OA\OA_KipiaoshenqingDAL.cs" />
     <Compile Include="OA\OA_ShebeiCateDAL.cs" />
     <Compile Include="OA\OA_PropertyCateDAL.cs" />
+    <Compile Include="OA\OA_GongzuozhizeDAL.cs" />
     <Compile Include="OA\OA_ShebeiWeixiuDAL.cs" />
     <Compile Include="OA\OA_ShebeiManageDAL.cs" />
     <Compile Include="OA\OA_PropertyManageDAL.cs" />
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderDAL.cs
index 18c1680..174721d 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderDAL.cs
@@ -270,7 +270,7 @@
         /// <returns></returns>
         public IEnumerable<Model.CoreCmsPlanOrder> GetModelByorderid(int orderid)
         {
-            return _dataBase.SelectModel<Model.CoreCmsPlanOrder>(" * ", " CoreCmsPlanOrder ", " orderkeyid = " + orderid + "") as IList<Model.CoreCmsPlanOrder>;//鎵ц鏌ヨ
+            return _dataBase.SelectModel<Model.CoreCmsPlanOrder>(" * ", " CoreCmsPlanOrder ", " orderkeyid = " + orderid + " order by [pianqu]") as IList<Model.CoreCmsPlanOrder>;//鎵ц鏌ヨ
         }
 
 
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_GongzuozhizeDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_GongzuozhizeDAL.cs
new file mode 100644
index 0000000..8430a3a
--- /dev/null
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_GongzuozhizeDAL.cs
@@ -0,0 +1,249 @@
+锘縰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_GongzuozhizeDAL : IOA_GongzuozhizeDAL
+    {
+        private Database _dataBase = null;
+
+        public OA_GongzuozhizeDAL()
+        {
+            _dataBase = new Database();
+        }
+
+        public OA_GongzuozhizeDAL(Database dataBase)
+        {
+            _dataBase = dataBase;
+        }
+
+        /// <summary>
+        /// 鏂板
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
+        {
+            Model.OA_Gongzuozhize trueModel = model as Model.OA_Gongzuozhize;
+            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_Gongzuozhize ([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_Gongzuozhize trueModel = model as Model.OA_Gongzuozhize;
+            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_Gongzuozhize 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_Gongzuozhize trueModel = model as Model.OA_Gongzuozhize;
+            if (trueModel == null)
+            {
+                return false;
+            }
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+                {
+                	new SqlParameter("@Keyid",trueModel.Keyid)
+                };
+            string sql = "Delete OA_Gongzuozhize 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_Gongzuozhize> SelectModelPage(Infrastructure.Query.Query query, Infrastructure.Query.Pagination pagination)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// 鍗曚釜鏌ヨ
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public IEnumerable<Model.OA_Gongzuozhize> SelectAllModel(Infrastructure.Query.Query query)
+        {
+            return _dataBase.SelectModel<Model.OA_Gongzuozhize>(" * ", " OA_Gongzuozhize ") as IList<Model.OA_Gongzuozhize>;//鎵ц鏌ヨ
+        }
+
+        /// <summary>
+        /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="Keyid">缂栧彿</param>
+        /// <returns></returns>
+        public OA_Gongzuozhize GetModelByKeyid(int? Keyid)
+        {
+            try
+            {
+                if (Keyid == null || Keyid < 0)
+                    return null;//閿欒鏁版嵁杩斾細绌� 
+
+                IList<OA_Gongzuozhize> result = _dataBase.SelectModel<OA_Gongzuozhize>(" * ", " OA_Gongzuozhize ", string.Format(" Keyid='{0}'", Keyid)) as IList<OA_Gongzuozhize>;//鎵ц鏌ヨ
+
+                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_Gongzuozhize> 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_Gongzuozhize>(pagination, " a.*  ", " OA_Gongzuozhize a ", " a.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(int? Zerenren, int? Keyid)
+        {
+            try
+            {
+                string where = " Zerenren = " + Zerenren + " ";
+
+                if (Keyid.HasValue)
+                {
+                    where += " and Keyid <> " + Keyid + " ";
+                }
+
+                IList<OA_CarManage> result = _dataBase.SelectModel<OA_CarManage>("*", "OA_Gongzuozhize", 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 5ca4941..5a575d6 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -2841,6 +2841,8 @@
     <Content Include="Pages\work\BaoxiaoReplyAdd.aspx" />
     <Content Include="Pages\work\RequestReplyAdd.aspx" />
     <Content Include="Pages\work\RequestReplyList.aspx" />
+    <Content Include="Pages\work\GongzuozhizeList.aspx" />
+    <Content Include="Pages\work\GongzuozhizeEdit.aspx" />
     <Content Include="Pages\work\WorkPlanAdd.aspx" />
     <Content Include="Pages\work\WorkPlanDetail.aspx" />
     <Content Include="Pages\work\WorkPlanList.aspx" />
@@ -9482,6 +9484,20 @@
     <Compile Include="Pages\work\RequestReplyList.aspx.designer.cs">
       <DependentUpon>RequestReplyList.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Pages\work\GongzuozhizeList.aspx.cs">
+      <DependentUpon>GongzuozhizeList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\work\GongzuozhizeList.aspx.designer.cs">
+      <DependentUpon>GongzuozhizeList.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\work\GongzuozhizeEdit.aspx.cs">
+      <DependentUpon>GongzuozhizeEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\work\GongzuozhizeEdit.aspx.designer.cs">
+      <DependentUpon>GongzuozhizeEdit.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/DeliverWorkBookSonghuo.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
index ff4394f..31d51da 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
@@ -41,13 +41,13 @@
             {
                  
 
-                BindList();
+                BindList("diyici");
             }
              
         }
 
         //缁戝畾鏁版嵁
-        private void BindList()
+        private void BindList(string diyici="")
         {
             string orderIdStr = Request["orderId"];
             this.hideOrderId.Value = orderIdStr;
@@ -158,11 +158,40 @@
 
                     if (string.IsNullOrEmpty(OrderState))
                     {
-                        coreCmsPlanOrder.biaoge += biaoge;
-                        if(PlanOrderid.Count(x=>x == coreCmsPlanOrder.id) == 0)
+                       
+                        if (string.IsNullOrEmpty(diyici))
                         {
-                            PlanOrderid.Add(coreCmsPlanOrder.id);
+                            coreCmsPlanOrder.biaoge += biaoge;
+                            if (PlanOrderid.Count(x => x == coreCmsPlanOrder.id) == 0)
+                            {
+                                PlanOrderid.Add(coreCmsPlanOrder.id);
+                            }
                         }
+                        else
+                        {
+                            var jihuashuliang = cmsPlanOrderItems1.Sum(x => x.nums);
+                            var coreDeliverOrderItems2 = coreDeliverOrderItems.Where(x => x.PlanOrderId == coreCmsPlanOrder.id);
+                            var songhuoshuliang = coreDeliverOrderItems2.Sum(x => x.Number);
+                            var jieyueshuliang = coreDeliverOrderItems2.Sum(x => x.LessNumber);
+                            if (songhuoshuliang <= 0 && jieyueshuliang <= 0)
+                            {
+                                coreCmsPlanOrder.biaoge += biaoge;
+                                if (PlanOrderid.Count(x => x == coreCmsPlanOrder.id) == 0)
+                                {
+                                    PlanOrderid.Add(coreCmsPlanOrder.id);
+                                }
+                            }
+                            else if (songhuoshuliang + jieyueshuliang < jihuashuliang && jihuashuliang > 0 && songhuoshuliang + jieyueshuliang > 0)
+                            {
+                                coreCmsPlanOrder.biaoge += biaoge;
+                                if (PlanOrderid.Count(x => x == coreCmsPlanOrder.id) == 0)
+                                {
+                                    PlanOrderid.Add(coreCmsPlanOrder.id);
+                                }
+                            }
+                        }
+                       
+                        
                     }
                     else if (OrderState == "0")
                     {
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs
index 77c263d..635df8e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs
@@ -60,6 +60,7 @@
         OA_WageManageBLL bll_OA_WageManageBLL = null;
         OA_WageAwardPunishBLL bll_OA_WageAwardPunishBLL = null;
         OA_CustomerAccessRecordBLL bll_OA_CustomerAccessRecordBLL = null;
+        OA_GongzuozhizeBLL bll_OA_GongzuozhizeBLL = null;
 
         public string old_province = "";
         public string old_city = "";
@@ -103,6 +104,7 @@
             bll_OA_WageManageBLL = new OA_WageManageBLL();
             bll_OA_WageAwardPunishBLL = new OA_WageAwardPunishBLL();
             bll_OA_CustomerAccessRecordBLL = new OA_CustomerAccessRecordBLL();
+            bll_OA_GongzuozhizeBLL = new OA_GongzuozhizeBLL();
         }
 
         protected void Page_Load(object sender, EventArgs e)
@@ -247,6 +249,18 @@
             else if (Request["dateType"] == "shebeiNamecheckname")
             {
                 Response.Write(IsExitsShebeiNameCateName(Request["name"], Request["keyid"]));
+            }
+            else if (Request["dateType"] == "Gongzuozhizeckname")
+            {
+                if (string.IsNullOrEmpty(Request["name"]))
+                {
+                    Response.Write(1);
+                }
+                else
+                {
+                    Response.Write(IsExitsGongzuozhizeName(Request["name"], Request["keyid"]));
+                }
+               
             }
             else if (Request["dateType"] == "resumeCateChange")
             {
@@ -1444,6 +1458,18 @@
             return bll_OA_ShebeiManageBLL.IsExitsName(Name, CurrentUser.MemberId, Keyid);
         }
 
+
+        /// <summary>
+        /// 妫�娴嬭鏀跨墿鍝佹槸鍚﹂噸澶�
+        /// </summary>
+        /// <param name="Name"></param>
+        /// <param name="Keyid"></param>
+        /// <returns></returns>
+        public int IsExitsGongzuozhizeName(string Name, string Keyid)
+        {
+            return bll_OA_GongzuozhizeBLL.IsExitsName(Name.ToInt32(), Keyid.ToInt32());
+        }
+
         #endregion
 
         #region 鏍规嵁鑱屼綅绫诲埆鑾峰彇鍏ㄩ儴鑱屼綅
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuozhizeEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuozhizeEdit.aspx
new file mode 100644
index 0000000..59828fb
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuozhizeEdit.aspx
@@ -0,0 +1,165 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="GongzuozhizeEdit.aspx.cs" Inherits="CY.WebForm.Pages.work.GongzuozhizeEdit" %>
+
+<!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());
+            if (Name != "") {
+                $.ajax({
+                    url: "/Pages/common/CommonAjax.aspx",
+                    type: "POST",
+                    dataType: "html",
+                    data: { dateType: "Gongzuozhizeckname", 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;
+        }
+
+
+
+
+        //涓篠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/GongzuozhizeEdit.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"));
+                        }
+                    }
+                }
+            });
+        }
+
+    </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 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/GongzuozhizeEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuozhizeEdit.aspx.cs
new file mode 100644
index 0000000..a70509b
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuozhizeEdit.aspx.cs
@@ -0,0 +1,195 @@
+锘縰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 GongzuozhizeEdit : BasePage
+    {
+        OA_GongzuozhizeBLL bll_OA_GongzuozhizeBLL = null;
+        OA_StaffBLL bll_OA_StaffBLL = null;
+        OA_DepartmentBll bll_OA_DepartmentBll = null;
+
+        public GongzuozhizeEdit()
+        {
+            bll_OA_GongzuozhizeBLL = new OA_GongzuozhizeBLL();
+            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.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_Gongzuozhize m_OA_Gongzuozhize = bll_OA_GongzuozhizeBLL.GetModelByKeyid(Request["keyid"].ToInt32());
+            if (m_OA_Gongzuozhize != null)
+            {
+                
+                this.txtCarNumbera.Value = m_OA_Gongzuozhize.Gongzuozhize;
+                
+                this.selZerenren.Value = m_OA_Gongzuozhize.Zerenren.HasValue? m_OA_Gongzuozhize.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_Gongzuozhize m_OA_Gongzuozhize = bll_OA_GongzuozhizeBLL.GetModelByKeyid(Request["keyid"].ToInt32());
+                if (m_OA_Gongzuozhize == null)
+                {
+                    m_OA_Gongzuozhize = new OA_Gongzuozhize();
+                    m_OA_Gongzuozhize.MemberId = CurrentUser.MemberId;
+                  
+                  
+                }
+               
+                m_OA_Gongzuozhize.Gongzuozhize = this.txtCarNumbera.Value;
+               
+
+                m_OA_Gongzuozhize.Zerenren = this.selZerenren.Value.ToInt32();
+                var a_Staff = bll_OA_StaffBLL.GetModelByKeyid(m_OA_Gongzuozhize.Zerenren);
+                if (a_Staff != null)
+                {
+                    m_OA_Gongzuozhize.ZerenrenName = a_Staff.Name;
+                }
+                else
+                {
+                    m_OA_Gongzuozhize.ZerenrenName = "";
+                }
+               
+                m_OA_Gongzuozhize.Updator = CurrentUser.ShortName;
+                m_OA_Gongzuozhize.LastUpdateTime = nowTime;
+               
+
+                if (Request["keyid"].ToInt32() > 0)
+                {
+                    if (bll_OA_GongzuozhizeBLL.UpdateModel(m_OA_Gongzuozhize))
+                    {
+                        JavaScript.MessageBox("鏇存柊鎴愬姛", this, true, true);
+                    }
+                       
+                    else
+                        JavaScript.MessageBox("鏇存柊澶辫触", this);
+                }
+                else
+                {
+                    m_OA_Gongzuozhize.Creator = CurrentUser.ShortName;
+                    m_OA_Gongzuozhize.CreateTime = nowTime;
+                    if (bll_OA_GongzuozhizeBLL.InsertModel(m_OA_Gongzuozhize))
+                    {
+                        this.txtCarNumbera.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/GongzuozhizeEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuozhizeEdit.aspx.designer.cs
new file mode 100644
index 0000000..f0277ed
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuozhizeEdit.aspx.designer.cs
@@ -0,0 +1,80 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.work
+{
+
+
+    public partial class GongzuozhizeEdit
+    {
+
+        /// <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>
+        /// btn_submit 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btn_submit;
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuozhizeList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuozhizeList.aspx
new file mode 100644
index 0000000..889ef56
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuozhizeList.aspx
@@ -0,0 +1,182 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="GongzuozhizeList.aspx.cs" Inherits="CY.WebForm.Pages.work.GongzuozhizeList" %>
+
+<!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/GongzuozhizeEdit.aspx?keyid=" + keyid, Title: "宸ヤ綔鑱岃矗淇敼", Width: 500, Height: 430 });
+        }
+
+        //娣诲姞
+        function addModel() {
+            top.Dialog.open({ URL: "/Pages/work/GongzuozhizeEdit.aspx", Title: "宸ヤ綔鑱岃矗鏂板", Width: 500, Height: 430 });
+        }
+
+        //鍒犻櫎
+        function onDele(keyid) {
+            top.Dialog.confirm("纭畾瑕佹姤搴熻宸ヤ綔鑱岃矗鍚楋紵", function () {
+                window.location = "/Pages/work/GongzuozhizeList.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("纭畾瑕佸垹闄ゆ墍閫夊伐浣滆亴璐e悧锛�", function () {
+                    window.location = "/Pages/work/GongzuozhizeList.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/GongzuozhizeList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuozhizeList.aspx.cs
new file mode 100644
index 0000000..666912a
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuozhizeList.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 GongzuozhizeList : BasePage
+    {
+        
+        OA_GongzuozhizeBLL bll_OA_GongzuozhizeBLL = null;
+        OA_StaffBLL bll_OA_StaffBLL = null;
+        
+        //鍒濆鍖�
+        public GongzuozhizeList()
+        {
+           
+            bll_OA_GongzuozhizeBLL = new OA_GongzuozhizeBLL();
+            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_Gongzuozhize model = bll_OA_GongzuozhizeBLL.GetModelByKeyid(Request["delete"].ToInt32());
+                if (model != null && model.Keyid != null)
+                {
+                   
+                    bll_OA_GongzuozhizeBLL.DeleteModel(model);
+                    JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
+                    Response.Redirect("/Pages/work/GongzuozhizeList.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_Gongzuozhize model = bll_OA_GongzuozhizeBLL.GetModelByKeyid(keyId.ToInt32());
+                    if (model.Keyid != null && model != null)
+                        bll_OA_GongzuozhizeBLL.DeleteModel(model);
+                    else
+                    {
+                        JavaScript.MessageBox("鍒犻櫎澶辫触", this);
+                        return;
+                    }
+                }
+                JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
+                Response.Redirect("/Pages/work/GongzuozhizeList.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 Gongzuozhizes = bll_OA_GongzuozhizeBLL.SelectModelPage(pa, CurrentUser.MemberId,   this.txtName.Value, this.selZerenren.Value.ToInt32());
+             
+            
+            this.RepClientList.DataSource = Gongzuozhizes;
+            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/GongzuozhizeList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuozhizeList.aspx.designer.cs
new file mode 100644
index 0000000..01c9646
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/GongzuozhizeList.aspx.designer.cs
@@ -0,0 +1,89 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.work
+{
+
+
+    public partial class GongzuozhizeList
+    {
+
+        /// <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