From ebd639c929bd5c05859b6b414787e3440cdcd4bc Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 20 十二月 2024 12:21:42 +0800
Subject: [PATCH] 财务管理 -》外协付款  批量付款

---
 CY_ECommercePlatform/CY.WebForm/Pages/procurement/SpecificationList.aspx                  |    4 
 CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs                               |   93 +
 CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js                                     |  119 +
 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx                             |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/procurement/GoodsInfoList.aspx                      |   11 
 CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePiliangPayMoney.aspx             |  185 +++
 CY_ECommercePlatform/CY.WebForm/Pages/procurement/BrandList.aspx.designer.cs              |   34 
 CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePayOrder.aspx                    |   48 
 CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs                         |  771 ++++++++++++
 CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx                  |    1 
 CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx                     |   12 
 CY_ECommercePlatform/CY.SQLDAL/OA/OA_SpecificationDAL.cs                                  |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.designer.cs      |   55 
 CY_ECommercePlatform/CY.WebForm/Pages/procurement/SpecificationList.aspx.designer.cs      |   34 
 CY_ECommercePlatform/CY.WebForm/Pages/procurement/BrandList.aspx.cs                       |   32 
 CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.cs            |   45 
 CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs                  |    2 
 CY_ECommercePlatform/CY.BLL/OA/OA_GoodsInfoBLL.cs                                         |    4 
 CY_ECommercePlatform/CY.Model/CY.Model.csproj                                             |    1 
 CY_ECommercePlatform/CY.SQLDAL/OA/OA_GoodsInfoDAL.cs                                      |    8 
 CY_ECommercePlatform/CY.SQLDAL/OA/OA_BrandDAL.cs                                          |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx.designer.cs        |   59 
 CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx               |    6 
 CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.cs               |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/procurement/BrandList.aspx                          |    4 
 CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.designer.cs   |    9 
 CY_ECommercePlatform/CY.Model/Inquiry/InquirySHiJuanModel.cs                              |  244 ++++
 CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePiliangPayMoney.aspx.cs          |  320 +++++
 CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx                    |    8 
 CY_ECommercePlatform/CY.IDAL/OA/IOA_GoodsInfoDAL.cs                                       |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx                                  | 1202 +++++++++++++++----
 CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.designer.cs         |    9 
 CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePayOrder.aspx.designer.cs        |   50 
 CY_ECommercePlatform/CY.WebForm/Pages/procurement/SpecificationList.aspx.cs               |   31 
 CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePiliangPayMoney.aspx.designer.cs |  134 ++
 CY_ECommercePlatform/CY.WebForm/Pages/procurement/GoodsInfoList.aspx.cs                   |   39 
 CY_ECommercePlatform/CY.WebForm/Pages/procurement/GoodsInfoList.aspx.designer.cs          |   41 
 CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx.cs                 |    7 
 38 files changed, 3,204 insertions(+), 428 deletions(-)

diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_GoodsInfoBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_GoodsInfoBLL.cs
index c94e209..0803d10 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_GoodsInfoBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_GoodsInfoBLL.cs
@@ -67,9 +67,9 @@
         /// <param name="FirmId"></param>
         /// <param name="GoodsName"></param>
         /// <returns></returns>
-        public IEnumerable<Model.OA_GoodsInfo> SelectModelPage(Pagination pa, Guid FirmId, string GoodsName, string CommodityName)
+        public IEnumerable<Model.OA_GoodsInfo> SelectModelPage(Pagination pa, Guid FirmId, string GoodsName, string CommodityName, string selGoodsStatus)
         {
-            return goodsInfoDAL.SelectModelPage(pa, FirmId, GoodsName, CommodityName);
+            return goodsInfoDAL.SelectModelPage(pa, FirmId, GoodsName, CommodityName, selGoodsStatus);
         }
 
         public DataTable SelectTableList(Guid FirmId)
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_GoodsInfoDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_GoodsInfoDAL.cs
index 50ba271..2dafc65 100644
--- a/CY_ECommercePlatform/CY.IDAL/OA/IOA_GoodsInfoDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_GoodsInfoDAL.cs
@@ -15,7 +15,7 @@
     public interface IOA_GoodsInfoDAL : ICommonDAL, IPaging<OA_GoodsInfo>, IGetAllModel<OA_GoodsInfo>
     {
         Model.OA_GoodsInfo SelectSingleModel(string Keyid);
-        IEnumerable<Model.OA_GoodsInfo> SelectModelPage(Pagination pa, Guid FirmId, string GoodsName, string CommodityName);
+        IEnumerable<Model.OA_GoodsInfo> SelectModelPage(Pagination pa, Guid FirmId, string GoodsName, string CommodityName, string selGoodsStatus);
         DataTable SelectTableList(Guid FirmId);
         DataTable SlectModleByCommity(string GoodsTypeId,Guid FirmId);
         bool isExistGoodsName(String GoodsName, Guid FirmId, int ID);
diff --git a/CY_ECommercePlatform/CY.Model/CY.Model.csproj b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
index 3276fc3..ea0e8ff 100644
--- a/CY_ECommercePlatform/CY.Model/CY.Model.csproj
+++ b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
@@ -111,6 +111,7 @@
     <Compile Include="Inquiry\InquiryEnum.cs" />
     <Compile Include="Inquiry\InquiryInsideModel.cs" />
     <Compile Include="Inquiry\InquiryResultModel.cs" />
+    <Compile Include="Inquiry\InquirySHiJuanModel.cs" />
     <Compile Include="Inquiry\InquiryWorkBookModel.cs" />
     <Compile Include="Inquiry\Inquiry_AdhesiveFastCost.cs" />
     <Compile Include="Inquiry\Inquiry_AdhesivePaperPrice.cs" />
diff --git a/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs b/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs
index e02c6db..9bad503 100644
--- a/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs
+++ b/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs
@@ -14,7 +14,8 @@
         private List<int> _afterWorkList;
         private List<InquiryInsideModel> _inquiryInsideList;
         private List<InquiryWorkBookModel> _inquiryWorkBookList;
-        
+        private List<InquirySHiJuanModel> _inquiryShiJuanList;
+
 
         /// <summary>
         /// 鍗板埛绫诲瀷
@@ -30,6 +31,17 @@
         /// 绾稿紶灏哄
         /// </summary>
         public int PrintSizeId { get; set; }
+
+        /// <summary>
+        /// 绾稿紶灏哄
+        /// </summary>
+        public string paperSize6P { get; set; }
+        public string paperSizeA4 { get; set; }
+        public string paperSizeA3 { get; set; }
+        /// <summary>
+        /// 绾稿紶灏哄
+        /// </summary>
+        public string paperSize8P { get; set; }
 
         /// <summary>
         /// 绾稿紶Id
@@ -177,6 +189,24 @@
         public string PrintSizeName { get; set; }
 
         /// <summary>
+        /// 鍗板埛灏哄
+        /// </summary>
+        public string PrintSizeName6P { get; set; }
+        public string PrintSizeName8P { get; set; }
+        public string PrintSizeNameA4 { get; set; }
+        public string PrintSizeNameA3 { get; set; }
+
+        /// <summary>
+        /// papershijuan
+        /// </summary>
+        public string papershijuan { get; set; }
+
+        public string printColorshijuan { get; set; }
+
+        public string paper1 { get; set; }
+        public string printColor1 { get; set; }
+        public string printColor2 { get; set; }
+        /// <summary>
         /// 瑕嗚啘绫诲瀷
         /// </summary>
         public int CoveredTypeId { get; set; }
@@ -301,6 +331,44 @@
         /// </summary>
         public string secondSize { get; set; }
 
+
+        /// <summary>
+        /// 鑷畾涔夊昂瀵稿
+        /// </summary>
+        public string firstSize6P { get; set; }
+
+        /// <summary>
+        /// 鑷畾涔夊昂瀵搁暱
+        /// </summary>
+        public string secondSize8P { get; set; }
+
+        /// <summary>
+        /// 鑷畾涔夊昂瀵稿
+        /// </summary>
+        public string firstSize8P { get; set; }
+
+        /// <summary>
+        /// 鑷畾涔夊昂瀵搁暱
+        /// </summary>
+        public string secondSize6P { get; set; }
+
+        /// <summary>
+        /// 鑷畾涔夊昂瀵稿
+        /// </summary>
+        public string firstSizeA4 { get; set; }
+        /// <summary>
+        /// 鑷畾涔夊昂瀵搁暱
+        /// </summary>
+        public string secondSizeA3 { get; set; }
+        /// <summary>
+        /// 鑷畾涔夊昂瀵稿
+        /// </summary>
+        public string firstSizeA3 { get; set; }
+        /// <summary>
+        /// 鑷畾涔夊昂瀵搁暱
+        /// </summary>
+        public string secondSizeA4 { get; set; }
+
         /// <summary>
         /// 鍘氬害
         /// </summary>
@@ -381,8 +449,31 @@
                 _inquiryWorkBookList = value;
             }
         }
+        /// <summary>
+        /// 鐢诲唽锛屼功鍒婄殑鍐呴〉鍙傛暟鍒楄〃
+        /// </summary>
+        public List<InquirySHiJuanModel> InquirySHiJuanList
+        {
+            get
+            {
+                if (_inquiryShiJuanList == null)
+                {
+                    _inquiryShiJuanList = new List<InquirySHiJuanModel>();
+                }
+                return _inquiryShiJuanList;
+            }
+            set
+            {
+                if (_inquiryShiJuanList == null)
+                {
+                    _inquiryShiJuanList = new List<InquirySHiJuanModel>();
+                }
+                _inquiryShiJuanList = value;
+            }
+        }
         
 
+
         #region 鐢ㄤ簬鏄剧ず
 
         /// <summary>
diff --git a/CY_ECommercePlatform/CY.Model/Inquiry/InquirySHiJuanModel.cs b/CY_ECommercePlatform/CY.Model/Inquiry/InquirySHiJuanModel.cs
new file mode 100644
index 0000000..7f4029e
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/Inquiry/InquirySHiJuanModel.cs
@@ -0,0 +1,244 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace CY.Model.Inquiry
+{
+    /// <summary>
+    /// 璇曞嵎淇濆瓨妯℃澘
+    /// </summary>
+    [Serializable]
+    public class InquirySHiJuanModel
+    {
+        /// <summary>
+        /// 骞寸骇
+        /// </summary>
+        public string Nianji { get; set; }
+        /// <summary>
+        /// 浜烘暟
+        /// </summary>
+        public string txtRenshu { get; set; }
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public string yuwencheckboxinput { get; set; }
+        /// <summary>
+        /// 鍑爌
+        /// </summary>
+        public string yuwenselect { get; set; }
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public string shuxuecheckboxinput { get; set; }
+        /// <summary>
+        /// 鍑爌
+        /// </summary>
+        public string shuxueselect { get; set; }
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public string yingyucheckboxinput { get; set; }
+        /// <summary>
+        /// 鍑爌
+        /// </summary>
+        public string yingyuselect { get; set; }
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public string pingdecheckboxinput { get; set; }
+        /// <summary>
+        /// 鍑爌
+        /// </summary>
+        public string pingdeselect { get; set; }
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public string kexuecheckboxinput { get; set; }
+        /// <summary>
+        /// 鍑爌
+        /// </summary>
+        public string kexueselect { get; set; }
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public string lishicheckboxinput { get; set; }
+        /// <summary>
+        /// 鍑爌
+        /// </summary>
+        public string lishiselect { get; set; }
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public string dilicheckboxinput { get; set; }
+        /// <summary>
+        /// 鍑爌
+        /// </summary>
+        public string diliselect { get; set; }
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public string shengwucheckboxinput { get; set; }
+        /// <summary>
+        /// 鍑爌
+        /// </summary>
+        public string shengwuselect { get; set; }
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public string wulicheckboxinput { get; set; }
+        /// <summary>
+        /// 鍑爌
+        /// </summary>
+        public string wuliselect { get; set; }
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public string huaxuecheckboxinput { get; set; }
+        /// <summary>
+        /// 鍑爌
+        /// </summary>
+        public string huaxueselect { get; set; }
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public string zhengzhicheckboxinput { get; set; }
+        /// <summary>
+        /// 鍑爌
+        /// </summary>
+        public string zhengzhiselect { get; set; }
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public string sixiangpingdecheckboxinput { get; set; }
+        /// <summary>
+        /// 鍑爌
+        /// </summary>
+        public string sixiangpingdeselect { get; set; }
+
+
+
+
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public string yuwendatikacheckboxinput { get; set; }
+        /// <summary>
+        /// 鍑爌
+        /// </summary>
+        public string yuwendatikaselect { get; set; }
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public string shuxuedatikacheckboxinput { get; set; }
+        /// <summary>
+        /// 鍑爌
+        /// </summary>
+        public string shuxuedatikaselect { get; set; }
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public string yingyudatikacheckboxinput { get; set; }
+        /// <summary>
+        /// 鍑爌
+        /// </summary>
+        public string yingyudatikaselect { get; set; }
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public string pingdedatikacheckboxinput { get; set; }
+        /// <summary>
+        /// 鍑爌
+        /// </summary>
+        public string pingdedatikaselect { get; set; }
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public string kexuedatikacheckboxinput { get; set; }
+        /// <summary>
+        /// 鍑爌
+        /// </summary>
+        public string kexuedatikaselect { get; set; }
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public string lishidatikacheckboxinput { get; set; }
+        /// <summary>
+        /// 鍑爌
+        /// </summary>
+        public string lishidatikaselect { get; set; }
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public string dilidatikacheckboxinput { get; set; }
+        /// <summary>
+        /// 鍑爌
+        /// </summary>
+        public string dilidatikaselect { get; set; }
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public string shengwudatikacheckboxinput { get; set; }
+        /// <summary>
+        /// 鍑爌
+        /// </summary>
+        public string shengwudatikaselect { get; set; }
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public string wulidatikacheckboxinput { get; set; }
+        /// <summary>
+        /// 鍑爌
+        /// </summary>
+        public string wulidatikaselect { get; set; }
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public string huaxuedatikacheckboxinput { get; set; }
+        /// <summary>
+        /// 鍑爌
+        /// </summary>
+        public string huaxuedatikaselect { get; set; }
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public string zhengzhidatikacheckboxinput { get; set; }
+        /// <summary>
+        /// 鍑爌
+        /// </summary>
+        public string zhengzhidatikaselect { get; set; }
+
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public string sixiangpingdedatikacheckboxinput { get; set; }
+        /// <summary>
+        /// 鍑爌
+        /// </summary>
+        public string sixiangpingdedatikaselect { get; set; }
+
+    }
+}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_BrandDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_BrandDAL.cs
index 7b52768..56340d5 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_BrandDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_BrandDAL.cs
@@ -256,7 +256,7 @@
             }
             if (!string.IsNullOrEmpty(CommdityName))
             {
-                Condition += "and  c.CommodityName like '%" + CommdityName + "%'";
+                Condition += "and  a.GoodsTypeId = " + CommdityName + "";
             }
             string selectTarget = " t.GoodsId ,t.AorDerNum ";
             string fromSource = "(select DISTINCT  a.Keyid as GoodsId ,c.OrderNum AS AorDerNum from dbo.OA_GoodsInfo AS a INNER JOIN  dbo.OA_Brand AS b ON a.Keyid=b.GoodsId LEFT JOIN dbo.OA_Commodity AS c ON a.GoodsTypeId= c.Keyid where " + Condition + ") as t";
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_GoodsInfoDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_GoodsInfoDAL.cs
index aafa92a..d4e204e 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_GoodsInfoDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_GoodsInfoDAL.cs
@@ -153,7 +153,7 @@
             throw new NotImplementedException();
         }
 
-        public IEnumerable<Model.OA_GoodsInfo> SelectModelPage(Pagination pa, Guid FirmId, string GoodsName, string CommodityName)
+        public IEnumerable<Model.OA_GoodsInfo> SelectModelPage(Pagination pa, Guid FirmId, string GoodsName, string CommodityName ,string selGoodsStatus)
         {
 
             string Condition = " where a.FirmId='" + FirmId + "' ";
@@ -163,7 +163,11 @@
             }
             if (!string.IsNullOrEmpty(CommodityName))
             {
-                Condition += "  and e.CommodityName like '%" + CommodityName + "%' ";
+                Condition += "  and a.GoodsTypeId = " + CommodityName + " ";
+            }
+            if (!string.IsNullOrEmpty(selGoodsStatus))
+            {
+                Condition += "  and a.StatusId = " + selGoodsStatus + " ";
             }
             string selTarget = "a.* ,b.Name AS brandName,c.Name as SpecificationName,d.Name as  StatusName,e.CommodityName as CommodityName";
 
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_SpecificationDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_SpecificationDAL.cs
index 2b14ea5..33e16c1 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_SpecificationDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_SpecificationDAL.cs
@@ -148,7 +148,7 @@
             }
             if (!string.IsNullOrEmpty(CommdityName))
             {
-                Condition += "and  c.CommodityName like '%" + CommdityName + "%'";
+                Condition += "and  a.GoodsTypeId = " + CommdityName + "";
             }
             string selectTarget = " t.GoodsId ,t.AorDerNum ";
             string fromSource = "(select DISTINCT  a.Keyid as GoodsId ,a.GoodsName as GoodsName,c.OrderNum AS AorDerNum,c.CommodityName as CommodityName from dbo.OA_GoodsInfo AS a INNER JOIN  dbo.OA_Specification AS b ON a.Keyid=b.GoodsId LEFT JOIN dbo.OA_Commodity AS c ON a.GoodsTypeId= c.Keyid where " + Condition + ") as t";
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx
index 9fbcb08..0685a7c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx
@@ -79,8 +79,12 @@
             <td class="w160px">
                 <%--<select id="" runat="server" keepdefaultstyle="true">
                 </select>--%>
-                <asp:DropDownList ID="selOutFirm" runat="server" AutoPostBack="True" 
+                <asp:DropDownList ID="selOutFirm" runat="server" AutoPostBack="True"  
                     onselectedindexchanged="selOutFirm_SelectedIndexChanged"></asp:DropDownList>
+                <asp:RequiredFieldValidator ID="rfvExample" runat="server" 
+    ControlToValidate="selOutFirm" Display="Dynamic" 
+    ErrorMessage="璇烽�夋嫨涓�涓鍗忓巶鍟�" InitialValue="">
+</asp:RequiredFieldValidator>
             </td>
             <td class="ali03 w100px">
                 鍒跺崟浜猴細
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.cs
index 3c00b4a..0396505 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.cs
@@ -141,6 +141,7 @@
             this.selOutFirm.DataTextField = "OutVendorName";
             this.selOutFirm.DataValueField = "FirmId";
             this.selOutFirm.DataBind();
+            this.selOutFirm.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
             selOutFirm_SelectedIndexChanged(null, null);
         }
 
@@ -201,6 +202,12 @@
                 JavaScript.MessageBox("鏈紶閫掑弬鏁帮紒", this);
                 return false;
             }
+            if (string.IsNullOrEmpty(this.selOutFirm.SelectedValue))
+            {
+                JavaScript.MessageBox("鏈�夋嫨澶栧崗鍘傚晢锛�", this);
+                return false;
+            }
+            
             int? orderid = MyConvert.ConvertToInt32(orderIdStr);
             if (!orderid.HasValue)
             {
@@ -326,33 +333,43 @@
 
         protected void selOutFirm_SelectedIndexChanged(object sender, EventArgs e)
         {
-
-            OA_CorporateClients oA_CorporateClientsModel = new OA_CorporateClients();
-            oA_CorporateClientsModel = bll_OA_CorporateClientsBLL.GetModelByMemberIdAndName(CurrentUser.MemberId, selOutFirm.SelectedItem.Text.ToString());
-            if (oA_CorporateClientsModel.Keyid != oA_CorporateClientsModel.FirmId)
+            if(selOutFirm.SelectedValue != "")
             {
-                trFile.Visible = true;
-                LF_OrderFile lfModel = new LF_OrderFile();
-                LF_OrderFileBLL lF_OrderFileBLL = new LF_OrderFileBLL();
-                lfModel = lF_OrderFileBLL.GetModel(Convert.ToInt32(Request["orderid"]));
-                if (lfModel == null)
+                OA_CorporateClients oA_CorporateClientsModel = new OA_CorporateClients();
+                oA_CorporateClientsModel = bll_OA_CorporateClientsBLL.GetModelByMemberIdAndName(CurrentUser.MemberId, selOutFirm.SelectedItem.Text.ToString());
+                if (oA_CorporateClientsModel.Keyid != oA_CorporateClientsModel.FirmId)
                 {
-                    cbkIsAllRecovery.Visible = false;
-                    IsFiles = true;
+                    trFile.Visible = true;
+                    LF_OrderFile lfModel = new LF_OrderFile();
+                    LF_OrderFileBLL lF_OrderFileBLL = new LF_OrderFileBLL();
+                    lfModel = lF_OrderFileBLL.GetModel(Convert.ToInt32(Request["orderid"]));
+                    if (lfModel == null)
+                    {
+                        cbkIsAllRecovery.Visible = false;
+                        IsFiles = true;
+                    }
+                    else
+                    {
+                        cbkIsAllRecovery.Visible = true;
+                        IsFiles = false;
+                    }
+
+
                 }
                 else
                 {
-                    cbkIsAllRecovery.Visible = true;
+                    trFile.Visible = false;
                     IsFiles = false;
                 }
-
-
             }
             else
             {
                 trFile.Visible = false;
                 IsFiles = false;
             }
+            string script = "<script>ReceiptT('member', '"+ CurrentUser.MemberId + "', 4, 100)</script>";
+            this.ClientScript.RegisterStartupScript(this.Page.GetType(), "key", script);
+            
         }
     }
 }
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.designer.cs
index b157d19..b2f1ca9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.designer.cs
@@ -51,6 +51,15 @@
         protected global::System.Web.UI.WebControls.DropDownList selOutFirm;
 
         /// <summary>
+        /// rfvExample 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.RequiredFieldValidator rfvExample;
+
+        /// <summary>
         /// selBusinessManager 鎺т欢銆�
         /// </summary>
         /// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index fb889bd..ba617c5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -9,7 +9,7 @@
     <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=102" type="text/javascript"></script>
+    <script src="../../js/Inquiry/Inquiry.js?v=116" type="text/javascript"></script>
     <script src="../../js/business/Order.js?v=36" type="text/javascript"></script>
     <!--鍓嶅彴椤甸潰end-->
     <script type="text/javascript" language="javascript">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePayOrder.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePayOrder.aspx
index 6c3641f..bc3463c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePayOrder.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePayOrder.aspx
@@ -26,6 +26,19 @@
             $("#NowPageAlreadyMoney").html(value_NowPageAlreadyMoney.toFixed(2));
             $("#NowPageNoMoney").html(value_NowPageNoMoney.toFixed(2));
         });
+
+
+        //澶栧崗鎵归噺浠樻
+        function StorageVolume() {
+            var keyid = "";
+            $(".SelectCheck:checked").each(function (ii, vv) {
+                keyid = keyid + "|" + $(vv).attr("value_Keyid");
+            });
+            if (keyid == "")
+                alertMsg("鏈�変腑浠讳綍鏁版嵁");
+            else
+                top.Dialog.open({ URL: "/Pages/financial/OutsourcePiliangPayMoney.aspx?Keyid=" + keyid + "&&sendfrom=corporate", Title: "澶栧崗鎵归噺浠樻", Width: 600, Height: 400, Modal: false });
+        }
     </script>
     <style type="text/css">
         .StatisticsMoney td { color: #FF5500; }
@@ -34,8 +47,9 @@
 </head>
 <body>
     <form id="form1" runat="server">
+        <div id="scrollContent">
     <div class="box1" paneltitle="鍔熻兘闈㈡澘" roller="false" style=''>
-        <table>
+        <table class="TableNewStyle" width="100%">
             <tr>
                 <td class="ali03">
                     涓嬪崟鏃堕棿锛�
@@ -81,11 +95,28 @@
             </tr>
         </table>
     </div>
-    <div id="scrollContent">
+        <div class="box_tool_min ">
+            <div class="center">
+                <div class="left">
+                    <div class="right">
+                        <div class="padding_top5 padding_left10">
+                            <a href="javascript:;" onclick="StorageVolume()"  ><span class="icon_add">鎵归噺浠樻</span></a>  
+                            <div class="clear">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="clear">
+            </div>
+        </div>
+    
         <div>
-            <table class="tableStyle ali02" useclick="false" usecheckbox="false" sortmode="false">
-                <thead>
+            <table class="tableStyle ali02" useclick="false" usecheckbox="true" sortmode="true">
+                
                     <tr>
+                         <th width="25">
+                    </th>
                         <th width='25px'>
                             缂栧彿
                         </th>
@@ -126,11 +157,14 @@
                             鎿嶄綔
                         </th>
                     </tr>
-                </thead>
-                <tbody>
+               
+               
                     <asp:Repeater ID="rptData" runat="server">
                         <ItemTemplate>
                             <tr>
+                                 <td>
+                                <input type="checkbox" name="keiyids" class="SelectCheck" value_keyid="<%#Eval("Keyid")%>" />
+                            </td>
                                 <td>
                                     <%#Container.ItemIndex + (UCPager1.PageSize *( UCPager1.PageIndex-1)+1)%>
                                 </td>
@@ -175,7 +209,7 @@
                             </tr>
                         </ItemTemplate>
                     </asp:Repeater>
-                </tbody>
+                
                 <tr class="StatisticsMoney">
                     <td colspan="9" class="ali03">
                         褰撳墠椤电粺璁★細
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePayOrder.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePayOrder.aspx.designer.cs
index 02fbbf2..aa0079c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePayOrder.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePayOrder.aspx.designer.cs
@@ -2,16 +2,18 @@
 // <鑷姩鐢熸垚>
 //     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
 //
-//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�� 
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace CY.WebForm.Pages.financial {
-    
-    
-    public partial class OutsourcePayOrder {
-        
+namespace CY.WebForm.Pages.financial
+{
+
+
+    public partial class OutsourcePayOrder
+    {
+
         /// <summary>
         /// CMSHead1 鎺т欢銆�
         /// </summary>
@@ -20,7 +22,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-        
+
         /// <summary>
         /// form1 鎺т欢銆�
         /// </summary>
@@ -29,7 +31,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// txtBeginData 鎺т欢銆�
         /// </summary>
@@ -38,7 +40,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtBeginData;
-        
+
         /// <summary>
         /// txtEndDate 鎺т欢銆�
         /// </summary>
@@ -47,7 +49,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtEndDate;
-        
+
         /// <summary>
         /// txtPMS_Printers 鎺т欢銆�
         /// </summary>
@@ -56,7 +58,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlSelect txtPMS_Printers;
-        
+
         /// <summary>
         /// selPrintTypes 鎺т欢銆�
         /// </summary>
@@ -65,7 +67,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlSelect selPrintTypes;
-        
+
         /// <summary>
         /// txtOrderId 鎺т欢銆�
         /// </summary>
@@ -74,7 +76,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtOrderId;
-        
+
         /// <summary>
         /// selPayStates 鎺т欢銆�
         /// </summary>
@@ -83,7 +85,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlSelect selPayStates;
-        
+
         /// <summary>
         /// btn_Search 鎺т欢銆�
         /// </summary>
@@ -92,7 +94,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button btn_Search;
-        
+
         /// <summary>
         /// txtCommission 鎺т欢銆�
         /// </summary>
@@ -101,7 +103,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtCommission;
-        
+
         /// <summary>
         /// rptData 鎺т欢銆�
         /// </summary>
@@ -110,7 +112,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Repeater rptData;
-        
+
         /// <summary>
         /// NowPageAllMoney 鎺т欢銆�
         /// </summary>
@@ -119,7 +121,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl NowPageAllMoney;
-        
+
         /// <summary>
         /// NowPageAlreadyMoney 鎺т欢銆�
         /// </summary>
@@ -128,7 +130,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl NowPageAlreadyMoney;
-        
+
         /// <summary>
         /// NowPageNoMoney 鎺т欢銆�
         /// </summary>
@@ -137,7 +139,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl NowPageNoMoney;
-        
+
         /// <summary>
         /// AllMoney 鎺т欢銆�
         /// </summary>
@@ -146,7 +148,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl AllMoney;
-        
+
         /// <summary>
         /// AlreadyMoney 鎺т欢銆�
         /// </summary>
@@ -155,7 +157,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl AlreadyMoney;
-        
+
         /// <summary>
         /// NoMoney 鎺т欢銆�
         /// </summary>
@@ -164,7 +166,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl NoMoney;
-        
+
         /// <summary>
         /// UCPager1 鎺т欢銆�
         /// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePiliangPayMoney.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePiliangPayMoney.aspx
new file mode 100644
index 0000000..77360c5
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePiliangPayMoney.aspx
@@ -0,0 +1,185 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="OutsourcePiliangPayMoney.aspx.cs" Inherits="CY.WebForm.Pages.financial.OutsourcePiliangPayMoney" %>
+
+<!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" />
+    <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
+    <style type="text/css">
+        .table2 td{ text-align:left; padding:3px 2px;}
+    </style>
+    <script type="text/javascript">
+
+        var accountsTypes = false;
+        var accounts = false;
+
+        $(function () {
+            if ('1' == document.getElementById('txtResult').value) {
+                CloseOpenWindow(true);
+                return;
+            } else;
+            document.getElementById('txtReceiveDate').value = new Date().ToString("yyyy-MM-dd HH:mm");
+            //document.getElementById('txtReceiveMoney').value = document.getElementById('txtReciveMoney').value;
+           /* document.getElementById('txtReceiveMoney').focus();*/
+            accountsTypes = '<%=Request.RequestContext.RouteData.DataTokens["accountsTypes"] %>';
+            accounts = '<%=Request.RequestContext.RouteData.DataTokens["accounts"] %>';
+
+            try {
+                accountsTypes = eval(accountsTypes);
+                accounts = eval(accounts)[0];
+            } catch (e) {
+                accountsTypes = 'object' == typeof (accountsTypes) ? accountsTypes : [];
+                accounts = [];
+            }
+
+        });
+
+        /*
+        楠岃瘉杈撳叆浠锋牸
+        */
+        function ValidateInputPrice(txt) {
+            if (!ValidateDecimal(txt)) return; else;
+            try {
+                var inputPrice = parseFloat(txt.value);
+                var unPayed = parseFloat(document.getElementById('txtReciveMoney').value);
+                txt.value = isNaN(inputPrice) || isNaN(unPayed) ? 0 : txt.value;
+                if (inputPrice > unPayed) { alertMsg(' 鏈鏀舵閲戦澶т簬璁㈠崟鏈粯娆�!<br/>涓轰簡鎮ㄧ殑璐﹀姟姝g‘鎬ц閲嶆柊澶嶆煡锛�'); }
+            } catch (e) {
+
+            }
+        }
+    </script>
+</head>
+<body style='margin: 0; padding: 0;'>
+    <form id="form1" runat="server" onsubmit="if(false)return false;">
+    <input type="hidden" id='txtResult' value='<%=Request.RequestContext.RouteData.DataTokens["IsWin"] %>'>
+    <table class="tableStyle" style="margin: 5px 0;">
+        <tr>
+            <td class="ali03 ">
+                閲囪喘鍗曟暟锛�
+            </td>
+            <td>
+                <span class="moneystyle" id="spanCountRe" runat="server"></span>
+            </td>
+        </tr>
+        <tr>
+            <td class="ali03 ">
+                鎬婚噾棰濓細
+            </td>
+            <td>
+                <span class="moneystyle" id="spanAllMoney" runat="server">锟�</span>
+            </td>
+        </tr>
+        <tr>
+            <td class="ali03 ">
+                鏈粯閲戦锛�
+            </td>
+            <td>
+                <span class="moneystyle" id="spanReceiveMoney" runat="server">锟�</span>
+            </td>
+        </tr>
+         <tr>
+            <td class="ali03 ">
+                鏀跺彇閲戦锛�
+            </td>
+            <td >
+                <asp:TextBox TextMode="SingleLine"  id="txtReciveMoney" runat="server" class="req float" min="0" ReadOnly="true" ></asp:TextBox>
+            </td>
+        </tr>
+
+            
+           
+            <tr>
+               <%-- <td style=" text-align:right;">
+                    浠樻鏂瑰紡锛�
+                </td>
+                <td colspan="5">
+                    <input type="radio" name='rdoReceiveWay' id='rdoReceiveWay0' value='0' checked="checked" /><label for='rdoReceiveWay0'>棰勪粯娆�</label>
+                    (鍓╀綑棰勪粯娆撅細<span id="nowCustomMoney" runat="server" class="moneystyle"></span>)
+                </td>--%>
+                <td class="ali03 ">
+                    璐︽埛绫诲瀷锛�
+                </td>
+                <td>
+                    <select class="Sreq" id="selAcoountType" runat="server" datatextfield="Name" datavaluefield="Name" onchange="ChangeThisType(this);" keepdefaultstyle="true" msg="璇烽�夋嫨璐︽埛绫诲瀷">
+                    </select>
+                </td>
+                </tr>
+            <tr>
+                <td class="ali03 ">
+                    璐︽埛鍚嶇О锛�
+                </td>
+                <td>
+                    <select class="Sreq" id="selAccountName" runat="server" datatextfield="AccountName" datavaluefield="Keyid" keepdefaultstyle="true" msg="璇烽�夋嫨璐︽埛鍚嶇О">
+                        <option value="">璇烽�夋嫨</option>
+                    </select>
+                </td>
+                </tr>
+            <tr>
+                <td class="ali03 ">
+                    绉戠洰鍚嶇О锛�
+                </td>
+                <td>
+                    <select id="selSubject" runat="server" datatextfield="SubjectName" datavaluefield="Keyid" keepdefaultstyle="true" msg="璇烽�夋嫨绉戠洰鍚嶇О">
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td style=" text-align:right; vertical-align: top;">
+                    浠樻鏃ユ湡锛�
+                </td>
+                <td   align="left">
+                    <input class='date' id="txtReceiveDate" runat="server" maxlength='20' datefmt="yyyy-MM-dd HH:mm" />
+                </td>
+            </tr>
+            <tr>
+                <td style=" text-align:right;">
+                    浠樻澶囨敞锛�
+                </td>
+                <td   align="left">
+                    <textarea id='txtRemark' runat="server" onblur='Restrict(this,200)' class='remark' style='height: 30px; width: 440px;'></textarea>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                </td>
+                <td   align="left">
+                <input type="button" value="纭浠樻" runat="server"   id='btnSubmit' /> 
+                </td>
+            </tr>
+    </table>
+    </form>
+     <script language="javascript" type="text/javascript">
+         function ChangeThisType(obj) {
+             $("#selAccountName").html("<option value=''>璇烽�夋嫨</option>");
+             $.ajax({
+                 url: "/Pages/financial/OutsourcePiliangPayMoney.aspx",
+                 type: "POST",
+                 dataType: "html",
+                 data: { TypeName: $(obj).val(), DataType: "change" },
+                 global: false,
+                 cache: false,
+                 success: function (data) {
+                     var myobj = eval('(' + data + ')');
+                     if (myobj != null && myobj.length > 0) {
+                         for (var i = 0; i < myobj.length; i++) {
+                             var city_keyid = myobj[i].Keyid;
+                             var city_name = myobj[i].AccountName + "-" + myobj[i].UserName;
+                             var option = "";
+                             option = "<option value = '" + city_keyid + "'>" + city_name + "</option>";
+                             $(option).appendTo($("#selAccountName"));
+                         }
+                     }
+                 }
+             });
+         }
+            
+    </script>
+    <script type="text/javascript">
+        $(function () {
+            ChangeThisType("#selAcoountType");
+        });
+    </script>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePiliangPayMoney.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePiliangPayMoney.aspx.cs
new file mode 100644
index 0000000..720434c
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePiliangPayMoney.aspx.cs
@@ -0,0 +1,320 @@
+锘縰sing 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.OA;
+using CY.BLL.Sys;
+using System.Text;
+using CY.BLL;
+using System.Data;
+using System.Transactions;
+
+namespace CY.WebForm.Pages.financial
+{
+    //鍚磋緣
+    //澶栧崗棰勪粯娆�
+    public partial class OutsourcePiliangPayMoney : BasePage
+    {
+        private EC_OrderBasicBLL _eC_OrderBasicBLL = null;
+        private OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = null;
+        OA_FirmAccountBLL _OA_FirmAccountBLL = null;
+        OA_FirmAccountRecordBLL _OA_FirmAccountRecordBLL = null;
+        OA_FirmAccountRecord firmAccountRecord = null;
+        OA_FirmAccount firmAccount = null;
+        string orderNo = string.Empty;
+
+        decimal? AllMoney = 0;
+        decimal? ReceiveMoney = 0;
+
+        /// <summary>
+        /// 鍒濆鍖栨瀯閫� 
+        /// </summary>
+        public OutsourcePiliangPayMoney()
+        {
+            bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+            _OA_FirmAccountBLL = new OA_FirmAccountBLL();
+            firmAccountRecord = new OA_FirmAccountRecord();
+            _OA_FirmAccountRecordBLL = new OA_FirmAccountRecordBLL();
+        }
+
+        /// <summary>
+        /// 鐣岄潰鍔犺浇浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+            btnSubmit.ServerClick += new EventHandler(btnSubmit_ServerClick);
+            try
+            {
+                switch (Request["DataType"])
+                {
+                    case "change":
+                        Response.Write(reLoadAccountName(Request["TypeName"].ToString2()));
+                        break;
+                    default://涓�鑸儏鍐典笉澶勭悊
+                        if (IsPostBack || IsCallback)
+                            return;
+                        else
+                        {
+                            LoadOrder();
+                            InitialData();
+                        }
+                        return;
+                }
+            }
+            catch (Exception ex)
+            {
+                PAGEHandleException(ex);
+                Response.Clear();
+                Response.Write("-1");
+            }
+            Response.End();
+            InitPage();
+
+        }
+        protected void InitialData()
+        {
+            //绉戠洰鍚嶇О
+            Sys_DictionaryBLL _Sys_DictionaryBLL = new Sys_DictionaryBLL();
+            OA_SubjectSetBLL _OA_SubjectSetBLL = new OA_SubjectSetBLL();
+            OA_FirmAccountBLL oA_FirmAccountBLL = new OA_FirmAccountBLL();
+            selSubject.DataSource = _OA_SubjectSetBLL.getAllSubject(CurrentUser.MemberId, "璐�");
+            selSubject.DataBind();
+            selSubject.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+            ///璐︽埛绫诲瀷
+            
+            selAcoountType.DataSource = _Sys_DictionaryBLL.GetDataByType("璐︽埛绫诲瀷");   
+           
+            selAcoountType.DataBind();
+
+            //selAcoountType_SelectedIndexChanged(null, null);
+
+        }
+        protected string reLoadAccountName(string selAcoountType)
+        {
+            return JsonHelper.GetJsonStringByObject(_OA_FirmAccountBLL.getAllSubject(CurrentUser.MemberId, selAcoountType));
+        }
+        /// <summary>
+        /// 鎻愪氦鎸夐挳鐐瑰嚮浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void btnSubmit_ServerClick(object sender, EventArgs e)
+        {
+
+            string[] Keys = Request["Keyid"].ToString2().Trim('|').Split('|');
+            
+            //_orderBasic = new EC_OrderBasic();
+            _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+            //_orderBasic = _eC_OrderBasicBLL.SelectModelById(orderId.Value);
+            //string orderno = "";
+            //string sellerName = "";
+            firmAccount = _OA_FirmAccountBLL.getSingleSubject(Request["selAccountName"].ToInt32());
+
+            if (firmAccount.Balance < this.txtReciveMoney.Text.ToDecimal2())
+            {
+                JavaScript.MessageBox("璐︽埛浣欓涓嶈冻", this);
+                return;
+            }
+
+            var ssss = false;
+
+
+            using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+    new TransactionOptions
+    {
+        IsolationLevel = System.Transactions.IsolationLevel.ReadCommitted,
+        Timeout = TransactionManager.MaximumTimeout
+    }
+    ))
+            {
+                try
+                {
+                   
+
+
+                    foreach (var item in Keys)
+                    {
+                        if (!string.IsNullOrEmpty(item))
+                        {
+                            var orderBasic = _eC_OrderBasicBLL.SelectModelById(item.ToInt32().Value);
+                            if (orderBasic != null)
+                            {
+                                firmAccountRecord.AccountId = Request["selAccountName"].ToInt32();
+                                firmAccountRecord.LastUpdateTime = DateTime.Now;
+                                firmAccountRecord.Money = orderBasic.UnPayedMoney;
+                                orderNo = orderBasic.SellerOrderId;
+                                firmAccountRecord.OperationalMatters = "澶栧崗浠樻" + "(" + orderNo + ")";
+                                firmAccountRecord.Operator = CurrentUser.ShortName;
+                                firmAccountRecord.PaymentUnit = orderBasic.SellerName;
+                                firmAccountRecord.RecordTypeId = 2;//鏀嚭
+                                firmAccountRecord.Remark = this.txtRemark.Value;
+                                firmAccountRecord.SubjectId = this.selSubject.Value.ToInt32();
+                                firmAccountRecord.ResidualAmount = firmAccount.Balance - orderBasic.UnPayedMoney; ;
+
+                                firmAccount.AllExpenses = orderBasic.UnPayedMoney + firmAccount.AllExpenses;
+                                firmAccount.Balance = firmAccount.Balance - orderBasic.UnPayedMoney;
+                                ssss = _OA_FirmAccountRecordBLL.AddModel(firmAccountRecord, firmAccount);
+                                if (ssss)
+                                {
+                                    UsePrepare(orderBasic);
+                                   
+
+                                }
+                                else
+                                {
+                                    JavaScript.MessageBox("娣诲姞澶辫触", this);
+                                    return;
+                                }
+
+                            }
+
+                        }
+                    }
+
+                    
+
+                    if (ssss)
+                    {
+                        
+                        scope.Complete();
+                        JavaScript.MessageBox("浠樻鎴愬姛", this, "top.frmright.ReLoad();top.Dialog.close();");
+                    }
+                    else
+                        JavaScript.MessageBox("娣诲姞澶辫触", this);
+                }
+                catch (Exception ex)
+                {
+                    PAGEHandleException(ex);
+                    JavaScript.MessageBox("娣诲姞澶辫触", this);
+                }
+                finally
+                {
+                    scope.Dispose();
+                }
+
+
+            }
+
+
+
+
+
+        }
+
+        /// <summary>
+        /// 鍔犺浇椤甸潰鏁版嵁
+        /// </summary>
+        private void InitPage()
+        {
+            try
+            {
+                Sys_DictionaryBLL _Sys_DictionaryBLL = new Sys_DictionaryBLL();
+                //OA_SubjectSetBLL _OA_SubjectSetBLL = new OA_SubjectSetBLL();
+                OA_FirmAccountBLL oA_FirmAccountBLL = new OA_FirmAccountBLL();               
+
+                int i = -1;
+                //璐︽埛绫诲瀷
+                List<Sys_Dictionary> accountsType = _Sys_DictionaryBLL.GetDataByType("璐︽埛绫诲瀷") as List<Sys_Dictionary>;
+                Request.RequestContext.RouteData.DataTokens.Add("accountsTypes", null == accountsType || accountsType.Count == 0 ? "[]" : JsonHelper.GetJsonStringByObject(accountsType));
+
+                List<OA_FirmAccount> firmAccounts = oA_FirmAccountBLL.getAllSubject(CurrentUser.MemberId, "") as List<OA_FirmAccount>;
+
+                const string ACCOUNTSJSONKEY = "accounts";
+                if (null == firmAccounts)
+                {
+                    Request.RequestContext.RouteData.DataTokens.Add(ACCOUNTSJSONKEY, "[]");
+                    return;
+                }
+
+                IEnumerable<IGrouping<string, OA_FirmAccount>> groupings = firmAccounts.GroupBy(fa => fa.AccountType);
+                StringBuilder builder = new StringBuilder();
+
+                foreach (IGrouping<string, OA_FirmAccount> groupitem in groupings)
+                {
+                    OA_FirmAccount[] items = groupitem.ToArray();
+                    builder.AppendFormat("{0}\"{2}\":{3}{1}", ",", "", groupitem.Key, JsonHelper.GetJsonStringByObject(items));
+                }
+                builder.Append("}]");
+                builder.Replace(",", "[{", 0, 1);
+
+                Request.RequestContext.RouteData.DataTokens.Add(ACCOUNTSJSONKEY, null == firmAccounts ? "[]" : builder.ToString());
+
+            }
+            catch (Exception ex)
+            {
+                PAGEHandleException(ex);
+            }
+        }
+
+        /// <summary>
+        /// 鍔犺浇璁㈠崟
+        /// </summary>
+        private void LoadOrder()
+        {
+           
+            string[] Keys = Request["Keyid"].ToString2().Trim('|').Split('|');
+            foreach (var item in Keys)
+            {
+                if (!string.IsNullOrEmpty(item))
+                {
+                  var   orderBasic = _eC_OrderBasicBLL.SelectModelById(item.ToInt32().Value);
+                    if (orderBasic != null)
+                    {
+                        var sumPrice = orderBasic.SumPrice ?? 0;
+                        AllMoney += sumPrice;
+                        ReceiveMoney += orderBasic.UnPayedMoney;
+                    }
+                }
+            }
+
+
+           
+            this.spanAllMoney.InnerText = "锟�" + AllMoney.Value.ToString("0.00");
+            this.spanReceiveMoney.InnerText = "锟�" + ReceiveMoney.Value.ToString("0.00");
+            this.txtReciveMoney.Text = ReceiveMoney.Value.ToString("0.00");
+            this.spanCountRe.InnerHtml = Keys.Count().ToString2() + " 鍗�";
+          
+        }
+        
+        /// <summary>
+        /// 浣跨敤棰勪粯娆�(浠樻銆佹敹娆�)
+        /// </summary>
+        /// <returns></returns>
+        private bool UsePrepare(EC_OrderBasic orderBasic)
+        {
+            decimal? money = MyConvert.ConvertToDecimal(txtReciveMoney.Text);
+            int operatTypeId = 3;
+            string subject = "璁㈠崟浠樻";
+            switch (Request["outsourceType"])
+            {
+                case "1":
+                    operatTypeId = 2;
+                    subject = "澶栧崗浠樻";
+                    break;
+                default:
+                    break;
+            }
+            string[] Keys = Request["Keyid"].ToString2().Trim('|').Split('|');
+
+            
+            
+
+            return _eC_OrderBasicBLL.ReceiveMoney(orderBasic.SellerId, orderBasic.BuyerId, orderBasic.Keyid.Value, orderBasic.UnPayedMoney, operatTypeId, subject, CurrentUser.ShortName); ;// _eC_OrderBasicBLL.ReceiveMoney(_orderBasic.SellerId, _orderBasic.BuyerId, _orderBasic.Keyid.Value, money.Value, operatTypeId, subject, CurrentUser.ShortName);
+        }
+
+        //protected void selAcoountType_SelectedIndexChanged(object sender, EventArgs e)
+        //{
+        //    _OA_FirmAccountBLL = new OA_FirmAccountBLL();
+        //    DataTable dt = _OA_FirmAccountBLL.getAllAountName(CurrentUser.MemberId, selAcoountType.SelectedItem.Text.ToString());
+        //}
+    }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePiliangPayMoney.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePiliangPayMoney.aspx.designer.cs
new file mode 100644
index 0000000..66ace03
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePiliangPayMoney.aspx.designer.cs
@@ -0,0 +1,134 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.financial
+{
+
+
+    public partial class OutsourcePiliangPayMoney
+    {
+
+        /// <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>
+        /// spanCountRe 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanCountRe;
+
+        /// <summary>
+        /// spanAllMoney 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanAllMoney;
+
+        /// <summary>
+        /// spanReceiveMoney 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanReceiveMoney;
+
+        /// <summary>
+        /// txtReciveMoney 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtReciveMoney;
+
+        /// <summary>
+        /// selAcoountType 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selAcoountType;
+
+        /// <summary>
+        /// selAccountName 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selAccountName;
+
+        /// <summary>
+        /// selSubject 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selSubject;
+
+        /// <summary>
+        /// txtReceiveDate 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputText txtReceiveDate;
+
+        /// <summary>
+        /// txtRemark 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtRemark;
+
+        /// <summary>
+        /// btnSubmit 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputButton btnSubmit;
+    }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index b866916..b3f4ae1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -798,6 +798,775 @@
                     typeModel = _multipleTypeInfoBLL.GetModel(model.PaperMP.ToInt32().Value);
                     printDemand += typeModel.TypeNmae + "锛�" + model.PrintColor;
                 }
+                else if (model.PrintTypeId == 38) //涔﹀垔
+                {
+                    if (request["papershijuan"] != null)
+                    {
+                        model.papershijuan = request["papershijuan"].ToString();
+                        printDemand += "  璇曞嵎锛氱焊寮狅細" + model.papershijuan + "锛�";
+                    }
+
+
+                    if (request["paperSize"] != null)
+                    {
+                        model.PrintSizeId = request["paperSize"].ToString().ToInt32().Value;
+                        if (model.PrintSizeId != -1)
+                        {
+                            SysInquiry_PaperSizeDetail paperSize = _paperSizeDetailBLL.GetPaperSizeDetail(model.PrintTypeId, model.PrintSizeId);
+                            model.PrintSizeName = paperSize.Name;
+                            printDemand += "鎴愬搧灏哄锛�4P " + paperSize.Name + "锛�";
+                        }
+                        else if (model.PrintSizeId == -1)
+                        {
+                            model.PrintSizeName = request["txtFirstSize"].ToString() + "脳" + request["txtSecondSize"].ToString();
+                            model.firstSize = request["txtFirstSize"].ToString();
+                            model.secondSize = request["txtSecondSize"].ToString();
+                            printDemand += "鎴愬搧灏哄锛�4P " + model.PrintSizeName + "锛�";
+                        }
+                    }
+
+
+                    if (request["paperSize6P"] != null)
+                    {
+                        model.paperSize6P = request["paperSize6P"].ToString();
+                        if (model.paperSize6P == "-1")
+                        {
+                            model.PrintSizeName6P = request["txtFirstSize6P"].ToString() + "脳" + request["txtSecondSize6P"].ToString();
+                            model.firstSize6P = request["txtFirstSize6P"].ToString();
+                            model.secondSize6P = request["txtSecondSize6P"].ToString();
+                            printDemand += "6P " + model.PrintSizeName + "锛�";
+                        }
+                        else
+                        {
+                            printDemand += "6P " + model.paperSize6P + "锛�";
+                        }
+                    }
+
+                    if (request["paperSize8P"] != null)
+                    {
+                        model.paperSize8P = request["paperSize8P"].ToString();
+                        if (model.paperSize8P == "-1")
+                        {
+                            model.PrintSizeName8P = request["txtFirstSize8P"].ToString() + "脳" + request["txtSecondSize8P"].ToString();
+                            model.firstSize8P = request["txtFirstSize8P"].ToString();
+                            model.secondSize8P = request["txtSecondSize8P"].ToString();
+                            printDemand += "8P " + model.PrintSizeName + "锛�";
+                        }
+                        else
+                        {
+                            printDemand += "8P " + model.paperSize8P + "锛�";
+                        }
+                    }
+
+                    if (request["papershijuan"] != null)
+                    {
+                        model.printColorshijuan = request["printColorshijuan"].ToString();
+                        printDemand += "璇曞嵎琚嬬焊寮狅細" + model.printColorshijuan + "锛�";
+                    }
+
+                    if (request["paper1"] != null)
+                    {
+                        model.paper1 = request["paper1"].ToString();
+                        printDemand += "绛旈鍗★細绾稿紶锛�" + model.paper1 + "锛�";
+                    }
+
+
+
+                    if (request["paperSizeA4"] != null)
+                    {
+                        model.paperSizeA4 = request["paperSizeA4"].ToString();
+                        if (model.paperSizeA4 == "-1")
+                        {
+                            model.PrintSizeNameA4 = request["txtFirstSizeA4"].ToString() + "脳" + request["txtSecondSizeA4"].ToString();
+                            model.firstSizeA4 = request["txtFirstSizeA4"].ToString();
+                            model.secondSizeA4 = request["txtSecondSizeA4"].ToString();
+                            printDemand += "鎴愬搧灏哄锛欰4 " + model.PrintSizeNameA4 + "锛�";
+                        }
+                        else
+                        {
+                            printDemand += "鎴愬搧灏哄锛欰4 " + model.paperSizeA4 + "锛�";
+                        }
+                    }
+
+                    if (request["paperSizeA3"] != null)
+                    {
+                        model.paperSizeA3 = request["paperSizeA3"].ToString();
+                        if (model.paperSizeA3 == "-1")
+                        {
+                            model.PrintSizeNameA3 = request["txtFirstSizeA3"].ToString() + "脳" + request["txtSecondSizeA3"].ToString();
+                            model.firstSizeA3 = request["txtFirstSizeA3"].ToString();
+                            model.secondSizeA3 = request["txtSecondSizeA3"].ToString();
+                            printDemand += "A3 " + model.PrintSizeName + "锛�";
+                        }
+                        else
+                        {
+                            printDemand += "A3 " + model.paperSizeA3 + "锛�";
+                        }
+                    }
+                    if (request["printColor1"] != null)
+                    {
+                        model.printColor1 = request["printColor1"].ToString();
+                        printDemand += "鍗板埛棰滆壊锛�" + model.printColor1 + "锛�";
+                    }
+
+                    if (request["printColor2"] != null)
+                    {
+                        model.printColor2 = request["printColor2"].ToString();
+                        printDemand += "绛旈鍗¤绾稿紶锛�" + model.printColor2 + "锛�";
+                    }
+
+
+                    InquirySHiJuanModel inquirySHiJuanModel = null;
+
+                    if (request["selNianji"] != null)
+                    {
+                        var sss = request["selNianji"].Split(',').Length;
+                        string[] selNianji = request["selNianji"]?.Split(',');
+                        string[] txtRenshu = request["txtRenshu"]?.Split(',');
+
+                        string[] yuwencheckboxinput = request["yuwencheckboxinput"]?.Split(',');
+                        string[] yuwenselect = request["yuwenselect"]?.Split(',');
+                        string[] shuxuecheckboxinput = request["shuxuecheckboxinput"]?.Split(',');
+                        string[] shuxueselect = request["shuxueselect"]?.Split(',');
+                        string[] yingyucheckboxinput = request["yingyucheckboxinput"]?.Split(',');
+                        string[] yingyuselect = request["yingyuselect"]?.Split(',');
+                        string[] pingdecheckboxinput = request["pingdecheckboxinput"]?.Split(',');
+                        string[] pingdeselect = request["pingdeselect"]?.Split(',');
+                        string[] kexuecheckboxinput = request["kexuecheckboxinput"]?.Split(',');
+                        string[] kexueselect = request["kexueselect"]?.Split(',');
+                        string[] lishicheckboxinput = request["lishicheckboxinput"]?.Split(',');
+                        string[] lishiselect = request["lishiselect"]?.Split(',');
+                        string[] dilicheckboxinput = request["dilicheckboxinput"]?.Split(',');
+                        string[] diliselect = request["diliselect"]?.Split(',');
+                        string[] shengwucheckboxinput = request["shengwucheckboxinput"]?.Split(',');
+                        string[] shengwuselect = request["shengwuselect"]?.Split(',');
+                        string[] wulicheckboxinput = request["wulicheckboxinput"]?.Split(',');
+                        string[] wuliselect = request["wuliselect"]?.Split(',');
+                        string[] huaxuecheckboxinput = request["huaxuecheckboxinput"]?.Split(',');
+                        string[] huaxueselect = request["huaxueselect"]?.Split(',');
+                        string[] zhengzhicheckboxinput = request["zhengzhicheckboxinput"]?.Split(',');
+                        string[] zhengzhiselect = request["zhengzhiselect"]?.Split(',');
+                        string[] sixiangpingdecheckboxinput = request["sixiangpingdecheckboxinput"]?.Split(',');
+                        string[] sixiangpingdeselect = request["sixiangpingdeselect"]?.Split(',');
+
+
+                        string[] yuwendatikacheckboxinput = request["yuwendatikacheckboxinput"]?.Split(',');
+                        string[] yuwendatikaselect = request["yuwendatikaselect"]?.Split(',');
+                        string[] shuxuedatikacheckboxinput = request["shuxuedatikacheckboxinput"]?.Split(',');
+                        string[] shuxuedatikaselect = request["shuxuedatikaselect"]?.Split(',');
+                        string[] yingyudatikacheckboxinput = request["yingyudatikacheckboxinput"]?.Split(',');
+                        string[] yingyudatikaselect = request["yingyudatikaselect"]?.Split(',');
+                        string[] pingdedatikacheckboxinput = request["pingdedatikacheckboxinput"]?.Split(',');
+                        string[] pingdedatikaselect = request["pingdedatikaselect"]?.Split(',');
+                        string[] kexuedatikacheckboxinput = request["kexuedatikacheckboxinput"]?.Split(',');
+                        string[] kexuedatikaselect = request["kexuedatikaselect"]?.Split(',');
+                        string[] lishidatikacheckboxinput = request["lishidatikacheckboxinput"]?.Split(',');
+                        string[] lishidatikaselect = request["lishidatikaselect"]?.Split(',');
+                        string[] dilidatikacheckboxinput = request["dilidatikacheckboxinput"]?.Split(',');
+                        string[] dilidatikaselect = request["dilidatikaselect"]?.Split(',');
+                        string[] shengwudatikacheckboxinput = request["shengwudatikacheckboxinput"]?.Split(',');
+                        string[] shengwudatikaselect = request["shengwudatikaselect"]?.Split(',');
+                        string[] wulidatikacheckboxinput = request["wulidatikacheckboxinput"]?.Split(',');
+                        string[] wulidatikaselect = request["wulidatikaselect"]?.Split(',');
+                        string[] huaxuedatikacheckboxinput = request["huaxuedatikacheckboxinput"]?.Split(',');
+                        string[] huaxuedatikaselect = request["huaxuedatikaselect"]?.Split(',');
+                        string[] zhengzhidatikacheckboxinput = request["zhengzhidatikacheckboxinput"]?.Split(',');
+                        string[] zhengzhidatikaselect = request["zhengzhidatikaselect"]?.Split(',');
+                        string[] sixiangpingdedatikacheckboxinput = request["sixiangpingdedatikacheckboxinput"]?.Split(',');
+                        string[] sixiangpingdedatikaselect = request["sixiangpingdedatikaselect"]?.Split(',');
+
+                        for (int i=0;i< sss; i++)
+                        {
+                            inquirySHiJuanModel = new InquirySHiJuanModel();
+
+                            inquirySHiJuanModel.Nianji = selNianji[i];
+                            printDemand += (i+1) + "骞寸骇锛�" + inquirySHiJuanModel.Nianji + "锛�";
+                            inquirySHiJuanModel.txtRenshu = txtRenshu[i];
+                            printDemand += "浜烘暟锛�" + inquirySHiJuanModel.txtRenshu + "锛�";
+
+                            inquirySHiJuanModel.yuwencheckboxinput = yuwencheckboxinput[i];
+                          
+                            inquirySHiJuanModel.yuwenselect = yuwenselect[i];
+                           
+                            inquirySHiJuanModel.shuxuecheckboxinput = shuxuecheckboxinput[i];
+                            inquirySHiJuanModel.shuxueselect = shuxueselect[i];
+                            inquirySHiJuanModel.yingyucheckboxinput = yingyucheckboxinput[i];
+                            inquirySHiJuanModel.yingyuselect = yingyuselect[i];
+                            inquirySHiJuanModel.pingdecheckboxinput = pingdecheckboxinput[i];
+                            inquirySHiJuanModel.pingdeselect = pingdeselect[i];
+                            inquirySHiJuanModel.kexuecheckboxinput = kexuecheckboxinput[i];
+                            inquirySHiJuanModel.kexueselect = kexueselect[i];
+                            inquirySHiJuanModel.lishicheckboxinput = lishicheckboxinput[i];
+                            inquirySHiJuanModel.lishiselect = lishiselect[i];
+                            inquirySHiJuanModel.dilicheckboxinput = dilicheckboxinput[i];
+                            inquirySHiJuanModel.diliselect = diliselect[i];
+                            inquirySHiJuanModel.shengwucheckboxinput = shengwucheckboxinput[i];
+                            inquirySHiJuanModel.shengwuselect = shengwuselect[i];
+                            inquirySHiJuanModel.wulicheckboxinput = wulicheckboxinput[i];
+                            inquirySHiJuanModel.wuliselect = wuliselect[i];
+                            inquirySHiJuanModel.huaxuecheckboxinput = huaxuecheckboxinput[i];
+                            inquirySHiJuanModel.huaxueselect = huaxueselect[i];
+                            inquirySHiJuanModel.zhengzhicheckboxinput = zhengzhicheckboxinput[i];
+                            inquirySHiJuanModel.zhengzhiselect = zhengzhiselect[i];
+                            inquirySHiJuanModel.sixiangpingdecheckboxinput = sixiangpingdecheckboxinput[i];
+                            inquirySHiJuanModel.sixiangpingdeselect = sixiangpingdeselect[i];
+
+
+
+                            inquirySHiJuanModel.yuwendatikacheckboxinput = yuwendatikacheckboxinput[i];
+                            inquirySHiJuanModel.yuwendatikaselect = yuwendatikaselect[i];
+                            inquirySHiJuanModel.shuxuedatikacheckboxinput = shuxuedatikacheckboxinput[i];
+                            inquirySHiJuanModel.shuxuedatikaselect = shuxuedatikaselect[i];
+                            inquirySHiJuanModel.yingyudatikacheckboxinput = yingyudatikacheckboxinput[i];
+                            inquirySHiJuanModel.yingyudatikaselect = yingyudatikaselect[i];
+                            inquirySHiJuanModel.pingdedatikacheckboxinput = pingdedatikacheckboxinput[i];
+                            inquirySHiJuanModel.pingdedatikaselect = pingdedatikaselect[i];
+                            inquirySHiJuanModel.kexuedatikacheckboxinput = kexuedatikacheckboxinput[i];
+                            inquirySHiJuanModel.kexuedatikaselect = kexuedatikaselect[i];
+                            inquirySHiJuanModel.lishidatikacheckboxinput = lishidatikacheckboxinput[i];
+                            inquirySHiJuanModel.lishidatikaselect = lishidatikaselect[i];
+                            inquirySHiJuanModel.dilidatikacheckboxinput = dilidatikacheckboxinput[i];
+                            inquirySHiJuanModel.dilidatikaselect = dilidatikaselect[i];
+                            inquirySHiJuanModel.shengwudatikacheckboxinput = shengwudatikacheckboxinput[i];
+                            inquirySHiJuanModel.shengwudatikaselect = shengwudatikaselect[i];
+                            inquirySHiJuanModel.wulidatikacheckboxinput = wulidatikacheckboxinput[i];
+                            inquirySHiJuanModel.wulidatikaselect = wulidatikaselect[i];
+                            inquirySHiJuanModel.huaxuedatikacheckboxinput = huaxuedatikacheckboxinput[i];
+                            inquirySHiJuanModel.huaxuedatikaselect = huaxuedatikaselect[i];
+                            inquirySHiJuanModel.zhengzhidatikacheckboxinput = zhengzhidatikacheckboxinput[i];
+                            inquirySHiJuanModel.zhengzhidatikaselect = zhengzhidatikaselect[i];
+                            inquirySHiJuanModel.sixiangpingdedatikacheckboxinput = sixiangpingdedatikacheckboxinput[i];
+                            inquirySHiJuanModel.sixiangpingdedatikaselect = sixiangpingdedatikaselect[i];
+                           
+                            if (inquirySHiJuanModel.Nianji != "楂樻牎璇曞嵎")
+                            {
+                                printDemand += "璇曞嵎锛�";
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yuwencheckboxinput))
+                                {
+                                    printDemand += "璇枃锛�" + inquirySHiJuanModel.yuwencheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.yuwenselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.shuxuecheckboxinput))
+                                {
+                                    printDemand += "鏁板锛�" + inquirySHiJuanModel.shuxuecheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.shuxueselect + "锛�";
+                                }
+
+                            }
+
+
+
+                            if (inquirySHiJuanModel.Nianji == "涓�骞寸骇" || inquirySHiJuanModel.Nianji == "浜屽勾绾�")
+                            {
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.pingdecheckboxinput))
+                                {
+                                    printDemand += "鍝佸痉涓庣敓娲伙細" + inquirySHiJuanModel.pingdecheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.pingdeselect + "锛�";
+                                }
+                              
+                            }
+                            else if (inquirySHiJuanModel.Nianji == "涓夊勾绾�" || inquirySHiJuanModel.Nianji == "鍥涘勾绾�" || inquirySHiJuanModel.Nianji == "浜斿勾绾�" || inquirySHiJuanModel.Nianji == "鍏勾绾�")
+                            {
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyucheckboxinput))
+                                {
+                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.yingyuselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.kexuecheckboxinput))
+                                {
+                                    printDemand += "绉戝锛�" + inquirySHiJuanModel.kexuecheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.kexueselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.pingdecheckboxinput))
+                                {
+                                    printDemand += "鍝佸痉涓庣敓娲伙細" + inquirySHiJuanModel.pingdecheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.pingdeselect + "锛�";
+                                }
+
+                              
+                              
+                            }
+                            else if (inquirySHiJuanModel.Nianji == "涓冨勾绾�")
+                            {
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyucheckboxinput))
+                                {
+                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.yingyuselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.lishicheckboxinput))
+                                {
+                                    printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishicheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.lishiselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.dilicheckboxinput))
+                                {
+                                    printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilicheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.diliselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwucheckboxinput))
+                                {
+                                    printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwucheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.shengwuselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.sixiangpingdecheckboxinput))
+                                {
+                                    printDemand += "鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.sixiangpingdeselect + "锛�";
+                                }
+
+
+
+                                printDemand += "绛旈鍗★細";
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yuwendatikacheckboxinput))
+                                {
+                                    printDemand += "璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.yuwendatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.shuxuedatikacheckboxinput))
+                                {
+                                    printDemand += "鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.shuxuedatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyudatikacheckboxinput))
+                                {
+                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.yingyudatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.lishidatikacheckboxinput))
+                                {
+                                    printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishidatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.lishidatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.dilidatikacheckboxinput))
+                                {
+                                    printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilidatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.dilidatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwudatikacheckboxinput))
+                                {
+                                    printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwudatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.shengwudatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.sixiangpingdedatikacheckboxinput))
+                                {
+                                    printDemand += "鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.sixiangpingdedatikaselect + "锛�";
+                                }
+                            }
+                            else if (inquirySHiJuanModel.Nianji == "鍏勾绾�")
+                            {
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyucheckboxinput))
+                                {
+                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.yingyuselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.lishicheckboxinput))
+                                {
+                                    printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishicheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.lishiselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.dilicheckboxinput))
+                                {
+                                    printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilicheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.diliselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwucheckboxinput))
+                                {
+                                    printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwucheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.shengwuselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.wulicheckboxinput))
+                                {
+                                    printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulicheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.wuliselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.sixiangpingdecheckboxinput))
+                                {
+                                    printDemand += "鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.sixiangpingdeselect + "锛�";
+                                }
+
+                                printDemand += "绛旈鍗★細";
+
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yuwendatikacheckboxinput))
+                                {
+                                    printDemand += "璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.yuwendatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.shuxuedatikacheckboxinput))
+                                {
+                                    printDemand += "鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.shuxuedatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyudatikacheckboxinput))
+                                {
+                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.yingyudatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.lishidatikacheckboxinput))
+                                {
+                                    printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishidatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.lishidatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.dilidatikacheckboxinput))
+                                {
+                                    printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilidatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.dilidatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwudatikacheckboxinput))
+                                {
+                                    printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwudatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.shengwudatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.wulidatikacheckboxinput))
+                                {
+                                    printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulidatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.wulidatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.sixiangpingdedatikacheckboxinput))
+                                {
+                                    printDemand += "鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.sixiangpingdedatikaselect + "锛�";
+                                }
+
+                               
+                            }
+                            else if (inquirySHiJuanModel.Nianji == "涔濆勾绾�")
+                            {
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyucheckboxinput))
+                                {
+                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.yingyuselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.lishicheckboxinput))
+                                {
+                                    printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishicheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.lishiselect + "锛�";
+                                }
+                                 
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.wulicheckboxinput))
+                                {
+                                    printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulicheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.wuliselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.huaxuecheckboxinput))
+                                {
+                                    printDemand += "鍖栧锛�" + inquirySHiJuanModel.huaxuecheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.huaxueselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.sixiangpingdecheckboxinput))
+                                {
+                                    printDemand += "鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdecheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.sixiangpingdeselect + "锛�";
+                                }
+
+                                printDemand += "绛旈鍗★細";
+
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yuwendatikacheckboxinput))
+                                {
+                                    printDemand += "璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.yuwendatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.shuxuedatikacheckboxinput))
+                                {
+                                    printDemand += "鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.shuxuedatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyudatikacheckboxinput))
+                                {
+                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.yingyudatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.lishidatikacheckboxinput))
+                                {
+                                    printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishidatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.lishidatikaselect + "锛�";
+                                }
+                                
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.wulidatikacheckboxinput))
+                                {
+                                    printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulidatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.wulidatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.huaxuedatikacheckboxinput))
+                                {
+                                    printDemand += "鍖栧锛�" + inquirySHiJuanModel.huaxuedatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.huaxuedatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.sixiangpingdedatikacheckboxinput))
+                                {
+                                    printDemand += "鎬濇兂鍝佸痉锛�" + inquirySHiJuanModel.sixiangpingdedatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.sixiangpingdedatikaselect + "锛�";
+                                }
+
+                                
+                            }
+                            else if (inquirySHiJuanModel.Nianji == "楂樹竴")
+                            {
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyucheckboxinput))
+                                {
+                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.yingyuselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.lishicheckboxinput))
+                                {
+                                    printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishicheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.lishiselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.dilicheckboxinput))
+                                {
+                                    printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilicheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.diliselect + "锛�";
+                                }
+                               
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.wulicheckboxinput))
+                                {
+                                    printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulicheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.wuliselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.huaxuecheckboxinput))
+                                {
+                                    printDemand += "鍖栧锛�" + inquirySHiJuanModel.huaxuecheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.huaxueselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.zhengzhicheckboxinput))
+                                {
+                                    printDemand += "鏀挎不锛�" + inquirySHiJuanModel.zhengzhicheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.zhengzhiselect + "锛�";
+                                }
+
+                                printDemand += "绛旈鍗★細";
+
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yuwendatikacheckboxinput))
+                                {
+                                    printDemand += "璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.yuwendatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.shuxuedatikacheckboxinput))
+                                {
+                                    printDemand += "鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.shuxuedatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyudatikacheckboxinput))
+                                {
+                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.yingyudatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.lishidatikacheckboxinput))
+                                {
+                                    printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishidatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.lishidatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.dilidatikacheckboxinput))
+                                {
+                                    printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilidatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.dilidatikaselect + "锛�";
+                                }
+                                
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.wulidatikacheckboxinput))
+                                {
+                                    printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulidatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.wulidatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.huaxuedatikacheckboxinput))
+                                {
+                                    printDemand += "鍖栧锛�" + inquirySHiJuanModel.huaxuedatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.huaxuedatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.zhengzhidatikacheckboxinput))
+                                {
+                                    printDemand += "鏀挎不锛�" + inquirySHiJuanModel.zhengzhidatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.zhengzhidatikaselect + "锛�";
+                                }
+ 
+                            }
+                            else if (inquirySHiJuanModel.Nianji == "楂樹簩")
+                            {
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyucheckboxinput))
+                                {
+                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.yingyuselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.lishicheckboxinput))
+                                {
+                                    printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishicheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.lishiselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.dilicheckboxinput))
+                                {
+                                    printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilicheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.diliselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwucheckboxinput))
+                                {
+                                    printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwucheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.shengwuselect + "锛�";
+                                }
+
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.wulicheckboxinput))
+                                {
+                                    printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulicheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.wuliselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.huaxuecheckboxinput))
+                                {
+                                    printDemand += "鍖栧锛�" + inquirySHiJuanModel.huaxuecheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.huaxueselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.zhengzhicheckboxinput))
+                                {
+                                    printDemand += "鏀挎不锛�" + inquirySHiJuanModel.zhengzhicheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.zhengzhiselect + "锛�";
+                                }
+
+                                printDemand += "绛旈鍗★細";
+
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yuwendatikacheckboxinput))
+                                {
+                                    printDemand += "璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.yuwendatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.shuxuedatikacheckboxinput))
+                                {
+                                    printDemand += "鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.shuxuedatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyudatikacheckboxinput))
+                                {
+                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.yingyudatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.lishidatikacheckboxinput))
+                                {
+                                    printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishidatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.lishidatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.dilidatikacheckboxinput))
+                                {
+                                    printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilidatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.dilidatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwudatikacheckboxinput))
+                                {
+                                    printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwudatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.shengwudatikaselect + "锛�";
+                                }
+
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.wulidatikacheckboxinput))
+                                {
+                                    printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulidatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.wulidatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.huaxuedatikacheckboxinput))
+                                {
+                                    printDemand += "鍖栧锛�" + inquirySHiJuanModel.huaxuedatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.huaxuedatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.zhengzhidatikacheckboxinput))
+                                {
+                                    printDemand += "鏀挎不锛�" + inquirySHiJuanModel.zhengzhidatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.zhengzhidatikaselect + "锛�";
+                                }
+
+                               
+                            }
+                            else if (inquirySHiJuanModel.Nianji == "楂樹笁")
+                            {
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyucheckboxinput))
+                                {
+                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyucheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.yingyuselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.lishicheckboxinput))
+                                {
+                                    printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishicheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.lishiselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.dilicheckboxinput))
+                                {
+                                    printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilicheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.diliselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwucheckboxinput))
+                                {
+                                    printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwucheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.shengwuselect + "锛�";
+                                }
+
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.wulicheckboxinput))
+                                {
+                                    printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulicheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.wuliselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.huaxuecheckboxinput))
+                                {
+                                    printDemand += "鍖栧锛�" + inquirySHiJuanModel.huaxuecheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.huaxueselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.zhengzhicheckboxinput))
+                                {
+                                    printDemand += "鏀挎不锛�" + inquirySHiJuanModel.zhengzhicheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.zhengzhiselect + "锛�";
+                                }
+
+                                printDemand += "绛旈鍗★細";
+
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yuwendatikacheckboxinput))
+                                {
+                                    printDemand += "璇枃锛�" + inquirySHiJuanModel.yuwendatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.yuwendatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.shuxuedatikacheckboxinput))
+                                {
+                                    printDemand += "鏁板锛�" + inquirySHiJuanModel.shuxuedatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.shuxuedatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.yingyudatikacheckboxinput))
+                                {
+                                    printDemand += "鑻辫锛�" + inquirySHiJuanModel.yingyudatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.yingyudatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.lishidatikacheckboxinput))
+                                {
+                                    printDemand += "鍘嗗彶锛�" + inquirySHiJuanModel.lishidatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.lishidatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.dilidatikacheckboxinput))
+                                {
+                                    printDemand += "鍦扮悊锛�" + inquirySHiJuanModel.dilidatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.dilidatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwudatikacheckboxinput))
+                                {
+                                    printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwudatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.shengwudatikaselect + "锛�";
+                                }
+
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.wulidatikacheckboxinput))
+                                {
+                                    printDemand += "鐗╃悊锛�" + inquirySHiJuanModel.wulidatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.wulidatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.huaxuedatikacheckboxinput))
+                                {
+                                    printDemand += "鍖栧锛�" + inquirySHiJuanModel.huaxuedatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.huaxuedatikaselect + "锛�";
+                                }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.zhengzhidatikacheckboxinput))
+                                {
+                                    printDemand += "鏀挎不锛�" + inquirySHiJuanModel.zhengzhidatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.zhengzhidatikaselect + "锛�";
+                                }
+
+                            }else if (inquirySHiJuanModel.Nianji == "楂樻牎璇曞嵎")
+                            {
+
+                            }
+                            model.InquirySHiJuanList.Add(inquirySHiJuanModel);
+                        }
+                    }
+
+                }
                 else if (model.PrintTypeId == 32) //骞垮憡鎵戝厠
                 {
                     MultipleTypeInfoBLL _multipleTypeInfoBLL = new MultipleTypeInfoBLL();
@@ -1476,7 +2245,7 @@
                     printDemand += model.Shape;
                 }
                 //鍒ゆ柇灏哄
-                if (request["hidOrderId"].ToInt32() >= 0 && model.PrintTypeId != 37)
+                if (request["hidOrderId"].ToInt32() >= 0 && model.PrintTypeId != 37 && model.PrintTypeId != 38)
                 {
                     if (model.PrintSizeId ==-1)
                     {
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx
index 63f7c1d..fea8949 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx
@@ -1,265 +1,937 @@
-锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Shijuan.aspx.cs" Inherits="CY.WebForm.Pages.front.Shijuan" %>
-
-<!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>
-</head>
-<body>
-      <input type="hidden" name="printMode" value="0" />
-    <table class="table2">
-        <tbody>
-             <tr>
-                  <td align="center">
-                    <table>
-                        <tr>
-                            <td colspan="6">
-                                <div class="xialap">
-                                    <input type="text"  id="printCount" name="printCount" readonly="readonly"  style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
-                                    <div class="xialapb">
-                                        <div class="xialapr">500</div>
-                                        <div class="xialapr">1000</div>
-                                        <div class="xialapr">2000</div>  
-                                        <div class="xialapr">3000</div> 
-                                        <div class="xialapr">5000</div> 
-                                        <div class="xialapr">10000</div>
-                                        <div class="xialapr">20000</div>
-                                        <div class="xialapr">50000</div>
-                                        <div class="xialapr">100000</div>
-                                    </div>
-                                </div>
-                            </td>
-                            <td>
-                                <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
-                            </td>
-                        </tr>
-                    </table>
-                    
-                </td>
- </tr>
-            <tr>
-                <th style="text-align: left;" colspan="6">
-                    鍗板埛瑕佹眰
-                </th>
-                 
-            </tr>
-             <tr>
-                <th style="text-align: left;" colspan="6">
-                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;璇曞嵎
-                </th>
-                 
-            </tr>
-            
-            <tr>
-                  <td style="width:20%">
-                    绾稿紶锛�<select class="selectLaber"  id="paper0" name="paper0"     keepdefaultstyle='true' >
-                          <option value="60鍏嬫湰鑹插弻鑳�">60鍏嬫湰鑹插弻鑳�</option>
-                         <option value="60鍏嬮珮鐧藉弻鑳�">60鍏嬮珮鐧藉弻鑳�</option> 
-                        <option value="70鍏嬫湰鑹插弻鑳�">70鍏嬫湰鑹插弻鑳�</option>
-                         <option value="70鍏嬮珮鐧藉弻鑳�" selected="selected">70鍏嬮珮鐧藉弻鑳�</option> 
-                        <option value="80鍏嬫湰鑹插弻鑳�">80鍏嬫湰鑹插弻鑳�</option>
-                         <option value="80鍏嬮珮鐧藉弻鑳�">80鍏嬮珮鐧藉弻鑳�</option> 
-                    </select>
-                </td>
-                 <td style="width:20%">
-                   
-                   鎴愬搧灏哄锛�4P <select class="selectLaber" id="paperSize" name="paperSize">
-                        <%
-                            CY.BLL.Inquiry.PaperSizeDetailBLL _paperSizeDetailBLL=new CY.BLL.Inquiry.PaperSizeDetailBLL();
-                            List<CY.Model.SysInquiry_PaperSizeDetail> paperSizeList = _paperSizeDetailBLL.GetPaperSizeList(PrintTypeId);
-                            foreach (CY.Model.SysInquiry_PaperSizeDetail size in paperSizeList)
-                            {
-                        %>
-                        <option value="<%=size.KeyId%>"><%=size.Name%></option>
-                        <%
-                            }
-                        %>
-                    </select>
-
-
-</td>
-                 <td style="width:15%">
-                      6P <select class="selectLaber" id="paperSize6P" name="paperSize6P">
-                           <option value="260x540">260x540</option>
-                          <option value="-1">鑷畾涔夊昂瀵�</option>
-                            </select>
-                    <span style="display:none; margin-left:5px" id="divSize6P"><input id="txtFirstSize6P" name="txtFirstSize6P" type="text" class="validateInt" style="width:35px"/>脳<input id="txtSecondSize6P" name="txtSecondSize6P" type="text" class="validateInt" style="width:35px"/>mm</span>
-                     </td>
-                  <td style="width:15%">
-                     8P <select class="selectLaber" id="paperSize8P" name="paperSize8P">
-                           <option value="260x540">260x740</option>
-                          <option value="-1">鑷畾涔夊昂瀵�</option>
-                            </select>
-                     <span style="display:none; margin-left:5px" id="divSize8P"><input id="txtFirstSize8P" name="txtFirstSize8P" type="text" class="validateInt" style="width:35px"/>脳<input id="txtSecondSize8P" name="txtSecondSize8P" type="text" class="validateInt" style="width:35px"/>mm</span>
-                </td>
-              
-               
-                
-               
-                
-                <td  style="width:25%">
-                   璇曞嵎琚嬬焊寮狅細<select class="selectLaber" name="printColor0">
-                        <option value="80鍏嬬墰鐨焊">80鍏嬬墰鐨焊</option>
-                        <option value="100鍏嬬墰鐨焊" selected="selected">100鍏嬬墰鐨焊</option>
-                        <option value="120鍏嬬墰鐨焊">120鍏嬬墰鐨焊</option>
-                       
-                    </select>
-                </td>
-            </tr>
-             <tr>
-                <th style="text-align: left;" colspan="6">
-                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;绛旈鍗�
-                </th>
-                 
-            </tr>
-               <tr>
-                  <td style="width:20%">
-                    绾稿紶锛�<select class="selectLaber"  id="paper1" name="paper1"     keepdefaultstyle='true' >
-                          
-                        
-                         <option value="70鍏嬮珮鐧藉弻鑳�" >70鍏嬮珮鐧藉弻鑳�</option> 
-                       
-                         <option value="80鍏嬮珮鐧藉弻鑳�">80鍏嬮珮鐧藉弻鑳�</option> 
-                         <option value="100鍏嬮珮鐧藉弻鑳�" selected="selected">100鍏嬮珮鐧藉弻鑳�</option> 
-                       
-                         <option value="120鍏嬮珮鐧藉弻鑳�">120鍏嬮珮鐧藉弻鑳�</option> 
-                    </select>
-                </td>
-                  
-                 <td style="width:20%">
-                      鎴愬搧灏哄锛欰4 <select class="selectLaber" id="paperSizeA4" name="paperSizeA4">
-                           <option value="260x540">260x540</option>
-                          <option value="-1">鑷畾涔夊昂瀵�</option>
-                            </select>
-                    <span style="display:none; margin-left:5px" id="divSizeA4"><input id="txtFirstSizeA4" name="txtFirstSizeA4" type="text" class="validateInt" style="width:35px"/>脳<input id="txtSecondSizeA4" name="txtSecondSizeA4" type="text" class="validateInt" style="width:35px"/>mm</span>
-                     </td>
-                  <td style="width:15%">
-                     A3 <select class="selectLaber" id="paperSizeA3" name="paperSizeA3">
-                           <option value="260x540">260x740</option>
-                          <option value="-1">鑷畾涔夊昂瀵�</option>
-                            </select>
-                     <span style="display:none; margin-left:5px" id="divSizeA3"><input id="txtFirstSizeA3" name="txtFirstSizeA3" type="text" class="validateInt" style="width:35px"/>脳<input id="txtSecondSizeA3" name="txtSecondSizeA3" type="text" class="validateInt" style="width:35px"/>mm</span>
-                </td>
-              
-                <td  style="width:25%">
-                   鍗板埛棰滆壊锛�<select class="selectLaber" name="printColor1">
-                           <option value="榛戣壊">榛戣壊</option>
-                        <option value="鍙岃壊(榛�+閲戠孩)" selected="selected">鍙岃壊(榛�+閲戠孩)</option>
-                       
-                       
-                    </select>
-                </td>
-                
-               
-                
-                <td  style="width:25%">
-                   绛旈鍗¤绾稿紶锛�<select class="selectLaber" name="printColor2">
-                    
-                         <option value="80鍏嬬墰鐨焊">80鍏嬬墰鐨焊</option>
-                        <option value="100鍏嬬墰鐨焊" selected="selected">100鍏嬬墰鐨焊</option>
-                        <option value="120鍏嬬墰鐨焊">120鍏嬬墰鐨焊</option>
-                       
-                    </select>
-                </td>
-            </tr>
-        </tbody>
-    </table>
-     <table class="table2">
-         <tbody>
-             <tr>
-                <th colspan="4">
-                    鍗板埛鏁伴噺
-                </th>
-            </tr>
-            
-              </tbody>
-    </table>
-    <table class="table2 AddTab" value_id="1">
-        <tbody>
-             
-            <tr>
-                <td align="left" style="padding-left: 40px;width:160px;"><span  name="biaohao" value_id="1" >1銆�</span>骞寸骇锛�<select class="selectLaber" name="selNianji"   value_id="1">
-                    
-                         <option value="80鍏嬬墰鐨焊">80鍏嬬墰鐨焊</option>
-                        <option value="100鍏嬬墰鐨焊" selected="selected">100鍏嬬墰鐨焊</option>
-                        <option value="120鍏嬬墰鐨焊">120鍏嬬墰鐨焊</option>
-                       
-                    </select></td>
-                 <td align="left" style="padding-left: 40px;">浜烘暟锛�<input type="text"    name="txtRenshu"    style="height: 15px; line-height: 15px; width:80px;" class="validateInt"   value_id="1" /> </td>
- 
-                 
-                 
-            </tr>
-        </tbody>
-    </table>
-
-    <table class="table2">
-         <tbody>
-              <tr>
-            <td colspan="2" align="center">
-                <input type="button" class="Btn AddForums" value="娣诲姞骞寸邯" />
-                <input type="button" class="Btn CutForums" value="鍑忓皯骞寸邯" />
-            </td>
-        </tr>
-            
-              </tbody>
-    </table>
-</body>
-       <script type="text/javascript" language="javascript">
-           $("#paperSize6P").bind("change", function () {
-               var value = $("#paperSize6P").val();
-               if (value == "-1" || value == -1) {
-                   $("#divSize6P").show();
-                   $("#divSize6P").find("input").show();
-               } else {
-                   $("#divSize6P").hide();
-               }
-           });
-           $("#paperSize8P").bind("change", function () {
-               var value = $("#paperSize8P").val();
-               if (value == "-1" || value == -1) {
-                   $("#divSize8P").show();
-                   $("#divSize8P").find("input").show();
-               } else {
-                   $("#divSize8P").hide();
-               }
-           });
-           $("#paperSizeA4").bind("change", function () {
-               var value = $("#paperSizeA4").val();
-               if (value == "-1" || value == -1) {
-                   $("#divSizeA4").show();
-                   $("#divSizeA4").find("input").show();
-               } else {
-                   $("#divSizeA4").hide();
-               }
-           });
-           $("#paperSizeA3").bind("change", function () {
-               var value = $("#paperSizeA3").val();
-               if (value == "-1" || value == -1) {
-                   $("#divSizeA3").show();
-                   $("#divSizeA3").find("input").show();
-               } else {
-                   $("#divSizeA3").hide();
-               }
-           });
-
-
-           $(".AddForums").click(function () {
-             
-               var value_id = parseInt($(".AddTab").last().attr("value_id"));
-               $(".AddTab").last().after($(".AddTab").last().clone(true));
-               $(".AddTab").last().attr("value_id", value_id + 1);
-              
-
-           });
-
-           $(".CutForums").click(function () {
-               var value_id = parseInt($(".AddTab").last().attr("value_id"));
-               if (value_id == 1) {
-               } else {
-                   $(".AddTab").last().remove();
-               }
-           });
-       </script>
-</html>
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Shijuan.aspx.cs" Inherits="CY.WebForm.Pages.front.Shijuan" %>
+
+<!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>
+</head>
+<body>
+      <input type="hidden" name="printMode" value="0" />
+    <table class="table2">
+        <tbody>
+             <tr style="display:none;">
+                  <td align="center">
+                    <table>
+                        <tr>
+                            <td colspan="6">
+                                <div class="xialap">
+                                    <input type="text"  id="printCount" name="printCount" readonly="readonly"  style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
+                                    <div class="xialapb">
+                                        <div class="xialapr">500</div>
+                                        <div class="xialapr">1000</div>
+                                        <div class="xialapr">2000</div>  
+                                        <div class="xialapr">3000</div> 
+                                        <div class="xialapr">5000</div> 
+                                        <div class="xialapr">10000</div>
+                                        <div class="xialapr">20000</div>
+                                        <div class="xialapr">50000</div>
+                                        <div class="xialapr">100000</div>
+                                    </div>
+                                </div>
+                            </td>
+                            <td>
+                                <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+                            </td>
+                        </tr>
+                    </table>
+                    
+                </td>
+ </tr>
+            <tr>
+                <th style="text-align: left;" colspan="6">
+                    鍗板埛瑕佹眰
+                </th>
+                 
+            </tr>
+             <tr>
+                <th style="text-align: left;" colspan="6">
+                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;璇曞嵎
+                </th>
+                 
+            </tr>
+            
+            <tr>
+                  <td style="width:20%">
+                    绾稿紶锛�<select class="selectLaber"  id="papershijuan" name="papershijuan"     keepdefaultstyle='true' >
+                          <option value="60鍏嬫湰鑹插弻鑳�">60鍏嬫湰鑹插弻鑳�</option>
+                         <option value="60鍏嬮珮鐧藉弻鑳�">60鍏嬮珮鐧藉弻鑳�</option> 
+                        <option value="70鍏嬫湰鑹插弻鑳�">70鍏嬫湰鑹插弻鑳�</option>
+                         <option value="70鍏嬮珮鐧藉弻鑳�" selected="selected">70鍏嬮珮鐧藉弻鑳�</option> 
+                        <option value="80鍏嬫湰鑹插弻鑳�">80鍏嬫湰鑹插弻鑳�</option>
+                         <option value="80鍏嬮珮鐧藉弻鑳�">80鍏嬮珮鐧藉弻鑳�</option> 
+                    </select>
+                </td>
+                 <td style="width:20%">
+                   
+                   鎴愬搧灏哄锛�4P <select class="selectLaber" id="paperSize" name="paperSize">
+                        <%
+                            CY.BLL.Inquiry.PaperSizeDetailBLL _paperSizeDetailBLL=new CY.BLL.Inquiry.PaperSizeDetailBLL();
+                            List<CY.Model.SysInquiry_PaperSizeDetail> paperSizeList = _paperSizeDetailBLL.GetPaperSizeList(PrintTypeId);
+                            foreach (CY.Model.SysInquiry_PaperSizeDetail size in paperSizeList)
+                            {
+                        %>
+                        <option value="<%=size.KeyId%>"><%=size.Name%></option>
+                        <%
+                            }
+                        %>
+                    </select>
+
+
+</td>
+                 <td style="width:15%">
+                      6P <select class="selectLaber" id="paperSize6P" name="paperSize6P">
+                           <option value="260x540">260x540</option>
+                          <option value="-1">鑷畾涔夊昂瀵�</option>
+                            </select>
+                    <span style="display:none; margin-left:5px" id="divSize6P"><input id="txtFirstSize6P" name="txtFirstSize6P" type="text" class="validateInt" style="width:35px"/>脳<input id="txtSecondSize6P" name="txtSecondSize6P" type="text" class="validateInt" style="width:35px"/>mm</span>
+                     </td>
+                  <td style="width:15%">
+                     8P <select class="selectLaber" id="paperSize8P" name="paperSize8P">
+                           <option value="260x540">260x740</option>
+                          <option value="-1">鑷畾涔夊昂瀵�</option>
+                            </select>
+                     <span style="display:none; margin-left:5px" id="divSize8P"><input id="txtFirstSize8P" name="txtFirstSize8P" type="text" class="validateInt" style="width:35px"/>脳<input id="txtSecondSize8P" name="txtSecondSize8P" type="text" class="validateInt" style="width:35px"/>mm</span>
+                </td>
+              
+               
+                
+               
+                
+                <td  style="width:30%">
+                   璇曞嵎琚嬬焊寮狅細<select class="selectLaber" id="printColorshijuan"  name="printColorshijuan">
+                        <option value="80鍏嬬墰鐨焊">80鍏嬬墰鐨焊</option>
+                        <option value="100鍏嬬墰鐨焊" selected="selected">100鍏嬬墰鐨焊</option>
+                        <option value="120鍏嬬墰鐨焊">120鍏嬬墰鐨焊</option>
+                       
+                    </select>
+                </td>
+            </tr>
+             <tr>
+                <th style="text-align: left;" colspan="6">
+                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;绛旈鍗�
+                </th>
+                 
+            </tr>
+               <tr>
+                  <td style="width:20%">
+                    绾稿紶锛�<select class="selectLaber"  id="paper1" name="paper1"     keepdefaultstyle='true' >
+                          
+                        
+                         <option value="70鍏嬮珮鐧藉弻鑳�" >70鍏嬮珮鐧藉弻鑳�</option> 
+                       
+                         <option value="80鍏嬮珮鐧藉弻鑳�">80鍏嬮珮鐧藉弻鑳�</option> 
+                         <option value="100鍏嬮珮鐧藉弻鑳�" selected="selected">100鍏嬮珮鐧藉弻鑳�</option> 
+                       
+                         <option value="120鍏嬮珮鐧藉弻鑳�">120鍏嬮珮鐧藉弻鑳�</option> 
+                    </select>
+                </td>
+                  
+                 <td style="width:20%">
+                      鎴愬搧灏哄锛欰4 <select class="selectLaber" id="paperSizeA4" name="paperSizeA4">
+                           <option value="260x540">260x540</option>
+                          <option value="-1">鑷畾涔夊昂瀵�</option>
+                            </select>
+                    <span style="display:none; margin-left:5px" id="divSizeA4"><input id="txtFirstSizeA4" name="txtFirstSizeA4" type="text" class="validateInt" style="width:35px"/>脳<input id="txtSecondSizeA4" name="txtSecondSizeA4" type="text" class="validateInt" style="width:35px"/>mm</span>
+                     </td>
+                  <td style="width:15%">
+                     A3 <select class="selectLaber" id="paperSizeA3" name="paperSizeA3">
+                           <option value="260x540">260x740</option>
+                          <option value="-1">鑷畾涔夊昂瀵�</option>
+                            </select>
+                     <span style="display:none; margin-left:5px" id="divSizeA3"><input id="txtFirstSizeA3" name="txtFirstSizeA3" type="text" class="validateInt" style="width:35px"/>脳<input id="txtSecondSizeA3" name="txtSecondSizeA3" type="text" class="validateInt" style="width:35px"/>mm</span>
+                </td>
+              
+                <td  style="width:25%">
+                   鍗板埛棰滆壊锛�<select class="selectLaber" id="printColor1" name="printColor1">
+                           <option value="榛戣壊">榛戣壊</option>
+                        <option value="鍙岃壊(榛�+閲戠孩)" selected="selected">鍙岃壊(榛�+閲戠孩)</option>
+                       
+                       
+                    </select>
+                </td>
+                
+               
+                
+                <td  style="width:25%">
+                   绛旈鍗¤绾稿紶锛�<select class="selectLaber" id="printColor2" name="printColor2">
+                    
+                         <option value="80鍏嬬墰鐨焊">80鍏嬬墰鐨焊</option>
+                        <option value="100鍏嬬墰鐨焊" selected="selected">100鍏嬬墰鐨焊</option>
+                        <option value="120鍏嬬墰鐨焊">120鍏嬬墰鐨焊</option>
+                       
+                    </select>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+     <table class="table2">
+         <tbody>
+             <tr>
+                <th colspan="4">
+                    鍗板埛鏁伴噺
+                </th>
+            </tr>
+            
+              </tbody>
+    </table>
+    <table class="table2 AddTab" value_id="1" style="width:140%;">
+        <tbody>
+             
+            <tr>
+                <td align="left" style="width:160px;"><span  name="biaohao" value_id="1" >1銆�</span>骞寸骇锛�<select class="selectLaber" name="selNianji"   value_id="1" onchange="changgeNianji(this);">
+                    
+                         <option value="涓�骞寸骇">涓�骞寸骇</option>
+                       <option value="浜屽勾绾�">浜屽勾绾�</option>
+                       <option value="涓夊勾绾�">涓夊勾绾�</option>
+                    <option value="鍥涘勾绾�">鍥涘勾绾�</option>
+                    <option value="浜斿勾绾�">浜斿勾绾�</option>
+                    <option value="鍏勾绾�">鍏勾绾�</option>
+                    <option value="涓冨勾绾�">涓冨勾绾�</option>
+                    <option value="鍏勾绾�">鍏勾绾�</option>
+                    <option value="涔濆勾绾�">涔濆勾绾�</option>
+                    <option value="楂樹竴">楂樹竴</option>
+                    <option value="楂樹簩">楂樹簩</option>
+                    <option value="楂樹笁">楂樹笁</option>
+                    <option value="楂樻牎璇曞嵎">楂樻牎璇曞嵎</option>
+                       
+                    </select></td>
+                 <td align="left" style="">浜烘暟锛�<input type="text"    name="txtRenshu"    style="height: 15px; line-height: 15px; width:80px;" class="validateInt"   value_id="1" onchange="addshuliang();" /> </td>
+ 
+                 
+                 
+            </tr>
+            <tr name="shijuan" value_id="1" >
+                 <td align="left" style=""  colspan="2">
+                     璇曘��鍗凤細<input type="checkbox" name="yuwencheckbox" value_id="1" value="1" style="display:none;" /><span name="yuwentitle"  value_id="1" >璇枃锛�</span><input type="text"    name="yuwencheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="yuwenunit"  value_id="1" >寮�</span>
+                     <select  class="selectLaber" name="yuwenselect" style=" width:45px;"   value_id="1">
+                         <option value="4P">4P</option>
+                        <option value="6P"  >6P</option>
+                        <option value="8P">8P</option>
+                          <option value="6+4P">6+4P</option>
+                          <option value="6+6P">6+6P</option>
+                       
+                    </select>
+                     <input type="checkbox" name="shuxuecheckbox" value_id="1" value="1" style="display:none;" /><span name="shuxuetitle"  value_id="1" >鏁板锛�</span><input type="text"    name="shuxuecheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="shuxueunit"  value_id="1" >寮�</span>
+                     <select  class="selectLaber" name="shuxueselect" style=" width:45px;"   value_id="1">
+                         <option value="4P">4P</option>
+                        <option value="6P"  >6P</option>
+                        <option value="8P">8P</option>
+                          <option value="6+4P">6+4P</option>
+                          <option value="6+6P">6+6P</option>
+                       
+                    </select>
+                      <input type="checkbox" name="yingyucheckbox" value_id="1" value="1" style="display:none;"  /><span name="yingyutitle"  value_id="1" style="display:none;" >鑻辫锛�</span><input type="text"    name="yingyucheckboxinput"    style="height: 15px; line-height: 15px; width:40px;display:none;" class="validateInt"   value_id="1" /><span name="yingyuunit"  value_id="1" style="display:none;" >寮�</span>
+                     <select  class="selectLaber" name="yingyuselect" style=" width:45px;display:none;"   value_id="1" >
+                         <option value="4P">4P</option>
+                        <option value="6P"  >6P</option>
+                        <option value="8P">8P</option>
+                          <option value="6+4P">6+4P</option>
+                          <option value="6+6P">6+6P</option>
+                       
+                    </select>
+                      <input type="checkbox" name="kexuecheckbox" value_id="1" value="1" style="display:none;" /><span name="kexuetitle"  value_id="1" style="display:none;" >绉戝锛�</span><input type="text"    name="kexuecheckboxinput"    style="height: 15px; line-height: 15px; width:40px;display:none;" class="validateInt"   value_id="1" /><span name="kexueunit"  value_id="1" style="display:none;" >寮�</span>
+                     <select  class="selectLaber" name="kexueselect" style=" width:45px;display:none;"   value_id="1">
+                         <option value="4P">4P</option>
+                        <option value="6P"  >6P</option>
+                        <option value="8P">8P</option>
+                          <option value="6+4P">6+4P</option>
+                          <option value="6+6P">6+6P</option>
+                       
+                    </select>
+                     <input type="checkbox" name="lishicheckbox" value_id="1" value="1" style="display:none;"  /><span name="lishititle"  value_id="1" style="display:none;"  >鍘嗗彶锛�</span><input type="text"    name="lishicheckboxinput"    style="height: 15px; line-height: 15px; width:40px;display:none;" class="validateInt"   value_id="1" /><span name="lishiunit"  value_id="1" style="display:none;"  >寮�</span>
+                     <select  class="selectLaber" name="lishiselect" style=" width:45px;display:none;"   value_id="1">
+                         <option value="4P">4P</option>
+                        <option value="6P"  >6P</option>
+                        <option value="8P">8P</option>
+                          <option value="6+4P">6+4P</option>
+                          <option value="6+6P">6+6P</option>
+                       
+                    </select>
+                      <input type="checkbox" name="dilicheckbox" value_id="1" value="1" style="display:none;"  /><span name="dilititle"  value_id="1" style="display:none;"  >鍦扮悊锛�</span><input type="text"    name="dilicheckboxinput"    style="height: 15px; line-height: 15px; width:40px;display:none;" class="validateInt"   value_id="1" /><span name="diliunit"  value_id="1" style="display:none;"  >寮�</span>
+                     <select  class="selectLaber" name="diliselect" style=" width:45px;display:none;"   value_id="1">
+                         <option value="4P">4P</option>
+                        <option value="6P"  >6P</option>
+                        <option value="8P">8P</option>
+                          <option value="6+4P">6+4P</option>
+                          <option value="6+6P">6+6P</option>
+                       
+                    </select>
+                     <input type="checkbox" name="shengwucheckbox" value_id="1" value="1" style="display:none;" /><span name="shengwutitle"  value_id="1" style="display:none;" >鐢熺墿锛�</span><input type="text"    name="shengwucheckboxinput"    style="height: 15px; line-height: 15px; width:40px;display:none;" class="validateInt"   value_id="1" /><span name="shengwuunit"  value_id="1" style="display:none;" >寮�</span>
+                     <select  class="selectLaber" name="shengwuselect" style=" width:45px;display:none;"   value_id="1">
+                         <option value="4P">4P</option>
+                        <option value="6P"  >6P</option>
+                        <option value="8P">8P</option>
+                          <option value="6+4P">6+4P</option>
+                          <option value="6+6P">6+6P</option>
+                       
+                    </select>
+                     <input type="checkbox" name="pingdecheckbox" value_id="1" value="1" style="display:none;"  /><span name="pingdetitle"  value_id="1" >鍝佸痉涓庣敓娲伙細</span><input type="text"    name="pingdecheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="pingdeunit"  value_id="1" >寮�</span>
+                     <select  class="selectLaber" name="pingdeselect" style=" width:45px;"   value_id="1">
+                         <option value="4P">4P</option>
+                        <option value="6P"  >6P</option>
+                        <option value="8P">8P</option>
+                          <option value="6+4P">6+4P</option>
+                          <option value="6+6P">6+6P</option>
+                       
+                    </select>
+                      <input type="checkbox" name="wulicheckbox" value_id="1" value="1" style="display:none;" /><span name="wulititle"  value_id="1" style="display:none;" >鐗╃悊锛�</span><input type="text"    name="wulicheckboxinput"    style="height: 15px; line-height: 15px; width:40px;display:none;" class="validateInt"   value_id="1" /><span name="wuliunit"  value_id="1" style="display:none;" >寮�</span>
+                     <select  class="selectLaber" name="wuliselect" style=" width:45px;display:none;"   value_id="1">
+                         <option value="4P">4P</option>
+                        <option value="6P"  >6P</option>
+                        <option value="8P">8P</option>
+                          <option value="6+4P">6+4P</option>
+                          <option value="6+6P">6+6P</option>
+                       
+                    </select>
+                      <input type="checkbox" name="huaxuecheckbox" value_id="1" value="1" style="display:none;" /><span name="huaxuetitle"  value_id="1" style="display:none;" >鍖栧锛�</span><input type="text"    name="huaxuecheckboxinput"    style="height: 15px; line-height: 15px; width:40px;display:none;" class="validateInt"   value_id="1" /><span name="huaxueunit"  value_id="1" style="display:none;" >寮�</span>
+                     <select  class="selectLaber" name="huaxueselect" style=" width:45px;display:none;"   value_id="1">
+                         <option value="4P">4P</option>
+                        <option value="6P"  >6P</option>
+                        <option value="8P">8P</option>
+                          <option value="6+4P">6+4P</option>
+                          <option value="6+6P">6+6P</option>
+                       
+                    </select>
+                       <input type="checkbox" name="zhengzhicheckbox" value_id="1" value="1" style="display:none;" /><span name="zhengzhititle"  value_id="1" style="display:none;" >鏀挎不锛�</span><input type="text"    name="zhengzhicheckboxinput"    style="height: 15px; line-height: 15px; width:40px;display:none;" class="validateInt"   value_id="1" /><span name="zhengzhiunit"  value_id="1" style="display:none;" >寮�</span>
+                     <select  class="selectLaber" name="zhengzhiselect" style=" width:45px;display:none;"   value_id="1">
+                         <option value="4P">4P</option>
+                        <option value="6P"  >6P</option>
+                        <option value="8P">8P</option>
+                          <option value="6+4P">6+4P</option>
+                          <option value="6+6P">6+6P</option>
+                       
+                    </select>
+                      <input type="checkbox" name="sixiangpingdecheckbox" value_id="1" value="1" style="display:none;" /><span name="sixiangpingdetitle"  value_id="1" style="display:none;" >鎬濇兂鍝佸痉锛�</span><input type="text"    name="sixiangpingdecheckboxinput"    style="height: 15px; line-height: 15px; width:40px;display:none;" class="validateInt"   value_id="1" /><span name="sixiangpingdeunit"  value_id="1" style="display:none;" >寮�</span>
+                     <select  class="selectLaber" name="sixiangpingdeselect" style=" width:45px;display:none;"   value_id="1">
+                         <option value="4P">4P</option>
+                        <option value="6P"  >6P</option>
+                        <option value="8P">8P</option>
+                          <option value="6+4P">6+4P</option>
+                          <option value="6+6P">6+6P</option>
+                       
+                    </select>
+                     
+                     </td>
+                 </tr>
+             <tr name="datika" value_id="1" style="display:none;" >
+                 <td align="left" style="" colspan="2">
+                     绛旈鍗★細<input type="checkbox" name="yuwendatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="yuwendatikatitle"  value_id="1" >璇枃锛�</span><input type="text"    name="yuwendatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="yuwendatikaunit"  value_id="1" >寮�</span>
+                     <select  class="selectLaber" name="yuwendatikaselect" style=" width:45px;"   value_id="1">
+                         <option value="A4">A4</option>
+                        <option value="A3"  >A3</option>
+                        
+                       
+                    </select>
+                     <input type="checkbox" name="shuxuedatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="shuxuedatikatitle"  value_id="1" >鏁板锛�</span><input type="text"    name="shuxuedatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="shuxuedatikaunit"  value_id="1" >寮�</span>
+                     <select  class="selectLaber" name="shuxuedatikaselect" style=" width:45px;"   value_id="1">
+                          <option value="A4">A4</option>
+                        <option value="A3"  >A3</option>
+                       
+                    </select>
+                      <input type="checkbox" name="yingyudatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="yingyudatikatitle"  value_id="1" >鑻辫锛�</span><input type="text"    name="yingyudatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="yingyudatikaunit"  value_id="1" >寮�</span>
+                     <select  class="selectLaber" name="yingyudatikaselect" style=" width:45px;"   value_id="1">
+                         <option value="A4">A4</option>
+                        <option value="A3"  >A3</option>
+                       
+                    </select>
+                      <input type="checkbox" name="kexuedatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="kexuedatikatitle"  value_id="1" >绉戝锛�</span><input type="text"    name="kexuedatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="kexuedatikaunit"  value_id="1" >寮�</span>
+                     <select  class="selectLaber" name="kexuedatikaselect" style=" width:45px;"   value_id="1">
+                         <option value="A4">A4</option>
+                        <option value="A3"  >A3</option>
+                       
+                    </select>
+                     <input type="checkbox" name="lishidatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="lishidatikatitle"  value_id="1" >鍘嗗彶锛�</span><input type="text"    name="lishidatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="lishidatikaunit"  value_id="1" >寮�</span>
+                     <select  class="selectLaber" name="lishidatikaselect" style=" width:45px;"   value_id="1">
+                           <option value="A4">A4</option>
+                        <option value="A3"  >A3</option>
+                       
+                    </select>
+                      <input type="checkbox" name="dilidatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="dilidatikatitle"  value_id="1" >鍦扮悊锛�</span><input type="text"    name="dilidatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="dilidatikaunit"  value_id="1" >寮�</span>
+                     <select  class="selectLaber" name="dilidatikaselect" style=" width:45px;"   value_id="1">
+                          <option value="A4">A4</option>
+                        <option value="A3"  >A3</option>
+                       
+                    </select>
+                     <input type="checkbox" name="shengwudatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="shengwudatikatitle"  value_id="1" >鐢熺墿锛�</span><input type="text"    name="shengwudatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="shengwudatikaunit"  value_id="1" >寮�</span>
+                     <select  class="selectLaber" name="shengwudatikaselect" style=" width:45px;"   value_id="1">
+                          <option value="A4">A4</option>
+                        <option value="A3"  >A3</option>
+                       
+                    </select>
+                     <input type="checkbox" name="pingdedatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="pingdedatikatitle"  value_id="1" >鍝佸痉涓庣敓娲伙細</span><input type="text"    name="pingdedatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="pingdedatikaunit"  value_id="1" >寮�</span>
+                     <select  class="selectLaber" name="pingdedatikaselect" style=" width:45px;"   value_id="1">
+                          <option value="A4">A4</option>
+                        <option value="A3"  >A3</option>
+                       
+                    </select>
+                      <input type="checkbox" name="wulidatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="wulidatikatitle"  value_id="1" >鐗╃悊锛�</span><input type="text"    name="wulidatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="wulidatikaunit"  value_id="1" >寮�</span>
+                     <select  class="selectLaber" name="wulidatikaselect" style=" width:45px;"   value_id="1">
+                          <option value="A4">A4</option>
+                        <option value="A3"  >A3</option>
+                       
+                    </select>
+                      <input type="checkbox" name="huaxuedatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="huaxuedatikatitle"  value_id="1" >鍖栧锛�</span><input type="text"    name="huaxuedatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="huaxuedatikaunit"  value_id="1" >寮�</span>
+                     <select  class="selectLaber" name="huaxuedatikaselect" style=" width:45px;"   value_id="1">
+                          <option value="A4">A4</option>
+                        <option value="A3"  >A3</option>
+                       
+                    </select>
+                       <input type="checkbox" name="zhengzhidatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="zhengzhidatikatitle"  value_id="1" >鏀挎不锛�</span><input type="text"    name="zhengzhidatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="zhengzhidatikaunit"  value_id="1" >寮�</span>
+                     <select  class="selectLaber" name="zhengzhidatikaselect" style=" width:45px;"   value_id="1">
+                          <option value="A4">A4</option>
+                        <option value="A3"  >A3</option>
+                       
+                    </select>
+                      <input type="checkbox" name="sixiangpingdedatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="sixiangpingdedatikatitle"  value_id="1" >鎬濇兂鍝佸痉锛�</span><input type="text"    name="sixiangpingdedatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="sixiangpingdedatikaunit"  value_id="1" >寮�</span>
+                     <select  class="selectLaber" name="sixiangpingdedatikaselect" style=" width:45px;"   value_id="1">
+                          <option value="A4">A4</option>
+                        <option value="A3"  >A3</option>
+                       
+                    </select>
+                     </td>
+                 </tr>
+        </tbody>
+    </table>
+
+    <table class="table2">
+         <tbody>
+              <tr>
+            <td colspan="2" align="center">
+                <input type="button" class="Btn AddForums" value="娣诲姞骞寸骇" />
+                <input type="button" class="Btn CutForums" value="鍑忓皯骞寸骇" />
+            </td>
+        </tr>
+            
+              </tbody>
+    </table>
+</body>
+       <script type="text/javascript" language="javascript">
+           $("#paperSize6P").bind("change", function () {
+               var value = $("#paperSize6P").val();
+               if (value == "-1" || value == -1) {
+                   $("#divSize6P").show();
+                   $("#divSize6P").find("input").show();
+               } else {
+                   $("#divSize6P").hide();
+               }
+           });
+           $("#paperSize8P").bind("change", function () {
+               var value = $("#paperSize8P").val();
+               if (value == "-1" || value == -1) {
+                   $("#divSize8P").show();
+                   $("#divSize8P").find("input").show();
+               } else {
+                   $("#divSize8P").hide();
+               }
+           });
+           $("#paperSizeA4").bind("change", function () {
+               var value = $("#paperSizeA4").val();
+               if (value == "-1" || value == -1) {
+                   $("#divSizeA4").show();
+                   $("#divSizeA4").find("input").show();
+               } else {
+                   $("#divSizeA4").hide();
+               }
+           });
+           $("#paperSizeA3").bind("change", function () {
+               var value = $("#paperSizeA3").val();
+               if (value == "-1" || value == -1) {
+                   $("#divSizeA3").show();
+                   $("#divSizeA3").find("input").show();
+               } else {
+                   $("#divSizeA3").hide();
+               }
+           });
+
+
+           $(".AddForums").click(function () {
+             
+               var value_id = parseInt($(".AddTab").last().attr("value_id"));
+               $(".AddTab").last().after($(".AddTab").last().clone(true));
+               $(".AddTab").last().attr("value_id", value_id + 1);
+
+               $("span[name='biaohao']").last().attr("value_id", value_id + 1);
+               $("span[name='biaohao']").last().text((value_id + 1) + "銆�");
+
+
+               $("tr[name='shijuan']").last().attr("value_id", value_id + 1);
+               $("tr[name='datika']").last().attr("value_id", value_id + 1);
+
+               $("select[name='selNianji']").last().attr("value_id", value_id + 1);
+               $("input[name='txtRenshu']").last().attr("value_id", value_id + 1);
+
+               $("input[name='yuwencheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='yuwencheckboxinput']").last().attr("value_id", value_id + 1);
+               $("select[name='yuwenselect']").last().attr("value_id", value_id + 1);
+               $("input[name='yuwendatikacheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='yuwendatikacheckboxinput']").last().attr("value_id", value_id + 1);
+               $("select[name='yuwendatikaselect']").last().attr("value_id", value_id + 1);
+               $("span[name='yuwentitle']").last().attr("value_id", value_id + 1);
+               $("span[name='yuwenunit']").last().attr("value_id", value_id + 1);
+               $("span[name='yuwendatikatitle']").last().attr("value_id", value_id + 1);
+               $("span[name='yuwendatikaunit']").last().attr("value_id", value_id + 1);
+               $("input[name='yuwencheckbox']").last().val(value_id + 1);
+               $("input[name='yuwendatikacheckbox']").last().val(value_id + 1);
+
+               $("input[name='shuxuecheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='shuxuecheckboxinput']").last().attr("value_id", value_id + 1);
+               $("select[name='shuxueselect']").last().attr("value_id", value_id + 1);
+               $("input[name='shuxuedatikacheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='shuxuedatikacheckboxinput']").last().attr("value_id", value_id + 1);
+               $("select[name='shuxuedatikaselect']").last().attr("value_id", value_id + 1);
+               $("span[name='shuxuetitle']").last().attr("value_id", value_id + 1);
+               $("span[name='shuxueunit']").last().attr("value_id", value_id + 1);
+               $("span[name='shuxuedatikatitle']").last().attr("value_id", value_id + 1);
+               $("span[name='shuxuedatikaunit']").last().attr("value_id", value_id + 1);
+               $("input[name='shuxuecheckbox']").last().val(value_id + 1);
+               $("input[name='shuxuedatikacheckbox']").last().val(value_id + 1);
+
+               $("input[name='yingyucheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='yingyucheckboxinput']").last().attr("value_id", value_id + 1);
+               $("select[name='yingyuselect']").last().attr("value_id", value_id + 1);
+               $("input[name='yingyudatikacheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='yingyudatikacheckboxinput']").last().attr("value_id", value_id + 1);
+               $("select[name='yingyudatikaselect']").last().attr("value_id", value_id + 1);
+               $("span[name='yingyutitle']").last().attr("value_id", value_id + 1);
+               $("span[name='yingyuunit']").last().attr("value_id", value_id + 1);
+               $("span[name='yingyudatikatitle']").last().attr("value_id", value_id + 1);
+               $("span[name='yingyudatikaunit']").last().attr("value_id", value_id + 1);
+               $("input[name='yingyucheckbox']").last().val(value_id + 1);
+               $("input[name='yingyudatikacheckbox']").last().val(value_id + 1);
+
+               $("input[name='kexuecheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='kexuecheckboxinput']").last().attr("value_id", value_id + 1);
+               $("select[name='kexueselect']").last().attr("value_id", value_id + 1);
+               $("input[name='kexuedatikacheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='kexuedatikacheckboxinput']").last().attr("value_id", value_id + 1);
+               $("select[name='kexuedatikaselect']").last().attr("value_id", value_id + 1);
+               $("span[name='kexuetitle']").last().attr("value_id", value_id + 1);
+               $("span[name='kexueunit']").last().attr("value_id", value_id + 1);
+               $("span[name='kexuedatikatitle']").last().attr("value_id", value_id + 1);
+               $("span[name='kexuedatikaunit']").last().attr("value_id", value_id + 1);
+               $("input[name='kexuecheckbox']").last().val(value_id + 1);
+               $("input[name='kexuedatikacheckbox']").last().val(value_id + 1);
+
+               $("input[name='lishicheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='lishicheckboxinput']").last().attr("value_id", value_id + 1);
+               $("select[name='lishiselect']").last().attr("value_id", value_id + 1);
+               $("input[name='lishidatikacheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='lishidatikacheckboxinput']").last().attr("value_id", value_id + 1);
+               $("select[name='lishidatikaselect']").last().attr("value_id", value_id + 1);
+               $("span[name='lishititle']").last().attr("value_id", value_id + 1);
+               $("span[name='lishiunit']").last().attr("value_id", value_id + 1);
+               $("span[name='lishidatikatitle']").last().attr("value_id", value_id + 1);
+               $("span[name='lishidatikaunit']").last().attr("value_id", value_id + 1);
+               $("input[name='lishicheckbox']").last().val(value_id + 1);
+               $("input[name='lishidatikacheckbox']").last().val(value_id + 1);
+
+               $("input[name='dilicheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='dilicheckboxinput']").last().attr("value_id", value_id + 1);
+               $("select[name='diliselect']").last().attr("value_id", value_id + 1);
+               $("input[name='dilidatikacheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='dilidatikacheckboxinput']").last().attr("value_id", value_id + 1);
+               $("select[name='dilidatikaselect']").last().attr("value_id", value_id + 1);
+               $("span[name='dilititle']").last().attr("value_id", value_id + 1);
+               $("span[name='diliunit']").last().attr("value_id", value_id + 1);
+               $("span[name='dilidatikatitle']").last().attr("value_id", value_id + 1);
+               $("span[name='dilidatikaunit']").last().attr("value_id", value_id + 1);
+               $("input[name='dilicheckbox']").last().val(value_id + 1);
+               $("input[name='dilidatikacheckbox']").last().val(value_id + 1);
+
+               $("input[name='shengwucheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='shengwucheckboxinput']").last().attr("value_id", value_id + 1);
+               $("select[name='shengwuselect']").last().attr("value_id", value_id + 1);
+               $("input[name='shengwudatikacheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='shengwudatikacheckboxinput']").last().attr("value_id", value_id + 1);
+               $("select[name='shengwudatikaselect']").last().attr("value_id", value_id + 1);
+               $("span[name='shengwutitle']").last().attr("value_id", value_id + 1);
+               $("span[name='shengwuunit']").last().attr("value_id", value_id + 1);
+               $("span[name='shengwudatikatitle']").last().attr("value_id", value_id + 1);
+               $("span[name='shengwudatikaunit']").last().attr("value_id", value_id + 1);
+               $("input[name='shengwucheckbox']").last().val(value_id + 1);
+               $("input[name='shengwudatikacheckbox']").last().val(value_id + 1);
+
+               $("input[name='pingdecheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='pingdecheckboxinput']").last().attr("value_id", value_id + 1);
+               $("select[name='pingdeselect']").last().attr("value_id", value_id + 1);
+               $("input[name='pingdedatikacheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='pingdedatikacheckboxinput']").last().attr("value_id", value_id + 1);
+               $("select[name='pingdedatikaselect']").last().attr("value_id", value_id + 1);
+               $("span[name='pingdetitle']").last().attr("value_id", value_id + 1);
+               $("span[name='pingdeunit']").last().attr("value_id", value_id + 1);
+               $("span[name='pingdedatikatitle']").last().attr("value_id", value_id + 1);
+               $("span[name='pingdedatikaunit']").last().attr("value_id", value_id + 1);
+               $("input[name='pingdecheckbox']").last().val(value_id + 1);
+               $("input[name='pingdedatikacheckbox']").last().val(value_id + 1);
+
+               $("input[name='wulicheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='wulicheckboxinput']").last().attr("value_id", value_id + 1);
+               $("select[name='wuliselect']").last().attr("value_id", value_id + 1);
+               $("input[name='wulidatikacheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='wulidatikacheckboxinput']").last().attr("value_id", value_id + 1);
+               $("select[name='wulidatikaselect']").last().attr("value_id", value_id + 1);
+               $("span[name='wulititle']").last().attr("value_id", value_id + 1);
+               $("span[name='wuliunit']").last().attr("value_id", value_id + 1);
+               $("span[name='wulidatikatitle']").last().attr("value_id", value_id + 1);
+               $("span[name='wulidatikaunit']").last().attr("value_id", value_id + 1);
+               $("input[name='wulicheckbox']").last().val(value_id + 1);
+               $("input[name='wulidatikacheckbox']").last().val(value_id + 1);
+
+               $("input[name='huaxuecheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='huaxuecheckboxinput']").last().attr("value_id", value_id + 1);
+               $("select[name='huaxueselect']").last().attr("value_id", value_id + 1);
+               $("input[name='huaxuedatikacheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='huaxuedatikacheckboxinput']").last().attr("value_id", value_id + 1);
+               $("select[name='huaxuedatikaselect']").last().attr("value_id", value_id + 1);
+               $("span[name='huaxuetitle']").last().attr("value_id", value_id + 1);
+               $("span[name='huaxueunit']").last().attr("value_id", value_id + 1);
+               $("span[name='huaxuedatikatitle']").last().attr("value_id", value_id + 1);
+               $("span[name='huaxuedatikaunit']").last().attr("value_id", value_id + 1);
+               $("input[name='huaxuecheckbox']").last().val(value_id + 1);
+               $("input[name='huaxuedatikacheckbox']").last().val(value_id + 1);
+
+               $("input[name='zhengzhicheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='zhengzhicheckboxinput']").last().attr("value_id", value_id + 1);
+               $("select[name='zhengzhiselect']").last().attr("value_id", value_id + 1);
+               $("input[name='zhengzhidatikacheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='zhengzhidatikacheckboxinput']").last().attr("value_id", value_id + 1);
+               $("select[name='zhengzhidatikaselect']").last().attr("value_id", value_id + 1);
+               $("span[name='zhengzhititle']").last().attr("value_id", value_id + 1);
+               $("span[name='zhengzhiunit']").last().attr("value_id", value_id + 1);
+               $("span[name='zhengzhidatikatitle']").last().attr("value_id", value_id + 1);
+               $("span[name='zhengzhidatikaunit']").last().attr("value_id", value_id + 1);
+               $("input[name='zhengzhicheckbox']").last().val(value_id + 1);
+               $("input[name='zhengzhidatikacheckbox']").last().val(value_id + 1);
+
+               $("input[name='sixiangpingdecheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='sixiangpingdecheckboxinput']").last().attr("value_id", value_id + 1);
+               $("select[name='sixiangpingdeselect']").last().attr("value_id", value_id + 1);
+               $("input[name='sixiangpingdedatikacheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='sixiangpingdedatikacheckboxinput']").last().attr("value_id", value_id + 1);
+               $("select[name='sixiangpingdedatikaselect']").last().attr("value_id", value_id + 1);
+               $("span[name='sixiangpingdetitle']").last().attr("value_id", value_id + 1);
+               $("span[name='sixiangpingdeunit']").last().attr("value_id", value_id + 1);
+               $("span[name='sixiangpingdedatikatitle']").last().attr("value_id", value_id + 1);
+               $("span[name='sixiangpingdedatikaunit']").last().attr("value_id", value_id + 1);
+               $("input[name='sixiangpingdecheckbox']").last().val(value_id + 1);
+               $("input[name='sixiangpingdedatikacheckbox']").last().val(value_id + 1);
+               
+               
+               changgeNianji($("select[name='selNianji']").last());
+
+           });
+
+           $(".CutForums").click(function () {
+               var value_id = parseInt($(".AddTab").last().attr("value_id"));
+               if (value_id == 1) {
+               } else {
+                   $(".AddTab").last().remove();
+               }
+           });
+
+           function addshuliang() {
+
+               var printCount = 0;
+               $("input[name='txtRenshu']").each(function (ii, vv) {
+
+                 
+                   if ($(vv).val() != "") {
+                       var value = parseInt($(vv).val());
+                       if (isNaN(value)) {
+                           printCount += 0;
+                       } else {
+                           printCount += value;
+                       }
+                      
+                   }
+                  
+               });
+               $("#printCount").val(printCount);
+           }
+
+
+           function changgeNianji(obj) {
+               var value_id = $(obj).attr("value_id");
+               if ($(obj).val() == "涓�骞寸骇" || $(obj).val() == "浜屽勾绾�") {
+                   $("tr[name='datika'][value_id='" + value_id + "']").hide();
+                   $("tr[name='shijuan'][value_id='" + value_id + "']").show();
+
+                   $("input[name='yingyucheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='yingyuselect'][value_id='" + value_id + "']").hide();
                   $("span[name='yingyutitle'][value_id='" + value_id + "']").hide();
                   $("span[name='yingyuunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='kexuecheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='kexueselect'][value_id='" + value_id + "']").hide();
                   $("span[name='kexuetitle'][value_id='" + value_id + "']").hide();
                   $("span[name='kexueunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='pingdecheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='pingdeselect'][value_id='" + value_id + "']").show();
                   $("span[name='pingdetitle'][value_id='" + value_id + "']").show();
                   $("span[name='pingdeunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='lishicheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='lishiselect'][value_id='" + value_id + "']").hide();
                   $("span[name='lishititle'][value_id='" + value_id + "']").hide();
                   $("span[name='lishiunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='dilicheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='diliselect'][value_id='" + value_id + "']").hide();
                   $("span[name='dilititle'][value_id='" + value_id + "']").hide();
                   $("span[name='diliunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='shengwucheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='shengwuselect'][value_id='" + value_id + "']").hide();
                   $("span[name='shengwutitle'][value_id='" + value_id + "']").hide();
                   $("span[name='shengwuunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='wulicheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='wuliselect'][value_id='" + value_id + "']").hide();
                   $("span[name='wulititle'][value_id='" + value_id + "']").hide();
                   $("span[name='wuliunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='huaxuecheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='huaxueselect'][value_id='" + value_id + "']").hide();
                   $("span[name='huaxuetitle'][value_id='" + value_id + "']").hide();
                   $("span[name='huaxueunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='zhengzhicheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='zhengzhiselect'][value_id='" + value_id + "']").hide();
                   $("span[name='zhengzhititle'][value_id='" + value_id + "']").hide();
                   $("span[name='zhengzhiunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='sixiangpingdecheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='sixiangpingdeselect'][value_id='" + value_id + "']").hide();
                   $("span[name='sixiangpingdetitle'][value_id='" + value_id + "']").hide();
                   $("span[name='sixiangpingdeunit'][value_id='" + value_id + "']").hide();
+               } else if ($(obj).val() == "涓夊勾绾�" || $(obj).val() == "鍥涘勾绾�" || $(obj).val() == "浜斿勾绾�" || $(obj).val() == "鍏勾绾�") {
+                   $("tr[name='datika'][value_id='" + value_id + "']").hide();
+                   $("tr[name='shijuan'][value_id='" + value_id + "']").show();
+
+                   $("input[name='yingyucheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='yingyuselect'][value_id='" + value_id + "']").show();
                   $("span[name='yingyutitle'][value_id='" + value_id + "']").show();
                   $("span[name='yingyuunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='kexuecheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='kexueselect'][value_id='" + value_id + "']").show();
                   $("span[name='kexuetitle'][value_id='" + value_id + "']").show();
                   $("span[name='kexueunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='pingdecheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='pingdeselect'][value_id='" + value_id + "']").show();
                   $("span[name='pingdetitle'][value_id='" + value_id + "']").show();
                   $("span[name='pingdeunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='lishicheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='lishiselect'][value_id='" + value_id + "']").hide();
                   $("span[name='lishititle'][value_id='" + value_id + "']").hide();
                   $("span[name='lishiunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='dilicheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='diliselect'][value_id='" + value_id + "']").hide();
                   $("span[name='dilititle'][value_id='" + value_id + "']").hide();
                   $("span[name='diliunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='shengwucheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='shengwuselect'][value_id='" + value_id + "']").hide();
                   $("span[name='shengwutitle'][value_id='" + value_id + "']").hide();
                   $("span[name='shengwuunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='wulicheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='wuliselect'][value_id='" + value_id + "']").hide();
                   $("span[name='wulititle'][value_id='" + value_id + "']").hide();
                   $("span[name='wuliunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='huaxuecheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='huaxueselect'][value_id='" + value_id + "']").hide();
                   $("span[name='huaxuetitle'][value_id='" + value_id + "']").hide();
                   $("span[name='huaxueunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='zhengzhicheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='zhengzhiselect'][value_id='" + value_id + "']").hide();
                   $("span[name='zhengzhititle'][value_id='" + value_id + "']").hide();
                   $("span[name='zhengzhiunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='sixiangpingdecheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='sixiangpingdeselect'][value_id='" + value_id + "']").hide();
                   $("span[name='sixiangpingdetitle'][value_id='" + value_id + "']").hide();
                   $("span[name='sixiangpingdeunit'][value_id='" + value_id + "']").hide();
+
+               } else if ($(obj).val() == "涓冨勾绾�" ) {
+                   $("tr[name='datika'][value_id='" + value_id + "']").show();
+                   $("tr[name='shijuan'][value_id='" + value_id + "']").show();
+
+                   $("input[name='yingyucheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='yingyuselect'][value_id='" + value_id + "']").show();
                   $("span[name='yingyutitle'][value_id='" + value_id + "']").show();
                   $("span[name='yingyuunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='kexuecheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='kexueselect'][value_id='" + value_id + "']").hide();
                   $("span[name='kexuetitle'][value_id='" + value_id + "']").hide();
                   $("span[name='kexueunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='pingdecheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='pingdeselect'][value_id='" + value_id + "']").hide();
                   $("span[name='pingdetitle'][value_id='" + value_id + "']").hide();
                   $("span[name='pingdeunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='lishicheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='lishiselect'][value_id='" + value_id + "']").show();
                   $("span[name='lishititle'][value_id='" + value_id + "']").show();
                   $("span[name='lishiunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='dilicheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='diliselect'][value_id='" + value_id + "']").show();
                   $("span[name='dilititle'][value_id='" + value_id + "']").show();
                   $("span[name='diliunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='shengwucheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='shengwuselect'][value_id='" + value_id + "']").show();
                   $("span[name='shengwutitle'][value_id='" + value_id + "']").show();
                   $("span[name='shengwuunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='wulicheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='wuliselect'][value_id='" + value_id + "']").hide();
                   $("span[name='wulititle'][value_id='" + value_id + "']").hide();
                   $("span[name='wuliunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='huaxuecheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='huaxueselect'][value_id='" + value_id + "']").hide();
                   $("span[name='huaxuetitle'][value_id='" + value_id + "']").hide();
                   $("span[name='huaxueunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='zhengzhicheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='zhengzhiselect'][value_id='" + value_id + "']").hide();
                   $("span[name='zhengzhititle'][value_id='" + value_id + "']").hide();
                   $("span[name='zhengzhiunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='sixiangpingdecheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='sixiangpingdeselect'][value_id='" + value_id + "']").show();
                   $("span[name='sixiangpingdetitle'][value_id='" + value_id + "']").show();
                   $("span[name='sixiangpingdeunit'][value_id='" + value_id + "']").show();
+
+
+
+                   $("input[name='yingyudatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='yingyudatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='yingyudatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='yingyudatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='kexuedatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='kexuedatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='kexuedatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='kexuedatikaunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='pingdedatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='pingdedatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='pingdedatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='pingdedatikaunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='lishidatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='lishidatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='lishidatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='lishidatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='dilidatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='dilidatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='dilidatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='dilidatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='shengwudatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='shengwudatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='shengwudatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='shengwudatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='wulidatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='wulidatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='wulidatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='wulidatikaunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='huaxuedatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='huaxuedatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='huaxuedatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='huaxuedatikaunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='zhengzhidatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='zhengzhidatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='zhengzhidatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='zhengzhidatikaunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='sixiangpingdedatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='sixiangpingdedatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='sixiangpingdedatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='sixiangpingdedatikaunit'][value_id='" + value_id + "']").show();
+               } else if ($(obj).val() == "鍏勾绾�") {
+                   $("tr[name='datika'][value_id='" + value_id + "']").show();
+                   $("tr[name='shijuan'][value_id='" + value_id + "']").show();
+
+                   $("input[name='yingyucheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='yingyuselect'][value_id='" + value_id + "']").show();
                   $("span[name='yingyutitle'][value_id='" + value_id + "']").show();
                   $("span[name='yingyuunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='kexuecheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='kexueselect'][value_id='" + value_id + "']").hide();
                   $("span[name='kexuetitle'][value_id='" + value_id + "']").hide();
                   $("span[name='kexueunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='pingdecheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='pingdeselect'][value_id='" + value_id + "']").hide();
                   $("span[name='pingdetitle'][value_id='" + value_id + "']").hide();
                   $("span[name='pingdeunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='lishicheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='lishiselect'][value_id='" + value_id + "']").show();
                   $("span[name='lishititle'][value_id='" + value_id + "']").show();
                   $("span[name='lishiunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='dilicheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='diliselect'][value_id='" + value_id + "']").show();
                   $("span[name='dilititle'][value_id='" + value_id + "']").show();
                   $("span[name='diliunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='shengwucheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='shengwuselect'][value_id='" + value_id + "']").show();
                   $("span[name='shengwutitle'][value_id='" + value_id + "']").show();
                   $("span[name='shengwuunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='wulicheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='wuliselect'][value_id='" + value_id + "']").show();
                   $("span[name='wulititle'][value_id='" + value_id + "']").show();
                   $("span[name='wuliunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='huaxuecheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='huaxueselect'][value_id='" + value_id + "']").hide();
                   $("span[name='huaxuetitle'][value_id='" + value_id + "']").hide();
                   $("span[name='huaxueunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='zhengzhicheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='zhengzhiselect'][value_id='" + value_id + "']").hide();
                   $("span[name='zhengzhititle'][value_id='" + value_id + "']").hide();
                   $("span[name='zhengzhiunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='sixiangpingdecheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='sixiangpingdeselect'][value_id='" + value_id + "']").show();
                   $("span[name='sixiangpingdetitle'][value_id='" + value_id + "']").show();
                   $("span[name='sixiangpingdeunit'][value_id='" + value_id + "']").show();
+
+
+
+                   $("input[name='yingyudatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='yingyudatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='yingyudatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='yingyudatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='kexuedatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='kexuedatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='kexuedatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='kexuedatikaunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='pingdedatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='pingdedatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='pingdedatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='pingdedatikaunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='lishidatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='lishidatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='lishidatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='lishidatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='dilidatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='dilidatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='dilidatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='dilidatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='shengwudatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='shengwudatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='shengwudatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='shengwudatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='wulidatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='wulidatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='wulidatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='wulidatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='huaxuedatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='huaxuedatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='huaxuedatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='huaxuedatikaunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='zhengzhidatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='zhengzhidatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='zhengzhidatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='zhengzhidatikaunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='sixiangpingdedatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='sixiangpingdedatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='sixiangpingdedatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='sixiangpingdedatikaunit'][value_id='" + value_id + "']").show();
+               } else if ($(obj).val() == "涔濆勾绾�") {
+                   $("tr[name='datika'][value_id='" + value_id + "']").show();
+                   $("tr[name='shijuan'][value_id='" + value_id + "']").show();
+
+                   $("input[name='yingyucheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='yingyuselect'][value_id='" + value_id + "']").show();
                   $("span[name='yingyutitle'][value_id='" + value_id + "']").show();
                   $("span[name='yingyuunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='kexuecheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='kexueselect'][value_id='" + value_id + "']").hide();
                   $("span[name='kexuetitle'][value_id='" + value_id + "']").hide();
                   $("span[name='kexueunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='pingdecheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='pingdeselect'][value_id='" + value_id + "']").hide();
                   $("span[name='pingdetitle'][value_id='" + value_id + "']").hide();
                   $("span[name='pingdeunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='lishicheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='lishiselect'][value_id='" + value_id + "']").show();
                   $("span[name='lishititle'][value_id='" + value_id + "']").show();
                   $("span[name='lishiunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='dilicheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='diliselect'][value_id='" + value_id + "']").hide();
                   $("span[name='dilititle'][value_id='" + value_id + "']").hide();
                   $("span[name='diliunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='shengwucheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='shengwuselect'][value_id='" + value_id + "']").hide();
                   $("span[name='shengwutitle'][value_id='" + value_id + "']").hide();
                   $("span[name='shengwuunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='wulicheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='wuliselect'][value_id='" + value_id + "']").show();
                   $("span[name='wulititle'][value_id='" + value_id + "']").show();
                   $("span[name='wuliunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='huaxuecheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='huaxueselect'][value_id='" + value_id + "']").show();
                   $("span[name='huaxuetitle'][value_id='" + value_id + "']").show();
                   $("span[name='huaxueunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='zhengzhicheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='zhengzhiselect'][value_id='" + value_id + "']").hide();
                   $("span[name='zhengzhititle'][value_id='" + value_id + "']").hide();
                   $("span[name='zhengzhiunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='sixiangpingdecheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='sixiangpingdeselect'][value_id='" + value_id + "']").show();
                   $("span[name='sixiangpingdetitle'][value_id='" + value_id + "']").show();
                   $("span[name='sixiangpingdeunit'][value_id='" + value_id + "']").show();
+
+
+
+                   $("input[name='yingyudatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='yingyudatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='yingyudatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='yingyudatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='kexuedatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='kexuedatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='kexuedatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='kexuedatikaunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='pingdedatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='pingdedatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='pingdedatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='pingdedatikaunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='lishidatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='lishidatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='lishidatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='lishidatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='dilidatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='dilidatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='dilidatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='dilidatikaunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='shengwudatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='shengwudatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='shengwudatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='shengwudatikaunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='wulidatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='wulidatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='wulidatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='wulidatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='huaxuedatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='huaxuedatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='huaxuedatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='huaxuedatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='zhengzhidatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='zhengzhidatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='zhengzhidatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='zhengzhidatikaunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='sixiangpingdedatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='sixiangpingdedatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='sixiangpingdedatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='sixiangpingdedatikaunit'][value_id='" + value_id + "']").show();
+               } else if ($(obj).val() == "楂樹竴") {
+                   $("tr[name='datika'][value_id='" + value_id + "']").show();
+                   $("tr[name='shijuan'][value_id='" + value_id + "']").show();
+
+                   $("input[name='yingyucheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='yingyuselect'][value_id='" + value_id + "']").show();
                   $("span[name='yingyutitle'][value_id='" + value_id + "']").show();
                   $("span[name='yingyuunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='kexuecheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='kexueselect'][value_id='" + value_id + "']").hide();
                   $("span[name='kexuetitle'][value_id='" + value_id + "']").hide();
                   $("span[name='kexueunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='pingdecheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='pingdeselect'][value_id='" + value_id + "']").hide();
                   $("span[name='pingdetitle'][value_id='" + value_id + "']").hide();
                   $("span[name='pingdeunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='lishicheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='lishiselect'][value_id='" + value_id + "']").show();
                   $("span[name='lishititle'][value_id='" + value_id + "']").show();
                   $("span[name='lishiunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='dilicheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='diliselect'][value_id='" + value_id + "']").show();
                   $("span[name='dilititle'][value_id='" + value_id + "']").show();
                   $("span[name='diliunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='shengwucheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='shengwuselect'][value_id='" + value_id + "']").hide();
                   $("span[name='shengwutitle'][value_id='" + value_id + "']").hide();
                   $("span[name='shengwuunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='wulicheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='wuliselect'][value_id='" + value_id + "']").show();
                   $("span[name='wulititle'][value_id='" + value_id + "']").show();
                   $("span[name='wuliunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='huaxuecheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='huaxueselect'][value_id='" + value_id + "']").show();
                   $("span[name='huaxuetitle'][value_id='" + value_id + "']").show();
                   $("span[name='huaxueunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='zhengzhicheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='zhengzhiselect'][value_id='" + value_id + "']").show();
                   $("span[name='zhengzhititle'][value_id='" + value_id + "']").show();
                   $("span[name='zhengzhiunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='sixiangpingdecheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='sixiangpingdeselect'][value_id='" + value_id + "']").hide();
                   $("span[name='sixiangpingdetitle'][value_id='" + value_id + "']").hide();
                   $("span[name='sixiangpingdeunit'][value_id='" + value_id + "']").hide();
+
+
+
+                   $("input[name='yingyudatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='yingyudatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='yingyudatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='yingyudatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='kexuedatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='kexuedatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='kexuedatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='kexuedatikaunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='pingdedatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='pingdedatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='pingdedatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='pingdedatikaunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='lishidatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='lishidatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='lishidatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='lishidatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='dilidatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='dilidatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='dilidatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='dilidatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='shengwudatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='shengwudatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='shengwudatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='shengwudatikaunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='wulidatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='wulidatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='wulidatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='wulidatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='huaxuedatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='huaxuedatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='huaxuedatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='huaxuedatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='zhengzhidatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='zhengzhidatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='zhengzhidatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='zhengzhidatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='sixiangpingdedatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='sixiangpingdedatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='sixiangpingdedatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='sixiangpingdedatikaunit'][value_id='" + value_id + "']").hide();
+               } else if ($(obj).val() == "楂樹簩" || $(obj).val() == "楂樹笁") {
+                   $("tr[name='datika'][value_id='" + value_id + "']").show();
+                   $("tr[name='shijuan'][value_id='" + value_id + "']").show();
+
+                   $("input[name='yingyucheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='yingyuselect'][value_id='" + value_id + "']").show();
                   $("span[name='yingyutitle'][value_id='" + value_id + "']").show();
                   $("span[name='yingyuunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='kexuecheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='kexueselect'][value_id='" + value_id + "']").hide();
                   $("span[name='kexuetitle'][value_id='" + value_id + "']").hide();
                   $("span[name='kexueunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='pingdecheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='pingdeselect'][value_id='" + value_id + "']").hide();
                   $("span[name='pingdetitle'][value_id='" + value_id + "']").hide();
                   $("span[name='pingdeunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='lishicheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='lishiselect'][value_id='" + value_id + "']").show();
                   $("span[name='lishititle'][value_id='" + value_id + "']").show();
                   $("span[name='lishiunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='dilicheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='diliselect'][value_id='" + value_id + "']").show();
                   $("span[name='dilititle'][value_id='" + value_id + "']").show();
                   $("span[name='diliunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='shengwucheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='shengwuselect'][value_id='" + value_id + "']").show();
                   $("span[name='shengwutitle'][value_id='" + value_id + "']").show();
                   $("span[name='shengwuunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='wulicheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='wuliselect'][value_id='" + value_id + "']").show();
                   $("span[name='wulititle'][value_id='" + value_id + "']").show();
                   $("span[name='wuliunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='huaxuecheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='huaxueselect'][value_id='" + value_id + "']").show();
                   $("span[name='huaxuetitle'][value_id='" + value_id + "']").show();
                   $("span[name='huaxueunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='zhengzhicheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='zhengzhiselect'][value_id='" + value_id + "']").show();
                   $("span[name='zhengzhititle'][value_id='" + value_id + "']").show();
                   $("span[name='zhengzhiunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='sixiangpingdecheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='sixiangpingdeselect'][value_id='" + value_id + "']").hide();
                   $("span[name='sixiangpingdetitle'][value_id='" + value_id + "']").hide();
                   $("span[name='sixiangpingdeunit'][value_id='" + value_id + "']").hide();
+
+
+
+                   $("input[name='yingyudatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='yingyudatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='yingyudatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='yingyudatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='kexuedatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='kexuedatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='kexuedatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='kexuedatikaunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='pingdedatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='pingdedatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='pingdedatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='pingdedatikaunit'][value_id='" + value_id + "']").hide();
+
+                   $("input[name='lishidatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='lishidatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='lishidatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='lishidatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='dilidatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='dilidatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='dilidatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='dilidatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='shengwudatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='shengwudatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='shengwudatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='shengwudatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='wulidatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='wulidatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='wulidatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='wulidatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='huaxuedatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='huaxuedatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='huaxuedatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='huaxuedatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='zhengzhidatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='zhengzhidatikaselect'][value_id='" + value_id + "']").show();
                   $("span[name='zhengzhidatikatitle'][value_id='" + value_id + "']").show();
                   $("span[name='zhengzhidatikaunit'][value_id='" + value_id + "']").show();
+
+                   $("input[name='sixiangpingdedatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='sixiangpingdedatikaselect'][value_id='" + value_id + "']").hide();
                   $("span[name='sixiangpingdedatikatitle'][value_id='" + value_id + "']").hide();
                   $("span[name='sixiangpingdedatikaunit'][value_id='" + value_id + "']").hide();
+               }
+               else if ($(obj).val() == "楂樻牎璇曞嵎") {
+                   $("tr[name='datika'][value_id='" + value_id + "']").hide();
+                   $("tr[name='shijuan'][value_id='" + value_id + "']").hide();
+
+                   
+               }
+           }
+       </script>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/BrandList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/BrandList.aspx
index 4ef99b9..3d24321 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/BrandList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/BrandList.aspx
@@ -34,7 +34,9 @@
                         璐у搧绫诲埆锛�
                     </td>
                     <td>
-                        <input id="txtCommodity" type="text" runat="server" />
+                      <%--  <input id="txtCommodity" type="text" runat="server" />--%>
+                         <asp:DropDownList runat="server" ID="dwCommity" AutoPostBack="true" keepDefaultStyle="true" class="w100px">
+                </asp:DropDownList>
                     </td>
                     <td>
                         璐у搧鍚嶇О锛�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/BrandList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/BrandList.aspx.cs
index dd6fb09..46c0fd5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/BrandList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/BrandList.aspx.cs
@@ -8,6 +8,8 @@
 using CY.BLL.OA;
 using CY.Infrastructure.Query;
 using CY.Infrastructure.Common;
+using System.Data;
+
 namespace CY.WebForm.Pages.procurement
 {
     public partial class BrandList : BasePage
@@ -15,11 +17,13 @@
 
         OA_Brand brand = null;
         OA_BrandBLL _OA_BrandBLL = null;
+        OA_CommodityBLL _OA_CommodityBLL = null;
 
         public BrandList()
         {
             brand = new OA_Brand();
             _OA_BrandBLL = new OA_BrandBLL();
+            _OA_CommodityBLL = new OA_CommodityBLL();
         }
 
         protected void Page_Load(object sender, EventArgs e)
@@ -28,6 +32,9 @@
             UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
             if (!IsPostBack)
             {
+                DataTable ds = _OA_CommodityBLL.SelectModelPage(CurrentUser.MemberId, "", "true");
+                GetDataByLevel(dwCommity, ds, 0, 0);
+                dwCommity.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
 
                 if (Request["Keyid"].ToInt32() > 0) //濡傛灉keyid>0 鍒欏垹闄ゅ搴斿璞�
                 {
@@ -72,7 +79,7 @@
             Pagination pa = new Pagination();
             pa.PageSize = this.UCPager1.AspNetPager.PageSize;
             pa.PageIndex = this.UCPager1.AspNetPager.CurrentPageIndex;
-            this.RepBrandList.DataSource = _OA_BrandBLL.getAllBrandNameByGoods(pa, CurrentUser.MemberId, txtBrandName.Value, this.txtGoodsName.Value, this.txtCommodity.Value);
+            this.RepBrandList.DataSource = _OA_BrandBLL.getAllBrandNameByGoods(pa, CurrentUser.MemberId, txtBrandName.Value, this.txtGoodsName.Value, this.dwCommity.SelectedValue);
             this.RepBrandList.DataBind();
             UCPager1.AspNetPager.RecordCount = pa.RecordCount;
         }
@@ -86,6 +93,29 @@
         {
             BindList();
         }
+        #region 涓婄骇鐖剁被鏁版嵁鍒濆鍖�
+        public static void GetDataByLevel(System.Web.UI.WebControls.DropDownList dwCommity, DataTable data, int parentId, int level)
+        {
+            DataRow[] result = data.Select(string.Format("ParentId={0}", parentId));
+            int i = -1;
+            while (++i < result.Length)
+            {
+                dwCommity.Items.Add(new ListItem(GetSplitChar(level) + result[i]["CommodityName"].ToString2(), result[i]["Keyid"].ToString2()));
+                GetDataByLevel(dwCommity, data, result[i]["Keyid"].ToInt32().Value, level + 1);
 
+            }
+        }
+        public static string GetSplitChar(int level)
+        {
+            string splitchar = "";
+            int i = -1;
+            while (++i < level)
+            {
+                splitchar += ".";
+            }
+            return splitchar;
+        }
+
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/BrandList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/BrandList.aspx.designer.cs
index 25b8f6d..1d6a152 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/BrandList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/BrandList.aspx.designer.cs
@@ -2,16 +2,18 @@
 // <鑷姩鐢熸垚>
 //     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
 //
-//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�� 
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace CY.WebForm.Pages.procurement {
-    
-    
-    public partial class BrandList {
-        
+namespace CY.WebForm.Pages.procurement
+{
+
+
+    public partial class BrandList
+    {
+
         /// <summary>
         /// CMSHead1 鎺т欢銆�
         /// </summary>
@@ -20,7 +22,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-        
+
         /// <summary>
         /// form1 鎺т欢銆�
         /// </summary>
@@ -29,16 +31,16 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
-        /// txtCommodity 鎺т欢銆�
+        /// dwCommity 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlInputText txtCommodity;
-        
+        protected global::System.Web.UI.WebControls.DropDownList dwCommity;
+
         /// <summary>
         /// txtGoodsName 鎺т欢銆�
         /// </summary>
@@ -47,7 +49,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtGoodsName;
-        
+
         /// <summary>
         /// txtBrandName 鎺т欢銆�
         /// </summary>
@@ -56,7 +58,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtBrandName;
-        
+
         /// <summary>
         /// btn_Register 鎺т欢銆�
         /// </summary>
@@ -65,7 +67,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button btn_Register;
-        
+
         /// <summary>
         /// RepBrandList 鎺т欢銆�
         /// </summary>
@@ -74,7 +76,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Repeater RepBrandList;
-        
+
         /// <summary>
         /// UCPager1 鎺т欢銆�
         /// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/GoodsInfoList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/GoodsInfoList.aspx
index d5232ac..06d985c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/GoodsInfoList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/GoodsInfoList.aspx
@@ -39,7 +39,9 @@
                         璐у搧绫诲埆锛�
                     </td>
                     <td>
-                        <input id="CommodityName" type="text" runat="server" />
+                       <%-- <input id="CommodityName" type="text" runat="server" />--%>
+                        <asp:DropDownList runat="server" ID="dwCommity" AutoPostBack="true" keepDefaultStyle="true" class="w100px">
+                </asp:DropDownList>
                     </td>
                     <td>
                         璐у搧鍚嶇О锛�
@@ -48,6 +50,13 @@
                         <input id="txtGoodName" type="text" runat="server" />
                     </td>
                     <td>
+                        璐у搧鐘舵�侊細
+                    </td>
+                    <td>
+                         <select id="selGoodsStatus" runat="server" datatextfield="Name" keepdefaultstyle="true" datavaluefield="Keyid" class="w100px">
+                </select>
+                    </td>
+                    <td>
                         <asp:Button ID="btn_Register" Text="鏌ヨ" runat="server" padding="0px" OnClick="btn_Register_Click1" />
                     </td>
                 </tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/GoodsInfoList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/GoodsInfoList.aspx.cs
index 1bca920..5cbd9fc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/GoodsInfoList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/GoodsInfoList.aspx.cs
@@ -10,6 +10,7 @@
 using CY.Infrastructure.Common;
 using CY.BLL.Sys;
 using CY.BLL.OA;
+using System.Data;
 
 namespace CY.WebForm.Pages.procurement
 {
@@ -17,11 +18,15 @@
     {
         OA_GoodsInfoBLL _OA_GoodsInfoBLL = null;
         OA_GoodsInfo goodsInfo = null;
+        OA_CommodityBLL _OA_CommodityBLL = null;
+        Sys_DictionaryBLL _Sys_DictionaryBLL = null;
 
         public GoodsInfoList()
         {
             goodsInfo = new OA_GoodsInfo();
             _OA_GoodsInfoBLL = new OA_GoodsInfoBLL();
+            _OA_CommodityBLL = new OA_CommodityBLL();
+            _Sys_DictionaryBLL = new Sys_DictionaryBLL();
         }
 
         protected void Page_Load(object sender, EventArgs e)
@@ -29,6 +34,13 @@
             UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
             if (!IsPostBack)
             {
+                DataTable ds = _OA_CommodityBLL.SelectModelPage(CurrentUser.MemberId, "", "true");
+                GetDataByLevel(dwCommity, ds, 0, 0);
+                dwCommity.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+                this.selGoodsStatus.DataSource = _Sys_DictionaryBLL.GetDataByType("璐у搧鐘舵��");
+                this.selGoodsStatus.DataBind();
+                selGoodsStatus.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
                 if (Request["Keyid"].ToInt32() > 0) //濡傛灉keyid>0 鍒欏垹闄ゅ搴斿璞�
                 {
                     goodsInfo = _OA_GoodsInfoBLL.SelectSingleModel(Request["Keyid"].ToString2());
@@ -55,7 +67,7 @@
             Pagination pa = new Pagination();
             pa.PageSize = this.UCPager1.AspNetPager.PageSize;
             pa.PageIndex = this.UCPager1.AspNetPager.CurrentPageIndex;
-            this.ReGoodList.DataSource = _OA_GoodsInfoBLL.SelectModelPage(pa, CurrentUser.MemberId, this.txtGoodName.Value, this.CommodityName.Value);
+            this.ReGoodList.DataSource = _OA_GoodsInfoBLL.SelectModelPage(pa, CurrentUser.MemberId, this.txtGoodName.Value, this.dwCommity.SelectedValue, this.selGoodsStatus.Value);
             this.ReGoodList.DataBind();
             UCPager1.AspNetPager.RecordCount = pa.RecordCount;
         }
@@ -69,5 +81,30 @@
         {
             BindList();
         }
+
+        #region 涓婄骇鐖剁被鏁版嵁鍒濆鍖�
+        public static void GetDataByLevel(System.Web.UI.WebControls.DropDownList dwCommity, DataTable data, int parentId, int level)
+        {
+            DataRow[] result = data.Select(string.Format("ParentId={0}", parentId));
+            int i = -1;
+            while (++i < result.Length)
+            {
+                dwCommity.Items.Add(new ListItem(GetSplitChar(level) + result[i]["CommodityName"].ToString2(), result[i]["Keyid"].ToString2()));
+                GetDataByLevel(dwCommity, data, result[i]["Keyid"].ToInt32().Value, level + 1);
+
+            }
+        }
+        public static string GetSplitChar(int level)
+        {
+            string splitchar = "";
+            int i = -1;
+            while (++i < level)
+            {
+                splitchar += ".";
+            }
+            return splitchar;
+        }
+
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/GoodsInfoList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/GoodsInfoList.aspx.designer.cs
index 872d879..3981f8f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/GoodsInfoList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/GoodsInfoList.aspx.designer.cs
@@ -2,16 +2,18 @@
 // <鑷姩鐢熸垚>
 //     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
 //
-//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�� 
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace CY.WebForm.Pages.procurement {
-    
-    
-    public partial class GoodsInfoList {
-        
+namespace CY.WebForm.Pages.procurement
+{
+
+
+    public partial class GoodsInfoList
+    {
+
         /// <summary>
         /// CMSHead1 鎺т欢銆�
         /// </summary>
@@ -20,7 +22,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-        
+
         /// <summary>
         /// form1 鎺т欢銆�
         /// </summary>
@@ -29,16 +31,16 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
-        /// CommodityName 鎺т欢銆�
+        /// dwCommity 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlInputText CommodityName;
-        
+        protected global::System.Web.UI.WebControls.DropDownList dwCommity;
+
         /// <summary>
         /// txtGoodName 鎺т欢銆�
         /// </summary>
@@ -47,7 +49,16 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtGoodName;
-        
+
+        /// <summary>
+        /// selGoodsStatus 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlSelect selGoodsStatus;
+
         /// <summary>
         /// btn_Register 鎺т欢銆�
         /// </summary>
@@ -56,7 +67,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button btn_Register;
-        
+
         /// <summary>
         /// ReGoodList 鎺т欢銆�
         /// </summary>
@@ -65,7 +76,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Repeater ReGoodList;
-        
+
         /// <summary>
         /// UCPager1 鎺т欢銆�
         /// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx
index 11eb01e..fc5a731 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx
@@ -72,7 +72,7 @@
                 鍗曚环(鍏�)锛�
             </td>
             <td>
-                <input type="text" runat="server" class="req float w120px" id="txtPrice"  msg="璇峰~鍐欏崟浠�"/>
+                <input type="text" runat="server" class=" float w120px" id="txtPrice"  msg="璇峰~鍐欏崟浠�"/>
             </td>
             
         </tr>
@@ -89,11 +89,19 @@
                 閲戦(鍏�)锛�
             </td>
             <td>
-                <input type="text" runat="server" class="req float w120px" id="txtAllMoney"  msg="璇峰~鍐欓噾棰�"/>
+                <input type="text" runat="server" class=" float w120px" id="txtAllMoney"  msg="璇峰~鍐欓噾棰�"/>
             </td>
             <asp:Panel ID="tanDiv1" runat="server">
             </asp:Panel>
         </tr>
+         <tr>
+                    <td class="ali03">
+                        澶囨敞锛�
+                    </td>
+                    <td colspan="5">
+                        <textarea id="txtRemark" runat="server" style="width: 460px; height: 40px;"></textarea>
+                    </td>
+                </tr>
         <tr>
             <td colspan="6" align="center">
                 <asp:Button runat="server" Text="鎻愪氦" ID="btn_config" OnClick="btn_config_Click" />
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs
index a4e73d2..ffc989d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs
@@ -380,7 +380,7 @@
            
             procurement.FirmId = CurrentUser.MemberId;
             procurement.GoodsId = this.dwGoodsList.SelectedValue.ToInt32();
-            procurement.Remark = "";
+            procurement.Remark = this.txtRemark.Value;
             procurement.BrandId = this.dwBrand.SelectedValue.ToInt32();
             procurement.SpecificationId = this.dwSpecification.SelectedValue.ToInt32();
             procurement.PaperWeightId = this.dwPaperWeight.SelectedValue.ToInt32() ?? 0;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.designer.cs
index e5b2799..c58621d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.designer.cs
@@ -168,6 +168,15 @@
         protected global::System.Web.UI.WebControls.Panel tanDiv1;
 
         /// <summary>
+        /// txtRemark 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtRemark;
+
+        /// <summary>
         /// btn_config 鎺т欢銆�
         /// </summary>
         /// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx
index 3b84990..61cd5c1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx
@@ -26,6 +26,7 @@
   <tr>  <td class="ali03 w100px">缁撶畻鐘舵�� 锛�</td><td><span  id="spanClearingStatus" runat="server" ></span></td></tr>
   <tr>  <td class="ali03 w100px">閲囪喘鏃堕棿 锛�</td><td><span  id="spanPurchaseTime" runat="server" ></span></td></tr>
   <tr>   <td class="ali03 ">鎿嶄綔浜猴細</td><td colspan="5" runat="server" id="spanOperator"></td></tr>
+  <tr>   <td class="ali03 ">澶囨敞锛�</td><td colspan="5" runat="server" id="spanRemark"></td></tr>
             
                
 	        </table>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.cs
index 3d78ead..305dcd8 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.cs
@@ -42,7 +42,7 @@
             spanGoodsType.InnerText = goodsInfo.CommodityName;
             spanOperator.InnerText = procurenment.Operator;
             spanPrice.InnerText = string.Format("{0:F}", procurenment.Price);
-
+            spanRemark.InnerText = procurenment.Remark;
 
             spanPurchaseStatus.InnerText = procurenment.PurchaseStatus;
             spanPurchaseTime.InnerText = procurenment.PurchaseTime.ToString();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.designer.cs
index 6c50efd..6d33021 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.designer.cs
@@ -2,16 +2,18 @@
 // <鑷姩鐢熸垚>
 //     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
 //
-//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�� 
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace CY.WebForm.Pages.procurement {
-    
-    
-    public partial class ProcurementDetail {
-        
+namespace CY.WebForm.Pages.procurement
+{
+
+
+    public partial class ProcurementDetail
+    {
+
         /// <summary>
         /// CMSHead1 鎺т欢銆�
         /// </summary>
@@ -20,7 +22,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-        
+
         /// <summary>
         /// form1 鎺т欢銆�
         /// </summary>
@@ -29,7 +31,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// spanSuppliers 鎺т欢銆�
         /// </summary>
@@ -38,7 +40,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSuppliers;
-        
+
         /// <summary>
         /// spanGoodsName 鎺т欢銆�
         /// </summary>
@@ -47,7 +49,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanGoodsName;
-        
+
         /// <summary>
         /// spanGoodsType 鎺т欢銆�
         /// </summary>
@@ -56,7 +58,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanGoodsType;
-        
+
         /// <summary>
         /// spanBrandName 鎺т欢銆�
         /// </summary>
@@ -65,7 +67,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanBrandName;
-        
+
         /// <summary>
         /// spanSpecificationName 鎺т欢銆�
         /// </summary>
@@ -74,7 +76,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSpecificationName;
-        
+
         /// <summary>
         /// TrPaperWeight 鎺т欢銆�
         /// </summary>
@@ -83,7 +85,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTableRow TrPaperWeight;
-        
+
         /// <summary>
         /// spanPaperWeight 鎺т欢銆�
         /// </summary>
@@ -92,7 +94,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPaperWeight;
-        
+
         /// <summary>
         /// spanPrice 鎺т欢銆�
         /// </summary>
@@ -101,7 +103,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPrice;
-        
+
         /// <summary>
         /// spanQuantity 鎺т欢銆�
         /// </summary>
@@ -110,7 +112,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanQuantity;
-        
+
         /// <summary>
         /// spanAllMoney 鎺т欢銆�
         /// </summary>
@@ -119,7 +121,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanAllMoney;
-        
+
         /// <summary>
         /// spanPurchaseStatus 鎺т欢銆�
         /// </summary>
@@ -128,7 +130,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPurchaseStatus;
-        
+
         /// <summary>
         /// spanClearingStatus 鎺т欢銆�
         /// </summary>
@@ -137,7 +139,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanClearingStatus;
-        
+
         /// <summary>
         /// spanPurchaseTime 鎺т欢銆�
         /// </summary>
@@ -146,7 +148,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPurchaseTime;
-        
+
         /// <summary>
         /// spanOperator 鎺т欢銆�
         /// </summary>
@@ -155,5 +157,14 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTableCell spanOperator;
+
+        /// <summary>
+        /// spanRemark 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTableCell spanRemark;
     }
 }
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx
index b6e342a..ed8fca1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx
@@ -94,6 +94,14 @@
             <asp:Panel ID="tanDiv1" runat="server">
             </asp:Panel>
         </tr>
+         <tr>
+                    <td class="ali03">
+                        澶囨敞锛�
+                    </td>
+                    <td colspan="5">
+                        <textarea id="txtRemark" runat="server" style="width: 460px; height: 40px;"></textarea>
+                    </td>
+                </tr>
         <tr>
             <td colspan="6" align="center">
                 <asp:Button runat="server" Text="鎻愪氦" ID="btn_config" OnClick="btn_config_Click" />
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx.cs
index f130858..1244d8d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx.cs
@@ -71,6 +71,7 @@
             ///渚涘簲鍟�
             selSuppliers.DataSource = _OA_SuppliersBLL.getSupplierTable(CurrentUser.MemberId);
             selSuppliers.DataBind();
+            selSuppliers.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
             ///浜у搧绫诲埆
             ///
             dwCommity.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
@@ -116,8 +117,7 @@
             this.txtPrice.Value = procurementModel.Price.ToString();
             this.txtTenPrice.Value = procurementModel.TanPrice.ToString();
             this.txtAllMoney.Value = procurementModel.AllMoney.ToString();
-
-
+            this.txtRemark.Value = procurementModel.Remark;
 
         }
 
@@ -302,7 +302,7 @@
             procurement.SuppliersId = this.selSuppliers.Value.ToInt32();
             procurement.FirmId = CurrentUser.MemberId;
             procurement.GoodsId = this.dwGoodsList.SelectedValue.ToInt32();
-            procurement.Remark = "";
+            procurement.Remark = this.txtRemark.Value;
             procurement.BrandId = this.dwBrand.SelectedValue.ToInt32();
             procurement.SpecificationId = this.dwSpecification.SelectedValue.ToInt32();
             procurement.PaperWeightId = this.dwPaperWeight.SelectedValue.ToInt32() ?? 0;
@@ -328,6 +328,7 @@
                 procurementModel.PaperWeightId = this.dwPaperWeight.SelectedValue.ToInt32() ?? 0;
                 procurementModel.LastUpdateTime = DateTime.Now;
                 procurementModel.Operator = CurrentUser.ShortName;
+                procurementModel.Remark = this.txtRemark.Value;
                 if (_OA_ProcurementBLL.UpdateModel(procurementModel))
                 {
                     JavaScript.RefreshDIVOpener(this);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx.designer.cs
index 2850a8b..8e0b148 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx.designer.cs
@@ -2,16 +2,18 @@
 // <鑷姩鐢熸垚>
 //     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
 //
-//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�� 
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace CY.WebForm.Pages.procurement {
-    
-    
-    public partial class ProcurementEdit {
-        
+namespace CY.WebForm.Pages.procurement
+{
+
+
+    public partial class ProcurementEdit
+    {
+
         /// <summary>
         /// CMSHead1 鎺т欢銆�
         /// </summary>
@@ -20,7 +22,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-        
+
         /// <summary>
         /// form1 鎺т欢銆�
         /// </summary>
@@ -29,7 +31,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// selSuppliers 鎺т欢銆�
         /// </summary>
@@ -38,7 +40,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlSelect selSuppliers;
-        
+
         /// <summary>
         /// dwCommity 鎺т欢銆�
         /// </summary>
@@ -47,7 +49,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList dwCommity;
-        
+
         /// <summary>
         /// dwGoodsList 鎺т欢銆�
         /// </summary>
@@ -56,7 +58,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList dwGoodsList;
-        
+
         /// <summary>
         /// dwBrand 鎺т欢銆�
         /// </summary>
@@ -65,7 +67,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList dwBrand;
-        
+
         /// <summary>
         /// dwSpecification 鎺т欢銆�
         /// </summary>
@@ -74,7 +76,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList dwSpecification;
-        
+
         /// <summary>
         /// div_td 鎺т欢銆�
         /// </summary>
@@ -83,7 +85,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Panel div_td;
-        
+
         /// <summary>
         /// trWeight 鎺т欢銆�
         /// </summary>
@@ -92,7 +94,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTableCell trWeight;
-        
+
         /// <summary>
         /// dwPaperWeight 鎺т欢銆�
         /// </summary>
@@ -101,7 +103,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList dwPaperWeight;
-        
+
         /// <summary>
         /// div_td1 鎺т欢銆�
         /// </summary>
@@ -110,7 +112,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Panel div_td1;
-        
+
         /// <summary>
         /// txtQuantity 鎺т欢銆�
         /// </summary>
@@ -119,7 +121,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtQuantity;
-        
+
         /// <summary>
         /// txtPrice 鎺т欢銆�
         /// </summary>
@@ -128,7 +130,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtPrice;
-        
+
         /// <summary>
         /// tanDiv 鎺т欢銆�
         /// </summary>
@@ -137,7 +139,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Panel tanDiv;
-        
+
         /// <summary>
         /// txtTenPrice 鎺т欢銆�
         /// </summary>
@@ -146,7 +148,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtTenPrice;
-        
+
         /// <summary>
         /// txtAllMoney 鎺т欢銆�
         /// </summary>
@@ -155,7 +157,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtAllMoney;
-        
+
         /// <summary>
         /// tanDiv1 鎺т欢銆�
         /// </summary>
@@ -164,7 +166,16 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Panel tanDiv1;
-        
+
+        /// <summary>
+        /// txtRemark 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtRemark;
+
         /// <summary>
         /// btn_config 鎺т欢銆�
         /// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SpecificationList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SpecificationList.aspx
index 02ff450..120b59c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SpecificationList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SpecificationList.aspx
@@ -34,7 +34,9 @@
                         璐у搧绫诲埆锛�
                     </td>
                     <td>
-                        <input id="txtCommodityName" type="text" runat="server" />
+                      <%--  <input id="txtCommodityName" type="text" runat="server" />--%>
+                         <asp:DropDownList runat="server" ID="dwCommity" AutoPostBack="true" keepDefaultStyle="true" class="w100px">
+                </asp:DropDownList>
                     </td>
                     <td>
                         璐у搧鍚嶇О锛�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SpecificationList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SpecificationList.aspx.cs
index e522eca..8a875ca 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SpecificationList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SpecificationList.aspx.cs
@@ -8,6 +8,7 @@
 using CY.BLL.OA;
 using CY.Infrastructure.Query;
 using CY.Infrastructure.Common;
+using System.Data;
 
 namespace CY.WebForm.Pages.procurement
 {
@@ -17,16 +18,21 @@
 
         OA_Specification specification = null;
         OA_SpecificationBLL _OA_SpecificationBLL = null;
+        OA_CommodityBLL _OA_CommodityBLL = null;
         public SpecificationList()
         {
             specification = new OA_Specification();
             _OA_SpecificationBLL = new OA_SpecificationBLL();
+            _OA_CommodityBLL = new OA_CommodityBLL();
         }
         protected void Page_Load(object sender, EventArgs e)
         {
             UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
             if (!IsPostBack)
             {
+                DataTable ds = _OA_CommodityBLL.SelectModelPage(CurrentUser.MemberId, "", "true");
+                GetDataByLevel(dwCommity, ds, 0, 0);
+                dwCommity.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
 
                 if (Request["Keyid"].ToInt32() > 0) //濡傛灉keyid>0 鍒欏垹闄ゅ搴斿璞�
                 {
@@ -58,7 +64,7 @@
             pa.PageSize = this.UCPager1.AspNetPager.PageSize;
             pa.PageIndex = this.UCPager1.AspNetPager.CurrentPageIndex;
 
-            this.RepBrandList.DataSource = _OA_SpecificationBLL.getAllSpecification(pa, CurrentUser.MemberId, txtSpecificationName.Value, this.txtGoodsName.Value, this.txtCommodityName.Value);
+            this.RepBrandList.DataSource = _OA_SpecificationBLL.getAllSpecification(pa, CurrentUser.MemberId, txtSpecificationName.Value, this.txtGoodsName.Value, this.dwCommity.SelectedValue);
             this.RepBrandList.DataBind();
             UCPager1.AspNetPager.RecordCount = pa.RecordCount;
         }
@@ -72,6 +78,29 @@
         {
             BindList();
         }
+        #region 涓婄骇鐖剁被鏁版嵁鍒濆鍖�
+        public static void GetDataByLevel(System.Web.UI.WebControls.DropDownList dwCommity, DataTable data, int parentId, int level)
+        {
+            DataRow[] result = data.Select(string.Format("ParentId={0}", parentId));
+            int i = -1;
+            while (++i < result.Length)
+            {
+                dwCommity.Items.Add(new ListItem(GetSplitChar(level) + result[i]["CommodityName"].ToString2(), result[i]["Keyid"].ToString2()));
+                GetDataByLevel(dwCommity, data, result[i]["Keyid"].ToInt32().Value, level + 1);
 
+            }
+        }
+        public static string GetSplitChar(int level)
+        {
+            string splitchar = "";
+            int i = -1;
+            while (++i < level)
+            {
+                splitchar += ".";
+            }
+            return splitchar;
+        }
+
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SpecificationList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SpecificationList.aspx.designer.cs
index 95ff2f7..8a982ae 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SpecificationList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SpecificationList.aspx.designer.cs
@@ -2,16 +2,18 @@
 // <鑷姩鐢熸垚>
 //     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
 //
-//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-//     閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便�� 
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace CY.WebForm.Pages.procurement {
-    
-    
-    public partial class SpecificationList {
-        
+namespace CY.WebForm.Pages.procurement
+{
+
+
+    public partial class SpecificationList
+    {
+
         /// <summary>
         /// CMSHead1 鎺т欢銆�
         /// </summary>
@@ -20,7 +22,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-        
+
         /// <summary>
         /// form1 鎺т欢銆�
         /// </summary>
@@ -29,16 +31,16 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
-        /// txtCommodityName 鎺т欢銆�
+        /// dwCommity 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlInputText txtCommodityName;
-        
+        protected global::System.Web.UI.WebControls.DropDownList dwCommity;
+
         /// <summary>
         /// txtGoodsName 鎺т欢銆�
         /// </summary>
@@ -47,7 +49,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtGoodsName;
-        
+
         /// <summary>
         /// txtSpecificationName 鎺т欢銆�
         /// </summary>
@@ -56,7 +58,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputText txtSpecificationName;
-        
+
         /// <summary>
         /// btn_Register 鎺т欢銆�
         /// </summary>
@@ -65,7 +67,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button btn_Register;
-        
+
         /// <summary>
         /// RepBrandList 鎺т欢銆�
         /// </summary>
@@ -74,7 +76,7 @@
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Repeater RepBrandList;
-        
+
         /// <summary>
         /// UCPager1 鎺т欢銆�
         /// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
index 828999a..17fd469 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
@@ -1221,7 +1221,7 @@
                     $("[name='singleOrdouble" + index + "']").val("鍙岄潰");
                 }
             }
-            if (printTypeId != 37) {
+            if (printTypeId != 37 && printTypeId != 38) {
                 $.ajax({
                     url: '/Pages/front/InquiryOnLine.aspx?tmp' + (new Date()).valueOf(),
                     type: "POST",
@@ -1625,6 +1625,123 @@
             
         }
     }
+
+    //璇曞嵎绾�
+    if (printTypeId == 38) {
+
+
+        $("#papershijuan").val(dataJson.papershijuan);
+        $("#paperSize").val(dataJson.PrintSizeId);
+        $("#txtFirstSize").val(dataJson.firstSize);
+        $("#txtSecondSize").val(dataJson.secondSize);
+        $("#paperSize6P").val(dataJson.paperSize6P);
+        $("#txtFirstSize6P").val(dataJson.firstSize6P);
+        $("#txtSecondSize6P").val(dataJson.secondSize6P);
+        $("#paperSize8P").val(dataJson.paperSize8P);
+        $("#txtFirstSize8P").val(dataJson.firstSize8P);
+        $("#txtSecondSize8P").val(dataJson.secondSize8P);
+        
+        $("#printColorshijuan").val(dataJson.printColorshijuan);
+        $("#paper1").val(dataJson.paper1);
+        $("#paperSizeA4").val(dataJson.paperSizeA4);
+        $("#txtFirstSizeA4").val(dataJson.firstSizeA4);
+        $("#txtSecondSizeA4").val(dataJson.secondSizeA4);
+        $("#paperSizeA3").val(dataJson.paperSizeA3);
+        $("#txtFirstSizeA3").val(dataJson.firstSizeA3);
+        $("#txtSecondSizeA3").val(dataJson.secondSizeA3);
+        
+        $("#printColor2").val(dataJson.printColor2);
+        
+        $("#printColor1").val(dataJson.printColor1);
+
+       
+        var insideArry = dataJson.InquirySHiJuanList;
+        if (insideArry.length > 0) {
+            
+            for (var i = 0; i < insideArry.length; i++) {
+                if (i > 0) {
+                    $(".AddForums").click();
+                }
+
+                $("select[name='selNianji']").last().val(insideArry[i].Nianji);
+                $("input[name='txtRenshu']").last().val(insideArry[i].txtRenshu);
+
+                $("input[name='yuwencheckboxinput']").last().val(insideArry[i].yuwencheckboxinput);
+                $("select[name='yuwenselect']").last().val(insideArry[i].yuwenselect);
+                $("select[name='yuwendatikaselect']").last().val(insideArry[i].yuwendatikaselect);
+                $("input[name='yuwendatikacheckboxinput']").last().val(insideArry[i].yuwendatikacheckboxinput);
+
+                $("input[name='shuxuecheckboxinput']").last().val(insideArry[i].shuxuecheckboxinput);
+                $("select[name='shuxueselect']").last().val(insideArry[i].shuxueselect);
+                $("select[name='shuxuedatikaselect']").last().val(insideArry[i].shuxuedatikaselect);
+                $("input[name='shuxuedatikacheckboxinput']").last().val(insideArry[i].shuxuedatikacheckboxinput);
+
+                $("input[name='yingyucheckboxinput']").last().val(insideArry[i].yingyucheckboxinput);
+                $("select[name='yingyuselect']").last().val(insideArry[i].yingyuselect);
+                $("select[name='yingyudatikaselect']").last().val(insideArry[i].yingyudatikaselect);
+                $("input[name='yingyudatikacheckboxinput']").last().val(insideArry[i].yingyudatikacheckboxinput);
+
+                $("input[name='pingdecheckboxinput']").last().val(insideArry[i].pingdecheckboxinput);
+                $("select[name='pingdeselect']").last().val(insideArry[i].pingdeselect);
+                $("select[name='pingdedatikaselect']").last().val(insideArry[i].pingdedatikaselect);
+                $("input[name='pingdedatikacheckboxinput']").last().val(insideArry[i].pingdedatikacheckboxinput);
+
+                $("input[name='kexuecheckboxinput']").last().val(insideArry[i].kexuecheckboxinput);
+                $("select[name='kexueselect']").last().val(insideArry[i].kexueselect);
+                $("select[name='kexuedatikaselect']").last().val(insideArry[i].kexuedatikaselect);
+                $("input[name='kexuedatikacheckboxinput']").last().val(insideArry[i].kexuedatikacheckboxinput);
+
+                $("input[name='lishicheckboxinput']").last().val(insideArry[i].lishicheckboxinput);
+                $("select[name='lishiselect']").last().val(insideArry[i].lishiselect);
+                $("select[name='lishidatikaselect']").last().val(insideArry[i].lishidatikaselect);
+                $("input[name='lishidatikacheckboxinput']").last().val(insideArry[i].lishidatikacheckboxinput);
+
+                $("input[name='dilicheckboxinput']").last().val(insideArry[i].dilicheckboxinput);
+                $("select[name='diliselect']").last().val(insideArry[i].diliselect);
+                $("select[name='dilidatikaselect']").last().val(insideArry[i].dilidatikaselect);
+                $("input[name='dilidatikacheckboxinput']").last().val(insideArry[i].dilidatikacheckboxinput);
+
+                $("input[name='shengwucheckboxinput']").last().val(insideArry[i].shengwucheckboxinput);
+                $("select[name='shengwuselect']").last().val(insideArry[i].shengwuselect);
+                $("select[name='shengwudatikaselect']").last().val(insideArry[i].shengwudatikaselect);
+                $("input[name='shengwudatikacheckboxinput']").last().val(insideArry[i].shengwudatikacheckboxinput);
+
+                $("input[name='wulicheckboxinput']").last().val(insideArry[i].wulicheckboxinput);
+                $("select[name='wuliselect']").last().val(insideArry[i].wuliselect);
+                $("select[name='wulidatikaselect']").last().val(insideArry[i].wulidatikaselect);
+                $("input[name='wulidatikacheckboxinput']").last().val(insideArry[i].wulidatikacheckboxinput);
+
+                $("input[name='huaxuecheckboxinput']").last().val(insideArry[i].huaxuecheckboxinput);
+                $("select[name='huaxueselect']").last().val(insideArry[i].huaxueselect);
+                $("select[name='huaxuedatikaselect']").last().val(insideArry[i].huaxuedatikaselect);
+                $("input[name='huaxuedatikacheckboxinput']").last().val(insideArry[i].huaxuedatikacheckboxinput);
+
+                $("input[name='sixiangpingdecheckboxinput']").last().val(insideArry[i].sixiangpingdecheckboxinput);
+                $("select[name='sixiangpingdeselect']").last().val(insideArry[i].sixiangpingdeselect);
+                $("select[name='sixiangpingdedatikaselect']").last().val(insideArry[i].sixiangpingdedatikaselect);
+                $("input[name='sixiangpingdedatikacheckboxinput']").last().val(insideArry[i].sixiangpingdedatikacheckboxinput);
+
+                $("input[name='zhengzhicheckboxinput']").last().val(insideArry[i].zhengzhicheckboxinput);
+                $("select[name='zhengzhiselect']").last().val(insideArry[i].zhengzhiselect);
+                $("select[name='zhengzhidatikaselect']").last().val(insideArry[i].zhengzhidatikaselect);
+                $("input[name='zhengzhidatikacheckboxinput']").last().val(insideArry[i].zhengzhidatikacheckboxinput);
+
+
+                    
+               
+                changgeNianji($("select[name='selNianji']").last());
+            }
+
+
+        }
+
+
+        $("#paperSize").change();
+        $("#paperSize6P").change();
+        $("#paperSize8P").change();
+        $("#paperSizeA4").change();
+        $("#paperSizeA3").change();
+    }
 }
 
 function Init() {

--
Gitblit v1.9.1