From ffaad850fd7ecd29ec004bcf4a90e1b0f5be8605 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 25 七月 2025 09:20:13 +0800
Subject: [PATCH] 试卷下单修改

---
 CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js              |   10 ++
 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx      |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx           |   56 +++++++-------
 CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs  |  102 ++++++++++++++-----------
 CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/common/CMSHead.ascx          |   11 ++
 6 files changed, 109 insertions(+), 74 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index 66d8211..91c6fdd 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=185" type="text/javascript"></script>
+    <script src="../../js/Inquiry/Inquiry.js?v=186" type="text/javascript"></script>
     <script src="../../js/business/Order.js?v=47" type="text/javascript"></script>
     <!--鍓嶅彴椤甸潰end-->
     <script type="text/javascript" language="javascript">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx
index 3a526fc..3b4ed22 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.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=180" type="text/javascript"></script>
+    <script src="../../js/Inquiry/Inquiry.js?v=181" type="text/javascript"></script>
     <script src="../../js/business/Order.js?v=47" type="text/javascript"></script>
     <!--鍓嶅彴椤甸潰end-->
     <script type="text/javascript" language="javascript">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/common/CMSHead.ascx b/CY_ECommercePlatform/CY.WebForm/Pages/common/CMSHead.ascx
index 90f7940..ea1880e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/common/CMSHead.ascx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/common/CMSHead.ascx
@@ -76,6 +76,17 @@
                 $(this).val("0");
             }
         });
+
+        $(".validateIntshijuan").live("blur", function () {
+            var price = $(this).val();
+            if (price != "") {
+                if (!reg2.test(price)) {
+                    alertMsg("璁剧疆鐨勫�煎繀椤讳负姝f暣鏁�");
+                    $(this).focus();
+                    $(this).val("");
+                }
+            } 
+        });
     });
 </script>
 <script type="text/javascript">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index 6be0cf7..167b482 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -950,56 +950,61 @@
                         printDemand += "璇曞嵎琚嬬焊寮狅細" + model.printColorshijuan + "锛�";
                     }
 
-                    if (request["paper1"] != null)
+                    if(request["paper1"] != null && !string.IsNullOrEmpty(request["paper1"].ToString()))
                     {
-                        model.paper1 = request["paper1"].ToString();
-                        printDemand += "绛旈鍗★細绾稿紶锛�" + model.paper1 + "锛�";
-                    }
-
-
-
-                    if (request["paperSizeA4"] != null)
-                    {
-                        model.paperSizeA4 = request["paperSizeA4"].ToString();
-                        if (model.paperSizeA4 == "-1")
+                        if (request["paper1"] != null)
                         {
-                            model.PrintSizeNameA4 = request["txtFirstSizeA4"].ToString() + "脳" + request["txtSecondSizeA4"].ToString();
-                            model.firstSizeA4 = request["txtFirstSizeA4"].ToString();
-                            model.secondSizeA4 = request["txtSecondSizeA4"].ToString();
-                            printDemand += "鎴愬搧灏哄锛欰4 " + model.PrintSizeNameA4 + "锛�";
+                            model.paper1 = request["paper1"].ToString();
+                            printDemand += "绛旈鍗★細绾稿紶锛�" + model.paper1 + "锛�";
                         }
-                        else
+
+
+
+                        if (request["paperSizeA4"] != null)
                         {
-                            printDemand += "鎴愬搧灏哄锛欰4 " + model.paperSizeA4 + "锛�";
+                            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 + "锛�";
                         }
                     }
 
-                    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;
@@ -1420,6 +1425,11 @@
                                     printDemand += "鏀挎不锛�" + inquirySHiJuanModel.zhengzhicheckboxinput + "寮狅紝";
                                     printDemand += inquirySHiJuanModel.zhengzhiselect + "锛�";
                                 }
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwucheckboxinput))
+                                {
+                                    printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwucheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.shengwuselect + "锛�";
+                                }
 
                                 printDemand += "绛旈鍗★細";
 
@@ -1464,7 +1474,11 @@
                                     printDemand += "鏀挎不锛�" + inquirySHiJuanModel.zhengzhidatikacheckboxinput + "寮狅紝";
                                     printDemand += inquirySHiJuanModel.zhengzhidatikaselect + "锛�";
                                 }
- 
+                                if (!string.IsNullOrEmpty(inquirySHiJuanModel.shengwudatikacheckboxinput))
+                                {
+                                    printDemand += "鐢熺墿锛�" + inquirySHiJuanModel.shengwudatikacheckboxinput + "寮狅紝";
+                                    printDemand += inquirySHiJuanModel.shengwudatikaselect + "锛�";
+                                }
                             }
                             else if (inquirySHiJuanModel.Nianji == "楂樹簩")
                             {
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx
index 2893ff1..1dd0f0e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx
@@ -117,7 +117,7 @@
                   <td style="width:20%">
                     绾稿紶锛�<select class="selectLaber"  id="paper1" name="paper1"     keepdefaultstyle='true' >
                           
-                        
+                          <option value="" >璇烽�夋嫨</option> 
                          <option value="70鍏嬮珮鐧藉弻鑳�" >70鍏嬮珮鐧藉弻鑳�</option> 
                        
                          <option value="80鍏嬮珮鐧藉弻鑳�">80鍏嬮珮鐧藉弻鑳�</option> 
@@ -196,14 +196,14 @@
                     <option value="楂樻牎璇曞嵎">楂樻牎璇曞嵎</option>
                        
                     </select></td>
-                 <td align="left" style="">浜烘暟锛�<input type="text"    name="txtRenshu"  onchange="ShijuanCountChange();"    style="height: 15px; line-height: 15px; width:80px;" class="validateInt"   value_id="1" onchange="addshuliang();" /> </td>
+                 <td align="left" style="">浜烘暟锛�<input type="text"    name="txtRenshu"  onchange="ShijuanCountChange();"    style="height: 15px; line-height: 15px; width:80px;" class="validateIntshijuan"   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" onchange="ShijuanCountChange();"    name="yuwencheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1"   /><span name="yuwenunit"  value_id="1" >寮�</span>
+                     璇曘��鍗凤細<input type="checkbox" name="yuwencheckbox" value_id="1" value="1" style="display:none;" /><span name="yuwentitle"  value_id="1" >璇枃锛�</span><input type="text" onchange="ShijuanCountChange();"    name="yuwencheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateIntshijuan"   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>
@@ -212,7 +212,7 @@
                           <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"  onchange="ShijuanCountChange();"   name="shuxuecheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="shuxueunit"  value_id="1" >寮�</span>
+                     <input type="checkbox" name="shuxuecheckbox" value_id="1" value="1" style="display:none;" /><span name="shuxuetitle"  value_id="1" >鏁板锛�</span><input type="text"  onchange="ShijuanCountChange();"   name="shuxuecheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateIntshijuan"   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>
@@ -221,7 +221,7 @@
                           <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"  onchange="ShijuanCountChange();"   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>
+                      <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"  onchange="ShijuanCountChange();"   name="yingyucheckboxinput"    style="height: 15px; line-height: 15px; width:40px;display:none;" class="validateIntshijuan"   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>
@@ -230,7 +230,7 @@
                           <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"  onchange="ShijuanCountChange();"   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>
+                      <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"  onchange="ShijuanCountChange();"   name="kexuecheckboxinput"    style="height: 15px; line-height: 15px; width:40px;display:none;" class="validateIntshijuan"   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>
@@ -239,7 +239,7 @@
                           <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" onchange="ShijuanCountChange();"    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>
+                     <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" onchange="ShijuanCountChange();"    name="lishicheckboxinput"    style="height: 15px; line-height: 15px; width:40px;display:none;" class="validateIntshijuan"   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>
@@ -248,7 +248,7 @@
                           <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" onchange="ShijuanCountChange();"    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>
+                      <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" onchange="ShijuanCountChange();"    name="dilicheckboxinput"    style="height: 15px; line-height: 15px; width:40px;display:none;" class="validateIntshijuan"   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>
@@ -257,7 +257,7 @@
                           <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" onchange="ShijuanCountChange();"    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>
+                     <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" onchange="ShijuanCountChange();"    name="shengwucheckboxinput"    style="height: 15px; line-height: 15px; width:40px;display:none;" class="validateIntshijuan"   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>
@@ -266,7 +266,7 @@
                           <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" onchange="ShijuanCountChange();"    name="pingdecheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="pingdeunit"  value_id="1" >寮�</span>
+                     <input type="checkbox" name="pingdecheckbox" value_id="1" value="1" style="display:none;"  /><span name="pingdetitle"  value_id="1" >鍝佸痉涓庣敓娲伙細</span><input type="text" onchange="ShijuanCountChange();"    name="pingdecheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateIntshijuan"   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>
@@ -275,7 +275,7 @@
                           <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" onchange="ShijuanCountChange();"    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>
+                      <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" onchange="ShijuanCountChange();"    name="wulicheckboxinput"    style="height: 15px; line-height: 15px; width:40px;display:none;" class="validateIntshijuan"   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>
@@ -284,7 +284,7 @@
                           <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" onchange="ShijuanCountChange();"    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>
+                      <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" onchange="ShijuanCountChange();"    name="huaxuecheckboxinput"    style="height: 15px; line-height: 15px; width:40px;display:none;" class="validateIntshijuan"   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>
@@ -293,7 +293,7 @@
                           <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" onchange="ShijuanCountChange();"    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>
+                       <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" onchange="ShijuanCountChange();"    name="zhengzhicheckboxinput"    style="height: 15px; line-height: 15px; width:40px;display:none;" class="validateIntshijuan"   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>
@@ -302,7 +302,7 @@
                           <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" onchange="ShijuanCountChange();"    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>
+                      <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" onchange="ShijuanCountChange();"    name="sixiangpingdecheckboxinput"    style="height: 15px; line-height: 15px; width:40px;display:none;" class="validateIntshijuan"   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>
@@ -316,74 +316,74 @@
                  </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"  onchange="ShijuanCountChange();"   name="yuwendatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="yuwendatikaunit"  value_id="1" >寮�</span>
+                     绛旈鍗★細<input type="checkbox" name="yuwendatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="yuwendatikatitle"  value_id="1" >璇枃锛�</span><input type="text"  onchange="ShijuanCountChange();"   name="yuwendatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateIntshijuan"   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"  onchange="ShijuanCountChange();"   name="shuxuedatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="shuxuedatikaunit"  value_id="1" >寮�</span>
+                     <input type="checkbox" name="shuxuedatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="shuxuedatikatitle"  value_id="1" >鏁板锛�</span><input type="text"  onchange="ShijuanCountChange();"   name="shuxuedatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateIntshijuan"   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"  onchange="ShijuanCountChange();"   name="yingyudatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="yingyudatikaunit"  value_id="1" >寮�</span>
+                      <input type="checkbox" name="yingyudatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="yingyudatikatitle"  value_id="1" >鑻辫锛�</span><input type="text"  onchange="ShijuanCountChange();"   name="yingyudatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateIntshijuan"   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"  onchange="ShijuanCountChange();"   name="kexuedatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="kexuedatikaunit"  value_id="1" >寮�</span>
+                      <input type="checkbox" name="kexuedatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="kexuedatikatitle"  value_id="1" >绉戝锛�</span><input type="text"  onchange="ShijuanCountChange();"   name="kexuedatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateIntshijuan"   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"  onchange="ShijuanCountChange();"   name="lishidatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="lishidatikaunit"  value_id="1" >寮�</span>
+                     <input type="checkbox" name="lishidatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="lishidatikatitle"  value_id="1" >鍘嗗彶锛�</span><input type="text"  onchange="ShijuanCountChange();"   name="lishidatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateIntshijuan"   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"  onchange="ShijuanCountChange();"   name="dilidatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="dilidatikaunit"  value_id="1" >寮�</span>
+                      <input type="checkbox" name="dilidatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="dilidatikatitle"  value_id="1" >鍦扮悊锛�</span><input type="text"  onchange="ShijuanCountChange();"   name="dilidatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateIntshijuan"   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"  onchange="ShijuanCountChange();"   name="shengwudatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="shengwudatikaunit"  value_id="1" >寮�</span>
+                     <input type="checkbox" name="shengwudatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="shengwudatikatitle"  value_id="1" >鐢熺墿锛�</span><input type="text"  onchange="ShijuanCountChange();"   name="shengwudatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateIntshijuan"   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" onchange="ShijuanCountChange();"    name="pingdedatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="pingdedatikaunit"  value_id="1" >寮�</span>
+                     <input type="checkbox" name="pingdedatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="pingdedatikatitle"  value_id="1" >鍝佸痉涓庣敓娲伙細</span><input type="text" onchange="ShijuanCountChange();"    name="pingdedatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateIntshijuan"   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"  onchange="ShijuanCountChange();"   name="wulidatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="wulidatikaunit"  value_id="1" >寮�</span>
+                      <input type="checkbox" name="wulidatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="wulidatikatitle"  value_id="1" >鐗╃悊锛�</span><input type="text"  onchange="ShijuanCountChange();"   name="wulidatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateIntshijuan"   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"  onchange="ShijuanCountChange();"   name="huaxuedatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="huaxuedatikaunit"  value_id="1" >寮�</span>
+                      <input type="checkbox" name="huaxuedatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="huaxuedatikatitle"  value_id="1" >鍖栧锛�</span><input type="text"  onchange="ShijuanCountChange();"   name="huaxuedatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateIntshijuan"   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"  onchange="ShijuanCountChange();"   name="zhengzhidatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="zhengzhidatikaunit"  value_id="1" >寮�</span>
+                       <input type="checkbox" name="zhengzhidatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="zhengzhidatikatitle"  value_id="1" >鏀挎不锛�</span><input type="text"  onchange="ShijuanCountChange();"   name="zhengzhidatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateIntshijuan"   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" onchange="ShijuanCountChange();"    name="sixiangpingdedatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateInt"   value_id="1" /><span name="sixiangpingdedatikaunit"  value_id="1" >寮�</span>
+                      <input type="checkbox" name="sixiangpingdedatikacheckbox" value_id="1" value="1" style="display:none;" /><span name="sixiangpingdedatikatitle"  value_id="1" >鎬濇兂鍝佸痉锛�</span><input type="text" onchange="ShijuanCountChange();"    name="sixiangpingdedatikacheckboxinput"    style="height: 15px; line-height: 15px; width:40px;" class="validateIntshijuan"   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>
@@ -877,7 +877,7 @@
 
                    $("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='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();
 
@@ -899,7 +899,7 @@
 
                    $("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='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();
 
diff --git a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
index adce8f9..ab57e45 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
@@ -532,6 +532,11 @@
                 num = num + parseInt(numnnzhengzhi);
                 shijuannum = shijuannum + parseInt(numnnzhengzhi);
             }
+            var numnnshengwu = $("input[name='shengwucheckboxinput'][value_id='" + (i + 1) + "']").val();
+            if (numnnshengwu != "") {
+                num = num + parseInt(numnnshengwu);
+                shijuannum = shijuannum + parseInt(numnnshengwu);
+            }
 
 
             var numnnyuwendatika = $("input[name='yuwendatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
@@ -576,6 +581,11 @@
                 num = num + parseInt(numnnzhengzhidatika);
                 datikanum = datikanum + parseInt(numnnzhengzhidatika);
             }
+            var numnnshengwudatika = $("input[name='shengwudatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
+            if (numnnshengwudatika != "") {
+                num = num + parseInt(numnnshengwudatika);
+                datikanum = datikanum + parseInt(numnnshengwudatika);
+            }
         }
         else if (Nianji == "楂樹簩" || Nianji == "楂樹笁") {
 

--
Gitblit v1.9.1