From f47da9571d16108fcab2bf6d55279a08ce2e7cbf Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 15 十一月 2024 14:29:14 +0800
Subject: [PATCH] 计划订单相关功能

---
 CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx                             |   25 
 CY_ECommercePlatform/CY.WebForm/js/business/Order.js                                       |    4 
 CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs                                          |   10 
 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs                           |   24 
 CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderDAL.cs                                    |   54 
 CY_ECommercePlatform/CY.WebForm/Pages/business/jisuanjine.aspx.designer.cs                 |  323 +
 CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs                               |  241 +
 CY_ECommercePlatform/CY.WebForm/Pages/business/BackVisitNoteEdit.aspx                      |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.designer.cs |   53 
 CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.designer.cs                 |  126 
 CY_ECommercePlatform/CY.Infrastructure/Configuration/ConfigurationSetting.cs               |    7 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairList.aspx                           |  160 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairAdd.aspx.cs                         |   78 
 CY_ECommercePlatform/CY.SQLDAL/OA/OA_CarrepairDAL.cs                                       |  219 
 CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderEdit.aspx.designer.cs              |  143 
 CY_ECommercePlatform/CY.SQLDAL/Database.cs                                                 |   28 
 CY_ECommercePlatform/CY.WebForm/packages.config                                            |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx.cs                 |  103 
 CY_ECommercePlatform/CY.Model/Inquiry/SysInquiry_WorkBookType.cs                           |   19 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageList.aspx.designer.cs               |   30 
 CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj                                          |  128 
 CY_ECommercePlatform/CY.WebForm/Pages/business/WorkBookUpLoad.aspx                         |  197 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarInsuranceAdd.aspx                         |    2 
 CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj                                            |    3 
 CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj                                                |    3 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedList.aspx.cs                      |    2 
 CY_ECommercePlatform/CY.Model/Inquiry/InquiryWorkBookModel.cs                              |   16 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedAdd.aspx.designer.cs              |   32 
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx                   |  160 
 CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderList.aspx                          |  253 +
 CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderList.aspx.designer.cs              |  143 
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx                 |  166 
 CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js                                      |   39 
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookDetail.aspx                  |  156 
 CY_ECommercePlatform/CY.BLL/OA/OA_CarrepairBLL.cs                                          |   75 
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.designer.cs     |  107 
 CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs                          |   36 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairAdd.aspx                            |   59 
 CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs                                           |    8 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedDetail.aspx                       |   10 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarMaintenanceDetail.aspx.cs                 |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx.cs                |   84 
 CY_ECommercePlatform/CY.BLL/Sys/Sys_CitySiteBLL.cs                                         |   12 
 CY_ECommercePlatform/CY.SQLDAL/OA/OA_CarExaminedDAL.cs                                     |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairDetail.aspx.cs                      |   56 
 CY_ECommercePlatform/CY.WebForm/js/business/BackVisitNote.js                               |    2 
 CY_ECommercePlatform/AbstractFactory/Factory.cs                                            |   19 
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx.designer.cs       |   89 
 CY_ECommercePlatform/CY.Model/OA/OA_Carrepair.cs                                           |  240 +
 CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderAdd.aspx                           |  187 
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx             |  121 
 CY_ECommercePlatform/CY.Model/OA/OA_CarInsurance.cs                                        |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs              |  172 
 CY_ECommercePlatform/CY.WebForm/Pages/business/WorkBookUpLoad.aspx.designer.cs             |   71 
 CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderEdit.aspx.cs                       |  161 
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx                    |  204 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedDetail.aspx.designer.cs           |   30 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarInsuranceDetail.aspx.designer.cs          |   32 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageAdd.aspx.cs                         |   47 
 CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx.designer.cs                 |   32 
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx.designer.cs        |  134 
 CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.cs                          |   10 
 CY_ECommercePlatform/CY.Model/OA/OA_CarExamined.cs                                         |   14 
 CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs                |   10 
 CY_ECommercePlatform/CY.IDAL/OA/IOA_CarrepairDAL.cs                                        |   30 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairList.aspx.cs                        |   98 
 CY_ECommercePlatform/CY.WebForm/js/common/Printter.js                                      |   18 
 CY_ECommercePlatform/CY.BLL/CY.BLL.csproj                                                  |    3 
 CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderItemDAL.cs                                |   45 
 CY_ECommercePlatform/CY.Model/OA/OA_CarManage.cs                                           |  102 
 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx                            |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs                         |    7 
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.cs          |  205 
 CY_ECommercePlatform/CY.WebForm/images/jihuageshi/上传计划订单.xlsx                              |    0 
 CY_ECommercePlatform/CY.WebForm/Pages/business/WorkBookUpLoad.aspx.cs                      |  190 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairList.aspx.designer.cs               |   98 
 CY_ECommercePlatform/CY.Model/CY.Model.csproj                                              |    4 
 CY_ECommercePlatform/CY.SQLDAL/OA/OA_CarManageDAL.cs                                       |   79 
 CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrderItem.cs                                   |  200 
 CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs                                       |   17 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedList.aspx.designer.cs             |   36 
 CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrder.cs                                       |  514 ++
 CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx                           |   10 
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookDetail.aspx.cs               |  140 
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookDetail.aspx.designer.cs      |   89 
 CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx                          |    1 
 CY_ECommercePlatform/CY.WebForm/Pages/business/jisuanjine.aspx.cs                          |  906 +++
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedList.aspx                         |   16 
 CY_ECommercePlatform/CY.WebForm/Pages/front/WorkBook.aspx.cs                               |    8 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedAdd.aspx.cs                       |    8 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairDetail.aspx                         |   55 
 CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderBLL.cs                                      |  237 +
 CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs                                         |   87 
 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx                              |    9 
 CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderList.aspx.cs                       |  596 ++
 CY_ECommercePlatform/CY.IDAL/OA/IOA_CarExaminedDAL.cs                                      |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageList.aspx                           |   28 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedDetail.aspx.cs                    |    2 
 CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs                                      |   73 
 CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderAdd.aspx.cs                        |  327 +
 CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderDetail.aspx.cs                     |   53 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarInsuranceDetail.aspx                      |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/business/jisuanjine.aspx                             | 1435 ++++++
 CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderAdd.aspx.designer.cs               |  143 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarInsuranceAdd.aspx.designer.cs             |   34 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairDetail.aspx.designer.cs             |   80 
 CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderDetail.aspx                        |  126 
 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx                              |   13 
 CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs                                               |   30 
 CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderDAL.cs                                   |  425 +
 CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx                             |   12 
 CY_ECommercePlatform/CY.Model/OA/CoreDeliverOrderItem.cs                                   |  144 
 CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderItemBLL.cs                                  |  146 
 CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderEdit.aspx                          |  177 
 CY_ECommercePlatform/UploadFiles/Web.config                                                |    4 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedAdd.aspx                          |   10 
 CY_ECommercePlatform/CY.WebForm/MainPage.cs                                                |   35 
 CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderDetail.aspx.designer.cs            |  125 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageAdd.aspx.designer.cs                |  122 
 CY_ECommercePlatform/CY.WebForm/Pages/front/WorkBook.aspx                                  |  962 +++-
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageAdd.aspx                            |  287 +
 CY_ECommercePlatform/CY.WebForm/Web.config                                                 |    9 
 CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairAdd.aspx.designer.cs                |   89 
 123 files changed, 13,167 insertions(+), 517 deletions(-)

diff --git a/CY_ECommercePlatform/AbstractFactory/Factory.cs b/CY_ECommercePlatform/AbstractFactory/Factory.cs
index 518cf07..c25303e 100644
--- a/CY_ECommercePlatform/AbstractFactory/Factory.cs
+++ b/CY_ECommercePlatform/AbstractFactory/Factory.cs
@@ -231,6 +231,7 @@
             OBJECT_PATH.Add(DALInterface.IOA_CarExaminedDAL, "OA_CarExaminedDAL");
             OBJECT_PATH.Add(DALInterface.IOA_CarInsuranceDAL, "OA_CarInsuranceDAL");
             OBJECT_PATH.Add(DALInterface.IOA_CarMaintenanceDAL, "OA_CarMaintenanceDAL");
+            OBJECT_PATH.Add(DALInterface.IOA_CarrepairDAL, "OA_CarrepairDAL"); 
             OBJECT_PATH.Add(DALInterface.IOA_CarManageDAL, "OA_CarManageDAL");
             OBJECT_PATH.Add(DALInterface.IOA_CarTransferDAL, "OA_CarTransferDAL");
             OBJECT_PATH.Add(DALInterface.IOA_CarViolationDAL, "OA_CarViolationDAL");
@@ -258,6 +259,8 @@
             OBJECT_PATH.Add(DALInterface.IOA_WageAwardPunishDAL, "OA_WageAwardPunishDAL");
             OBJECT_PATH.Add(DALInterface.IOA_DeliverPlanDAL, "OA_DeliverPlanDAL");
             OBJECT_PATH.Add(DALInterface.IOA_KipiaoshenqingDAL, "OA_KipiaoshenqingDAL");
+            OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderDAL, "CoreCmsPlanOrderDAL");
+            OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderItemDAL, "CoreCmsPlanOrderItemDAL");
             OBJECT_PATH.Add(DALInterface.IOA_YujihuikuanDAL, "OA_YujihuikuanDAL");
             OBJECT_PATH.Add(DALInterface.IOA_CuikuanjiluDAL, "OA_CuikuanjiluDAL"); 
             #endregion
@@ -747,7 +750,7 @@
         /// </summary>
         IOA_WorkPlanDAL = 100,
         /// <summary>
-        /// 杞﹁締骞村璁板綍鏁版嵁璁块棶鎺ュ彛
+        /// 杞﹁締骞存璁板綍鏁版嵁璁块棶鎺ュ彛
         /// </summary>
         IOA_CarExaminedDAL = 101,
         /// <summary>
@@ -758,6 +761,10 @@
         /// 杞﹁締淇濆吇璁板綍鏁版嵁璁块棶鎺ュ彛
         /// </summary>
         IOA_CarMaintenanceDAL = 103,
+        /// <summary>
+        /// 杞﹁締缁翠慨璁板綍鏁版嵁璁块棶鎺ュ彛
+        /// </summary>
+        IOA_CarrepairDAL = 666,
         /// <summary>
         /// 杞﹁締绠$悊鏁版嵁璁块棶鎺ュ彛
         /// </summary>
@@ -866,6 +873,16 @@
         /// 寮�绁ㄧ敵璇�
         /// </summary>
         IOA_KipiaoshenqingDAL = 1131,
+
+        /// <summary>
+        /// 璁″垝璁㈠崟
+        /// </summary>
+        ICoreCmsPlanOrderDAL = 1231,
+
+        /// <summary>
+        /// 璁″垝璁㈠崟鏄庣粏
+        /// </summary>
+        ICoreCmsPlanOrderItemDAL = 1331,
         /// <summary>
         /// 棰勮鏀舵鏃堕棿
         /// </summary>
diff --git a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
index e59e75d..be53784 100644
--- a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
+++ b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
@@ -153,11 +153,14 @@
     <Compile Include="Integrity\Integrity_IntegrityCardBLL.cs" />
     <Compile Include="Integrity\Integrity_CreditLevelRuleBLL.cs" />
     <Compile Include="LF\LF_OrderFileBLL.cs" />
+    <Compile Include="OA\CoreCmsPlanOrderBLL.cs" />
+    <Compile Include="OA\CoreCmsPlanOrderItemBLL.cs" />
     <Compile Include="OA\OA_CarDictionaryBLL.cs" />
     <Compile Include="OA\OA_CarExaminedBLL.cs" />
     <Compile Include="OA\OA_CarInsuranceBLL.cs" />
     <Compile Include="OA\OA_CarMaintenanceBLL.cs" />
     <Compile Include="OA\OA_CarManageBLL.cs" />
+    <Compile Include="OA\OA_CarrepairBLL.cs" />
     <Compile Include="OA\OA_CarTransferBLL.cs" />
     <Compile Include="OA\OA_CarViolationBLL.cs" />
     <Compile Include="OA\OA_CorporateClientsContractBLL.cs" />
diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
index c6c67a2..6686e61 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -29,6 +29,9 @@
 using CY.Model;
 using CY.IDAL;
 using CY.Infrastructure.Query;
+using CY.Model.Inquiry;
+using CY.Infrastructure.Common;
+using CY.IDAL.EC;
 
 namespace CY.BLL.EC
 {
@@ -38,10 +41,11 @@
     public class EC_OrderBasicBLL
     {
         IEC_OrderBasicDAL _eC_OrderBasicDAL = null;
-
+        IEC_OrderPrintParameterDAL _eC_OrderPrintParameterDAL = null;
         public EC_OrderBasicBLL()
         {
             _eC_OrderBasicDAL = AbstractFactory.Factory.GetDALByInterfaceName(AbstractFactory.DALInterface.IEC_OrderBasicDAL) as IEC_OrderBasicDAL;
+            _eC_OrderPrintParameterDAL = AbstractFactory.Factory.GetDALByInterfaceName(AbstractFactory.DALInterface.IEC_OrderPrintParameterDAL) as IEC_OrderPrintParameterDAL;
         }
 
         /// <summary>
@@ -64,6 +68,17 @@
         public IEnumerable<EC_OrderBasic> SelectModelPage_Seller(Infrastructure.Query.Pagination pagination, Dictionary<int, object> searchParam)
         {
             return _eC_OrderBasicDAL.SelectModelPage_Seller(pagination, searchParam);
+        }
+
+
+        /// <summary>
+        /// 浣滀笟鏈�佽揣鍒嗛〉鏌ヨ
+        /// </summary>
+        /// <param name="pagination"></param>
+        /// <returns></returns>
+        public IEnumerable<EC_OrderBasic> SelectModelPageWorkBook(Infrastructure.Query.Pagination pagination, Guid _MemberID, string txtBeginDate, string txtEndDate, string txtOrderId, string txtSearchyjname, string selCustormerManager, string selBusinessManager, string selOrderStates)
+        {
+            return _eC_OrderBasicDAL.SelectModelPageWorkBook(pagination, _MemberID, txtBeginDate, txtEndDate, txtOrderId, txtSearchyjname, selCustormerManager, selBusinessManager, selOrderStates);
         }
 
         /// <summary>
@@ -645,5 +660,75 @@
         {
             return _eC_OrderBasicDAL.GetEC_OrderBasicListBydeliverorderId(deliverorderId, FirmId);
         }
+
+
+        /// <summary>
+        /// 閲嶆柊璁$畻璁㈠崟鐨勯噾棰�
+        /// </summary>
+        /// <param name="orderOperate"></param>
+        /// <returns></returns>
+        public bool UpdateorderJine(int orderId)
+        {
+            CoreCmsPlanOrderBLL _PlanOrderBLL = new CoreCmsPlanOrderBLL();
+            CoreCmsPlanOrderItemBLL _coreCmsPlanOrderItemBLL = new CoreCmsPlanOrderItemBLL();
+
+            var  eC_OrderBasic  = this.SelectModelById(orderId);
+            EC_OrderPrintParameterBLL _OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
+            var eC_OrderPrintParameter = _OrderPrintParameterBLL.GetModel(orderId);
+           InquiryCommonModel model = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
+
+            //eC_OrderBasic.SumPrice =12 ;
+            //eC_OrderBasic.UnitPrice = 12;
+            var sss = model.InquiryWorkBookList;
+
+            var coreCmsPlanOrders = _PlanOrderBLL.GetModelByorderid(orderId).ToList();
+
+
+            decimal SumPrice = 0;
+            int num = 0;
+
+            var coreCmsPlanOrders2 = new List<CoreCmsPlanOrderItem>();
+
+            foreach (var coreCmsPlanOrder  in coreCmsPlanOrders)
+            {
+                var coreCmsPlanOrders1  = _coreCmsPlanOrderItemBLL.GetModelsByOrderid(coreCmsPlanOrder.id).ToList();
+                coreCmsPlanOrders2.AddRange(coreCmsPlanOrders1);
+
+                num += coreCmsPlanOrders1.Sum(x=>x.nums);
+                SumPrice += coreCmsPlanOrders1.Sum(x => x.amount);
+
+            }
+
+            eC_OrderBasic.SumPrice = SumPrice;
+            if (num > 0)
+            {
+                eC_OrderBasic.UnitPrice = Math.Round(SumPrice / new decimal(num), 4);
+            }
+            else
+            {
+                eC_OrderBasic.UnitPrice = 0;
+            }
+            
+
+
+            model.PrintCount = num;
+            foreach ( var inquiryWorkBookModel in model.InquiryWorkBookList)
+            {
+                var sssssss = coreCmsPlanOrders2.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt).ToList();
+                inquiryWorkBookModel.WorkBookCount = sssssss.Sum(x=>x.nums).ToString2();
+                inquiryWorkBookModel.WorkBookMoney = sssssss.Sum(x=>x.amount).ToString2();
+            }
+
+
+            var isWin = _eC_OrderBasicDAL.Updatejinedanjia(eC_OrderBasic.Keyid.Value, eC_OrderBasic.SumPrice.Value, eC_OrderBasic.UnitPrice.Value);    
+
+            eC_OrderPrintParameter.PrintParameter = SerializationHelper.Serialize(model);
+            isWin = _eC_OrderPrintParameterDAL.UpdateModel(eC_OrderPrintParameter);
+
+
+
+            return isWin;
+        }
+
     }
 }
diff --git a/CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderBLL.cs
new file mode 100644
index 0000000..e05ef9f
--- /dev/null
+++ b/CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderBLL.cs
@@ -0,0 +1,237 @@
+锘縰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 CoreCmsPlanOrderBLL
+    {
+        ICoreCmsPlanOrderDAL _ICoreCmsPlanOrderDAL = null;
+
+        /// <summary>
+        /// 鍒濆鍖栨瀯閫�
+        /// </summary>
+        public CoreCmsPlanOrderBLL()
+        {
+            //鑾峰彇CoreCmsPlanOrder DAL瀹炵幇
+            _ICoreCmsPlanOrderDAL = Factory.GetDALByInterfaceName(DALInterface.ICoreCmsPlanOrderDAL) as ICoreCmsPlanOrderDAL;
+
+
+        }
+
+        /// <summary>
+        /// 鏂板閫佽揣瀹夋帓
+        /// </summary>
+        /// <param name="rType"></param>
+        /// <param name="m_OA_CustomerCommunications"></param>
+        /// <param name="m_EC_AcceptWayByCustomers"></param>
+        /// <returns></returns>
+        public bool InsertModel(CY.Model.CoreCmsPlanOrder m_CoreCmsPlanOrder)
+        {
+            try
+            {
+
+                return _ICoreCmsPlanOrderDAL.InserModel(m_CoreCmsPlanOrder);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        /// <summary>
+        /// 鏂板閫佽揣瀹夋帓
+        /// </summary>
+        /// <param name="rType"></param>
+        /// <param name="m_OA_CustomerCommunications"></param>
+        /// <param name="m_EC_AcceptWayByCustomers"></param>
+        /// <returns></returns>
+        public int InsertModelIden(CY.Model.CoreCmsPlanOrder m_CoreCmsPlanOrder)
+        {
+            try
+            {
+
+                return _ICoreCmsPlanOrderDAL.InsertModelIden(m_CoreCmsPlanOrder);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+
+
+
+        /// <summary>
+        /// 淇敼閫佽揣瀹夋帓
+        /// </summary>
+        /// <param name="rType"></param>
+        /// <returns></returns>
+        public bool UpdateModel(CY.Model.CoreCmsPlanOrder m_CoreCmsPlanOrder)
+        {
+            try
+            {
+                return _ICoreCmsPlanOrderDAL.UpdateModel(m_CoreCmsPlanOrder);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        /// <summary>
+        /// 淇敼閫佽揣瀹夋帓
+        /// </summary>
+        /// <param name="rType"></param>
+        /// <returns></returns>
+        public bool UpdateModelOrderItem(CY.Model.CoreCmsPlanOrderItem m_CoreCmsPlanOrder)
+        {
+            try
+            {
+                return _ICoreCmsPlanOrderDAL.UpdateModelOrderItem(m_CoreCmsPlanOrder);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+
+        /// <summary>
+        /// 淇敼閫佽揣瀹夋帓
+        /// </summary>
+        /// <param name="rType"></param>
+        /// <returns></returns>
+        public bool insertModelOrderItem(CY.Model.CoreCmsPlanOrderItem m_CoreCmsPlanOrder)
+        {
+            try
+            {
+                return _ICoreCmsPlanOrderDAL.insertModelOrderItem(m_CoreCmsPlanOrder);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        /// <summary>
+        /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+        /// </summary>
+        /// <param name="Keyid">涓婚敭id</param>
+        /// <returns></returns>
+        public IEnumerable<CoreCmsPlanOrder> GetModelList()
+        {
+            Query query = new Query();
+            return _ICoreCmsPlanOrderDAL.SelectAllModel(query);
+        }
+
+
+        /// <summary>
+        /// 鏍规嵁formid鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="Keyid">缂栧彿</param>
+        /// <returns></returns>
+        public IEnumerable<Model.CoreCmsPlanOrder> GetModelByformid(Guid formid)
+        {
+
+            return _ICoreCmsPlanOrderDAL.GetModelByformid(formid);
+        }
+
+
+        /// <summary>
+        /// 鏍规嵁formid鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="Keyid">缂栧彿</param>
+        /// <returns></returns>
+        public IEnumerable<Model.CoreCmsPlanOrder> GetModelByorderid(int orderid)
+        {
+
+            return _ICoreCmsPlanOrderDAL.GetModelByorderid(orderid);
+        }
+
+        /// <summary>
+        /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+        /// </summary>
+        /// <param name="Keyid">涓婚敭id</param>
+        /// <returns></returns>
+        public CoreCmsPlanOrder GetModelByKeyid(int keyid)
+        {
+
+            return _ICoreCmsPlanOrderDAL.GetModelByKeyid(keyid);
+        }
+
+        /// <summary>
+        /// 鍒犻櫎鍚堜綔瀹㈡埛
+        /// </summary>
+        /// <param name="rType"></param>
+        /// <returns></returns>
+        public bool DeleteModel(CY.Model.CoreCmsPlanOrder rType)
+        {
+            try
+            {
+                _ICoreCmsPlanOrderDAL.DeleteModel(rType);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// 鏌ヨ鍚堜綔瀹㈡埛鍒嗛〉鍒楄〃
+        /// </summary>
+        /// <param name="pa"></param>
+        /// <returns></returns>
+        public IEnumerable<CoreCmsPlanOrder> SelectModelPage(Pagination pa, string orderkeyid, string status, string sheng, string shi, string quxian, string pianqu, string shipAddress, string shipName,
+            string shipMobile, string shouhuoAddress, string createTimeStart, string createTimeEnd )
+        {
+            string Condition = " and a.orderkeyid =" + orderkeyid + "  ";
+            if (!string.IsNullOrEmpty(status))
+                Condition += " and  a.status = '" + status + "'";
+            if (!string.IsNullOrEmpty(sheng))
+                Condition += " and  a.sheng = '" + sheng + "'";
+            if (!string.IsNullOrEmpty(shi))
+                Condition += " and  a.shi = '" + shi + "'";
+            if (!string.IsNullOrEmpty(quxian))
+                Condition += " and  a.quxian = '" + quxian + "'";
+            if (!string.IsNullOrEmpty(pianqu))
+                Condition += " and  a.pianqu like '%" + pianqu + "%'";
+            if (!string.IsNullOrEmpty(shipAddress))
+                Condition += " and  a.shipAddress like '%" + shipAddress + "%'";
+            if (!string.IsNullOrEmpty(shipName))
+                Condition += " and  a.shipName like '%" + shipName + "%'";
+            if (!string.IsNullOrEmpty(shipMobile))
+                Condition += " and  a.shipMobile like '%" + shipMobile + "%'";
+            if (!string.IsNullOrEmpty(shouhuoAddress))
+                Condition += " and  a.shouhuoAddress like '%" + shouhuoAddress + "%'";
+
+            if (!string.IsNullOrEmpty(createTimeStart))
+                Condition += " and DATEDIFF(day,a.[createTime],'" + createTimeStart + "')<=0 ";
+
+            if (!string.IsNullOrEmpty(createTimeEnd))
+                Condition += " and DATEDIFF(day,a.[createTime],'" + createTimeEnd + "')>=0 ";
+
+            
+
+            Query query = new Query();
+            IList<Criterion> criterias = new List<Criterion>()
+            {
+                new Criterion("", Condition),
+
+                new Criterion("orderBy"," id desc   ")
+            };
+            query.Criteria = criterias;
+            return _ICoreCmsPlanOrderDAL.SelectModelPage(query, pa);
+        }
+
+
+    }
+}
diff --git a/CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderItemBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderItemBLL.cs
new file mode 100644
index 0000000..0b5e564
--- /dev/null
+++ b/CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderItemBLL.cs
@@ -0,0 +1,146 @@
+锘縰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 CoreCmsPlanOrderItemBLL
+    {
+        ICoreCmsPlanOrderItemDAL _ICoreCmsPlanOrderItemDAL = null;
+
+        /// <summary>
+        /// 鍒濆鍖栨瀯閫�
+        /// </summary>
+        public CoreCmsPlanOrderItemBLL()
+        {
+            //鑾峰彇CoreCmsPlanOrderItem DAL瀹炵幇
+            _ICoreCmsPlanOrderItemDAL = Factory.GetDALByInterfaceName(DALInterface.ICoreCmsPlanOrderItemDAL) as ICoreCmsPlanOrderItemDAL;
+
+
+        }
+
+        /// <summary>
+        /// 鏂板閫佽揣瀹夋帓
+        /// </summary>
+        /// <param name="rType"></param>
+        /// <param name="m_OA_CustomerCommunications"></param>
+        /// <param name="m_EC_AcceptWayByCustomers"></param>
+        /// <returns></returns>
+        public bool InsertModel(CY.Model.CoreCmsPlanOrderItem m_CoreCmsPlanOrderItem)
+        {
+            try
+            {
+
+                return _ICoreCmsPlanOrderItemDAL.InserModel(m_CoreCmsPlanOrderItem);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        /// <summary>
+        /// 淇敼閫佽揣瀹夋帓
+        /// </summary>
+        /// <param name="rType"></param>
+        /// <returns></returns>
+        public bool UpdateModel(CY.Model.CoreCmsPlanOrderItem m_CoreCmsPlanOrderItem)
+        {
+            try
+            {
+                return _ICoreCmsPlanOrderItemDAL.UpdateModel(m_CoreCmsPlanOrderItem);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        /// <summary>
+        /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+        /// </summary>
+        /// <param name="Keyid">涓婚敭id</param>
+        /// <returns></returns>
+        public IEnumerable<CoreCmsPlanOrderItem> GetModelList()
+        {
+            Query query = new Query();
+            return _ICoreCmsPlanOrderItemDAL.SelectAllModel(query);
+        }
+
+
+        /// <summary>
+        /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+        /// </summary>
+        /// <param name="orderid">涓婚敭id</param>
+        /// <returns></returns>
+        public IEnumerable<CoreCmsPlanOrderItem> GetModelsByOrderid(int orderid)
+        {
+            Query query = new Query();
+            return _ICoreCmsPlanOrderItemDAL.GetModelsByOrderid(orderid);
+        }
+
+        /// <summary>
+        /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+        /// </summary>
+        /// <param name="orderid">涓婚敭id</param>
+        /// <returns></returns>
+        public IEnumerable<CoreCmsPlanOrderItem> GetModelsByZongOrderid(int orderkeyid)
+        {
+            Query query = new Query();
+            return _ICoreCmsPlanOrderItemDAL.GetModelsByZongOrderid(orderkeyid);
+        }
+
+
+        /// <summary>
+        /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+        /// </summary>
+        /// <param name="orderkeyid">涓婚敭id</param>
+        /// <returns></returns>
+        public IEnumerable<CoreDeliverOrderItem> GetDeliverModelsByZongOrderid(int orderkeyid)
+        {
+            Query query = new Query();
+            return _ICoreCmsPlanOrderItemDAL.GetDeliverModelsByZongOrderid(orderkeyid);
+        }
+
+
+        /// <summary>
+        /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+        /// </summary>
+        /// <param name="Keyid">涓婚敭id</param>
+        /// <returns></returns>
+        public CoreCmsPlanOrderItem GetModelByKeyid(int keyid)
+        {
+
+            return _ICoreCmsPlanOrderItemDAL.getCoreCmsPlanOrderItem(keyid);
+        }
+
+        /// <summary>
+        /// 鍒犻櫎鍚堜綔瀹㈡埛
+        /// </summary>
+        /// <param name="rType"></param>
+        /// <returns></returns>
+        public bool DeleteModel(CY.Model.CoreCmsPlanOrderItem rType)
+        {
+            try
+            {
+                _ICoreCmsPlanOrderItemDAL.DeleteModel(rType);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return true;
+        }
+
+         
+
+
+    }
+}
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_CarrepairBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_CarrepairBLL.cs
new file mode 100644
index 0000000..cad5c5e
--- /dev/null
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_CarrepairBLL.cs
@@ -0,0 +1,75 @@
+锘縰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_CarrepairBLL
+    {
+        IOA_CarrepairDAL iOA_CarrepairDAL = null;
+
+        public OA_CarrepairBLL()
+        {
+            iOA_CarrepairDAL = Factory.GetDALByInterfaceName(DALInterface.IOA_CarrepairDAL) as IOA_CarrepairDAL;
+        }
+
+        /// <summary>
+        /// 娣诲姞
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool InsertModel(Model.OA_Carrepair model)
+        {
+            return iOA_CarrepairDAL.InserModel(model);
+        }
+
+        /// <summary>
+        /// 鏇存柊
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool UpdateModel(Model.OA_Carrepair model)
+        {
+
+            return iOA_CarrepairDAL.UpdateModel(model);
+        }
+
+        /// <summary>
+        /// 鍒犻櫎
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool DeleteModel(Model.OA_Carrepair model)
+        {
+
+            return iOA_CarrepairDAL.DeleteModel(model);
+        }
+
+        /// <summary>
+        /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="Keyid">缂栧彿</param>
+        /// <returns></returns>
+        public OA_Carrepair GetModelByKeyid(int? Keyid)
+        {
+            return iOA_CarrepairDAL.GetModelByKeyid(Keyid);
+        }
+
+        /// <summary>
+        /// 鍒嗛〉鏌ヨ
+        /// </summary>
+        /// <param name="pagination"></param>
+        /// <returns></returns>
+        public IEnumerable<Model.OA_Carrepair> SelectModelPage(Infrastructure.Query.Pagination pagination, int? _CarId, string _repairPerson, DateTime? _BeginrepairTime, DateTime? _EndrepairTime, string _repairType, decimal? _repairMoney, string _repairRecord, DateTime? _BeginLastUpdateTime, DateTime? _EndLastUpdateTime, string _Operator)
+        {
+            return iOA_CarrepairDAL.SelectModelPage(pagination, _CarId, _repairPerson, _BeginrepairTime, _EndrepairTime, _repairType, _repairMoney, _repairRecord, _BeginLastUpdateTime, _EndLastUpdateTime, _Operator);
+        }
+    }
+}
diff --git a/CY_ECommercePlatform/CY.BLL/Sys/Sys_CitySiteBLL.cs b/CY_ECommercePlatform/CY.BLL/Sys/Sys_CitySiteBLL.cs
index aff5af7..0d9027d 100644
--- a/CY_ECommercePlatform/CY.BLL/Sys/Sys_CitySiteBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/Sys/Sys_CitySiteBLL.cs
@@ -66,6 +66,18 @@
         }
 
         /// <summary>
+        /// 鑾峰彇閫変腑鍩庡競鐨勪笅绾�
+        /// </summary>
+        /// <param name="ProvinceId">鐪乮d</param>
+        /// <param name="CityId">甯俰d</param>
+        /// <param name="CityLevel">鍩庡競绾у埆</param>
+        /// <returns></returns>
+        public IEnumerable<Sys_CitySite> SelectAllModel(Infrastructure.Query.Query query)
+        {
+            return _ISys_CitySiteDal.SelectAllModel(query);
+        }
+
+        /// <summary>
         /// 鏌ヨ涓嬬骇鍙帹骞垮叏閮ㄥ煄甯�
         /// </summary>
         /// <param name="ProvinceId">鐪乮d</param>
diff --git a/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj b/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
index aeebe63..5acd832 100644
--- a/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
+++ b/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
@@ -156,6 +156,9 @@
     <Compile Include="Integrity\IIntegrity_CreditLevelRuleDAL.cs" />
     <Compile Include="Integrity\IIntegrity_EvaluationRecordsDAL.cs" />
     <Compile Include="Integrity\IIntegrity_IntegrityCardDAL.cs" />
+    <Compile Include="OA\ICoreCmsPlanOrderDAL.cs" />
+    <Compile Include="OA\ICoreCmsPlanOrderItemDAL.cs" />
+    <Compile Include="OA\IOA_CarrepairDAL.cs" />
     <Compile Include="OA\IOA_CuikuanjiluDAL.cs" />
     <Compile Include="OA\IOA_DeliverPlanDAL.cs" />
     <Compile Include="OA\IOA_KipiaoshenqingDAL.cs" />
diff --git a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
index f620fa7..5238c8d 100644
--- a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
@@ -71,6 +71,15 @@
 
         IEnumerable<EC_OrderBasic> SelectModelPageSeal(Infrastructure.Query.Pagination pagination, Dictionary<int, object> searchParam);
 
+
+        /// <summary>
+        /// 浣滀笟鏈�佽揣鍒嗛〉鏌ヨ
+        /// </summary>
+        /// <param name="pagination"></param>
+        /// <returns></returns>
+        IEnumerable<EC_OrderBasic> SelectModelPageWorkBook(Infrastructure.Query.Pagination pagination, Guid _MemberID, string txtBeginDate, string txtEndDate, string txtOrderId, string txtSearchyjname, string selCustormerManager, string selBusinessManager, string selOrderStates);
+
+
         /// <summary>
         /// 鍙楃悊璁㈠崟
         /// </summary>
@@ -269,6 +278,14 @@
 
 
         /// <summary>
+        /// 淇敼閲戦鍜屽崟浠�
+        /// </summary>
+        /// <param name="orderId"></param>
+        /// <param name="SumPrice"></param>
+        /// <param name="UnitPrice"></param>
+        bool Updatejinedanjia(int orderId,decimal SumPrice, decimal UnitPrice);
+
+        /// <summary>
         /// 淇敼鎵撳嵃鐘舵��
         /// </summary>
         /// <param name="orderId"></param>
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderDAL.cs
new file mode 100644
index 0000000..904219f
--- /dev/null
+++ b/CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderDAL.cs
@@ -0,0 +1,54 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Data;
+using System.Data.SqlClient;
+using CY.IBaseDAL;
+using CY.Model;
+
+namespace CY.IDAL
+{
+    public interface ICoreCmsPlanOrderDAL : ICommonDAL, IPaging<CoreCmsPlanOrder>, IGetAllModel<CoreCmsPlanOrder>
+    {
+        /// <summary>
+        /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="Keyid">缂栧彿</param>
+        /// <returns></returns>
+        CoreCmsPlanOrder GetModelByKeyid(int keyid);
+
+        /// <summary>
+        /// 鏍规嵁formid鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="Keyid">缂栧彿</param>
+        /// <returns></returns>
+        IEnumerable<CoreCmsPlanOrder> GetModelByformid(Guid formid);
+
+        /// <summary>
+        /// 鏍规嵁orderid鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="Keyid">缂栧彿</param>
+        /// <returns></returns>
+        IEnumerable<CoreCmsPlanOrder> GetModelByorderid(int orderid);
+
+
+        /// <summary>
+        /// 淇敼
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        bool UpdateModelOrderItem(Model.CoreCmsPlanOrderItem model);
+
+        /// <summary>
+        /// 淇敼
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        bool insertModelOrderItem(Model.CoreCmsPlanOrderItem model);
+
+
+        //澧炲姞瀹炰綋
+        int InsertModelIden(CY.Model.CoreCmsPlanOrder model);
+    }
+}
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderItemDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderItemDAL.cs
new file mode 100644
index 0000000..a2267b7
--- /dev/null
+++ b/CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderItemDAL.cs
@@ -0,0 +1,45 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Data;
+using System.Data.SqlClient;
+using CY.IBaseDAL;
+using CY.Model;
+
+namespace CY.IDAL
+{
+    public interface ICoreCmsPlanOrderItemDAL : ICommonDAL, IPaging<CoreCmsPlanOrderItem>, IGetAllModel<CoreCmsPlanOrderItem>
+    {
+        /// <summary>
+        /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="Keyid">缂栧彿</param>
+        /// <returns></returns>
+        CoreCmsPlanOrderItem getCoreCmsPlanOrderItem(int keyid);
+
+        /// <summary>
+        /// 鏍规嵁orderid鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="Keyid">缂栧彿</param>
+        /// <returns></returns>
+        IEnumerable<CoreCmsPlanOrderItem> GetModelsByOrderid(int orderid);
+
+
+        /// <summary>
+        /// 鏍规嵁鎬籵rderid鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="orderkeyid">缂栧彿</param>
+        /// <returns></returns>
+        IEnumerable<CoreCmsPlanOrderItem> GetModelsByZongOrderid(int orderkeyid);
+
+
+        /// <summary>
+        /// 鏍规嵁鎬籵rderid鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="orderkeyid">缂栧彿</param>
+        /// <returns></returns>
+        IEnumerable<CoreDeliverOrderItem> GetDeliverModelsByZongOrderid(int orderkeyid);
+
+    }
+}
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_CarExaminedDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_CarExaminedDAL.cs
index 722480c..c56632d 100644
--- a/CY_ECommercePlatform/CY.IDAL/OA/IOA_CarExaminedDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_CarExaminedDAL.cs
@@ -8,7 +8,7 @@
 namespace CY.IDAL
 {
     /// <summary>
-    ///杞﹁締骞村璁板綍-鏁版嵁搴撴搷浣滄帴鍙�
+    ///杞﹁締骞存璁板綍-鏁版嵁搴撴搷浣滄帴鍙�
     /// </summary>
     public interface IOA_CarExaminedDAL : ICommonDAL, IPaging<OA_CarExamined>, IGetAllModel<OA_CarExamined>
     {
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_CarrepairDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_CarrepairDAL.cs
new file mode 100644
index 0000000..541ea1b
--- /dev/null
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_CarrepairDAL.cs
@@ -0,0 +1,30 @@
+锘縰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_CarrepairDAL : ICommonDAL, IPaging<OA_Carrepair>, IGetAllModel<OA_Carrepair>
+    {
+        /// <summary>
+        /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="Keyid">缂栧彿</param>
+        /// <returns></returns>
+        OA_Carrepair GetModelByKeyid(int? Keyid);
+
+        /// <summary>
+        /// 鍒嗛〉鏌ヨ
+        /// </summary>
+        /// <param name="pagination"></param>
+        /// <returns></returns>
+        IEnumerable<Model.OA_Carrepair> SelectModelPage(Infrastructure.Query.Pagination pagination, int? _CarId, string _repairPerson, DateTime? _BeginrepairTime, DateTime? _EndrepairTime, string _repairType, decimal? _repairMoney, string _repairRecord, DateTime? _BeginLastUpdateTime, DateTime? _EndLastUpdateTime, string _Operator);
+
+    }
+}
diff --git a/CY_ECommercePlatform/CY.Infrastructure/Configuration/ConfigurationSetting.cs b/CY_ECommercePlatform/CY.Infrastructure/Configuration/ConfigurationSetting.cs
index 7a5de35..4f22fc4 100644
--- a/CY_ECommercePlatform/CY.Infrastructure/Configuration/ConfigurationSetting.cs
+++ b/CY_ECommercePlatform/CY.Infrastructure/Configuration/ConfigurationSetting.cs
@@ -35,7 +35,12 @@
         /// <summary>
         /// 閰嶇疆鏂囦欢璺熻矾寰�
         /// </summary>
-        public static string RootConfigPath = ConfigurationManager.AppSettings["RootConfigPath"].ToString(); 
+        public static string RootConfigPath = ConfigurationManager.AppSettings["RootConfigPath"].ToString();
+
+        /// <summary>
+        /// 鍥剧墖璺緞
+        /// </summary>
+        public static string TuPianLuJing = ConfigurationManager.AppSettings["TuPianLuJing"].ToString();
     }
 }
 
diff --git a/CY_ECommercePlatform/CY.Model/CY.Model.csproj b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
index eea06f4..50e216b 100644
--- a/CY_ECommercePlatform/CY.Model/CY.Model.csproj
+++ b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
@@ -198,8 +198,12 @@
     <Compile Include="LF\LF_OrderFileExtend.cs" />
     <Compile Include="LF\LF_SellerFileSpace.cs" />
     <Compile Include="LF\LF_SellerFileSpaceExtend.cs" />
+    <Compile Include="OA\CoreCmsPlanOrder.cs" />
+    <Compile Include="OA\CoreCmsPlanOrderItem.cs" />
+    <Compile Include="OA\CoreDeliverOrderItem.cs" />
     <Compile Include="OA\OA_CarDictionary.cs" />
     <Compile Include="OA\OA_CarInsurance.cs" />
+    <Compile Include="OA\OA_Carrepair.cs" />
     <Compile Include="OA\OA_CorporateClientsContract.cs" />
     <Compile Include="OA\OA_CorporateClientsParameter.cs" />
     <Compile Include="OA\OA_CorporateClientsPrint.cs" />
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs
index ce51109..01e16cb 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs
@@ -69,6 +69,16 @@
             set { _showcode = value; }
             get { return _showcode; }
         }
+
+        /// <summary>
+        /// 璁㈠崟缂栧彿
+        /// </summary>
+        public string UnitName
+        {
+            get;
+            set;
+        }
+
         /// <summary>
         /// 鍗栧璁㈠崟鍙�
         /// </summary>
diff --git a/CY_ECommercePlatform/CY.Model/Inquiry/InquiryWorkBookModel.cs b/CY_ECommercePlatform/CY.Model/Inquiry/InquiryWorkBookModel.cs
index 5f689e5..a9961d1 100644
--- a/CY_ECommercePlatform/CY.Model/Inquiry/InquiryWorkBookModel.cs
+++ b/CY_ECommercePlatform/CY.Model/Inquiry/InquiryWorkBookModel.cs
@@ -69,6 +69,11 @@
         public string WorkBookFengMian { get; set; }
 
         /// <summary>
+        /// 鑷畾涔夊皝闈㈢焊寮�
+        /// </summary>
+        public string ZiWorkBookFengMian { get; set; }
+
+        /// <summary>
         /// 灏侀潰绾稿紶
         /// </summary>
         public string WorkBookFengMianTxt { get; set; }
@@ -109,6 +114,17 @@
         public string WorkBookpageNum { get; set; }
 
 
+        /// <summary>
+        /// 鍐呰姱绾稿紶鍗板埛瑕佹眰
+        /// </summary>
+        public string fengmian { get; set; }
+
+        /// <summary>
+        /// 椤垫暟
+        /// </summary>
+        public string neiye { get; set; }
+
+
 
     }
 }
diff --git a/CY_ECommercePlatform/CY.Model/Inquiry/SysInquiry_WorkBookType.cs b/CY_ECommercePlatform/CY.Model/Inquiry/SysInquiry_WorkBookType.cs
index c4cbe8a..453622e 100644
--- a/CY_ECommercePlatform/CY.Model/Inquiry/SysInquiry_WorkBookType.cs
+++ b/CY_ECommercePlatform/CY.Model/Inquiry/SysInquiry_WorkBookType.cs
@@ -65,6 +65,15 @@
             set { _ordernum = value; }
             get { return _ordernum; }
         }
+        /// <summary>
+        /// 灏侀潰
+        /// </summary>
+        public System.String fengmian { get; set; }
+
+        /// <summary>
+        /// 鍐呴〉
+        /// </summary>
+        public System.String neiye { get; set; }
         #endregion Model
         #region Visiter
 
@@ -100,6 +109,16 @@
                 this.OrderNum = isChange ? MyConvert.ConvertToInt32(value) : OrderNum;
                 theValue = this.OrderNum;
             }
+            else if ("fengmian".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 6)
+            {
+                this.fengmian = isChange ? MyConvert.ConvertToString(value) : fengmian;
+                theValue = this.fengmian;
+            }
+            else if ("neiye".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 7)
+            {
+                this.neiye = isChange ? MyConvert.ConvertToString(value) : neiye;
+                theValue = this.neiye;
+            }
             return theValue;
         }
         #endregion
diff --git a/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrder.cs b/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrder.cs
new file mode 100644
index 0000000..9cabd81
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrder.cs
@@ -0,0 +1,514 @@
+锘縰sing System;
+using CY.Infrastructure.Domain;
+using CY.Infrastructure.Common;
+
+namespace CY.Model
+{
+    /// <summary>
+    /// 璁″垝璁㈠崟琛�
+    /// </summary>
+    [Serializable]
+    public partial class CoreCmsPlanOrder : IAggregateRoot
+    {
+        public CoreCmsPlanOrder()
+        {
+        }
+
+        #region Model
+
+        /// <summary>
+        /// 璁㈠崟鍙�
+        /// </summary>
+
+
+        public Int32 id { get; set; }
+
+
+        /// <summary>
+        /// 鐪両d
+        /// </summary>
+
+
+
+        public System.Int32 shengId { get; set; }
+        /// <summary>
+        /// 鐪�
+        /// </summary>
+
+
+
+        public System.String sheng { get; set; }
+
+        /// <summary>
+        /// 甯侷d
+        /// </summary>
+
+
+
+        public System.Int32 shiId { get; set; }
+
+
+
+        /// <summary>
+        /// 甯�
+        /// </summary>
+
+
+
+        public System.String shi { get; set; }
+
+
+        /// <summary>
+        /// 鍖哄幙Id
+        /// </summary>
+
+
+
+        public System.Int32 quxianId { get; set; }
+
+
+        /// <summary>
+        /// 鍖哄幙鍚嶇О
+        /// </summary>
+
+
+
+        public System.String quxian { get; set; }
+
+
+        /// <summary>
+        /// 鐗囧尯
+        /// </summary>
+
+
+        public System.String pianqu { get; set; }
+
+        /// <summary>
+        /// 璋冩暣璁㈠崟閲戦
+        /// </summary>
+
+
+
+        public System.Decimal orderAmount { get; set; }
+
+        /// <summary>
+        /// 璁㈠崟鐘舵��
+        /// </summary>
+
+
+
+        public System.Int32 status { get; set; }
+
+
+        /// <summary>
+        /// 鐢ㄦ埛ID 鍏宠仈mobile
+        /// </summary>
+
+
+
+        public System.String userMobile { get; set; }
+
+
+
+        /// <summary>
+        /// 瀛︽牎
+        /// </summary>
+
+
+        public System.String shipAddress { get; set; }
+
+
+        /// <summary>
+        /// 鑱旂郴浜�
+        /// </summary>
+
+        public System.String shipName { get; set; }
+
+
+        /// <summary>
+        /// 鏀惰揣鐢佃瘽
+        /// </summary>
+
+
+        public System.String shipMobile { get; set; }
+
+
+
+        /// <summary>
+        /// 鏀惰揣鍦板潃
+        /// </summary>
+
+        public System.String shouhuoAddress { get; set; }
+
+
+
+
+
+
+        /// <summary>
+        /// 璁″垝璁㈠崟閲戦
+        /// </summary>
+
+
+
+        public System.Decimal oldOrderAmount { get; set; }
+
+
+
+        /// <summary>
+        /// 鍙敤浣欓
+        /// </summary>
+
+
+
+        public System.Decimal keYongAmount { get; set; }
+
+
+        /// <summary>
+        ///     鐘舵�佽鏄�
+        /// </summary>
+        public string statusText { get; set; }
+
+
+        /// <summary>
+        /// 宸茶姳璐归噾棰�
+        /// </summary>
+
+
+        public System.Decimal huaFeiAmount { get; set; }
+
+
+        /// <summary>
+        /// 璋冩暣璁㈠崟閲戦
+        /// </summary>
+
+
+
+        public System.Decimal orderAmounts { get; set; }
+        /// <summary>
+        /// 璁″垝璁㈠崟閲戦
+        /// </summary>
+
+
+
+        public System.Decimal oldOrderAmounts { get; set; }
+        /// <summary>
+        /// 鍙敤浣欓
+        /// </summary>
+        /// 
+
+
+
+
+        public System.Decimal keYongAmounts { get; set; }
+
+
+        /// <summary>
+        /// 寤虹珛鏃堕棿
+        /// </summary>		
+        public DateTime? createTime { get; set; }
+
+        /// <summary>
+        /// 淇敼鏃堕棿
+        /// </summary>		
+        public DateTime? upDataTime { get; set; }
+
+        /// <summary>
+        /// 鍒涘缓浜�
+        /// </summary>		
+        public string createBy { get; set; }
+
+        /// <summary>
+        /// 淇敼浜�
+        /// </summary>		
+        public string upDataBy { get; set; }
+        /// <summary>
+        /// 鍒犻櫎鏍囧織
+        /// </summary>		
+        public bool isdelete { get; set; } = false;
+
+        /// <summary>
+        ///  璁㈠崟id
+        /// </summary>		
+        public System.Int32? orderkeyid { get; set; }
+
+        /// <summary>
+        ///  鎵�灞炰紒涓�
+        /// </summary>		
+        public System.Guid? FirmId { get; set; }
+
+
+
+        /// <summary>
+        /// 琛ㄦ牸string 
+        /// </summary>		
+        public string biaoge { 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 ("id".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 1)
+            {
+                this.id = isChange ? MyConvert.ConvertToInt32(value).Value : id;
+                theValue = this.id;
+            }
+            else if ("shengId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 2)
+            {
+                this.shengId = isChange ? MyConvert.ConvertToInt32(value).Value : shengId;
+                theValue = this.shengId;
+            }
+            else if ("sheng".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 3)
+            {
+                this.sheng = isChange ? MyConvert.ConvertToString(value) : sheng;
+                theValue = this.sheng;
+            }
+            else if ("shiId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 4)
+            {
+                this.shiId = isChange ? MyConvert.ConvertToInt32(value).Value : shiId;
+                theValue = this.shiId;
+            }
+
+            else if ("shi".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 5)
+            {
+                this.shi = isChange ? MyConvert.ConvertToString(value) : shi;
+                theValue = this.shi;
+            }
+            else if ("quxianId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 6)
+            {
+                this.quxianId = isChange ? MyConvert.ConvertToInt32(value).Value : quxianId;
+                theValue = this.quxianId;
+            }
+            else if ("quxian".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 7)
+            {
+                this.quxian = isChange ? MyConvert.ConvertToString(value) : quxian;
+                theValue = this.quxian;
+            }
+            else if ("pianqu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 8)
+            {
+                this.pianqu = isChange ? MyConvert.ConvertToString(value) : pianqu;
+                theValue = this.pianqu;
+            }
+            else if ("orderAmount".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 9)
+            {
+                this.orderAmount = isChange ? MyConvert.ConvertToDecimal(value).Value : orderAmount;
+                theValue = this.orderAmount;
+            }
+            else if ("status".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 10)
+            {
+                this.status = isChange ? MyConvert.ConvertToInt32(value).Value : status;
+                theValue = this.status;
+            }
+            else if ("userMobile".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 11)
+            {
+                this.userMobile = isChange ? MyConvert.ConvertToString(value) : userMobile;
+                theValue = this.userMobile;
+            }
+            else if ("shipAddress".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 12)
+            {
+                this.shipAddress = isChange ? MyConvert.ConvertToString(value) : shipAddress;
+                theValue = this.shipAddress;
+            }
+            else if ("shipName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 13)
+            {
+                this.shipName = isChange ? MyConvert.ConvertToString(value) : shipName;
+                theValue = this.shipName;
+            }
+            else if ("shipMobile".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 13)
+            {
+                this.shipMobile = isChange ? MyConvert.ConvertToString(value) : shipMobile;
+                theValue = this.shipMobile;
+            }
+
+
+
+
+
+
+            else if ("shouhuoAddress".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 14)
+            {
+                this.shouhuoAddress = isChange ? MyConvert.ConvertToString(value) : shouhuoAddress;
+                theValue = this.shouhuoAddress;
+            }
+            else if ("oldOrderAmount".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 15)
+            {
+                this.oldOrderAmount = isChange ? MyConvert.ConvertToDecimal(value).Value : oldOrderAmount;
+                theValue = this.oldOrderAmount;
+            }
+            else if ("keYongAmount".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 16)
+            {
+                this.keYongAmount = isChange ? MyConvert.ConvertToDecimal(value).Value : keYongAmount;
+                theValue = this.keYongAmount;
+            }
+            else if ("huaFeiAmount".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 17)
+            {
+                this.huaFeiAmount = isChange ? MyConvert.ConvertToDecimal(value).Value : huaFeiAmount;
+                theValue = this.huaFeiAmount;
+            }
+
+            else if ("createTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 18)
+            {
+                this.createTime = isChange ? MyConvert.ConvertToDateTime(value) : createTime;
+                theValue = this.createTime;
+            }
+            else if ("upDataTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 19)
+            {
+                this.upDataTime = isChange ? MyConvert.ConvertToDateTime(value) : upDataTime;
+                theValue = this.upDataTime;
+            }
+            else if ("createBy".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 20)
+            {
+                this.createBy = isChange ? MyConvert.ConvertToString(value) : createBy;
+                theValue = this.createBy;
+            }
+            else if ("upDataBy".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 21)
+            {
+                this.upDataBy = isChange ? MyConvert.ConvertToString(value) : upDataBy;
+                theValue = this.upDataBy;
+            }
+            else if ("isdelete".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 21)
+            {
+                this.isdelete = isChange ? MyConvert.ConvertToBoolean(value) : isdelete;
+                theValue = this.isdelete;
+            }
+            else if ("orderkeyid".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 21)
+            {
+                this.orderkeyid = isChange ? MyConvert.ConvertToInt32(value) : orderkeyid;
+                theValue = this.orderkeyid;
+            }
+            else if ("FirmId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 21)
+            {
+                this.FirmId = isChange ? MyConvert.ConvertToGuid(value) : FirmId;
+                theValue = this.FirmId;
+            }
+
+            return theValue;
+        }
+
+        #endregion
+    }
+
+
+
+
+    /// <summary>
+    ///     璁″垝璁㈠崟
+    /// </summary>
+    public class JiHuaOrder
+    {
+
+
+        /// <summary>
+        /// 瀛︽牎
+        /// </summary>
+
+
+
+        public System.String shipAddress { get; set; }
+
+        /// <summary>
+        /// 鑱旂郴浜�
+        /// </summary>
+
+
+        public System.String shipName { get; set; }
+
+
+
+        /// <summary>
+        /// 鑱旂郴鐢佃瘽
+        /// </summary>
+
+
+
+        public System.String shipMobile { get; set; }
+
+        /// <summary>
+        /// 鏀惰揣鍦板潃
+        /// </summary>
+
+
+
+        public System.String shouhuoAddress { get; set; }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        /// <summary>
+        /// quxian
+        /// </summary>
+
+        public System.String shi { get; set; }
+
+
+        /// <summary>
+        /// quxian
+        /// </summary>
+
+        public System.String quxian { get; set; }
+
+
+        /// <summary>
+        /// 鐗囧尯
+        /// </summary>
+
+        public System.String pianqu { get; set; }
+
+
+
+        /// <summary>
+        /// 鍟嗗搧鍚嶇О
+        /// </summary>
+
+        public System.String name { get; set; }
+
+
+        /// <summary>
+        /// 鍟嗗搧瑙勬牸
+        /// </summary>
+
+        public System.String specification { get; set; }
+
+
+        /// <summary>
+        /// 璐у搧浠锋牸鍗曚环
+        /// </summary>
+
+        public System.Decimal price { get; set; }
+
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+
+        public System.Int32 nums { get; set; }
+
+
+
+    }
+}
diff --git a/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrderItem.cs b/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrderItem.cs
new file mode 100644
index 0000000..a356979
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrderItem.cs
@@ -0,0 +1,200 @@
+锘縰sing System;
+using CY.Infrastructure.Domain;
+using CY.Infrastructure.Common;
+
+namespace CY.Model
+{
+
+    /// <summary>
+    /// 璁″垝璁㈠崟琛�
+    /// </summary>
+    [Serializable]
+    public partial class CoreCmsPlanOrderItem : IAggregateRoot
+    {
+        public CoreCmsPlanOrderItem()
+        {
+        }
+
+        #region Model
+
+        /// <summary>
+        /// 搴忓彿
+        /// </summary>
+        public System.Int32 id { get; set; }
+        /// <summary>
+        /// 璁㈠崟ID 鍏宠仈order.id
+        /// </summary>
+        public System.Int32 orderId { get; set; }
+
+
+        /// <summary>
+        /// 鍟嗗搧鍚嶇О
+        /// </summary>
+        public System.String name { get; set; }
+
+
+        /// <summary>
+        /// 鍟嗗搧瑙勬牸
+        /// </summary>
+        public System.String specification { get; set; }
+
+
+        /// <summary>
+        /// 璐у搧浠锋牸鍗曚环
+        /// </summary>
+
+        public System.Decimal price { get; set; }
+
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public System.Int32 nums { get; set; }
+        /// <summary>
+        /// 鎬讳环
+        /// </summary>
+        public System.Decimal amount { get; set; }
+
+        /// <summary>
+        /// 鏄惁鍘熷璁㈠崟
+        /// </summary>		
+        public bool isOld { get; set; } = false;
+
+
+ 
+
+
+        /// <summary>
+        /// 寤虹珛鏃堕棿
+        /// </summary>		
+        public DateTime? createTime { get; set; }
+
+        /// <summary>
+        /// 淇敼鏃堕棿
+        /// </summary>		
+        public DateTime? upDataTime { get; set; }
+
+        /// <summary>
+        /// 鍒涘缓浜�
+        /// </summary>		
+        public string createBy { get; set; }
+
+        /// <summary>
+        /// 淇敼浜�
+        /// </summary>		
+        public string upDataBy { get; set; }
+        /// <summary>
+        /// 鍒犻櫎鏍囧織
+        /// </summary>		
+        public bool isdelete { get; set; } = false;
+
+        /// <summary>
+        /// 灏侀潰
+        /// </summary>
+        public System.String fengmian { get; set; }
+
+        /// <summary>
+        /// 鍐呴〉
+        /// </summary>
+        public System.String neiye { 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 ("id".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 1)
+            {
+                this.id = isChange ? MyConvert.ConvertToInt32(value).Value : id;
+                theValue = this.id;
+            }
+            else if ("orderId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 2)
+            {
+                this.orderId = isChange ? MyConvert.ConvertToInt32(value).Value : orderId;
+                theValue = this.orderId;
+            }
+            else if ("name".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 3)
+            {
+                this.name = isChange ? MyConvert.ConvertToString(value) : name;
+                theValue = this.name;
+            }
+            else if ("specification".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 4)
+            {
+                this.specification = isChange ? MyConvert.ConvertToString(value) : specification;
+                theValue = this.specification;
+            }
+
+            else if ("price".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 5)
+            {
+                this.price = isChange ? MyConvert.ConvertToDecimal(value).Value : price;
+                theValue = this.price;
+            }
+            else if ("nums".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 6)
+            {
+                this.nums = isChange ? MyConvert.ConvertToInt32(value).Value : nums;
+                theValue = this.nums;
+            }
+            else if ("amount".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 7)
+            {
+                this.amount = isChange ? MyConvert.ConvertToDecimal(value).Value : amount;
+                theValue = this.amount;
+            }
+            else if ("isOld".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 8)
+            {
+                this.isOld = isChange ? MyConvert.ConvertToBoolean(value) : isOld;
+                theValue = this.isOld;
+            }
+            else if ("createTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 18)
+            {
+                this.createTime = isChange ? MyConvert.ConvertToDateTime(value) : createTime;
+                theValue = this.createTime;
+            }
+            else if ("upDataTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 19)
+            {
+                this.upDataTime = isChange ? MyConvert.ConvertToDateTime(value) : upDataTime;
+                theValue = this.upDataTime;
+            }
+            else if ("createBy".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 20)
+            {
+                this.createBy = isChange ? MyConvert.ConvertToString(value) : createBy;
+                theValue = this.createBy;
+            }
+            else if ("upDataBy".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 21)
+            {
+                this.upDataBy = isChange ? MyConvert.ConvertToString(value) : upDataBy;
+                theValue = this.upDataBy;
+            }
+            else if ("isdelete".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 21)
+            {
+                this.isdelete = isChange ? MyConvert.ConvertToBoolean(value) : isdelete;
+                theValue = this.isdelete;
+            }
+            else if ("fengmian".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 22)
+            {
+                this.fengmian = isChange ? MyConvert.ConvertToString(value) : fengmian;
+                theValue = this.fengmian;
+            }
+            else if ("neiye".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 23)
+            {
+                this.neiye = isChange ? MyConvert.ConvertToString(value) : neiye;
+                theValue = this.neiye;
+            }
+
+            return theValue;
+        }
+
+        #endregion
+    }
+}
diff --git a/CY_ECommercePlatform/CY.Model/OA/CoreDeliverOrderItem.cs b/CY_ECommercePlatform/CY.Model/OA/CoreDeliverOrderItem.cs
new file mode 100644
index 0000000..95744de
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/OA/CoreDeliverOrderItem.cs
@@ -0,0 +1,144 @@
+锘縰sing System;
+using CY.Infrastructure.Domain;
+using CY.Infrastructure.Common;
+
+namespace CY.Model
+{
+    /// <summary>
+    /// 璁″垝璁㈠崟琛�
+    /// </summary>
+    [Serializable]
+    public partial class CoreDeliverOrderItem : IAggregateRoot
+    {
+        public CoreDeliverOrderItem()
+        {
+        }
+
+        #region Model
+
+        /// <summary>
+        /// 搴忓彿
+        /// </summary>
+        public Guid id { get; set; }
+        /// <summary>
+        /// 璁㈠崟ID 鍏宠仈order.id
+        /// </summary>
+        public Guid OrderID { get; set; }
+
+
+        /// <summary>
+        /// 搴忓彿
+        /// </summary>
+        public System.Int32 PlanOrderId { get; set; }
+        
+
+        /// <summary>
+        /// 鍟嗗搧鍚嶇О
+        /// </summary>
+        public System.String ZYBName { get; set; }
+
+
+        /// <summary>
+        /// 鍟嗗搧瑙勬牸
+        /// </summary>
+        public System.String ZYBSpecification { get; set; }
+
+ 
+
+        /// <summary>
+        /// 閫佽揣鏁伴噺
+        /// </summary>
+        public System.Int32 Number { get; set; }
+
+
+        /// <summary>
+        /// 鑺傜害鏁伴噺
+        /// </summary>
+        public System.Int32 LessNumber { get; set; }
+
+        /// <summary>
+        /// 璁㈠崟鐘舵��
+        /// </summary>
+        public System.Int32 OrderState { get; set; }
+
+        
+
+
+        /// <summary>
+        /// 閫佽揣鏃堕棿
+        /// </summary>
+        public System.DateTime? MakeTime { 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 ("id".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 1)
+            {
+                this.id = isChange ? MyConvert.ConvertToGuid(value) : id;
+                theValue = this.id;
+            }
+            else if ("OrderID".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 2)
+            {
+                this.OrderID = isChange ? MyConvert.ConvertToGuid(value) : OrderID;
+                theValue = this.OrderID;
+            }
+            else if ("ZYBName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 3)
+            {
+                this.ZYBName = isChange ? MyConvert.ConvertToString(value) : ZYBName;
+                theValue = this.ZYBName;
+            }
+            else if ("ZYBSpecification".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 4)
+            {
+                this.ZYBSpecification = isChange ? MyConvert.ConvertToString(value) : ZYBSpecification;
+                theValue = this.ZYBSpecification;
+            }
+
+            
+            else if ("Number".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 6)
+            {
+                this.Number = isChange ? MyConvert.ConvertToInt32(value).Value : Number;
+                theValue = this.Number;
+            }
+            else if ("LessNumber".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 7)
+            {
+                this.LessNumber = isChange ? MyConvert.ConvertToInt32(value).Value : LessNumber;
+                theValue = this.LessNumber;
+            }
+            else if ("PlanOrderId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 8)
+            {
+                this.PlanOrderId = isChange ? MyConvert.ConvertToInt32(value).Value : PlanOrderId;
+                theValue = this.PlanOrderId;
+            }
+            else if ("MakeTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 8)
+            {
+                this.MakeTime = isChange ? MyConvert.ConvertToDateTime(value).Value : MakeTime;
+                theValue = this.MakeTime;
+            }
+            else if ("OrderState".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 9)
+            {
+                this.OrderState = isChange ? MyConvert.ConvertToInt32(value).Value : OrderState;
+                theValue = this.OrderState;
+            }
+
+            
+            return theValue;
+        }
+
+        #endregion
+    }
+}
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_CarExamined.cs b/CY_ECommercePlatform/CY.Model/OA/OA_CarExamined.cs
index d08db93..2e41274 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_CarExamined.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_CarExamined.cs
@@ -4,7 +4,7 @@
 namespace CY.Model
 {
     /// <summary>
-    ///杞﹁締骞村璁板綍
+    ///杞﹁締骞存璁板綍
     /// </summary>
     [Serializable]
     public partial class OA_CarExamined : IAggregateRoot
@@ -53,7 +53,7 @@
             }
         }
         /// <summary>
-        /// 缁忓姙浜�(骞村)
+        /// 缁忓姙浜�(骞存)
         /// </summary>		
         public string ExaminedPeople
         {
@@ -67,7 +67,7 @@
             }
         }
         /// <summary>
-        /// 骞村鏃堕棿
+        /// 骞存鏃堕棿
         /// </summary>		
         public DateTime? ExaminedTime
         {
@@ -81,7 +81,7 @@
             }
         }
         /// <summary>
-        /// 涓嬫骞村鏃堕棿
+        /// 涓嬫骞存鏃堕棿
         /// </summary>		
         public DateTime? ExaminedNextTime
         {
@@ -95,7 +95,7 @@
             }
         }
         /// <summary>
-        /// 骞村璐圭敤
+        /// 骞存璐圭敤
         /// </summary>		
         public decimal? ExaminedMoney
         {
@@ -109,7 +109,7 @@
             }
         }
         /// <summary>
-        /// 骞村璁板綍
+        /// 骞存璁板綍
         /// </summary>		
         public string ExaminedRecore
         {
@@ -123,7 +123,7 @@
             }
         }
         /// <summary>
-        /// 骞村鐘舵��
+        /// 骞存鐘舵��
         /// </summary>		
         public int? ExaminedStatus
         {
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_CarInsurance.cs b/CY_ECommercePlatform/CY.Model/OA/OA_CarInsurance.cs
index bf2bfd9..6713fbf 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_CarInsurance.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_CarInsurance.cs
@@ -124,7 +124,7 @@
             }
         }
         /// <summary>
-        /// 淇濋櫓鍐呭
+        /// 淇濋櫓闄╃
         /// </summary>		
         public string InsuranceContent
         {
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_CarManage.cs b/CY_ECommercePlatform/CY.Model/OA/OA_CarManage.cs
index 97d16c5..6fa2aaa 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_CarManage.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_CarManage.cs
@@ -24,6 +24,46 @@
         private string _operator;
         private int? _ordernum;
 
+
+        /// <summary>
+        /// 淇濋櫓鍏徃
+        /// </summary>		
+        public string InsuranceCompany
+        {
+            get; set;
+        }
+        /// <summary>
+        /// 淇濋櫓缁撴潫鏃堕棿
+        /// </summary>		
+        public DateTime? InsuranceEndTime
+        {
+            get; set;
+        }
+
+        /// <summary>
+        /// 涓嬫骞存鏃堕棿
+        /// </summary>		
+        public DateTime? MaintenanceNextTime
+        {
+            get; set;
+        }
+
+        /// <summary>
+        /// 涓嬫淇濋櫓鏃堕棿
+        /// </summary>		
+        public DateTime? ExaminedNextTime
+        {
+            get; set;
+        }
+
+        /// <summary>
+        /// 淇濋櫓鎯呭喌
+        /// </summary>		
+        public string InsuranceContent
+        {
+            get; set;
+        }
+
         /// <summary>
         /// 涓婚敭--鏍囪瘑ID
         /// </summary>		
@@ -173,6 +213,23 @@
             get;
             set;
         }
+
+        /// <summary>
+        /// 鍙告満id
+        /// </summary>		
+        public int? StaffID
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 鍙告満id
+        /// </summary>		
+        public string StaffName
+        {
+            get;
+            set;
+        }
         #endregion Model
 
         #region Visiter
@@ -252,6 +309,51 @@
                 this.CarConditionName = isChange ? MyConvert.ConvertToString(value) : CarConditionName;
                 theValue = this.CarConditionName;
             }
+            else if ("StaffID".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 12)
+            {
+
+                this.StaffID = isChange ? MyConvert.ConvertToInt(value) : StaffID;
+                theValue = this.StaffID;
+            }
+            else if ("StaffName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 12)
+            {
+
+                this.StaffName = isChange ? MyConvert.ConvertToString(value) : StaffName;
+                theValue = this.StaffName;
+            }
+            else if ("InsuranceCompany".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 13)
+            {
+
+                this.InsuranceCompany = isChange ? MyConvert.ConvertToString(value) : InsuranceCompany;
+                theValue = this.InsuranceCompany;
+            }
+            else if ("InsuranceEndTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 14)
+            {
+
+                this.InsuranceEndTime = isChange ? MyConvert.ConvertToDateTime(value) : InsuranceEndTime;
+                theValue = this.InsuranceEndTime;
+            }
+            else if ("MaintenanceNextTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 15)
+            {
+
+                this.MaintenanceNextTime = isChange ? MyConvert.ConvertToDateTime(value) : MaintenanceNextTime;
+                theValue = this.MaintenanceNextTime;
+            }
+            else if ("ExaminedNextTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 16)
+            {
+
+                this.ExaminedNextTime = isChange ? MyConvert.ConvertToDateTime(value) : ExaminedNextTime;
+                theValue = this.ExaminedNextTime;
+            }
+            else if ("InsuranceContent".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 17)
+            {
+
+                this.InsuranceContent = isChange ? MyConvert.ConvertToString(value) : InsuranceContent;
+                theValue = this.InsuranceContent;
+            }
+            
+
+
             return theValue;
         }
         #endregion Visiter
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Carrepair.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Carrepair.cs
new file mode 100644
index 0000000..9a93166
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Carrepair.cs
@@ -0,0 +1,240 @@
+锘縰sing System;
+using CY.Infrastructure.Domain;
+using CY.Infrastructure.Common;
+
+namespace CY.Model
+{
+    /// <summary>
+    ///杞﹁締淇濆吇璁板綍
+    /// </summary>
+    [Serializable]
+    public partial class OA_Carrepair : IAggregateRoot
+    {
+        public OA_Carrepair()
+        {
+        }
+
+        #region Model
+        private int? _keyid;
+        private int? _carid;
+        private string _repairperson;
+        private DateTime? _repairtime;
+        private string _repairtype;
+        private decimal? _repairmoney;
+        private string _repairrecord;
+        private DateTime? _lastupdatetime;
+        private string _operator;
+
+        /// <summary>
+        /// Keyid
+        /// </summary>		
+        public int? Keyid
+        {
+            get
+            {
+                return _keyid;
+            }
+            set
+            {
+                _keyid = value;
+            }
+        }
+        /// <summary>
+        /// 杞﹁締ID
+        /// </summary>		
+        public int? CarId
+        {
+            get
+            {
+                return _carid;
+            }
+            set
+            {
+                _carid = value;
+            }
+        }
+        /// <summary>
+        /// 淇濆吇浜�
+        /// </summary>		
+        public string repairPerson
+        {
+            get
+            {
+                return _repairperson;
+            }
+            set
+            {
+                _repairperson = value;
+            }
+        }
+        /// <summary>
+        /// 淇濆吇鏃堕棿
+        /// </summary>		
+        public DateTime? repairTime
+        {
+            get
+            {
+                return _repairtime;
+            }
+            set
+            {
+                _repairtime = value;
+            }
+        }
+        /// <summary>
+        /// 淇濆吇绫诲瀷
+        /// </summary>		
+        public string repairType
+        {
+            get
+            {
+                return _repairtype;
+            }
+            set
+            {
+                _repairtype = value;
+            }
+        }
+        /// <summary>
+        /// 淇濆吇璐圭敤
+        /// </summary>		
+        public decimal? repairMoney
+        {
+            get
+            {
+                return _repairmoney;
+            }
+            set
+            {
+                _repairmoney = value;
+            }
+        }
+        /// <summary>
+        /// 淇濆吇璁板綍
+        /// </summary>		
+        public string repairRecord
+        {
+            get
+            {
+                return _repairrecord;
+            }
+            set
+            {
+                _repairrecord = 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 CarNumber
+        {
+            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 ("CarId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 2)
+            {
+
+                this.CarId = isChange ? MyConvert.ConvertToInt(value) : CarId;
+                theValue = this.CarId;
+            }
+            else if ("repairPerson".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 3)
+            {
+
+                this.repairPerson = isChange ? MyConvert.ConvertToString(value) : repairPerson;
+                theValue = this.repairPerson;
+            }
+            else if ("repairTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 4)
+            {
+
+                this.repairTime = isChange ? MyConvert.ConvertToDateTime(value) : repairTime;
+                theValue = this.repairTime;
+            }
+            else if ("repairType".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 5)
+            {
+
+                this.repairType = isChange ? MyConvert.ConvertToString(value) : repairType;
+                theValue = this.repairType;
+            }
+            else if ("repairMoney".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 6)
+            {
+
+                this.repairMoney = isChange ? MyConvert.ConvertToDecimal(value) : repairMoney;
+                theValue = this.repairMoney;
+            }
+            else if ("repairRecord".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 7)
+            {
+
+                this.repairRecord = isChange ? MyConvert.ConvertToString(value) : repairRecord;
+                theValue = this.repairRecord;
+            }
+            else if ("LastUpdateTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 8)
+            {
+
+                this.LastUpdateTime = isChange ? MyConvert.ConvertToDateTime(value) : LastUpdateTime;
+                theValue = this.LastUpdateTime;
+            }
+            else if ("Operator".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 9)
+            {
+
+                this.Operator = isChange ? MyConvert.ConvertToString(value) : Operator;
+                theValue = this.Operator;
+            }
+            else if ("CarNumber".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 20)
+            {
+                this.CarNumber = isChange ? MyConvert.ConvertToString(value) : CarNumber;
+                theValue = this.CarNumber;
+            }
+            return theValue;
+        }
+        #endregion Visiter
+    }
+}
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs
index 85f6dcb..10b8853 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs
@@ -313,6 +313,26 @@
                 _isaccountmanager = value;
             }
         }
+
+        /// <summary>
+        /// BF_IsDriver
+        /// </summary>		
+        public bool BF_IsDriver
+        {
+            get;
+            
+            set;
+        }
+        /// <summary>
+        /// BF_IsDeliverManage
+        /// </summary>		
+        public bool BF_IsDeliverManage
+        {
+            get;
+
+            set;
+        }
+
         /// <summary>
         /// 鎵�鍦ㄩ儴闂�
         /// </summary>		
@@ -1277,6 +1297,16 @@
                 this.SM_SocialSecuritySelfMoney = isChange ? MyConvert.ConvertToDecimal(value) : SM_SocialSecuritySelfMoney;
                 theValue = this.SM_SocialSecuritySelfMoney;
             }
+            else if ("BF_IsDriver".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 65)
+            {
+                this.BF_IsDriver = isChange ? MyConvert.ConvertToBoolean(value) : BF_IsDriver;
+                theValue = this.BF_IsDriver;
+            }
+            else if ("BF_IsDeliverManage".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 66)
+            {
+                this.BF_IsDeliverManage = isChange ? MyConvert.ConvertToBoolean(value) : BF_IsDeliverManage;
+                theValue = this.BF_IsDeliverManage;
+            }
             return theValue;
         }
 
diff --git a/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj b/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
index bd06a3a..767605b 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
+++ b/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
@@ -169,11 +169,14 @@
     <Compile Include="Integrity\Integrity_IntegrityCardDAL.cs" />
     <Compile Include="LF\LF_OrderFileDAL.cs" />
     <Compile Include="LF\LF_SellerFileSpaceDAL.cs" />
+    <Compile Include="OA\CoreCmsPlanOrderDAL.cs" />
+    <Compile Include="OA\CoreCmsPlanOrderItemDAL.cs" />
     <Compile Include="OA\OA_CarDictionaryDAL.cs" />
     <Compile Include="OA\OA_CarExaminedDAL.cs" />
     <Compile Include="OA\OA_CarInsuranceDAL.cs" />
     <Compile Include="OA\OA_CarMaintenanceDAL.cs" />
     <Compile Include="OA\OA_CarManageDAL.cs" />
+    <Compile Include="OA\OA_CarrepairDAL.cs" />
     <Compile Include="OA\OA_CarTransferDAL.cs" />
     <Compile Include="OA\OA_CarViolationDAL.cs" />
     <Compile Include="OA\OA_CuikuanjiluDAL.cs" />
diff --git a/CY_ECommercePlatform/CY.SQLDAL/Database.cs b/CY_ECommercePlatform/CY.SQLDAL/Database.cs
index 0364c1a..985af02 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/Database.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/Database.cs
@@ -307,6 +307,34 @@
             return command.ExecuteReader(CommandBehavior.CloseConnection);//閲婃斁Reader鏃跺叧闂繛鎺�
         }
 
+
+        /// <summary>
+        /// 杩斿洖intid
+        /// </summary>
+        /// <param name="SQLString">Transaction-SQL璇彞</param>
+        /// <param name="param">SQL鍙傛暟</param>
+        /// <returns>杩斿洖intid</returns>
+        public int InsertDataAndGetId(string SQLString, params SqlParameter[] param)
+        {
+            int newRecordId = 0;
+            
+                SqlCommand cmd = new SqlCommand(SQLString + "; SELECT SCOPE_IDENTITY();", this.Connection);
+            if (this._Tran != null)
+            {
+                cmd.Transaction = this._Tran;
+            }
+            cmd.CommandTimeout = Database.QueryTimeOut;
+            cmd.Parameters.Clear();
+            if (param != null)
+            {
+                cmd.Parameters.AddRange(param);
+
+            }
+            newRecordId = Convert.ToInt32(cmd.ExecuteScalar());
+            
+            return newRecordId;
+        }
+
         /// <summary>
         /// 鎵цSQL璇彞锛岃繑鍥炲奖鍝嶇殑璁板綍鏁�
         /// </summary>
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index fb2a15a..46278c9 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -1302,6 +1302,57 @@
 
         }
 
+
+
+        /// <summary>
+        /// 浣滀笟鏈�佽揣鍒嗛〉鏌ヨ
+        /// </summary>
+        /// <param name="pagination"></param>
+        /// <returns></returns>
+        public IEnumerable<EC_OrderBasic> SelectModelPageWorkBook(Infrastructure.Query.Pagination pagination, Guid _MemberID, string txtBeginDate, string txtEndDate, string txtOrderId, string txtSearchyjname, string selCustormerManager, string selBusinessManager, string selOrderStates)
+        {
+            try
+            {
+                string condition = "  ob.PrintTypeId = 37 ";
+
+                if (_MemberID != Guid.Empty)
+                    condition += " and ob.SellerId = '" + _MemberID + "'";
+
+                if (!string.IsNullOrEmpty(txtBeginDate))
+                    condition += string.Format(" and CAST(ob.CreateTime AS DATE) >='{0}'", txtBeginDate);
+
+                if (!string.IsNullOrEmpty(txtEndDate))
+                {
+                  var EndDate = txtEndDate.ToDateTime2().Value.AddDays(1).ToShortDateString();
+                        condition += string.Format(" and CAST(ob.CreateTime AS DATE) <='{0}'", EndDate);
+                }
+                    
+
+                if (!string.IsNullOrEmpty(txtOrderId))
+                    condition += " and ob.SellerOrderId like '%" + txtOrderId + "%'";
+
+                if (!string.IsNullOrEmpty(txtSearchyjname))
+                    condition += " and ob.DocumentName like '%" + txtSearchyjname + "%'";
+
+                if (!string.IsNullOrEmpty(selCustormerManager))
+                    condition += " and oe.CustomerManagerId = '" + selCustormerManager + "'";
+
+                if (!string.IsNullOrEmpty(selBusinessManager))
+                    condition += " and oe.BusinessManagerId = '" + selBusinessManager + "'";
+
+                if (!string.IsNullOrEmpty(selOrderStates))
+                    condition += " and ob.OrderState = '" + selOrderStates + "'";
+
+ 
+
+                return _dataBase.SelectModelPage<EC_OrderBasic>(pagination, " ob.*,oe.shifouDelivery,oe.DeliveryOrderId,oe.KaipiaoshenqingCreater,oe.KaipiaoshenqingTime,oe.KaipiaoquerenCreater,oe.KaipiaoquerenTime,oe.Kehuqianshou,oe.KehuqianshouCreater,oe.KehuqianshouTime   ,oe.Quchudingdan,oe.QuchudingdanCreater,oe.QuchudingdanTime,oe.PrintPackDeliveryRequir,oe.PrintNum,oe.ExigencyCaseId,opy.Name as yssldw ", " EC_OrderBasic as ob Inner Join EC_OrderExtend as oe On(ob.Keyid=oe.Keyid) Left Join Sys_Dictionary as opy On (opy.DicType='鍗板埛鍗曚綅' And  opy.MeanValue = oe.printunit )   ", " ob.Keyid DESC ", " Keyid DESC ", condition);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
         /// <summary>
         /// 鍗曚釜鏌ヨ
         /// </summary>
@@ -2694,6 +2745,28 @@
             }
         }
 
+
+        /// <summary>
+        /// 淇敼鎵撳嵃鐘舵��
+        /// </summary>
+        /// <param name="orderId"></param>
+        public bool Updatejinedanjia(int orderId, decimal SumPrice, decimal UnitPrice)
+        {
+            try
+            {
+                string sqlStr = string.Empty;
+                sqlStr = "UPDATE EC_OrderBasic SET SumPrice="+ SumPrice + " ,UnitPrice="+ UnitPrice + " WHERE Keyid=@orderId";
+                SqlParameter par = new SqlParameter("@orderId", orderId);
+                _dataBase.ExecuteSql(sqlStr, par);
+            }
+            catch
+            {
+
+            }
+
+            return true;
+        }
+
         /// <summary>
         /// 淇敼鎵撳嵃鐘舵��
         /// </summary>
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderDAL.cs
new file mode 100644
index 0000000..3b7d3e1
--- /dev/null
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderDAL.cs
@@ -0,0 +1,425 @@
+锘縰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 CoreCmsPlanOrderDAL:ICoreCmsPlanOrderDAL
+    {
+        private Database _dataBase = null;
+        #region 甯搁噺
+        /// <summary>
+        /// 鏌ヨ鐩爣 
+        /// </summary>
+        const string SELECTTARGET = " t.* ";
+        /// <summary>
+        /// 鏌ヨ鏉ユ簮
+        /// </summary>
+        const string FROMSOUCEBEFORE = " ( select a.*   " +
+          " from [CoreCmsPlanOrder] a   where 0=0  ";
+        const string FROMSOUCEEND = ") as t  ";
+        /// <summary>
+        /// 鍒嗛〉榛樿鎺掑簭瀛楁
+        /// </summary>
+        const string ORDERBY = " id desc  ";
+        #endregion
+        public CoreCmsPlanOrderDAL()
+        {
+            _dataBase = new Database();
+        }
+
+        /// <summary>
+        /// 鏂板
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
+        {
+            Model.CoreCmsPlanOrder trueModel = model as Model.CoreCmsPlanOrder;
+            if (trueModel == null)
+            {
+                return false;
+            }
+            
+
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+            {
+
+                    new SqlParameter("@shengId",trueModel.shengId),
+                    new SqlParameter("@sheng",trueModel.sheng),
+                     new SqlParameter("@shiId",trueModel.shiId),
+                    new SqlParameter("@shi",trueModel.shi),
+                    new SqlParameter("@quxianId",trueModel.quxianId),
+                        new SqlParameter("@quxian",trueModel.quxian),
+                            new SqlParameter("@pianqu",trueModel.pianqu),
+                              new SqlParameter("@orderAmount",trueModel.orderAmount),
+                                new SqlParameter("@status",trueModel.status),
+                                  new SqlParameter("@userMobile",trueModel.userMobile),
+                                    new SqlParameter("@shipAddress",trueModel.shipAddress),
+                                       new SqlParameter("@shipName",trueModel.shipName),
+                                       new SqlParameter("@shipMobile",trueModel.shipMobile),
+
+                                         new SqlParameter("@shouhuoAddress",trueModel.shouhuoAddress),
+                                           new SqlParameter("@oldOrderAmount",trueModel.oldOrderAmount),
+                                             new SqlParameter("@keYongAmount",trueModel.keYongAmount),
+                                               new SqlParameter("@huaFeiAmount",trueModel.huaFeiAmount),
+                                                 new SqlParameter("@createTime",trueModel.createTime),
+                                                   new SqlParameter("@upDataTime",trueModel.upDataTime),
+                                                     new SqlParameter("@createBy",trueModel.createBy),
+                                                       new SqlParameter("@upDataBy",trueModel.upDataBy),
+                                                         new SqlParameter("@isdelete",trueModel.isdelete),
+                                                           new SqlParameter("@orderkeyid",trueModel.orderkeyid),
+                                                       new SqlParameter("@FirmId",trueModel.FirmId),
+
+            };
+            string sql = "Insert Into CoreCmsPlanOrder ([shengId],[sheng],[shiId],[shi], [quxianId], [quxian],[pianqu], [orderAmount],[status], [userMobile],[shipAddress],[shipName],[shipMobile],[shouhuoAddress],oldOrderAmount,keYongAmount,huaFeiAmount,createTime,upDataTime,createBy,upDataBy,isdelete,orderkeyid,FirmId)"
+                                             + " Values (@shengId,@sheng,@shiId, @shi, @quxianId, @quxian, @pianqu, @orderAmount, @status, @userMobile,@shipAddress,@shipName,@shipMobile,@shouhuoAddress,@oldOrderAmount,@keYongAmount,@huaFeiAmount,@createTime,@upDataTime,@createBy,@upDataBy,@isdelete,@orderkeyid,@FirmId )";
+            try
+            {
+                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return true;
+        }
+
+
+
+        /// <summary>
+        /// 鏂板
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public int InsertModelIden(CY.Model.CoreCmsPlanOrder trueModel)
+        {
+            //Model.CoreCmsPlanOrder trueModel = model as Model.CoreCmsPlanOrder;
+            if (trueModel == null)
+            {
+                return 0;
+            }
+
+
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+            {
+
+                    new SqlParameter("@shengId",trueModel.shengId),
+                    new SqlParameter("@sheng",trueModel.sheng),
+                     new SqlParameter("@shiId",trueModel.shiId),
+                    new SqlParameter("@shi",trueModel.shi),
+                    new SqlParameter("@quxianId",trueModel.quxianId),
+                        new SqlParameter("@quxian",trueModel.quxian),
+                            new SqlParameter("@pianqu",trueModel.pianqu),
+                              new SqlParameter("@orderAmount",trueModel.orderAmount),
+                                new SqlParameter("@status",trueModel.status),
+                                  new SqlParameter("@userMobile",trueModel.userMobile),
+                                    new SqlParameter("@shipAddress",trueModel.shipAddress),
+                                       new SqlParameter("@shipName",trueModel.shipName),
+                                       new SqlParameter("@shipMobile",trueModel.shipMobile),
+
+                                         new SqlParameter("@shouhuoAddress",trueModel.shouhuoAddress),
+                                           new SqlParameter("@oldOrderAmount",trueModel.oldOrderAmount),
+                                             new SqlParameter("@keYongAmount",trueModel.keYongAmount),
+                                               new SqlParameter("@huaFeiAmount",trueModel.huaFeiAmount),
+                                                 new SqlParameter("@createTime",trueModel.createTime),
+                                                   new SqlParameter("@upDataTime",trueModel.upDataTime),
+                                                     new SqlParameter("@createBy",trueModel.createBy),
+                                                       new SqlParameter("@upDataBy",trueModel.upDataBy),
+                                                         new SqlParameter("@isdelete",trueModel.isdelete),
+                                                           new SqlParameter("@orderkeyid",trueModel.orderkeyid),
+                                                       new SqlParameter("@FirmId",trueModel.FirmId),
+
+            };
+            string sql = "Insert Into CoreCmsPlanOrder ([shengId],[sheng],[shiId],[shi], [quxianId], [quxian],[pianqu], [orderAmount],[status], [userMobile],[shipAddress],[shipName],[shipMobile],[shouhuoAddress],oldOrderAmount,keYongAmount,huaFeiAmount,createTime,upDataTime,createBy,upDataBy,isdelete,orderkeyid,FirmId)"
+                                             + " Values ( @shengId,@sheng,@shiId, @shi, @quxianId, @quxian, @pianqu, @orderAmount, @status, @userMobile,@shipAddress,@shipName,@shipMobile,@shouhuoAddress,@oldOrderAmount,@keYongAmount,@huaFeiAmount,@createTime,@upDataTime,@createBy,@upDataBy,@isdelete,@orderkeyid,@FirmId )";
+
+            int id = 0;
+            try
+            {
+                id= _dataBase.InsertDataAndGetId(sql, sqlParms.ToArray<SqlParameter>());
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return id;
+        }
+
+        /// <summary>
+        /// 淇敼
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool UpdateModel(Infrastructure.Domain.IAggregateRoot model)
+        {
+            Model.CoreCmsPlanOrder trueModel = model as Model.CoreCmsPlanOrder;
+            if (trueModel == null)
+            {
+                return false;
+            }
+
+
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+            {
+
+                 new SqlParameter("@id",trueModel.id),
+                    new SqlParameter("@shengId",trueModel.shengId),
+                    new SqlParameter("@sheng",trueModel.sheng),
+                     new SqlParameter("@shiId",trueModel.shiId),
+                    new SqlParameter("@shi",trueModel.shi),
+                    new SqlParameter("@quxianId",trueModel.quxianId),
+                        new SqlParameter("@quxian",trueModel.quxian),
+                            new SqlParameter("@pianqu",trueModel.pianqu),
+                              new SqlParameter("@orderAmount",trueModel.orderAmount),
+                                new SqlParameter("@status",trueModel.status),
+                                  new SqlParameter("@userMobile",trueModel.userMobile),
+                                    new SqlParameter("@shipAddress",trueModel.shipAddress),
+                                       new SqlParameter("@shipName",trueModel.shipName),
+                                       new SqlParameter("@shipMobile",trueModel.shipMobile),
+
+                                         new SqlParameter("@shouhuoAddress",trueModel.shouhuoAddress),
+                                           new SqlParameter("@oldOrderAmount",trueModel.oldOrderAmount),
+                                             new SqlParameter("@keYongAmount",trueModel.keYongAmount),
+                                               new SqlParameter("@huaFeiAmount",trueModel.huaFeiAmount),
+                                               
+                                                   new SqlParameter("@upDataTime",trueModel.upDataTime),
+                                                    
+                                                       new SqlParameter("@upDataBy",trueModel.upDataBy),
+                                                         new SqlParameter("@isdelete",trueModel.isdelete),
+                                                           new SqlParameter("@orderkeyid",trueModel.orderkeyid),
+                                                       new SqlParameter("@FirmId",trueModel.FirmId),
+
+            };
+            string sql = "Update CoreCmsPlanOrder Set [shengId]=@shengId,[sheng]=@sheng,[shiId]=@shiId,[shi]=@shi, [quxianId]=@quxianId, [quxian]=@quxian,[pianqu]=@pianqu, [orderAmount]=@orderAmount,[status]=@status, [userMobile]=@userMobile,[shipAddress]=@shipAddress,[shipName]=@shipName,[shipMobile]=@shipMobile ,[shouhuoAddress]=@shouhuoAddress,[oldOrderAmount]=@oldOrderAmount,[keYongAmount]=@keYongAmount,[huaFeiAmount]=@huaFeiAmount,[upDataTime]=@upDataTime,[upDataBy]=@upDataBy,[isdelete]=@isdelete,[orderkeyid]=@orderkeyid,[FirmId]=@FirmId  where [id] =@id ";
+
+            try
+            {
+                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="Keyid">缂栧彿</param>
+        /// <returns></returns>
+        public CoreCmsPlanOrder GetModelByKeyid(int keyid)
+        {
+            try
+            {
+                string condition = "  ";
+                if (!keyid.Equals(Guid.Empty))
+                {
+                    condition = " id='" + keyid + "'";
+                }
+                else
+                {
+                    return null;
+                }
+
+                //  return null;//閿欒鏁版嵁杩斾細绌� 
+
+                IList<CoreCmsPlanOrder> result = _dataBase.SelectModel<CoreCmsPlanOrder>("*", "CoreCmsPlanOrder", condition) as IList<CoreCmsPlanOrder>;//鎵ц鏌ヨ
+
+                return (null == result || result.Count == 0) ? null : result[0];//杩斿洖缁撴灉
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+
+        /// <summary>
+        /// 鍏ㄩ儴鏌ヨ
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public IEnumerable<Model.CoreCmsPlanOrder> SelectAllModel(Infrastructure.Query.Query query)
+        {
+            return _dataBase.SelectModel<Model.CoreCmsPlanOrder>(" * ", " CoreCmsPlanOrder ") as IList<Model.CoreCmsPlanOrder>;//鎵ц鏌ヨ
+        }
+
+        /// <summary>
+        /// 鍏ㄩ儴鏌ヨ
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public IEnumerable<Model.CoreCmsPlanOrder> GetModelByformid(Guid FirmId)
+        {
+            return _dataBase.SelectModel<Model.CoreCmsPlanOrder>(" * ", " CoreCmsPlanOrder ", " FirmId = '" + FirmId + "'") as IList<Model.CoreCmsPlanOrder>;//鎵ц鏌ヨ
+        }
+
+        /// <summary>
+        /// 鍏ㄩ儴鏌ヨ
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public IEnumerable<Model.CoreCmsPlanOrder> GetModelByorderid(int orderid)
+        {
+            return _dataBase.SelectModel<Model.CoreCmsPlanOrder>(" * ", " CoreCmsPlanOrder ", " orderkeyid = " + orderid + "") as IList<Model.CoreCmsPlanOrder>;//鎵ц鏌ヨ
+        }
+
+
+        /// <summary>
+        /// 淇敼
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool UpdateModelOrderItem(Model.CoreCmsPlanOrderItem trueModel)
+        {
+            //Model.CoreCmsPlanOrderItem trueModel = model as Model.CoreCmsPlanOrderItem;
+            if (trueModel == null)
+            {
+                return false;
+            }
+
+
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+            {
+
+                 new SqlParameter("@id",trueModel.id),
+                    new SqlParameter("@orderId",trueModel.orderId),
+                    new SqlParameter("@name",trueModel.name),
+                     new SqlParameter("@specification",trueModel.specification),
+                    new SqlParameter("@price",trueModel.price),
+                    new SqlParameter("@nums",trueModel.nums),
+                        new SqlParameter("@amount",trueModel.amount),
+                            new SqlParameter("@isOld",trueModel.isOld),
+                              new SqlParameter("@upDataTime",trueModel.upDataTime),
+                                new SqlParameter("@upDataBy",trueModel.upDataBy),
+                                  new SqlParameter("@isdelete",trueModel.isdelete),
+
+            };
+            string sql = "Update CoreCmsPlanOrderItem Set [orderId]=@orderId,[name]=@name,[specification]=@specification,[price]=@price, [nums]=@nums, [amount]=@amount,[isOld]=@isOld, [upDataTime]=@upDataTime,[upDataBy]=@upDataBy, [isdelete]=@isdelete  where [id] =@id ";
+
+            try
+            {
+                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return true;
+        }
+
+
+        /// <summary>
+        /// 淇敼
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool insertModelOrderItem(Model.CoreCmsPlanOrderItem trueModel)
+        {
+            //Model.CoreCmsPlanOrderItem trueModel = model as Model.CoreCmsPlanOrderItem;
+            if (trueModel == null)
+            {
+                return false;
+            }
+
+
+
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+            {
+                    new SqlParameter("@orderId",trueModel.orderId),
+                    new SqlParameter("@name",trueModel.name),
+                     new SqlParameter("@specification",trueModel.specification),
+                    new SqlParameter("@price",trueModel.price),
+                    new SqlParameter("@nums",trueModel.nums),
+                        new SqlParameter("@amount",trueModel.amount),
+                            new SqlParameter("@isOld",trueModel.isOld),
+                             new SqlParameter("@createTime",trueModel.createTime),
+                              new SqlParameter("@upDataTime",trueModel.upDataTime),
+                                 new SqlParameter("@upDataBy",trueModel.upDataBy),
+                                new SqlParameter("@createBy",trueModel.createBy),
+                                  new SqlParameter("@isdelete",trueModel.isdelete),
+                                     new SqlParameter("@fengmian",string.IsNullOrEmpty(trueModel.fengmian)?"":trueModel.fengmian),
+                                                           new SqlParameter("@neiye",string.IsNullOrEmpty(trueModel.neiye)?"":trueModel.neiye),
+
+            };
+            string sql = "Insert Into CoreCmsPlanOrderItem ( [orderId],[name],[specification],[price], [nums], [amount],[isOld], [createTime],[upDataTime], [upDataBy],[createBy],[isdelete] ,[fengmian],[neiye])"
+                                             + " Values ( @orderId,@name,@specification, @price, @nums, @amount, @isOld, @createTime, @upDataTime, @upDataBy,@createBy,@isdelete,@fengmian,@neiye)";
+            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.CoreCmsPlanOrder> SelectModelPage(Infrastructure.Query.Query query, Infrastructure.Query.Pagination pagination)
+        {
+            if (null == pagination || null == query || null == query.Criteria || 1 > query.Criteria.Count)
+                return null;
+            //query.Criteria 棣栦釜鍏冪礌蹇呴』鏄帓搴忓瓧娈碉紝鍏跺�间负缁撴灉鎺掑簭瀛楁
+
+            int maxParamIndex = query.Criteria.Count - 1;//鏈�澶х储寮�
+
+            string[] orderbys = new string[] { ORDERBY };
+            string resultOrderBy = "";//缁撴灉闆嗘帓搴忔柟寮�
+
+            if ("@orderBy".Equals(query.Criteria[maxParamIndex].PropertyName))
+            {
+                orderbys = string.Format("{0}", query.Criteria[maxParamIndex].Value).Split(',');
+                resultOrderBy = query.Criteria[maxParamIndex].Value.ToString();//= 1 == orderbys.Length ? resultOrderBy : orderbys[1];
+            }
+            string fromSouce = string.Format("{0}{1}{2}", FROMSOUCEBEFORE, query.Criteria[0].Value, FROMSOUCEEND);//鎷艰鏉′欢
+            return _dataBase.SelectModelPage<Model.CoreCmsPlanOrder>(pagination, SELECTTARGET, fromSouce, orderbys[0], resultOrderBy);
+        }
+
+        /// <summary>
+        /// 鍒犻櫎
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool DeleteModel(Infrastructure.Domain.IAggregateRoot model)
+        {
+            Model.CoreCmsPlanOrder trueModel = model as Model.CoreCmsPlanOrder;
+            if (trueModel == null)
+            {
+                return false;
+            }
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+            {
+                
+                new SqlParameter("@orderId",trueModel.id),
+                new SqlParameter("@Keyid",trueModel.id),
+            };
+            string sql = "Delete CoreCmsPlanOrderItem Where [orderId] = @orderId ;Delete CoreCmsPlanOrder Where [id] = @Keyid ";
+
+
+            try
+            {
+                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return true;
+        }
+    }
+}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs
new file mode 100644
index 0000000..eaad58e
--- /dev/null
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderItemDAL.cs
@@ -0,0 +1,241 @@
+锘縰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 CoreCmsPlanOrderItemDAL:ICoreCmsPlanOrderItemDAL
+    {
+        private Database _dataBase = null;
+        #region 甯搁噺
+        /// <summary>
+        /// 鏌ヨ鐩爣 
+        /// </summary>
+        const string SELECTTARGET = " ";
+        /// <summary>
+        /// 鏌ヨ鏉ユ簮
+        /// </summary>
+        const string FROMSOUCEBEFORE = " ";
+        const string FROMSOUCEEND = "  ";
+        /// <summary>
+        /// 鍒嗛〉榛樿鎺掑簭瀛楁
+        /// </summary>
+        const string ORDERBY = " SellerOrderId desc  ";
+        #endregion
+        public CoreCmsPlanOrderItemDAL()
+        {
+            _dataBase = new Database();
+        }
+
+        /// <summary>
+        /// 鏂板
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
+        {
+            Model.CoreCmsPlanOrderItem trueModel = model as Model.CoreCmsPlanOrderItem;
+            if (trueModel == null)
+            {
+                return false;
+            }
+           
+ 
+
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+            {
+
+                    new SqlParameter("@orderId",trueModel.orderId),
+                    new SqlParameter("@name",trueModel.name),
+                     new SqlParameter("@specification",trueModel.specification),
+                    new SqlParameter("@price",trueModel.price),
+                    new SqlParameter("@nums",trueModel.nums),
+                        new SqlParameter("@amount",trueModel.amount),
+                            new SqlParameter("@isOld",trueModel.isOld),
+                             new SqlParameter("@createTime",trueModel.createTime),
+                              new SqlParameter("@upDataTime",trueModel.upDataTime),
+                                 new SqlParameter("@upDataBy",trueModel.upDataBy),
+                                new SqlParameter("@createBy",trueModel.createBy),
+                                  new SqlParameter("@isdelete",trueModel.isdelete),
+
+            };
+            string sql = "Insert Into CoreCmsPlanOrderItem ([orderId],[name],[specification],[price], [nums], [amount],[isOld], [createTime],[upDataTime], [upDataBy],[createBy],[isdelete] )"
+                                             + " Values ( @orderId,@name,@specification, @price, @nums, @amount, @isOld, @createTime, @upDataTime, @upDataBy,@createBy,@isdelete)";
+            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.CoreCmsPlanOrderItem trueModel = model as Model.CoreCmsPlanOrderItem;
+            if (trueModel == null)
+            {
+                return false;
+            }
+            
+
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+            {
+
+                 new SqlParameter("@id",trueModel.id),
+                    new SqlParameter("@orderId",trueModel.orderId),
+                    new SqlParameter("@name",trueModel.name),
+                     new SqlParameter("@specification",trueModel.specification),
+                    new SqlParameter("@price",trueModel.price),
+                    new SqlParameter("@nums",trueModel.nums),
+                        new SqlParameter("@amount",trueModel.amount),
+                            new SqlParameter("@isOld",trueModel.isOld),
+                              new SqlParameter("@upDataTime",trueModel.upDataTime),
+                                new SqlParameter("@upDataBy",trueModel.upDataBy),
+                                  new SqlParameter("@isdelete",trueModel.isdelete),
+
+            };
+            string sql = "Update CoreCmsPlanOrderItem Set [orderId]=@orderId,[name]=@name,[specification]=@specification,[price]=@price, [nums]=@nums, [amount]=@amount,[isOld]=@isOld, [upDataTime]=@upDataTime,[upDataBy]=@upDataBy, [isdelete]=@isdelete  where [id] =@id ";
+
+            try
+            {
+                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="Keyid">缂栧彿</param>
+        /// <returns></returns>
+        public CoreCmsPlanOrderItem getCoreCmsPlanOrderItem(int keyid)
+        {
+            try
+            {
+                string condition = "  ";
+                if (!keyid.Equals(Guid.Empty))
+                {
+                    condition = " id='" + keyid + "'";
+                }
+                else
+                {
+                    return null;
+                }
+
+                //  return null;//閿欒鏁版嵁杩斾細绌� 
+
+                IList<CoreCmsPlanOrderItem> result = _dataBase.SelectModel<CoreCmsPlanOrderItem>("*", "CoreCmsPlanOrderItem", condition) as IList<CoreCmsPlanOrderItem>;//鎵ц鏌ヨ
+
+                return (null == result || result.Count == 0) ? null : result[0];//杩斿洖缁撴灉
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+
+        /// <summary>
+        /// 鍏ㄩ儴鏌ヨ
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public IEnumerable<Model.CoreCmsPlanOrderItem> SelectAllModel(Infrastructure.Query.Query query)
+        {
+            return _dataBase.SelectModel<Model.CoreCmsPlanOrderItem>(" * ", " CoreCmsPlanOrderItem ") as IList<Model.CoreCmsPlanOrderItem>;//鎵ц鏌ヨ
+        }
+
+        /// <summary>
+        /// 鍏ㄩ儴鏌ヨ
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public IEnumerable<Model.CoreCmsPlanOrderItem> GetModelsByOrderid(int orderid)
+        {
+            return _dataBase.SelectModel<Model.CoreCmsPlanOrderItem>(" * ", " CoreCmsPlanOrderItem ", " orderId = " + orderid + "") as IList<Model.CoreCmsPlanOrderItem>;//鎵ц鏌ヨ
+        }
+
+
+        /// <summary>
+        /// 鍏ㄩ儴鏌ヨ
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public IEnumerable<Model.CoreCmsPlanOrderItem> GetModelsByZongOrderid(int orderkeyid)
+        {
+            return _dataBase.SelectModel<Model.CoreCmsPlanOrderItem>(" a.* ", " CoreCmsPlanOrderItem a Inner Join [CoreCmsPlanOrder] as b On(a.orderId=b.id ) ", " b.orderkeyid = " + orderkeyid + "") as IList<Model.CoreCmsPlanOrderItem>;//鎵ц鏌ヨ
+        }
+
+        /// <summary>
+        /// 鍏ㄩ儴鏌ヨ
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public IEnumerable<Model.CoreDeliverOrderItem> GetDeliverModelsByZongOrderid(int orderkeyid)
+        {
+            return _dataBase.SelectModel<Model.CoreDeliverOrderItem>(" a.*,b.[OrderId] as  PlanOrderId,b.[MakeTime],b.[OrderState]  ", " [CoreDeliverOrderItem] a Inner Join [CoreDeliverOrder] as b On(a.[OrderID]=b.[id] ) Inner Join [CoreCmsPlanOrder] as c On(b.[OrderID]=c.[id] )  ", " c.[orderkeyid] = " + orderkeyid + "") as IList<Model.CoreDeliverOrderItem>;//鎵ц鏌ヨ
+        }
+
+
+        /// <summary>
+        /// 鍒嗛〉鏌ヨ
+        /// </summary>
+        /// <param name="query"></param>
+        /// <param name="pagination"></param>
+        /// <returns></returns>
+        public IEnumerable<Model.CoreCmsPlanOrderItem> SelectModelPage(Infrastructure.Query.Query query, Infrastructure.Query.Pagination pagination)
+        {
+        
+            return null;
+        }
+
+        /// <summary>
+        /// 鍒犻櫎
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool DeleteModel(Infrastructure.Domain.IAggregateRoot model)
+        {
+            Model.CoreCmsPlanOrderItem trueModel = model as Model.CoreCmsPlanOrderItem;
+            if (trueModel == null)
+            {
+                return false;
+            }
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+            {
+                new SqlParameter("@Keyid",trueModel.id)
+            };
+            string sql = "Delete CoreCmsPlanOrderItem Where [id] = @Keyid ";
+
+
+            try
+            {
+                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return true;
+        }
+    }
+}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CarExaminedDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CarExaminedDAL.cs
index fb76eda..6025c44 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CarExaminedDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CarExaminedDAL.cs
@@ -9,7 +9,7 @@
 using System.Transactions;
 namespace CY.SQLDAL
 {
-    //杞﹁締骞村璁板綍
+    //杞﹁締骞存璁板綍
     public class OA_CarExaminedDAL : IOA_CarExaminedDAL
     {
         private Database _dataBase = null;
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CarManageDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CarManageDAL.cs
index ebaaacc..6d4ae0f 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CarManageDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CarManageDAL.cs
@@ -36,6 +36,37 @@
             {
                 return false;
             }
+            SqlParameter InsuranceEndTime = null;
+            if(trueModel.InsuranceEndTime.HasValue)
+            {
+                InsuranceEndTime = new SqlParameter("@InsuranceEndTime", trueModel.InsuranceEndTime);
+            }
+            else
+            {
+                InsuranceEndTime = new SqlParameter("@InsuranceEndTime", DBNull.Value);
+            }
+
+            SqlParameter MaintenanceNextTime = null;
+            if (trueModel.MaintenanceNextTime.HasValue)
+            {
+                MaintenanceNextTime = new SqlParameter("@MaintenanceNextTime", trueModel.MaintenanceNextTime);
+            }
+            else
+            {
+                MaintenanceNextTime = new SqlParameter("@MaintenanceNextTime", DBNull.Value);
+            }
+
+            SqlParameter ExaminedNextTime = null;
+            if (trueModel.ExaminedNextTime.HasValue)
+            {
+                ExaminedNextTime = new SqlParameter("@ExaminedNextTime", trueModel.ExaminedNextTime);
+            }
+            else
+            {
+                ExaminedNextTime = new SqlParameter("@ExaminedNextTime", DBNull.Value);
+            }
+
+
             IList<SqlParameter> sqlParms = new List<SqlParameter>()
             {
 			    new SqlParameter("@MemberID", trueModel.MemberID) ,            
@@ -46,7 +77,14 @@
                 new SqlParameter("@CarCondition", trueModel.CarCondition) ,            
                 new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,            
                 new SqlParameter("@Operator", trueModel.Operator) ,            
-                new SqlParameter("@OrderNum", trueModel.OrderNum)             
+                new SqlParameter("@OrderNum", trueModel.OrderNum),
+                new SqlParameter("@StaffID", trueModel.StaffID),
+                new SqlParameter("@InsuranceCompany", trueModel.InsuranceCompany),
+                InsuranceEndTime,
+                MaintenanceNextTime,
+                ExaminedNextTime,
+                  new SqlParameter("@InsuranceContent", trueModel.InsuranceContent),
+
             };
             try
             {
@@ -71,6 +109,35 @@
             {
                 return false;
             }
+            SqlParameter InsuranceEndTime = null;
+            if (trueModel.InsuranceEndTime.HasValue)
+            {
+                InsuranceEndTime = new SqlParameter("@InsuranceEndTime", trueModel.InsuranceEndTime);
+            }
+            else
+            {
+                InsuranceEndTime = new SqlParameter("@InsuranceEndTime", DBNull.Value);
+            }
+            SqlParameter MaintenanceNextTime = null;
+            if (trueModel.MaintenanceNextTime.HasValue)
+            {
+                MaintenanceNextTime = new SqlParameter("@MaintenanceNextTime", trueModel.MaintenanceNextTime);
+            }
+            else
+            {
+                MaintenanceNextTime = new SqlParameter("@MaintenanceNextTime", DBNull.Value);
+            }
+
+            SqlParameter ExaminedNextTime = null;
+            if (trueModel.ExaminedNextTime.HasValue)
+            {
+                ExaminedNextTime = new SqlParameter("@ExaminedNextTime", trueModel.ExaminedNextTime);
+            }
+            else
+            {
+                ExaminedNextTime = new SqlParameter("@ExaminedNextTime", DBNull.Value);
+            }
+
             IList<SqlParameter> sqlParms = new List<SqlParameter>()
             {
 			    new SqlParameter("@Keyid", trueModel.Keyid) ,            
@@ -82,7 +149,13 @@
                 new SqlParameter("@CarCondition", trueModel.CarCondition) ,            
                 new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,            
                 new SqlParameter("@Operator", trueModel.Operator) ,            
-                new SqlParameter("@OrderNum", trueModel.OrderNum)             
+                new SqlParameter("@OrderNum", trueModel.OrderNum),
+                new SqlParameter("@StaffID", trueModel.StaffID),
+                new SqlParameter("@InsuranceCompany", trueModel.InsuranceCompany),
+                   new SqlParameter("@InsuranceContent", trueModel.InsuranceContent),
+                InsuranceEndTime,
+                MaintenanceNextTime,
+                ExaminedNextTime,
             };
             try
             {
@@ -207,7 +280,7 @@
                 if (_OrderNum.HasValue)
                     condition += " and a.OrderNum = '" + _OrderNum + "'";
 
-                return _dataBase.SelectModelPage<Model.OA_CarManage>(pagination, " a.*,f.Name as CarConditionName ", " OA_CarManage as a LEFT JOIN dbo.Sys_Dictionary AS f ON a.CarCondition = f.MeanValue AND f.DicType='杞﹁締鐘舵��' ", " a.OrderNum ASC", " OrderNum ASC ", condition);
+                return _dataBase.SelectModelPage<Model.OA_CarManage>(pagination, " a.*,f.Name as CarConditionName,g.Name as StaffName ", " OA_CarManage as a LEFT JOIN dbo.Sys_Dictionary AS f ON a.CarCondition = f.MeanValue AND f.DicType='杞﹁締鐘舵��' LEFT JOIN dbo.[OA_Staff] AS g ON a.StaffID = g.Keyid    ", " a.OrderNum ASC", " OrderNum ASC ", condition);
             }
             catch (Exception ex)
             {
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CarrepairDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CarrepairDAL.cs
new file mode 100644
index 0000000..b8dbc39
--- /dev/null
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CarrepairDAL.cs
@@ -0,0 +1,219 @@
+锘縰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_CarrepairDAL : IOA_CarrepairDAL
+    {
+        private Database _dataBase = null;
+
+        public OA_CarrepairDAL()
+        {
+            _dataBase = new Database();
+        }
+
+        public OA_CarrepairDAL(Database dataBase)
+        {
+            _dataBase = dataBase;
+        }
+
+        /// <summary>
+        /// 鏂板
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
+        {
+            Model.OA_Carrepair trueModel = model as Model.OA_Carrepair;
+            if (trueModel == null)
+            {
+                return false;
+            }
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+            {
+                            new SqlParameter("@CarId", trueModel.CarId) ,
+                            new SqlParameter("@repairPerson", trueModel.repairPerson) ,
+                            new SqlParameter("@repairTime", trueModel.repairTime) ,
+                            new SqlParameter("@repairType", trueModel.repairType) ,
+                            new SqlParameter("@repairMoney", trueModel.repairMoney) ,
+                            new SqlParameter("@repairRecord", trueModel.repairRecord) ,
+                            new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,
+                            new SqlParameter("@Operator", trueModel.Operator)
+                     };
+            string sql = " INSERT INTO [dbo].[OA_Carrepair] ([CarId],[repairPerson],[repairTime],[repairType],[repairMoney],[repairRecord],[LastUpdateTime],[Operator]) VALUES (@CarId,@repairPerson,@repairTime,@repairType,@repairMoney,@repairRecord,@LastUpdateTime,@Operator) ";//@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 UpdateModel(Infrastructure.Domain.IAggregateRoot model)
+        {
+            Model.OA_Carrepair trueModel = model as Model.OA_Carrepair;
+            if (trueModel == null)
+            {
+                return false;
+            }
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+            {
+                            new SqlParameter("@Keyid", trueModel.Keyid) ,
+                            new SqlParameter("@CarId", trueModel.CarId) ,
+                            new SqlParameter("@repairPerson", trueModel.repairPerson) ,
+                            new SqlParameter("@repairTime", trueModel.repairTime) ,
+                            new SqlParameter("@repairType", trueModel.repairType) ,
+                            new SqlParameter("@repairMoney", trueModel.repairMoney) ,
+                            new SqlParameter("@repairRecord", trueModel.repairRecord) ,
+                            new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,
+                            new SqlParameter("@Operator", trueModel.Operator)
+                     };
+            string sql = " Update OA_Carrepair Set CarId=@CarId ,repairPerson=@repairPerson ,repairTime=@repairTime  ,repairType=@repairType ,repairMoney=@repairMoney,repairRecord=@repairRecord,LastUpdateTime=@LastUpdateTime,Operator=@Operator  Where Keyid =@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_Carrepair trueModel = model as Model.OA_Carrepair;
+            if (trueModel == null)
+            {
+                return false;
+            }
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+                {
+                    new SqlParameter("@Keyid",trueModel.Keyid)
+                };
+            string sql = " DELETE FROM  [OA_Carrepair]  Where Keyid =@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_Carrepair> SelectModelPage(Infrastructure.Query.Query query, Infrastructure.Query.Pagination pagination)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// 鍗曚釜鏌ヨ
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public IEnumerable<Model.OA_Carrepair> SelectAllModel(Infrastructure.Query.Query query)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+        /// </summary>
+        /// <param name="Keyid">缂栧彿</param>
+        /// <returns></returns>
+        public OA_Carrepair GetModelByKeyid(int? Keyid)
+        {
+            try
+            {
+                if (Keyid == null || Keyid < 0)
+                    return null;//閿欒鏁版嵁杩斾細绌� 
+
+                IList<OA_Carrepair> result = _dataBase.SelectModel<OA_Carrepair>(" * ", " OA_Carrepair ", string.Format(" Keyid='{0}'", Keyid)) as IList<OA_Carrepair>;//鎵ц鏌ヨ
+
+                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_Carrepair> SelectModelPage(Infrastructure.Query.Pagination pagination, int? _CarId, string _repairPerson, DateTime? _BeginrepairTime, DateTime? _EndrepairTime, string _repairType, decimal? _repairMoney, string _repairRecord, DateTime? _BeginLastUpdateTime, DateTime? _EndLastUpdateTime, string _Operator)
+        {
+            try
+            {
+                string condition = " 1=1 ";
+
+                if (_CarId.HasValue)
+                    condition += " and a.CarId = '" + _CarId + "'";
+
+                if (!string.IsNullOrEmpty(_repairPerson))
+                    condition += " and a.repairPerson = '" + _repairPerson + "'";
+
+                if (_BeginrepairTime.HasValue)
+                    condition += string.Format(" and CAST(a.repairTime AS DATE) >='{0}'", _BeginrepairTime);
+
+                if (_EndrepairTime.HasValue)
+                    condition += string.Format(" and CAST(a.repairTime AS DATE) <='{0}'", _EndrepairTime);
+
+                if (!string.IsNullOrEmpty(_repairType))
+                    condition += " and a.repairType = '" + _repairType + "'";
+
+                if (_repairMoney.HasValue)
+                    condition += " and a.repairMoney = '" + _repairMoney + "'";
+
+                if (!string.IsNullOrEmpty(_repairRecord))
+                    condition += " and a.repairRecord = '" + _repairRecord + "'";
+
+                if (_BeginLastUpdateTime.HasValue)
+                    condition += string.Format(" and CAST(a.LastUpdateTime AS DATE) >='{0}'", _BeginLastUpdateTime);
+
+                if (_EndLastUpdateTime.HasValue)
+                    condition += string.Format(" and CAST(a.LastUpdateTime AS DATE) <='{0}'", _EndLastUpdateTime);
+
+                if (!string.IsNullOrEmpty(_Operator))
+                    condition += " and a.Operator = '" + _Operator + "'";
+
+                return _dataBase.SelectModelPage<Model.OA_Carrepair>(pagination, " a.*,b.CarNumber ", " OA_Carrepair as a left join OA_CarManage as b on a.CarId = b.Keyid", " a.Keyid desc", " Keyid desc ", condition);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+    }
+}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs
index 5bf7d7d..6d89381 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs
@@ -96,7 +96,9 @@
                     new SqlParameter("@ManageProvince", trueModel.ManageProvince) ,            
                     new SqlParameter("@ManageCity", trueModel.ManageCity) ,            
                     new SqlParameter("@ManageCountry", trueModel.ManageCountry) ,            
-                    new SqlParameter("@ManageCountry1", trueModel.ManageCountry1) 
+                    new SqlParameter("@ManageCountry1", trueModel.ManageCountry1) ,
+                    new SqlParameter("@BF_IsDeliverManage", trueModel.BF_IsDeliverManage) ,
+                    new SqlParameter("@BF_IsDriver", trueModel.BF_IsDriver) ,
             };
             try
             {
@@ -186,7 +188,9 @@
                     new SqlParameter("@ManageProvince", trueModel.ManageProvince) ,
                     new SqlParameter("@ManageCity", trueModel.ManageCity) ,            
                     new SqlParameter("@ManageCountry", trueModel.ManageCountry)  ,            
-                    new SqlParameter("@ManageCountry1", trueModel.ManageCountry1) 
+                    new SqlParameter("@ManageCountry1", trueModel.ManageCountry1) ,
+                    new SqlParameter("@BF_IsDeliverManage", trueModel.BF_IsDeliverManage) ,
+                    new SqlParameter("@BF_IsDriver", trueModel.BF_IsDriver) ,
             };
             try
             {
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index 98365b9..ef2b784 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -65,6 +65,9 @@
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.4.4\lib\net40\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
     <Reference Include="LIMS.MessageBox, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\CY.Dlls\LIMS.MessageBox.dll</HintPath>
@@ -85,6 +88,18 @@
     <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\CY.Dlls\Microsoft.Practices.ServiceLocation.dll</HintPath>
+    </Reference>
+    <Reference Include="NPOI, Version=2.4.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPOI.2.4.1\lib\net40\NPOI.dll</HintPath>
+    </Reference>
+    <Reference Include="NPOI.OOXML, Version=2.4.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPOI.2.4.1\lib\net40\NPOI.OOXML.dll</HintPath>
+    </Reference>
+    <Reference Include="NPOI.OpenXml4Net, Version=2.4.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPOI.2.4.1\lib\net40\NPOI.OpenXml4Net.dll</HintPath>
+    </Reference>
+    <Reference Include="NPOI.OpenXmlFormats, Version=2.4.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPOI.2.4.1\lib\net40\NPOI.OpenXmlFormats.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -1868,6 +1883,11 @@
     <Content Include="Pages\business\BackVisitNoteEdit.aspx" />
     <Content Include="Pages\business\BargainPrice.aspx" />
     <Content Include="Pages\business\BargainPriceByFirm.aspx" />
+    <Content Include="Pages\business\WorkBookUpLoad.aspx" />
+    <Content Include="Pages\business\DeliverWorkBookSonghuo.aspx" />
+    <Content Include="Pages\business\DeliverWorkBookPrint.aspx" />
+    <Content Include="Pages\business\DeliverWorkBookDetail.aspx" />
+    <Content Include="Pages\business\DeliverWorkBookList.aspx" />
     <Content Include="Pages\business\ComplainanEdit.aspx" />
     <Content Include="Pages\business\ComplainanList.aspx" />
     <Content Include="Pages\business\ComplaintsManage.aspx" />
@@ -1926,9 +1946,11 @@
     <Content Include="Pages\business\MyQuoteList.aspx" />
     <Content Include="Pages\business\OrderAccept.aspx" />
     <Content Include="Pages\business\OrderArbitrate.aspx" />
+    <Content Include="Pages\business\DeliverWorkBookPrintDetail.aspx" />
     <Content Include="Pages\business\OrderDeatil.aspx" />
     <Content Include="Pages\business\OrderDelayTimeEdit.aspx" />
     <Content Include="Pages\business\OrderDialogueList.aspx" />
+    <Content Include="Pages\business\jisuanjine.aspx" />
     <Content Include="Pages\business\OrderEdit.aspx" />
     <Content Include="Pages\business\OrderFileList.aspx" />
     <Content Include="Pages\business\OrderKaipiaoshenqing.aspx" />
@@ -1938,6 +1960,7 @@
     <Content Include="Pages\business\OrderProdactionListchejian.aspx" />
     <Content Include="Pages\business\OrderProdactionPrintBiaoqian.aspx" />
     <Content Include="Pages\business\OrderProductionprogress.aspx" />
+    <Content Include="Pages\business\PlanOrderAdd.aspx" />
     <Content Include="Pages\business\SendAllIntLookBTable.aspx" />
     <Content Include="Pages\business\OrderList.aspx" />
     <Content Include="Pages\business\OrderOperate.aspx" />
@@ -1973,6 +1996,9 @@
     <Content Include="Pages\business\SendAllCorSMS.aspx" />
     <Content Include="Pages\business\ShiftIntOrCus.aspx" />
     <Content Include="Pages\business\StrangeCustomerInfo.aspx" />
+    <Content Include="Pages\business\PlanOrderList.aspx" />
+    <Content Include="Pages\business\PlanOrderDetail.aspx" />
+    <Content Include="Pages\business\PlanOrderEdit.aspx" />
     <Content Include="Pages\business\SubmitOrderDialogue.aspx" />
     <Content Include="Pages\business\TTTInsideInquiry.aspx" />
     <Content Include="Pages\business\TTTInsideInquiryDetail.aspx" />
@@ -2695,8 +2721,11 @@
     <Content Include="Pages\workcar\CarInsuranceAdd.aspx" />
     <Content Include="Pages\workcar\CarInsuranceDetail.aspx" />
     <Content Include="Pages\workcar\CarInsuranceList.aspx" />
+    <Content Include="Pages\workcar\CarrepairDetail.aspx" />
+    <Content Include="Pages\workcar\CarrepairAdd.aspx" />
     <Content Include="Pages\workcar\CarMaintenanceAdd.aspx" />
     <Content Include="Pages\workcar\CarMaintenanceDetail.aspx" />
+    <Content Include="Pages\workcar\CarrepairList.aspx" />
     <Content Include="Pages\workcar\CarMaintenanceList.aspx" />
     <Content Include="Pages\workcar\CarManageAdd.aspx" />
     <Content Include="Pages\workcar\CarManageList.aspx" />
@@ -3256,6 +3285,41 @@
     <Compile Include="Pages\business\BargainPriceByFirm.aspx.designer.cs">
       <DependentUpon>BargainPriceByFirm.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Pages\business\WorkBookUpLoad.aspx.cs">
+      <DependentUpon>WorkBookUpLoad.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\business\WorkBookUpLoad.aspx.designer.cs">
+      <DependentUpon>WorkBookUpLoad.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\business\DeliverWorkBookSonghuo.aspx.cs">
+      <DependentUpon>DeliverWorkBookSonghuo.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\business\DeliverWorkBookSonghuo.aspx.designer.cs">
+      <DependentUpon>DeliverWorkBookSonghuo.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\business\DeliverWorkBookPrint.aspx.cs">
+      <DependentUpon>DeliverWorkBookPrint.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\business\DeliverWorkBookPrint.aspx.designer.cs">
+      <DependentUpon>DeliverWorkBookPrint.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\business\DeliverWorkBookDetail.aspx.cs">
+      <DependentUpon>DeliverWorkBookDetail.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\business\DeliverWorkBookDetail.aspx.designer.cs">
+      <DependentUpon>DeliverWorkBookDetail.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\business\DeliverWorkBookList.aspx.cs">
+      <DependentUpon>DeliverWorkBookList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\business\DeliverWorkBookList.aspx.designer.cs">
+      <DependentUpon>DeliverWorkBookList.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Pages\business\ComplainanEdit.aspx.cs">
       <DependentUpon>ComplainanEdit.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -3662,6 +3726,13 @@
     <Compile Include="Pages\business\OrderArbitrate.aspx.designer.cs">
       <DependentUpon>OrderArbitrate.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Pages\business\DeliverWorkBookPrintDetail.aspx.cs">
+      <DependentUpon>DeliverWorkBookPrintDetail.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\business\DeliverWorkBookPrintDetail.aspx.designer.cs">
+      <DependentUpon>DeliverWorkBookPrintDetail.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Pages\business\OrderDeatil.aspx.cs">
       <DependentUpon>OrderDeatil.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -3682,6 +3753,13 @@
     </Compile>
     <Compile Include="Pages\business\OrderDialogueList.aspx.designer.cs">
       <DependentUpon>OrderDialogueList.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\business\jisuanjine.aspx.cs">
+      <DependentUpon>jisuanjine.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\business\jisuanjine.aspx.designer.cs">
+      <DependentUpon>jisuanjine.aspx</DependentUpon>
     </Compile>
     <Compile Include="Pages\business\OrderEdit.aspx.cs">
       <DependentUpon>OrderEdit.aspx</DependentUpon>
@@ -3745,6 +3823,13 @@
     </Compile>
     <Compile Include="Pages\business\OrderProductionprogress.aspx.designer.cs">
       <DependentUpon>OrderProductionprogress.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\business\PlanOrderAdd.aspx.cs">
+      <DependentUpon>PlanOrderAdd.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\business\PlanOrderAdd.aspx.designer.cs">
+      <DependentUpon>PlanOrderAdd.aspx</DependentUpon>
     </Compile>
     <Compile Include="Pages\business\SendAllIntLookBTable.aspx.cs">
       <DependentUpon>SendAllIntLookBTable.aspx</DependentUpon>
@@ -3997,6 +4082,27 @@
     </Compile>
     <Compile Include="Pages\business\StrangeCustomerInfo.aspx.designer.cs">
       <DependentUpon>StrangeCustomerInfo.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\business\PlanOrderList.aspx.cs">
+      <DependentUpon>PlanOrderList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\business\PlanOrderList.aspx.designer.cs">
+      <DependentUpon>PlanOrderList.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\business\PlanOrderDetail.aspx.cs">
+      <DependentUpon>PlanOrderDetail.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\business\PlanOrderDetail.aspx.designer.cs">
+      <DependentUpon>PlanOrderDetail.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\business\PlanOrderEdit.aspx.cs">
+      <DependentUpon>PlanOrderEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\business\PlanOrderEdit.aspx.designer.cs">
+      <DependentUpon>PlanOrderEdit.aspx</DependentUpon>
     </Compile>
     <Compile Include="Pages\business\SubmitOrderDialogue.aspx.cs">
       <DependentUpon>SubmitOrderDialogue.aspx</DependentUpon>
@@ -8453,6 +8559,20 @@
     <Compile Include="Pages\workcar\CarInsuranceList.aspx.designer.cs">
       <DependentUpon>CarInsuranceList.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Pages\workcar\CarrepairDetail.aspx.cs">
+      <DependentUpon>CarrepairDetail.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\workcar\CarrepairDetail.aspx.designer.cs">
+      <DependentUpon>CarrepairDetail.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\workcar\CarrepairAdd.aspx.cs">
+      <DependentUpon>CarrepairAdd.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\workcar\CarrepairAdd.aspx.designer.cs">
+      <DependentUpon>CarrepairAdd.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Pages\workcar\CarMaintenanceAdd.aspx.cs">
       <DependentUpon>CarMaintenanceAdd.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -8466,6 +8586,13 @@
     </Compile>
     <Compile Include="Pages\workcar\CarMaintenanceDetail.aspx.designer.cs">
       <DependentUpon>CarMaintenanceDetail.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\workcar\CarrepairList.aspx.cs">
+      <DependentUpon>CarrepairList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\workcar\CarrepairList.aspx.designer.cs">
+      <DependentUpon>CarrepairList.aspx</DependentUpon>
     </Compile>
     <Compile Include="Pages\workcar\CarMaintenanceList.aspx.cs">
       <DependentUpon>CarMaintenanceList.aspx</DependentUpon>
@@ -8812,6 +8939,7 @@
     </None>
     <None Include="images\admin\Thumbs.db" />
     <None Include="images\Common\admin\Thumbs.db" />
+    <Content Include="images\jihuageshi\涓婁紶璁″垝璁㈠崟.xlsx" />
     <None Include="js\ColorBox\colorbox.ai" />
     <None Include="js\ColorBox\colorbox.jquery.json" />
     <None Include="js\ColorBox\component.json" />
diff --git a/CY_ECommercePlatform/CY.WebForm/MainPage.cs b/CY_ECommercePlatform/CY.WebForm/MainPage.cs
index aca46ef..7f4fd2e 100644
--- a/CY_ECommercePlatform/CY.WebForm/MainPage.cs
+++ b/CY_ECommercePlatform/CY.WebForm/MainPage.cs
@@ -211,6 +211,28 @@
                 JavaScript.ExecuteClientScript("key", script, page);
             }
 
+
+            /// <summary>
+            /// 鏄剧ず瀵硅瘽妗�,缁欑埗椤甸潰鎺т欢璧嬪��
+            /// </summary>
+            /// <param name="Message">娑堟伅</param>
+            /// <param name="page"></param>
+            /// <param name="IsClose">鏄惁鍏抽棴</param>
+            /// <param name="IsRefreshParent">鏄惁鍒锋柊鐖剁獥鍙�</param>
+            public static void MessageBoxfuzhi(string Message, System.Web.UI.Page page, bool IsClose, string kongjian,string fileUrl)
+            {
+                string jsfn = "";
+                if (IsClose && !string.IsNullOrEmpty(kongjian))
+                    jsfn = "top.frmright.document.getElementById('" + kongjian + "').src = '"+ fileUrl + "';top.frmright.document.getElementById('view" + kongjian + "').href = '" + fileUrl + "';top.frmright.document.getElementById('hide" + kongjian + "').value = '" + fileUrl + "';top.Dialog.close();";
+                else if (IsClose)
+                    jsfn = "top.Dialog.close();";
+                else if (!string.IsNullOrEmpty(kongjian))
+                    jsfn = "top.frmright.document.getElementById('" + kongjian + "').src = '" + fileUrl + "';top.frmright.document.getElementById('view" + kongjian + "').href = '" + fileUrl + "';top.frmright.document.getElementById('hide" + kongjian + "').value = '" + fileUrl + "';";
+
+                string script = string.Format("alertMsg('{0}');{1}", Message, jsfn);
+                JavaScript.ExecuteClientScript("key", script, page);
+            }
+
             /// <summary>
             /// 鏄剧ず瀵硅瘽妗�
             /// </summary>
@@ -256,6 +278,19 @@
                 string script = string.Format("alertMsg('{0}');{1}", Message, jsfn);
                 JavaScript.ExecuteClientScript("key", script, page);
             }
+
+            /// <summary>
+            /// 鏄剧ず瀵硅瘽妗嗭紝鍒锋柊绗竴涓獥浣撳拰鐖剁獥浣�
+            /// </summary>
+            /// <param name="Message">娑堟伅</param>
+            /// <param name="page"></param>
+            public static void MessageBoxCloseAndRefreshFirsts(string Message, System.Web.UI.Page page)
+            {
+                string jsfn = "top.document.getElementById('_DialogFrame_0').contentWindow.ReWindowSelf();top.Dialog.close();";
+
+                string script = string.Format("alertMsg('{0}');{1}", Message, jsfn);
+                JavaScript.ExecuteClientScript("key", script, page);
+            }
             /// <summary>
             /// 鏄剧ず瀵硅瘽妗嗭紝鍒锋柊绗竴涓獥浣撳拰鐖剁獥浣�(鐖剁獥浣撲负鍒囨崲妗�)
             /// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/BackVisitNoteEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/BackVisitNoteEdit.aspx
index 858eb8b..8d26875 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/BackVisitNoteEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/BackVisitNoteEdit.aspx
@@ -7,7 +7,7 @@
     <title>鍥炶</title>
     <uc:CMSHead ID="CMSHead1" runat="server" />
     <script src="../../js/common/KeyBehaviorHook.js" type="text/javascript"></script>
-    <script src="../../js/business/BackVisitNote.js?v=1" type="text/javascript"></script>
+    <script src="../../js/business/BackVisitNote.js?v=11" type="text/javascript"></script>
     <script type="text/javascript">
         $(function () {
             document.getElementById('spnOperator').innerHTML = '<%=Request.RequestContext.RouteData.DataTokens["currentUserName"] %>';
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs
index 8737fc7..f7afaf2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs
@@ -94,6 +94,12 @@
                 JavaScript.MessageBox("瀹㈡埛鏉ユ簮涓烘斂搴滈噰璐紝璇峰~鍐欐満鏋勪唬鐮�", this);
                 return;
             }
+
+            if (string.IsNullOrEmpty(Request["selectProvince"].ToString2()) || string.IsNullOrEmpty(Request["selectCity"].ToString2()) || string.IsNullOrEmpty(Request["selectCounty"].ToString2()))
+            {
+                JavaScript.MessageBox("璇烽�夋嫨鎵�鍦ㄥ尯鍩�", this);
+                return;
+            }
             try
             {
                 //var files = Request.Files;
@@ -559,8 +565,8 @@
                 this.selSourcesInfoId.Value = m_OA_CorporateClients.SourcesInfoId.ToString2();
                 this.selCustomerIndustriesId.Value = m_OA_CorporateClients.CustomerIndustriesId.ToString2();
                 this.selCustomerTypeId.Value = m_OA_CorporateClients.CustomerTypeId.ToString2();
-                this.selBusinessManagerId.Value = m_OA_CorporateClients.BusinessManagerId.ToString2();
-                this.selAccountManagerId.Value = m_OA_CorporateClients.AccountManagerId.ToString2();
+                this.selBusinessManagerId.Value = m_OA_CorporateClients.BusinessManagerId.ToString2()=="0"?"": m_OA_CorporateClients.BusinessManagerId.ToString2();
+                this.selAccountManagerId.Value = m_OA_CorporateClients.AccountManagerId.ToString2() == "0" ? "" : m_OA_CorporateClients.AccountManagerId.ToString2();
                 this.selDegreeImportanId.Value = m_OA_CorporateClients.DegreeImportanId.ToString2();
                 this.selBusinessAnalysisId.Value = m_OA_CorporateClients.BusinessAnalysisId.ToString2();
                 this.selIsLoginCorporateWeb.Value = m_OA_CorporateClients.IsLoginCorporateWeb.ToString2();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookDetail.aspx
new file mode 100644
index 0000000..8f613c3
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookDetail.aspx
@@ -0,0 +1,156 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverWorkBookDetail.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverWorkBookDetail" %>
+
+<!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 onViewCarViolation(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/CarViolationList.aspx?carid=" + keyid, Title: "杩濈珷绠$悊", Width: 1000, Height: 660 });
+        }
+
+        //淇濆吇
+        function onViewCarMaintenance(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/CarMaintenanceList.aspx?carid=" + keyid, Title: "淇濆吇绠$悊", Width: 1000, Height: 660 });
+        }
+        //缁翠慨
+        function onViewCarrepair(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/CarrepairList.aspx?carid=" + keyid, Title: "缁翠慨绠$悊", Width: 1000, Height: 660 });
+        }
+
+        //骞存
+        function onViewCarExamined(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/CarExaminedList.aspx?carid=" + keyid, Title: "骞存绠$悊", Width: 1000, Height: 660 });
+        }
+
+        //淇濋櫓
+        function onViewCarInsurance(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/CarInsuranceList.aspx?carid=" + keyid, Title: "淇濋櫓绠$悊", Width: 1000, Height: 660 });
+        }
+
+        //淇敼
+        function onEdit(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/CarManageAdd.aspx?keyid=" + keyid, Title: "杞﹁締淇℃伅", Width: 1000, Height: 660 });
+        }
+
+        //娣诲姞
+        function addModel() {
+            top.Dialog.open({ URL: "/Pages/business/CarManageAdd.aspx", Title: "鏂板杞﹁締", Width: 1000, Height: 660});
+        }
+
+        //鍒犻櫎
+        function onDele(keyid) {
+            top.Dialog.confirm("纭畾瑕佸垹闄よ璁板綍鍚楋紵", function () {
+                window.location = "/Pages/business/DeliverWorkBookDetail.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/business/DeliverWorkBookDetail.aspx?deleteKeyIds=" + deleteKeyIds;
+                });
+            }
+        }
+        $(function () {
+            $(".AlreadyReply").remove();
+        });
+    </script>
+    <style type="text/css">
+        .AlreadyReply { display: none; }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+    <div id="scrollContent">
+        <div class="box1" paneltitle="鍔熻兘闈㈡澘" roller="false">
+            <table class="TableNewStyle">
+                <tr>
+                     
+                    <td class="ali03">
+                        鐗囧尯锛�
+                    </td>
+                    <td>
+                        <input id='txtpianqu' runat="server" maxlength='50' />
+                    </td>
+                     <td class="ali03">
+                        瀛︽牎锛�
+                    </td>
+                    <td>
+                        <input id='txtxuexiao' runat="server" maxlength='50' />
+                    </td>
+                      
+                     
+                    
+                      
+                    <td colspan="8">
+                        <asp:Button ID="btn_Submit" Text="鏌ヨ" runat="server" OnClick="btn_Search_Click" />&nbsp;<input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
+                         <input type="hidden" runat="server" id="hideOrderId" />
+                    </td>
+                </tr>
+            </table>
+        </div>
+        
+        <div>
+            <asp:Repeater ID="RepClientList" runat="server">
+                <HeaderTemplate>
+                    <table class="tableStyle">
+                        <tr>
+                            <th width="30" style="text-align: center">
+                                缂栧彿
+                            </th>
+                            <th style="text-align: center">
+                                鐗囧尯
+                            </th>
+                            <th style="text-align: center">
+                                瀛︽牎
+                            </th>
+                             <%=biaotou %>
+                        </tr>
+                </HeaderTemplate>
+                <ItemTemplate>
+                    <tr>
+                        
+                        <td style="text-align: center">
+                            <%#Container.ItemIndex + 1%>
+                        </td>
+                        <td style="text-align: center">
+                         <%#Eval("pianqu")%>
+                        </td>
+                        <td style="text-align: center">
+                           <%#Eval("shipAddress")%>
+                        </td>
+                          <%#Eval("biaoge")%>
+                         
+                    </tr>
+                </ItemTemplate>
+                <FooterTemplate>
+                     <tr>
+                      <%=biaowei %>
+                          </tr>
+                    </table>
+                </FooterTemplate>
+            </asp:Repeater>
+            
+        </div>
+    </div>
+    </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookDetail.aspx.cs
new file mode 100644
index 0000000..ec0c1f4
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookDetail.aspx.cs
@@ -0,0 +1,140 @@
+锘縰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;
+using CY.BLL.EC;
+using CY.Model.Inquiry;
+
+namespace CY.WebForm.Pages.business
+{
+    //鍚磋緣
+    //琛屾斂绠$悊
+    public partial class DeliverWorkBookDetail : BasePage
+    {
+        CoreCmsPlanOrderBLL bll_CoreCmsPlanOrderBLL = null;
+        CoreCmsPlanOrderItemBLL bll_CoreCmsPlanOrderItemBLL = null;
+        EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = null;
+        public string biaotou = "";
+        public string biaowei = "";
+
+
+        //鍒濆鍖�
+        public DeliverWorkBookDetail()
+        {
+            bll_CoreCmsPlanOrderBLL = new CoreCmsPlanOrderBLL();
+            bll_CoreCmsPlanOrderItemBLL = new CoreCmsPlanOrderItemBLL();
+            _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
+        }
+
+        //椤甸潰鍔犺浇
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            
+            if (!IsPostBack)
+            {
+                 
+
+                BindList();
+            }
+             
+        }
+
+        //缁戝畾鏁版嵁
+        private void BindList()
+        {
+            string orderIdStr = Request["orderId"];
+            this.hideOrderId.Value = orderIdStr;
+
+            var coreCmsPlanOrders = bll_CoreCmsPlanOrderBLL.GetModelByorderid(orderIdStr.ToInt32().Value);
+            var pianqu  = this.txtpianqu.Value.Trim();
+            if (!string.IsNullOrEmpty(pianqu))
+            {
+                coreCmsPlanOrders = coreCmsPlanOrders.Where(x => x.pianqu.Contains(pianqu));
+            }
+            var xuexiao = this.txtxuexiao.Value.Trim();
+            if (!string.IsNullOrEmpty(xuexiao))
+            {
+                coreCmsPlanOrders = coreCmsPlanOrders.Where(x => x.shipAddress.Contains(xuexiao));
+            }
+
+            var ids = coreCmsPlanOrders.Select(x => x.id).ToArray();
+            var cmsPlanOrderItems = bll_CoreCmsPlanOrderItemBLL.GetModelsByZongOrderid(orderIdStr.ToInt32().Value).Where(x=> ids.Contains( x.orderId));
+
+
+
+           
+            EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(orderIdStr.ToInt32().Value);
+            InquiryCommonModel _inquiryCommonModel = null;
+            if (null == _eC_OrderPrintParameter)
+            {
+                _inquiryCommonModel = new InquiryCommonModel();
+            }
+            else
+            {
+                _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
+
+            }
+           var inquiryWorkBookModels  = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x=>x.WorkBookNameTxt).ThenBy(x=>x.WorkBookSizeTxt);
+            if (string.IsNullOrEmpty(biaotou))
+            {
+                foreach (var inquiryWorkBookModel  in inquiryWorkBookModels)
+                {
+                    biaotou += " <th style=\"text-align:center\"> " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </th> ";
+ 
+                }
+            }
+            biaowei = "   <td style=\"text-align:center\"> 鍚堣 </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).Sum(x=>x.nums);
+
+
+                biaowei += " <td style=\"text-align:center\"> " + nums + " </td> ";
+
+            }
+
+
+
+        
+            foreach(var coreCmsPlanOrder  in coreCmsPlanOrders)
+            {
+                var cmsPlanOrderItems1 = cmsPlanOrderItems.Where(x => x.orderId == coreCmsPlanOrder.id);
+                foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
+                {
+                    var cmsPlanOrderItem = cmsPlanOrderItems1.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt).FirstOrDefault();
+                    if (cmsPlanOrderItem != null)
+                    {
+                        coreCmsPlanOrder.biaoge += " <td style=\"text-align:center\"> " + cmsPlanOrderItem.nums + " </td> ";
+                    }
+                    else
+                    {
+                        coreCmsPlanOrder.biaoge += " <td style=\"text-align:center\"> 0 </td> ";
+                    }
+                   
+                }
+
+            }
+
+             
+
+
+            this.RepClientList.DataSource = coreCmsPlanOrders;
+            this.RepClientList.DataBind();
+            
+        }
+ 
+
+        //鏌ヨ浜嬩欢
+        protected void btn_Search_Click(object src, EventArgs e)
+        {
+            BindList();
+        }
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookDetail.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookDetail.aspx.designer.cs
new file mode 100644
index 0000000..af7014d
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookDetail.aspx.designer.cs
@@ -0,0 +1,89 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+    public partial class DeliverWorkBookDetail
+    {
+
+        /// <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>
+        /// txtpianqu 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtpianqu;
+
+        /// <summary>
+        /// txtxuexiao 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtxuexiao;
+
+        /// <summary>
+        /// btn_Submit 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btn_Submit;
+
+        /// <summary>
+        /// hideOrderId 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden hideOrderId;
+
+        /// <summary>
+        /// RepClientList 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Repeater RepClientList;
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx
new file mode 100644
index 0000000..c427094
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx
@@ -0,0 +1,204 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverWorkBookList.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverWorkBookList" %>
+
+<!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 onViewCarViolation(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/CarViolationList.aspx?carid=" + keyid, Title: "杩濈珷绠$悊", Width: 1000, Height: 660 });
+        }
+
+        //淇濆吇
+        function onViewCarMaintenance(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/CarMaintenanceList.aspx?carid=" + keyid, Title: "淇濆吇绠$悊", Width: 1000, Height: 660 });
+        }
+        //缁翠慨
+        function onViewCarrepair(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/CarrepairList.aspx?carid=" + keyid, Title: "缁翠慨绠$悊", Width: 1000, Height: 660 });
+        }
+
+        //骞存
+        function onViewCarExamined(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/CarExaminedList.aspx?carid=" + keyid, Title: "骞存绠$悊", Width: 1000, Height: 660 });
+        }
+
+        //淇濋櫓
+        function onViewCarInsurance(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookSonghuo.aspx?orderId=" + keyid, Title: "鏌ョ湅閫佽揣鎯呭喌", Width: 1500, Height: 900 });
+        }
+
+        //淇敼
+        function onEdit(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookDetail.aspx?orderId=" + keyid, Title: "鏌ョ湅鏄庣粏", Width: 1500, Height: 900 });
+        }
+
+        //娣诲姞
+        function addModel() {
+            top.Dialog.open({ URL: "/Pages/business/CarManageAdd.aspx", Title: "鏂板杞﹁締", Width: 1000, Height: 660});
+        }
+
+        //鍒犻櫎
+        function onDele(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPrint.aspx?orderId=" + keyid, Title: "鎵撳嵃閫佽揣鍗�", Width: 600, Height: 900 });
+        }
+
+        //鎵归噺鍒犻櫎
+        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/business/DeliverWorkBookList.aspx?deleteKeyIds=" + deleteKeyIds;
+                });
+            }
+        }
+        $(function () {
+            $(".AlreadyReply").remove();
+        });
+    </script>
+    <style type="text/css">
+        .AlreadyReply { display: none; }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+    <div id="scrollContent">
+        <div class="box1" paneltitle="鍔熻兘闈㈡澘" roller="false">
+            <table class="TableNewStyle">
+                <tr>
+                       <td class="ali03">
+                        涓嬪崟鏃堕棿锛�
+                    </td>
+                    <td style="width: 215px">
+                        <input id="txtBeginDate" type="text" runat="server" class='date w80px' maxlength='10' />-<input id="txtEndDate" type="text" runat="server" class='date w80px' maxlength='10' />
+                    </td>
+                    <td class="ali03">
+                        璁㈠崟缂栧彿锛�
+                    </td>
+                    <td>
+                        <input id='txtOrderId' runat="server" maxlength='25' />
+                    </td>
+                     <td class="ali03">
+                        鍗颁欢鍚嶇О锛�
+                    </td>
+                    <td>
+                        <input id='txtSearchyjname' runat="server" maxlength='50' />
+                    </td>
+                      <td class="ali03">
+                        瀹㈡埛缁忕悊锛�
+                    </td>
+                    <td>
+                        <select keepdefaultstyle='true' id='selCustormerManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+                        </select>
+                    </td>
+                    <td class="ali03">
+                        涓氬姟缁忕悊锛�
+                    </td>
+                    <td>
+                        <select keepdefaultstyle='true' id='selBusinessManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+                        </select>
+                    </td>
+                    </tr>
+                <tr>
+                     <td class="ali03">
+                        璁㈠崟鐘舵�侊細
+                    </td>
+                    <td>
+                        <select keepdefaultstyle='true' id='selOrderStates' runat="server" datatextfield="Name" datavaluefield="MeanValue">
+                        </select>
+                    </td>
+                    <td colspan="8">
+                        <asp:Button ID="btn_Submit" Text="鏌ヨ" runat="server" OnClick="btn_Search_Click" />&nbsp;<input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
+                    </td>
+                </tr>
+            </table>
+        </div>
+        
+        <div>
+            <asp:Repeater ID="RepClientList" runat="server">
+                <HeaderTemplate>
+                    <table class="tableStyle">
+                        <tr>
+                            <th width="30" style="text-align: center">
+                                缂栧彿
+                            </th>
+                            <th style="text-align: center">
+                                璁㈠崟鍙�
+                            </th>
+                            <th style="text-align: center">
+                                鍗颁欢鍚嶇О
+                            </th>
+                             <th style="text-align: center">
+                                鏁伴噺
+                            </th>
+                            <th style="text-align: center">
+                                鍗曚綅
+                            </th>
+                           
+                            <th style="text-align: center">
+                                閲戦
+                            </th>
+                            
+                          
+                            <th style="text-align: center">
+                                鎿嶄綔
+                            </th>
+                        </tr>
+                </HeaderTemplate>
+                <ItemTemplate>
+                    <tr>
+                        
+                        <td style="text-align: center">
+                            <%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
+                        </td>
+                        <td style="text-align: center">
+                         <%#Eval("SellerOrderId")%>
+                        </td>
+                        <td style="text-align: center">
+                           <%#Eval("DocumentName")%>
+                        </td>
+                         <td style="text-align: center">
+                            <%#Eval("OrderExtend.PrintNum")%>
+                        </td>
+                        <td style="text-align: center">
+                            <%#Eval("yssldw")%>
+                        </td>
+                        
+                        <td style="text-align: center">
+                         <%#Eval("SumPrice", "{0:F}")%>
+                        </td>
+                        
+                        <td class="Operate " style="text-align: center">
+                            <span  onclick="onEdit('<%#Eval("Keyid")%>')">鏌ョ湅鏄庣粏</span>
+                            <span   onclick="onDele('<%#Eval("Keyid")%>')">鎵撳嵃閫佽揣鍗�</span>
+                             <span   onclick="onViewCarInsurance('<%#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/business/DeliverWorkBookList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx.cs
new file mode 100644
index 0000000..9aaca29
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx.cs
@@ -0,0 +1,103 @@
+锘縰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;
+using CY.BLL.EC;
+using CY.Model.Inquiry;
+
+namespace CY.WebForm.Pages.business
+{
+    //鍚磋緣
+    //琛屾斂绠$悊
+    public partial class DeliverWorkBookList : BasePage
+    {
+        Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
+        EC_OrderBasicBLL bll_EC_OrderBasicBLL = null;
+        EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = null;
+        OA_StaffBLL bll_OA_StaffBLL = null;
+
+        //鍒濆鍖�
+        public DeliverWorkBookList()
+        {
+            bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
+            bll_EC_OrderBasicBLL = new EC_OrderBasicBLL();
+            bll_OA_StaffBLL = new OA_StaffBLL();
+            _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
+        }
+
+        //椤甸潰鍔犺浇
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
+            if (!IsPostBack)
+            {
+                this.selCustormerManager.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, true);
+                this.selCustormerManager.DataTextField = "Name";
+                this.selCustormerManager.DataValueField = "Keyid";
+                this.selCustormerManager.DataBind();
+                this.selCustormerManager.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+                this.selBusinessManager.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, true, false);
+                this.selBusinessManager.DataTextField = "Name";
+                this.selBusinessManager.DataValueField = "Keyid";
+                this.selBusinessManager.DataBind();
+                this.selBusinessManager.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+                this.selOrderStates.DataSource = bll_Sys_DictionaryBLL.GetDataByType("EC_璁㈠崟鐘舵��").Where(p => p.MeanValue.Value != -5 && p.MeanValue.Value != -4);
+                this.selOrderStates.DataBind();
+                this.selOrderStates.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+                BindList();
+            }
+             
+        }
+
+        //缁戝畾鏁版嵁
+        private void BindList()
+        {
+            Pagination pa = new Pagination();
+            pa.PageSize = UCPager1.AspNetPager.PageSize;
+            pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
+
+            var eC_OrderBasics = bll_EC_OrderBasicBLL.SelectModelPageWorkBook(pa, CurrentUser.MemberId, this.txtBeginDate.Value.Trim(), this.txtEndDate.Value.Trim(), this.txtOrderId.Value.Trim(), this.txtSearchyjname.Value.Trim(), this.selCustormerManager.Value, this.selBusinessManager.Value, this.selOrderStates.Value);
+            foreach (var orderBasic in eC_OrderBasics)
+            {
+                EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(orderBasic.Keyid.Value);
+                InquiryCommonModel _inquiryCommonModel = null;
+                if (null == _eC_OrderPrintParameter)
+                {
+                    _inquiryCommonModel = new InquiryCommonModel();
+                }
+                else
+                {
+                    _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
+
+                }
+                orderBasic.OrderExtend.PrintNum = _inquiryCommonModel.PrintCount;
+            }
+
+            this.RepClientList.DataSource = eC_OrderBasics;
+            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/business/DeliverWorkBookList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx.designer.cs
new file mode 100644
index 0000000..9f1d723
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx.designer.cs
@@ -0,0 +1,134 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+    public partial class DeliverWorkBookList
+    {
+
+        /// <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>
+        /// txtBeginDate 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtBeginDate;
+
+        /// <summary>
+        /// txtEndDate 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtEndDate;
+
+        /// <summary>
+        /// txtOrderId 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtOrderId;
+
+        /// <summary>
+        /// txtSearchyjname 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtSearchyjname;
+
+        /// <summary>
+        /// selCustormerManager 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selCustormerManager;
+
+        /// <summary>
+        /// selBusinessManager 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selBusinessManager;
+
+        /// <summary>
+        /// selOrderStates 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selOrderStates;
+
+        /// <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;
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx
new file mode 100644
index 0000000..a9afb75
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx
@@ -0,0 +1,160 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverWorkBookPrint.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverWorkBookPrint" %>
+
+<!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 onViewCarViolation(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/CarViolationList.aspx?carid=" + keyid, Title: "杩濈珷绠$悊", Width: 1000, Height: 660 });
+        }
+
+        //淇濆吇
+        function onViewCarMaintenance(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/CarMaintenanceList.aspx?carid=" + keyid, Title: "淇濆吇绠$悊", Width: 1000, Height: 660 });
+        }
+        //缁翠慨
+        function onViewCarrepair(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/CarrepairList.aspx?carid=" + keyid, Title: "缁翠慨绠$悊", Width: 1000, Height: 660 });
+        }
+
+        //骞存
+        function onViewCarExamined(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/CarExaminedList.aspx?carid=" + keyid, Title: "骞存绠$悊", Width: 1000, Height: 660 });
+        }
+
+        //淇濋櫓
+        function onViewCarInsurance(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/CarInsuranceList.aspx?carid=" + keyid, Title: "淇濋櫓绠$悊", Width: 1000, Height: 660 });
+        }
+
+        //淇敼
+        function onEdit(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/CarManageAdd.aspx?keyid=" + keyid, Title: "杞﹁締淇℃伅", Width: 1000, Height: 660 });
+        }
+
+        //娣诲姞
+        function addModel() {
+            top.Dialog.open({ URL: "/Pages/business/CarManageAdd.aspx", Title: "鏂板杞﹁締", Width: 1000, Height: 660});
+        }
+
+        //鍒犻櫎
+        function onDele(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPrintDetail.aspx?PlanOrderid=" + keyid, Title: "鎵撳嵃閫佽揣鍗�", Width: 1000, Height: 900 });
+        }
+        //鍒犻櫎
+        function onDeles(orderid) {
+            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPrintDetail.aspx?orderid=" + orderid, Title: "鎵归噺鎵撳嵃閫佽揣鍗�", Width: 1000, Height: 900 });
+        }
+
+        //鎵归噺鍒犻櫎
+        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/business/DeliverWorkBookPrint.aspx?deleteKeyIds=" + deleteKeyIds;
+                });
+            }
+        }
+        $(function () {
+            $(".AlreadyReply").remove();
+        });
+    </script>
+    <style type="text/css">
+        .AlreadyReply { display: none; }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+    <div id="scrollContent">
+        <div class="box1" paneltitle="鍔熻兘闈㈡澘" roller="false">
+            <table class="TableNewStyle">
+                <tr>
+                     
+                    <td class="ali03">
+                        鐗囧尯锛�
+                    </td>
+                    <td>
+                        <input id='txtpianqu' runat="server" maxlength='50' />
+                    </td>
+                     <td class="ali03">
+                        瀛︽牎锛�
+                    </td>
+                    <td>
+                        <input id='txtxuexiao' runat="server" maxlength='50' />
+                    </td>
+                      
+                     
+                    
+                      
+                    <td colspan="8">
+                        <asp:Button ID="btn_Submit" Text="鏌ヨ" runat="server" OnClick="btn_Search_Click" />&nbsp;<input type="button" value='鎵归噺鎵撳嵃閫佽揣鍗�' onclick="onDeles('<%=orderid %>')" />
+                         <input type="hidden" runat="server" id="hideOrderId" />
+                    </td>
+                </tr>
+            </table>
+        </div>
+        
+        <div>
+            <asp:Repeater ID="RepClientList" runat="server">
+                <HeaderTemplate>
+                    <table class="tableStyle">
+                        <tr>
+                            <th width="30" style="text-align: center">
+                                缂栧彿
+                            </th>
+                            <th style="text-align: center">
+                                鐗囧尯
+                            </th>
+                            <th style="text-align: center">
+                                瀛︽牎
+                            </th>
+                              <th style="text-align: center">
+                                閫佽揣鍗�
+                            </th>
+                        </tr>
+                </HeaderTemplate>
+                <ItemTemplate>
+                    <tr>
+                        
+                        <td style="text-align: center">
+                            <%#Container.ItemIndex + 1%>
+                        </td>
+                        <td style="text-align: center">
+                         <%#Eval("pianqu")%>
+                        </td>
+                        <td style="text-align: center">
+                           <%#Eval("shipAddress")%>
+                        </td>
+                        <td class="Operate " style="text-align: center">
+                            <span   onclick="onDele('<%#Eval("id")%>')">鎵撳嵃</span>
+                        </td>
+                         
+                    </tr>
+                </ItemTemplate>
+                <FooterTemplate>
+                     
+                    </table>
+                </FooterTemplate>
+            </asp:Repeater>
+            
+        </div>
+    </div>
+    </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx.cs
new file mode 100644
index 0000000..0a47617
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx.cs
@@ -0,0 +1,84 @@
+锘縰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;
+using CY.BLL.EC;
+using CY.Model.Inquiry;
+
+namespace CY.WebForm.Pages.business
+{
+    //鍚磋緣
+    //琛屾斂绠$悊
+    public partial class DeliverWorkBookPrint : BasePage
+    {
+        CoreCmsPlanOrderBLL bll_CoreCmsPlanOrderBLL = null;
+        CoreCmsPlanOrderItemBLL bll_CoreCmsPlanOrderItemBLL = null;
+        EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = null;
+        public string orderid = "";
+
+        //鍒濆鍖�
+        public DeliverWorkBookPrint()
+        {
+            bll_CoreCmsPlanOrderBLL = new CoreCmsPlanOrderBLL();
+            bll_CoreCmsPlanOrderItemBLL = new CoreCmsPlanOrderItemBLL();
+            _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
+        }
+
+        //椤甸潰鍔犺浇
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            
+            if (!IsPostBack)
+            {
+                 
+
+                BindList();
+            }
+             
+        }
+
+        //缁戝畾鏁版嵁
+        private void BindList()
+        {
+            string orderIdStr = Request["orderId"];
+            this.hideOrderId.Value = orderIdStr;
+            orderid = orderIdStr;
+
+            var coreCmsPlanOrders = bll_CoreCmsPlanOrderBLL.GetModelByorderid(orderIdStr.ToInt32().Value);
+
+            var pianqu = this.txtpianqu.Value.Trim();
+            if (!string.IsNullOrEmpty(pianqu))
+            {
+                coreCmsPlanOrders = coreCmsPlanOrders.Where(x => x.pianqu.Contains(pianqu));
+            }
+            var xuexiao = this.txtxuexiao.Value.Trim();
+            if (!string.IsNullOrEmpty(xuexiao))
+            {
+                coreCmsPlanOrders = coreCmsPlanOrders.Where(x => x.shipAddress.Contains(xuexiao));
+            }
+
+
+
+
+
+
+            this.RepClientList.DataSource = coreCmsPlanOrders;
+            this.RepClientList.DataBind();
+            
+        }
+ 
+
+        //鏌ヨ浜嬩欢
+        protected void btn_Search_Click(object src, EventArgs e)
+        {
+            BindList();
+        }
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx.designer.cs
new file mode 100644
index 0000000..7d05cad
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx.designer.cs
@@ -0,0 +1,89 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+    public partial class DeliverWorkBookPrint
+    {
+
+        /// <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>
+        /// txtpianqu 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtpianqu;
+
+        /// <summary>
+        /// txtxuexiao 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtxuexiao;
+
+        /// <summary>
+        /// btn_Submit 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btn_Submit;
+
+        /// <summary>
+        /// hideOrderId 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden hideOrderId;
+
+        /// <summary>
+        /// RepClientList 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Repeater RepClientList;
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx
new file mode 100644
index 0000000..153387a
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx
@@ -0,0 +1,121 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverWorkBookPrintDetail.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverWorkBookPrintDetail" %>
+
+<!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>
+     <script src="../../js/utils/jquery-1.5.1.min.js" type="text/javascript"></script>
+    <script src="../../js/common/util.js" type="text/javascript"></script>
+    <script src="../../js/common/KeyBehaviorHook.js" type="text/javascript"></script>
+    <script src="../../js/common/Printter.js?v=7" type="text/javascript"></script>
+    <script src="../../js/common/LodopFuncs.js" type="text/javascript"></script>
+    <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
+    <!--鍓嶅彴椤甸潰start-->
+     
+    <script type="text/javascript">
+        
+    </script>
+</head>
+<body style='padding: 0; margin: 0;' onbeforeprint="OnPrint()" onafterprint="OnPrintOver()">
+    <form id="form1" runat="server">
+    <input type="hidden" runat="server" id="hideOrderId" />
+   
+        <object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width="0" height="0">
+            <embed id="LODOP_EM" type="application/x-print-lodop" width="0" height="0" pluginspage="/Pages/common/install_lodop32.exe"></embed>
+        </object>
+        <div id='div_tool' printparams='0,2100,2470,"A4"'>
+        </div>
+       
+            <asp:Repeater runat="server" ID='rptOrder'>
+                <ItemTemplate>
+       <div class='dbody'>              
+                     <style type="text/css">
+        .dbody { margin: 0; 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;*/
+        .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; }
+        .left {text-align: left; }
+        #div_tool { text-align: center; }
+    </style>
+                    <table border="0" cellpadding="0" cellspacing="0" style="border: 0;">
+                    <tr>
+                        <td colspan='9'>
+                            <div class='dtitle'>
+                                <%=orderName %></div>
+                          
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan='9'>
+                            &nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class='left' colspan="4">
+                            瀛︽牎锛�  <%#Eval("shipAddress")%>
+                        </td>
+                         
+                        <td class='left'  colspan="5">
+                            鍦板潃锛� <%#Eval("shouhuoAddress")%>
+                        </td>
+                      
+                    </tr>
+                       
+                     <tr>
+                        <td class='left'colspan="4">
+                            鑱旂郴浜猴細  <%#Eval("shipName")%>
+                        </td>
+                         
+                        <td class='left'colspan="5">
+                            鑱旂郴鐢佃瘽锛� <%#Eval("shipMobile")%>
+                        </td>
+                       
+                        
+                    </tr>
+  <tr>
+                        <td   colspan="9">
+                           <%=biaotou %>
+                        </td>
+                      
+                    </tr>
+
+                          
+
+                    <tr>
+                        <td colspan='9'>
+                            &nbsp;
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class='left'colspan="3">
+                            鏀惰揣鍗曚綅锛氾紙鐩栫珷锛�
+                        </td>
+                        <td class='left' colspan="3">
+                            鏀惰揣浜猴細
+                        </td>
+                        <td class='left'colspan="3">
+                            鑱旂郴鐢佃瘽锛�
+                        </td>
+                       
+                    </tr>
+                   <tr>
+                          <td class='left'colspan="6">
+                            閫佽揣鏃堕棿锛� 
+                        </td>
+                        <td class='left' colspan="3">
+                          閫佽揣浜猴細 
+                        </td>
+                    </tr>
+                   </table>
+      <%#(Container.ItemIndex !=  (countss-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
new file mode 100644
index 0000000..00558c4
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.cs
@@ -0,0 +1,205 @@
+锘�/**  
+* DeliverWorkBookPrintDetail.aspx.cs
+*
+* 鍔� 鑳斤細 璁㈠崟璇︽儏
+* 绫� 鍚嶏細 DeliverWorkBookPrintDetail
+*
+* Ver    鍙樻洿鏃ユ湡             璐熻矗浜�  鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01  2013-4-24 13:25      鍚村磶鍧�    鍒濈増
+* V0.02  2013-5-15 18:23      鍚村磶鍧�    缂栬緫鐣岄潰鏍峰紡
+* V0.03  2013-5-15 15:58      鍚村磶鍧�    瀹屾垚鏁版嵁鑾峰彇
+* V0.04  2013-5-21 14:38      鍚村磶鍧�    澧炲姞璁㈠崟杩涘害
+* V0.05  2013-5-23 9:33       鍚村磶鍧�    淇敼缁ф壙绫讳负榛樿绫籔age浣挎樉绀轰俊鎭笉鍙楃櫥褰曟帶鍒�
+*
+*
+*
+*
+*
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL.EC;
+using CY.Infrastructure.Common;
+using CY.Model;
+using CY.BLL;
+using CY.Model.Inquiry;
+using CY.BLL.Sys;
+
+namespace CY.WebForm.Pages.business
+{
+    /// <summary>
+    /// 璁㈠崟璇︽儏
+    /// </summary>
+    public partial class DeliverWorkBookPrintDetail : BasePage
+    {
+        CoreCmsPlanOrderBLL bll_CoreCmsPlanOrderBLL = null;
+        CoreCmsPlanOrderItemBLL bll_CoreCmsPlanOrderItemBLL = null;
+        EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = null;
+        EC_OrderBasicBLL _eC_OrderBasicBLL = null;
+        public int orderkeyid = 0;
+        public string biaotou = "";
+        public string orderName = "";
+        public int countss = 0;
+
+        //鍒濆鍖�
+        public DeliverWorkBookPrintDetail()
+        {
+            bll_CoreCmsPlanOrderBLL = new CoreCmsPlanOrderBLL();
+            bll_CoreCmsPlanOrderItemBLL = new CoreCmsPlanOrderItemBLL();
+            _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
+            _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+        }
+        /// <summary>
+        /// 椤甸潰鍔犺浇浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            try
+            {
+                switch (Request["Target"])
+                {
+                    case "GetCommunication":
+                        break;
+                    default:
+                        Page_Load_Default();
+                        return;
+                }
+            }
+            catch (Exception ex)
+            {
+                PAGEHandleException(ex);
+                Response.Clear();
+                Response.Write("-1");
+            }
+            Response.End();
+        }
+
+        /// <summary>
+        /// 榛樿鍔犺浇浜嬩欢鏂规硶
+        /// </summary>
+        private void Page_Load_Default()
+        {
+            LoadOrderInfo();
+        }
+
+        /// <summary>
+        /// 鍔犺浇璁㈠崟淇℃伅
+        /// </summary>
+        private bool LoadOrderInfo()
+        {
+            //濡傛灉鏄壒閲忔墦鍗�
+            string orderIdStr = Request["orderId"];
+            this.hideOrderId.Value = orderIdStr;
+
+            //濡傛灉鏄彧鎵撳嵃涓�寮�
+            string PlanOrderidStr = Request["PlanOrderid"];
+
+           
+            var coreCmsPlanOrders = new List<CoreCmsPlanOrder>();
+            if (!string.IsNullOrEmpty(orderIdStr))
+            {
+                var ssss = bll_CoreCmsPlanOrderBLL.GetModelByorderid(orderIdStr.ToInt32().Value);
+                coreCmsPlanOrders = ssss.ToList();
+                orderkeyid = orderIdStr.ToInt32().Value;
+            }
+            else if (!string.IsNullOrEmpty(PlanOrderidStr))
+            {
+
+                var aaaa = bll_CoreCmsPlanOrderBLL.GetModelByKeyid(PlanOrderidStr.ToInt32().Value);
+                coreCmsPlanOrders.Add(aaaa);
+
+                orderkeyid = aaaa.orderkeyid.Value;
+            }
+            else
+            {
+                CY.WebForm.BasePage.JavaScript.MessageBox("鏁版嵁涓嶅瓨鍦紒", this);
+                return false;
+            }
+
+            //璁㈠崟涓诲崟
+            var eC_OrderBasic = _eC_OrderBasicBLL.SelectModelById(orderkeyid);
+            orderName = eC_OrderBasic.DocumentName + "閫佽揣鍗�";
+            //璁㈠崟鏄庣粏
+            EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(orderkeyid);
+            InquiryCommonModel _inquiryCommonModel = null;
+            if (null == _eC_OrderPrintParameter)
+            {
+                _inquiryCommonModel = new InquiryCommonModel();
+            }
+            else
+            {
+                _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
+
+            }
+            var inquiryWorkBookModels = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x => x.WorkBookNameTxt).ThenBy(x => x.WorkBookSizeTxt);
+            if (string.IsNullOrEmpty(biaotou))
+            {
+                int i = 1;
+
+                biaotou = "<table border=\"1\" cellpadding=\"0\" cellspacing=\"0\" style=\"border: 0; \"><tr>";
+                foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
+                {
+                    biaotou += " <td style=\"text-align:center;border: 1px solid #999999;\"> " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </td> ";
+
+
+                    if (i%9==0)
+                    {
+                        biaotou += " </tr> <tr><td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> </tr>";
+                    }
+
+                    if (i % 9 == 0 && i != inquiryWorkBookModels.Count())
+                    {
+                        biaotou += "  <tr>";
+                    }
+
+                        if (i == inquiryWorkBookModels.Count()&& i % 9 != 0)
+                    {
+                        for (int j=0;j<9;j++)
+                        {
+                            biaotou += " <td style=\"text-align:center;border: 1px solid #999999;\"></td> ";
+                            i = i + 1;
+                            if (i % 9 == 0)
+                            {
+                                biaotou += " </tr><tr><td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> </tr>";
+                                break;
+                            }
+                        }
+                    }
+
+
+                    i++;
+                }
+
+                biaotou += " <tr> <td  style=\"text-align:center;border: 1px solid #999999;\"> 楠屾敹鎰忚</td >  <td  style=\"text-align:left;border: 1px solid #999999;\"  colspan=\"8\">  浜у搧璐ㄩ噺锛�<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>";
+            }
+
+
+
+            countss = coreCmsPlanOrders.Count;
+
+            rptOrder.DataSource = coreCmsPlanOrders;
+            rptOrder.DataBind();
+
+          
+
+
+
+
+            return true;
+        }
+
+       
+
+ 
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.designer.cs
new file mode 100644
index 0000000..a3d7a09
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.designer.cs
@@ -0,0 +1,53 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+    public partial class DeliverWorkBookPrintDetail
+    {
+
+        /// <summary>
+        /// Head1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// hideOrderId 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden hideOrderId;
+
+        /// <summary>
+        /// rptOrder 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Repeater rptOrder;
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx
new file mode 100644
index 0000000..75dc8a5
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx
@@ -0,0 +1,166 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverWorkBookSonghuo.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverWorkBookSonghuo" %>
+
+<!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 onViewCarViolation(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/CarViolationList.aspx?carid=" + keyid, Title: "杩濈珷绠$悊", Width: 1000, Height: 660 });
+        }
+
+        //淇濆吇
+        function onViewCarMaintenance(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/CarMaintenanceList.aspx?carid=" + keyid, Title: "淇濆吇绠$悊", Width: 1000, Height: 660 });
+        }
+        //缁翠慨
+        function onViewCarrepair(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/CarrepairList.aspx?carid=" + keyid, Title: "缁翠慨绠$悊", Width: 1000, Height: 660 });
+        }
+
+        //骞存
+        function onViewCarExamined(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/CarExaminedList.aspx?carid=" + keyid, Title: "骞存绠$悊", Width: 1000, Height: 660 });
+        }
+
+        //淇濋櫓
+        function onViewCarInsurance(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/CarInsuranceList.aspx?carid=" + keyid, Title: "淇濋櫓绠$悊", Width: 1000, Height: 660 });
+        }
+
+        //淇敼
+        function onEdit(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/CarManageAdd.aspx?keyid=" + keyid, Title: "杞﹁締淇℃伅", Width: 1000, Height: 660 });
+        }
+
+        //娣诲姞
+        function addModel() {
+            top.Dialog.open({ URL: "/Pages/business/CarManageAdd.aspx", Title: "鏂板杞﹁締", Width: 1000, Height: 660});
+        }
+
+        //鍒犻櫎
+        function onDele(keyid) {
+            top.Dialog.confirm("纭畾瑕佸垹闄よ璁板綍鍚楋紵", function () {
+                window.location = "/Pages/business/DeliverWorkBookSonghuo.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/business/DeliverWorkBookSonghuo.aspx?deleteKeyIds=" + deleteKeyIds;
+                });
+            }
+        }
+        $(function () {
+            $(".AlreadyReply").remove();
+        });
+    </script>
+    <style type="text/css">
+        .AlreadyReply { display: none; }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+    <div id="scrollContent">
+        <div class="box1" paneltitle="鍔熻兘闈㈡澘" roller="false">
+            <table class="TableNewStyle">
+                <tr>
+                     
+                    <td class="ali03">
+                        閫佽揣鏃堕棿锛�
+                    </td>
+                    <td>
+                       <input id="txtBeginDate" type="text" runat="server" class='date w80px' maxlength='10' />-<input id="txtEndDate" type="text" runat="server" class='date w80px' maxlength='10' />
+                    </td>
+                     <td class="ali03">
+                        瀛︽牎锛�
+                    </td>
+                    <td>
+                        <input id='txtxuexiao' runat="server" maxlength='50' />
+                    </td>
+                      
+                      <td class="ali03 " style="padding-left: 20px">
+                    閫佽揣鐘舵�侊細
+                </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 colspan="8">
+                        <asp:Button ID="btn_Submit" Text="鏌ヨ" runat="server" OnClick="btn_Search_Click" />&nbsp;<input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
+                         <input type="hidden" runat="server" id="hideOrderId" />
+                    </td>
+                </tr>
+            </table>
+        </div>
+        
+        <div>
+            <asp:Repeater ID="RepClientList" runat="server">
+                <HeaderTemplate>
+                    <table class="tableStyle">
+                        <tr>
+                            <th width="30" style="text-align: center" >
+                                缂栧彿
+                            </th>
+                            <th style="text-align: center" >
+                                鐗囧尯
+                            </th>
+                            <th style="text-align: center" >
+                                瀛︽牎
+                            </th>
+                             <%=biaotou %>
+                        </tr>
+                </HeaderTemplate>
+                <ItemTemplate>
+                    <tr>
+                        
+                        <td style="text-align: center">
+                            <%#Container.ItemIndex + 1%>
+                        </td>
+                        <td style="text-align: center">
+                         <%#Eval("pianqu")%>
+                        </td>
+                        <td style="text-align: center">
+                           <%#Eval("shipAddress")%>
+                        </td>
+                          <%#Eval("biaoge")%>
+                         
+                    </tr>
+                </ItemTemplate>
+                <FooterTemplate>
+                      <tr>
+                      <%=biaowei %>
+                            </tr>
+                    </table>
+                </FooterTemplate>
+            </asp:Repeater>
+            
+        </div>
+    </div>
+    </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
new file mode 100644
index 0000000..1fcaf36
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
@@ -0,0 +1,172 @@
+锘縰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;
+using CY.BLL.EC;
+using CY.Model.Inquiry;
+
+namespace CY.WebForm.Pages.business
+{
+    //鍚磋緣
+    //琛屾斂绠$悊
+    public partial class DeliverWorkBookSonghuo : BasePage
+    {
+        CoreCmsPlanOrderBLL bll_CoreCmsPlanOrderBLL = null;
+        CoreCmsPlanOrderItemBLL bll_CoreCmsPlanOrderItemBLL = null;
+        EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = null;
+        public string biaotou = "";
+        public string biaowei = "";
+
+
+        //鍒濆鍖�
+        public DeliverWorkBookSonghuo()
+        {
+            bll_CoreCmsPlanOrderBLL = new CoreCmsPlanOrderBLL();
+            bll_CoreCmsPlanOrderItemBLL = new CoreCmsPlanOrderItemBLL();
+            _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
+        }
+
+        //椤甸潰鍔犺浇
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            
+            if (!IsPostBack)
+            {
+                 
+
+                BindList();
+            }
+             
+        }
+
+        //缁戝畾鏁版嵁
+        private void BindList()
+        {
+            string orderIdStr = Request["orderId"];
+            this.hideOrderId.Value = orderIdStr;
+
+            var coreCmsPlanOrders = bll_CoreCmsPlanOrderBLL.GetModelByorderid(orderIdStr.ToInt32().Value);
+           
+            var xuexiao = this.txtxuexiao.Value.Trim();
+            if (!string.IsNullOrEmpty(xuexiao))
+            {
+                coreCmsPlanOrders = coreCmsPlanOrders.Where(x => x.shipAddress.Contains(xuexiao));
+            }
+
+            var ids = coreCmsPlanOrders.Select(x => x.id).ToArray();
+            var cmsPlanOrderItems = bll_CoreCmsPlanOrderItemBLL.GetModelsByZongOrderid(orderIdStr.ToInt32().Value).Where(x=> ids.Contains( x.orderId));
+
+
+            var coreDeliverOrderItems = bll_CoreCmsPlanOrderItemBLL.GetDeliverModelsByZongOrderid(orderIdStr.ToInt32().Value).Where(x => ids.Contains(x.PlanOrderId));
+            var BeginDate = this.txtBeginDate.Value.Trim();
+            if (!string.IsNullOrEmpty(BeginDate))
+            {
+              var sss =  BeginDate.ToDateTime2().Value;
+                coreDeliverOrderItems = coreDeliverOrderItems.Where(x => x.MakeTime >= sss);
+            }
+            var EndDate = this.txtEndDate.Value.Trim();
+            if (!string.IsNullOrEmpty(EndDate))
+            {
+                var sss = EndDate.ToDateTime2().Value.AddDays(1);
+                coreDeliverOrderItems = coreDeliverOrderItems.Where(x => x.MakeTime <= sss);
+            }
+
+            var OrderState = this.selstatus.Value.Trim();
+            if (!string.IsNullOrEmpty(OrderState))
+            {
+                var sss = OrderState.ToInt32().Value;
+                coreDeliverOrderItems = coreDeliverOrderItems.Where(x => x.OrderState == sss);
+            }
+
+
+
+            EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(orderIdStr.ToInt32().Value);
+            InquiryCommonModel _inquiryCommonModel = null;
+            if (null == _eC_OrderPrintParameter)
+            {
+                _inquiryCommonModel = new InquiryCommonModel();
+            }
+            else
+            {
+                _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
+
+            }
+           var inquiryWorkBookModels  = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x=>x.WorkBookNameTxt).ThenBy(x=>x.WorkBookSizeTxt);
+          
+            if (string.IsNullOrEmpty(biaotou))
+            {
+                string biaotou2 = " <th style=\"text-align:center\" >  </th> <th style=\"text-align:center\" >  </th> <th style=\"text-align:center\" >  </th>";
+                foreach (var inquiryWorkBookModel  in inquiryWorkBookModels)
+                {
+                    biaotou += " <th style=\"text-align:center\" colspan=\"2\"> " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </th> ";
+                    biaotou2+= " <th style=\"text-align:center\" > 宸查�� </th> <th style=\"text-align:center\" > 鏈�� </th> ";
+
+
+                }
+                biaotou +="</tr><tr>"+ biaotou2+ "</tr>";
+            }
+            biaowei = "   <td style=\"text-align:center\"> 鍚堣 </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).Sum(x => x.nums);
+
+                var coreDeliverOrderItems1 = coreDeliverOrderItems.Where(x => x.ZYBName == inquiryWorkBookModel.WorkBookNameTxt && x.ZYBSpecification == inquiryWorkBookModel.WorkBookSizeTxt);
+
+                var Number = coreDeliverOrderItems1.Sum(x => x.Number);
+                var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber);
+
+
+                biaowei += " <td style=\"text-align:center\"> " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:red;\" >" + (nums - LessNumber - Number) + " </span></td>";
+
+            }
+
+
+
+        
+            foreach(var coreCmsPlanOrder  in coreCmsPlanOrders)
+            {
+                var cmsPlanOrderItems1 = cmsPlanOrderItems.Where(x => x.orderId == coreCmsPlanOrder.id);
+                foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
+                {
+                    var cmsPlanOrderItem = cmsPlanOrderItems1.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt).FirstOrDefault();
+                    if (cmsPlanOrderItem != null)
+                    {
+                        var coreDeliverOrderItems1 = coreDeliverOrderItems.Where(x =>x.PlanOrderId == coreCmsPlanOrder.id && x.ZYBName == inquiryWorkBookModel.WorkBookNameTxt && x.ZYBSpecification == inquiryWorkBookModel.WorkBookSizeTxt);
+
+                        var Number = coreDeliverOrderItems1.Sum(x => x.Number);
+                        var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber);
+
+                        coreCmsPlanOrder.biaoge += " <td style=\"text-align:center\"> " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number)  + " </span></td>";
+                    }
+                    else
+                    {
+                        coreCmsPlanOrder.biaoge += " <td style=\"text-align:center\"> 0 </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >0</span></td> ";
+                    }
+                   
+                }
+
+            }
+
+             
+
+
+            this.RepClientList.DataSource = coreCmsPlanOrders;
+            this.RepClientList.DataBind();
+            
+        }
+ 
+
+        //鏌ヨ浜嬩欢
+        protected void btn_Search_Click(object src, EventArgs e)
+        {
+            BindList();
+        }
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.designer.cs
new file mode 100644
index 0000000..85cdff4
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.designer.cs
@@ -0,0 +1,107 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+    public partial class DeliverWorkBookSonghuo
+    {
+
+        /// <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>
+        /// txtBeginDate 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtBeginDate;
+
+        /// <summary>
+        /// txtEndDate 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtEndDate;
+
+        /// <summary>
+        /// txtxuexiao 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        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>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btn_Submit;
+
+        /// <summary>
+        /// hideOrderId 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden hideOrderId;
+
+        /// <summary>
+        /// RepClientList 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Repeater RepClientList;
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx
index 9e0dd1d..03753bb 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx
@@ -165,7 +165,7 @@
                             鏁伴噺锛�
                         </td>
                         <td>
-                            <%#Eval("OrderExtend.PrintNum")%>&nbsp;
+                            <%#Eval("OrderExtend.PrintNum")%>&nbsp;<%#Eval("UnitName")%>
                         </td>
                         <td class='left'>
                             鍗曚环锛�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs
index d87a2f2..dcc717a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs
@@ -39,7 +39,7 @@
     public partial class OrderDeatil : BasePage
     {
         EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
-
+        Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
         /// <summary>
         /// 椤甸潰鍔犺浇浜嬩欢
         /// </summary>
@@ -140,6 +140,11 @@
             {
                 _inquiryCommonModel.PrintDemand = _inquiryCommonModel.PrintCountName + "锛�" + _inquiryCommonModel.PrintDemand;
             }
+            var sys_Dictionarie = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅").FirstOrDefault(x=>x.MeanValue == _inquiryCommonModel.Unit);
+            if (sys_Dictionarie != null)
+            {
+                _eC_OrderBasic.UnitName = sys_Dictionarie.Name;
+            }
             rptOrder.DataSource = new List<EC_OrderBasic>() { _eC_OrderBasic };
             rptOrder.DataBind();
             rptAccpteWay.DataSource = "鑷彁".Equals(_inquiryCommonModel.DeliveryModeName) ? null : new List<EC_AcceptWayByOrder>() { _eC_AcceptWayByOrder };
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index 931670d..f3a22ea 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -9,8 +9,8 @@
     <link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
     <link href="../../Styles/changes.css" rel="stylesheet" type="text/css" />
     <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
-    <script src="../../js/Inquiry/Inquiry.js?v=49" type="text/javascript"></script>
-    <script src="../../js/business/Order.js?v=35" type="text/javascript"></script>
+    <script src="../../js/Inquiry/Inquiry.js?v=87 type="text/javascript"></script>
+    <script src="../../js/business/Order.js?v=36" type="text/javascript"></script>
     <!--鍓嶅彴椤甸潰end-->
     <script type="text/javascript" language="javascript">
 
@@ -252,10 +252,10 @@
                 <input id='txtDocumentName' runat="server" maxlength='200' class='req' style="width:200px;" />
                  <input type='hidden'   id='txtDocumentNameHide' />
             </td>
-            <td align="right">
+            <td align="right"  id="selVerifyWay1234">
                 璁㈠崟鍗曚环锛�
             </td>
-            <td align="left">
+            <td align="left"  id="selVerifyWay4321">
                 <input id='txtUnitPrice' runat="server" maxlength='9' class='float' onchange="jsPrice(this.value)" />
             </td>
             <td align="right">
@@ -415,6 +415,7 @@
             </td>
         </tr>
     </table>
+         <br />
     <table class="table2"  align="left" style=" width:1000px;">
         <tbody>
             
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
index b2ad99c..00a5e3e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
@@ -59,6 +59,9 @@
                         Page_Load_Default();
                         LoadOrderInfo();
                         return;
+                    case "jisuanorderJine":
+                        UpdateorderJine2();
+                        break;
                     default:
                         Page_Load_Default();
                         return;
@@ -340,6 +343,27 @@
         }
 
 
+        /// <summary>
+        /// 鍔犺浇鍗板埛鐗�
+        /// </summary>
+        private void UpdateorderJine2()
+        {
+            Response.Clear();
+            string result = string.Empty;
+            int orderId = Request["OrderId"].ToString().ToInt32().Value;
+            EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+           var  sss = _eC_OrderBasicBLL.UpdateorderJine(orderId);
+
+            result = "";//JsonHelper.GetJsonStringByObject(_CorporateClientsPrint);
+            result += "{\"status\":\"" + sss + "\"";
+            result += "}";
+
+
+            Response.Write(result);
+            //Response.End();
+        }
+
+
 
         /// <summary>
         /// 淇濆瓨璁㈠崟
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index d267260..6380eb2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -36,6 +36,10 @@
             top.Dialog.open({ URL: "/Pages/business/AgSealPrint.aspx?orderid=" + orderId, Title: "鎵撳嵃灏佺", Width: 1100, Height: 900 });
         }
 
+
+        function ShowPlanOrder(orderId) {
+            top.Dialog.open({ URL: "/Pages/business/PlanOrderList.aspx?orderkeyid=" + orderId, Title: "璁″垝璁㈠崟", Width: 1100, Height: 900 });
+        }
         
 
         function DeliverWork(orderId, orderCode, orderState) {
@@ -358,8 +362,11 @@
                         <th width="26" menu_member_case_id="case_ToAccept" menu_member_case_name="鍙楃悊">
                             鍙楃悊
                         </th>
-                         <th width="26" menu_member_case_id="case_ToAccept" menu_member_case_name="閿佸崟">
+                         <th width="26" >
                             閿佸崟
+                        </th>
+                         <th width="26" >
+                            璁″垝璁㈠崟
                         </th>
                           <th width="26" >
                             灏佺
@@ -477,6 +484,10 @@
                                     <span  <%#"37" == Eval("PrintTypeId").ToString()? "style='display:block;'" : "style='display:none;'" %>    <%#true.Equals(Eval("SuodanState"))?"title='宸查攣鍗�'":"title='閿佸崟'"%>    onclick="<%#true.Equals(Eval("SuodanState"))?"":"ToSuodan("+Eval("Keyid")+",'"+Eval("SellerOrderId")+"')"%>">
                                         <%#true.Equals(Eval("SuodanState")) ? "鈭�" : "閿佸崟"%></span>
                                 </td>
+                                 <td >
+                                    <span  <%#"37" == Eval("PrintTypeId").ToString()? "style='display:block;'" : "style='display:none;'" %>         onclick="ShowPlanOrder(<%#Eval("Keyid")%>)">
+                                        璁″垝璁㈠崟
+                                </td>
                                  <td  >
                                     <%-- <span class="hand look" title="鏌ョ湅鎴栨墦鍗�" onclick='ShowOrder(<%#Eval("Keyid") %>)'>鎵撳嵃</span>--%>
                                     <span class="hand_yes" <%#true.Equals(Eval("IsPrintfengqian"))? "title='宸叉墦鍗�'" : "title='鎵撳嵃'"%> onclick='ShowOrderFengqian(<%#Eval("Keyid") %>)'>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderAdd.aspx
new file mode 100644
index 0000000..ae9a6ca
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderAdd.aspx
@@ -0,0 +1,187 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PlanOrderAdd.aspx.cs" Inherits="CY.WebForm.Pages.financial.PlanOrderAdd" %>
+
+<!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 changenum(index) {
+              
+             
+
+             var itemNumarray = $("input[name='itemNumarray']:eq(" + index + ")").val();
+             var price = $("input[name='price']:eq(" + index + ")").val();
+
+             
+
+             $("input[name='amount']:eq(" + index + ")").val((itemNumarray * price).toFixed(2));
+
+
+             var zongjia = 0;
+
+             for (v = 0; v < $("input[name='amount']").size(); v++) {
+
+                 zongjia = zongjia + parseFloat($("input[name='amount']:eq(" + v + ")").val());
+
+
+             }
+ 
+
+
+             $('#OrderAmount').val(zongjia.toFixed(2));
+
+
+ 
+
+         }
+</script>
+</head>
+<body>
+    <form id="form1" runat="server" class="form2">
+         <div>
+   <table class="tableStyle">
+            <tr>
+                <td class="ali03 ">
+                    鐪侊細
+                </td>
+                <td>
+                    <span runat="server" id="spnsheng"></span>
+                    <%-- <asp:DropDownList ID="selectProvince" runat="server" keepDefaultStyle="true" AutoPostBack="true" OnSelectedIndexChanged="ChangeProvince" Width="70px" >
+                            </asp:DropDownList>--%>
+                     <input type="hidden" id="HideKeyid" runat="server" /> 
+                </td>
+                 <td class="ali03 ">
+                    甯傦細
+                </td>
+                <td>
+                    <span runat="server" id="spnshi"></span>
+                    <%-- <asp:DropDownList ID="selectCity" runat="server" keepDefaultStyle="true" AutoPostBack="true" OnSelectedIndexChanged="ChangeCity" Width="70px" >
+                            </asp:DropDownList>--%>
+                </td>
+                 <td class="ali03 ">
+                    鍖哄幙锛�
+                </td>
+                <td>
+                    <span runat="server" id="spnquxian"></span>
+                  <%--   <asp:DropDownList ID="selectCounty" runat="server" keepDefaultStyle="true" AutoPostBack="false" Width="70px" >
+                            </asp:DropDownList>--%>
+                </td>
+                 <td class="ali03 ">
+                    鐗囧尯锛�
+                </td>
+                <td>
+                   <input id="spnpianqu" name="spnpianqu" runat="server" type="text"  class='req' style="width:150px;" />  
+                    
+                </td>
+            </tr>
+            <tr>
+               
+                 <td class="ali03 ">
+                    瀛︽牎锛�
+                </td>
+                <td>
+                  <%--  <span runat="server" id="spnshipAddress"></span>--%>
+                       <input id="spnshipAddress" name="spnshipAddress" runat="server" type="text"  class='req' style="width:150px;"  />  
+                </td>
+                  <td class="ali03 ">
+                    鑱旂郴浜猴細
+                </td>
+                <td>
+                   <%-- <span runat="server" id="spnshipName"></span>--%>
+                     <input id="spnshipName" name="spnshipName" runat="server" type="text"  class='req' style="width:150px;"  />  
+                </td>
+                 <td class="ali03 ">
+                    鑱旂郴鐢佃瘽锛�
+                </td>
+                <td>
+                   <%-- <span runat="server" id="spnshipMobile"></span>--%>
+                     <input id="spnshipMobile" name="spnshipMobile" runat="server" type="text"  class='req' style="width:150px;"   />  
+                </td>
+                 <td class="ali03 ">
+                    鏀惰揣鍦板潃锛�
+                </td>
+                <td>
+                   <%-- <span runat="server" id="spnshouhuoAddress"></span>--%>
+                     <input id="spnshouhuoAddress" name="spnshouhuoAddress" runat="server" type="text"  class='req'  style="width:300px;" />  
+                </td>
+            </tr>
+            <tr>
+                <td class="ali03 ">
+                    閲戦锛�
+                </td>
+                <td>
+                  <input id="OrderAmount" name="OrderAmount" runat="server" type="text"  class='req'   readonly="readonly" />     
+                </td>
+            </tr>
+        </table>
+            
+      
+      
+
+                <asp:Repeater ID="RepSubjeSetctList" runat="server">
+                <HeaderTemplate>
+                    <table class="tableStyle ali02" useclick="false" usecheckbox="true" sortmode="true">
+                        <tr>
+                     
+                            <th>
+                                 鍟嗗搧鍚嶇О
+                            </th>
+                            <th>
+                                鍗曚环锛堝厓锛�
+                            </th>
+                            <th>
+                                 鏁伴噺
+                            </th>
+                            <th>
+                                 閲戦锛堝厓锛�
+                            </th>
+                             
+                        </tr>
+                </HeaderTemplate>
+                <ItemTemplate>
+                    <tr>
+                       
+                        <td>
+                            <%#Eval("name")%> <%#Eval("specification")%>
+                             <input type="hidden" name="name" value="<%#Eval("name")%>">
+                             <input type="hidden" name="specification" value="<%#Eval("specification")%>">
+                             <input type="hidden" name="fengmian" value="<%#Eval("fengmian")%>">
+                             <input type="hidden" name="neiye" value="<%#Eval("neiye")%>">
+                        </td>
+                        <td>
+                            <%#Eval("price")%> 
+                             <input type="hidden" name="price" value="<%#Eval("price")%>">
+                             <%-- <input type="hidden" name="id" value="<%#Eval("id")%>">--%>
+                        </td>
+                       
+                        <td>
+                           <input name="itemNumarray"   type="text" min="0" max="99999999"   class='req positiveint' placeholder="璇疯緭鍏ユ暟閲�"   value="<%#Eval("nums")%>" onchange="changenum(<%#Container.ItemIndex %>);" />  
+                        </td>
+                        <td>
+                           <input   name="amount" type="text" class='req' value=" <%#Eval("amount")%>" readonly="readonly" />
+                        </td>
+                           
+                    </tr>
+                </ItemTemplate>
+                <FooterTemplate>
+                    </table>
+                </FooterTemplate>
+            </asp:Repeater>
+    <table class="tableStyle">
+        <tr>
+           
+            <td align="center" colspan="8">
+                <p>
+                    <asp:Button ID="btn_Submit" Text="鎻愪氦" runat="server" OnClick="btn_Submit_Config" />
+                </p>
+            </td>
+        </tr>
+    </table>
+             </div>
+    </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderAdd.aspx.cs
new file mode 100644
index 0000000..090f4f3
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderAdd.aspx.cs
@@ -0,0 +1,327 @@
+锘縰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.Model;
+using CY.Infrastructure.Query;
+using CY.Infrastructure.Common;
+using CY.BLL.Sys;
+using CY.BLL.OA;
+using CY.BLL.EC;
+using System.Transactions;
+using CY.Model.Inquiry;
+
+namespace CY.WebForm.Pages.financial
+{
+    public partial class PlanOrderAdd : BasePage
+    {
+        CoreCmsPlanOrderBLL _PlanOrderBLL = new CoreCmsPlanOrderBLL();
+        CoreCmsPlanOrderItemBLL _coreCmsPlanOrderItemBLL = new CoreCmsPlanOrderItemBLL();
+        Sys_CitySiteBLL bll_Sys_CitySiteBLL = new Sys_CitySiteBLL();
+        EC_OrderPrintParameterBLL _OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
+        EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+        OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL() ;
+        public PlanOrderAdd()
+        {
+           
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                InitialData();
+                if (Request["Keyid"].ToInt32() > 0)  // 鍔犺浇瑕佷慨鏀圭殑鐨勬暟鎹�
+                {
+                    //HideKeyid.Value = Request["Keyid"].ToString2();
+                   
+                }
+            }
+        }
+
+        /// <summary>
+        /// 鍒濆鍖栫鐩被鍒�
+        /// </summary>
+        public void InitialData()
+        {
+            //BindProvince();
+
+            InitialModifyData();
+        }
+
+        /// <summary>
+        /// 鍒濆鍖栬淇敼鐨勬暟鎹�
+        /// </summary>
+        public void InitialModifyData()
+        {
+            //var coreCmsPlanOrder = _PlanOrderBLL.GetModelByKeyid(Request["Keyid"].ToInt32().Value);
+            //spnsheng.InnerText = coreCmsPlanOrder.sheng;
+            //spnshi.InnerText = coreCmsPlanOrder.shi;
+            //spnquxian.InnerText = coreCmsPlanOrder.quxian;
+            //spnpianqu.Value = coreCmsPlanOrder.pianqu;
+            //spnshipAddress.Value = coreCmsPlanOrder.shipAddress;
+            //spnshipName.Value = coreCmsPlanOrder.shipName;
+            //spnshipMobile.Value = coreCmsPlanOrder.shipMobile;
+            //spnshouhuoAddress.Value = coreCmsPlanOrder.shouhuoAddress;
+            //OrderAmount.Value = coreCmsPlanOrder.orderAmount.ToString2();
+            var coreCmsPlanOrders = new List<CoreCmsPlanOrderItem>();
+            if (Request["orderkeyid"].ToInt32() > 0)
+            {
+                HideKeyid.Value = Request["orderkeyid"].ToString2();
+                var eC_OrderPrintParameter = _OrderPrintParameterBLL.GetModel(Request["orderkeyid"].ToInt32().Value); ;
+                InquiryCommonModel model = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
+                foreach(var workBookModel in model.InquiryWorkBookList)
+                {
+                    var coreCmsPlanOrder = new CoreCmsPlanOrderItem();
+                    coreCmsPlanOrder.name = workBookModel.WorkBookNameTxt;
+                    coreCmsPlanOrder.specification = workBookModel.WorkBookSizeTxt;
+                    coreCmsPlanOrder.price = workBookModel.WorkBookPrice.ToDecimal2().Value;
+                    coreCmsPlanOrder.nums = 0;
+                    coreCmsPlanOrder.amount = 0;
+                    coreCmsPlanOrder.fengmian = string.IsNullOrEmpty(workBookModel.fengmian)?"": workBookModel.fengmian;
+                    coreCmsPlanOrder.neiye = string.IsNullOrEmpty(workBookModel.neiye) ? "" : workBookModel.neiye;
+                    coreCmsPlanOrders.Add(coreCmsPlanOrder);
+                }
+
+
+                this.RepSubjeSetctList.DataSource = coreCmsPlanOrders;
+
+                this.RepSubjeSetctList.DataBind();
+
+
+              var eC_OrderBasic =   _eC_OrderBasicBLL.SelectModelById(Request["orderkeyid"].ToInt32().Value);
+                if (eC_OrderBasic != null)
+                {
+
+                  var customerCommunications =  bll_OA_CorporateClientsBLL.GetModel_CustomerCommunications(eC_OrderBasic.BuyerId);
+                    spnsheng.InnerText = customerCommunications.Province;
+                    spnshi.InnerText = customerCommunications.City;
+                    spnquxian.InnerText = customerCommunications.County;
+                }
+            }
+                
+
+          
+        }
+
+        /// <summary>
+        /// 娣诲姞鎴栦慨鏀圭鐩�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btn_Submit_Config(object sender, EventArgs e)
+        {
+            //if(selectProvince.SelectedValue == "")
+            //{
+            //    JavaScript.MessageBox("璇烽�夋嫨鐪�", this);
+            //    return;
+            //}
+            //if (selectCity.SelectedValue == "")
+            //{
+            //    JavaScript.MessageBox("璇烽�夋嫨甯�", this);
+            //    return;
+            //}
+            //if (selectCounty.SelectedValue == "")
+            //{
+            //    JavaScript.MessageBox("璇烽�夋嫨鍖哄幙", this);
+            //    return;
+            //}
+
+
+            // string id =   HideKeyid.Value;
+            var orderAmount  =  this.OrderAmount.Value;
+            var pianqu = this.spnpianqu.Value.Trim();
+            var shipAddress = this.spnshipAddress.Value.Trim();
+            var shipName = this.spnshipName.Value.Trim();
+            var shipMobile = this.spnshipMobile.Value.Trim();
+            var shouhuoAddress = this.spnshouhuoAddress.Value.Trim();
+            //string[] ids = Request["id"].ToString2().Split(',');
+
+            string[] name = Request["name"].ToString2().Split(',');
+            string[] specification = Request["specification"].ToString2().Split(',');
+            string[] price = Request["price"].ToString2().Split(',');
+            string[] itemNumarray = Request["itemNumarray"].ToString2().Split(',');
+            string[] amount = Request["amount"].ToString2().Split(',');
+            string[] fengmian = Request["fengmian"].ToString2().Split(',');
+            string[] neiye = Request["neiye"].ToString2().Split(',');
+            var sss = false;
+            EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+            int orderkeyid = 0;
+            using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+         new TransactionOptions
+         {
+             IsolationLevel = IsolationLevel.ReadCommitted,
+             Timeout = TransactionManager.MaximumTimeout
+         }
+         ))
+            {
+                var coreCmsPlanOrder = new CoreCmsPlanOrder();
+                orderkeyid = HideKeyid.Value.ToInt32().Value;
+                //coreCmsPlanOrder.sheng = selectProvince.SelectedItem.Text;
+                //coreCmsPlanOrder.shengId = selectProvince.SelectedValue.ToInt32().Value;
+                //coreCmsPlanOrder.shi = selectCity.SelectedItem.Text;
+                //coreCmsPlanOrder.shiId = selectCity.SelectedValue.ToInt32().Value;
+                //coreCmsPlanOrder.quxian = selectCounty.SelectedItem.Text;
+                //coreCmsPlanOrder.quxianId = selectCounty.SelectedValue.ToInt32().Value;
+                coreCmsPlanOrder.sheng = spnsheng.InnerText;
+                coreCmsPlanOrder.shi = spnshi.InnerText;
+                coreCmsPlanOrder.quxian = spnquxian.InnerText;
+
+                var sys_CitySite = bll_Sys_CitySiteBLL.GetModelByName(coreCmsPlanOrder.sheng);
+                if (sys_CitySite != null)
+                {
+                    coreCmsPlanOrder.shengId = sys_CitySite.Keyid;
+                    var sys_CitySite1 = bll_Sys_CitySiteBLL.SelectAllNextModel(sys_CitySite.Keyid, 0, 2).FirstOrDefault(x=>x.Name == coreCmsPlanOrder.shi);
+                    if (sys_CitySite1 != null)
+                    {
+                        coreCmsPlanOrder.shiId = sys_CitySite1.Keyid;
+                        var sys_CitySite2 = bll_Sys_CitySiteBLL.SelectAllNextModel(sys_CitySite.Keyid, sys_CitySite1.Keyid, 3).FirstOrDefault(x => x.Name == coreCmsPlanOrder.quxian);
+                        if (sys_CitySite2 != null)
+                        {
+                            coreCmsPlanOrder.quxianId = sys_CitySite2.Keyid;
+                        }
+                    }
+                }
+              
+
+
+                coreCmsPlanOrder.orderkeyid = orderkeyid;
+                coreCmsPlanOrder.orderAmount = orderAmount.ToDecimal2().Value;
+                coreCmsPlanOrder.pianqu = pianqu;
+                coreCmsPlanOrder.shipAddress = shipAddress;
+                coreCmsPlanOrder.shipName = shipName;
+                coreCmsPlanOrder.shipMobile = shipMobile;
+                coreCmsPlanOrder.userMobile = shipMobile;
+                coreCmsPlanOrder.shouhuoAddress = shouhuoAddress;
+                coreCmsPlanOrder.upDataTime = DateTime.Now;
+                coreCmsPlanOrder.upDataBy = CurrentUser.ShortName;
+
+                coreCmsPlanOrder.createTime = DateTime.Now;
+                coreCmsPlanOrder.createBy = CurrentUser.ShortName;
+                coreCmsPlanOrder.FirmId = CurrentUser.MemberId;
+
+                int orderid = _PlanOrderBLL.InsertModelIden(coreCmsPlanOrder);
+
+
+                for (int i = 0; i < name.Length; i++)
+                {
+                    var cmsPlanOrderItem = new CoreCmsPlanOrderItem();
+                    cmsPlanOrderItem.orderId = orderid;
+                    cmsPlanOrderItem.name = name[i];
+                    cmsPlanOrderItem.specification = specification[i];
+                    cmsPlanOrderItem.price = price[i].ToDecimal2().Value;
+
+                    cmsPlanOrderItem.nums = itemNumarray[i].ToInt32().Value;
+                    cmsPlanOrderItem.amount = amount[i].ToDecimal2().Value;
+                    cmsPlanOrderItem.upDataTime = DateTime.Now;
+                    cmsPlanOrderItem.upDataBy = CurrentUser.ShortName;
+                    cmsPlanOrderItem.createTime = DateTime.Now;
+                    cmsPlanOrderItem.createBy = CurrentUser.ShortName;
+                    cmsPlanOrderItem.isOld = true;
+                    cmsPlanOrderItem.fengmian = string.IsNullOrEmpty(fengmian[i])?"": fengmian[i];
+                    cmsPlanOrderItem.neiye = string.IsNullOrEmpty(neiye[i]) ? "" : neiye[i];
+
+                    sss = _PlanOrderBLL.insertModelOrderItem(cmsPlanOrderItem);
+                }
+
+                //鏇存柊鏁翠釜璁㈠崟鐨勬�讳环鏍�
+               
+
+              
+
+            scope.Complete();
+        }
+        sss = _eC_OrderBasicBLL.UpdateorderJine(orderkeyid);
+          
+            if (sss)
+            {
+                JavaScript.MessageBoxCloseAndRefreshFirsts("鏂板鎴愬姛", this);
+               
+            }
+            else
+            {
+                JavaScript.MessageBox("鏂板鎴愬姛", this);
+            }
+            
+        }
+
+
+
+
+
+        ////缁戝畾鐪�
+        //protected void BindProvince()
+        //{
+        //    this.selectProvince.Items.Clear();
+
+        //    var sys_CitySites = bll_Sys_CitySiteBLL.SelectAllNextModel(0, 0, 1);
+        //    this.selectProvince.DataSource = sys_CitySites;
+        //    var sys_CitySite = sys_CitySites.FirstOrDefault(x => x.Name == "鍥涘窛鐪�");
+        //    this.selectProvince.DataTextField = "Name";
+        //    this.selectProvince.DataValueField = "Keyid";
+        //    this.selectProvince.DataBind();
+        //    this.selectProvince.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+        //    this.selectCity.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+        //    this.selectCounty.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+        //    if (sys_CitySite != null)
+        //    {
+        //        this.selectProvince.SelectedValue = sys_CitySite.Keyid.ToString();
+
+        //        this.selectCity.Items.Clear();
+        //        this.selectCounty.Items.Clear();
+        //        Sys_CitySite m_Sys_CitySite = bll_Sys_CitySiteBLL.GetModelByKeyid(this.selectProvince.SelectedValue.ToInt32() ?? 0);
+        //        if (m_Sys_CitySite != null)
+        //        {
+
+        //            this.selectCity.DataSource = bll_Sys_CitySiteBLL.SelectAllNextModel(m_Sys_CitySite.Keyid, 0, 2);
+
+        //            this.selectCity.DataTextField = "Name";
+        //            this.selectCity.DataValueField = "Keyid";
+        //            this.selectCity.DataBind();
+        //        }
+        //        this.selectCity.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+        //        this.selectCounty.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+        //    }
+
+        //}
+
+        ////鏀瑰彉鐪佺粦瀹氬競
+        //protected void ChangeProvince(object sender, EventArgs e)
+        //{
+        //    this.selectCity.Items.Clear();
+        //    this.selectCounty.Items.Clear();
+        //    Sys_CitySite m_Sys_CitySite = bll_Sys_CitySiteBLL.GetModelByKeyid(this.selectProvince.SelectedValue.ToInt32() ?? 0);
+        //    if (m_Sys_CitySite != null)
+        //    {
+                
+        //            this.selectCity.DataSource = bll_Sys_CitySiteBLL.SelectAllNextModel(m_Sys_CitySite.Keyid, 0, 2);
+
+        //        this.selectCity.DataTextField = "Name";
+        //        this.selectCity.DataValueField = "Keyid";
+        //        this.selectCity.DataBind();
+        //    }
+        //    this.selectCity.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+        //    this.selectCounty.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+        //}
+
+        ////鏀瑰彉甯傜粦瀹氬尯
+        //protected void ChangeCity(object sender, EventArgs e)
+        //{
+        //    this.selectCounty.Items.Clear();
+        //    Sys_CitySite m_Sys_CitySite = bll_Sys_CitySiteBLL.GetModelByKeyid(this.selectCity.SelectedValue.ToInt32() ?? 0);
+        //    if (m_Sys_CitySite != null)
+        //    {
+               
+        //            this.selectCounty.DataSource = bll_Sys_CitySiteBLL.SelectProxyNextModel(m_Sys_CitySite.ProvinceId, m_Sys_CitySite.Keyid, 3);
+
+        //        this.selectCounty.DataTextField = "Name";
+        //        this.selectCounty.DataValueField = "Keyid";
+        //        this.selectCounty.DataBind();
+        //    }
+        //    this.selectCounty.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+        //}
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderAdd.aspx.designer.cs
new file mode 100644
index 0000000..784cbdd
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderAdd.aspx.designer.cs
@@ -0,0 +1,143 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.financial
+{
+
+
+    public partial class PlanOrderAdd
+    {
+
+        /// <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>
+        /// spnsheng 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spnsheng;
+
+        /// <summary>
+        /// HideKeyid 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden HideKeyid;
+
+        /// <summary>
+        /// spnshi 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spnshi;
+
+        /// <summary>
+        /// spnquxian 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spnquxian;
+
+        /// <summary>
+        /// spnpianqu 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText spnpianqu;
+
+        /// <summary>
+        /// spnshipAddress 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText spnshipAddress;
+
+        /// <summary>
+        /// spnshipName 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText spnshipName;
+
+        /// <summary>
+        /// spnshipMobile 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText spnshipMobile;
+
+        /// <summary>
+        /// spnshouhuoAddress 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText spnshouhuoAddress;
+
+        /// <summary>
+        /// OrderAmount 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText OrderAmount;
+
+        /// <summary>
+        /// RepSubjeSetctList 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Repeater RepSubjeSetctList;
+
+        /// <summary>
+        /// btn_Submit 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btn_Submit;
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderDetail.aspx
new file mode 100644
index 0000000..fe4396c
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderDetail.aspx
@@ -0,0 +1,126 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" ValidateRequest="false" CodeBehind="PlanOrderDetail.aspx.cs" Inherits="CY.WebForm.Pages.financial.PlanOrderDetail" %>
+
+<!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" />
+</head>
+<body>
+    <form id="form1" runat="server">
+    <div>
+        <table class="tableStyle">
+            <tr>
+                <td class="ali03 ">
+                    鐪侊細
+                </td>
+                <td>
+                    <span runat="server" id="spnsheng"></span>
+                </td>
+                 <td class="ali03 ">
+                    甯傦細
+                </td>
+                <td>
+                    <span runat="server" id="spnshi"></span>
+                </td>
+                 <td class="ali03 ">
+                    鍖哄幙锛�
+                </td>
+                <td>
+                    <span runat="server" id="spnquxian"></span>
+                </td>
+                 <td class="ali03 ">
+                    鐗囧尯锛�
+                </td>
+                <td>
+                    <span runat="server" id="spnpianqu"></span>
+                </td>
+            </tr>
+            <tr>
+               
+                 <td class="ali03 ">
+                    瀛︽牎锛�
+                </td>
+                <td>
+                    <span runat="server" id="spnshipAddress"></span>
+                </td>
+                  <td class="ali03 ">
+                    鑱旂郴浜猴細
+                </td>
+                <td>
+                    <span runat="server" id="spnshipName"></span>
+                </td>
+                 <td class="ali03 ">
+                    鑱旂郴鐢佃瘽锛�
+                </td>
+                <td>
+                    <span runat="server" id="spnshipMobile"></span>
+                </td>
+                 <td class="ali03 ">
+                    鏀惰揣鍦板潃锛�
+                </td>
+                <td>
+                    <span runat="server" id="spnshouhuoAddress"></span>
+                </td>
+            </tr>
+            <tr>
+                <td class="ali03 ">
+                    閲戦锛�
+                </td>
+                <td>
+                    <span runat="server" id="spnorderAmount"></span>
+                </td>
+            </tr>
+            <tr>
+      
+      
+
+                <asp:Repeater ID="RepSubjeSetctList" runat="server">
+                <HeaderTemplate>
+                    <table class="tableStyle ali02" useclick="false" usecheckbox="true" sortmode="true">
+                        <tr>
+                     
+                            <th>
+                                 鍟嗗搧鍚嶇О
+                            </th>
+                            <th>
+                                鍗曚环锛堝厓锛�
+                            </th>
+                            <th>
+                                 鏁伴噺
+                            </th>
+                            <th>
+                                 閲戦锛堝厓锛�
+                            </th>
+                             
+                        </tr>
+                </HeaderTemplate>
+                <ItemTemplate>
+                    <tr>
+                       
+                        <td>
+                            <%#Eval("name")%> <%#Eval("specification")%>
+                        </td>
+                        <td>
+                            <%#Eval("price")%> 
+                        </td>
+                       
+                        <td>
+                            <%#Eval("nums")%>
+                        </td>
+                        <td>
+                            <%#Eval("amount")%>
+                        </td>
+                           
+                    </tr>
+                </ItemTemplate>
+                <FooterTemplate>
+                    </table>
+                </FooterTemplate>
+            </asp:Repeater>
+  </tr>
+        </table>
+    </div>
+    </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderDetail.aspx.cs
new file mode 100644
index 0000000..93ab354
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderDetail.aspx.cs
@@ -0,0 +1,53 @@
+锘縰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.Model;
+using CY.Infrastructure.Query;
+using CY.Infrastructure.Common;
+using CY.BLL.OA;
+
+namespace CY.WebForm.Pages.financial
+{
+    public partial class PlanOrderDetail : BasePage
+    {
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                BindPlanOrder();
+            
+            }
+        }
+        /// <summary>
+        /// 缁戝畾鍗曚釜绉戠洰鐨勫叿浣撲俊鎭�
+        /// </summary>
+        public void BindPlanOrder()
+        {
+
+
+        CoreCmsPlanOrderBLL _PlanOrderBLL = new CoreCmsPlanOrderBLL();
+            CoreCmsPlanOrderItemBLL _coreCmsPlanOrderItemBLL = new CoreCmsPlanOrderItemBLL();
+            var coreCmsPlanOrder = _PlanOrderBLL.GetModelByKeyid(Request["Keyid"].ToInt32().Value);
+            spnsheng.InnerText = coreCmsPlanOrder.sheng;
+            spnshi.InnerText = coreCmsPlanOrder.shi;
+            spnquxian.InnerText = coreCmsPlanOrder.quxian;
+            spnpianqu.InnerText = coreCmsPlanOrder.pianqu;
+            spnshipAddress.InnerText = coreCmsPlanOrder.shipAddress;
+            spnshipName.InnerText = coreCmsPlanOrder.shipName;
+            spnshipMobile.InnerText = coreCmsPlanOrder.shipMobile;
+            spnshouhuoAddress.InnerText = coreCmsPlanOrder.shouhuoAddress;
+            spnorderAmount.InnerText = coreCmsPlanOrder.orderAmount.ToString2() ;
+
+
+
+            this.RepSubjeSetctList.DataSource = _coreCmsPlanOrderItemBLL.GetModelsByOrderid(Request["Keyid"].ToInt32().Value) ;
+
+            this.RepSubjeSetctList.DataBind();
+        }
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderDetail.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderDetail.aspx.designer.cs
new file mode 100644
index 0000000..bcae078
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderDetail.aspx.designer.cs
@@ -0,0 +1,125 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.financial
+{
+
+
+    public partial class PlanOrderDetail
+    {
+
+        /// <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>
+        /// spnsheng 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spnsheng;
+
+        /// <summary>
+        /// spnshi 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spnshi;
+
+        /// <summary>
+        /// spnquxian 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spnquxian;
+
+        /// <summary>
+        /// spnpianqu 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spnpianqu;
+
+        /// <summary>
+        /// spnshipAddress 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spnshipAddress;
+
+        /// <summary>
+        /// spnshipName 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spnshipName;
+
+        /// <summary>
+        /// spnshipMobile 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spnshipMobile;
+
+        /// <summary>
+        /// spnshouhuoAddress 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spnshouhuoAddress;
+
+        /// <summary>
+        /// spnorderAmount 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spnorderAmount;
+
+        /// <summary>
+        /// RepSubjeSetctList 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Repeater RepSubjeSetctList;
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderEdit.aspx
new file mode 100644
index 0000000..60a9829
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderEdit.aspx
@@ -0,0 +1,177 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PlanOrderEdit.aspx.cs" Inherits="CY.WebForm.Pages.financial.PlanOrderEdit" %>
+
+<!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 changenum(index) {
+              
+             
+
+             var itemNumarray = $("input[name='itemNumarray']:eq(" + index + ")").val();
+             var price = $("input[name='price']:eq(" + index + ")").val();
+
+             
+
+             $("input[name='amount']:eq(" + index + ")").val((itemNumarray * price).toFixed(2));
+
+
+             var zongjia = 0;
+
+             for (v = 0; v < $("input[name='amount']").size(); v++) {
+
+                 zongjia = zongjia + parseFloat($("input[name='amount']:eq(" + v + ")").val());
+
+
+             }
+ 
+
+
+             $('#OrderAmount').val(zongjia.toFixed(2));
+
+
+ 
+
+         }
+</script>
+</head>
+<body>
+    <form id="form1" runat="server" class="form2">
+         <div>
+   <table class="tableStyle">
+            <tr>
+                <td class="ali03 ">
+                    鐪侊細
+                </td>
+                <td>
+                    <span runat="server" id="spnsheng"></span>
+                     <input type="hidden" id="HideKeyid" runat="server" /> 
+                </td>
+                 <td class="ali03 ">
+                    甯傦細
+                </td>
+                <td>
+                    <span runat="server" id="spnshi"></span>
+                </td>
+                 <td class="ali03 ">
+                    鍖哄幙锛�
+                </td>
+                <td>
+                    <span runat="server" id="spnquxian"></span>
+                </td>
+                 <td class="ali03 ">
+                    鐗囧尯锛�
+                </td>
+                <td>
+                   <input id="spnpianqu" name="spnpianqu" runat="server" type="text"  class='req' style="width:150px;" />  
+                    
+                </td>
+            </tr>
+            <tr>
+               
+                 <td class="ali03 ">
+                    瀛︽牎锛�
+                </td>
+                <td>
+                  <%--  <span runat="server" id="spnshipAddress"></span>--%>
+                       <input id="spnshipAddress" name="spnshipAddress" runat="server" type="text"  class='req' style="width:150px;"  />  
+                </td>
+                  <td class="ali03 ">
+                    鑱旂郴浜猴細
+                </td>
+                <td>
+                   <%-- <span runat="server" id="spnshipName"></span>--%>
+                     <input id="spnshipName" name="spnshipName" runat="server" type="text"  class='req' style="width:150px;"  />  
+                </td>
+                 <td class="ali03 ">
+                    鑱旂郴鐢佃瘽锛�
+                </td>
+                <td>
+                   <%-- <span runat="server" id="spnshipMobile"></span>--%>
+                     <input id="spnshipMobile" name="spnshipMobile" runat="server" type="text"  class='req' style="width:150px;"   />  
+                </td>
+                 <td class="ali03 ">
+                    鏀惰揣鍦板潃锛�
+                </td>
+                <td>
+                   <%-- <span runat="server" id="spnshouhuoAddress"></span>--%>
+                     <input id="spnshouhuoAddress" name="spnshouhuoAddress" runat="server" type="text"  class='req'  style="width:300px;" />  
+                </td>
+            </tr>
+            <tr>
+                <td class="ali03 ">
+                    閲戦锛�
+                </td>
+                <td>
+                  <input id="OrderAmount" name="OrderAmount" runat="server" type="text"  class='req'   readonly="readonly" />     
+                </td>
+            </tr>
+        </table>
+            
+      
+      
+
+                <asp:Repeater ID="RepSubjeSetctList" runat="server">
+                <HeaderTemplate>
+                    <table class="tableStyle ali02" useclick="false" usecheckbox="true" sortmode="true">
+                        <tr>
+                     
+                            <th>
+                                 鍟嗗搧鍚嶇О
+                            </th>
+                            <th>
+                                鍗曚环锛堝厓锛�
+                            </th>
+                            <th>
+                                 鏁伴噺
+                            </th>
+                            <th>
+                                 閲戦锛堝厓锛�
+                            </th>
+                             
+                        </tr>
+                </HeaderTemplate>
+                <ItemTemplate>
+                    <tr>
+                       
+                        <td>
+                            <%#Eval("name")%> <%#Eval("specification")%>
+                        </td>
+                        <td>
+                            <%#Eval("price")%> 
+                             <input type="hidden" name="price" value="<%#Eval("price")%>">
+                             <input type="hidden" name="id" value="<%#Eval("id")%>">
+                        </td>
+                       
+                        <td>
+                           <input name="itemNumarray"   type="text" min="0" max="99999999"   class='req positiveint' placeholder="璇疯緭鍏ユ暟閲�"   value="<%#Eval("nums")%>" onchange="changenum(<%#Container.ItemIndex %>);" />  
+                        </td>
+                        <td>
+                           <input   name="amount" type="text" class='req' value=" <%#Eval("amount")%>" readonly="readonly" />
+                        </td>
+                           
+                    </tr>
+                </ItemTemplate>
+                <FooterTemplate>
+                    </table>
+                </FooterTemplate>
+            </asp:Repeater>
+    <table class="tableStyle">
+        <tr>
+           
+            <td align="center" colspan="8">
+                <p>
+                    <asp:Button ID="btn_Submit" Text="鎻愪氦" runat="server" OnClick="btn_Submit_Config" />
+                </p>
+            </td>
+        </tr>
+    </table>
+             </div>
+    </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderEdit.aspx.cs
new file mode 100644
index 0000000..2fa10d1
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderEdit.aspx.cs
@@ -0,0 +1,161 @@
+锘縰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.Model;
+using CY.Infrastructure.Query;
+using CY.Infrastructure.Common;
+using CY.BLL.Sys;
+using CY.BLL.OA;
+using CY.BLL.EC;
+using System.Transactions;
+
+namespace CY.WebForm.Pages.financial
+{
+    public partial class PlanOrderEdit : BasePage
+    {
+        CoreCmsPlanOrderBLL _PlanOrderBLL = new CoreCmsPlanOrderBLL();
+        CoreCmsPlanOrderItemBLL _coreCmsPlanOrderItemBLL = new CoreCmsPlanOrderItemBLL();
+
+        public PlanOrderEdit()
+        {
+           
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                InitialData();
+                if (Request["Keyid"].ToInt32() > 0)  // 鍔犺浇瑕佷慨鏀圭殑鐨勬暟鎹�
+                {
+                    HideKeyid.Value = Request["Keyid"].ToString2();
+                    InitialModifyData();
+                }
+            }
+        }
+
+        /// <summary>
+        /// 鍒濆鍖栫鐩被鍒�
+        /// </summary>
+        public void InitialData()
+        {
+             
+        }
+
+        /// <summary>
+        /// 鍒濆鍖栬淇敼鐨勬暟鎹�
+        /// </summary>
+        public void InitialModifyData()
+        {
+            var coreCmsPlanOrder = _PlanOrderBLL.GetModelByKeyid(Request["Keyid"].ToInt32().Value);
+            spnsheng.InnerText = coreCmsPlanOrder.sheng;
+            spnshi.InnerText = coreCmsPlanOrder.shi;
+            spnquxian.InnerText = coreCmsPlanOrder.quxian;
+            spnpianqu.Value = coreCmsPlanOrder.pianqu;
+            spnshipAddress.Value = coreCmsPlanOrder.shipAddress;
+            spnshipName.Value = coreCmsPlanOrder.shipName;
+            spnshipMobile.Value = coreCmsPlanOrder.shipMobile;
+            spnshouhuoAddress.Value = coreCmsPlanOrder.shouhuoAddress;
+            OrderAmount.Value = coreCmsPlanOrder.orderAmount.ToString2();
+
+
+
+            this.RepSubjeSetctList.DataSource = _coreCmsPlanOrderItemBLL.GetModelsByOrderid(Request["Keyid"].ToInt32().Value);
+
+            this.RepSubjeSetctList.DataBind();
+        }
+
+        /// <summary>
+        /// 娣诲姞鎴栦慨鏀圭鐩�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btn_Submit_Config(object sender, EventArgs e)
+        {
+
+          string id =   HideKeyid.Value;
+          var orderAmount  =  this.OrderAmount.Value;
+            var pianqu = this.spnpianqu.Value.Trim();
+            var shipAddress = this.spnshipAddress.Value.Trim();
+            var shipName = this.spnshipName.Value.Trim();
+            var shipMobile = this.spnshipMobile.Value.Trim();
+            var shouhuoAddress = this.spnshouhuoAddress.Value.Trim();
+            string[] ids = Request["id"].ToString2().Split(',');
+            string[] price = Request["price"].ToString2().Split(',');
+            string[] itemNumarray = Request["itemNumarray"].ToString2().Split(',');
+            string[] amount = Request["amount"].ToString2().Split(',');
+            var sss = false;
+            EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+            int orderkeyid = 0;
+            using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+         new TransactionOptions
+         {
+             IsolationLevel = IsolationLevel.ReadCommitted,
+             Timeout = TransactionManager.MaximumTimeout
+         }
+         ))
+            {
+                var coreCmsPlanOrder = _PlanOrderBLL.GetModelByKeyid(id.ToInt32().Value);
+                orderkeyid = coreCmsPlanOrder.orderkeyid.Value;
+                coreCmsPlanOrder.orderAmount = orderAmount.ToDecimal2().Value;
+                coreCmsPlanOrder.pianqu = pianqu;
+                coreCmsPlanOrder.shipAddress = shipAddress;
+                coreCmsPlanOrder.shipName = shipName;
+                coreCmsPlanOrder.shipMobile = shipMobile;
+                coreCmsPlanOrder.userMobile = shipMobile;
+                coreCmsPlanOrder.shouhuoAddress = shouhuoAddress;
+                coreCmsPlanOrder.upDataTime = DateTime.Now;
+                coreCmsPlanOrder.upDataBy = CurrentUser.ShortName;
+                if (!coreCmsPlanOrder.createTime.HasValue)
+                {
+                    coreCmsPlanOrder.createTime = DateTime.Now;
+                    coreCmsPlanOrder.createBy = CurrentUser.ShortName;
+
+                }
+
+
+                sss = _PlanOrderBLL.UpdateModel(coreCmsPlanOrder);
+
+
+                for (int i = 0; i < ids.Length; i++)
+                {
+                    var cmsPlanOrderItem = _coreCmsPlanOrderItemBLL.GetModelByKeyid(ids[i].ToInt32().Value);
+                    cmsPlanOrderItem.nums = itemNumarray[i].ToInt32().Value;
+                    cmsPlanOrderItem.amount = amount[i].ToDecimal2().Value;
+                    cmsPlanOrderItem.upDataTime = DateTime.Now;
+                    cmsPlanOrderItem.upDataBy = CurrentUser.ShortName;
+                    if (!cmsPlanOrderItem.createTime.HasValue)
+                    {
+                        cmsPlanOrderItem.createTime = DateTime.Now;
+                        cmsPlanOrderItem.createBy = CurrentUser.ShortName;
+
+                    }
+                    sss = _PlanOrderBLL.UpdateModelOrderItem(cmsPlanOrderItem);
+                }
+
+                //鏇存柊鏁翠釜璁㈠崟鐨勬�讳环鏍�
+               
+
+              
+
+            scope.Complete();
+        }
+        sss = _eC_OrderBasicBLL.UpdateorderJine(orderkeyid);
+          
+            if (sss)
+            {
+                JavaScript.MessageBoxCloseAndRefreshFirsts("鏇存柊鎴愬姛", this);
+               
+            }
+            else
+            {
+                JavaScript.MessageBox("鏇存柊澶辫触", this);
+            }
+            
+        }
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderEdit.aspx.designer.cs
new file mode 100644
index 0000000..0989edb
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderEdit.aspx.designer.cs
@@ -0,0 +1,143 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.financial
+{
+
+
+    public partial class PlanOrderEdit
+    {
+
+        /// <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>
+        /// spnsheng 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spnsheng;
+
+        /// <summary>
+        /// HideKeyid 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden HideKeyid;
+
+        /// <summary>
+        /// spnshi 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spnshi;
+
+        /// <summary>
+        /// spnquxian 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spnquxian;
+
+        /// <summary>
+        /// spnpianqu 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText spnpianqu;
+
+        /// <summary>
+        /// spnshipAddress 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText spnshipAddress;
+
+        /// <summary>
+        /// spnshipName 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText spnshipName;
+
+        /// <summary>
+        /// spnshipMobile 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText spnshipMobile;
+
+        /// <summary>
+        /// spnshouhuoAddress 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText spnshouhuoAddress;
+
+        /// <summary>
+        /// OrderAmount 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText OrderAmount;
+
+        /// <summary>
+        /// RepSubjeSetctList 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Repeater RepSubjeSetctList;
+
+        /// <summary>
+        /// btn_Submit 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btn_Submit;
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderList.aspx
new file mode 100644
index 0000000..e72b1a8
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderList.aspx
@@ -0,0 +1,253 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PlanOrderList.aspx.cs" Inherits="CY.WebForm.Pages.financial.PlanOrderList" %>
+
+<!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 addModel(orderkeyid) {
+            top.Dialog.open({ URL: "/Pages/business/PlanOrderAdd.aspx?Keyid='0'&&orderkeyid=" + orderkeyid, Title: "鏂板璁″垝璁㈠崟", Width: 1100, Height: 900 });
+        }
+
+        //鏌ョ湅
+        function onView(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/PlanOrderDetail.aspx?Keyid=" + keyid, Title: "鏌ョ湅璁″垝璁㈠崟", Width: 1100, Height: 900 });
+        }
+
+        //淇敼
+        function onEdit(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/PlanOrderEdit.aspx?Keyid=" + keyid, Title: "淇敼璁″垝璁㈠崟", Width: 1100, Height: 900 });
+        }
+
+        //鍒犻櫎
+        function onDelete(keyid) {
+            top.Dialog.confirm("纭畾瑕佸垹闄よ璁板綍鍚楋紵", function () {
+                window.location = "/Pages/business/PlanOrderList.aspx?Keyid=" + keyid;
+            });
+        }
+
+        //鏌ョ湅
+        function checkSelFile() {
+
+           
+            var oFile = document.getElementById('filesel');
+            if (oFile.value == "") {
+                alertMsg('娌℃湁閫夋嫨鏂囦欢');
+                return false;
+
+            }
+            //debugger;
+            //replaceParamVal("deleteKeyIds", "");
+            return true;
+        }
+
+        //鎵归噺鍒犻櫎
+        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);
+                var oFile = document.getElementById('HideKeyid').value;
+                top.Dialog.confirm("纭畾瑕佸垹闄ゆ墍閫夎褰曞悧锛�", function () {
+                    window.location = "/Pages/business/PlanOrderList.aspx?deleteKeyIds=" + deleteKeyIds + "&orderkeyid=" + oFile;
+                });
+            }
+        }
+</script>
+</head>
+<body>
+    <form id="form1" runat="server">
+    <div id="scrollContent">
+        <div class="box1" paneltitle="鍔熻兘闈㈡澘" roller="false">
+        <table class="TableNewStyle">
+            <tr>
+                <td class="ali03 " style="padding-left: 20px">
+                    璁㈠崟鐘舵�侊細
+                </td>
+                <td>
+                     <select id="selstatus" keepdefaultstyle='true' runat="server" >
+                            <option selected="selected" value="">鍏ㄩ儴</option>
+                            <option value="1">鏈攣瀹�</option>
+                            <option value="2">宸查攣瀹�</option>
+                        </select>
+                </td>
+               <%-- <td class="ali03 " style="padding-left: 20px">
+                   鎵�鍦ㄥ尯鍩燂細
+                </td>
+                <td>
+                    <asp:DropDownList ID="selectProvince" runat="server" keepDefaultStyle="true" AutoPostBack="true" OnSelectedIndexChanged="ChangeProvince" Width="70px">
+                            </asp:DropDownList>
+                            <asp:DropDownList ID="selectCity" runat="server" keepDefaultStyle="true" AutoPostBack="true" OnSelectedIndexChanged="ChangeCity" Width="70px">
+                            </asp:DropDownList>
+                            <asp:DropDownList ID="selectCounty" runat="server" keepDefaultStyle="true" AutoPostBack="false" Width="70px">
+                            </asp:DropDownList>
+                </td>--%>
+                <td class="ali03 " style="padding-left: 20px">
+                    瀛︽牎锛�
+                </td>
+                <td>
+                    <input id="txtshipAddress" type="text" runat="server" />
+                </td>
+                  <td class="ali03 " style="padding-left: 20px">
+                    鐗囧尯锛�
+                </td>
+                <td>
+                    <input id="txtpianqu" type="text" runat="server" />
+                </td>
+                 
+            </tr>
+            <tr>
+                <td class="ali03 " style="padding-left: 20px">
+                    鑱旂郴浜猴細
+                </td>
+                <td>
+                    <input id="txtshipName" type="text" runat="server" />
+                </td>
+                 <td class="ali03 " style="padding-left: 20px">
+                    鑱旂郴鐢佃瘽锛�
+                </td>
+                <td>
+                    <input id="txtshipMobile" type="text" runat="server" />
+                </td>
+                  <td class="ali03 " style="padding-left: 20px">
+                    鏀惰揣鍦板潃锛�
+                </td>
+                <td>
+                    <input id="txtshouhuoAddress" type="text" runat="server" />
+                </td>
+                  
+                
+                
+                <td colspan="2">
+                    <asp:Button ID="btn_Register" Text="鏌ヨ" runat="server" OnClick="btn_Register_Click" />
+                    <input type="hidden" id="HideKeyid" runat="server" /> 
+                </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('<%=orderkeyid %>')" class="aaddModel" ><span class="icon_add">鏂板璁″垝璁㈠崟</span></a> &nbsp; &nbsp;
+                         <a href="javascript:;" onclick="onAllDelete()" ><span class="icon_delete">鎵归噺鍒犻櫎</span></a>
+                       <a class="aaddModel" href="/images/jihuageshi/涓婁紶璁″垝璁㈠崟.xlsx"><span class="icon_arr1">涓婁紶妯℃澘</span></a>
+                         <input type="file" id="filesel" name="__hetongFile" keepdefaultstyle="true" runat="server" text="璇烽�夋嫨鏂囦欢" /> 
+                         <asp:Button ID="UpdateFileNew" Text="涓婁紶" runat="server" OnClick="btn_Submit_Click" OnClientClick="return checkSelFile()" /> 
+                        <div class="clear">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="clear">
+        </div>
+    </div>
+        <div>
+            <asp:Repeater ID="RepSubjeSetctList" runat="server">
+                <HeaderTemplate>
+                    <table class="tableStyle ali02" useclick="false" usecheckbox="true" sortmode="true">
+                        <tr>
+                            <th width="25">
+                            </th>
+                            <th width="30" style="text-align: center">
+                                缂栧彿
+                            </th>
+                            <th>
+                                甯�
+                            </th>
+                            <th>
+                                鍖哄幙
+                            </th>
+                            <th>
+                                鐗囧尯
+                            </th>
+                            <th>
+                                瀛︽牎
+                            </th>
+                            <th>
+                                鑱旂郴浜�
+                            </th>
+                            <th>
+                                鑱旂郴鐢佃瘽
+                            </th>
+                              <th>
+                                鏀惰揣鍦板潃
+                            </th>
+                              <th>
+                                閲戦
+                            </th>
+                             
+
+                            <th width="80">
+                                鎿嶄綔
+                            </th>
+                        </tr>
+                </HeaderTemplate>
+                <ItemTemplate>
+                    <tr>
+                        <td>
+                            <input type="checkbox"  value='<%#Eval("id")%>' />
+                        </td>
+                        <td>
+                             <%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
+                        </td>
+                        <td>
+                            <%#Eval("shi")%>
+                        </td>
+                        <td>
+                            <%#Eval("quxian")%> 
+                        </td>
+                       
+                        <td>
+                            <%#Eval("pianqu")%>
+                        </td>
+                        <td>
+                            <%#Eval("shipAddress")%>
+                        </td>
+                          <td>
+                            <%#Eval("shipName")%>
+                        </td>
+                          <td>
+                            <%#Eval("shipMobile")%>
+                        </td>
+                          <td>
+                            <%#Eval("shouhuoAddress")%>
+                        </td>
+                         <td>
+                            <%#Eval("orderAmount")%>
+                        </td>
+                        
+                        <td class="Operate">
+                            <span  onclick="onView(<%#Eval("id")%>)">鏌ョ湅 </span>
+                            <span onclick="onEdit('<%#Eval("id")%>')">淇敼</span> </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/business/PlanOrderList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderList.aspx.cs
new file mode 100644
index 0000000..5a2c771
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderList.aspx.cs
@@ -0,0 +1,596 @@
+锘縰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.Model;
+using CY.Infrastructure.Query;
+using CY.Infrastructure.Common;
+using CY.BLL.OA;
+using CY.BLL.Sys;
+using System.IO;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System.Transactions;
+using CY.BLL.EC;
+using CY.BLL.Inquiry;
+using CY.Model.Inquiry;
+
+namespace CY.WebForm.Pages.financial 
+{
+    public partial class PlanOrderList : BasePage
+    {
+       // Sys_DictionaryBLL _Sys_DictionaryBLL = new Sys_DictionaryBLL();
+        CoreCmsPlanOrderBLL _PlanOrderBLL = new CoreCmsPlanOrderBLL();
+        Sys_CitySiteBLL bll_Sys_CitySiteBLL  = new Sys_CitySiteBLL();
+        EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+        //WorkBookTypeBLL _WorkBookTypeBLL = new WorkBookTypeBLL();
+        CoreCmsPlanOrderItemBLL _coreCmsPlanOrderItemBLL = new CoreCmsPlanOrderItemBLL();
+        EC_OrderPrintParameterBLL _OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
+        public string orderkeyid = "";
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
+            if (!IsPostBack)
+            {
+                var request = HttpContext.Current.Request;
+                HideKeyid.Value = request["orderkeyid"].ToString2();
+                orderkeyid = request["orderkeyid"].ToString2();
+                //this.selSubjectType.DataSource = _Sys_DictionaryBLL.GetDataByType("绉戠洰绫诲埆");
+                //this.selSubjectType.DataBind();
+                //this.selSubjectType.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+                //BindProvince();
+                BindList();
+            }
+
+            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)
+                {
+                    var model = _PlanOrderBLL.GetModelByKeyid(keyId.ToInt32().Value);
+                    if ( model != null)
+                        _PlanOrderBLL.DeleteModel(model);
+                   
+                }
+                var sss = _eC_OrderBasicBLL.UpdateorderJine(HideKeyid.Value.ToInt32().Value);
+                JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
+                Response.Redirect("/Pages/business/PlanOrderList.aspx?orderkeyid=" + HideKeyid.Value);
+            }
+
+        }
+
+
+        /// <summary>
+        /// 鍔犺浇鍏ㄩ儴鏁版嵁
+        /// </summary>
+        private void BindList()
+        {
+            
+            Pagination pa = new Pagination();
+            pa.PageSize = this.UCPager1.AspNetPager.PageSize;
+            pa.PageIndex = this.UCPager1.AspNetPager.CurrentPageIndex;
+            string sheng = "";
+            //if (this.selectProvince.SelectedItem.Text != "鍏ㄩ儴")
+            //{
+            //    sheng = this.selectProvince.SelectedItem.Text;
+            //}
+            string shi = "";
+            //if (this.selectCity.SelectedItem.Text != "鍏ㄩ儴")
+            //{
+            //    shi = this.selectCity.SelectedItem.Text;
+            //}
+            string quxian = "";
+            //if (this.selectCounty.SelectedItem.Text != "鍏ㄩ儴")
+            //{
+            //    quxian = this.selectCounty.SelectedItem.Text;
+            //}
+            this.RepSubjeSetctList.DataSource = _PlanOrderBLL.SelectModelPage(pa, HideKeyid.Value, selstatus.Value, sheng, shi
+                , quxian, txtpianqu.Value ,txtshipAddress.Value,txtshipName.Value,txtshipMobile.Value,txtshouhuoAddress.Value,"","");
+
+            this.RepSubjeSetctList.DataBind();
+             UCPager1.AspNetPager.RecordCount = pa.RecordCount;
+           
+        }
+
+        protected void AspNetPager1_PageChanged(object src, EventArgs e)
+        {
+            BindList();
+        }
+
+        protected void btn_Register_Click(object sender, EventArgs e)
+        {
+            BindList();
+        }
+
+
+        ////缁戝畾鐪�
+        //protected void BindProvince()
+        //{
+        //    this.selectProvince.Items.Clear();
+             
+        //    this.selectProvince.DataSource = bll_Sys_CitySiteBLL.SelectAllNextModel(0, 0, 1);
+
+        //    this.selectProvince.DataTextField = "Name";
+        //    this.selectProvince.DataValueField = "Keyid";
+        //    this.selectProvince.DataBind();
+        //    this.selectProvince.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+        //    this.selectCity.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+        //    this.selectCounty.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+        //}
+
+        ////鏀瑰彉鐪佺粦瀹氬競
+        //protected void ChangeProvince(object sender, EventArgs e)
+        //{
+        //    this.selectCity.Items.Clear();
+        //    this.selectCounty.Items.Clear();
+        //    Sys_CitySite m_Sys_CitySite = bll_Sys_CitySiteBLL.GetModelByKeyid(this.selectProvince.SelectedValue.ToInt32() ?? 0);
+        //    if (m_Sys_CitySite != null)
+        //    {
+                
+        //            this.selectCity.DataSource = bll_Sys_CitySiteBLL.SelectAllNextModel(m_Sys_CitySite.Keyid, 0, 2);
+
+        //        this.selectCity.DataTextField = "Name";
+        //        this.selectCity.DataValueField = "Keyid";
+        //        this.selectCity.DataBind();
+        //    }
+        //    this.selectCity.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+        //    this.selectCounty.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+        //}
+
+        ////鏀瑰彉甯傜粦瀹氬尯
+        //protected void ChangeCity(object sender, EventArgs e)
+        //{
+        //    this.selectCounty.Items.Clear();
+        //    Sys_CitySite m_Sys_CitySite = bll_Sys_CitySiteBLL.GetModelByKeyid(this.selectCity.SelectedValue.ToInt32() ?? 0);
+        //    if (m_Sys_CitySite != null)
+        //    {
+                
+        //            this.selectCounty.DataSource = bll_Sys_CitySiteBLL.SelectProxyNextModel(m_Sys_CitySite.ProvinceId, m_Sys_CitySite.Keyid, 3);
+
+        //        this.selectCounty.DataTextField = "Name";
+        //        this.selectCounty.DataValueField = "Keyid";
+        //        this.selectCounty.DataBind();
+        //    }
+        //    this.selectCounty.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+        //}
+
+
+        protected void btn_Submit_Click(object sender, EventArgs e)
+        {
+
+            var files = Request.Files;
+            if (files.Count <= 0)
+                return;
+
+            var file = files[0];
+            if (file == null)
+            {
+                JavaScript.MessageBox("璇烽�夋嫨鏂囦欢", this);
+                return;
+            }
+
+            //鍒濆鍖栦笂浼犲弬鏁�
+            var maxSize = 1024 * 1024 * 5; //涓婁紶澶у皬5M
+
+            var fileName = file.FileName;
+            var fileExt = Path.GetExtension(fileName).ToLowerInvariant();
+
+            //妫�鏌ュぇ灏�
+            if (file.ContentLength > maxSize)
+            {
+               
+                JavaScript.MessageBox("涓婁紶鏂囦欢澶у皬瓒呰繃闄愬埗锛屾渶澶у厑璁镐笂浼�5M", this);
+                return;
+            }
+          
+            string FileTypes = "xlsx";//xls,
+            //妫�鏌ユ枃浠舵墿灞曞悕
+            if (string.IsNullOrEmpty(fileExt) ||
+                Array.IndexOf(FileTypes.Split(','), fileExt.Substring(1).ToLower()) == -1)
+            {
+                JavaScript.MessageBox("涓婁紶鏂囦欢鎵╁睍鍚嶆槸涓嶅厑璁哥殑鎵╁睍鍚�,璇蜂笂浼犲悗缂�鍚嶄负锛�" + FileTypes, this);
+                return;
+            }
+            var lie = new List<JiHuaOrder>();
+            using (var fileStream = file.InputStream)
+            {
+                // 浣跨敤HSSFWorkbook鎵撳紑.xls鏍煎紡鐨勬枃浠�
+                IWorkbook workbook = new XSSFWorkbook(fileStream);
+
+                // 鑾峰彇绗竴涓伐浣滆〃
+                ISheet sheet = workbook.GetSheetAt(0);
+
+                // 杩唬宸ヤ綔琛ㄤ腑鐨勬墍鏈夎
+                for (int i = 1; i <= sheet.LastRowNum; i++)
+                {
+                    var hang = new JiHuaOrder();
+                    IRow row = sheet.GetRow(i);
+                    if (row == null) continue; // 璺宠繃绌鸿
+
+
+                    ICell cell0 = row.GetCell(0);
+                    if (cell0 == null)
+                    {
+                        JavaScript.MessageBox("绗�" + (i + 1) + "甯備笉鑳戒负绌�", this); 
+                        return;
+                    }
+                    hang.shi = getcellvalue(cell0);
+
+                    ICell cell1 = row.GetCell(1);
+                    if (cell1 == null)
+                    {
+                        JavaScript.MessageBox("绗�" + (i + 1) + "鍖哄幙涓嶈兘涓虹┖", this);
+                        return;
+                    }
+                    hang.quxian = getcellvalue(cell1);
+
+                    ICell cell2 = row.GetCell(2);
+                    if (cell2 == null)
+                    {
+                        JavaScript.MessageBox("绗�" + (i + 1) + "鐗囧尯涓嶈兘涓虹┖", this);
+                        return;
+                    }
+                    hang.pianqu = getcellvalue(cell2);
+
+                    ICell cell3 = row.GetCell(3);
+                    if (cell3 == null)
+                    {
+                        JavaScript.MessageBox("绗�" + (i + 1) + "瀛︽牎涓嶈兘涓虹┖", this);
+                        return;
+                    }
+                    hang.shipAddress = getcellvalue(cell3);
+
+                    ICell cell4 = row.GetCell(4);
+                    if (cell4 == null)
+                    {
+                        JavaScript.MessageBox("绗�" + (i + 1) + "鑱旂郴浜轰笉鑳戒负绌�", this);
+                        return;
+                    }
+                    hang.shipName = getcellvalue(cell4);
+
+                    ICell cell5 = row.GetCell(5);
+                    if (cell5 == null)
+                    {
+                        JavaScript.MessageBox("绗�" + (i + 1) + "鑱旂郴鐢佃瘽涓嶈兘涓虹┖", this);
+                        return;
+                    }
+                    hang.shipMobile = getcellvalue(cell5);
+                     
+                    ICell cell6 = row.GetCell(6);
+                    if (cell6 == null)
+                    {
+                        JavaScript.MessageBox("绗�" + (i + 1) + "鏀惰揣鍦板潃涓嶈兘涓虹┖", this);
+                        return;
+                    }
+                    hang.shouhuoAddress = getcellvalue(cell6);
+
+                    ICell cell7 = row.GetCell(7);
+                    if (cell7 == null)
+                    {
+                        JavaScript.MessageBox("绗�" + (i + 1) + "鍟嗗搧鍚嶇О涓嶈兘涓虹┖", this);
+                        return ;
+                    }
+                    hang.name = getcellvalue(cell7);
+                    
+
+                    ICell cell8 = row.GetCell(8);
+                    if (cell8 == null)
+                    {
+                        JavaScript.MessageBox("绗�" + (i + 1) + "瑙勬牸涓嶈兘涓虹┖", this);
+                        return ;
+                    }
+                    hang.specification = getcellvalue(cell8);
+                    
+
+                    //ICell cell9 = row.GetCell(9);
+                    //if (cell9 == null)
+                    //{
+                    //    JavaScript.MessageBox("绗�" + (i + 1) + "鍗曚环锛堝厓锛変笉鑳戒负绌�", this);
+                    //    return ;
+                    //}
+                    //hang.price = decimal.Parse(getcellvalue(cell9));
+
+
+                    ICell cell9 = row.GetCell(9);
+                    if (cell9 == null)
+                    {
+                        JavaScript.MessageBox("绗�" + (i + 1) + "鏁伴噺涓嶈兘涓虹┖", this);
+                        return ;
+                    }
+                    int aaa = 0;
+                    int.TryParse(getcellvalue(cell9), out aaa);
+                    hang.nums = aaa;
+
+                    lie.Add(hang);
+
+                }
+            }
+
+
+            if (lie != null && lie.Count > 0)
+            {
+                if (string.IsNullOrEmpty(lie[0].shi))
+                {
+                    JavaScript.MessageBox("绗�" + 1 + "甯備笉鑳戒负绌�", this);
+                    return;
+                }
+                if (string.IsNullOrEmpty(lie[0].quxian))
+                {
+                    JavaScript.MessageBox("绗�" + 1 + "鍖哄幙涓嶈兘涓虹┖", this);
+                    return;
+                }
+
+
+                for (int i = 0; i < lie.Count; i++)
+                {
+                    if (!string.IsNullOrEmpty(lie[i].shipAddress))
+                    {
+                        if (string.IsNullOrEmpty(lie[i].shipMobile))
+                        {
+                            JavaScript.MessageBox("绗�" + (i + 1) + "鑱旂郴鐢佃瘽涓嶈兘涓虹┖", this);
+                            return;
+                        }
+
+                      
+
+                    }
+                    if (string.IsNullOrEmpty(lie[i].name))
+                    {
+                        JavaScript.MessageBox("绗�" + (i + 1) + "鍟嗗搧鍚嶇О涓嶈兘涓虹┖", this);
+                        return;
+                    }
+
+                    if (string.IsNullOrEmpty(lie[i].specification))
+                    {
+                        JavaScript.MessageBox("绗�" + (i + 1) + "瑙勬牸涓嶈兘涓虹┖", this);
+                        return;
+                    }
+                }
+            }
+            var orderid = HideKeyid.Value;
+            var sys_CitySites = bll_Sys_CitySiteBLL.SelectAllModel(null).ToList();
+            var eC_OrderPrintParameter = _OrderPrintParameterBLL.GetModel(orderid.ToInt32().Value); ;
+            InquiryCommonModel model = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
+
+            using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+        new TransactionOptions
+        {
+            IsolationLevel = IsolationLevel.ReadCommitted,
+            Timeout = TransactionManager.MaximumTimeout
+        }
+        ))
+            {
+
+                string pianqu = "";
+                if (lie != null && lie.Count > 0)
+                {
+                    var order = new List<JiHuaOrder>();
+                    for (int i = 0; i < lie.Count; i++)
+                    {
+                        if (i == 0)
+                        {
+
+                            order.Add(lie[i]);
+                            pianqu = lie[i].pianqu;
+
+                        }
+                        else
+                        {
+                            if (string.IsNullOrEmpty(lie[i].shipAddress))
+                            {
+                                order.Add(lie[i]);
+                            }
+                            else
+                            {
+                                //淇濆瓨璁㈠崟
+                                //jm = await _coreCmsPlanOrderServices.ToAddJiHua(order, _user.ID, _user.Name);
+                                //if (jm.code == 1)
+                                //{
+                                //    return jm;
+                                //}
+                                string res = saveorder(order,model.InquiryWorkBookList,sys_CitySites);
+                                if (!string.IsNullOrEmpty(res))
+                                {
+                                    JavaScript.MessageBox(res, this);
+                                    return;
+                                }
+                                order = new List<JiHuaOrder>();
+                                if (string.IsNullOrEmpty(lie[i].shi))
+                                {
+                                    lie[i].shi = lie[0].shi;
+                                }
+                                if (string.IsNullOrEmpty(lie[i].quxian))
+                                {
+                                    lie[i].quxian = lie[0].quxian;
+                                }
+                                if (string.IsNullOrEmpty(lie[i].pianqu))
+                                {
+                                    lie[i].pianqu = pianqu;
+                                }
+                                else
+                                {
+                                    pianqu = lie[i].pianqu;
+                                }
+                                order.Add(lie[i]);
+                            }
+                        }
+
+                        if (i == lie.Count - 1)
+                        {
+                            //淇濆瓨璁㈠崟
+                            //jm = await _coreCmsPlanOrderServices.ToAddJiHua(order, _user.ID, _user.Name);
+                            //if (jm.code == 1)
+                            //{
+                            //    return jm;
+                            //}
+                          string res =  saveorder(order, model.InquiryWorkBookList, sys_CitySites);
+                            if (!string.IsNullOrEmpty(res))
+                            {
+                                JavaScript.MessageBox(res, this);
+                                return;
+                            }
+                        }
+                    }
+
+
+                }
+                else
+                {
+
+
+                    JavaScript.MessageBox("琛ㄦ牸鏃犳暟鎹�", this);
+                    return;
+                }
+                scope.Complete();
+            }
+
+
+
+           
+            var sss = _eC_OrderBasicBLL.UpdateorderJine(orderid.ToInt32().Value);
+
+            JavaScript.MessageBox("涓婁紶鏂囦欢鎴愬姛", this);
+            BindList();
+
+            return;
+            }
+
+
+
+
+    /// <summary>
+    /// 璁″垝璁㈠崟涓婁紶鎺ュ彛
+    /// </summary>
+    /// <returns></returns>
+    public string getcellvalue(ICell cell)
+    {
+        string cellvalue = "";
+        switch (cell.CellType)
+        {
+            case CellType.String:
+                // Console.WriteLine(cell.StringCellValue);
+                cellvalue = cell.StringCellValue.Trim();
+                break;
+            case CellType.Numeric:
+                //Console.WriteLine(cell.NumericCellValue);
+                cellvalue = cell.NumericCellValue.ToString().Trim();
+                break;
+            case CellType.Boolean:
+                //Console.WriteLine(cell.BooleanCellValue);
+                cellvalue = cell.BooleanCellValue.ToString().Trim();
+                break;
+            case CellType.Error:
+                // Console.WriteLine(cell.ErrorCellValue);
+                cellvalue = cell.ErrorCellValue.ToString().Trim();
+                break;
+            case CellType.Blank:
+                    // Console.WriteLine(cell.ErrorCellValue);
+                    cellvalue = "";
+                    break;
+                    // 鍙互娣诲姞鍏朵粬绫诲瀷鐨刢ase
+            }
+
+        return cellvalue;
+    }
+        /// <summary>
+        /// 璁″垝璁㈠崟涓婁紶鎺ュ彛
+        /// </summary>
+        /// <returns></returns>
+        public string saveorder(List<JiHuaOrder> jiHuaOrders , List<InquiryWorkBookModel> InquiryWorkBookList,List<Sys_CitySite> sys_CitySites)
+        {
+            var coreCmsPlanOrder = _PlanOrderBLL.GetModelByorderid(HideKeyid.Value.ToInt32().Value).Where(x=>x.shipAddress == jiHuaOrders[0].shipAddress && x.shouhuoAddress == jiHuaOrders[0].shouhuoAddress).FirstOrDefault() ;
+            if(coreCmsPlanOrder == null)
+            {
+                CoreCmsPlanOrder order = new CoreCmsPlanOrder();
+                order.status = 1;
+                order.shipMobile = jiHuaOrders[0].shipMobile;
+                order.shipAddress = jiHuaOrders[0].shipAddress;
+                order.shipName = jiHuaOrders[0].shipName;
+                order.shouhuoAddress = jiHuaOrders[0].shouhuoAddress;
+                order.userMobile = jiHuaOrders[0].shipMobile;
+                order.createBy = CurrentUser.ShortName;
+                order.createTime = DateTime.Now;
+                order.upDataBy = CurrentUser.ShortName;
+                order.upDataTime = DateTime.Now;
+                order.isdelete = false;
+                order.orderkeyid = HideKeyid.Value.ToInt32();
+                order.FirmId = CurrentUser.MemberId;
+                order.sheng = "鍥涘窛鐪�";
+                order.shi = jiHuaOrders[0].shi;
+                order.quxian = jiHuaOrders[0].quxian;
+                var sheng = sys_CitySites.FirstOrDefault(x => x.Name == order.sheng);
+                if (sheng != null)
+                {
+                    order.shengId = sheng.Keyid;
+
+                    var shi = sys_CitySites.FirstOrDefault(x => x.Name == order.shi && x.ProvinceId == sheng.Keyid);
+                    if (shi != null)
+                    {
+                        order.shiId = shi.Keyid;
+                        var quxian = sys_CitySites.FirstOrDefault(x => x.Name == order.quxian && x.CityId == shi.Keyid);
+                        if (quxian != null)
+                        {
+                            order.quxianId = quxian.Keyid;
+                        }
+                    }
+                }
+
+                order.pianqu = jiHuaOrders[0].pianqu;
+
+
+                decimal orderAmount = 0;
+                var cmsPlanOrderItems = new List<CoreCmsPlanOrderItem>();
+                for (int i = 0; i < jiHuaOrders.Count; i++)
+                {
+                    var workbook = InquiryWorkBookList.FirstOrDefault(x => x.WorkBookNameTxt == jiHuaOrders[i].name && x.WorkBookSizeTxt == jiHuaOrders[i].specification);
+                    if (workbook == null)
+                    {
+                       // JavaScript.MessageBox(jiHuaOrders[i].name + " " + jiHuaOrders[i].specification + "娌℃壘鍒板崟浠�", this);
+                        return jiHuaOrders[i].name + " " + jiHuaOrders[i].specification + "娌℃壘鍒板崟浠�";
+                    }
+                    var item = new CoreCmsPlanOrderItem();
+                    item.orderId = 0;
+                    item.name = jiHuaOrders[i].name;
+                    item.specification = jiHuaOrders[i].specification;
+                    item.price = workbook.WorkBookPrice.ToDecimal2().Value;//jiHuaOrders[i].price;
+                    item.fengmian = string.IsNullOrEmpty(workbook.fengmian) ? "" : workbook.fengmian;
+                    item.neiye = string.IsNullOrEmpty(workbook.neiye) ? "" : workbook.neiye;
+                    item.nums = jiHuaOrders[i].nums; ;
+                    item.amount = item.price * (decimal)jiHuaOrders[i].nums;
+                    item.createBy = CurrentUser.ShortName;
+                    item.createTime = DateTime.Now;
+                    item.upDataBy = CurrentUser.ShortName;
+                    item.upDataTime = DateTime.Now;
+                    item.isdelete = false;
+                    item.isOld = true;
+                    cmsPlanOrderItems.Add(item);
+                    orderAmount += item.amount;
+                }
+
+                order.orderAmount = orderAmount;
+                order.oldOrderAmount = orderAmount;
+                order.keYongAmount = 0;
+                order.huaFeiAmount = 0;
+
+
+                var id = _PlanOrderBLL.InsertModelIden(order);
+                var sss = false;
+                foreach (var cmsPlanOrderItem in cmsPlanOrderItems)
+                {
+                    cmsPlanOrderItem.orderId = id;
+                    sss = _PlanOrderBLL.insertModelOrderItem(cmsPlanOrderItem);
+                }
+            }
+
+            return "";
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderList.aspx.designer.cs
new file mode 100644
index 0000000..1717584
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/PlanOrderList.aspx.designer.cs
@@ -0,0 +1,143 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.financial
+{
+
+
+    public partial class PlanOrderList
+    {
+
+        /// <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>
+        /// selstatus 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selstatus;
+
+        /// <summary>
+        /// txtshipAddress 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtshipAddress;
+
+        /// <summary>
+        /// txtpianqu 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtpianqu;
+
+        /// <summary>
+        /// txtshipName 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtshipName;
+
+        /// <summary>
+        /// txtshipMobile 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtshipMobile;
+
+        /// <summary>
+        /// txtshouhuoAddress 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtshouhuoAddress;
+
+        /// <summary>
+        /// btn_Register 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btn_Register;
+
+        /// <summary>
+        /// HideKeyid 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden HideKeyid;
+
+        /// <summary>
+        /// filesel 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputFile filesel;
+
+        /// <summary>
+        /// UpdateFileNew 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button UpdateFileNew;
+
+        /// <summary>
+        /// RepSubjeSetctList 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Repeater RepSubjeSetctList;
+
+        /// <summary>
+        /// UCPager1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::CY.WebForm.Pages.common.UCPager UCPager1;
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx
index 10e8db4..db979d1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx
@@ -210,6 +210,7 @@
                         鏀惰揣浜�(绛惧瓧)锛�
                     </td>
                     <td>
+                         楠屾敹浜�(绛惧瓧)锛�
                     </td>
                 </tr>
             </tbody>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/WorkBookUpLoad.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/WorkBookUpLoad.aspx
new file mode 100644
index 0000000..6432414
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/WorkBookUpLoad.aspx
@@ -0,0 +1,197 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WorkBookUpLoad.aspx.cs" Inherits="CY.WebForm.Pages.business.WorkBookUpLoad" %>
+
+<%-- 涓婁紶鍚堝悓椤甸潰  寤� 20210916澧炲姞--%>
+<!DOCTYPE html>
+<script src="./../../myPagination/js/share/js/jquery.min.js" type="text/javascript"></script>
+<%--<script src="./../../js/jquery.hammer.min.js" type="text/javascript"></script>--%>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title></title>
+
+
+    <uc:CMSHead ID="CMSHead1" runat="server" />
+
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div class="box1" paneltitle="鍔熻兘闈㈡澘" roller="false">
+            <table class="TableNewStyle">
+                <tr>
+                                  
+ 
+
+                    <td class="ali03">
+                        <input type="file" id="filesel" name="__hetongFile" keepdefaultstyle="true" runat="server" text="璇烽�夋嫨鏂囦欢" /></td>
+                    <td>
+                        <asp:Button ID="UpdateFileNew" Text="涓婁紶" runat="server" OnClick="btn_Submit_Click" OnClientClick="return checkSelFile()" />
+                           <input type="hidden" id="HideKeyid" runat="server" /> 
+                    </td>
+                 
+                </tr>
+            </table>
+
+
+        </div>
+
+        
+        
+
+    </form>
+</body>
+</html>
+<script type="text/javascript">
+
+    //鏌ョ湅
+    function checkSelMulitFile() {
+
+        var oFile = document.getElementById('file2');
+        if (oFile.value == "") {
+            alertMsg('娌℃湁閫夋嫨鏂囦欢');
+            return false;
+           
+        }
+        //debugger;
+        //replaceParamVal("deleteKeyIds", "");
+        return true;
+    }
+    //鏌ョ湅
+    function checkSelFile() {
+
+        
+        var oFile = document.getElementById('filesel');
+        if (oFile.value == "") {
+            alertMsg('娌℃湁閫夋嫨鏂囦欢');
+            return false;
+
+        }
+        //debugger;
+        //replaceParamVal("deleteKeyIds", "");
+        return true;
+    }
+
+    //鏀瑰彉鍙傛暟
+    function changeURLArg(url, arg, arg_val) {
+        var pattern = arg + '=([^&]*)';
+        var replaceText = arg + '=' + arg_val;
+        if (url.match(pattern)) {
+            var tmp = '/(' + arg + '=)([^&]*)/gi';
+            tmp = url.replace(eval(tmp), replaceText);
+            return tmp;
+        } else {
+            if (url.match('[\?]')) {
+                return url + '&' + replaceText;
+            } else {
+                return url + '?' + replaceText;
+            }
+        }
+    }
+
+
+    // 鑾峰彇url閲岀殑鍙傛暟
+
+    function getURLString(arg) {
+        var reg = new RegExp("(^|&)" + arg + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null)
+            return unescape(r[2]);
+        return null;
+    }
+
+    //鏇挎崲鎸囧畾浼犲叆鍙傛暟鐨勫��,paramName涓哄弬鏁�,replaceWith涓烘柊鍊�
+    function replaceParamVal(paramName, replaceWith) {
+        var oUrl = this.location.href.toString();
+        var re = eval('/(' + paramName + '=)([^&]*)/gi');
+        var nUrl = oUrl.replace(re, paramName + '=' + replaceWith);
+        this.location = nUrl;
+        window.location.href = nUrl
+    }
+    //鍒犻櫎鍒跺畾鍚堝悓椤甸潰
+    function delelid(KeyID, pageID) {
+
+     
+        top.Dialog.confirm("鏄惁瑕佸垹闄よ鍚堝悓椤甸潰锛�", function () {
+            window.location = "/Pages/business/WorkBookUpLoad.aspx?deleteKeyIds=" + KeyID + "&Keyid=" + pageID;
+        }
+        );
+    }
+
+
+
+    //缁存姢
+    function onViewuplodshow(keyid) {
+
+       
+        top.Dialog.open({ URL: "/Pages/business/CorporateClientsContractShow.aspx?Keyid=" + keyid, Title: "娴忚鍚堝悓", Width: 1024, Height: 750 });
+    }
+
+    $(document).ready(function () {
+        $("#file2").change(function () {
+            var myfile = document.getElementById('file2');
+         
+       
+            for (let i = 0; i < myfile.files.length; i++)
+        {
+                var filepath = myfile.files[i].name;
+          
+            var extStart = filepath.lastIndexOf(".");
+            var ext = filepath.substring(extStart, filepath.length).toUpperCase();
+            if (ext != ".BMP" && ext != ".PNG" && ext != ".GIF" && ext != ".JPG" && ext != ".JPEG") {
+                alertMsg("鍥剧墖闄愪簬bmp,png,gif,jpeg,jpg鏍煎紡");
+                
+                return false;
+            } else { $("#fileType").text(ext) }
+             
+                var ext = filepath.substring(0, extStart);
+                if (isNumber(ext)) {
+
+                }
+                else {
+                    alertMsg(filepath + '鏂囦欢鍚嶆湁璇�');
+                    return false;
+                }
+                
+        }
+           
+            //var file_size = 0;
+            //if ($.browser.msie) {
+            //    var img = new Image();
+            //    img.src = filepath;
+            //    while (true) {
+            //        if (img.fileSize > 0) {
+            //            if (img.fileSize > 3 * 1024 * 1024) {
+            //                alert("鍥剧墖涓嶅ぇ浜�100MB銆�");
+            //            } else {
+            //                var num03 = img.fileSize / 1024;
+            //                num04 = num03.toFixed(2)
+            //                $("#fileSize").text(num04 + "KB");
+            //            }
+            //            break;
+            //        }
+            //    }
+            //} else {
+            //    file_size = this.files[0].size;
+            //    var size = file_size / 1024;
+            //    if (size > 10240) {
+            //        alert("涓婁紶鐨勫浘鐗囧ぇ灏忎笉鑳借秴杩�10M锛�");
+            //    } else {
+            //        var num01 = file_size / 1024;
+            //        num02 = num01.toFixed(2);
+            //        $("#fileSize").text(num02 + " KB");
+            //    }
+            //}
+            return true;
+        });
+    });
+    function isNumber(val) {
+        var regPos = /^\d+(\.\d+)?$/; //闈炶礋娴偣鏁�
+        var regNeg = /^(-(([0-9]+\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\.[0-9]+)|([0-9]*[1-9][0-9]*)))$/; //璐熸诞鐐规暟
+        if (regPos.test(val) || regNeg.test(val)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+</script>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/WorkBookUpLoad.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/WorkBookUpLoad.aspx.cs
new file mode 100644
index 0000000..b4d4723
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/WorkBookUpLoad.aspx.cs
@@ -0,0 +1,190 @@
+锘縰sing CY.Infrastructure.Common;
+using CY.Infrastructure.Logging;
+using CY.SQLDAL;
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using static CY.WebForm.MainPage;
+using CY.Model.OA;
+using CY.WebForm.Helper;
+using CY.Infrastructure.Query;
+using System.IO;
+using CY.Infrastructure.Configuration;
+using System.Collections;
+using System.Globalization;
+
+namespace CY.WebForm.Pages.business
+{
+    public partial class WorkBookUpLoad : BasePage
+    {
+
+        
+        /// <summary>
+        /// 閫夋嫨鏂囦欢
+        /// </summary>
+        List<HttpFileCollection> SelFile { set; get; }
+        /// <summary>
+        /// 鍚堝悓闄勪欢闆嗗悎
+        /// </summary>
+        List<OA_CorporateClientsContract> fileDataList { set; get; } = new List<OA_CorporateClientsContract>();
+
+        
+
+        /// <summary>
+        /// 闄勪欢涓暟
+        /// </summary>
+        public int  FileCount { get; set; }
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+            if (!IsPostBack)
+                HideKeyid.Value = Request["Keyid"];
+
+
+
+
+
+
+        }
+        
+       
+         
+
+    
+        protected void btn_Submit_Click(object sender, EventArgs e)
+        {
+            string ssss = HideKeyid.Value;
+
+            var files = Request.Files;
+            if (files.Count <= 0)
+                return;
+            //    return;
+            HttpPostedFile file = null;
+         
+
+
+            for (int i = 0; i < files.Count; i++)
+            {
+
+                if (files.Keys[i] == "filesel")
+                {
+                    file = files[i];
+                    if (file.ContentLength == 0)
+                    {
+                        return;
+                    }
+                       
+                    break;
+                }
+
+            }
+
+           
+            string WebDomain = ConfigurationSetting.TuPianLuJing;
+            //鏍圭洰褰曡矾寰勶紝鐩稿璺緞
+            String savePath = "/images/WorkBook/" + DateTime.Now.ToString("yyyyMMdd") + "/";
+            //鏍圭洰褰昒RL锛屽彲浠ユ寚瀹氱粷瀵硅矾寰勶紝姣斿 http://www.yoursite.com/attached/
+            String saveUrl = ConfigurationSetting.TuPianLuJing.TrimEnd('/') + "/images/WorkBook/" + DateTime.Now.ToString("yyyyMMdd") + "/";
+
+            string fileTypes = "gif,jpg,jpeg,png,bmp";
+            double maxSize = 2 * 1024 * 1024;
+
+
+            string dirPath = Server.MapPath("~" + savePath);
+            if (!Directory.Exists(dirPath))
+            {
+                Directory.CreateDirectory(dirPath);
+            }
+
+            string fileName = file.FileName;
+            string fileExt = Path.GetExtension(fileName).ToLower();
+
+            ArrayList fileTypeList = ArrayList.Adapter(fileTypes.Split(','));
+
+            if (file.InputStream == null || file.InputStream.Length > maxSize)
+            {
+                JavaScript.MessageBox("涓婁紶鏂囦欢澶у皬瓒呰繃闄愬埗", this);
+               
+            }
+
+            if (string.IsNullOrEmpty(fileExt) || Array.IndexOf(fileTypes.Split(','), fileExt.Substring(1).ToLower()) == -1)
+            {
+                JavaScript.MessageBox("涓婁紶鏂囦欢鎵╁睍鍚嶆槸涓嶅厑璁哥殑鎵╁睍鍚�", this);
+               
+            }
+
+
+         
+
+
+
+          
+
+            
+
+
+
+            try
+            {
+                string newFileName = DateTime.Now.ToString("yyyyMMddHHmmss_ffff", DateTimeFormatInfo.InvariantInfo) + fileExt;
+                string filePath = dirPath + newFileName;
+                file.SaveAs(filePath);
+                string fileUrl = saveUrl + newFileName;
+
+                JavaScript.MessageBoxfuzhi("涓婁紶鏂囦欢鎴愬姛", this,true, ssss, fileUrl);
+                //JavaScript.RefreshSelf(this);
+                //JavaScript.RefreshOpener(this);
+              
+            }
+            catch (Exception )
+            {
+                JavaScript.MessageBox("涓婁紶鏂囦欢澶辫触", this);
+                // JavaScript.RefreshSelf(this);
+                //JavaScript.RefreshOpener(this);
+              
+
+            }
+        
+
+            //    CY.WebForm.cs.UploadCS.Upload(System.Web.HttpContext.Current.Request.MapPath("contractImgs/") + Guid.NewGuid().ToString() + fileName)
+
+
+            //var files = Request.Files;
+            //for (int iFile = 0; iFile < files.Count; iFile++)
+            //{
+            //    ///'妫�鏌ユ枃浠舵墿灞曞悕瀛�
+            //    HttpPostedFile postedFile = files[iFile];
+            //    string fileName, fileExtension;
+            //    fileName = System.IO.Path.GetFileName(postedFile.FileName);
+            //    if (fileName != "")
+            //    {
+            //        fileExtension = System.IO.Path.GetExtension(fileName);
+            //        //strMsg.Append("涓婁紶鐨勬枃浠剁被鍨嬶細" + postedFile.ContentType.ToString() + "<br>");
+            //        //strMsg.Append("瀹㈡埛绔枃浠跺湴鍧�锛�" + postedFile.FileName + "<br>");
+            //        //strMsg.Append("涓婁紶鏂囦欢鐨勬枃浠跺悕锛�" + fileName + "<br>");
+            //        //strMsg.Append("涓婁紶鏂囦欢鐨勬墿灞曞悕锛�" + fileExtension + "<br><hr>");
+            //        ///'鍙牴鎹墿灞曞悕瀛楃殑涓嶅悓淇濆瓨鍒颁笉鍚岀殑鏂囦欢澶�
+            //        ///娉ㄦ剰锛氬彲鑳借淇敼浣犵殑鏂囦欢澶圭殑鍖垮悕鍐欏叆鏉冮檺銆�
+            //        ///
+
+            //       // postedFile.SaveAs(System.Web.HttpContext.Current.Request.MapPath("contractImgs/") + Guid.NewGuid().ToString()+ fileName);
+
+
+            //    }
+            //}
+
+        }
+
+        
+        
+        
+
+
+
+
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/WorkBookUpLoad.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/WorkBookUpLoad.aspx.designer.cs
new file mode 100644
index 0000000..91337ad
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/WorkBookUpLoad.aspx.designer.cs
@@ -0,0 +1,71 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+    public partial class WorkBookUpLoad
+    {
+
+        /// <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>
+        /// filesel 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputFile filesel;
+
+        /// <summary>
+        /// UpdateFileNew 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button UpdateFileNew;
+
+        /// <summary>
+        /// HideKeyid 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden HideKeyid;
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/jisuanjine.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/jisuanjine.aspx
new file mode 100644
index 0000000..328abcf
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/jisuanjine.aspx
@@ -0,0 +1,1435 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="jisuanjine.aspx.cs" Inherits="CY.WebForm.Pages.business.jisuanjine" %>
+
+<!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" />
+    <!--鍓嶅彴椤甸潰start-->
+    <link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
+    <link href="../../Styles/changes.css" rel="stylesheet" type="text/css" />
+    <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
+    <script src="../../js/Inquiry/Inquiry.js?v=72 type="text/javascript"></script>
+    <script src="../../js/business/Order.js?v=36" type="text/javascript"></script>
+    <!--鍓嶅彴椤甸潰end-->
+    <script type="text/javascript" language="javascript">
+
+        function jsPrice(dj) {
+            var num = $("#printCount").val();
+
+            $("#txtSumPrice").val(dj * num);            
+        }
+
+        function jsdjPrice(zj) {
+            var num = $("#printCount").val();
+
+            $("#txtUnitPrice").val( (zj/num).toFixed(4) );
+        }
+
+        function ReBindClients() {
+            $.ajax({
+                url: "/Pages/business/jisuanjine.aspx",
+                type: "POST",
+                dataType: "html",
+                data: { Target: "ReBindClients"},
+                global: false,
+                cache: false,
+                async: false,
+                success: function (data) {
+                    $("#selCustormer").html(data);
+                }
+            });
+        }
+
+        ///鏂板瀹㈡埛
+        function showCustomer() {
+            top.Dialog.open({ URL: "/Pages/business/CorporateClientsEdit.aspx?src=order", Title: "鏂板瀹㈡埛", Width: 1200, Height: 780 });
+        }
+
+        function Saveyaoqiu() {
+            if (document.getElementById('selPrintTypes').value != "6") {
+                alertMsg("鐩墠鍙繚瀛樹功鍒婅姹�!");
+                return;
+            }
+            return ValidateForm();
+        }
+
+        //涓篠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;'/><span onclick='showCustomer()' style=\"padding-left:10px;\" class=\"a_under\">鏂板瀹㈡埛</span>";
+                $(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);
+                });
+            });
+        }
+
+        window.FastKeyDistinctived = true; //渚嬪蹇嵎閿�(涓嶄娇鐢ㄩ�氱敤蹇嵎閿�)
+        var keyDownHook = new KeyBehaviorHook('keydown');
+        keyDownHook.Regist(window.Keys.S, "ClickElement('btnSave')", window.WithKey.Ctrl); //Ctrl+s 淇濆瓨
+        keyDownHook.Regist(window.Keys.Enter, "ClickElement('btnSave')", window.WithKey.Ctrl); //Ctrl+Enter 淇濆瓨
+        keyDownHook.Regist(window.Keys.R, "ClickElement('btnReset')", window.WithKey.Ctrl); //Ctrl+R 閲嶇疆
+        keyDownHook.Regist(window.Keys.Q, "ClickElement('btnBackList')", window.WithKey.Ctrl); //Ctrl+Q 閫�鍑�(Quit)
+
+        $(function () {
+            SelectAddSearch();
+            keyDownHook.Binding();
+            global.SetReqMsg();
+            try {
+                document.getElementById('spnCustormerControl').style.display = document.getElementById('txtCustormerName') ? 'none' : '';
+                if ('0' == document.getElementById('txtKeyid').value) {
+                    document.getElementById('txtDeliveryTime').value = new Date().ToFuture({ day: 2 }).ToString('yyyy-MM-dd');
+                    ReceiptT('customer', '', 6, 120); return;
+                } else {
+                    ReceiptT('order', '<%=Orderid %>', 6, 120);  
+                }
+                document.getElementById('selPrintTypes').style.display = 'none';
+                document.getElementById('spnPrintType').innerHTML = document.getElementById('txtPrintTypes').value;
+                //document.getElementById('div_PrintParams').style.display = 'none'; //灏嗗睍绀虹殑鍗板埛鍙傛暟鏄剧ず鍑烘潵
+                printTypeChange(document.getElementById('selPrintTypes'));
+            } catch (e) {
+
+            }
+            var orderTypeId = $("#hidOrderTypeId").val();
+            if (orderTypeId != "1") {
+                $("#tbBasic").attr("disabled", true);
+                $("#divInquiry").attr("disabled", true);
+                setTimeout(displayControl, 1000);
+            }
+
+            $("#div_InquiryEdit").render();
+        });
+
+        //window.custormers = {};
+
+        function displayControl() {
+            $("#InsideOpDiv").hide();
+        }
+
+
+         
+    </script>
+    <style type="text/css">
+        .table2Left td { text-align: left; }
+        .table2Left .alignR { text-align: right; }
+    </style>
+</head>
+<body style='padding: 0; margin: 0;'>
+    <form id="form1" runat="server" style='padding: 0; margin: 0;' class='form2'>
+    <input type="hidden" id="hidOrderId" name="hidOrderId" />
+    <input name="Target" value='save' type="hidden" />
+    <input type="hidden" id="hidOrderTypeId" value="" runat="server" />
+    <%--<asp:Repeater ID='rptCustormer' runat="server">
+        <ItemTemplate>
+            <script type='text/javascript'>
+                window.custormers['<%#Eval("MemberId") %>'] = { id: '<%#Eval("MemberId") %>', level: '<%#Eval("DegreeImportanId") %>', bmid: '<%#Eval("BusinessManagerId") %>', cmid: '<%#Eval("AccountManagerId") %>' };
+            </script>
+        </ItemTemplate>
+    </asp:Repeater>--%>
+    <table class="table2" id="tbBasic" align="left" style=" width:1000px;">
+        <thead>
+            <tr>
+                <th colspan="8">
+                    鍩烘湰淇℃伅
+                </th>
+            </tr>
+        </thead>
+        <tr style=" height:1px;">
+                <td style="border:none;width: 100px;">
+                </td>
+                <td style="border:none; width:161px;">
+                </td>
+                <td style="border:none;width: 100px;">
+                </td>
+                <td style="border:none;">
+                </td>
+                <td style="border:none;width: 100px;">
+                </td>
+                <td style="border:none;">
+                </td>
+                <td style="border:none;width: 100px;">
+                </td>
+                <td style="border:none;">
+                </td>
+            </tr>
+        <tr>
+             <td align="right">
+                瀹㈡埛鍗曚綅锛�
+            </td>
+            <td colspan="3" align="left">
+                <input type="hidden" id='txtCustormer' runat="server" />
+                <input id='txtCustormerName' runat="server" readonly="readonly" /><span id='spnCustormerControl'><select id='selCustormer' runat="server" keepdefaultstyle='true' datavaluefield='MemberId' datatextfield='CompanyName' onchange='custormerChange(this)' class='Sreq' selinputhtml="True" sign="" style=" width:123px;"></select>
+                    <%--<input type="button" value='鏂板' keepdefaultstyle='true' onclick="top.Dialog.open({ URL: '/Pages/business/CorporateClientsEdit.aspx', Title: '鏂板瀹㈡埛', Width: 900, Height: 680});" />--%>
+                </span>
+                <input type='hidden' runat="server" id='txtCompanyName' />
+            </td>
+             <td align="right">
+                瀹㈡埛绾у埆锛�
+            </td>
+            <td align="left">
+                <select id='selCustormerLevel' class='Sreq' runat="server" datatextfield="Name" datavaluefield="Keyid" keepdefaultstyle='true'>
+                </select>
+                <!--datavaluefield="MeanValue"-->
+            </td>
+            <td align="right">
+                璁㈠崟绫诲瀷锛�
+            </td>
+            <td align="left">
+                <span id='spnPrintType'></span>
+                <input type="hidden" id='txtPrintTypes' runat="server" />
+                <select id='selPrintTypes' runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepdefaultstyle='true' onchange='printTypeChange(this)' class=' Sreq'>
+                </select>
+            </td>   
+           
+        </tr>
+        <tr>
+             <td align="right">
+                璁㈠崟缂栧彿锛�
+            </td>
+            <td align="left">
+                <input id='txtOrderId' runat="server" onfocus='this.blur();' />
+            </td>
+            <td align="right">
+                绱ф�ョ▼搴︼細
+            </td>
+            <td align="left">
+                <select id='selExigencyDegree' runat="server" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                </select>
+            </td>
+            <td align="right" id="selVerifyWay123">
+                浜よ揣鏃堕棿锛�
+            </td>
+            <td align="left" id="selVerifyWay321">
+                <input id='txtDeliveryTime' class='date' runat="server" />
+            </td>
+           <td align="right">
+                宸叉湁鍗颁欢锛�
+            </td>
+            <td align="left">
+                <select id='selprintask' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'    onchange='printTypeChange1(this)'  >
+                    <option value="" >璇烽�夋嫨</option>
+                </select>
+            </td>
+        </tr>
+         
+        <tr>
+             <td align="right">
+                鍗颁欢鍚嶇О锛�
+            </td>
+            <td align="left">
+                <input id='txtDocumentName' runat="server" maxlength='200' class='req' style="width:200px;" />
+                 <input type='hidden'   id='txtDocumentNameHide' />
+            </td>
+            <td align="right"  id="selVerifyWay1234">
+                璁㈠崟鍗曚环锛�
+            </td>
+            <td align="left"  id="selVerifyWay4321">
+                <input id='txtUnitPrice' runat="server" maxlength='9' class='float' onchange="jsPrice(this.value)" />
+            </td>
+            <td align="right">
+                璁㈠崟鎬讳环锛�
+            </td>
+            <td align="left">
+                <input id='txtSumPrice' runat="server" maxlength='9' value='0' class="req float" min="0" onchange="jsdjPrice(this.value)" />
+            </td>
+            <td align="right" id="selVerifyWay12">
+                鏍$鏂瑰紡锛�
+            </td>
+            <td align="left" id="selVerifyWay21">
+                <select id='selVerifyWay' class=' Sreq' runat="server" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                </select>
+            </td>
+           
+        </tr>
+        <tr>
+            <td align="right">
+                涓氬姟缁忕悊锛�
+            </td>
+            <td align="left">
+                <select id='selBusinessManagers' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
+                </select>
+            </td>
+            <td align="right">
+                瀹㈡埛缁忕悊锛�
+            </td>
+            <td align="left">
+                <select id='selCustormerManagers' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
+                </select>
+            </td>
+            <td align="right">
+                鑱� 绯� 浜猴細
+            </td>
+            <td align="left">
+                <input id='txtContact' runat="server" maxlength="20" />
+            </td>
+            <td align="right">
+                鑱旂郴鐢佃瘽锛�
+            </td>
+            <td align="left">
+                <input id='txtPhone' runat="server" class='' />
+            </td>
+           
+        </tr>
+
+        <tr>
+             <td align="right">
+                鑱旂郴Q Q锛�
+            </td>
+            <td align="left">
+                <input id='txtQQ' runat="server" maxlength="50" />
+            </td>
+             <td align="right">
+                
+            </td>
+            <td align="left">
+              
+            </td>
+            <td align="right">
+                
+            </td>
+            <td align="left">
+              
+            </td>
+            <td align="right">
+                
+            </td>
+            <td align="left">
+              
+            </td>
+            </tr>
+    </table>
+  
+    <div id='div_InquiryEdit' style='display: block;'>
+        <div id="divInquiry"  style=' display: block;width:1010px;'  >
+        </div>
+         <br />
+        <table class="table2 table2Left"  align="left" style=" width:1000px;">
+            <thead>
+                <tr>
+                    <th colspan="6">
+                        閫佽揣鏂瑰紡
+                    </th>
+                </tr>
+            </thead>
+            <tr id='ReceiptT_Html' style=" height:11px;">
+                <td style="width: 100px;">
+                </td>
+                <td style="width:161px;">
+                </td>
+                <td style="width: 100px;">
+                </td>
+                <td style="width:156px;">
+                </td>
+                <td style="width: 100px;">
+                </td>
+                <td style="">
+                </td>
+            </tr>
+        </table>
+    </div>
+         <br />
+    <table class="table2" id="tbFacing"  align="left" style=" width:1000px;">
+        <thead>
+            <tr>
+                <th colspan="4">
+                    鍖呰瑕佹眰
+                </th>
+            </tr>
+        </thead>
+        <tr style=" height:1px;">
+                <td style="border:none;width: 100px;">
+                </td>
+                <td style="border:none; width:161px;">
+                </td>
+                <td style="border:none;width: 100px;">
+                </td>
+                <td style="border:none;">
+                </td>
+                <td style="border:none;width: 100px;">
+                </td>
+                <td style="border:none;">
+                </td>
+                <td style="border:none;width: 100px;">
+                </td>
+                <td style="border:none;">
+                </td>
+            </tr>
+        <tr id="trbook" style = "display:none">
+            <td align="right">
+                涔﹀彿锛�
+            </td>
+            <td align="left">
+                <input id='txtBookNumber' runat="server" maxlength='200' />
+            </td>
+            <td align="right">
+                瀹氫环锛�
+            </td>
+            <td align="left">
+                <input id='txtBookPrice' runat="server" maxlength='9' class='float' />
+            </td>
+        </tr>
+        <tr id="trPerBag">
+           <td align="right">
+                姣忓寘鏁伴噺锛�
+            </td>
+            <td align="left">
+                <input id='txtNumberPerBag' runat="server" maxlength='200' onblur="NumberPerBagBlur()"/>
+            </td>
+            <td align="right">
+                鎬诲寘鏁帮細
+            </td>
+            <td align="left">
+                <input id='txtBagNum' runat="server" maxlength='9' onblur="bagNumBlur()"/>
+            </td>
+        </tr>
+    </table>
+         <br />
+    <table class="table2"  align="left" style=" width:1000px;">
+        <tbody>
+            
+             <tr>
+                <td style="width: 100px; text-align:right;">
+                    鍗板埛銆佹墦鍖呫�侀�佽揣瑕佹眰锛�
+                </td>
+                <td style=" text-align:left;">
+                    <textarea id="txtPrintPackDeliveryRequir" name="txtPrintPackDeliveryRequir" runat="server" style="width: 692px; height: 30px;"></textarea>
+                </td>
+            </tr>
+            <tr>
+                <td style="width: 100px; text-align:right;">
+                    澶囨敞锛�
+                </td>
+                <td style=" text-align:left;">
+                    <textarea id="txtRemark" name="txtRemark" runat="server" style="width: 692px; height: 30px;"></textarea>
+                </td>
+            </tr>
+            <tr>
+                <td class="contentLeft" colspan="2" style=" padding-left:300px;">
+                    <input type="hidden" id='txtKeyid' runat="server" value='0' /><input type="hidden" value='0' id='txtBillMode' runat="server" />
+                    <input type="hidden" name='Target' value='default' />
+                    <input  name='hidPrintTypeId' id='hidPrintTypeId' type="hidden" />
+                    <input type="button" id="btnSaveask" runat="server" value="淇濆瓨璁㈠崟鍜岃姹�" onclick="if(!Saveyaoqiu())return false;" />&nbsp;&nbsp;&nbsp;<input type="button" id="btnSave" runat="server" value="淇濆瓨璁㈠崟" onclick="if(!Save())return false;" />&nbsp;&nbsp;&nbsp;<input type="button" value="閲� 缃�" id='btnReset' onclick="ReLoad()" />
+
+                    
+
+                    <input type="button" value="杩斿洖鍒楄〃" id='btnBackList' onclick="window.location='OrderList.aspx';" />
+                </td>
+            </tr>
+            <tr>
+                <td colspan="2">
+                    &nbsp;
+                </td>
+            </tr>
+        </tbody>
+    </table>
+    </form>
+    
+</body>
+<script type="text/javascript" language="javascript">
+    function NumberPerBagBlur() {
+        var count = document.getElementById('printCount').value;
+        var numPerBag = parseInt($("#txtNumberPerBag").val());
+
+        if (isNaN(count)) {
+
+            $("#txtBagNum").val(0);
+        }
+        else {
+
+            var bagNum = parseInt(count / numPerBag);
+            $("#txtBagNum").val(bagNum);
+        }
+
+    }
+    function bagNumBlur() {
+        var count = document.getElementById('printCount').value;
+        var bagNum = parseInt($("#txtBagNum").val());
+
+        if (isNaN(count)) {
+            
+            $("#txtNumberPerBag").val(0);
+
+        }
+        else {
+            var numPerBag = parseInt(count / bagNum);
+            $("#txtNumberPerBag").val(numPerBag);
+        }
+    }
+
+    /*
+鍗板埛绫诲瀷閫変腑鍊兼敼鍙樻柟娉�
+*/
+    function printTypeChange1(sel) {
+        showWait();
+        var OldOrderId = document.getElementById('txtKeyid').value;
+        var ssselPrintTypes = document.getElementById('selPrintTypes').value;
+        //alert(7);
+        if (ssselPrintTypes == -1 || ssselPrintTypes == "-1") {//鍏朵粬绫诲瀷
+            $("#hidOrderId").val(OldOrderId);
+            $("#divInquiry").load("/Pages/front/OtherType.aspx", { "PrintTypeId": "-1" });
+            setTimeout(function () {
+                //alert(8);
+                if (sel.value != "" || sel.value == "0") {
+                    BindControl1(sel.value);
+                }
+            }, 1000);
+
+            window.hideWaitDiv = window.parent.parent.parent.parent.parent.parent.hideWaitDiv;
+            if (window.hideWaitDiv)
+                window.hideWaitDiv();
+        }
+        else
+        {
+            DelayLoadPrintType1(ssselPrintTypes, '1', OldOrderId, 'order');
+        }
+        document.getElementById('hidPrintTypeId').value = ssselPrintTypes;
+        if ($("#txtKeyid").val() == "0") {
+            //document.getElementById('txtDocumentName').value = sel.value ? sel.options[sel.selectedIndex].text : '';
+        }
+        if (ssselPrintTypes == 6) {
+            document.getElementById('trbook').style.display = '';
+        }
+        else {
+            document.getElementById('trbook').style.display = 'none';
+        }
+
+        if (ssselPrintTypes == 37) {
+            document.getElementById('tbFacing').style.display = 'none';
+            document.getElementById('selVerifyWay12').style.display = 'none';
+            document.getElementById('selVerifyWay21').style.display = 'none';
+            //document.getElementById('selVerifyWay123').style.display = 'none';
+            //document.getElementById('selVerifyWay321').style.display = 'none';
+
+            document.getElementById('txtDeliveryTime').value = "";
+            
+            
+        }
+        else {
+            document.getElementById('tbFacing').style.display = '';
+            document.getElementById('selVerifyWay12').style.display = '';
+            document.getElementById('selVerifyWay21').style.display = '';
+        }
+    }
+
+
+
+    //淇敼鍙嶇粦鏁版嵁
+    function BindControl1(orderId) {
+       // alert(1);
+        if (parseInt(orderId) > 0) {
+            $.ajax({
+                url: '/Pages/front/InquiryOnLine.aspx?tmp' + (new Date()).valueOf(),
+                type: "POST",
+                data: "BindControl1=true&OrderId=" + orderId,
+                success: function (dataJsonStr) {
+                   // alert(2);
+                    if (dataJsonStr == null || dataJsonStr == "")
+                        return;
+                    var dataJson = eval('(' + dataJsonStr + ')');
+                   // alert(dataJson.PrintTypeId);
+                    if (dataJson.PrintTypeId == "-1" || dataJson.PrintTypeId == -1) {
+                        $("[name='printSizeName']").val(dataJson.PrintSizeName);
+                        $("[name='printCount']").val(dataJson.PrintCount);
+                        $("#ysUnit").attr("value", dataJson.Unit);
+                        $("[name='txtPrintDemand']").val(dataJson.PrintDemand);
+                    } else {
+                        BindControlByPrintType(dataJson);
+                    }
+                }
+            });
+
+
+            $.ajax({
+                url: '/Pages/business/jisuanjine.aspx?tmp' + (new Date()).valueOf(),
+                type: "POST",
+                data: "Target=getPrintAsk2&OrderId=" + orderId,
+                success: function (dataJsonStr) {
+                   
+                    if (dataJsonStr == null || dataJsonStr == "")
+                        return;
+                    var dataJson = $.parseJSON(dataJsonStr);
+
+                  
+                    $("#txtContact").val(dataJson.BusinessManagers);
+                    $("#txtPhone").val(dataJson.ManagersMobile);
+                    $("#txtQQ").val(dataJson.ManagersQQ);
+                    $("#txtPrintPackDeliveryRequir").val(dataJson.Deliveryrequirements);
+                   
+
+                    $("#txtDocumentName").val(dataJson.DocumentName);
+                    $("#txtUnitPrice").val(dataJson.UnitPrice.toFixed(2));
+                    $("#txtSumPrice").val(dataJson.SumPrice.toFixed(2));
+                    
+                }
+            });
+        }
+    }
+
+
+    function DelayLoadPrintType1(printid, pvctype, orderkeyid) {
+        if (window.delaier) {
+            clearTimeout(window.delaier);
+        }
+
+        window.delaier = setTimeout(function () {
+            LoadPrintType1(printid, pvctype, orderkeyid);
+        }, '0' == orderkeyid ? 1000 : 0); //寤惰繜涓ょ鎵ц
+    }
+
+
+    function LoadPrintType1(printTypeId, pvcTypePar, OrderId) {
+        //alert(4);
+        $("#hidOrderId").val(OrderId);
+        switch (printTypeId) {
+            //鍚嶇墖                            
+            case "13":
+                $("#divInquiry").load("/Pages/front/BusinessCard.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack1);
+                break;
+            //DM鍗�                               
+            case "14":
+                $("#divInquiry").load("/Pages/front/DMInquiry.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack1);
+                break;
+            //鐢诲唽                               
+            case "15":
+                $("#divInquiry").load("/Pages/front/PictureAlbumNew.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack1);
+                break;
+            //骞垮憡绾告澂                         
+            case "31":
+                $("#divInquiry").load("/Pages/front/AdvertisingCup.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack1);
+                break;
+            //骞垮憡鎵戝厠                  
+            case "32":
+                $("#divInquiry").load("/Pages/front/AdvertisingPoker.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack1);
+                break;
+            //骞抽潰璁捐                       
+            case "34":
+                $("#divInquiry").load("/Pages/front/GraphicDesigner.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack1);
+                break;
+            //鎴垮崱濂�                    
+            case "35":
+                $("#divInquiry").load("/Pages/front/RoomCard.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack1);
+                break;
+            //鍠风粯                     
+            case "17":
+                $("#divInquiry").load("/Pages/front/Airbrush.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack1);
+                break;
+            //榛戠櫧鍗颁欢                   
+            case "29":
+                $("#divInquiry").load("/Pages/front/BlackAndWhite.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack1);
+                break;
+            //渚跨                   
+            case "22":
+                $("#divInquiry").load("/Pages/front/Note.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack1);
+                break;
+            //灏佸                   
+            case "26":
+                $("#divInquiry").load("/Pages/front/Packet.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack1);
+                break;
+            //鎵嬫彁琚�                  
+            case "16":
+                $("#divInquiry").load("/Pages/front/Reticule.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack1);
+                break;
+            //淇″皝                  
+            case "21":
+                $("#divInquiry").load("/Pages/front/Envelop.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack1);
+                break;
+            //PVC鍗�                  
+            case "33":
+                if (pvcTypePar == "1") {
+                    $("#divInquiry").load("/Pages/front/PVCCard.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack1);
+                }
+                else {
+                    $("#divInquiry").load("/Pages/front/PortraitCard.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack1);
+                }
+                break;
+            //鎶ョ焊                  
+            case "7":
+                $("#divInquiry").load("/Pages/front/NewsPaper.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack1);
+                break;
+            //涔﹀垔                   
+            case "6":
+                $("#divInquiry").load("/Pages/front/Book.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack1);
+                break;
+            //鏀舵嵁鑱斿崟                    
+            case "27":
+                $("#divInquiry").load("/Pages/front/ReceiptDocument.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack1);
+                break;
+            //鎸傚巻                     
+            case "23":
+                $("#divInquiry").load("/Pages/front/Calendary.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack1);
+                break;
+            //LED鏄剧ず灞�                  
+            case "19":
+                $("#divInquiry").load("/Pages/front/LED.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack1);
+                break;
+            //鎷涚墝瀛�                    
+            case "18":
+                $("#divInquiry").load("/Pages/front/Signboard.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack1);
+                break;
+            //鍙板巻                  
+            case "25":
+                $("#divInquiry").load("/Pages/front/DeskCalendar.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack1);
+                break;
+            //鏁扮爜蹇嵃                   
+            case "36":
+                $("#divInquiry").load("/Pages/front/DigitalSingle.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack1);
+                break;
+            //涓嶅共鑳�                  
+            case "20":
+                $("#divInquiry").load("/Pages/front/Adhesive.aspx", { "PrintTypeId": printTypeId }, ExcuteCallBack1);
+                break;
+            default:
+                window.hideWaitDiv = window.parent.parent.parent.parent.parent.parent.hideWaitDiv;
+                if (window.hideWaitDiv) window.hideWaitDiv();
+                return;
+        }
+        window.hideWaitDiv = window.parent.parent.parent.parent.parent.parent.hideWaitDiv;
+        if (window.hideWaitDiv) window.hideWaitDiv();
+    }
+
+
+    //鍔ㄦ�佸姞杞介〉闈㈠悗鎵ц鐨勮鍙�
+    function ExcuteCallBack1() {
+       // alert(5);
+        var printTypeId = $("#hidPrintTypeId").val();
+
+        $("#selDigitalPrintType").live("change",
+            function () {
+                var value = $(this).val();
+                if (value == "鍗曞紶") {
+                    $("#divInquiry").load("/Pages/front/DigitalSingle.aspx", { "PrintTypeId": printTypeId, "DigitalPrintType": "" + value + "" }, ExcuteCallBack1);
+                }
+                else {
+                    $("#divInquiry").load("/Pages/front/DigitalBook.aspx", { "PrintTypeId": printTypeId, "DigitalPrintType": "" + value + "" }, ExcuteCallBack1);
+                }
+            }
+        );
+
+        $("#signboardCharacter").live("change",
+            function () {
+                var characterName = $(this).val();
+                if (characterName != null && characterName != "") {
+                    $.ajax({
+                        url: '/Pages/front/InquiryOnLine.aspx?tmp' + (new Date()).valueOf(),
+                        type: "POST",
+                        async: false,
+                        data: "CharacterSelect=true&CharacterName=" + characterName,
+                        success: function (dataStr) {
+                            var option = "";
+                            var thicknesss = dataStr;
+                            if (thicknesss != "") {
+                                $(".thickness").show();
+                                var thicknessArry = thicknesss.split('|');
+                                for (var i = 0; i < thicknessArry.length; i++) {
+                                    option += "<option value=\"" + thicknessArry[i] + "\">" + thicknessArry[i] + "</option>";
+                                }
+                                $("#thickness").html("");
+                                $("#thickness").html(option);
+                            }
+                            else {
+                                $(".thickness").hide();
+                                $("#thickness").html("");
+                            }
+                        }
+                    });
+                }
+            }
+        );
+        Init();
+        var orderId = $("#hidOrderId").val();
+
+        var ssselprintask = $("#selprintask").val();
+        //淇敼鍙嶇粦鏁版嵁
+        //alert(3);
+        if (ssselprintask != "" || ssselprintask == "0") {
+            BindControl1(ssselprintask);
+        }
+        $("[name='pvcType']").change(
+            function () {
+
+                var pvcTypePar = "1";
+                var typeValue = $(this).val();
+                if (typeValue == "浜哄儚鍗�") {
+                    pvcTypePar = "2";
+                    if (window.ControlNum == 2 || window.ControlNum == 0) {
+                        $("#hidOrderId").val("");
+                    }
+                }
+                else {
+                    $("#hidOrderId").val("");
+                }
+                LoadPrintType($("#hidPrintTypeId").val(), pvcTypePar, $("#hidOrderId").val());
+            }
+        );
+
+        $("[name='sjType']").change(
+            function () {
+                var value = $(this).val();
+                if (value == 53 || value == 54 || value == 55) {
+                    $(".pmYM").show();
+                }
+                else {
+                    $(".pmYM").hide();
+                }
+            }
+        );
+
+        $("#SelSize").change(
+            function () {
+                var printTypeId = $("#hidPrintTypeId").val();
+                var value = $(this).val();
+                var bindModel = $("#bindingMode").val();
+                if (bindModel == 17) {
+                    if (value == 95 || value == 96 || value == 85 || value == 86) {
+                        if (printTypeId == 15) {
+                            $(this).val(100);
+                        }
+                        else {
+                            $(this).val(90);
+                        }
+                        alertMsg("64寮�涓嶈兘绮捐");
+                        return;
+                    }
+                }
+                if (value == "95" || value == "96" || value == "103" || value == "104") {
+                    $(".lf[value='18']").attr("disabled", true);
+                    $(".lf[value='18']").attr("checked", false);
+                }
+                else {
+                    $(".lf[value='18']").attr("disabled", false);
+                }
+                if (value == "95" || value == "96" || value == "103" || value == "104" || value == "97" || value == "98" || value == "120" || value == "121" || value == "122" || value == "123") {
+                    $(".lf[value='32']").attr("disabled", true);
+                    $(".lf[value='32']").attr("checked", false);
+                    $("[name='LaFeng']").hide();
+                    $(".doubleCover").hide();
+                    $(".doubleCover").find("input:checkbox").attr("checked", false);
+                }
+                else {
+                    $(".lf[value='32']").attr("disabled", false);
+                }
+            }
+        );
+
+        $(".xialap").hover(function () {
+            $(this).find(".xialapb").show();
+        }, function () {
+            $(this).find(".xialapb").hide();
+        });
+
+        $(".xialapr").hover(function () {
+            $(this).find(".xialapb").show();
+            $(this).removeClass("xialapr").addClass("xialaprh");
+        }, function () {
+            $(this).removeClass("xialaprh").addClass("xialapr");
+            $(this).find(".xialapb").hide();
+        });
+
+        $(".xialapr").click(function () {
+            $(this).parent().parent().find("input").val($(this).text());
+            $(".xialapb").hide();
+        });
+
+        //        //姝f暣鏁版鍒欒〃杈惧紡
+        //        var reg2 = /^[0-9]\d*$/;
+
+        $(".pageNum").blur(
+            function () {
+                var isSuccess = true;
+                var isOk = true;
+                var bindingMode = $("#bindingMode").val();
+                var i = 0;
+                var tempVal = 0;
+                var nameValue = $(this).attr("name");
+                var index = nameValue.substring(nameValue.length - 1);
+                var paperId = $("[name='paper" + index + "']").val();
+
+                if (bindingMode == 15) {
+                    i = 2;
+                }
+                else {
+                    i = 2;
+                }
+                var value = $(this).val();
+
+                if (paperId != 18) {
+                    if (!reg2.test(value)) {
+                        isSuccess = false;
+                    }
+                    else {
+                        if (parseInt(value) % i != 0) {
+                            isSuccess = false;
+                        }
+                    }
+                    var msg = "";
+                    if (!isSuccess) {
+                        msg = "鍐呴〉鐨勯〉鐮佸繀椤讳负" + i + "鐨勫�嶆暟鐨勬鏁存暟";
+                        tempVal = 4;
+                    }
+                    //                    if (bindingMode != 14) {
+                    //                        if (!checkBookPageNum()) {
+                    //                            isOk = false;
+                    //                            tempVal = 36;
+                    //                        }
+                    //                    }
+                    //                    if (!isOk) {
+                    //                        msg = "鏃犵嚎锛岄攣绾胯兌瑁呭拰绮捐鍐呴〉椤电爜涓嶈兘灏忎簬36";
+                    //                    }
+
+                    if (!isOk) {
+                        $(this).focus();
+                        $(this).val(tempVal);
+                        alertMsg(msg);
+                    }
+                    else if (!isSuccess) {
+                        $(this).focus();
+                        $(this).val(tempVal);
+                        alertMsg(msg);
+                    }
+                }
+                else {
+                    if (!reg2.test(value)) {
+                        alertMsg("椤电爜蹇呴』鏄鏁存暟");
+                        $(this).val(1);
+                    }
+                }
+            }
+        );
+
+        $(".newsPageNum").blur(
+            function () {
+                var isSuccess = true;
+                var value = $(this).val();
+                if (!reg2.test(value)) {
+                    isSuccess = false;
+                }
+                else {
+                    if (parseInt(value) % 4 != 0) {
+                        isSuccess = false;
+                    }
+                }
+                if (!isSuccess) {
+                    var msg = "鐗堟暟蹇呴』鏄�4鐨勫�嶆暟鐨勬鏁存暟";
+                    $(this).focus();
+                    $(this).val(8);
+                    alertMsg(msg);
+                }
+            }
+        );
+
+        $("#bindingMode").change(
+            function () {
+                var value = $(this).val();
+                var isSuccess = true;
+                var isOk = true;
+                var tempVal = 0;
+                var i = 0;
+                $("[id*=paper][id!=paperSize]").each(
+                    function () {
+                        var paperId = $(this).val();
+                        if (paperId == 18) {
+                            if (value == 14 || value == 17) {
+                                isSuccess = false;
+                            }
+                        }
+                    }
+                );
+                if (!isSuccess) {
+                    alertMsg("纭吀绾镐笉鑳界敤楠戦┈閽夊拰绮捐");
+                    $(this).val(15);
+                    return;
+                }
+                //                if (value == 15) {
+                //                    i = 2;
+                //                }
+                //                else {
+                //                    i = 4;
+                //                }
+                //                $(".pageNum").each(
+                //                    function () {
+                //                        var pageNum = $(this).val();
+                //                        var index = $(this).attr("name").substring($(this).attr("name").length - 1);
+                //                        var paperId = $("[id='paper" + index + "'][id!=paperSize]").val();
+                //                        if (paperId != 18) {
+                //                            if (value != 14) {
+                //                                if (parseInt(pageNum) < 36) {
+                //                                    isOk = false;
+                //                                    $(this).focus();
+                //                                    $(this).val(36);
+                //                                }
+                //                            }
+                //                            if (isOk) {
+                //                                if (parseInt(pageNum) % i != 0) {
+                //                                    isSuccess = false;
+                //                                    $(this).focus();
+                //                                    $(this).val(4);
+                //                                }
+                //                            }
+                //                        }
+                //                        else {
+                //                            if (!reg1.test(pageNum)) {
+                //                                alertMsg("椤电爜蹇呴』鏄鏁板瓧");
+                //                                $(this).val(1);
+                //                            }
+                //                        }
+                //                    }
+                //                );
+                //                var msg = "";
+                //                if (!isSuccess) {
+                //                    msg += "鍐呴〉鐨勯〉鐮佸繀椤讳负" + i + "鐨勫�嶆暟鐨勬鏁板瓧(闄ょ~閰哥焊)";
+                //                }
+                //                if (!isOk) {
+                //                    msg = "鏃犵嚎锛岄攣绾胯兌瑁呭拰绮捐鍐呴〉椤电爜涓嶈兘灏忎簬36(闄ょ~閰哥焊),";
+                //                }
+                var msg = "";
+                var printTypeId = $("#hidPrintTypeId").val();
+                $("[name='works']").attr("disabled", false);
+                if (value == 17) {
+                    var paperSize = $("#paperSize").val();
+                    if (paperSize == 95 || paperSize == 96 || paperSize == 85 || paperSize == 86) {
+                        isSuccess = false;
+                        msg += "64寮�涓嶈兘绮捐,";
+                        if (printTypeId == 15) {
+                            $("#paperSize").val(100)
+                        }
+                        else {
+                            $("#paperSize").val(90);
+                        }
+                    }
+                    if (isSuccess) {
+                        var SelSize = $("#SelSize").val();
+                        if (SelSize == 95 || SelSize == 96 || paperSize == 85 || paperSize == 86) {
+                            isSuccess = false;
+                            msg += "64寮�涓嶈兘绮捐锛�";
+                            if (printTypeId == 15) {
+                                $("#SelSize").val(100)
+                            }
+                            else {
+                                $("#SelSize").val(90)
+                            }
+                        }
+                    }
+
+                    $("[name='works']").each(
+                        function () {
+                            var workVal = $(this).val();
+                            if (workVal == 5 || workVal == 3 || workVal == 32 || workVal == 18 || workVal == 2) {
+                                $(this).attr("checked", false);
+                                $("[name='LaFeng']").hide();
+                                $(this).attr("disabled", true);
+                            }
+                        }
+                    );
+                }
+
+                if (!isSuccess) {
+                    msg = msg.substring(0, msg.length - 1);
+                    alertMsg(msg);
+                }
+            }
+        );
+
+        $("[name='frontType']").change(
+            function () {
+                var value = $(this).val();
+                if (value == "鏃犲皝闈�") {
+                    $("#spPrintDemand").hide();
+                }
+                else {
+                    $("#spPrintDemand").show();
+                }
+            }
+        );
+
+        $(".validateIntSpc").blur(
+            function () {
+                var isSuccess = true;
+                var value = $(this).val();
+                var defalutValue = $(this).attr("defaultValue");
+                if (!reg2.test(value)) {
+                    isSuccess = false;
+                }
+                if (parseInt(value) < parseInt(defalutValue)) {
+                    isSuccess = false;
+                }
+                if (!isSuccess) {
+                    var msg = "鍗板埛鏁伴噺蹇呴』鏄ぇ浜庣瓑浜�" + defalutValue + "鐨勬鏁存暟";
+                    $(this).val(defalutValue);
+                    alertMsg(msg);
+                }
+            }
+        );
+
+        $("[id*='brand']").live("change",
+            function () {
+                var brandId = $(this).val();
+                var id = $(this).attr("id");
+                var index = id.substring(id.length - 1);
+                //                    alert(index);
+                var paperId = $("[id*='paper" + index + "'][id!=paperSize]").val();
+                if (paperId == 0) {
+                    return;
+                }
+                var printTypeId = $("#hidPrintTypeId").val();
+                $.ajax({
+                    url: '/Pages/front/InquiryOnLine.aspx?tmp' + (new Date()).valueOf(),
+                    type: "POST",
+                    async: false,
+                    data: "BrandSelect=true&PrinttypeId=" + printTypeId + "&PaperId=" + paperId + "&BrandId=" + brandId,
+                    success: function (dataStr) {
+                        var option = "";
+                        var gramWeights = dataStr;
+                        if (gramWeights.length != undefined) {
+                            var gramWeightArry = gramWeights.split('|');
+                            for (var i = 0; i < gramWeightArry.length; i++) {
+                                option += "<option value=\"" + gramWeightArry[i] + "\">" + gramWeightArry[i] + "</option>";
+                            }
+                            $("[id*='gramWeight" + index + "']").html("");
+                            $("[id*='gramWeight" + index + "']").html(option);
+                        }
+                    }
+                });
+            }
+        );
+
+
+
+        $(":radio[name='printMode']").click(
+            function () {
+                var printTypeId = $("#hidPrintTypeId").val();
+                if ($(this).val() == 0) {
+                    $("[class*='Brand']").show();
+                    $("[id*='brand']").show();
+                    if (printTypeId == "20") {
+                        $(".divShow").show();
+                    }
+                    if (printTypeId == "15") {
+                        $.ajax({
+                            url: '/Pages/front/InquiryOnLine.aspx?tmp' + (new Date()).valueOf(),
+                            type: "POST",
+                            async: false,
+                            data: "PaperInit=true&PrinttypeId=" + printTypeId,
+                            success: function (dataJsonStr) {
+                                var dataJson = eval('(' + dataJsonStr + ')');
+                                var paperInfo = dataJson.paperInfo;
+                                var sizeInfo = dataJson.sizeInfo;
+                                var option = "";
+                                for (var i = 0; i < sizeInfo.length; i++) {
+                                    option += "<option value=\"" + sizeInfo[i].sizeId + "\">" + sizeInfo[i].sizeName + "</option>";
+                                }
+                                option += "<option value=\"-1\">鑷畾涔夊昂瀵�</option>";
+                                $("#paperSize").html("");
+                                $("#paperSize").html(option);
+                            }
+                        });
+                        $(".pageNum").val("");
+                        $("#paperSize").val(100);
+                        $("#InsidePageDiv").show();
+                        $(".trHide").show();
+                        $(".insidePageAfterWork1").show();
+                        $("#InsideOpDiv").show();
+                        $(".singleOrdouble").show();
+                        $("#InsidePage2").hide();
+                        $("#InsidePage3").hide();
+                        $("#InsidePage4").hide();
+                        $("#InsidePage5").hide();
+                        $("#hidInsidePageNum").val("1");
+                        $("#InsidePageAdd").val("鍐呴〉2");
+                        $("[name*='printColor']").attr("disabled", false);
+                        $("#bindingMode").attr("disabled", false);
+                        $("[name*='pageNum']").attr("readonly", false);
+                    }
+                    if (printTypeId == "22") {
+                        $.ajax({
+                            url: '/Pages/front/InquiryOnLine.aspx?tmp' + (new Date()).valueOf(),
+                            type: "POST",
+                            async: false,
+                            data: "PaperInit=true&PrinttypeId=" + printTypeId,
+                            success: function (dataJsonStr) {
+                                var dataJson = eval('(' + dataJsonStr + ')');
+                                var paperInfo = dataJson.paperInfo;
+                                var sizeInfo = dataJson.sizeInfo;
+                                var option = "";
+                                for (var i = 0; i < paperInfo.length; i++) {
+                                    option += "<option value=\"" + paperInfo[i].paperId + "\">" + paperInfo[i].paperName + "</option>";
+                                }
+                                $("[id*='paper'][id!=paperSize]").html("");
+                                $("[id*='paper'][id!=paperSize]").html(option);
+                                option = "";
+                                for (var i = 0; i < sizeInfo.length; i++) {
+                                    option += "<option value=\"" + sizeInfo[i].sizeId + "\">" + sizeInfo[i].sizeName + "</option>";
+                                }
+                                $("#paperSize").html("");
+                                $("#paperSize").html(option);
+                            }
+                        });
+                        $("#printCount").attr("readonly", false);
+                        $("[id*='brand']").attr("disabled", false);
+                        $("[id*='paper'][id!=paperSize]").bind("change", OnPaperSelect);
+                        PaperSelect(0, $("#hidPrintTypeId").val(), 0);
+
+                    }
+                    else if (printTypeId == "27") {
+                        $(".fsByre").show();
+                        $.ajax({
+                            url: '/Pages/front/InquiryOnLine.aspx?tmp' + (new Date()).valueOf(),
+                            type: "POST",
+                            async: false,
+                            data: "PaperInit=true&PrinttypeId=" + printTypeId,
+                            success: function (dataJsonStr) {
+                                var dataJson = eval('(' + dataJsonStr + ')');
+                                var paperInfo = dataJson.paperInfo;
+                                var sizeInfo = dataJson.sizeInfo;
+                                var option = "";
+                                for (var i = 0; i < paperInfo.length; i++) {
+                                    option += "<option value=\"" + paperInfo[i].paperId + "\">" + paperInfo[i].paperName + "</option>";
+                                }
+                                $("[id*='paper'][id!=paperSize]").html("");
+                                $("[id*='paper'][id!=paperSize]").html(option);
+                                option = "";
+                                for (var i = 0; i < sizeInfo.length; i++) {
+                                    option += "<option value=\"" + sizeInfo[i].sizeId + "\">" + sizeInfo[i].sizeName + "</option>";
+                                }
+                                $("#paperSize").html("");
+                                $("#paperSize").html(option);
+                            }
+                        });
+                        $("#printCount").attr("readonly", false);
+                        $("[id*='brand']").attr("disabled", false);
+                        $("[id*='paper'][id!=paperSize]").bind("change", OnPaperSelect);
+                        PaperSelect($("[id*='paper'][id!=paperSize]").val(), $("#hidPrintTypeId").val(), 0);
+                    }
+                    else if (printTypeId == "26") {
+                        $.ajax({
+                            url: '/Pages/front/InquiryOnLine.aspx?tmp' + (new Date()).valueOf(),
+                            type: "POST",
+                            async: false,
+                            data: "PaperInit=true&PrinttypeId=" + printTypeId,
+                            success: function (dataJsonStr) {
+                                var dataJson = eval('(' + dataJsonStr + ')');
+                                var paperInfo = dataJson.paperInfo;
+                                var sizeInfo = dataJson.sizeInfo;
+                                var option = "";
+                                for (var i = 0; i < paperInfo.length; i++) {
+                                    option += "<option value=\"" + paperInfo[i].paperId + "\">" + paperInfo[i].paperName + "</option>";
+                                }
+                                $("[id*='paper'][id!=paperSize]").html("");
+                                $("[id*='paper'][id!=paperSize]").html(option);
+                            }
+                        });
+                        $("#printCount").attr("readonly", false);
+                        $("[id*='brand']").attr("disabled", false);
+                        PaperSelect(0, $("#hidPrintTypeId").val(), 0);
+                    } else if (printTypeId == "16") {
+                        $.ajax({
+                            url: '/Pages/front/InquiryOnLine.aspx?tmp' + (new Date()).valueOf(),
+                            type: "POST",
+                            async: false,
+                            data: "PaperInit=true&PrinttypeId=" + printTypeId,
+                            success: function (dataJsonStr) {
+                                var dataJson = eval('(' + dataJsonStr + ')');
+                                var paperInfo = dataJson.paperInfo;
+                                var sizeInfo = dataJson.sizeInfo;
+                                var option = "";
+                                for (var i = 0; i < paperInfo.length; i++) {
+                                    option += "<option value=\"" + paperInfo[i].paperId + "\">" + paperInfo[i].paperName + "</option>";
+                                }
+                                $("[id*='paper'][id!=paperSize]").html("");
+                                $("[id*='paper'][id!=paperSize]").html(option);
+                            }
+                        });
+                        $("#printCount").attr("readonly", false);
+                        $("[id*='brand']").attr("disabled", false);
+                        $("[id*='paper'][id!=paperSize]").bind("change", OnPaperSelect);
+                        PaperSelect(0, $("#hidPrintTypeId").val(), 0);
+                    }
+                    else if (printTypeId == "21") {
+                        $.ajax({
+                            url: '/Pages/front/InquiryOnLine.aspx?tmp' + (new Date()).valueOf(),
+                            type: "POST",
+                            async: false,
+                            data: "PaperInit=true&PrinttypeId=" + printTypeId,
+                            success: function (dataJsonStr) {
+                                var dataJson = eval('(' + dataJsonStr + ')');
+                                var paperInfo = dataJson.paperInfo;
+                                var sizeInfo = dataJson.sizeInfo;
+                                var option = "";
+                                for (var i = 0; i < paperInfo.length; i++) {
+                                    option += "<option value=\"" + paperInfo[i].paperId + "\">" + paperInfo[i].paperName + "</option>";
+                                }
+                                $("[id*='paper'][id!=paperSize]").html("");
+                                $("[id*='paper'][id!=paperSize]").html(option);
+                            }
+                        });
+                        $("#printCount").attr("readonly", false);
+                        $("[id*='brand']").attr("disabled", false);
+                        $("[name='printColor']").attr("disabled", false);
+                        $("#tbAfterWork").show();
+                        $("[id*='paper'][id!=paperSize]").bind("change", OnPaperSelect);
+                        PaperSelect(0, $("#hidPrintTypeId").val(), 0);
+                    }
+                    else {
+                        $("#printCount").attr("readonly", false);
+                        $("[id*='paper'][id!=paperSize]").attr("disabled", false);
+                        $("[id*='brand']").attr("disabled", false);
+                        $("[id*='paper'][id!=paperSize]").bind("change", OnPaperSelect);
+                        $("[id*='paper'][id!=paperSize]").each(
+                            function () {
+                                var id = $(this).attr("id");
+                                var index = id.substring(id.length - 1);
+                                PaperSelect($(this).val(), $("#hidPrintTypeId").val(), index);
+                            }
+                        );
+                    }
+                    OrderPageSizeContronl();
+                }
+                else {
+                    Init();
+                }
+                $("#printCount").val("500");
+                $("#divInquiryResult").hide();
+            }
+        );
+
+        $("#InsidePageAdd").click(
+            function () {
+                var hidValue = $("#hidInsidePageNum").val();
+                var maxValue = $("#hidInsidePageNum").attr("maxValue");
+                var minValue = $("#hidInsidePageNum").attr("minValue");
+                var newValue = parseInt(hidValue) + 1;
+                if (newValue > maxValue) {
+                    alertMsg("鍐呴〉鏂板涓嶈兘瓒呰繃5涓紒");
+                    return;
+                }
+                $("#InsidePage" + newValue + "").show();
+                $("#hidInsidePageNum").val(newValue);
+                if (newValue != maxValue) {
+                    var value = newValue + 1;
+                    $("#InsidePageAdd").val("鍐呴〉" + value);
+                }
+            }
+        );
+
+        $("#InsidePageDel").click(
+            function () {
+                var hidValue = $("#hidInsidePageNum").val();
+                var maxValue = $("#hidInsidePageNum").attr("maxValue");
+                var minValue = $("#hidInsidePageNum").attr("minValue");
+                var newValue = parseInt(hidValue) - 1;
+                if (newValue < minValue) {
+                    alertMsg("鍐呴〉涓嶈兘灏戜簬1锛�");
+                    return;
+                }
+                $("#InsidePage" + hidValue + "").hide();
+                $("[name='pageNum" + hidValue + "']").val("");
+                $("#hidInsidePageNum").val(newValue);
+                if (parseInt(hidValue) != minValue) {
+                    var value = parseInt(hidValue);
+                    $("#InsidePageAdd").val("鍐呴〉" + value);
+                }
+            }
+        );
+
+        $(".ClickControl").click(
+            function () {
+                var checked = $(this).attr("checked");
+                var id = $(this).attr("id");
+                if (!checked) {
+                    $(".ClickControl[id!='" + id + "']").attr("checked", false);
+                    $(".ClickControl[id!='" + id + "']").attr("disabled", false);
+                }
+                else {
+                    $(".ClickControl[id!='" + id + "']").attr("disabled", true);
+                }
+            }
+        );
+    }
+</script>
+</html>
+<div id='div_PrintParams' style='display: none;'>
+    <%--        <asp:Repeater ID='rptInquiryCommon' runat="server">
+            <ItemTemplate>
+                <table class="table2">
+                    <thead>
+                        <tr>
+                            <th colspan='4'>
+                                鍗板埛璇︽儏
+                            </th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td class='col_half'>
+                                鍗板埛鏁伴噺锛� <strong>
+                                    <%#Eval("PrintCountName")%></strong>
+                            </td>
+                            <td class='col_half'>
+                                鍗板埛鏂瑰紡锛� <strong>
+                                    <%#Eval("PrintModeName")%></strong>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan='2' align="left">
+                                鍗板埛瑕佹眰锛� <strong>
+                                    <%#Eval("PrintDemand")%></strong>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan='2' align="left">
+                                鍚庨亾宸ュ簭锛� <strong>
+                                    <%#Eval("AfterWorksDemand") %></strong>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class='col_half'>
+                                浜よ揣鏂瑰紡锛� <strong>
+                                    <%#Eval("DeliveryModeName")%></strong>
+                            </td>
+                            <td class='col_half'>
+                                绁�&#12288;&#12288;鎹細 <strong>
+                                    <%#Eval("BillModeName")%></strong>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan='2' align="left">
+                                澶�&#12288;&#12288;娉細 <strong>
+                                    <%#Eval("Remarks")%></strong>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </ItemTemplate>
+        </asp:Repeater>--%>
+</div>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/jisuanjine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/jisuanjine.aspx.cs
new file mode 100644
index 0000000..d22b5a8
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/jisuanjine.aspx.cs
@@ -0,0 +1,906 @@
+锘�/**  
+* jisuanjine.aspx.cs
+*
+* 鍔� 鑳斤細 璁㈠崟鍒楄〃
+* 绫� 鍚嶏細 jisuanjine
+*
+* Ver    鍙樻洿鏃ユ湡             璐熻矗浜�  鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01  2013-5-8 13:55       鍚村磶鍧�    鍒濈増
+* V0.02  2013-5-8 15:47       鍚村磶鍧�    瀹炵幇涓嬫媺鏁版嵁缁戝畾涓庢暟鎹骇鑱�
+* V0.03  2013-5-8 18:00       鍚村磶鍧�    鍒濇瀹屾垚鏂板绾夸笅璁㈠崟(鏈皟璇�)
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL.Sys;
+using CY.BLL;
+using CY.Model;
+using CY.Infrastructure.Common;
+using CY.WebForm.Pages.common;
+using CY.BLL.EC;
+using CY.Model.Inquiry;
+
+namespace CY.WebForm.Pages.business
+{
+    public partial class jisuanjine : MainPage
+    {
+        public int Orderid = 0;
+        public int printNum = 0;
+
+        /// <summary>
+        /// 椤甸潰鍔犺浇浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            try
+            {
+                switch (Request["Target"])
+                {
+                    case "getPrintAsk2":
+                        LoadPrintAsk2();
+                        break;
+                    case "getPrintAsk":
+                        LoadPrintAsk();
+                    break;
+                    case "GetCommunication":
+                        LoadCommunication();
+                        break;
+                    case "ReBindClients":
+                        Response.Write(ReLoadClients());
+                        break;
+                    case "ToUpSetData":
+                        Page_Load_Default();
+                        LoadOrderInfo();
+                        return;
+                    case "jisuanorderJine":
+                        UpdateorderJine2();
+                        break;
+                    default:
+                        Page_Load_Default();
+                        return;
+                }
+            }
+            catch (Exception ex)
+            {
+                PAGEHandleException(ex);
+                Response.Clear();
+                //Response.Write("-1");
+                Response.Write(ex.Message);
+            }
+            Response.End();
+        }
+
+        private void LoadOrderInfo()
+        {
+
+            if (IsPostBack || IsCallback)
+                return;
+            else
+                ;
+            EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+            Orderid = Request["orderId"].ToInt32() ?? 0;
+            string orderIdStr = Request["orderId"];
+            if (string.IsNullOrEmpty(orderIdStr) || "0".Equals(orderIdStr))
+                return;
+            else
+                ;
+            if (string.IsNullOrEmpty(orderIdStr))
+            {
+                JavaScript.MessageBox("鏈紶閫掑弬鏁帮紒", this);
+                return;
+            }
+            int? orderId = MyConvert.ConvertToInt32(orderIdStr);
+            if (!orderId.HasValue)
+            {
+                JavaScript.MessageBox("鏈紶閫掑弬鏁帮紒", this);
+                return;
+            }
+
+            EC_OrderBasic _eC_OrderBasic = _eC_OrderBasicBLL.SelectModelById(orderId.Value);
+            this.txtKeyid.Value = MyConvert.ConvertToString(_eC_OrderBasic.Keyid);
+            this.txtOrderId.Value = MyConvert.ConvertToString(_eC_OrderBasic.SellerOrderId);
+            this.txtCustormerName.Value = MyConvert.ConvertToString(_eC_OrderBasic.BuyerName);
+            this.txtCustormerName.Visible = true;
+            this.selCustormer.Value = MyConvert.ConvertToString(_eC_OrderBasic.BuyerId.ToString());
+            this.txtCompanyName.Value = MyConvert.ConvertToString(_eC_OrderBasic.BuyerName);
+            this.selPrintTypes.Value = _eC_OrderBasic.PrintTypeId.HasValue ? _eC_OrderBasic.PrintTypeId.Value.ToString() : "";
+            this.txtPrintTypes.Value = MyConvert.ConvertToString(_eC_OrderBasic.PrintType.PrintName);
+            this.txtDeliveryTime.Value = _eC_OrderBasic.DeliveryTime.HasValue? _eC_OrderBasic.DeliveryTime.Value.ToString(FixedInfo.DATEFORMAT):"";
+            this.txtDocumentName.Value = MyConvert.ConvertToString(_eC_OrderBasic.DocumentName);
+            this.hidOrderTypeId.Value = _eC_OrderBasic.OrderTypeId.ToString();
+            this.txtRemark.Value = _eC_OrderBasic.Remark.ToString2();
+            this.txtPrintPackDeliveryRequir.Value = _eC_OrderBasic.PrintPackDeliveryRequir.ToString2();
+
+            if (_eC_OrderBasic.UnitPrice.HasValue)
+            {
+                this.txtUnitPrice.Value = _eC_OrderBasic.UnitPrice.Value.ToString("0.0000");
+            }
+            if (_eC_OrderBasic.SumPrice.HasValue)
+            {
+                this.txtSumPrice.Value = _eC_OrderBasic.SumPrice.Value.ToString("0.00");
+            }
+            this.txtPhone.Value = MyConvert.ConvertToString(_eC_OrderBasic.OrderExtend.ContactPhone);
+            this.txtContact.Value = MyConvert.ConvertToString(_eC_OrderBasic.OrderExtend.Contacts);
+            this.selVerifyWay.Value = MyConvert.ConvertToString(_eC_OrderBasic.OrderExtend.ProofreadWay);
+            //spnSurplusPrintNum.InnerHtml = MyConvert.ConvertToString(_eC_OrderBasic.OrderExtend.SurplusPrintNum);
+
+            this.selCustormerLevel.Value = _eC_OrderBasic.OrderExtend.CustomerLevelId.HasValue ? MyConvert.ConvertToString(_eC_OrderBasic.OrderExtend.CustomerLevelId) : "";
+            this.selExigencyDegree.Value = MyConvert.ConvertToString(_eC_OrderBasic.OrderExtend.ExigencyCaseId);
+            this.selCustormerManagers.Value = MyConvert.ConvertToString(_eC_OrderBasic.OrderExtend.CustomerManagerId);
+            this.selBusinessManagers.Value = MyConvert.ConvertToString(_eC_OrderBasic.OrderExtend.BusinessManagerId);
+            this.txtBookNumber.Value = MyConvert.ConvertToString(_eC_OrderBasic.OrderExtend.BookNum);
+            this.txtBookPrice.Value = MyConvert.ConvertToString(_eC_OrderBasic.OrderExtend.BookPrice);
+            this.txtNumberPerBag.Value = MyConvert.ConvertToString(_eC_OrderBasic.OrderExtend.NumPerBag);
+            this.txtBagNum.Value = MyConvert.ConvertToString(_eC_OrderBasic.OrderExtend.BagNum);
+
+            //EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
+            //EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(orderId.Value);
+            //InquiryCommonModel _inquiryCommonModel = null;
+            //if (null != _eC_OrderPrintParameter)
+            //{
+            //    _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
+
+            //}
+            //else ;
+
+            //rptInquiryCommon.DataSource = new List<InquiryCommonModel>() { _inquiryCommonModel };
+            //rptInquiryCommon.DataBind();
+        }
+
+        /// <summary>
+        /// 榛樿鎵ц鏂规硶
+        /// </summary>
+        private void Page_Load_Default()
+        {
+
+            btnSave.ServerClick += new EventHandler(btnSave_ServerClick);
+            btnSaveask.ServerClick += new EventHandler(btnSaveask_ServerClick); 
+            if (!IsPostBack && !IsCallback)
+            {
+
+                Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+                SysInquiry_PrintingTypeBLL _sysInquiry_PrintingTypeBLL = new SysInquiry_PrintingTypeBLL();//鍗板埛涓氬姟绫诲瀷涓氬姟閫昏緫鎿嶄綔绫诲璞�
+                OA_CorporateClientsBLL _oA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+                EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+
+                this.txtCustormerName.Visible = false;//榛樿涓嶆樉绀�
+                this.txtOrderId.Value = _eC_OrderBasicBLL.LoadOrderIdBySellerId(CurrentUser.MemberId);//鍔犺浇璁㈠崟缂栧彿
+
+                IList<OA_CorporateClients> corporateClients = _oA_CorporateClientsBLL.SelectListByFirmId(CurrentUser.MemberId) as IList<OA_CorporateClients>;
+                if (null != corporateClients)
+                {
+                    corporateClients.Where(cc => CurrentUser.MemberId.Equals(cc.MemberId) && corporateClients.Remove(cc));
+                }
+                this.selCustormer.DataSource = corporateClients;
+                this.selCustormer.DataBind();
+                this.selCustormer.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+                //this.rptCustormer.DataSource = corporateClients;
+                //this.rptCustormer.DataBind();
+
+                this.selPrintTypes.DataSource = _sysInquiry_PrintingTypeBLL.SelectUsedModlesByFirm(CurrentUser.MemberId).OrderBy(x=>x.orderNumHome);
+                this.selPrintTypes.DataBind();
+                this.selPrintTypes.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+                this.selPrintTypes.Items.Add(new ListItem("鍏朵粬", "-1"));
+
+                this.selExigencyDegree.DataSource = _sys_DictionaryBLL.GetDataByType("OA_绱ф�ョ▼搴�");
+                this.selExigencyDegree.DataBind();
+                this.selExigencyDegree.Value = "0";
+
+                this.selVerifyWay.DataSource = _sys_DictionaryBLL.GetDataByType("EC_鏍$鏂瑰紡");
+                this.selVerifyWay.DataBind();
+                this.selVerifyWay.Value = "0";
+
+                this.selCustormerLevel.DataSource = _sys_DictionaryBLL.GetDataByType("瀹㈡埛閲嶈绋嬪害");
+                this.selCustormerLevel.DataBind();
+
+                OA_StaffBLL oA_StaffBLL = new BLL.OA_StaffBLL();
+
+                this.selBusinessManagers.DataSource = oA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, true, false);
+                this.selBusinessManagers.DataBind();
+                this.selBusinessManagers.Items.Insert(0, new ListItem("鏃�", "0"));
+
+                this.selCustormerManagers.DataSource = oA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, true);
+                this.selCustormerManagers.DataBind();
+                this.selCustormerManagers.Items.Insert(0, new ListItem("鏃�", "0"));
+
+                
+            }
+        }
+
+        /// <summary>
+        /// 淇濆瓨鐐瑰嚮浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void btnSave_ServerClick(object sender, EventArgs e)
+        {
+
+            if (SaveOrder())
+            {
+                //鎿嶄綔鎴愬姛
+                JavaScript.MessageBox("鎿嶄綔鎴愬姛", this, 1);
+            }
+            else
+            {
+                //鎿嶄綔澶辫触
+                JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+            }
+        }
+
+        /// <summary>
+        /// 淇濆瓨瑕佹眰鐐瑰嚮浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void btnSaveask_ServerClick(object sender, EventArgs e)
+        {
+            
+
+                if (SaveOrderAsk())
+            {
+                //鎿嶄綔鎴愬姛
+                JavaScript.MessageBox("鎿嶄綔鎴愬姛", this,1);
+            }
+            else
+            {
+                //鎿嶄綔澶辫触
+                JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+            }
+        }
+
+        
+
+        /// <summary>
+        /// 鍔犺浇瀹㈡埛鑱旂郴鏂瑰紡 
+        /// </summary>
+        private void LoadCommunication()
+        {
+            Response.Clear();
+            string id = Request["id"];
+            if (string.IsNullOrEmpty(id))
+            {
+                Response.Write("-2");
+                return;
+            }
+
+            OA_CorporateClientsBLL _oA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+            OA_CorporateClients m_OA_CorporateClients = _oA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, id.ToGuid2());
+            OA_CustomerCommunications _oA_CustomerCommunications = _oA_CorporateClientsBLL.GetModel_CustomerCommunications(m_OA_CorporateClients.Keyid);
+            _oA_CustomerCommunications.DegreeImportanId = m_OA_CorporateClients.DegreeImportanId;
+            _oA_CustomerCommunications.AccountManagerId = m_OA_CorporateClients.AccountManagerId;
+            _oA_CustomerCommunications.BusinessManagerId = m_OA_CorporateClients.BusinessManagerId;
+            _oA_CustomerCommunications.CompanyName = m_OA_CorporateClients.CompanyName;
+            Response.Write(null == _oA_CustomerCommunications ? "" : JsonHelper.GetJsonStringByObject(_oA_CustomerCommunications));
+        }
+
+        /// <summary>
+        /// 鍔犺浇鍗板埛鐗�
+        /// </summary>
+        private void LoadPrintAsk()
+        {
+            Response.Clear();
+            string id = Request["id"];
+            if (string.IsNullOrEmpty(id))
+            {
+                Response.Write("-2");
+                return;
+            }
+
+            OA_CorporateClientsBLL _oA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+            List<OA_CorporateClientsPrint> oA_CorporateClientsPrints = _oA_CorporateClientsBLL.SelectPrintListByCorId(id.ToGuid2()).ToList();
+            string sss = "[";// JsonHelper.GetJsonStringByObject(oA_CorporateClientsPrints);
+            if (oA_CorporateClientsPrints!=null&& oA_CorporateClientsPrints.Count > 0)
+            {
+                for(int i=0;i< oA_CorporateClientsPrints.Count; i++)
+                {
+                    sss += "{\"Keyid\":\""+ oA_CorporateClientsPrints [i].Keyid+ "\",";
+                    sss += "\"DocumentName\":\"" + oA_CorporateClientsPrints[i].DocumentName + "\"}";
+                    if(i != oA_CorporateClientsPrints.Count - 1)
+                    {
+                        sss += ",";
+                    }
+                }
+            }
+            sss += "]";
+
+            Response.Write(null == oA_CorporateClientsPrints ? "[]" : sss);
+        }
+
+
+
+        /// <summary>
+        /// 鍔犺浇鍗板埛鐗�
+        /// </summary>
+        private void LoadPrintAsk2()
+        {
+            Response.Clear();
+            string result = string.Empty;
+            int orderId = Request["OrderId"].ToString().ToInt32().Value;
+            OA_CorporateClientsBLL oA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+            OA_CorporateClientsPrint _CorporateClientsPrint = oA_CorporateClientsBLL.SelectPrintListByPrintId(orderId);
+
+            result = "";//JsonHelper.GetJsonStringByObject(_CorporateClientsPrint);
+            result += "{\"BusinessManagers\":\"" + _CorporateClientsPrint.BusinessManagers + "\",";
+            result += "\"ManagersMobile\":\"" + _CorporateClientsPrint.ManagersMobile + "\",";
+            result += "\"ManagersQQ\":\"" + _CorporateClientsPrint.ManagersQQ + "\",";
+            result += "\"Deliveryrequirements\":\"" + _CorporateClientsPrint.Deliveryrequirements + "\",";
+            result += "\"DocumentName\":\"" + _CorporateClientsPrint.DocumentName + "\",";
+            result += "\"UnitPrice\":" + _CorporateClientsPrint.UnitPrice + ",";
+            result += "\"SumPrice\":" + _CorporateClientsPrint.SumPrice + "";
+            result += "}";
+
+
+            Response.Write(result);
+            //Response.End();
+        }
+
+
+        /// <summary>
+        /// 鍔犺浇鍗板埛鐗�
+        /// </summary>
+        private void UpdateorderJine2()
+        {
+            Response.Clear();
+            string result = string.Empty;
+            int orderId = Request["OrderId"].ToString().ToInt32().Value;
+            EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+           var  sss = _eC_OrderBasicBLL.UpdateorderJine(orderId);
+
+            result = "";//JsonHelper.GetJsonStringByObject(_CorporateClientsPrint);
+            result += "{\"status\":" + sss + "";
+            result += "}";
+
+
+            Response.Write(result);
+            //Response.End();
+        }
+
+
+
+        /// <summary>
+        /// 淇濆瓨璁㈠崟
+        /// </summary>
+        private bool SaveOrder()
+        {
+            bool isWin = false;
+            EC_OrderBasicBLL bll_EC_OrderBasicBLL = new EC_OrderBasicBLL();
+            EC_OrderExtend eC_OrderExtend = new EC_OrderExtend();//璁㈠崟鎵╁睍淇℃伅
+            EC_OrderBasic eC_OrderBasic = new EC_OrderBasic();//璁㈠崟涓昏淇℃伅 
+            EC_OrderPrintParameter orderPrintParameter = null;
+            InquiryCommonModel _inquiryCommonModel = null;
+            eC_OrderExtend.Keyid = MyConvert.ConvertToInt32(txtKeyid.Value);
+            if (txtKeyid.Value == "0" || hidOrderTypeId.Value == "1")
+            {
+                eC_OrderBasic = bll_EC_OrderBasicBLL.SelectModelById(eC_OrderExtend.Keyid ?? 0);
+                if (eC_OrderBasic == null || eC_OrderBasic.Keyid == null)
+                {
+                    eC_OrderBasic = new EC_OrderBasic();
+                }
+
+                eC_OrderExtend.Remark = MyConvert.ConvertToString(Request["txtRemark"]).Trim();
+                eC_OrderExtend.PrintPackDeliveryRequir = MyConvert.ConvertToString(Request["txtPrintPackDeliveryRequir"]).Trim(); 
+                eC_OrderExtend.Operate = CurrentUser.ShortName;
+
+                eC_OrderExtend.ExigencyCaseId = MyConvert.ConvertToInt32(Request["selExigencyDegree"]);
+                eC_OrderExtend.ProofreadWayId = MyConvert.ConvertToInt32(Request["selVerifyWay"]);
+                eC_OrderExtend.BusinessManagerId = MyConvert.ConvertToInt32(Request["selBusinessManagers"]);
+                eC_OrderExtend.CustomerManagerId = MyConvert.ConvertToInt32(Request["selCustormerManagers"]);
+                eC_OrderExtend.CustomerLevelId = MyConvert.ConvertToInt32(Request["selCustormerLevel"]);
+                eC_OrderExtend.Contacts = MyConvert.ConvertToString(Request["txtContact"]).Trim();
+                eC_OrderExtend.ContactPhone = MyConvert.ConvertToString(Request["txtPhone"]).Trim();
+                eC_OrderExtend.printunit = MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
+
+                eC_OrderBasic.Remark = eC_OrderExtend.Remark;
+                eC_OrderBasic.DocumentName = MyConvert.ConvertToString(Request["txtDocumentName"]).Trim();
+                eC_OrderBasic.Operator = eC_OrderBasic.Creater = eC_OrderExtend.Operate;
+
+                if (Request["txtUnitPrice"] != null && !string.IsNullOrEmpty(Request["txtUnitPrice"]))
+                {
+                    eC_OrderBasic.UnitPrice = MyConvert.ConvertToDecimal(Request["txtUnitPrice"]);
+                }
+                eC_OrderBasic.SumPrice = MyConvert.ConvertToDecimal(Request["txtSumPrice"]);
+                //eC_OrderExtend.SurplusPrintNum = MyConvert.ConvertToInt32(txtSurplusPrintNum.Value);
+                if (Request["hidPrintTypeId"].ToString().ToInt32() == -1)
+                {
+                    _inquiryCommonModel = new InquiryCommonModel();
+                    _inquiryCommonModel.PrintTypeId = -1;
+                    _inquiryCommonModel.PrintCount = Request["printCount"].ToString().ToInt32().Value;
+                    _inquiryCommonModel.Unit = MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
+                    if (Request["txtPrintDemand"].ToString().IndexOf(Request["printSizeName"].ToString()) >= 0)
+                    {
+                        _inquiryCommonModel.PrintDemand = Request["txtPrintDemand"].ToString();
+                    }
+                    else
+                    {
+                        _inquiryCommonModel.PrintDemand = Request["printSizeName"].ToString() + "锛�" + Request["txtPrintDemand"].ToString();
+                    }
+                    
+                    _inquiryCommonModel.PrintSizeName = Request["printSizeName"].ToString();
+                }
+                else
+                {
+                    _inquiryCommonModel = CY.WebForm.Pages.front.InquiryOnLine.GetInquiryCommonModel();
+                }
+                if (null == _inquiryCommonModel)
+                    return false;
+                if (_inquiryCommonModel.PrintTypeId == 13)
+                {
+                    eC_OrderExtend.PrintNum = _inquiryCommonModel.PrintCount * _inquiryCommonModel.PrintBoxNumber;
+                    eC_OrderExtend.SurplusPrintNum = _inquiryCommonModel.PrintCount * _inquiryCommonModel.PrintBoxNumber;
+                }
+                else
+                {
+                    eC_OrderExtend.PrintNum = _inquiryCommonModel.PrintCount;
+                    eC_OrderExtend.SurplusPrintNum = _inquiryCommonModel.PrintCount;
+                }
+                
+                orderPrintParameter = new EC_OrderPrintParameter()//璁㈠崟鍗板埛鍙傛暟
+                {
+                    PrintParameter = SerializationHelper.Serialize(_inquiryCommonModel)
+                    ,
+                    OrderId = eC_OrderExtend.Keyid.HasValue ? eC_OrderExtend.Keyid.Value : 0
+                };
+            }
+
+            eC_OrderBasic.DocumentName = MyConvert.ConvertToString(Request["txtDocumentName"]);
+            eC_OrderBasic.DeliveryTime = MyConvert.ConvertToDateTime(Request["txtDeliveryTime"]);
+
+            ///鏄慨鏀规椂鍙繚瀛樻墿灞曚俊鎭�
+            if (eC_OrderExtend.Keyid.HasValue && 0 < eC_OrderExtend.Keyid.Value)
+            {
+                EC_OrderBLL orderBLL = new EC_OrderBLL();
+                //eC_OrderExtend.CustomerManagerId = 0;
+                //eC_OrderExtend.BusinessManagerId = 0;
+                if (!string.IsNullOrEmpty(hidOrderTypeId.Value))
+                {
+                    eC_OrderBasic.OrderTypeId = hidOrderTypeId.Value.ToString().ToInt32().Value;
+                }
+                EC_AcceptWayByOrderBLL _AcceptWayByOrderBLL = new EC_AcceptWayByOrderBLL();
+                EC_AcceptWayByOrder acceptWayByOrder = _AcceptWayByOrderBLL.GetModelByTargetId(eC_OrderExtend.Keyid.Value);
+                Sys_DictionaryBLL _bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
+                string ReceiptType = _bll_Sys_DictionaryBLL.GetModelByKeyid(Request["AcceptTypeId"].ToInt32());
+                acceptWayByOrder.AcceptTypeId = Request["AcceptTypeId"].ToInt32();
+                acceptWayByOrder.InvoiceDemand = Request["InvoiceId"].ToString2();
+                switch (ReceiptType)
+                {
+                    case "鑷彁":
+                        break;
+                    case "浠e彂璐ц繍":
+                        acceptWayByOrder.City = Request["City_OnBehalfOfCargo"].ToString2();
+                        acceptWayByOrder.Accepter = Request["Accepter_OnBehalfOfCargo"].ToString2();
+                        acceptWayByOrder.AccepterPhone = Request["AccepterPhone_OnBehalfOfCargo"].ToString2();
+                        break;
+                    case "閫佽揣涓婇棬":
+                        acceptWayByOrder.City = Request["City_HomeDelivery"].ToString2();
+                        acceptWayByOrder.Accepter = Request["Accepter_HomeDelivery"].ToString2();
+                        acceptWayByOrder.AccepterPhone = Request["AccepterPhone_HomeDelivery"].ToString2();
+                        acceptWayByOrder.AccepterAddress = Request["AccepterAddress_HomeDelivery"].ToString();
+                        break;
+                    case "鎸囧畾璐ц繍鍏徃":
+                        acceptWayByOrder.City = Request["City_OfficialFreightForwarder"].ToString2();
+                        acceptWayByOrder.Accepter = Request["Accepter_OfficialFreightForwarder"].ToString2();
+                        acceptWayByOrder.AccepterPhone = Request["AccepterPhone_OfficialFreightForwarder"].ToString2();
+                        acceptWayByOrder.AppointCourierCompany = Request["AppointCourierCompany"].ToString2();
+                        acceptWayByOrder.AccepterAddress = Request["AccepterAddress"].ToString2();
+                        acceptWayByOrder.AccepterPhoneNum = Request["AccepterPhoneNum"].ToString2();
+                        acceptWayByOrder.AcceptContacts = Request["AcceptContacts"].ToString2();
+                        acceptWayByOrder.FetchAddress = Request["FetchAddress"].ToString2();
+                        acceptWayByOrder.FetchPhoneNum = Request["FetchPhoneNum"].ToString2();
+                        acceptWayByOrder.FetchContacts = Request["FetchContacts"].ToString2();
+                        acceptWayByOrder.AppointCourierCompany = Request["AppointCourierCompany"].ToString2();
+                        break;
+                    default:
+                        break;
+                }
+                eC_OrderBasic.AcceptWayByOrder = acceptWayByOrder;
+                eC_OrderExtend.BookNum = MyConvert.ConvertToString(Request["txtBookNumber"]).Trim();
+                eC_OrderExtend.BookPrice = MyConvert.ConvertToString(Request["txtBookPrice"]).Trim();
+                eC_OrderExtend.NumPerBag = MyConvert.ConvertToString(Request["txtNumberPerBag"]).Trim();
+                eC_OrderExtend.BagNum = MyConvert.ConvertToString(Request["txtBagNum"]).Trim();
+                isWin = orderBLL.UpdateOrderInfo(eC_OrderBasic, eC_OrderExtend, orderPrintParameter);
+            }
+            else
+            {
+                eC_OrderBasic.PrintTypeId = MyConvert.ConvertToInt32(Request["selPrintTypes"]);
+                eC_OrderBasic.DocumentName = MyConvert.ConvertToString(Request["txtDocumentName"]);
+                eC_OrderBasic.DeliveryTime = MyConvert.ConvertToDateTime(Request["txtDeliveryTime"]);
+
+                OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+                OA_CorporateClients m_OA_CorporateClients = bll_OA_CorporateClientsBLL.GetModel(MyConvert.ConvertToGuid(Request["selCustormer"]));
+                if (m_OA_CorporateClients == null)
+                {
+                    eC_OrderBasic.BuyerId = MyConvert.ConvertToGuid(Request["selCustormer"]);
+                }
+                else
+                {
+                    eC_OrderBasic.BuyerId = m_OA_CorporateClients.MemberId;
+                }
+                eC_OrderBasic.BuyerName = MyConvert.ConvertToString(Request["txtCompanyName"]).Trim();
+                eC_OrderBasic.SellerId = CurrentUser.MemberId;
+                eC_OrderBasic.SellerName = CurrentUser.Name;
+
+                eC_OrderBasic.OrderTypeId = 1;//  璁剧疆璁㈠崟绫诲瀷涓烘柊澧炶鍗�(MeanValue涓�1鐨�"EC_璁㈠崟绫诲瀷"涓�"鏂板璁㈠崟")
+                eC_OrderBasic.PayState = 0;//鏀粯鐘舵�佷负鏈粯娆�
+
+
+
+                eC_OrderExtend.BookNum = MyConvert.ConvertToString(Request["txtBookNumber"]).Trim();
+                eC_OrderExtend.BookPrice = MyConvert.ConvertToString(Request["txtBookPrice"]).Trim();
+                eC_OrderExtend.NumPerBag = MyConvert.ConvertToString(Request["txtNumberPerBag"]).Trim();
+                eC_OrderExtend.BagNum = MyConvert.ConvertToString(Request["txtBagNum"]).Trim();
+                if (!eC_OrderBasic.Keyid.HasValue || 0 == eC_OrderBasic.Keyid.Value)
+                {
+                    isWin =  null != PayAbout.NewOrder(eC_OrderBasic, eC_OrderExtend, _inquiryCommonModel);
+                }
+                else
+                {
+                    isWin = false;
+                }
+            }
+
+
+           
+
+         
+            return isWin;
+        }
+
+        /// <summary>
+        /// 淇濆瓨璁㈠崟
+        /// </summary>
+        private bool SaveOrderAsk()
+        {
+            bool isWin = false;
+            EC_OrderBasicBLL bll_EC_OrderBasicBLL = new EC_OrderBasicBLL();
+            EC_OrderExtend eC_OrderExtend = new EC_OrderExtend();//璁㈠崟鎵╁睍淇℃伅
+            EC_OrderBasic eC_OrderBasic = new EC_OrderBasic();//璁㈠崟涓昏淇℃伅 
+            EC_OrderPrintParameter orderPrintParameter = null;
+            InquiryCommonModel _inquiryCommonModel = null;
+            eC_OrderExtend.Keyid = MyConvert.ConvertToInt32(txtKeyid.Value);
+            if (txtKeyid.Value == "0" || hidOrderTypeId.Value == "1")
+            {
+                eC_OrderBasic = bll_EC_OrderBasicBLL.SelectModelById(eC_OrderExtend.Keyid ?? 0);
+                if (eC_OrderBasic == null || eC_OrderBasic.Keyid == null)
+                {
+                    eC_OrderBasic = new EC_OrderBasic();
+                }
+
+                eC_OrderExtend.Remark = MyConvert.ConvertToString(Request["txtRemark"]).Trim();
+                eC_OrderExtend.PrintPackDeliveryRequir = MyConvert.ConvertToString(Request["txtPrintPackDeliveryRequir"]).Trim();
+                eC_OrderExtend.Operate = CurrentUser.ShortName;
+
+                eC_OrderExtend.ExigencyCaseId = MyConvert.ConvertToInt32(Request["selExigencyDegree"]);
+                eC_OrderExtend.ProofreadWayId = MyConvert.ConvertToInt32(Request["selVerifyWay"]);
+                eC_OrderExtend.BusinessManagerId = MyConvert.ConvertToInt32(Request["selBusinessManagers"]);
+                eC_OrderExtend.CustomerManagerId = MyConvert.ConvertToInt32(Request["selCustormerManagers"]);
+                eC_OrderExtend.CustomerLevelId = MyConvert.ConvertToInt32(Request["selCustormerLevel"]);
+                eC_OrderExtend.Contacts = MyConvert.ConvertToString(Request["txtContact"]).Trim();
+                eC_OrderExtend.ContactPhone = MyConvert.ConvertToString(Request["txtPhone"]).Trim();
+                eC_OrderExtend.printunit= MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
+
+                eC_OrderBasic.Remark = eC_OrderExtend.Remark;
+                eC_OrderBasic.DocumentName = MyConvert.ConvertToString(Request["txtDocumentName"]).Trim();
+                eC_OrderBasic.Operator = eC_OrderBasic.Creater = eC_OrderExtend.Operate;
+
+                if (Request["txtUnitPrice"] != null && !string.IsNullOrEmpty(Request["txtUnitPrice"]))
+                {
+                    eC_OrderBasic.UnitPrice = MyConvert.ConvertToDecimal(Request["txtUnitPrice"]);
+                }
+                eC_OrderBasic.SumPrice = MyConvert.ConvertToDecimal(Request["txtSumPrice"]);
+                //eC_OrderExtend.SurplusPrintNum = MyConvert.ConvertToInt32(txtSurplusPrintNum.Value);
+                if (Request["hidPrintTypeId"].ToString().ToInt32() == -1)
+                {
+                    _inquiryCommonModel = new InquiryCommonModel();
+                    _inquiryCommonModel.PrintTypeId = -1;
+                    _inquiryCommonModel.PrintCount = Request["printCount"].ToString().ToInt32().Value;
+                    _inquiryCommonModel.Unit = MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
+                    if (Request["txtPrintDemand"].ToString().IndexOf(Request["printSizeName"].ToString()) >= 0)
+                    {
+                        _inquiryCommonModel.PrintDemand = Request["txtPrintDemand"].ToString();
+                    }
+                    else
+                    {
+                        _inquiryCommonModel.PrintDemand = Request["printSizeName"].ToString() + "锛�" + Request["txtPrintDemand"].ToString();
+                    }
+                    _inquiryCommonModel.PrintSizeName = Request["printSizeName"].ToString();
+                }
+                else
+                {
+                    _inquiryCommonModel = CY.WebForm.Pages.front.InquiryOnLine.GetInquiryCommonModel();
+                }
+                if (null == _inquiryCommonModel)
+                    return false;
+                if (_inquiryCommonModel.PrintTypeId == 13)
+                {
+                    eC_OrderExtend.PrintNum = _inquiryCommonModel.PrintCount * _inquiryCommonModel.PrintBoxNumber;
+                    eC_OrderExtend.SurplusPrintNum = _inquiryCommonModel.PrintCount * _inquiryCommonModel.PrintBoxNumber;
+                }
+                else
+                {
+                    eC_OrderExtend.PrintNum = _inquiryCommonModel.PrintCount;
+                    eC_OrderExtend.SurplusPrintNum = _inquiryCommonModel.PrintCount;
+                }
+
+                orderPrintParameter = new EC_OrderPrintParameter()//璁㈠崟鍗板埛鍙傛暟
+                {
+                    PrintParameter = SerializationHelper.Serialize(_inquiryCommonModel)
+                    ,
+                    OrderId = eC_OrderExtend.Keyid.HasValue ? eC_OrderExtend.Keyid.Value : 0
+                };
+            }
+
+            eC_OrderBasic.DocumentName = MyConvert.ConvertToString(Request["txtDocumentName"]);
+            eC_OrderBasic.DeliveryTime = MyConvert.ConvertToDateTime(Request["txtDeliveryTime"]);
+
+            ///鏄慨鏀规椂鍙繚瀛樻墿灞曚俊鎭�
+            if (eC_OrderExtend.Keyid.HasValue && 0 < eC_OrderExtend.Keyid.Value)
+            {
+                EC_OrderBLL orderBLL = new EC_OrderBLL();
+                //eC_OrderExtend.CustomerManagerId = 0;
+                //eC_OrderExtend.BusinessManagerId = 0;
+                if (!string.IsNullOrEmpty(hidOrderTypeId.Value))
+                {
+                    eC_OrderBasic.OrderTypeId = hidOrderTypeId.Value.ToString().ToInt32().Value;
+                }
+                EC_AcceptWayByOrderBLL _AcceptWayByOrderBLL = new EC_AcceptWayByOrderBLL();
+                EC_AcceptWayByOrder acceptWayByOrder = _AcceptWayByOrderBLL.GetModelByTargetId(eC_OrderExtend.Keyid.Value);
+                Sys_DictionaryBLL _bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
+                string ReceiptType = _bll_Sys_DictionaryBLL.GetModelByKeyid(Request["AcceptTypeId"].ToInt32());
+                acceptWayByOrder.AcceptTypeId = Request["AcceptTypeId"].ToInt32();
+                acceptWayByOrder.InvoiceDemand = Request["InvoiceId"].ToString2();
+                switch (ReceiptType)
+                {
+                    case "鑷彁":
+                        break;
+                    case "浠e彂璐ц繍":
+                        acceptWayByOrder.City = Request["City_OnBehalfOfCargo"].ToString2();
+                        acceptWayByOrder.Accepter = Request["Accepter_OnBehalfOfCargo"].ToString2();
+                        acceptWayByOrder.AccepterPhone = Request["AccepterPhone_OnBehalfOfCargo"].ToString2();
+                        break;
+                    case "閫佽揣涓婇棬":
+                        acceptWayByOrder.City = Request["City_HomeDelivery"].ToString2();
+                        acceptWayByOrder.Accepter = Request["Accepter_HomeDelivery"].ToString2();
+                        acceptWayByOrder.AccepterPhone = Request["AccepterPhone_HomeDelivery"].ToString2();
+                        acceptWayByOrder.AccepterAddress = Request["AccepterAddress_HomeDelivery"].ToString();
+                        break;
+                    case "鎸囧畾璐ц繍鍏徃":
+                        acceptWayByOrder.City = Request["City_OfficialFreightForwarder"].ToString2();
+                        acceptWayByOrder.Accepter = Request["Accepter_OfficialFreightForwarder"].ToString2();
+                        acceptWayByOrder.AccepterPhone = Request["AccepterPhone_OfficialFreightForwarder"].ToString2();
+                        acceptWayByOrder.AppointCourierCompany = Request["AppointCourierCompany"].ToString2();
+                        acceptWayByOrder.AccepterAddress = Request["AccepterAddress"].ToString2();
+                        acceptWayByOrder.AccepterPhoneNum = Request["AccepterPhoneNum"].ToString2();
+                        acceptWayByOrder.AcceptContacts = Request["AcceptContacts"].ToString2();
+                        acceptWayByOrder.FetchAddress = Request["FetchAddress"].ToString2();
+                        acceptWayByOrder.FetchPhoneNum = Request["FetchPhoneNum"].ToString2();
+                        acceptWayByOrder.FetchContacts = Request["FetchContacts"].ToString2();
+                        acceptWayByOrder.AppointCourierCompany = Request["AppointCourierCompany"].ToString2();
+                        break;
+                    default:
+                        break;
+                }
+                eC_OrderBasic.AcceptWayByOrder = acceptWayByOrder;
+                eC_OrderExtend.BookNum = MyConvert.ConvertToString(Request["txtBookNumber"]).Trim();
+                eC_OrderExtend.BookPrice = MyConvert.ConvertToString(Request["txtBookPrice"]).Trim();
+                eC_OrderExtend.NumPerBag = MyConvert.ConvertToString(Request["txtNumberPerBag"]).Trim();
+                eC_OrderExtend.BagNum = MyConvert.ConvertToString(Request["txtBagNum"]).Trim();
+                isWin = orderBLL.UpdateOrderInfo(eC_OrderBasic, eC_OrderExtend, orderPrintParameter);
+            }
+            else
+            {
+                eC_OrderBasic.PrintTypeId = MyConvert.ConvertToInt32(Request["selPrintTypes"]);
+                eC_OrderBasic.DocumentName = MyConvert.ConvertToString(Request["txtDocumentName"]);
+                eC_OrderBasic.DeliveryTime = MyConvert.ConvertToDateTime(Request["txtDeliveryTime"]);
+
+                OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+                OA_CorporateClients m_OA_CorporateClients = bll_OA_CorporateClientsBLL.GetModel(MyConvert.ConvertToGuid(Request["selCustormer"]));
+                if (m_OA_CorporateClients == null)
+                {
+                    eC_OrderBasic.BuyerId = MyConvert.ConvertToGuid(Request["selCustormer"]);
+                }
+                else
+                {
+                    eC_OrderBasic.BuyerId = m_OA_CorporateClients.MemberId;
+                }
+                eC_OrderBasic.BuyerName = MyConvert.ConvertToString(Request["txtCompanyName"]).Trim();
+                eC_OrderBasic.SellerId = CurrentUser.MemberId;
+                eC_OrderBasic.SellerName = CurrentUser.Name;
+
+                eC_OrderBasic.OrderTypeId = 1;//  璁剧疆璁㈠崟绫诲瀷涓烘柊澧炶鍗�(MeanValue涓�1鐨�"EC_璁㈠崟绫诲瀷"涓�"鏂板璁㈠崟")
+                eC_OrderBasic.PayState = 0;//鏀粯鐘舵�佷负鏈粯娆�
+
+
+
+                eC_OrderExtend.BookNum = MyConvert.ConvertToString(Request["txtBookNumber"]).Trim();
+                eC_OrderExtend.BookPrice = MyConvert.ConvertToString(Request["txtBookPrice"]).Trim();
+                eC_OrderExtend.NumPerBag = MyConvert.ConvertToString(Request["txtNumberPerBag"]).Trim();
+                eC_OrderExtend.BagNum = MyConvert.ConvertToString(Request["txtBagNum"]).Trim();
+                if (!eC_OrderBasic.Keyid.HasValue || 0 == eC_OrderBasic.Keyid.Value)
+                {
+                    isWin = null != PayAbout.NewOrder(eC_OrderBasic, eC_OrderExtend, _inquiryCommonModel);
+                }
+                else
+                {
+                    isWin = false;
+                }
+            }
+
+
+
+
+            //add by zyyao 璁㈠崟涓轰功鍒婄殑鏃跺�欙紝淇濆瓨瀹㈡埛鐨勫嵃鍒疯姹�
+
+            OA_CorporateClientsBLL _oA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+                List<OA_CorporateClientsPrint> oA_CorporateClientsPrints = _oA_CorporateClientsBLL.SelectPrintListByCorId(eC_OrderBasic.BuyerId).Where(x => x.DocumentName == eC_OrderBasic.DocumentName).ToList(); ;
+                OA_CorporateClientsPrint a_CorporateClientsPrint = null;
+                if (oA_CorporateClientsPrints != null && oA_CorporateClientsPrints.Count > 0)
+                {
+
+                    a_CorporateClientsPrint = oA_CorporateClientsPrints[0];
+                    a_CorporateClientsPrint.CorporateClientsid = eC_OrderBasic.BuyerId;
+                    a_CorporateClientsPrint.BusinessManagers = eC_OrderExtend.Contacts;
+                    a_CorporateClientsPrint.ManagersMobile = eC_OrderExtend.ContactPhone;
+                    a_CorporateClientsPrint.ManagersQQ = MyConvert.ConvertToString(Request["txtQQ"]).Trim();
+                    //a_CorporateClientsPrint.Xinge = "";
+                    a_CorporateClientsPrint.DocumentName = eC_OrderBasic.DocumentName;
+                    a_CorporateClientsPrint.UnitPrice = eC_OrderBasic.UnitPrice.HasValue ? eC_OrderBasic.UnitPrice.Value : 0;
+                    a_CorporateClientsPrint.SumPrice = eC_OrderBasic.SumPrice.HasValue ? eC_OrderBasic.SumPrice.Value : 0;
+                    a_CorporateClientsPrint.Deliveryrequirements = eC_OrderExtend.PrintPackDeliveryRequir;
+                    a_CorporateClientsPrint.Updater = CurrentUser.TrueMemberId;
+                    a_CorporateClientsPrint.LastUpdateTime = DateTime.Now;
+                    isWin = _oA_CorporateClientsBLL.UpdateModelPrint(a_CorporateClientsPrint);
+                }
+                else
+                {
+                    a_CorporateClientsPrint = new OA_CorporateClientsPrint();//璁㈠崟鎵╁睍淇℃伅
+                    a_CorporateClientsPrint.CorporateClientsid = eC_OrderBasic.BuyerId;
+                    a_CorporateClientsPrint.BusinessManagers = eC_OrderExtend.Contacts;
+                    a_CorporateClientsPrint.ManagersMobile = eC_OrderExtend.ContactPhone;
+                    a_CorporateClientsPrint.ManagersQQ = MyConvert.ConvertToString(Request["txtQQ"]).Trim();
+                    a_CorporateClientsPrint.Xinge = "";
+                    a_CorporateClientsPrint.DocumentName = eC_OrderBasic.DocumentName;
+                    a_CorporateClientsPrint.UnitPrice = eC_OrderBasic.UnitPrice.HasValue ? eC_OrderBasic.UnitPrice.Value : 0;
+                    a_CorporateClientsPrint.SumPrice = eC_OrderBasic.SumPrice.HasValue ? eC_OrderBasic.SumPrice.Value : 0;
+                    a_CorporateClientsPrint.Deliveryrequirements = eC_OrderExtend.PrintPackDeliveryRequir;
+                    a_CorporateClientsPrint.Creater = CurrentUser.TrueMemberId;
+                    a_CorporateClientsPrint.CreateTime = DateTime.Now;
+                    a_CorporateClientsPrint.Updater = CurrentUser.TrueMemberId;
+                    a_CorporateClientsPrint.LastUpdateTime = DateTime.Now;
+                    isWin = _oA_CorporateClientsBLL.InsertModelPrint(a_CorporateClientsPrint);
+                }
+
+                OA_CorporateClientsParameter a_CorporateClientsParameter = null;
+
+                a_CorporateClientsParameter = _oA_CorporateClientsBLL.GetModelParameter(a_CorporateClientsPrint.Keyid);
+                if (string.IsNullOrEmpty(a_CorporateClientsParameter.PrintParameter))
+                {
+                    a_CorporateClientsParameter = new OA_CorporateClientsParameter()//璁㈠崟鍗板埛鍙傛暟
+                    {
+                        PrintParameter = SerializationHelper.Serialize(_inquiryCommonModel)
+                   ,
+                        TargetId = a_CorporateClientsPrint.Keyid
+                    };
+
+                    _oA_CorporateClientsBLL.InsertModelParameter(a_CorporateClientsParameter);
+                }
+                else
+                {
+                    a_CorporateClientsParameter = new OA_CorporateClientsParameter()//璁㈠崟鍗板埛鍙傛暟
+                    {
+                        PrintParameter = SerializationHelper.Serialize(_inquiryCommonModel)
+                 ,
+                        TargetId = a_CorporateClientsPrint.Keyid
+                    };
+
+                    _oA_CorporateClientsBLL.UpdateModelParameter(a_CorporateClientsParameter);
+                }
+ 
+            return isWin;
+        }
+
+        /// <summary>
+        /// 鑾峰彇璁㈠崟鏀惰揣鏂瑰紡
+        /// </summary>
+        /// <param name="writeTarget"></param>
+        /// <returns></returns>
+        internal static CY.Infrastructure.Domain.IAggregateRoot GetAcceptWay(CY.Infrastructure.Domain.IAggregateRoot writeTarget)
+        {
+            if (null == writeTarget)
+                return writeTarget;
+            HttpRequest Request = HttpContext.Current.Request;
+
+            string receiptType = (new Sys_DictionaryBLL()).GetModelByKeyid(Request["AcceptTypeId"].ToInt32());
+            if (string.IsNullOrEmpty(receiptType))
+                return writeTarget;
+            string theAwb = Request["txtTheAwb"];
+            writeTarget.Visiter("TheAwb", -1, true, string.IsNullOrEmpty(theAwb) ? "" : theAwb);
+            writeTarget.Visiter("AcceptTypeId", -1, true, Request["AcceptTypeId"].ToInt32());
+            writeTarget.Visiter("InvoiceDemand", -1, true, Request["InvoiceId"].ToString2());
+            writeTarget.Visiter("Remark", -1, true, Request["Remark"].ToString2());
+            writeTarget.Visiter("LastUpdateTime", -1, true, DateTime.Now);
+            writeTarget.Visiter("City", -1, true, "");
+            writeTarget.Visiter("Accepter", -1, true, "");
+            writeTarget.Visiter("AccepterPhone", -1, true, "");
+
+            writeTarget.Visiter("AppointCourierCompany", -1, true, "");
+            writeTarget.Visiter("AccepterAddress", -1, true, Request["AccepterAddress_HomeDelivery"].ToString2());
+            writeTarget.Visiter("AccepterPhoneNum", -1, true, "");
+            writeTarget.Visiter("AcceptContacts", -1, true, "");
+            writeTarget.Visiter("FetchAddress", -1, true, "");
+            writeTarget.Visiter("FetchPhoneNum", -1, true, "");
+            writeTarget.Visiter("FetchContacts", -1, true, "");
+            writeTarget.Visiter("AppointCourierCompany", -1, true, "");
+
+            writeTarget.Visiter("AppointCourierCompany", -1, true, Request["AppointCourierCompany"].ToString2());
+            writeTarget.Visiter("AccepterPhoneNum", -1, true, Request["AccepterPhoneNum"].ToString2());
+            writeTarget.Visiter("AcceptContacts", -1, true, Request["AcceptContacts"].ToString2());
+            writeTarget.Visiter("FetchAddress", -1, true, Request["FetchAddress"].ToString2());
+            writeTarget.Visiter("FetchPhoneNum", -1, true, Request["FetchPhoneNum"].ToString2());
+            writeTarget.Visiter("FetchContacts", -1, true, Request["FetchContacts"].ToString2());
+            writeTarget.Visiter("AppointCourierCompany", -1, true, Request["AppointCourierCompany"].ToString2());
+
+            switch (receiptType)
+            {
+                case "鑷彁":
+                case "浠e彂璐ц繍":
+                    writeTarget.Visiter("City", -1, true, Request["City_OnBehalfOfCargo"].ToString2());
+                    writeTarget.Visiter("Accepter", -1, true, Request["Accepter_OnBehalfOfCargo"].ToString2());
+                    writeTarget.Visiter("AccepterPhone", -1, true, Request["AccepterPhone_OnBehalfOfCargo"].ToString2());
+                    break;
+                case "閫佽揣涓婇棬":
+                    writeTarget.Visiter("City", -1, true, Request["City_HomeDelivery"].ToString2());
+                    writeTarget.Visiter("Accepter", -1, true, Request["Accepter_HomeDelivery"].ToString2());
+                    writeTarget.Visiter("AccepterPhone", -1, true, Request["AccepterPhone_HomeDelivery"].ToString2());
+                    break;
+                case "鎸囧畾璐ц繍鍏徃":
+                    writeTarget.Visiter("City", -1, true, Request["City_OfficialFreightForwarder"].ToString2());
+                    writeTarget.Visiter("Accepter", -1, true, Request["Accepter_OfficialFreightForwarder"].ToString2());
+                    writeTarget.Visiter("AccepterPhone", -1, true, Request["AccepterPhone_OfficialFreightForwarder"].ToString2());
+                    writeTarget.Visiter("AccepterAddress", -1, true, Request["AccepterAddress"].ToString2());
+                    break;
+                default:
+                    break;
+            }
+            return writeTarget;
+        }
+
+        /// <summary>
+        /// 閲嶆柊鍔犺浇瀹㈡埛鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        private string ReLoadClients()
+        {
+            try
+            {
+                string res = "<option value=''>璇烽�夋嫨</option>";
+                OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+                IList<OA_CorporateClients> m_OA_CorporateClientsList = bll_OA_CorporateClientsBLL.SelectListByFirmId(CurrentUser.MemberId) as IList<OA_CorporateClients>;
+                if (null != m_OA_CorporateClientsList)
+                {
+                    m_OA_CorporateClientsList.Where(cc => CurrentUser.MemberId.Equals(cc.MemberId) && m_OA_CorporateClientsList.Remove(cc));
+                    if (m_OA_CorporateClientsList.Count > 0)
+                    {
+                        foreach (var m_OA_CorporateClients in m_OA_CorporateClientsList)
+                        {
+                            res = res + ("<option value='" + m_OA_CorporateClients.MemberId + "'>" + m_OA_CorporateClients.CompanyName + "</option>");
+                        }
+                    }
+                }
+                return res;
+            }
+            catch (Exception ex)
+            {
+                PAGEHandleException(ex);
+                return "";
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/jisuanjine.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/jisuanjine.aspx.designer.cs
new file mode 100644
index 0000000..515cbe0
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/jisuanjine.aspx.designer.cs
@@ -0,0 +1,323 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+    public partial class jisuanjine
+    {
+
+        /// <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>
+        /// hidOrderTypeId 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden hidOrderTypeId;
+
+        /// <summary>
+        /// txtCustormer 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtCustormer;
+
+        /// <summary>
+        /// txtCustormerName 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtCustormerName;
+
+        /// <summary>
+        /// selCustormer 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selCustormer;
+
+        /// <summary>
+        /// txtCompanyName 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtCompanyName;
+
+        /// <summary>
+        /// selCustormerLevel 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selCustormerLevel;
+
+        /// <summary>
+        /// txtPrintTypes 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtPrintTypes;
+
+        /// <summary>
+        /// selPrintTypes 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selPrintTypes;
+
+        /// <summary>
+        /// txtOrderId 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtOrderId;
+
+        /// <summary>
+        /// selExigencyDegree 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selExigencyDegree;
+
+        /// <summary>
+        /// txtDeliveryTime 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtDeliveryTime;
+
+        /// <summary>
+        /// selprintask 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selprintask;
+
+        /// <summary>
+        /// txtDocumentName 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtDocumentName;
+
+        /// <summary>
+        /// txtUnitPrice 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtUnitPrice;
+
+        /// <summary>
+        /// txtSumPrice 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtSumPrice;
+
+        /// <summary>
+        /// selVerifyWay 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selVerifyWay;
+
+        /// <summary>
+        /// selBusinessManagers 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selBusinessManagers;
+
+        /// <summary>
+        /// selCustormerManagers 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selCustormerManagers;
+
+        /// <summary>
+        /// txtContact 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtContact;
+
+        /// <summary>
+        /// txtPhone 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtPhone;
+
+        /// <summary>
+        /// txtQQ 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtQQ;
+
+        /// <summary>
+        /// txtBookNumber 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtBookNumber;
+
+        /// <summary>
+        /// txtBookPrice 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtBookPrice;
+
+        /// <summary>
+        /// txtNumberPerBag 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtNumberPerBag;
+
+        /// <summary>
+        /// txtBagNum 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtBagNum;
+
+        /// <summary>
+        /// txtPrintPackDeliveryRequir 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtPrintPackDeliveryRequir;
+
+        /// <summary>
+        /// txtRemark 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtRemark;
+
+        /// <summary>
+        /// txtKeyid 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtKeyid;
+
+        /// <summary>
+        /// txtBillMode 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtBillMode;
+
+        /// <summary>
+        /// btnSaveask 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputButton btnSaveask;
+
+        /// <summary>
+        /// btnSave 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputButton btnSave;
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index c089c20..6f6b797 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -693,6 +693,25 @@
                             printDemand += "锛屽崟浠凤細" + inquiryWorkBookModel.WorkBookPrice + "";
                         }
 
+                        if (request["hidefengmiana" + (i + 1)] != null)
+                        {
+                            inquiryWorkBookModel.fengmian = request["hidefengmiana" + (i + 1)].ToString();
+
+                        }
+                        else
+                        {
+                            inquiryWorkBookModel.fengmian = "";
+                        }
+
+                        if (request["hideneiyea" + (i + 1)] != null)
+                        {
+                            inquiryWorkBookModel.neiye = request["hideneiyea" + (i + 1)].ToString();
+                        }
+                        else
+                        {
+                            inquiryWorkBookModel.neiye = "";
+                        }
+
                         if (request["WorkBookMoneya" + (i + 1)] != null)
                         {
                             inquiryWorkBookModel.WorkBookMoney = request["WorkBookMoneya" + (i + 1)].ToString();
@@ -701,10 +720,21 @@
                         if (request["WorkBookFengMiana" + (i + 1)] != null)
                         {
                             inquiryWorkBookModel.WorkBookFengMian = request["WorkBookFengMiana" + (i + 1)].ToString();
-                            var WorkBookFengMian = fengmianzhizhang.FirstOrDefault(x => x.MeanValue == int.Parse(inquiryWorkBookModel.WorkBookFengMian));
-                            if (WorkBookFengMian != null)
+                            if (inquiryWorkBookModel.WorkBookFengMian == "-1")
                             {
-                                inquiryWorkBookModel.WorkBookFengMianTxt = WorkBookFengMian.Name;
+                                if (request["ZiWorkBookFengMiana" + (i + 1)] != null )
+                                {
+                                    inquiryWorkBookModel.WorkBookFengMianTxt = request["ZiWorkBookFengMiana" + (i + 1)].ToString();
+                                    inquiryWorkBookModel.ZiWorkBookFengMian = request["ZiWorkBookFengMiana" + (i + 1)].ToString();
+                                }
+                            }
+                            else
+                            {
+                                var WorkBookFengMian = fengmianzhizhang.FirstOrDefault(x => x.MeanValue == int.Parse(inquiryWorkBookModel.WorkBookFengMian));
+                                if (WorkBookFengMian != null)
+                                {
+                                    inquiryWorkBookModel.WorkBookFengMianTxt = WorkBookFengMian.Name;
+                                }
                             }
                             printDemand += "锛屽皝闈㈢焊寮狅細" + inquiryWorkBookModel.WorkBookFengMianTxt + "";
                         }
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx
index 0fdb6f7..651a121 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx
@@ -241,7 +241,7 @@
             </td>
             <td align="center">
                 <div class="xialap">
-                    <input type="text"  id="" name="pageNum1" readonly="readonly"  style="height: 15px; line-height: 15px; width:80px;" class="pageNum" defaultValue="4" value="4" />
+                    <input type="text"  id="" name="pageNum1" readonly="readonly"  style="height: 15px; line-height: 15px; width:80px;" class="validateInt"  defaultValue="4" value="4" />
                     <div class="xialapb">
                         <div class="xialapr">4</div>
                         <div class="xialapr">8</div>
@@ -347,7 +347,7 @@
             </td>
             <td align="center">
                 <div class="xialap">
-                    <input type="text"  id="" name="pageNum2" readonly="readonly"  style="height: 15px; line-height: 15px; width:80px;" class="pageNum" defaultValue="4" value="4" />
+                    <input type="text"  id="" name="pageNum2" readonly="readonly"  style="height: 15px; line-height: 15px; width:80px;" class="validateInt"  defaultValue="4" value="4" />
                     <div class="xialapb">
                         <div class="xialapr">4</div>
                         <div class="xialapr">8</div>
@@ -450,7 +450,7 @@
             </td>
             <td align="center">
                 <div class="xialap">
-                    <input type="text"  id="Text3" name="pageNum3" readonly="readonly"  style="height: 15px; line-height: 15px; width:80px;" class="pageNum" defaultValue="4" value="4" />
+                    <input type="text"  id="" name="pageNum3" readonly="readonly"  style="height: 15px; line-height: 15px; width:80px;"  class="validateInt"  defaultValue="4" value="4" />
                     <div class="xialapb">
                         <div class="xialapr">4</div>
                         <div class="xialapr">8</div>
@@ -554,7 +554,7 @@
             </td>
             <td align="center">
                 <div class="xialap">
-                    <input type="text"  id="Text3" name="pageNum4" readonly="readonly"  style="height: 15px; line-height: 15px; width:80px;" class="pageNum" defaultValue="4" value="4"/>
+                    <input type="text"  id="" name="pageNum4" readonly="readonly"  style="height: 15px; line-height: 15px; width:80px;" class="validateInt"  defaultValue="4" value="4"/>
                     <div class="xialapb">
                         <div class="xialapr">4</div>
                         <div class="xialapr">8</div>
@@ -658,7 +658,7 @@
             </td>
             <td align="center">
                 <div class="xialap">
-                    <input type="text"  id="Text3" name="pageNum5" readonly="readonly"  style="height: 15px; line-height: 15px; width:80px;" class="validateInt pageNum" />
+                    <input type="text"  id="" name="pageNum5" readonly="readonly"  style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
                         <div class="xialapr">4</div>
                         <div class="xialapr">8</div>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/WorkBook.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/WorkBook.aspx
index 774e3cd..a8f2e11 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/WorkBook.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/WorkBook.aspx
@@ -110,8 +110,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana1" name="WorkBookFengMiana1" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana1" name="WorkBookFengMiana1" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a1')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana1">
+                    <input id="ZiWorkBookFengMiana1" name="ZiWorkBookFengMiana1" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -133,19 +136,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma1" name="WorkBookpageNuma1" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
                         <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+        <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana1" target="view_window">
+                                <img  id="fengmiana1" name="fengmiana1"   width="25" height="20" />
+                            </a> <input type="hidden" id="hidefengmiana1" name="hidefengmiana1"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana1')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea1" target="view_window">
+                                <img  id="neiyea1" name="neiyea1"   width="25" height="20" />
+                            </a> <input type="hidden" id="hideneiyea1" name="hideneiyea1"  /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea1')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -203,8 +218,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana2" name="WorkBookFengMiana2" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana2" name="WorkBookFengMiana2" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a2')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana2">
+                    <input id="ZiWorkBookFengMiana2" name="ZiWorkBookFengMiana2" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -226,19 +244,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma2" name="WorkBookpageNuma2" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
                         <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
-
+           
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana2" target="view_window">
+                                <img  id="fengmiana2" name="fengmiana2"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana2" name="hidefengmiana2"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana2')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea2" target="view_window">
+                                <img  id="neiyea2" name="neiyea2"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea2" name="hideneiyea2"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea2')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -296,8 +326,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana3" name="WorkBookFengMiana3" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana3" name="WorkBookFengMiana3" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a3')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana3">
+                    <input id="ZiWorkBookFengMiana3" name="ZiWorkBookFengMiana3" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -319,19 +352,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma3" name="WorkBookpageNuma3" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
-                        <div class="xialapr">32</div>
+                       <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana3" target="view_window">
+                                <img  id="fengmiana3" name="fengmiana3"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana3" name="hidefengmiana3"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana3')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea3" target="view_window">
+                                <img  id="neiyea3" name="neiyea3"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea3" name="hideneiyea3"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea3')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -388,8 +433,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana4" name="WorkBookFengMiana4" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana4" name="WorkBookFengMiana4" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a4')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana4">
+                    <input id="ZiWorkBookFengMiana4" name="ZiWorkBookFengMiana4" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -411,19 +459,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma4" name="WorkBookpageNuma4" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
-                        <div class="xialapr">32</div>
+                      <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana4" target="view_window">
+                                <img  id="fengmiana4" name="fengmiana4"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana4" name="hidefengmiana4"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana4')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea4" target="view_window">
+                                <img  id="neiyea4" name="neiyea4"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea4" name="hideneiyea4"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea4')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -480,8 +540,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana5" name="WorkBookFengMiana5" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana5" name="WorkBookFengMiana5" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a5')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana5">
+                    <input id="ZiWorkBookFengMiana5" name="ZiWorkBookFengMiana5" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -503,19 +566,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma5" name="WorkBookpageNuma5" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
-                        <div class="xialapr">32</div>
+                         <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana5" target="view_window">
+                                <img  id="fengmiana5" name="fengmiana5"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana5" name="hidefengmiana5"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana5')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea5" target="view_window">
+                                <img  id="neiyea5" name="neiyea5"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea5" name="hideneiyea5"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea5')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -572,8 +647,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana6" name="WorkBookFengMiana6" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana6" name="WorkBookFengMiana6" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a6')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana6">
+                    <input id="ZiWorkBookFengMiana6" name="ZiWorkBookFengMiana6" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -595,19 +673,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma6" name="WorkBookpageNuma6" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
-                        <div class="xialapr">32</div>
+                         <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana6" target="view_window">
+                                <img  id="fengmiana6" name="fengmiana6"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana6" name="hidefengmiana6"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana6')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea6" target="view_window">
+                                <img  id="neiyea6" name="neiyea6"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea6" name="hideneiyea6"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea6')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -664,8 +754,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana7" name="WorkBookFengMiana7" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana7" name="WorkBookFengMiana7" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a7')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana7">
+                    <input id="ZiWorkBookFengMiana7" name="ZiWorkBookFengMiana7" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -687,19 +780,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma7" name="WorkBookpageNuma7" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
-                        <div class="xialapr">32</div>
+                         <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana7" target="view_window">
+                                <img  id="fengmiana7" name="fengmiana7"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana7" name="hidefengmiana7"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana7')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea7" target="view_window">
+                                <img  id="neiyea7" name="neiyea7"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea7" name="hideneiyea7"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea7')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -756,8 +861,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana8" name="WorkBookFengMiana8" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana8" name="WorkBookFengMiana8" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a8')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana8">
+                    <input id="ZiWorkBookFengMiana8" name="ZiWorkBookFengMiana8" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -779,19 +887,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma8" name="WorkBookpageNuma8" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
                         <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana8" target="view_window">
+                                <img  id="fengmiana8" name="fengmiana8"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana8" name="hidefengmiana8"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana8')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea8" target="view_window">
+                                <img  id="neiyea8" name="neiyea8"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea8" name="hideneiyea8"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea8')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -848,8 +968,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana9" name="WorkBookFengMiana9" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana9" name="WorkBookFengMiana9" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a9')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana9">
+                    <input id="ZiWorkBookFengMiana9" name="ZiWorkBookFengMiana9" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -871,19 +994,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma9" name="WorkBookpageNuma9" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
-                        <div class="xialapr">32</div>
+                         <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana9" target="view_window">
+                                <img  id="fengmiana9" name="fengmiana9"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana9" name="hidefengmiana9"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana9')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea9" target="view_window">
+                                <img  id="neiyea9" name="neiyea9"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea9" name="hideneiyea9"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea9')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -940,8 +1075,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana10" name="WorkBookFengMiana10" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana10" name="WorkBookFengMiana10" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a10')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana10">
+                    <input id="ZiWorkBookFengMiana10" name="ZiWorkBookFengMiana10" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -963,19 +1101,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma10" name="WorkBookpageNuma10" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
                         <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana10" target="view_window">
+                                <img  id="fengmiana10" name="fengmiana10"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana10" name="hidefengmiana10"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana10')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea10" target="view_window">
+                                <img  id="neiyea10" name="neiyea10"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea10" name="hideneiyea10"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea10')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -1032,8 +1182,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana11" name="WorkBookFengMiana11" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana11" name="WorkBookFengMiana11" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a11')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana11">
+                    <input id="ZiWorkBookFengMiana11" name="ZiWorkBookFengMiana11" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -1055,19 +1208,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma11" name="WorkBookpageNuma11" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
                         <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana11" target="view_window">
+                                <img  id="fengmiana11" name="fengmiana11"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana11" name="hidefengmiana11"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana11')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea11" target="view_window">
+                                <img  id="neiyea11" name="neiyea11"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea11" name="hideneiyea11"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea11')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -1124,8 +1289,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana12" name="WorkBookFengMiana12" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana12" name="WorkBookFengMiana12" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a12')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana12">
+                    <input id="ZiWorkBookFengMiana12" name="ZiWorkBookFengMiana12" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -1147,19 +1315,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma12" name="WorkBookpageNuma12" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
                         <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana12" target="view_window">
+                                <img  id="fengmiana12" name="fengmiana12"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana12" name="hidefengmiana12"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana12')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea12" target="view_window">
+                                <img  id="neiyea12" name="neiyea12"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea12" name="hideneiyea12"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea12')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -1216,8 +1396,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana13" name="WorkBookFengMiana13" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana13" name="WorkBookFengMiana13" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a13')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana13">
+                    <input id="ZiWorkBookFengMiana13" name="ZiWorkBookFengMiana13" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -1239,19 +1422,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma13" name="WorkBookpageNuma13" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
                         <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana13" target="view_window">
+                                <img  id="fengmiana13" name="fengmiana13"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana13" name="hidefengmiana13"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana13')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea13" target="view_window">
+                                <img  id="neiyea13" name="neiyea13"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea13" name="hideneiyea13"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea13')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -1308,8 +1503,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana14" name="WorkBookFengMiana14" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana14" name="WorkBookFengMiana14" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a14')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana14">
+                    <input id="ZiWorkBookFengMiana14" name="ZiWorkBookFengMiana14" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -1331,19 +1529,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma14" name="WorkBookpageNuma14" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
                         <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana14" target="view_window">
+                                <img  id="fengmiana14" name="fengmiana14"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana14" name="hidefengmiana14"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana14')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea14" target="view_window">
+                                <img  id="neiyea14" name="neiyea14"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea14" name="hideneiyea14"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea14')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -1400,8 +1610,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana15" name="WorkBookFengMiana15" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana15" name="WorkBookFengMiana15" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a15')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana15">
+                    <input id="ZiWorkBookFengMiana15" name="ZiWorkBookFengMiana15" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -1423,19 +1636,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma15" name="WorkBookpageNuma15" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
-                        <div class="xialapr">32</div>
+                       <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana15" target="view_window">
+                                <img  id="fengmiana15" name="fengmiana15"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana15" name="hidefengmiana15"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana15')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea15" target="view_window">
+                                <img  id="neiyea15" name="neiyea15"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea15" name="hideneiyea15"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea15')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -1492,8 +1717,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana16" name="WorkBookFengMiana16" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana16" name="WorkBookFengMiana16" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a16')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana16">
+                    <input id="ZiWorkBookFengMiana16" name="ZiWorkBookFengMiana16" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -1515,19 +1743,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma16" name="WorkBookpageNuma16" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
                         <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana16" target="view_window">
+                                <img  id="fengmiana16" name="fengmiana16"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana16" name="hidefengmiana16"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana16')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea16" target="view_window">
+                                <img  id="neiyea16" name="neiyea16"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea16" name="hideneiyea16"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea16')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -1584,8 +1824,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana17" name="WorkBookFengMiana17" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana17" name="WorkBookFengMiana17" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a17')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana17">
+                    <input id="ZiWorkBookFengMiana17" name="ZiWorkBookFengMiana17" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -1607,19 +1850,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma17" name="WorkBookpageNuma17" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
                         <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana17" target="view_window">
+                                <img  id="fengmiana17" name="fengmiana17"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana17" name="hidefengmiana17"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana17')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea17" target="view_window">
+                                <img  id="neiyea17" name="neiyea17"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea17" name="hideneiyea17"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea17')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -1676,8 +1931,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana18" name="WorkBookFengMiana18" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana18" name="WorkBookFengMiana18" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a18')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana18">
+                    <input id="ZiWorkBookFengMiana18" name="ZiWorkBookFengMiana18" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -1699,19 +1957,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma18" name="WorkBookpageNuma18" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
-                        <div class="xialapr">32</div>
+                      <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana18" target="view_window">
+                                <img  id="fengmiana18" name="fengmiana18"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana18" name="hidefengmiana18"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana18')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea18" target="view_window">
+                                <img  id="neiyea18" name="neiyea18"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea18" name="hideneiyea18"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea18')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -1768,8 +2038,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana19" name="WorkBookFengMiana19" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana19" name="WorkBookFengMiana19" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a19')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana19">
+                    <input id="ZiWorkBookFengMiana19" name="ZiWorkBookFengMiana19" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -1791,19 +2064,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma19" name="WorkBookpageNuma19" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
                         <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana19" target="view_window">
+                                <img  id="fengmiana19" name="fengmiana19"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana19" name="hidefengmiana19"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana19')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea19" target="view_window">
+                                <img  id="neiyea19" name="neiyea19"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea19" name="hideneiyea19"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea19')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -1860,8 +2145,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana20" name="WorkBookFengMiana20" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana20" name="WorkBookFengMiana20" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a20')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana20">
+                    <input id="ZiWorkBookFengMiana20" name="ZiWorkBookFengMiana20" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -1883,19 +2171,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma20" name="WorkBookpageNuma20" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
                         <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana20" target="view_window">
+                                <img  id="fengmiana20" name="fengmiana20"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana20" name="hidefengmiana20"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana20')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea20" target="view_window">
+                                <img  id="neiyea20" name="neiyea20"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea20" name="hideneiyea20"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea20')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -1952,8 +2252,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana21" name="WorkBookFengMiana21" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana21" name="WorkBookFengMiana21" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a21')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana21">
+                    <input id="ZiWorkBookFengMiana21" name="ZiWorkBookFengMiana21" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -1975,19 +2278,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma21" name="WorkBookpageNuma21" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
                         <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana21" target="view_window">
+                                <img  id="fengmiana21" name="fengmiana21"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana21" name="hidefengmiana21"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana21')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea21" target="view_window">
+                                <img  id="neiyea21" name="neiyea21"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea21" name="hideneiyea21"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea21')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -2044,8 +2359,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana22" name="WorkBookFengMiana22" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana22" name="WorkBookFengMiana22" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a22')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana22">
+                    <input id="ZiWorkBookFengMiana22" name="ZiWorkBookFengMiana22" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -2067,19 +2385,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma22" name="WorkBookpageNuma22" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
                         <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana22" target="view_window">
+                                <img  id="fengmiana22" name="fengmiana22"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana22" name="hidefengmiana22"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana22')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea22" target="view_window">
+                                <img  id="neiyea22" name="neiyea22"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea22" name="hideneiyea22"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea22')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -2136,8 +2466,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana23" name="WorkBookFengMiana23" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana23" name="WorkBookFengMiana23" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a23')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana23">
+                    <input id="ZiWorkBookFengMiana23" name="ZiWorkBookFengMiana23" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -2159,19 +2492,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma23" name="WorkBookpageNuma23" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
-                        <div class="xialapr">32</div>
+                      <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana23" target="view_window">
+                                <img  id="fengmiana23" name="fengmiana23"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana23" name="hidefengmiana23"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana23')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea23" target="view_window">
+                                <img  id="neiyea23" name="neiyea23"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea23" name="hideneiyea23"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea23')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -2228,8 +2573,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana24" name="WorkBookFengMiana24" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana24" name="WorkBookFengMiana24" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a24')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana24">
+                    <input id="ZiWorkBookFengMiana24" name="ZiWorkBookFengMiana24" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -2251,19 +2599,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma24" name="WorkBookpageNuma24" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
-                        <div class="xialapr">32</div>
+                       <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana24" target="view_window">
+                                <img  id="fengmiana24" name="fengmiana24"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana24" name="hidefengmiana24"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana24')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea24" target="view_window">
+                                <img  id="neiyea24" name="neiyea24"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea24" name="hideneiyea24"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea24')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -2320,8 +2680,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana25" name="WorkBookFengMiana25" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana25" name="WorkBookFengMiana25" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a25')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana25">
+                    <input id="ZiWorkBookFengMiana25" name="ZiWorkBookFengMiana25" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -2343,19 +2706,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma25" name="WorkBookpageNuma25" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
-                        <div class="xialapr">32</div>
+                       <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana25" target="view_window">
+                                <img  id="fengmiana25" name="fengmiana25"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana25" name="hidefengmiana25"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana25')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea25" target="view_window">
+                                <img  id="neiyea25" name="neiyea25"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea25" name="hideneiyea25"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea25')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -2412,8 +2787,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana26" name="WorkBookFengMiana26" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana26" name="WorkBookFengMiana26" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a26')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana26">
+                    <input id="ZiWorkBookFengMiana26" name="ZiWorkBookFengMiana26" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -2435,19 +2813,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma26" name="WorkBookpageNuma26" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
                         <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana26" target="view_window">
+                                <img  id="fengmiana26" name="fengmiana26"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana26" name="hidefengmiana26"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana26')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea26" target="view_window">
+                                <img  id="neiyea26" name="neiyea26"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea26" name="hideneiyea26"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea26')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -2504,8 +2894,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana27" name="WorkBookFengMiana27" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana27" name="WorkBookFengMiana27" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a27')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana27">
+                    <input id="ZiWorkBookFengMiana27" name="ZiWorkBookFengMiana27" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -2527,19 +2920,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma27" name="WorkBookpageNuma27" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
-                        <div class="xialapr">32</div>
+                       <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana27" target="view_window">
+                                <img  id="fengmiana27" name="fengmiana27"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana27" name="hidefengmiana27"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana27')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea27" target="view_window">
+                                <img  id="neiyea27" name="neiyea27"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea27" name="hideneiyea27"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea27')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -2596,8 +3001,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana28" name="WorkBookFengMiana28" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana28" name="WorkBookFengMiana28" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a28')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana28">
+                    <input id="ZiWorkBookFengMiana28" name="ZiWorkBookFengMiana28" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -2619,19 +3027,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma28" name="WorkBookpageNuma28" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
-                        <div class="xialapr">32</div>
+                       <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana28" target="view_window">
+                                <img  id="fengmiana28" name="fengmiana28"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana28" name="hidefengmiana28"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana28')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea28" target="view_window">
+                                <img  id="neiyea28" name="neiyea28"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea28" name="hideneiyea28"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea28')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -2688,8 +3108,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana29" name="WorkBookFengMiana29" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana29" name="WorkBookFengMiana29" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a29')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana29">
+                    <input id="ZiWorkBookFengMiana29" name="ZiWorkBookFengMiana29" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -2711,19 +3134,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma29" name="WorkBookpageNuma29" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
-                        <div class="xialapr">32</div>
+                       <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana29" target="view_window">
+                                <img  id="fengmiana29" name="fengmiana29"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana29" name="hidefengmiana29"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana29')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea29" target="view_window">
+                                <img  id="neiyea29" name="neiyea29"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea29" name="hideneiyea29"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea29')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
@@ -2780,8 +3215,11 @@
         <tr>
             <td align="left">灏侀潰绾稿紶:</td>
             <td align="left">
-                <select runat="server" class="selectLaber" id="WorkBookFengMiana30" name="WorkBookFengMiana30" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
+                <select runat="server" class="selectLaber" id="WorkBookFengMiana30" name="WorkBookFengMiana30" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' onchange="WorkBookFengMianaChange(this,'a30')" >
                 </select>
+                <br /><span style="display:none; margin-left:0px" id="divWorkBookFengMiana30">
+                    <input id="ZiWorkBookFengMiana30" name="ZiWorkBookFengMiana30" type="text"  style="height: 15px; line-height: 15px; width:130px;"  /> 
+                </span>
             </td>
             <td align="left">鍗板埛瑕佹眰:</td>
             <td align="left">
@@ -2803,19 +3241,31 @@
                 <div class="xialap">
                     <input type="text" id="WorkBookpageNuma30" name="WorkBookpageNuma30" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" />
                     <div class="xialapb">
-                        <div class="xialapr">4</div>
-                        <div class="xialapr">8</div>
-                        <div class="xialapr">12</div>
-                        <div class="xialapr">16</div>
-                        <div class="xialapr">20</div>
-                        <div class="xialapr">24</div>
-                        <div class="xialapr">28</div>
-                        <div class="xialapr">32</div>
+                       <div class="xialapr">32</div>
+                        <div class="xialapr">36</div>
+                        <div class="xialapr">40</div>
+                        <div class="xialapr">48</div>
                     </div>
                 </div>
             </td>
 
         </tr>
+         <tr>
+               <td align="left">灏侀潰:</td>
+             <td align="left">  <a title="鐐瑰嚮鏌ョ湅鍘熷浘" id="viewfengmiana30" target="view_window">
+                                <img  id="fengmiana30" name="fengmiana30"   width="25" height="20" />
+                            </a><input type="hidden" id="hidefengmiana30" name="hidefengmiana30"   /></td>
+             <td align="left">  <a onclick="onViewuplod('fengmiana30')">涓婁紶灏侀潰</a></td>
+             <td align="left">鍐呴〉:</td>
+            <td align="left"><a title="鐐瑰嚮鏌ョ湅鍘熷浘"  id="viewneiyea30" target="view_window">
+                                <img  id="neiyea30" name="neiyea30"   width="25" height="20" />
+                            </a><input type="hidden" id="hideneiyea30" name="hideneiyea30"   /></td>
+            <td align="left"><a onclick="onViewuplod('neiyea30')">涓婁紶鍐呴〉</a></td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+            <td align="left"> </td>
+             </tr>
     </table>
 
 </div>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/WorkBook.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/WorkBook.aspx.cs
index 0913b7b..f913f0e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/WorkBook.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/WorkBook.aspx.cs
@@ -337,7 +337,13 @@
                 this.WorkBookSizea30.DataSource = kaibenlist;
                 this.WorkBookSizea30.DataBind();
 
-                var fengmianzhizhang = _sys_DictionaryBLL.GetDataByType("浣滀笟鏈皝闈㈢焊寮�").OrderBy(x => x.MeanValue); ;
+                var fengmianzhizhangs = _sys_DictionaryBLL.GetDataByType("浣滀笟鏈皝闈㈢焊寮�").OrderBy(x => x.MeanValue);
+                var zidingyifengmian = new Model.Sys_Dictionary();
+                zidingyifengmian.MeanValue = -1;
+                zidingyifengmian.Name = "鑷畾涔�";
+                var fengmianzhizhang = fengmianzhizhangs.ToList();
+                fengmianzhizhang.Add(zidingyifengmian);
+
                 this.WorkBookFengMiana1.DataSource = fengmianzhizhang;
                 this.WorkBookFengMiana1.DataBind();
                 this.WorkBookFengMiana2.DataSource = fengmianzhizhang;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx
index 33020c6..dbbf547 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx
@@ -194,6 +194,31 @@
                     </asp:RadioButtonList>
                 </td>
             </tr>
+             <tr>
+                  <td class="ali03">
+                    鏄惁鍙告満锛�
+                </td>
+                  <td>
+                       <asp:RadioButtonList runat="server" ID="BF_IsDriver" RepeatDirection="Horizontal" CellPadding="0" CellSpacing="0" CssClass="w120px NoBorder">
+                        <asp:ListItem Text="鏄�" Value="True" />
+                        <asp:ListItem Text="鍚�" Value="False" />
+                    </asp:RadioButtonList>
+                       </td>
+                  <td class="ali03">
+                    鏄惁閰嶉�佹潈闄愶細
+                </td>
+                  <td>
+                      <asp:RadioButtonList runat="server" ID="BF_IsDeliverManage" RepeatDirection="Horizontal" CellPadding="0" CellSpacing="0" CssClass="w120px NoBorder">
+                        <asp:ListItem Text="鏄�" Value="True" />
+                        <asp:ListItem Text="鍚�" Value="False" />
+                    </asp:RadioButtonList>
+                       </td>
+                  <td class="ali03">
+                </td>
+                  <td>
+                       </td>
+                  </tr>
+
             <tr>
                 <td class="ali03">
                     鎵嬫満鍙风爜锛�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.cs
index cc3496f..ef88746 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.cs
@@ -91,6 +91,8 @@
             this.txtSM_Post.Value = "";
             this.IsBusinessManager.SelectedValue = "False";
             this.IsAccountManager.SelectedValue = "False";
+            this.BF_IsDriver.SelectedValue = "False";
+            this.BF_IsDeliverManage.SelectedValue = "False";
 
             this.txtMobieNum.Value = "";
             this.txtSM_Money.Value = "";
@@ -166,6 +168,8 @@
                 this.selSex.Value = m_OA_StaffResume.R_G_Sex;
                 this.IsBusinessManager.SelectedValue = "False";
                 this.IsAccountManager.SelectedValue = "False";
+                this.BF_IsDeliverManage.SelectedValue = "False";
+                this.BF_IsDriver.SelectedValue = "False";
                 this.txtSM_Birthday.Value = m_OA_StaffResume.R_G_DocumentsType;
                 this.txtSM_IDCardNum.Value = m_OA_StaffResume.R_G_DocumentsNumber;
                 this.aSM_IDCardPic.Visible = false;
@@ -200,6 +204,8 @@
                     this.selDepartmentId.Value = m_OA_Staff.DepartmentId.ToString2();
                     this.IsBusinessManager.SelectedValue = m_OA_Staff.IsBusinessManager ? "True" : "False";
                     this.IsAccountManager.SelectedValue = m_OA_Staff.IsAccountManager ? "True" : "False";
+                    this.BF_IsDeliverManage.SelectedValue = m_OA_Staff.BF_IsDeliverManage ? "True" : "False";
+                    this.BF_IsDriver.SelectedValue = m_OA_Staff.BF_IsDriver ? "True" : "False";
                     this.selRole.Value = m_OA_StaffRoleRel.RoleId.ToString2();
 
                     this.txtName.Style.Add("display", "none");
@@ -283,6 +289,8 @@
                 {
                     this.IsBusinessManager.SelectedValue = "False";
                     this.IsAccountManager.SelectedValue = "False";
+                    this.BF_IsDriver.SelectedValue = "False";
+                    this.BF_IsDeliverManage.SelectedValue = "False";
                 }
             }
         }
@@ -375,6 +383,8 @@
 
                 m_OA_Staff.IsBusinessManager = this.IsBusinessManager.SelectedValue.ToBoolean2();
                 m_OA_Staff.IsAccountManager = this.IsAccountManager.SelectedValue.ToBoolean2();
+                m_OA_Staff.BF_IsDeliverManage = this.BF_IsDeliverManage.SelectedValue.ToBoolean2();
+                m_OA_Staff.BF_IsDriver = this.BF_IsDriver.SelectedValue.ToBoolean2();
                 m_OA_Staff.DepartmentId = this.selDepartmentId.Value.ToInt32();
 
                 m_OA_Staff.SM_SpouseName = this.txtSM_SpouseName.Value.ToString2();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.designer.cs
index 440eae1..477863a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.designer.cs
@@ -2,16 +2,18 @@
 // <鑷姩鐢熸垚>
 //     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
 //
-//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�� 
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace CY.WebForm.Pages.personnel {
-    
-    
-    public partial class StaffEdit {
-        
+namespace CY.WebForm.Pages.personnel
+{
+
+
+    public partial class StaffEdit
+    {
+
         /// <summary>
         /// Head1 鎺т欢銆�
         /// </summary>
@@ -20,7 +22,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-        
+
         /// <summary>
         /// CMSHead1 鎺т欢銆�
         /// </summary>
@@ -29,7 +31,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-        
+
         /// <summary>
         /// form1 鎺т欢銆�
         /// </summary>
@@ -38,7 +40,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// txtName 鎺т欢銆�
         /// </summary>
@@ -47,7 +49,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtName;
-        
+
         /// <summary>
         /// spanName 鎺т欢銆�
         /// </summary>
@@ -56,7 +58,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanName;
-        
+
         /// <summary>
         /// selSex 鎺т欢銆�
         /// </summary>
@@ -65,7 +67,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlSelect selSex;
-        
+
         /// <summary>
         /// txtStaffUserName 鎺т欢銆�
         /// </summary>
@@ -74,7 +76,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtStaffUserName;
-        
+
         /// <summary>
         /// spanStaffUserName 鎺т欢銆�
         /// </summary>
@@ -83,7 +85,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanStaffUserName;
-        
+
         /// <summary>
         /// selDepartmentId 鎺т欢銆�
         /// </summary>
@@ -92,7 +94,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlSelect selDepartmentId;
-        
+
         /// <summary>
         /// txtSM_Post 鎺т欢銆�
         /// </summary>
@@ -101,7 +103,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtSM_Post;
-        
+
         /// <summary>
         /// selRole 鎺т欢銆�
         /// </summary>
@@ -110,7 +112,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlSelect selRole;
-        
+
         /// <summary>
         /// selStatus 鎺т欢銆�
         /// </summary>
@@ -119,7 +121,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlSelect selStatus;
-        
+
         /// <summary>
         /// IsBusinessManager 鎺т欢銆�
         /// </summary>
@@ -128,7 +130,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.RadioButtonList IsBusinessManager;
-        
+
         /// <summary>
         /// IsAccountManager 鎺т欢銆�
         /// </summary>
@@ -137,7 +139,25 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.RadioButtonList IsAccountManager;
-        
+
+        /// <summary>
+        /// BF_IsDriver 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.RadioButtonList BF_IsDriver;
+
+        /// <summary>
+        /// BF_IsDeliverManage 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.RadioButtonList BF_IsDeliverManage;
+
         /// <summary>
         /// txtMobieNum 鎺т欢銆�
         /// </summary>
@@ -146,7 +166,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtMobieNum;
-        
+
         /// <summary>
         /// txtSM_Money 鎺т欢銆�
         /// </summary>
@@ -155,7 +175,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtSM_Money;
-        
+
         /// <summary>
         /// txtSM_Birthday 鎺т欢銆�
         /// </summary>
@@ -164,7 +184,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtSM_Birthday;
-        
+
         /// <summary>
         /// spanSM_Birthday 鎺т欢銆�
         /// </summary>
@@ -173,7 +193,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSM_Birthday;
-        
+
         /// <summary>
         /// txtPhoneNum 鎺т欢銆�
         /// </summary>
@@ -182,7 +202,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtPhoneNum;
-        
+
         /// <summary>
         /// txtQQ 鎺т欢銆�
         /// </summary>
@@ -191,7 +211,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtQQ;
-        
+
         /// <summary>
         /// txtEmail 鎺т欢銆�
         /// </summary>
@@ -200,7 +220,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtEmail;
-        
+
         /// <summary>
         /// RBLSM_IsContract 鎺т欢銆�
         /// </summary>
@@ -209,7 +229,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.RadioButtonList RBLSM_IsContract;
-        
+
         /// <summary>
         /// trContract 鎺т欢銆�
         /// </summary>
@@ -218,7 +238,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTableRow trContract;
-        
+
         /// <summary>
         /// txtSM_ContractStartTime 鎺т欢銆�
         /// </summary>
@@ -227,7 +247,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtSM_ContractStartTime;
-        
+
         /// <summary>
         /// txtSM_ContractEndTime 鎺т欢銆�
         /// </summary>
@@ -236,7 +256,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtSM_ContractEndTime;
-        
+
         /// <summary>
         /// RBLSM_IsSocialSecurity 鎺т欢銆�
         /// </summary>
@@ -245,7 +265,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.RadioButtonList RBLSM_IsSocialSecurity;
-        
+
         /// <summary>
         /// trSocialSecurity1 鎺т欢銆�
         /// </summary>
@@ -254,7 +274,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTableRow trSocialSecurity1;
-        
+
         /// <summary>
         /// txtSM_SocialSecurityType 鎺т欢銆�
         /// </summary>
@@ -263,7 +283,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtSM_SocialSecurityType;
-        
+
         /// <summary>
         /// txtSM_SocialSecurityNumber 鎺т欢銆�
         /// </summary>
@@ -272,7 +292,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtSM_SocialSecurityNumber;
-        
+
         /// <summary>
         /// txtSM_SocialSecurityTime 鎺т欢銆�
         /// </summary>
@@ -281,7 +301,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtSM_SocialSecurityTime;
-        
+
         /// <summary>
         /// trSocialSecurity2 鎺т欢銆�
         /// </summary>
@@ -290,7 +310,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTableRow trSocialSecurity2;
-        
+
         /// <summary>
         /// txtSM_SocialSecurityAllMoney 鎺т欢銆�
         /// </summary>
@@ -299,7 +319,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtSM_SocialSecurityAllMoney;
-        
+
         /// <summary>
         /// txtSM_SocialSecurityFirmMoney 鎺т欢銆�
         /// </summary>
@@ -308,7 +328,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtSM_SocialSecurityFirmMoney;
-        
+
         /// <summary>
         /// txtSM_SocialSecuritySelfMoney 鎺т欢銆�
         /// </summary>
@@ -317,7 +337,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtSM_SocialSecuritySelfMoney;
-        
+
         /// <summary>
         /// txtSM_SpouseName 鎺т欢銆�
         /// </summary>
@@ -326,7 +346,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtSM_SpouseName;
-        
+
         /// <summary>
         /// txtSM_SpousePhone 鎺т欢銆�
         /// </summary>
@@ -335,7 +355,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtSM_SpousePhone;
-        
+
         /// <summary>
         /// txtSM_OldAdress 鎺т欢銆�
         /// </summary>
@@ -344,7 +364,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtSM_OldAdress;
-        
+
         /// <summary>
         /// txtSM_NowAddress 鎺т欢銆�
         /// </summary>
@@ -353,7 +373,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtSM_NowAddress;
-        
+
         /// <summary>
         /// txtSM_IDCardNum 鎺т欢銆�
         /// </summary>
@@ -362,7 +382,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtSM_IDCardNum;
-        
+
         /// <summary>
         /// txtSM_IDCardPic 鎺т欢銆�
         /// </summary>
@@ -371,7 +391,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputFile txtSM_IDCardPic;
-        
+
         /// <summary>
         /// aSM_IDCardPic 鎺т欢銆�
         /// </summary>
@@ -380,7 +400,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlAnchor aSM_IDCardPic;
-        
+
         /// <summary>
         /// imgSM_IDCardPic 鎺т欢銆�
         /// </summary>
@@ -389,7 +409,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlImage imgSM_IDCardPic;
-        
+
         /// <summary>
         /// SM_CertificateType_xx 鎺т欢銆�
         /// </summary>
@@ -398,7 +418,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText SM_CertificateType_xx;
-        
+
         /// <summary>
         /// ProductPics 鎺т欢銆�
         /// </summary>
@@ -407,7 +427,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputFile ProductPics;
-        
+
         /// <summary>
         /// txtSM_OtherLog 鎺т欢銆�
         /// </summary>
@@ -416,7 +436,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTextArea txtSM_OtherLog;
-        
+
         /// <summary>
         /// txtRemarks 鎺т欢銆�
         /// </summary>
@@ -425,7 +445,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTextArea txtRemarks;
-        
+
         /// <summary>
         /// btn_submit 鎺т欢銆�
         /// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx
index bc413f7..d92155d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx
@@ -133,6 +133,12 @@
                             <th>
                                 瀹㈡埛缁忕悊
                             </th>
+                             <th>
+                                鏄惁鍙告満
+                            </th>
+                             <th>
+                                鏄惁閰嶉�佹潈闄�
+                            </th>
                             <th>
                                 璐熻矗鍖哄煙
                             </th>
@@ -179,6 +185,12 @@
                         <td>
                             <%#bool.Parse(Eval("IsAccountManager").ToString()) ? "鏄�" : "鍚�"%>
                         </td>
+                         <td>
+                            <%#bool.Parse(Eval("BF_IsDriver").ToString())?"鏄�":"鍚�"%>
+                        </td>
+                        <td>
+                            <%#bool.Parse(Eval("BF_IsDeliverManage").ToString()) ? "鏄�" : "鍚�"%>
+                        </td>
                         <td class="Operate">
                             <span menu_member_case_id="case_ManageAddress" menu_member_case_name="淇敼璐熻矗鍖哄煙" onclick="ManageAddress('<%#Eval("Keyid")%>')">淇敼</span>
                         </td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx.designer.cs
index c6fb0d4..e11b46c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx.designer.cs
@@ -2,16 +2,18 @@
 // <鑷姩鐢熸垚>
 //     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
 //
-//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�� 
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace CY.WebForm.Pages.personnel {
-    
-    
-    public partial class StaffList {
-        
+namespace CY.WebForm.Pages.personnel
+{
+
+
+    public partial class StaffList
+    {
+
         /// <summary>
         /// Head1 鎺т欢銆�
         /// </summary>
@@ -20,7 +22,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-        
+
         /// <summary>
         /// CMSHead1 鎺т欢銆�
         /// </summary>
@@ -29,7 +31,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-        
+
         /// <summary>
         /// form1 鎺т欢銆�
         /// </summary>
@@ -38,7 +40,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// selDepartmentId 鎺т欢銆�
         /// </summary>
@@ -47,7 +49,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlSelect selDepartmentId;
-        
+
         /// <summary>
         /// txtMemberName 鎺т欢銆�
         /// </summary>
@@ -56,7 +58,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtMemberName;
-        
+
         /// <summary>
         /// selStatus 鎺т欢銆�
         /// </summary>
@@ -65,7 +67,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlSelect selStatus;
-        
+
         /// <summary>
         /// btn_Submit 鎺т欢銆�
         /// </summary>
@@ -74,7 +76,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button btn_Submit;
-        
+
         /// <summary>
         /// RepClientList 鎺т欢銆�
         /// </summary>
@@ -83,7 +85,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Repeater RepClientList;
-        
+
         /// <summary>
         /// UCPager1 鎺т欢銆�
         /// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedAdd.aspx
index 7502911..7c14532 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedAdd.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedAdd.aspx
@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head id="Head1" runat="server">
-    <title>鏂板骞村璁板綍</title>
+    <title>鏂板骞存璁板綍</title>
     <uc:CMSHead ID="CMSHead1" runat="server" />
 </head>
 <body>
@@ -13,7 +13,7 @@
         <table class="tableStyle" style="margin: 10px auto;" cellpadding="0" cellspacing="0">
             <tr>
                 <td class="ali03 w100px">
-                    骞村鏃堕棿锛�
+                    骞存鏃堕棿锛�
                 </td>
                 <td>
                     <input id="txtExaminedTime" type="text" class="date w90px" datefmt="yyyy-MM-dd" runat="server" />
@@ -27,13 +27,13 @@
             </tr>
             <tr>
                 <td class="ali03">
-                    涓嬫骞村鏃堕棿锛�
+                    涓嬫骞存鏃堕棿锛�
                 </td>
                 <td>
                     <input id="txtExaminedNextTime" type="text" class="date w90px" datefmt="yyyy-MM-dd" runat="server" />
                 </td>
                 <td class="ali03 w100px">
-                    骞村璐圭敤(鍏�)锛�
+                    骞存璐圭敤(鍏�)锛�
                 </td>
                 <td>
                     <input id="txtExaminedMoney" type="text" class="req float w90px" min="0" runat="server" msg="璇峰~鍐欏ぇ浜�0鐨勬暟瀛�" />
@@ -41,7 +41,7 @@
             </tr>
             <tr>
                 <td class="ali03">
-                    骞村璁板綍锛�
+                    骞存璁板綍锛�
                 </td>
                 <td colspan="3">
                    <textarea id="txtExaminedRecore" runat="server" style="width: 370px; height: 50px;" class=""></textarea>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedAdd.aspx.cs
index 8ca7c7a..18a3636 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedAdd.aspx.cs
@@ -17,7 +17,7 @@
 namespace CY.WebForm.Pages.workcar
 {
     //鍚磋緣
-    //鏂板骞村璁板綍
+    //鏂板骞存璁板綍
     public partial class CarExaminedAdd : BasePage
     {
         Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
@@ -44,19 +44,19 @@
             {
                 if (string.IsNullOrEmpty(this.txtExaminedTime.Value))
                 {
-                    JavaScript.MessageBox("骞村鏃堕棿涓嶈兘涓虹┖", this);
+                    JavaScript.MessageBox("骞存鏃堕棿涓嶈兘涓虹┖", this);
                     return;
                 }
                 if (string.IsNullOrEmpty(this.txtExaminedNextTime.Value))
                 {
-                    JavaScript.MessageBox("涓嬫骞村鏃堕棿涓嶈兘涓虹┖", this);
+                    JavaScript.MessageBox("涓嬫骞存鏃堕棿涓嶈兘涓虹┖", this);
                     return;
                 }
                 DateTime? Runtime1 = DateTime.Parse(this.txtExaminedTime.Value);
                 DateTime? Runtime2 = DateTime.Parse(this.txtExaminedNextTime.Value);
                 if (Runtime1 == null || Runtime2 == null || Runtime1 > Runtime2)
                 {
-                    JavaScript.MessageBox("骞村鏃堕棿 涓嶈兘澶т簬 涓嬫骞村鏃堕棿", this);
+                    JavaScript.MessageBox("骞存鏃堕棿 涓嶈兘澶т簬 涓嬫骞存鏃堕棿", this);
                     return;
                 }
 
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedAdd.aspx.designer.cs
index 59ee1c0..333ec55 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedAdd.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedAdd.aspx.designer.cs
@@ -2,16 +2,18 @@
 // <鑷姩鐢熸垚>
 //     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
 //
-//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�� 
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace CY.WebForm.Pages.workcar {
-    
-    
-    public partial class CarExaminedAdd {
-        
+namespace CY.WebForm.Pages.workcar
+{
+
+
+    public partial class CarExaminedAdd
+    {
+
         /// <summary>
         /// Head1 鎺т欢銆�
         /// </summary>
@@ -20,7 +22,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-        
+
         /// <summary>
         /// CMSHead1 鎺т欢銆�
         /// </summary>
@@ -29,7 +31,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-        
+
         /// <summary>
         /// form1 鎺т欢銆�
         /// </summary>
@@ -38,7 +40,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// txtExaminedTime 鎺т欢銆�
         /// </summary>
@@ -47,7 +49,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtExaminedTime;
-        
+
         /// <summary>
         /// txtExaminedPeople 鎺т欢銆�
         /// </summary>
@@ -56,7 +58,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtExaminedPeople;
-        
+
         /// <summary>
         /// txtExaminedNextTime 鎺т欢銆�
         /// </summary>
@@ -65,7 +67,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtExaminedNextTime;
-        
+
         /// <summary>
         /// txtExaminedMoney 鎺т欢銆�
         /// </summary>
@@ -74,7 +76,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtExaminedMoney;
-        
+
         /// <summary>
         /// txtExaminedRecore 鎺т欢銆�
         /// </summary>
@@ -83,7 +85,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTextArea txtExaminedRecore;
-        
+
         /// <summary>
         /// btn_submit 鎺т欢銆�
         /// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedDetail.aspx
index ebec251..8d82e57 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedDetail.aspx
@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head id="Head1" runat="server">
-    <title>骞村璁板綍鏄庣粏</title>
+    <title>骞存璁板綍鏄庣粏</title>
     <uc:CMSHead ID="CMSHead1" runat="server" />
 </head>
 <body>
@@ -13,7 +13,7 @@
         <table class="tableStyle" style="margin: 10px auto;" cellpadding="0" cellspacing="0">
             <tr>
                 <td class="ali03 w100px">
-                    骞村鏃堕棿锛�
+                    骞存鏃堕棿锛�
                 </td>
                 <td>
                     <span id="txtExaminedTime" type="text" runat="server" ></span>
@@ -27,13 +27,13 @@
             </tr>
             <tr>
                 <td class="ali03">
-                    涓嬫骞村鏃堕棿锛�
+                    涓嬫骞存鏃堕棿锛�
                 </td>
                 <td>
                     <span id="txtExaminedNextTime" runat="server" ></span>
                 </td>
                 <td class="ali03 w100px">
-                    骞村璐圭敤(鍏�)锛�
+                    骞存璐圭敤(鍏�)锛�
                 </td>
                 <td>
                     <span id="txtExaminedMoney" runat="server" ></span>
@@ -41,7 +41,7 @@
             </tr>
             <tr>
                 <td class="ali03">
-                    骞村璁板綍锛�
+                    骞存璁板綍锛�
                 </td>
                 <td colspan="3">
                    <div id="txtExaminedRecore" runat="server" style="overflow: visible; word-break: break-all; word-wrap: normal; width: 300px;">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedDetail.aspx.cs
index 5e73025..4edede8 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedDetail.aspx.cs
@@ -17,7 +17,7 @@
 namespace CY.WebForm.Pages.workcar
 {
     //鍚磋緣
-    //骞村璁板綍鏄庣粏
+    //骞存璁板綍鏄庣粏
     public partial class CarExaminedDetail : BasePage
     {
         Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedDetail.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedDetail.aspx.designer.cs
index 7889d61..c3bb6f3 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedDetail.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedDetail.aspx.designer.cs
@@ -2,16 +2,18 @@
 // <鑷姩鐢熸垚>
 //     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
 //
-//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�� 
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace CY.WebForm.Pages.workcar {
-    
-    
-    public partial class CarExaminedDetail {
-        
+namespace CY.WebForm.Pages.workcar
+{
+
+
+    public partial class CarExaminedDetail
+    {
+
         /// <summary>
         /// Head1 鎺т欢銆�
         /// </summary>
@@ -20,7 +22,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-        
+
         /// <summary>
         /// CMSHead1 鎺т欢銆�
         /// </summary>
@@ -29,7 +31,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-        
+
         /// <summary>
         /// form1 鎺т欢銆�
         /// </summary>
@@ -38,7 +40,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// txtExaminedTime 鎺т欢銆�
         /// </summary>
@@ -47,7 +49,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtExaminedTime;
-        
+
         /// <summary>
         /// txtExaminedPeople 鎺т欢銆�
         /// </summary>
@@ -56,7 +58,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtExaminedPeople;
-        
+
         /// <summary>
         /// txtExaminedNextTime 鎺т欢銆�
         /// </summary>
@@ -65,7 +67,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtExaminedNextTime;
-        
+
         /// <summary>
         /// txtExaminedMoney 鎺т欢銆�
         /// </summary>
@@ -74,7 +76,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtExaminedMoney;
-        
+
         /// <summary>
         /// txtExaminedRecore 鎺т欢銆�
         /// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedList.aspx
index 6dd3b84..8417725 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedList.aspx
@@ -4,17 +4,17 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head id="Head1" runat="server">
-    <title>杞﹁締骞村璁板綍</title>
+    <title>杞﹁締骞存璁板綍</title>
     <uc:CMSHead ID="CMSHead1" runat="server" />
     <script type="text/javascript">
         //鏌ョ湅
         function onEdit(keyid) {
-            top.Dialog.open({ URL: "/Pages/workcar/CarExaminedDetail.aspx?keyid=" + keyid, Title: "骞村璁板綍鏄庣粏", Width: 500, Height: 190 });
+            top.Dialog.open({ URL: "/Pages/workcar/CarExaminedDetail.aspx?keyid=" + keyid, Title: "骞存璁板綍鏄庣粏", Width: 500, Height: 190 });
         }
 
         //娣诲姞
         function addModel() {
-            top.Dialog.open({ URL: "/Pages/workcar/CarExaminedAdd.aspx?carid=" + '<%=Request["carid"] %>', Title: "鏂板骞村璁板綍", Width: 500, Height: 200 });
+            top.Dialog.open({ URL: "/Pages/workcar/CarExaminedAdd.aspx?carid=" + '<%=Request["carid"] %>', Title: "鏂板骞存璁板綍", Width: 500, Height: 200 });
         }
 
         //鍒犻櫎
@@ -55,7 +55,7 @@
             <table class="TableNewStyle">
                 <tr>
                     <td class="ali03">
-                        骞村鏃堕棿锛�
+                        骞存鏃堕棿锛�
                     </td>
                     <td style="width: 215px">
                         <input id="txtBeginExaminedTime" type="text" class="date w90px" datefmt="yyyy-MM-dd" runat="server" />-<input id="txtEndExaminedTime" type="text" class="date w90px" datefmt="yyyy-MM-dd" runat="server" />
@@ -83,7 +83,7 @@
                 <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>
+                            <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>
@@ -110,16 +110,16 @@
                                 杞︾墝鍙�
                             </th>
                             <th style="text-align: center">
-                                骞村鏃堕棿
+                                骞存鏃堕棿
                             </th>
                             <th style="text-align: center">
                                 缁忓姙浜�
                             </th>
                             <th style="text-align: center">
-                                骞村璐圭敤
+                                骞存璐圭敤
                             </th>
                             <th style="text-align: center">
-                                涓嬫骞村鏃堕棿
+                                涓嬫骞存鏃堕棿
                             </th>
                             <th style="text-align: center">
                                 鐘舵��
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedList.aspx.cs
index 42faf89..9619b80 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedList.aspx.cs
@@ -13,7 +13,7 @@
 namespace CY.WebForm.Pages.workcar
 {
     //鍚磋緣
-    //杞﹁締骞村璁板綍
+    //杞﹁締骞存璁板綍
     public partial class CarExaminedList : BasePage
     {
         OA_CarExaminedBll bll_OA_CarExaminedBll = null;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedList.aspx.designer.cs
index c24d6bc..0b58838 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarExaminedList.aspx.designer.cs
@@ -2,16 +2,18 @@
 // <鑷姩鐢熸垚>
 //     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
 //
-//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�� 
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace CY.WebForm.Pages.workcar {
-    
-    
-    public partial class CarExaminedList {
-        
+namespace CY.WebForm.Pages.workcar
+{
+
+
+    public partial class CarExaminedList
+    {
+
         /// <summary>
         /// Head1 鎺т欢銆�
         /// </summary>
@@ -20,7 +22,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-        
+
         /// <summary>
         /// CMSHead1 鎺т欢銆�
         /// </summary>
@@ -29,7 +31,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-        
+
         /// <summary>
         /// form1 鎺т欢銆�
         /// </summary>
@@ -38,7 +40,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// txtBeginExaminedTime 鎺т欢銆�
         /// </summary>
@@ -47,7 +49,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtBeginExaminedTime;
-        
+
         /// <summary>
         /// txtEndExaminedTime 鎺т欢銆�
         /// </summary>
@@ -56,7 +58,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtEndExaminedTime;
-        
+
         /// <summary>
         /// txtExaminedPeople 鎺т欢銆�
         /// </summary>
@@ -65,7 +67,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtExaminedPeople;
-        
+
         /// <summary>
         /// txtBeginExaminedNextTime 鎺т欢銆�
         /// </summary>
@@ -74,7 +76,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtBeginExaminedNextTime;
-        
+
         /// <summary>
         /// txtEndExaminedNextTime 鎺т欢銆�
         /// </summary>
@@ -83,7 +85,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtEndExaminedNextTime;
-        
+
         /// <summary>
         /// btn_Submit 鎺т欢銆�
         /// </summary>
@@ -92,7 +94,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button btn_Submit;
-        
+
         /// <summary>
         /// RepClientList 鎺т欢銆�
         /// </summary>
@@ -101,7 +103,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Repeater RepClientList;
-        
+
         /// <summary>
         /// UCPager1 鎺т欢銆�
         /// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarInsuranceAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarInsuranceAdd.aspx
index cff17e4..e515b7b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarInsuranceAdd.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarInsuranceAdd.aspx
@@ -48,7 +48,7 @@
             </tr>
             <tr>
                 <td class="ali03">
-                    淇濋櫓鍐呭锛�
+                    淇濋櫓闄╃锛�
                 </td>
                 <td colspan="3">
                     <textarea id="txtInsuranceContent" runat="server" style="width: 370px; height: 50px;" class=""></textarea>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarInsuranceAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarInsuranceAdd.aspx.designer.cs
index 2952fe6..1e7fc2c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarInsuranceAdd.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarInsuranceAdd.aspx.designer.cs
@@ -2,16 +2,18 @@
 // <鑷姩鐢熸垚>
 //     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
 //
-//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�� 
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace CY.WebForm.Pages.workcar {
-    
-    
-    public partial class CarInsuranceAdd {
-        
+namespace CY.WebForm.Pages.workcar
+{
+
+
+    public partial class CarInsuranceAdd
+    {
+
         /// <summary>
         /// Head1 鎺т欢銆�
         /// </summary>
@@ -20,7 +22,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-        
+
         /// <summary>
         /// CMSHead1 鎺т欢銆�
         /// </summary>
@@ -29,7 +31,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-        
+
         /// <summary>
         /// form1 鎺т欢銆�
         /// </summary>
@@ -38,7 +40,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// txtInsuranceTime 鎺т欢銆�
         /// </summary>
@@ -47,7 +49,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtInsuranceTime;
-        
+
         /// <summary>
         /// txtInsuranceEndTime 鎺т欢銆�
         /// </summary>
@@ -56,7 +58,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtInsuranceEndTime;
-        
+
         /// <summary>
         /// txtInsurancePeople 鎺т欢銆�
         /// </summary>
@@ -65,7 +67,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtInsurancePeople;
-        
+
         /// <summary>
         /// txtInsuranceMoney 鎺т欢銆�
         /// </summary>
@@ -74,7 +76,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtInsuranceMoney;
-        
+
         /// <summary>
         /// txtInsuranceCompany 鎺т欢銆�
         /// </summary>
@@ -83,7 +85,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtInsuranceCompany;
-        
+
         /// <summary>
         /// txtInsuranceContent 鎺т欢銆�
         /// </summary>
@@ -92,7 +94,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTextArea txtInsuranceContent;
-        
+
         /// <summary>
         /// btn_submit 鎺т欢銆�
         /// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarInsuranceDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarInsuranceDetail.aspx
index ecfcb65..f0d04e6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarInsuranceDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarInsuranceDetail.aspx
@@ -48,7 +48,7 @@
             </tr>
             <tr>
                 <td class="ali03">
-                    淇濋櫓鍐呭锛�
+                    淇濋櫓闄╃锛�
                 </td>
                 <td colspan="3">
                     <div id="txtInsuranceContent" runat="server" style="overflow: visible; word-break: break-all; word-wrap: normal; width: 300px;">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarInsuranceDetail.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarInsuranceDetail.aspx.designer.cs
index bb53f42..2435b78 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarInsuranceDetail.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarInsuranceDetail.aspx.designer.cs
@@ -2,16 +2,18 @@
 // <鑷姩鐢熸垚>
 //     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
 //
-//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�� 
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace CY.WebForm.Pages.workcar {
-    
-    
-    public partial class CarInsuranceDetail {
-        
+namespace CY.WebForm.Pages.workcar
+{
+
+
+    public partial class CarInsuranceDetail
+    {
+
         /// <summary>
         /// Head1 鎺т欢銆�
         /// </summary>
@@ -20,7 +22,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-        
+
         /// <summary>
         /// CMSHead1 鎺т欢銆�
         /// </summary>
@@ -29,7 +31,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-        
+
         /// <summary>
         /// form1 鎺т欢銆�
         /// </summary>
@@ -38,7 +40,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// txtInsuranceTime 鎺т欢銆�
         /// </summary>
@@ -47,7 +49,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtInsuranceTime;
-        
+
         /// <summary>
         /// txtInsuranceEndTime 鎺т欢銆�
         /// </summary>
@@ -56,7 +58,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtInsuranceEndTime;
-        
+
         /// <summary>
         /// txtInsurancePeople 鎺т欢銆�
         /// </summary>
@@ -65,7 +67,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtInsurancePeople;
-        
+
         /// <summary>
         /// txtInsuranceMoney 鎺т欢銆�
         /// </summary>
@@ -74,7 +76,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtInsuranceMoney;
-        
+
         /// <summary>
         /// txtInsuranceCompany 鎺т欢銆�
         /// </summary>
@@ -83,7 +85,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtInsuranceCompany;
-        
+
         /// <summary>
         /// txtInsuranceContent 鎺т欢銆�
         /// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarMaintenanceDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarMaintenanceDetail.aspx.cs
index 5746967..7009c08 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarMaintenanceDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarMaintenanceDetail.aspx.cs
@@ -46,7 +46,7 @@
             {
                 this.txtMaintenanceTime.InnerText = m_OA_CarMaintenance.MaintenanceTime.Value.ToString("yyyy-MM-dd");
                 this.txtMaintenancePerson.InnerText = m_OA_CarMaintenance.MaintenancePerson.ToString2();
-                this.txtMaintenanceType.InnerText = m_OA_CarMaintenance.MaintenanceMoney.Value.ToString("0.00");
+                this.txtMaintenanceMoney.InnerText = m_OA_CarMaintenance.MaintenanceMoney.Value.ToString("0.00");
                 this.txtMaintenanceType.InnerText = m_OA_CarMaintenance.MaintenanceType.ToString2();
                 this.txtMaintenanceRecord.InnerText = m_OA_CarMaintenance.MaintenanceRecord.ToString2();
             }
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageAdd.aspx
index 667ce30..5d51c78 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageAdd.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageAdd.aspx
@@ -59,24 +59,21 @@
                         <option value="3">绉佸杞�</option>
                     </select>
                 </td>
-            </tr>
-            <tr>
-                <td class="ali03">
+                 <td class="ali03">
                     杞︾墝鍙凤細
                 </td>
                 <td>
                     <input id="txtCarNumber" style="width: 100px;" type="text" runat="server" />
                 </td>
-            </tr>
-            <tr>
-                <td class="ali03">
+                 <td class="ali03">
                     褰撳墠閲岀▼(KM)锛�
                 </td>
                 <td>
                     <input id="txtNowMileage" style="width: 100px;" value="0" type="text" class="req int" min="0" runat="server" />
                 </td>
             </tr>
-            <tr>
+           
+            <tr style="display:none;">
                 <td class="ali03 w100px">
                     杞﹁締鐘跺喌锛�
                 </td>
@@ -84,22 +81,292 @@
                     <select id="selCarCondition" runat="server" keepdefaultstyle="true" style="width: 100px;">
                     </select>
                 </td>
-            </tr>
-            <tr>
                 <td class="ali03">
                     鎺掑簭锛�
                 </td>
                 <td>
                     <input id="txtOrderNum" style="width: 100px;" type="text" class="req int" value="0" runat="server" />
                 </td>
+                <td class="ali03 w100px">
+                    
+                </td>
+                <td>
+                    
+                </td>
+            </tr>
+             <tr>
+                <td class="ali03 w100px">
+                     绠$悊浜猴細
+                </td>
+                <td>
+                    <select id="selStaffID" runat="server" keepdefaultstyle="true" style="width: 100px;">
+                    </select>
+                </td>
+                 <td class="ali03 w100px">
+                    
+                </td>
+                <td>
+                    
+                </td>
+                <td class="ali03 w100px">
+                    
+                </td>
+                <td>
+                    
+                </td>
             </tr>
             <tr>
-                <td colspan="2" style="text-align: center;">
+                <td class="ali03 w100px">
+                     淇濋櫓鎯呭喌锛�
+                </td>
+                <td>
+                   
+                </td>
+                 <td class="ali03 w100px">
+                    
+                </td>
+                <td>
+                    
+                </td>
+                <td class="ali03 w100px">
+                    
+                </td>
+                <td>
+                    
+                </td>
+            </tr>
+            <tr>
+                <td class="ali03 w100px">
+                     淇濋櫓鍒版湡鏃堕棿锛�
+                </td>
+                <td>
+                    <input id="txtInsuranceEndTime" type="text" class="date w90px" datefmt="yyyy-MM-dd" runat="server" />
+                </td>
+                 <td class="ali03 w100px">
+                    淇濋櫓鍏徃锛�
+                </td>
+                <td colspan="3">
+                      <input id="txtInsuranceCompany" type="text"   style="width: 360px;" runat="server" msg="璇峰~鍐欎繚闄╁叕鍙�" />
+                </td>
+                
+            </tr>
+              <tr>
+                <td class="ali03 w100px">
+                     淇濋櫓闄╃锛�
+                </td>
+                <td colspan="5">
+                    <textarea id="txtInsuranceContent" runat="server" style="width: 370px; height: 50px;" class=""></textarea>
+                </td>
+                  
+            </tr>
+             <tr>
+                <td class="ali03 w100px">
+                     涓嬫骞存鏃堕棿锛�
+                </td>
+                <td colspan="5">
+                      <input id="txtExaminedNextTime" type="text" class="date w90px" datefmt="yyyy-MM-dd" runat="server" />
+                </td>
+                  
+            </tr>
+             <tr>
+                <td class="ali03 w100px">
+                     涓嬫淇濆吇鏃堕棿锛�
+                </td>
+                <td colspan="5">
+                      <input id="txtMaintenanceNextTime" type="text" class="date w90px" datefmt="yyyy-MM-dd" runat="server" />
+                </td>
+                  
+            </tr>
+             <tr>
+                <td class="ali03 w100px">
+                     淇濋櫓璁板綍锛�
+                </td>
+                <td colspan="5">
+                     
+                </td>
+                  
+            </tr>
+            <tr>
+               
+                <td colspan="6">
+                       <asp:Repeater ID="RepClientList" runat="server">
+                  <HeaderTemplate>
+                    <table class="tableStyle">
+                        
+                </HeaderTemplate>
+                <ItemTemplate>
+                    <tr>
+                        
+                        
+                        <td style="text-align: center;width:25%;">
+                            <%#Eval("InsuranceTime", "{0:yyyy-MM-dd}")%>
+                        </td>
+                        
+                        <td style="text-align: center;width:25%;">
+                           <%#Eval("InsuranceCompany")%>
+                        </td>
+                        <%--  <td style="text-align: center;width:25%;">
+                           <%#Eval("InsuranceMoney","{0:F2}")%>鍏�
+                        </td>--%>
+                        
+                        <td style="text-align: center;width:25%;">
+                           <%#Eval("InsuranceContent")%>
+                        </td>
+                        
+                    </tr>
+                </ItemTemplate>
+                <FooterTemplate>
+                    </table>
+                </FooterTemplate>
+            </asp:Repeater>
+                </td>
+                  
+            </tr>
+
+                  <tr>
+                <td class="ali03 w100px">
+                     淇濆吇璁板綍锛�
+                </td>
+                <td colspan="5">
+                     
+                </td>
+                  
+            </tr>
+            <tr>
+               
+                <td colspan="6">
+                       <asp:Repeater ID="RepClientList3" runat="server">
+                <HeaderTemplate>
+                    <table class="tableStyle">
+                         
+                </HeaderTemplate>
+                <ItemTemplate>
+                    <tr>
+                        
+                        
+                        <td style="text-align: center;width:25%;">
+                            <%#Eval("MaintenanceTime", "{0:yyyy-MM-dd}")%>
+                        </td>
+                        
+                        <td style="text-align: center;width:25%;">
+                           <%#Eval("MaintenancePerson")%>
+                        </td>
+                          <td style="text-align: center;width:25%;">
+                           <%#Eval("MaintenanceMoney","{0:F2}")%>鍏�
+                        </td>
+                        <td style="text-align: center;width:25%;">
+                           <%#Eval("MaintenanceRecord")%>
+                        </td>
+                        
+                    </tr>
+                </ItemTemplate>
+                <FooterTemplate>
+                    </table>
+                </FooterTemplate>
+            </asp:Repeater>
+                </td>
+                  
+            </tr>
+             <tr>
+                <td class="ali03 w100px">
+                     骞存璁板綍锛�
+                </td>
+                <td colspan="5">
+                     
+                </td>
+                  
+            </tr>
+            <tr>
+               
+                <td colspan="6">
+                       <asp:Repeater ID="RepClientList2" runat="server">
+                <HeaderTemplate>
+                    <table class="tableStyle">
+                        
+                </HeaderTemplate>
+                <ItemTemplate>
+                    <tr>
+                        
+                        
+                        <td style="text-align: center;width:25%;">
+                            <%#Eval("ExaminedTime", "{0:yyyy-MM-dd}")%>
+                        </td>
+                        
+                        <td style="text-align: center;width:25%;">
+                           <%#Eval("ExaminedPeople")%>
+                        </td>
+                          <td style="text-align: center;width:25%;">
+                           <%#Eval("ExaminedMoney","{0:F2}")%>鍏�
+                        </td>
+                       <%-- <td style="text-align: center;width:25%;">
+                           <%#Eval("ExaminedRecore")%>
+                        </td>--%>
+                        
+                    </tr>
+                </ItemTemplate>
+                <FooterTemplate>
+                    </table>
+                </FooterTemplate>
+            </asp:Repeater>
+                </td>
+                  
+            </tr>
+
+            <tr>
+                <td class="ali03 w100px">
+                     缁翠慨璁板綍锛�
+                </td>
+                <td colspan="5">
+                     
+                </td>
+                  
+            </tr>
+            <tr>
+               
+                <td colspan="6">
+                       <asp:Repeater ID="RepClientList1" runat="server">
+                <HeaderTemplate>
+                    <table class="tableStyle">
+                         
+                </HeaderTemplate>
+                <ItemTemplate>
+                    <tr>
+                        
+                        
+                        <td style="text-align: center;width:25%;">
+                            <%#Eval("repairTime", "{0:yyyy-MM-dd}")%>
+                        </td>
+                        
+                        <td style="text-align: center;width:25%;">
+                           <%#Eval("repairPerson")%>
+                        </td>
+                          <td style="text-align: center;width:25%;">
+                           <%#Eval("repairMoney","{0:F2}")%>鍏�
+                        </td>
+                        <td style="text-align: center;width:25%;">
+                           <%#Eval("repairRecord")%>
+                        </td>
+                        
+                    </tr>
+                </ItemTemplate>
+                <FooterTemplate>
+                    </table>
+                </FooterTemplate>
+            </asp:Repeater>
+                </td>
+                  
+            </tr>
+            <tr>
+                <td colspan="6" style="text-align: center;">
                     <asp:Button ID="btn_submit" runat="server" OnClick="btn_submit_form" OnClientClick="if(CheckCarNumber())return true;else return false; " Text="鎻愪氦" />
                 </td>
             </tr>
         </table>
     </div>
+         
+          
+           
+        
     </form>
 </body>
 </html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageAdd.aspx.cs
index 931f764..2b7e5b1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageAdd.aspx.cs
@@ -21,11 +21,21 @@
     {
         Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
         OA_CarManageBll oA_WorkReminderBll = null;
+        OA_StaffBLL o_StaffBLL = null;
+        OA_CarInsuranceBll bll_OA_CarInsuranceBll = null;
+        OA_CarrepairBLL bll_OA_CarrepairBLL = null;
+        OA_CarExaminedBll bll_OA_CarExaminedBll = null;
+        OA_CarMaintenanceBll bll_OA_CarMaintenanceBll = null;
 
         public CarManageAdd()
         {
             bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
             oA_WorkReminderBll = new OA_CarManageBll();
+            o_StaffBLL = new OA_StaffBLL();
+            bll_OA_CarInsuranceBll = new OA_CarInsuranceBll();
+            bll_OA_CarrepairBLL = new OA_CarrepairBLL();
+            bll_OA_CarExaminedBll = new OA_CarExaminedBll();
+            bll_OA_CarMaintenanceBll = new OA_CarMaintenanceBll();
         }
 
         //椤甸潰鍔犺浇
@@ -38,6 +48,12 @@
                 this.selCarCondition.DataValueField = "MeanValue";
                 this.selCarCondition.DataBind();
 
+                this.selStaffID.DataSource = o_StaffBLL.SelectListByFirmId(CurrentUser.MemberId,null,null).Where(x=>x.BF_IsDriver == true);
+                this.selStaffID.DataTextField = "Name";
+                this.selStaffID.DataValueField = "Keyid";
+                this.selStaffID.DataBind();
+                this.selStaffID.Items.Add(new ListItem("璇烽�夋嫨", "0"));
+                this.selStaffID.Value = "0";
                 InitData();
             }
         }
@@ -50,10 +66,34 @@
             {
                 this.selCarType.Value = m_OA_CarManage.CarType;
                 this.selCarCondition.Value = m_OA_CarManage.CarCondition.ToString2();
+                this.selStaffID.Value = m_OA_CarManage.StaffID.ToString2();
                 this.txtCarNumber.Value = m_OA_CarManage.CarNumber;
                 this.txtNowMileage.Value = m_OA_CarManage.NowMileage.ToString2();
                 this.txtNowMileage.Attributes.Add("min", m_OA_CarManage.StartMileage.ToString2());
                 this.txtOrderNum.Value = m_OA_CarManage.OrderNum.ToString2();
+                this.txtInsuranceCompany.Value = m_OA_CarManage.InsuranceCompany.ToString2();
+                this.txtInsuranceEndTime.Value = m_OA_CarManage.InsuranceEndTime.ToStringForDateTime("yyyy-MM-dd");
+                this.txtMaintenanceNextTime.Value = m_OA_CarManage.MaintenanceNextTime.ToStringForDateTime("yyyy-MM-dd");
+                this.txtExaminedNextTime.Value = m_OA_CarManage.ExaminedNextTime.ToStringForDateTime("yyyy-MM-dd");
+                this.txtInsuranceContent.Value = m_OA_CarManage.InsuranceContent.ToString2();
+
+                Pagination pa = new Pagination();
+                pa.PageSize = 1;
+                pa.PageIndex = 1;
+                this.RepClientList.DataSource = bll_OA_CarInsuranceBll.SelectModelPage(pa, Request["keyid"].ToInt32(), null, null, null, null, null, null, null, null, null, null, null, null);
+                this.RepClientList.DataBind();
+
+                this.RepClientList1.DataSource = bll_OA_CarrepairBLL.SelectModelPage(pa, Request["keyid"].ToInt32(), null, null, null, null, null, null, null, null, null);
+                this.RepClientList1.DataBind();
+
+                this.RepClientList2.DataSource = bll_OA_CarExaminedBll.SelectModelPage(pa, Request["keyid"].ToInt32(), null, null, null, null, null, null, null, null, null, null, null);
+                this.RepClientList2.DataBind();
+
+                this.RepClientList3.DataSource = bll_OA_CarMaintenanceBll.SelectModelPage(pa, Request["keyid"].ToInt32(), null, null, null, null, null, null, null, null, null);
+                this.RepClientList3.DataBind();
+                
+
+
             }
         }
 
@@ -75,6 +115,13 @@
                 m_OA_CarManage.CarType = this.selCarType.Value;
                 m_OA_CarManage.NowMileage = this.txtNowMileage.Value.ToInt32();
                 m_OA_CarManage.OrderNum = this.txtOrderNum.Value.ToInt32();
+                m_OA_CarManage.StaffID = this.selStaffID.Value.ToInt32();
+                m_OA_CarManage.InsuranceCompany = this.txtInsuranceCompany.Value;
+                m_OA_CarManage.InsuranceEndTime = this.txtInsuranceEndTime.Value.ToDateTime2();
+                m_OA_CarManage.MaintenanceNextTime = this.txtMaintenanceNextTime.Value.ToDateTime2();
+                m_OA_CarManage.ExaminedNextTime = this.txtExaminedNextTime.Value.ToDateTime2();
+                m_OA_CarManage.InsuranceContent =this.txtInsuranceContent.Value;
+
 
                 m_OA_CarManage.Operator = CurrentUser.ShortName;
                 m_OA_CarManage.LastUpdateTime = nowTime;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageAdd.aspx.designer.cs
index f65aa17..e94816f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageAdd.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageAdd.aspx.designer.cs
@@ -2,16 +2,18 @@
 // <鑷姩鐢熸垚>
 //     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
 //
-//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�� 
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace CY.WebForm.Pages.workcar {
-    
-    
-    public partial class CarManageAdd {
-        
+namespace CY.WebForm.Pages.workcar
+{
+
+
+    public partial class CarManageAdd
+    {
+
         /// <summary>
         /// Head1 鎺т欢銆�
         /// </summary>
@@ -20,7 +22,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-        
+
         /// <summary>
         /// CMSHead1 鎺т欢銆�
         /// </summary>
@@ -29,7 +31,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-        
+
         /// <summary>
         /// form1 鎺т欢銆�
         /// </summary>
@@ -38,7 +40,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// selCarType 鎺т欢銆�
         /// </summary>
@@ -47,7 +49,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlSelect selCarType;
-        
+
         /// <summary>
         /// txtCarNumber 鎺т欢銆�
         /// </summary>
@@ -56,7 +58,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtCarNumber;
-        
+
         /// <summary>
         /// txtNowMileage 鎺т欢銆�
         /// </summary>
@@ -65,7 +67,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtNowMileage;
-        
+
         /// <summary>
         /// selCarCondition 鎺т欢銆�
         /// </summary>
@@ -74,7 +76,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlSelect selCarCondition;
-        
+
         /// <summary>
         /// txtOrderNum 鎺т欢銆�
         /// </summary>
@@ -83,7 +85,97 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtOrderNum;
-        
+
+        /// <summary>
+        /// selStaffID 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selStaffID;
+
+        /// <summary>
+        /// txtInsuranceEndTime 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtInsuranceEndTime;
+
+        /// <summary>
+        /// txtInsuranceCompany 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtInsuranceCompany;
+
+        /// <summary>
+        /// txtInsuranceContent 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtInsuranceContent;
+
+        /// <summary>
+        /// txtExaminedNextTime 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtExaminedNextTime;
+
+        /// <summary>
+        /// txtMaintenanceNextTime 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtMaintenanceNextTime;
+
+        /// <summary>
+        /// RepClientList 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Repeater RepClientList;
+
+        /// <summary>
+        /// RepClientList3 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Repeater RepClientList3;
+
+        /// <summary>
+        /// RepClientList2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Repeater RepClientList2;
+
+        /// <summary>
+        /// RepClientList1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Repeater RepClientList1;
+
         /// <summary>
         /// btn_submit 鎺т欢銆�
         /// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageList.aspx
index 58f029b..403d29f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageList.aspx
@@ -15,10 +15,14 @@
         function onViewCarMaintenance(keyid) {
             top.Dialog.open({ URL: "/Pages/workcar/CarMaintenanceList.aspx?carid=" + keyid, Title: "淇濆吇绠$悊", Width: 1000, Height: 660 });
         }
+        //缁翠慨
+        function onViewCarrepair(keyid) {
+            top.Dialog.open({ URL: "/Pages/workcar/CarrepairList.aspx?carid=" + keyid, Title: "缁翠慨绠$悊", Width: 1000, Height: 660 });
+        }
 
-        //骞村
+        //骞存
         function onViewCarExamined(keyid) {
-            top.Dialog.open({ URL: "/Pages/workcar/CarExaminedList.aspx?carid=" + keyid, Title: "骞村绠$悊", Width: 1000, Height: 660 });
+            top.Dialog.open({ URL: "/Pages/workcar/CarExaminedList.aspx?carid=" + keyid, Title: "骞存绠$悊", Width: 1000, Height: 660 });
         }
 
         //淇濋櫓
@@ -28,12 +32,12 @@
 
         //淇敼
         function onEdit(keyid) {
-            top.Dialog.open({ URL: "/Pages/workcar/CarManageAdd.aspx?keyid=" + keyid, Title: "杞﹁締淇℃伅", Width: 350, Height: 190 });
+            top.Dialog.open({ URL: "/Pages/workcar/CarManageAdd.aspx?keyid=" + keyid, Title: "杞﹁締淇℃伅", Width: 1000, Height: 660 });
         }
 
         //娣诲姞
         function addModel() {
-            top.Dialog.open({ URL: "/Pages/workcar/CarManageAdd.aspx", Title: "鏂板杞﹁締", Width: 350, Height: 190});
+            top.Dialog.open({ URL: "/Pages/workcar/CarManageAdd.aspx", Title: "鏂板杞﹁締", Width: 1000, Height: 660});
         }
 
         //鍒犻櫎
@@ -141,9 +145,13 @@
                             <th style="text-align: center">
                                 杞﹁締绫诲瀷
                             </th>
+                             <th style="text-align: center">
+                                绠$悊浜�
+                            </th>
                             <th style="text-align: center">
                                 杞﹁締鐘跺喌
                             </th>
+                           
                             <th style="text-align: center">
                                 褰撳墠閲岀▼
                             </th>
@@ -153,8 +161,11 @@
                             <th style="text-align: center">
                                 淇濆吇璁板綍
                             </th>
+                              <th style="text-align: center">
+                                缁翠慨璁板綍
+                            </th>
                             <th style="text-align: center">
-                                骞村璁板綍
+                                骞存璁板綍
                             </th>
                             <th style="text-align: center">
                                 淇濋櫓璁板綍
@@ -178,9 +189,13 @@
                         <td style="text-align: center">
                             <%#Eval("CarType").ToString() == "1" ? "涓撶敤杞�" : (Eval("CarType").ToString() == "2" ? "鍏敤杞�" : "绉佸杞�")%>
                         </td>
+                         <td style="text-align: center">
+                            <%#Eval("StaffName")%>
+                        </td>
                         <td style="text-align: center">
                             <%#Eval("CarConditionName")%>
                         </td>
+                        
                         <td style="text-align: center">
                             <%#Eval("NowMileage")%>KM
                         </td>
@@ -190,6 +205,9 @@
                         <td class="Operate "  style="text-align: center">
                             <span menu_member_case_id="case_CarMaintenance" menu_member_case_name="淇濆吇绠$悊" onclick="onViewCarMaintenance('<%#Eval("Keyid")%>')">鏌ョ湅</span>
                         </td>
+                         <td class="Operate "  style="text-align: center">
+                            <span   onclick="onViewCarrepair('<%#Eval("Keyid")%>')">鏌ョ湅</span>
+                        </td>
                         <td class="Operate "  style="text-align: center">
                             <span menu_member_case_id="case_CarExamined" menu_member_case_name="骞村绠$悊" onclick="onViewCarExamined('<%#Eval("Keyid")%>')">鏌ョ湅</span>
                         </td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageList.aspx.designer.cs
index 33ff29d..fc64410 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarManageList.aspx.designer.cs
@@ -2,16 +2,18 @@
 // <鑷姩鐢熸垚>
 //     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
 //
-//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�� 
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace CY.WebForm.Pages.workcar {
-    
-    
-    public partial class CarManageList {
-        
+namespace CY.WebForm.Pages.workcar
+{
+
+
+    public partial class CarManageList
+    {
+
         /// <summary>
         /// Head1 鎺т欢銆�
         /// </summary>
@@ -20,7 +22,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-        
+
         /// <summary>
         /// CMSHead1 鎺т欢銆�
         /// </summary>
@@ -29,7 +31,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-        
+
         /// <summary>
         /// form1 鎺т欢銆�
         /// </summary>
@@ -38,7 +40,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// selCarType 鎺т欢銆�
         /// </summary>
@@ -47,7 +49,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlSelect selCarType;
-        
+
         /// <summary>
         /// selCarCondition 鎺т欢銆�
         /// </summary>
@@ -56,7 +58,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlSelect selCarCondition;
-        
+
         /// <summary>
         /// btn_Submit 鎺т欢銆�
         /// </summary>
@@ -65,7 +67,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button btn_Submit;
-        
+
         /// <summary>
         /// RepClientList 鎺т欢銆�
         /// </summary>
@@ -74,7 +76,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Repeater RepClientList;
-        
+
         /// <summary>
         /// UCPager1 鎺т欢銆�
         /// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairAdd.aspx
new file mode 100644
index 0000000..094cdcc
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairAdd.aspx
@@ -0,0 +1,59 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CarrepairAdd.aspx.cs" Inherits="CY.WebForm.Pages.workcar.CarrepairAdd" %>
+
+<!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" />
+</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 w100px">
+                    缁翠慨鏃堕棿锛�
+                </td>
+                <td>
+                    <input id="txtrepairTime" type="text" class="date w90px" datefmt="yyyy-MM-dd" runat="server" />
+                </td>
+                <td class="ali03">
+                    缁翠慨浜猴細
+                </td>
+                <td>
+                    <input id="txtrepairPerson" type="text" class="req w90px" runat="server" msg="璇峰~鍐欑淮淇汉" />
+                </td>
+            </tr>
+            <tr>
+                <td class="ali03">
+                     缁翠慨璐圭敤(鍏�)锛�
+                </td>
+                <td>
+                  <input id="txtrepairMoney" type="text" class="req float w90px" min="0" runat="server" msg="璇峰~鍐欏ぇ浜�0鐨勬暟瀛�" />
+                </td>
+                <td class="ali03 w100px">
+                   
+                </td>
+                <td>
+                   
+                </td>
+            </tr>
+            <tr>
+                <td class="ali03">
+                    缁翠慨璁板綍锛�
+                </td>
+                <td colspan="3">
+                    <textarea id="txtrepairRecord" runat="server" style="width: 370px; height: 50px;" class=""></textarea>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="4" style="text-align: center;">
+                    <asp:Button ID="btn_submit" runat="server" OnClick="btn_submit_form" Text="鎻愪氦" />
+                </td>
+            </tr>
+        </table>
+    </div>
+    </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairAdd.aspx.cs
new file mode 100644
index 0000000..2086c51
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairAdd.aspx.cs
@@ -0,0 +1,78 @@
+锘縰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.workcar
+{
+    //鍚磋緣
+    //鏂板缁翠慨璁板綍
+    public partial class CarrepairAdd : BasePage
+    {
+        OA_CarDictionaryBLL bll_OA_CarDictionaryBLL = null;
+        OA_CarrepairBLL oA_WorkReminderBll = null;
+
+        public CarrepairAdd()
+        {
+            bll_OA_CarDictionaryBLL = new OA_CarDictionaryBLL();
+            oA_WorkReminderBll = new OA_CarrepairBLL();
+        }
+
+        //椤甸潰鍔犺浇
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                //this.selrepairType.DataSource = bll_OA_CarDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "缁翠慨绫诲瀷");
+                //this.selrepairType.DataValueField = "ParName";
+                //this.selrepairType.DataTextField = "ParName";
+                //this.selrepairType.DataBind();
+            }
+        }
+
+        //琛ㄥ崟鎻愪氦
+        protected void btn_submit_form(object sender, EventArgs e)
+        {
+            try
+            {
+                if (string.IsNullOrEmpty(this.txtrepairTime.Value))
+                {
+                    JavaScript.MessageBox("缁翠慨鏃堕棿涓嶈兘涓虹┖", this);
+                    return;
+                }
+
+                DateTime nowTime = DateTime.Now;
+                OA_Carrepair m_OA_Carrepair = new OA_Carrepair();
+                m_OA_Carrepair.CarId = Request["carid"].ToInt32();
+                m_OA_Carrepair.repairPerson = this.txtrepairPerson.Value;
+                m_OA_Carrepair.repairTime = this.txtrepairTime.Value.ToDateTime2();
+                m_OA_Carrepair.repairType = "";
+                m_OA_Carrepair.repairMoney = this.txtrepairMoney.Value.ToDecimal2();
+                m_OA_Carrepair.repairRecord = this.txtrepairRecord.Value;
+                m_OA_Carrepair.Operator = CurrentUser.ShortName;
+                m_OA_Carrepair.LastUpdateTime = nowTime;
+
+                if (oA_WorkReminderBll.InsertModel(m_OA_Carrepair))
+                    JavaScript.MessageBoxCloseAndRefreshFirst("鏂板鎴愬姛", this);
+                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/workcar/CarrepairAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairAdd.aspx.designer.cs
new file mode 100644
index 0000000..fe4f829
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairAdd.aspx.designer.cs
@@ -0,0 +1,89 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.workcar
+{
+
+
+    public partial class CarrepairAdd
+    {
+
+        /// <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>
+        /// txtrepairTime 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtrepairTime;
+
+        /// <summary>
+        /// txtrepairPerson 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtrepairPerson;
+
+        /// <summary>
+        /// txtrepairMoney 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtrepairMoney;
+
+        /// <summary>
+        /// txtrepairRecord 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtrepairRecord;
+
+        /// <summary>
+        /// btn_submit 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Button btn_submit;
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairDetail.aspx
new file mode 100644
index 0000000..40d196a
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairDetail.aspx
@@ -0,0 +1,55 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CarrepairDetail.aspx.cs" Inherits="CY.WebForm.Pages.workcar.CarrepairDetail" %>
+
+<!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" />
+</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 w100px">
+                    缁翠慨鏃堕棿锛�
+                </td>
+                <td>
+                    <span id="txtrepairTime" runat="server"></span>
+                </td>
+                <td class="ali03">
+                    缁翠慨浜猴細
+                </td>
+                <td>
+                    <span id="txtrepairPerson" runat="server"></span>
+                </td>
+            </tr>
+            <tr>
+                <td class="ali03">
+                     缁翠慨璐圭敤(鍏�)锛�
+                </td>
+                <td>
+                    <span id="txtrepairMoney" runat="server"></span>
+                </td>
+                <td class="ali03 w100px">
+                   
+                </td>
+                <td>
+                   
+                </td>
+            </tr>
+            <tr>
+                <td class="ali03">
+                    缁翠慨璁板綍锛�
+                </td>
+                <td colspan="3">
+                    <div id="txtrepairRecord" runat="server" style="overflow: visible; word-break: break-all; word-wrap: normal; width: 300px;">
+                    </div>
+                </td>
+            </tr>
+        </table>
+    </div>
+    </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairDetail.aspx.cs
new file mode 100644
index 0000000..5d6ff43
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairDetail.aspx.cs
@@ -0,0 +1,56 @@
+锘縰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.workcar
+{
+    //鍚磋緣
+    //缁翠慨璁板綍鏄庣粏
+    public partial class CarrepairDetail : BasePage
+    {
+        Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
+        OA_CarrepairBLL oA_WorkReminderBll = null;
+
+        public CarrepairDetail()
+        {
+            bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
+            oA_WorkReminderBll = new OA_CarrepairBLL();
+        }
+
+        //椤甸潰鍔犺浇
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                InitData();
+            }
+        }
+
+        //鏁版嵁鍔犺浇
+        public void InitData()
+        {
+            OA_Carrepair m_OA_Carrepair = oA_WorkReminderBll.GetModelByKeyid(Request["keyid"].ToInt32());
+            if (m_OA_Carrepair != null)
+            {
+                this.txtrepairTime.InnerText = m_OA_Carrepair.repairTime.Value.ToString("yyyy-MM-dd");
+                this.txtrepairPerson.InnerText = m_OA_Carrepair.repairPerson.ToString2();
+                this.txtrepairMoney.InnerText = m_OA_Carrepair.repairMoney.Value.ToString("0.00");
+                //this.txtrepairType.InnerText = m_OA_Carrepair.repairType.ToString2();
+                this.txtrepairRecord.InnerText = m_OA_Carrepair.repairRecord.ToString2();
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairDetail.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairDetail.aspx.designer.cs
new file mode 100644
index 0000000..49801ca
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairDetail.aspx.designer.cs
@@ -0,0 +1,80 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.workcar
+{
+
+
+    public partial class CarrepairDetail
+    {
+
+        /// <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>
+        /// txtrepairTime 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtrepairTime;
+
+        /// <summary>
+        /// txtrepairPerson 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtrepairPerson;
+
+        /// <summary>
+        /// txtrepairMoney 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtrepairMoney;
+
+        /// <summary>
+        /// txtrepairRecord 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl txtrepairRecord;
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairList.aspx
new file mode 100644
index 0000000..63ead1f
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairList.aspx
@@ -0,0 +1,160 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CarrepairList.aspx.cs" Inherits="CY.WebForm.Pages.workcar.CarrepairList" %>
+
+<!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/workcar/CarrepairDetail.aspx?keyid=" + keyid, Title: "缁翠慨璁板綍鏄庣粏", Width: 500, Height: 240 });
+        }
+
+        //娣诲姞
+        function addModel() {
+            top.Dialog.open({ URL: "/Pages/workcar/CarrepairAdd.aspx?carid=" + '<%=Request["carid"] %>', Title: "鏂板缁翠慨璁板綍", Width: 500, Height: 240 });
+        }
+
+        //鍒犻櫎
+        function onDele(keyid) {
+            top.Dialog.confirm("纭畾瑕佸垹闄よ璁板綍鍚楋紵", function () {
+                window.location = "/Pages/workcar/CarrepairList.aspx?delete=" + keyid + "&carid=" + '<%=Request["carid"] %>';
+            });
+        }
+
+        //鎵归噺鍒犻櫎
+        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/workcar/CarrepairList.aspx?deleteKeyIds=" + deleteKeyIds + "&carid=" + '<%=Request["carid"] %>';
+                });
+            }
+        }
+    </script>
+</head>
+<body>
+    <form id="form1" runat="server">
+    <div id="scrollContent">
+        <div class="box1" paneltitle="鍔熻兘闈㈡澘" roller="false">
+            <table class="TableNewStyle">
+                <tr>
+                    <td class="ali03">
+                        缁翠慨鏃堕棿锛�
+                    </td>
+                    <td style="width: 215px">
+                        <input id="txtBeginrepairTime" type="text" class="date w90px" datefmt="yyyy-MM-dd" runat="server" />-<input id="txtEndrepairTime" type="text" class="date w90px" datefmt="yyyy-MM-dd" runat="server" />
+                    </td>
+                    <td class="ali03">
+                        缁翠慨浜猴細
+                    </td>
+                    <td>
+                        <input id="txtrepairPeople" type="text" class="w90px" 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="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">
+                                缁翠慨鏃堕棿
+                            </th>
+                            <th style="text-align: center">
+                                缁翠慨浜�
+                            </th>
+                          
+                            <th style="text-align: center">
+                                缁翠慨璐圭敤
+                            </th>
+                            <th style="text-align: center">
+                                鎿嶄綔
+                            </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("CarNumber")%>
+                        </td>
+                        <td style="text-align: center">
+                            <%#Eval("repairTime","{0:yyyy-MM-dd}")%>
+                        </td>
+                        <td style="text-align: center">
+                            <%#Eval("repairPerson")%>
+                        </td>
+                        
+                        <td style="text-align: center">
+                           <%#Eval("repairMoney", "{0:F2}")%>鍏�
+                        </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/workcar/CarrepairList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairList.aspx.cs
new file mode 100644
index 0000000..29cb253
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairList.aspx.cs
@@ -0,0 +1,98 @@
+锘縰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.workcar
+{
+    //鍚磋緣
+    //杞﹁締缁翠慨璁板綍
+    public partial class CarrepairList : BasePage
+    {
+        OA_CarrepairBLL bll_OA_CarrepairBll = null;
+        OA_CarDictionaryBLL bll_OA_CarDictionaryBLL = null;
+        //鍒濆鍖�
+        public CarrepairList()
+        {
+            bll_OA_CarrepairBll = new OA_CarrepairBLL();
+            bll_OA_CarDictionaryBLL = new OA_CarDictionaryBLL();
+        }
+
+        //椤甸潰鍔犺浇
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
+            if (!IsPostBack)
+            {
+                BindList();
+                //this.selrepairType.DataSource = bll_OA_CarDictionaryBLL.SelectListByMemberIdAndParType(CurrentUser.MemberId, "缁翠慨绫诲瀷");
+                //this.selrepairType.DataValueField = "ParName";
+                //this.selrepairType.DataTextField = "ParName";
+                //this.selrepairType.DataBind();
+                //this.selrepairType.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+            }
+            if (Request["delete"] != null)
+            {
+                OA_Carrepair model = bll_OA_CarrepairBll.GetModelByKeyid(Request["delete"].ToInt32());
+                if (model != null && model.Keyid != null)
+                {
+                    bll_OA_CarrepairBll.DeleteModel(model);
+                    JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
+                    Response.Redirect("/Pages/workcar/CarrepairList.aspx?carid=" + Request["carid"]);
+                }
+                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_Carrepair model = bll_OA_CarrepairBll.GetModelByKeyid(keyId.ToInt32());
+                    if (model.Keyid != null && model != null)
+                        bll_OA_CarrepairBll.DeleteModel(model);
+                    else
+                    {
+                        JavaScript.MessageBox("鍒犻櫎澶辫触", this);
+                        return;
+                    }
+                }
+                JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
+                Response.Redirect("/Pages/workcar/CarrepairList.aspx?carid=" + Request["carid"]);
+            }
+        }
+
+        //缁戝畾鏁版嵁
+        private void BindList()
+        {
+            Pagination pa = new Pagination();
+            pa.PageSize = UCPager1.AspNetPager.PageSize;
+            pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
+            this.RepClientList.DataSource = bll_OA_CarrepairBll.SelectModelPage(pa, Request["carid"].ToInt32(), this.txtrepairPeople.Value, this.txtBeginrepairTime.Value.ToDateTime2(), this.txtEndrepairTime.Value.ToDateTime2(), null, null, null, 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/workcar/CarrepairList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairList.aspx.designer.cs
new file mode 100644
index 0000000..102c139
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/workcar/CarrepairList.aspx.designer.cs
@@ -0,0 +1,98 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.workcar
+{
+
+
+    public partial class CarrepairList
+    {
+
+        /// <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>
+        /// txtBeginrepairTime 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtBeginrepairTime;
+
+        /// <summary>
+        /// txtEndrepairTime 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtEndrepairTime;
+
+        /// <summary>
+        /// txtrepairPeople 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtrepairPeople;
+
+        /// <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;
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Web.config b/CY_ECommercePlatform/CY.WebForm/Web.config
index 8edd974..a04f9bc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Web.config
+++ b/CY_ECommercePlatform/CY.WebForm/Web.config
@@ -268,9 +268,7 @@
   </exceptionHandling>
   <connectionStrings>
     <!--<add name="SqlConnection" connectionString="Server=CB2-20200827ONU;Database=ECTEST;Trusted_Connection=True;" providerName="System.Data.SqlClient" />-->
-     <add name="SqlConnection"
-			 connectionString="Data Source=.;Initial Catalog=ECTEST;User ID=sa;Password=123456;Max Pool Size=32767; Min Pool Size=0;"
-			 providerName="System.Data.SqlClient" />
+     <add name="SqlConnection" connectionString="Data Source=.;Initial Catalog=ECTEST;User ID=sa;Password=123456;Max Pool Size=32767; Min Pool Size=0;" providerName="System.Data.SqlClient" />
     <!--<add name="SqlConnection"
       connectionString="Data Source=118.123.213.60\SQLSERVER2008;Initial Catalog=ECTEST;User ID=sa;Password=123qwe!@#;"
       providerName="System.Data.SqlClient" />-->
@@ -290,6 +288,7 @@
     <add key="RootConfigPath" value="" />
     <add key="LoginURL" value="" />
     <add key="UploadFileURL" value="http://localhost:2641/FileUpload.aspx" />
+    <add key="TuPianLuJing" value="http://localhost:8888/" />
   </appSettings>
   <system.web>
     <httpModules>
@@ -383,6 +382,10 @@
         <assemblyIdentity name="Microsoft.Practices.Unity.Interception" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-2.1.505.0" newVersion="2.1.505.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-0.86.0.518" newVersion="0.86.0.518" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git "a/CY_ECommercePlatform/CY.WebForm/images/jihuageshi/\344\270\212\344\274\240\350\256\241\345\210\222\350\256\242\345\215\225.xlsx" "b/CY_ECommercePlatform/CY.WebForm/images/jihuageshi/\344\270\212\344\274\240\350\256\241\345\210\222\350\256\242\345\215\225.xlsx"
new file mode 100644
index 0000000..b4681fe
--- /dev/null
+++ "b/CY_ECommercePlatform/CY.WebForm/images/jihuageshi/\344\270\212\344\274\240\350\256\241\345\210\222\350\256\242\345\215\225.xlsx"
Binary files differ
diff --git a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
index 7ac7e87..f75347b 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
@@ -174,6 +174,16 @@
     }
 }
 
+function WorkBookFengMianaChange(obj, index) {
+    var value = $(obj).val();
+    if (value == "-1" || value == -1) {
+        $("#divWorkBookFengMian" + index).show();
+        $("#divWorkBookFengMian" + index).find("input").show();
+    } else {
+        $("#divWorkBookFengMian" + index).hide();
+    }
+}
+
 function WorkBookCountChange(obj, index) {
  
     var price = $("#WorkBookPrice" + index).val();
@@ -227,7 +237,7 @@
         var value = newValue + 1;
         $("#WorkBookAdd").val("浣滀笟鏈�" + value);
     }
-    $("#WorkBookNamea" + newValue + "").val($("#WorkBookNamea" + hidValue + "").val());
+    $("#WorkBookNamea" + newValue + "").val((parseInt($("#WorkBookNamea" + hidValue + "").val())+1));
     $("#WorkBookSizea" + newValue + "").val($("#WorkBookSizea" + hidValue + "").val());
     $("#WorkBookFirstSizea" + newValue + "").val($("#WorkBookFirstSizea" + hidValue + "").val());
     $("#WorkBookSecondSizea" + newValue + "").val($("#WorkBookSecondSizea" + hidValue + "").val());
@@ -244,7 +254,11 @@
     $("#WorkBookMoneya" + newValue + "").val($("#WorkBookMoneya" + hidValue + "").val());
 };
   
+//缁存姢
+function onViewuplod(keyid) {
 
+    top.Dialog.open({ URL: "/Pages/business/WorkBookUpLoad.aspx?Keyid=" + keyid, Title: "涓婁紶鍥剧墖", Width: 500, Height: 250 });
+}
  
 function WorkBookDelClick() {
         var hidValue = $("#hidWorkBookPageNum").val();
@@ -1012,6 +1026,10 @@
                         }
                         $("#printCount").val("500");
                         $("#divInquiryResult").hide();
+                        if (printTypeId == "15") {
+                            $("#paperSize").val(100);
+                        }
+                       
                     }
          );
 
@@ -1474,7 +1492,7 @@
         if (insideArry.length > 0) {
             for (var j = 0; j < insideArry.length; j++) {
                 var index = insideArry[j].InsideIndex;
-                if (parseInt(index) > 1 && j == insideArry.length - 1) {
+                if (parseInt(index) > 1 ) {
                     $("#InsidePage" + index + "").show();
                     $("#hidInsidePageNum").val(index);
                     var indexValue = parseInt(index);
@@ -1556,11 +1574,28 @@
                 $("#WorkBookPricea" + (i + 1)).val(insideArry[i].WorkBookPrice);
                 $("#WorkBookMoneya" + (i + 1)).val(insideArry[i].WorkBookMoney);
                 $("#WorkBookFengMiana" + (i + 1)).val(insideArry[i].WorkBookFengMian);
+                if (insideArry[i].WorkBookFengMian == "-1") {
+                    $("#divWorkBookFengMiana" + (i + 1)).show();
+                    $("#divWorkBookFengMiana" + (i + 1)).find("input").show();
+                    $("#ZiWorkBookFengMiana" + (i + 1)).val(insideArry[i].ZiWorkBookFengMian);
+                }
+
                 $("#FengMianYaoqiua" + (i + 1)).val(insideArry[i].FengMianYaoqiu);
                 $("#WorkBookNeiXinga" + (i + 1)).val(insideArry[i].WorkBookNeiXing);
 
                 $("#NeiXingYaoqiua" + (i + 1)).val(insideArry[i].NeiXingYaoqiu);
                 $("#WorkBookpageNuma" + (i + 1)).val(insideArry[i].WorkBookpageNum);
+                if (insideArry[i].fengmian != "") {
+                    $("#fengmiana" + (i + 1)).attr("src", insideArry[i].fengmian);
+                    $("#viewfengmiana" + (i + 1)).attr("href", insideArry[i].fengmian);
+                    $("#hidefengmiana" + (i + 1)).val(insideArry[i].fengmian);
+                }
+                if (insideArry[i].neiye != "") {
+                    $("#neiyea" + (i + 1)).attr("src", insideArry[i].neiye);
+                    $("#viewneiyea" + (i + 1)).attr("href", insideArry[i].neiye);
+                    $("#hideneiyea" + (i + 1)).val(insideArry[i].neiye);
+                }
+              
 
 
 
diff --git a/CY_ECommercePlatform/CY.WebForm/js/business/BackVisitNote.js b/CY_ECommercePlatform/CY.WebForm/js/business/BackVisitNote.js
index f7b86f4..e2565b9 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/business/BackVisitNote.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/business/BackVisitNote.js
@@ -17,7 +17,7 @@
         var data = {
             Reason: document.getElementById('txtReason').value,
             Advice: document.getElementById('txtAdvice').value,
-            LastUpdateTime: document.getElementById('spnLastUpdateTime').innerHTML,
+            LastTime: document.getElementById('spnLastUpdateTime').innerHTML,
             Operator: document.getElementById('spnOperator').innerHTML,
             IsVisited: GetValueByName('IsVisited'),
             Scores: jscore
diff --git a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
index f7a528f..df309d1 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
@@ -536,6 +536,8 @@
         document.getElementById('tbFacing').style.display = 'none';
         document.getElementById('selVerifyWay12').style.display = 'none';
         document.getElementById('selVerifyWay21').style.display = 'none';
+        document.getElementById('selVerifyWay1234').style.display = 'none';
+        document.getElementById('selVerifyWay4321').style.display = 'none';
         if (OldOrderId == "" || OldOrderId == "0") {
             document.getElementById('txtDeliveryTime').value = "";
         }
@@ -551,6 +553,8 @@
         document.getElementById('selVerifyWay21').style.display = '';
         document.getElementById('selVerifyWay123').style.display = '';
         document.getElementById('selVerifyWay321').style.display = '';
+        document.getElementById('selVerifyWay1234').style.display = '';
+        document.getElementById('selVerifyWay4321').style.display = '';
     }
 }
 
diff --git a/CY_ECommercePlatform/CY.WebForm/js/common/Printter.js b/CY_ECommercePlatform/CY.WebForm/js/common/Printter.js
index f5d1d7b..868081f 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/common/Printter.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/common/Printter.js
@@ -131,8 +131,22 @@
             }
             else {
                 $(".warning").remove();
-                //alert($(document.documentElement).html());
-                LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", $(document.documentElement).html());
+                /*alert($(document.documentElement).html());*/
+               /* LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", $(document.documentElement).html());*/
+
+                // 鑾峰彇HTML鍐呭
+                var content = $(document.documentElement).html();
+
+                // 灏嗗唴瀹规寜鍒嗛〉鏍囩鍒嗗壊
+                var pages = content.split('<div class="page-break"></div>');
+                // 閬嶅巻姣忎竴椤电殑鍐呭
+                for (var i = 0; i < pages.length; i++) {
+                  /*  alert(pages[i]);*/
+                    if (i > 0) LODOP.NewPage(); // 瀵逛簬闈炵涓�椤碉紝娣诲姞鏂伴〉
+
+                    // 娣诲姞鎵撳嵃鍐呭
+                    LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", pages[i]);
+                }
             }
         }
         LODOP.PREVIEW();
diff --git a/CY_ECommercePlatform/CY.WebForm/packages.config b/CY_ECommercePlatform/CY.WebForm/packages.config
index 473d6dd..5248ade 100644
--- a/CY_ECommercePlatform/CY.WebForm/packages.config
+++ b/CY_ECommercePlatform/CY.WebForm/packages.config
@@ -1,4 +1,6 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EntityFramework" version="6.4.4" targetFramework="net40" />
+  <package id="NPOI" version="2.4.1" targetFramework="net40" />
+  <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/CY_ECommercePlatform/UploadFiles/Web.config b/CY_ECommercePlatform/UploadFiles/Web.config
index c88ba79..465210f 100644
--- a/CY_ECommercePlatform/UploadFiles/Web.config
+++ b/CY_ECommercePlatform/UploadFiles/Web.config
@@ -368,6 +368,10 @@
         <assemblyIdentity name="Microsoft.Practices.Unity.Interception" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-2.1.505.0" newVersion="2.1.505.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-0.84.0.0" newVersion="0.84.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 

--
Gitblit v1.9.1