From f6043f17982667a9e028ff7aa5cd7c2f8318a791 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 08 八月 2025 14:07:40 +0800
Subject: [PATCH] 20250807  设计订单提成最新修改  试卷按照p数  自动合集p数、根据p数算提成

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx.cs  |  105 ++++
 CY_ECommercePlatform/CY.WebForm/Pages/business/ShejijijianEdit.aspx    |    2 
 CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js                  |  891 ++++++++++++++++++++++++++++++++++++++++--
 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx          |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs |   12 
 CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx               |  130 +++++
 CY_ECommercePlatform/CY.WebForm/Pages/business/ShejijijianList.aspx    |    2 
 CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs      |   46 ++
 CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx     |    8 
 CY_ECommercePlatform/CY.Model/Inquiry/InquirySHiJuanModel.cs           |   21 +
 10 files changed, 1,133 insertions(+), 86 deletions(-)

diff --git a/CY_ECommercePlatform/CY.Model/Inquiry/InquirySHiJuanModel.cs b/CY_ECommercePlatform/CY.Model/Inquiry/InquirySHiJuanModel.cs
index 7f4029e..1b1b1ab 100644
--- a/CY_ECommercePlatform/CY.Model/Inquiry/InquirySHiJuanModel.cs
+++ b/CY_ECommercePlatform/CY.Model/Inquiry/InquirySHiJuanModel.cs
@@ -205,6 +205,27 @@
         public string shengwudatikaselect { get; set; }
 
         /// <summary>
+        /// 鍚堝苟鍦扮悊
+        /// </summary>
+        public string dilidatikahebingcheckbox { get; set; }
+
+        /// <summary>
+        /// 鍚堝苟鍘嗗彶
+        /// </summary>
+        public string lishidatikahebingcheckbox { get; set; }
+
+
+        /// <summary>
+        /// 鍚堝苟鐢熺墿
+        /// </summary>
+        public string shengwudatikahebingcheckbox { get; set; }
+
+        /// <summary>
+        /// 鍚堝苟鏀挎不
+        /// </summary>
+        public string sixiangpingdedatikahebingcheckbox { get; set; }
+
+        /// <summary>
         /// 鏁伴噺
         /// </summary>
         public string wulidatikacheckboxinput { get; set; }
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index e7b3503..3c53532 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=189" type="text/javascript"></script>
+    <script src="../../js/Inquiry/Inquiry.js?v=200" type="text/javascript"></script>
     <script src="../../js/business/Order.js?v=51" 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 c5ddebe..72df5f6 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=189" type="text/javascript"></script>
+    <script src="../../js/Inquiry/Inquiry.js?v=200" type="text/javascript"></script>
     <script src="../../js/business/Order.js?v=51" type="text/javascript"></script>
     <!--鍓嶅彴椤甸潰end-->
     <script type="text/javascript" language="javascript">
@@ -621,7 +621,7 @@
                 <td   style="text-align:left;"  >
                           <select id='SelShejileixingneiye15' runat="server" keepdefaultstyle='true'  onchange="changeShejileixingneiye15()" >
                              <option  value="2">鏁撮〉琛ㄦ牸</option>
-                             <option  value="3">鍗婃枃鍗婅〃</option>
+                            <%-- <option  value="3">鍗婃枃鍗婅〃</option>--%>
                                 <option  value="9">褰╄壊璁捐</option>
                              <option  value="4">鎵弿鐓у仛</option>
                              <option  value="5">鏂囦欢淇敼</option>
@@ -829,7 +829,7 @@
                 </select>
                 </td>
                  <td style="width: 100px;text-align:left;" colspan="4">
-                   <input id='txtShejileixingName38' runat="server" maxlength="100"   />  P
+                   <input id='txtShejileixingName38' runat="server" maxlength="100" readonly="readonly"   />  P
                 </td>
                 
                  
@@ -854,7 +854,7 @@
                 </select>
                 </td>
                 <td style="width: 100px;text-align:left;" colspan="4">
-                   <input id='txtShejileixingNameneiye38' runat="server" maxlength="100"   />  P
+                   <input id='txtShejileixingNameneiye38' runat="server" maxlength="100"  readonly="readonly"  />  绉�
                 </td>
                 
                  
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx.cs
index 1b6b2cd..66d6d13 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx.cs
@@ -304,10 +304,10 @@
                 //this.rptCustormer.DataSource = corporateClients;
                 //this.rptCustormer.DataBind();
 
-                this.selPrintTypes.DataSource = _sysInquiry_PrintingTypeBLL.SelectUsedModlesByFirm(CurrentUser.MemberId).OrderBy(x=>x.orderNumHome);
+                this.selPrintTypes.DataSource = _sysInquiry_PrintingTypeBLL.SelectUsedModlesByFirm(CurrentUser.MemberId).Where(x=> x.KeyId != 37 && x.KeyId != 31).OrderBy(x=>x.orderNumHome);
                 this.selPrintTypes.DataBind();
                 this.selPrintTypes.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
-                this.selPrintTypes.Items.Add(new ListItem("鍏朵粬", "-1"));
+                //this.selPrintTypes.Items.Add(new ListItem("鍏朵粬", "-1"));
 
                 this.selExigencyDegree.DataSource = _sys_DictionaryBLL.GetDataByType("OA_绱ф�ョ▼搴�");
                 this.selExigencyDegree.DataBind();
@@ -330,64 +330,159 @@
                 this.selCustormerManagers.DataBind();
                 this.selCustormerManagers.Items.Insert(0, new ListItem("鏃�", "0"));
 
-
+                var ToUpSetData = Request["ToUpSetData"];
                 var oA_Staffs = oA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.DepartmentId == 13);
                 this.SelShejirenyuan29.DataSource = oA_Staffs;
                 this.SelShejirenyuan29.DataBind();
+                if (string.IsNullOrEmpty(ToUpSetData))
+                {
+                    var StaffId = CurrentUser.StaffId;
+                    this.SelShejirenyuan29.Value = StaffId.ToString();
+                }
 
                 this.SelShejirenyuan6.DataSource = oA_Staffs;
                 this.SelShejirenyuan6.DataBind();
+                if (string.IsNullOrEmpty(ToUpSetData))
+                {
+                    var StaffId = CurrentUser.StaffId;
+                    this.SelShejirenyuan6.Value = StaffId.ToString();
+                }
 
                 this.SelShejirenyuanneiye6.DataSource = oA_Staffs;
                 this.SelShejirenyuanneiye6.DataBind();
+                if (string.IsNullOrEmpty(ToUpSetData))
+                {
+                    var StaffId = CurrentUser.StaffId;
+                    this.SelShejirenyuanneiye6.Value = StaffId.ToString();
+                }
 
                 this.SelShejirenyuan15.DataSource = oA_Staffs;
                 this.SelShejirenyuan15.DataBind();
+                if (string.IsNullOrEmpty(ToUpSetData))
+                {
+                    var StaffId = CurrentUser.StaffId;
+                    this.SelShejirenyuan15.Value = StaffId.ToString();
+                }
 
                 this.SelShejirenyuanneiye15.DataSource = oA_Staffs;
                 this.SelShejirenyuanneiye15.DataBind();
+                if (string.IsNullOrEmpty(ToUpSetData))
+                {
+                    var StaffId = CurrentUser.StaffId;
+                    this.SelShejirenyuanneiye15.Value = StaffId.ToString();
+                }
 
                 this.SelShejirenyuan14.DataSource = oA_Staffs;
                 this.SelShejirenyuan14.DataBind();
+                if (string.IsNullOrEmpty(ToUpSetData))
+                {
+                    var StaffId = CurrentUser.StaffId;
+                    this.SelShejirenyuan14.Value = StaffId.ToString();
+                }
 
                 this.SelShejirenyuan27.DataSource = oA_Staffs;
                 this.SelShejirenyuan27.DataBind();
+                if (string.IsNullOrEmpty(ToUpSetData))
+                {
+                    var StaffId = CurrentUser.StaffId;
+                    this.SelShejirenyuan27.Value = StaffId.ToString();
+                }
 
                 this.SelShejirenyuan21.DataSource = oA_Staffs;
                 this.SelShejirenyuan21.DataBind();
+                if (string.IsNullOrEmpty(ToUpSetData))
+                {
+                    var StaffId = CurrentUser.StaffId;
+                    this.SelShejirenyuan21.Value = StaffId.ToString();
+                }
 
                 this.SelShejirenyuan7.DataSource = oA_Staffs;
                 this.SelShejirenyuan7.DataBind();
+                if (string.IsNullOrEmpty(ToUpSetData))
+                {
+                    var StaffId = CurrentUser.StaffId;
+                    this.SelShejirenyuan7.Value = StaffId.ToString();
+                }
 
                 this.SelShejirenyuan38.DataSource = oA_Staffs;
                 this.SelShejirenyuan38.DataBind();
+                if (string.IsNullOrEmpty(ToUpSetData))
+                {
+                    var StaffId = CurrentUser.StaffId;
+                    this.SelShejirenyuan38.Value = StaffId.ToString();
+                }
 
                 this.SelShejirenyuanneiye38.DataSource = oA_Staffs;
                 this.SelShejirenyuanneiye38.DataBind();
+                if (string.IsNullOrEmpty(ToUpSetData))
+                {
+                    var StaffId = CurrentUser.StaffId;
+                    this.SelShejirenyuanneiye38.Value = StaffId.ToString();
+                }
 
                 this.SelShejirenyuan20.DataSource = oA_Staffs;
                 this.SelShejirenyuan20.DataBind();
+                if (string.IsNullOrEmpty(ToUpSetData))
+                {
+                    var StaffId = CurrentUser.StaffId;
+                    this.SelShejirenyuan20.Value = StaffId.ToString();
+                }
 
                 this.SelShejirenyuan16.DataSource = oA_Staffs;
                 this.SelShejirenyuan16.DataBind();
+                if (string.IsNullOrEmpty(ToUpSetData))
+                {
+                    var StaffId = CurrentUser.StaffId;
+                    this.SelShejirenyuan16.Value = StaffId.ToString();
+                }
 
                 this.SelShejirenyuan22.DataSource = oA_Staffs;
                 this.SelShejirenyuan22.DataBind();
+                if (string.IsNullOrEmpty(ToUpSetData))
+                {
+                    var StaffId = CurrentUser.StaffId;
+                    this.SelShejirenyuan22.Value = StaffId.ToString();
+                }
 
                 this.SelShejirenyuan39.DataSource = oA_Staffs;
                 this.SelShejirenyuan39.DataBind();
+                if (string.IsNullOrEmpty(ToUpSetData))
+                {
+                    var StaffId = CurrentUser.StaffId;
+                    this.SelShejirenyuan39.Value = StaffId.ToString();
+                }
 
                 this.SelShejirenyuan23.DataSource = oA_Staffs;
                 this.SelShejirenyuan23.DataBind();
+                if (string.IsNullOrEmpty(ToUpSetData))
+                {
+                    var StaffId = CurrentUser.StaffId;
+                    this.SelShejirenyuan23.Value = StaffId.ToString();
+                }
 
                 this.SelShejirenyuan25.DataSource = oA_Staffs;
                 this.SelShejirenyuan25.DataBind();
+                if (string.IsNullOrEmpty(ToUpSetData))
+                {
+                    var StaffId = CurrentUser.StaffId;
+                    this.SelShejirenyuan25.Value = StaffId.ToString();
+                }
 
                 this.SelShejirenyuan26.DataSource = oA_Staffs;
                 this.SelShejirenyuan26.DataBind();
+                if (string.IsNullOrEmpty(ToUpSetData))
+                {
+                    var StaffId = CurrentUser.StaffId;
+                    this.SelShejirenyuan26.Value = StaffId.ToString();
+                }
 
                 this.SelShejirenyuan1111.DataSource = oA_Staffs;
                 this.SelShejirenyuan1111.DataBind();
+                if (string.IsNullOrEmpty(ToUpSetData))
+                {
+                    var StaffId = CurrentUser.StaffId;
+                    this.SelShejirenyuan1111.Value = StaffId.ToString();
+                }
 
             }
         }
@@ -1017,7 +1112,7 @@
             }
             else if (PrintTypeId == 38)
             {
-                eC_OrderExtend.Shejicount = this.ShijuanprintCount.Value.ToInt32() ?? 0;     //Request["printCount"].ToString().ToInt32();
+                eC_OrderExtend.Shejicount = this.txtShejileixingName38.Value.ToInt32() ?? 0;     //Request["printCount"].ToString().ToInt32();
                 eC_OrderExtend.Shejirenyuan = this.SelShejirenyuan38.Value.ToInt32();
                 var oA_Staff = oA_StaffBLL.GetModelByKeyid(eC_OrderExtend.Shejirenyuan);
                 if (oA_Staff != null)
@@ -1041,7 +1136,7 @@
 
 
 
-                eC_OrderExtend.Shejicountneiye = this.DatikaprintCount.Value.ToInt32()??0; //Request["printCount"].ToString().ToInt32();
+                eC_OrderExtend.Shejicountneiye = this.txtShejileixingNameneiye38.Value.ToInt32()??0; //Request["printCount"].ToString().ToInt32();
                 eC_OrderExtend.Shejirenyuanneiye = this.SelShejirenyuanneiye38.Value.ToInt32();
                 var oA_Staff1 = oA_StaffBLL.GetModelByKeyid(eC_OrderExtend.Shejirenyuanneiye);
                 if (oA_Staff1 != null)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejijijianEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejijijianEdit.aspx
index 663cbb1..0923420 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejijijianEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejijijianEdit.aspx
@@ -89,7 +89,7 @@
                      $('#selShejileixing').html('<option  value="7">璁捐灏侀潰</option><option  value="4">鎵弿鐓у仛</option><option  value="5">鏂囦欢淇敼</option><option  value="8">瀹緵鏂囦欢</option>');
                  }
                  else if ($('#selFengmianneiye').val() == "2") {
-                     $('#selShejileixing').html('<option  value="2">鏁撮〉琛ㄦ牸</option> <option  value="3">鍗婃枃鍗婅〃</option><option  value="9">褰╄壊璁捐</option> <option  value="4">鎵弿鐓у仛</option> <option  value="5">鏂囦欢淇敼</option><option  value="8">瀹緵鏂囦欢</option>');
+                     $('#selShejileixing').html('<option  value="2">鏁撮〉琛ㄦ牸</option><option  value="9">褰╄壊璁捐</option> <option  value="4">鎵弿鐓у仛</option> <option  value="5">鏂囦欢淇敼</option><option  value="8">瀹緵鏂囦欢</option>');// <option  value="3">鍗婃枃鍗婅〃</option>
                  }
              } else if ($('#selDingdanleixing').val() == "38") {
                 
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejijijianList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejijijianList.aspx
index 883c2dd..ec2fc98 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejijijianList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/ShejijijianList.aspx
@@ -130,7 +130,7 @@
                             <%#Eval("ShejileixingName") %>
                         </td>
                          <td>
-                            <%#Eval("Shejilemoney") %>
+                            <%#Eval("Shejilemoney","{0:F2}") %>
                         </td>
                         <td class="Operate">
                             <span menu_member_case_id="case_onEdit" menu_member_case_name="淇敼" onclick="onEdit('<%#Eval("Keyid")%>')">淇敼</span> <span menu_member_case_id="case_onDelete" menu_member_case_name="鍒犻櫎" onclick="onDelete('<%#Eval("Keyid")%>')">鍒犻櫎</span>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
index abfbcc7..26592f9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
@@ -205,12 +205,7 @@
                         firmAccount.AllExpenses = this.txtMoney.Value.ToDecimal2() + firmAccount.AllExpenses;
                         firmAccount.Balance = firmAccount.Balance - this.txtMoney.Value.ToDecimal2();
                         sddd = _OA_FirmAccountRecordBLL.AddModel(firmAccountRecord, firmAccount);
-                    }
 
-                   
-
-                    if (sddd)
-                    {
                         if (!string.IsNullOrEmpty(this.selSubject.Value))
                         {
                             var oA_SubjectSet = _OA_SubjectSetBLL.getSingleSubject(firmAccountRecord.SubjectId);
@@ -252,6 +247,13 @@
 
                             }
                         }
+                    }
+
+                   
+
+                    if (sddd)
+                    {
+                     
 
                         scope.Complete();
                         JavaScript.MessageBox("浠樻鎴愬姛", this, true, true);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index 167b482..94f0341 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -1066,6 +1066,14 @@
                         string[] sixiangpingdedatikacheckboxinput = request["sixiangpingdedatikacheckboxinput"]?.Split(',');
                         string[] sixiangpingdedatikaselect = request["sixiangpingdedatikaselect"]?.Split(',');
 
+                        string dilidatikahebingcheckbox = request["dilidatikahebingcheckbox"]??"";
+                        string lishidatikahebingcheckbox = request["lishidatikahebingcheckbox"] ?? "";
+                        string shengwudatikahebingcheckbox = request["shengwudatikahebingcheckbox"] ?? "";
+                        string sixiangpingdedatikahebingcheckbox = request["sixiangpingdedatikahebingcheckbox"] ?? "";
+                        dilidatikahebingcheckbox = "," + dilidatikahebingcheckbox + ",";
+                        lishidatikahebingcheckbox = "," + lishidatikahebingcheckbox + ",";
+                        shengwudatikahebingcheckbox = "," + shengwudatikahebingcheckbox + ",";
+                        sixiangpingdedatikahebingcheckbox = "," + sixiangpingdedatikahebingcheckbox + ",";
                         for (int i=0;i< sss; i++)
                         {
                             inquirySHiJuanModel = new InquirySHiJuanModel();
@@ -1128,7 +1136,43 @@
                             inquirySHiJuanModel.zhengzhidatikaselect = zhengzhidatikaselect[i];
                             inquirySHiJuanModel.sixiangpingdedatikacheckboxinput = sixiangpingdedatikacheckboxinput[i];
                             inquirySHiJuanModel.sixiangpingdedatikaselect = sixiangpingdedatikaselect[i];
-                           
+
+
+                          
+                            var ssscishu = "," + (i + 1) + ",";
+                            if (dilidatikahebingcheckbox.IndexOf(ssscishu) >= 0)
+                            {
+                                inquirySHiJuanModel.dilidatikahebingcheckbox = ""+(i + 1);
+                            }
+                            else
+                            {
+                                inquirySHiJuanModel.dilidatikahebingcheckbox = "";
+                            }
+                            if (lishidatikahebingcheckbox.IndexOf(ssscishu) >= 0)
+                            {
+                                inquirySHiJuanModel.lishidatikahebingcheckbox = "" + (i + 1);
+                            }
+                            else
+                            {
+                                inquirySHiJuanModel.lishidatikahebingcheckbox = "";
+                            }
+                            if (shengwudatikahebingcheckbox.IndexOf(ssscishu) >= 0)
+                            {
+                                inquirySHiJuanModel.shengwudatikahebingcheckbox = "" + (i + 1);
+                            }
+                            else
+                            {
+                                inquirySHiJuanModel.shengwudatikahebingcheckbox = "";
+                            }
+                            if (sixiangpingdedatikahebingcheckbox.IndexOf(ssscishu) >= 0)
+                            {
+                                inquirySHiJuanModel.sixiangpingdedatikahebingcheckbox = "" + (i + 1);
+                            }
+                            else
+                            {
+                                inquirySHiJuanModel.sixiangpingdedatikahebingcheckbox = "";
+                            }
+
                             if (inquirySHiJuanModel.Nianji != "楂樻牎璇曞嵎")
                             {
                                 printDemand += "璇曞嵎锛�";
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx
index 1dd0f0e..51bdb55 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Shijuan.aspx
@@ -204,7 +204,7 @@
             <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="validateIntshijuan"   value_id="1"   /><span name="yuwenunit"  value_id="1" >寮�</span>
-                     <select  class="selectLaber" name="yuwenselect" style=" width:45px;"   value_id="1">
+                     <select  class="selectLaber" name="yuwenselect" style=" width:45px;"   value_id="1"  onchange="ShijuanCountChange();"  >
                          <option value="4P">4P</option>
                         <option value="6P"  >6P</option>
                         <option value="8P">8P</option>
@@ -213,7 +213,7 @@
                        
                     </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="validateIntshijuan"   value_id="1" /><span name="shuxueunit"  value_id="1" >寮�</span>
-                     <select  class="selectLaber" name="shuxueselect" style=" width:45px;"   value_id="1">
+                     <select  class="selectLaber" name="shuxueselect" style=" width:45px;"   value_id="1" onchange="ShijuanCountChange();"  >
                          <option value="4P">4P</option>
                         <option value="6P"  >6P</option>
                         <option value="8P">8P</option>
@@ -222,7 +222,7 @@
                        
                     </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="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" >
+                     <select  class="selectLaber" name="yingyuselect" style=" width:45px;display:none;"   value_id="1" onchange="ShijuanCountChange();"   >
                          <option value="4P">4P</option>
                         <option value="6P"  >6P</option>
                         <option value="8P">8P</option>
@@ -231,7 +231,7 @@
                        
                     </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="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">
+                     <select  class="selectLaber" name="kexueselect" style=" width:45px;display:none;"   value_id="1" onchange="ShijuanCountChange();"  >
                          <option value="4P">4P</option>
                         <option value="6P"  >6P</option>
                         <option value="8P">8P</option>
@@ -240,7 +240,7 @@
                        
                     </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="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">
+                     <select  class="selectLaber" name="lishiselect" style=" width:45px;display:none;"   value_id="1" onchange="ShijuanCountChange();"  >
                          <option value="4P">4P</option>
                         <option value="6P"  >6P</option>
                         <option value="8P">8P</option>
@@ -249,7 +249,7 @@
                        
                     </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="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">
+                     <select  class="selectLaber" name="diliselect" style=" width:45px;display:none;"   value_id="1" onchange="ShijuanCountChange();"  >
                          <option value="4P">4P</option>
                         <option value="6P"  >6P</option>
                         <option value="8P">8P</option>
@@ -258,7 +258,7 @@
                        
                     </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="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">
+                     <select  class="selectLaber" name="shengwuselect" style=" width:45px;display:none;"   value_id="1" onchange="ShijuanCountChange();"  >
                          <option value="4P">4P</option>
                         <option value="6P"  >6P</option>
                         <option value="8P">8P</option>
@@ -267,7 +267,7 @@
                        
                     </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="validateIntshijuan"   value_id="1" /><span name="pingdeunit"  value_id="1" >寮�</span>
-                     <select  class="selectLaber" name="pingdeselect" style=" width:45px;"   value_id="1">
+                     <select  class="selectLaber" name="pingdeselect" style=" width:45px;"   value_id="1" onchange="ShijuanCountChange();"  >
                          <option value="4P">4P</option>
                         <option value="6P"  >6P</option>
                         <option value="8P">8P</option>
@@ -276,7 +276,7 @@
                        
                     </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="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">
+                     <select  class="selectLaber" name="wuliselect" style=" width:45px;display:none;"   value_id="1" onchange="ShijuanCountChange();"  >
                          <option value="4P">4P</option>
                         <option value="6P"  >6P</option>
                         <option value="8P">8P</option>
@@ -285,7 +285,7 @@
                        
                     </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="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">
+                     <select  class="selectLaber" name="huaxueselect" style=" width:45px;display:none;"   value_id="1" onchange="ShijuanCountChange();"  >
                          <option value="4P">4P</option>
                         <option value="6P"  >6P</option>
                         <option value="8P">8P</option>
@@ -294,7 +294,7 @@
                        
                     </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="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">
+                     <select  class="selectLaber" name="zhengzhiselect" style=" width:45px;display:none;"   value_id="1" onchange="ShijuanCountChange();"  >
                          <option value="4P">4P</option>
                         <option value="6P"  >6P</option>
                         <option value="8P">8P</option>
@@ -303,7 +303,7 @@
                        
                     </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="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">
+                     <select  class="selectLaber" name="sixiangpingdeselect" style=" width:45px;display:none;"   value_id="1" onchange="ShijuanCountChange();"  >
                          <option value="4P">4P</option>
                         <option value="6P"  >6P</option>
                         <option value="8P">8P</option>
@@ -347,18 +347,21 @@
                         <option value="A3"  >A3</option>
                        
                     </select>
+                     <input type="checkbox" name="lishidatikahebingcheckbox" value_id="1" value="1"  onchange="hebingkemuChange('lishidatikahebingcheckbox',this);"  />
                       <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="dilidatikahebingcheckbox" value_id="1" value="1" onchange="hebingkemuChange('dilidatikahebingcheckbox',this);"  />
                      <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="shengwudatikahebingcheckbox" value_id="1" value="1"  onchange="hebingkemuChange('shengwudatikahebingcheckbox',this);"  />
                      <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>
@@ -389,6 +392,7 @@
                         <option value="A3"  >A3</option>
                        
                     </select>
+                      <input type="checkbox" name="sixiangpingdedatikahebingcheckbox" value_id="1" value="1"  onchange="hebingkemuChange('sixiangpingdedatikahebingcheckbox',this);"  />
                      </td>
                  </tr>
         </tbody>
@@ -532,6 +536,10 @@
                $("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);
+               $("input[name='dilidatikahebingcheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='lishidatikahebingcheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='shengwudatikahebingcheckbox']").last().attr("value_id", value_id + 1);
+               $("input[name='sixiangpingdedatikahebingcheckbox']").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);
@@ -644,6 +652,32 @@
                $("input[name='huaxuedatikacheckboxinput'][value_id='" + (value_id + 1) + "']").val("");
                $("input[name='zhengzhidatikacheckboxinput'][value_id='" + (value_id + 1) + "']").val("");
                $("input[name='sixiangpingdedatikacheckboxinput'][value_id='" + (value_id + 1) + "']").val("");
+
+
+               $("input[name='dilidatikahebingcheckbox'][value_id='" + (value_id + 1) + "']").prop('checked', false);
+               $("input[name='lishidatikahebingcheckbox'][value_id='" + (value_id + 1) + "']").prop('checked', false);
+               $("input[name='shengwudatikahebingcheckbox'][value_id='" + (value_id + 1) + "']").prop('checked', false);
+               $("input[name='sixiangpingdedatikahebingcheckbox'][value_id='" + (value_id + 1) + "']").prop('checked', false);
+
+               $("input[name='dilidatikahebingcheckbox'][value_id='" + (value_id + 1) + "']").val("" + (value_id + 1));
+               $("input[name='lishidatikahebingcheckbox'][value_id='" + (value_id + 1) + "']").val("" + (value_id + 1));
+               $("input[name='shengwudatikahebingcheckbox'][value_id='" + (value_id + 1) + "']").val("" + (value_id + 1));
+               $("input[name='sixiangpingdedatikahebingcheckbox'][value_id='" + (value_id + 1) + "']").val("" + (value_id + 1));
+
+
+               // 鍋囪select鍏冪礌鐨刬d涓�"mySelect"
+               var selectElement = $("select[name='selNianji'][value_id='" + (value_id) + "']") ;
+
+               // 鑾峰彇褰撳墠閫変腑椤圭殑涓嬩竴涓�夐」
+               var nextOption = selectElement.find('option:selected').next('option');
+
+               // 妫�鏌ユ槸鍚﹀瓨鍦ㄤ笅涓�涓�夐」锛屽鏋滃瓨鍦ㄥ垯鑾峰彇鍏秜alue
+               if (nextOption.length) {
+                   $("select[name='selNianji']").last().val(nextOption.val());  
+                   
+               } else {
+                   $("select[name='selNianji']").last().val(selectElement.val());
+               }
 
                
                changgeNianji($("select[name='selNianji']").last());
@@ -762,7 +796,10 @@
 
                    $("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='dilidatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='dilidatikaselect'][value_id='" + value_id + "']").show();
                   $("input[name='dilidatikahebingcheckbox'][value_id='" + value_id + "']").show();
+                   $("input[name='lishidatikahebingcheckbox'][value_id='" + value_id + "']").show();
+                   $("input[name='shengwudatikahebingcheckbox'][value_id='" + value_id + "']").show();
+                   $("input[name='sixiangpingdedatikahebingcheckbox'][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();
 
@@ -807,7 +844,10 @@
 
                    $("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='dilidatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='dilidatikaselect'][value_id='" + value_id + "']").show();
                   $("input[name='dilidatikahebingcheckbox'][value_id='" + value_id + "']").show();
+                   $("input[name='lishidatikahebingcheckbox'][value_id='" + value_id + "']").show();
+                   $("input[name='shengwudatikahebingcheckbox'][value_id='" + value_id + "']").show();
+                   $("input[name='sixiangpingdedatikahebingcheckbox'][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();
 
@@ -852,7 +892,10 @@
 
                    $("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='dilidatikacheckboxinput'][value_id='" + value_id + "']").hide();
                   $("select[name='dilidatikaselect'][value_id='" + value_id + "']").hide();
                   $("input[name='dilidatikahebingcheckbox'][value_id='" + value_id + "']").hide();
+                   $("input[name='lishidatikahebingcheckbox'][value_id='" + value_id + "']").show();
+                   $("input[name='shengwudatikahebingcheckbox'][value_id='" + value_id + "']").hide();
+                   $("input[name='sixiangpingdedatikahebingcheckbox'][value_id='" + value_id + "']").show();
                   $("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();
 
@@ -897,7 +940,10 @@
 
                    $("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='dilidatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='dilidatikaselect'][value_id='" + value_id + "']").show();
                   $("input[name='dilidatikahebingcheckbox'][value_id='" + value_id + "']").hide();
+                   $("input[name='lishidatikahebingcheckbox'][value_id='" + value_id + "']").hide();
+                   $("input[name='shengwudatikahebingcheckbox'][value_id='" + value_id + "']").hide();
+                   $("input[name='sixiangpingdedatikahebingcheckbox'][value_id='" + value_id + "']").hide();
                   $("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();
 
@@ -942,7 +988,10 @@
 
                    $("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='dilidatikacheckboxinput'][value_id='" + value_id + "']").show();
                   $("select[name='dilidatikaselect'][value_id='" + value_id + "']").show();
                   $("input[name='dilidatikahebingcheckbox'][value_id='" + value_id + "']").hide();
+                   $("input[name='lishidatikahebingcheckbox'][value_id='" + value_id + "']").hide();
+                   $("input[name='shengwudatikahebingcheckbox'][value_id='" + value_id + "']").hide();
+                   $("input[name='sixiangpingdedatikahebingcheckbox'][value_id='" + value_id + "']").hide();
                   $("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();
 
@@ -963,5 +1012,52 @@
 
                ShijuanCountChange();
            }
+
+           function hebingkemuChange(name,obj) {
+               var value_id = $(obj).attr("value_id");
+               if (name == "dilidatikahebingcheckbox") {
+
+                   var isChecked = $("input[name='dilidatikahebingcheckbox'][value_id='" + value_id + "']").prop('checked');
+                   if (isChecked) {
+                       $("input[name='shengwudatikahebingcheckbox'][value_id='" + value_id + "']").prop('checked', true);
+                   } else {
+                       $("input[name='shengwudatikahebingcheckbox'][value_id='" + value_id + "']").prop('checked', false);
+                   }
+               }
+
+               if (name == "shengwudatikahebingcheckbox") {
+
+                   var isChecked = $("input[name='shengwudatikahebingcheckbox'][value_id='" + value_id + "']").prop('checked');
+                   if (isChecked) {
+                       $("input[name='dilidatikahebingcheckbox'][value_id='" + value_id + "']").prop('checked', true);
+                   } else {
+                       $("input[name='dilidatikahebingcheckbox'][value_id='" + value_id + "']").prop('checked', false);
+                   }
+               }
+
+
+
+               if (name == "lishidatikahebingcheckbox") {
+
+                   var isChecked = $("input[name='lishidatikahebingcheckbox'][value_id='" + value_id + "']").prop('checked');
+                   if (isChecked) {
+                       $("input[name='sixiangpingdedatikahebingcheckbox'][value_id='" + value_id + "']").prop('checked', true);
+                   } else {
+                       $("input[name='sixiangpingdedatikahebingcheckbox'][value_id='" + value_id + "']").prop('checked', false);
+                   }
+               }
+
+               if (name == "sixiangpingdedatikahebingcheckbox") {
+
+                   var isChecked = $("input[name='sixiangpingdedatikahebingcheckbox'][value_id='" + value_id + "']").prop('checked');
+                   if (isChecked) {
+                       $("input[name='lishidatikahebingcheckbox'][value_id='" + value_id + "']").prop('checked', true);
+                   } else {
+                       $("input[name='lishidatikahebingcheckbox'][value_id='" + value_id + "']").prop('checked', false);
+                   }
+               }
+
+               ShijuanCountChange();
+           }
        </script>
 </html>
diff --git a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
index b21842e..fe2b3da 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
@@ -198,122 +198,357 @@
     var num = 0;
     var shijuannum = 0;
     var datikanum = 0;
+    var shijuanpshu = 0;
+    var datikakshu = 0;
     var count = $('[name="yuwencheckboxinput"]').length;
     for (var i = 0; i < count; i++) {
         var Nianji = $("select[name='selNianji'][value_id='" + (i + 1) + "']").val();
         if (Nianji == "涓�骞寸骇" || Nianji == "浜屽勾绾�") {
             var numnn = $("input[name='yuwencheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var yuwenselect = $("select[name='yuwenselect'][value_id='" + (i + 1) + "']").val();
             if (numnn != "") {
                 num = num + parseInt(numnn);
                 shijuannum = shijuannum + parseInt(numnn);
+                if (yuwenselect =="4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (yuwenselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (yuwenselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (yuwenselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (yuwenselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnnshuxue = $("input[name='shuxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var shuxueselect = $("select[name='shuxueselect'][value_id='" + (i + 1) + "']").val();
             if (numnnshuxue != "") {
                 num = num + parseInt(numnnshuxue);
                 shijuannum = shijuannum + parseInt(numnnshuxue);
+                if (shuxueselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (shuxueselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (shuxueselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (shuxueselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (shuxueselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnnpingde = $("input[name='pingdecheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var pingdeselect = $("select[name='pingdeselect'][value_id='" + (i + 1) + "']").val();
             if (numnnpingde != "") {
                 num = num + parseInt(numnnpingde);
                 shijuannum = shijuannum + parseInt(numnnpingde);
+
+                if (pingdeselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (pingdeselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (pingdeselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (pingdeselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (pingdeselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
         }
         else if (Nianji == "涓夊勾绾�" || Nianji == "鍥涘勾绾�" || Nianji == "浜斿勾绾�" || Nianji == "鍏勾绾�") {
             var numnn = $("input[name='yuwencheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var yuwenselect = $("select[name='yuwenselect'][value_id='" + (i + 1) + "']").val();
             if (numnn != "") {
                 num = num + parseInt(numnn);
                 shijuannum = shijuannum + parseInt(numnn);
+
+                if (yuwenselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (yuwenselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (yuwenselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (yuwenselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (yuwenselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnnshuxue = $("input[name='shuxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var shuxueselect = $("select[name='shuxueselect'][value_id='" + (i + 1) + "']").val();
             if (numnnshuxue != "") {
                 num = num + parseInt(numnnshuxue);
                 shijuannum = shijuannum + parseInt(numnnshuxue);
+
+                if (shuxueselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (shuxueselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (shuxueselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (shuxueselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (shuxueselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnnyingyu = $("input[name='yingyucheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var yingyuselect = $("select[name='yingyuselect'][value_id='" + (i + 1) + "']").val();
             if (numnnyingyu != "") {
                 num = num + parseInt(numnnyingyu);
                 shijuannum = shijuannum + parseInt(numnnyingyu);
+
+                if (yingyuselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (yingyuselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (yingyuselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (yingyuselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (yingyuselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnnpingde = $("input[name='pingdecheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var pingdeselect = $("select[name='pingdeselect'][value_id='" + (i + 1) + "']").val();
             if (numnnpingde != "") {
                 num = num + parseInt(numnnpingde);
                 shijuannum = shijuannum + parseInt(numnnyingyu);
+
+                if (pingdeselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (pingdeselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (pingdeselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (pingdeselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (pingdeselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
+            }
+
+
+            var numnnkexue = $("input[name='kexuecheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var kexueselect = $("select[name='kexueselect'][value_id='" + (i + 1) + "']").val();
+            if (numnnkexue != "") {
+                num = num + parseInt(numnnkexue);
+                shijuannum = shijuannum + parseInt(numnnyingyu);
+
+                if (kexueselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (kexueselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (kexueselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (kexueselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (kexueselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
         }
         else if (Nianji == "涓冨勾绾�") {
             var numnn = $("input[name='yuwencheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var yuwenselect = $("select[name='yuwenselect'][value_id='" + (i + 1) + "']").val();
             if (numnn != "") {
                 num = num + parseInt(numnn);
                 shijuannum = shijuannum + parseInt(numnn);
+
+                if (yuwenselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (yuwenselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (yuwenselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (yuwenselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (yuwenselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnnshuxue = $("input[name='shuxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var shuxueselect = $("select[name='shuxueselect'][value_id='" + (i + 1) + "']").val();
             if (numnnshuxue != "") {
                 num = num + parseInt(numnnshuxue);
-                shijuannum = shijuannum+ parseInt(numnnshuxue);
+                shijuannum = shijuannum + parseInt(numnnshuxue);
+
+
+                if (shuxueselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (shuxueselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (shuxueselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (shuxueselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (shuxueselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnnyingyu = $("input[name='yingyucheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var yingyuselect = $("select[name='yingyuselect'][value_id='" + (i + 1) + "']").val();
             if (numnnyingyu != "") {
                 num = num + parseInt(numnnyingyu);
-                shijuannum = shijuannum+ parseInt(numnnyingyu);
+                shijuannum = shijuannum + parseInt(numnnyingyu);
+
+                if (yingyuselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (yingyuselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (yingyuselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (yingyuselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (yingyuselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
 
             var numnnlishi = $("input[name='lishicheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var lishiselect = $("select[name='lishiselect'][value_id='" + (i + 1) + "']").val();
             if (numnnlishi != "") {
                 num = num + parseInt(numnnlishi);
                 shijuannum = shijuannum + parseInt(numnnlishi);
+
+                if (lishiselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (lishiselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (lishiselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (lishiselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (lishiselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnndili = $("input[name='dilicheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var diliselect = $("select[name='diliselect'][value_id='" + (i + 1) + "']").val();
             if (numnndili != "") {
                 num = num + parseInt(numnndili);
                 shijuannum = shijuannum + parseInt(numnndili);
+
+                if (diliselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (diliselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (diliselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (diliselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (diliselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnnshengwu = $("input[name='shengwucheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var shengwuselect = $("select[name='shengwuselect'][value_id='" + (i + 1) + "']").val();
             if (numnnshengwu != "") {
                 num = num + parseInt(numnnshengwu);
                 shijuannum = shijuannum + parseInt(numnnshengwu);
+
+                if (shengwuselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (shengwuselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (shengwuselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (shengwuselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (shengwuselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnnsixiang = $("input[name='sixiangpingdecheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var sixiangpingdeselect = $("select[name='sixiangpingdeselect'][value_id='" + (i + 1) + "']").val();
             if (numnnsixiang != "") {
                 num = num + parseInt(numnnsixiang);
                 shijuannum = shijuannum + parseInt(numnnsixiang);
+
+                if (sixiangpingdeselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (sixiangpingdeselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (sixiangpingdeselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (sixiangpingdeselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (sixiangpingdeselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             
             var numnnyuwendatika = $("input[name='yuwendatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnyuwendatika != "") {
                 num = num + parseInt(numnnyuwendatika);
                 datikanum = datikanum + parseInt(numnnyuwendatika);
+
+                datikakshu = datikakshu + 1;
             }
             var numnnshuxuedatika = $("input[name='shuxuedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnshuxuedatika != "") {
                 num = num + parseInt(numnnshuxuedatika);
                 datikanum = datikanum + parseInt(numnnshuxuedatika);
+
+                datikakshu = datikakshu + 1;
             }
 
             var numnnyingyudatika = $("input[name='yingyudatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnyingyudatika != "") {
                 num = num + parseInt(numnnyingyudatika);
                 datikanum = datikanum + parseInt(numnnyingyudatika);
+
+                datikakshu = datikakshu + 1;
             }
             var numnnlishidatika = $("input[name='lishidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var lishidatikahebingcheckbox = $("input[name='lishidatikahebingcheckbox'][value_id='" + (i + 1) + "']").prop('checked');
+            var sixiangpingdedatikahebingcheckbox = $("input[name='sixiangpingdedatikahebingcheckbox'][value_id='" + (i + 1) + "']").prop('checked');
+            
+            
             if (numnnlishidatika != "") {
                 num = num + parseInt(numnnlishidatika);
                 datikanum = datikanum + parseInt(numnnlishidatika);
-            }
-            var numnndilidatika = $("input[name='dilidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
-            if (numnndilidatika != "") {
-                num = num + parseInt(numnndilidatika);
-                datikanum = datikanum + parseInt(numnndilidatika);
-            }
-            var numnnshengwudatika = $("input[name='shengwudatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
-            if (numnnshengwudatika != "") {
-                num = num + parseInt(numnnshengwudatika);
-                datikanum = datikanum + parseInt(numnnshengwudatika);
+                datikakshu = datikakshu + 1;
             }
             var numnnsixiangpingdedatika = $("input[name='sixiangpingdedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnsixiangpingdedatika != "") {
                 num = num + parseInt(numnnsixiangpingdedatika);
                 datikanum = datikanum + parseInt(numnnsixiangpingdedatika);
+
+                if ( lishidatikahebingcheckbox && sixiangpingdedatikahebingcheckbox ) {
+                    
+                } else {
+                    datikakshu = datikakshu + 1;
+                }
             }
+
+
+            var numnndilidatika = $("input[name='dilidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
+
+            var dilidatikahebingcheckbox = $("input[name='dilidatikahebingcheckbox'][value_id='" + (i + 1) + "']").prop('checked');
+            var shengwudatikahebingcheckbox = $("input[name='shengwudatikahebingcheckbox'][value_id='" + (i + 1) + "']").prop('checked');
+
+            if (numnndilidatika != "") {
+                num = num + parseInt(numnndilidatika);
+                datikanum = datikanum + parseInt(numnndilidatika);
+
+                datikakshu = datikakshu + 1;
+            }
+            var numnnshengwudatika = $("input[name='shengwudatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
+            if (numnnshengwudatika != "") {
+                num = num + parseInt(numnnshengwudatika);
+                datikanum = datikanum + parseInt(numnnshengwudatika);
+
+                if (dilidatikahebingcheckbox && shengwudatikahebingcheckbox) {
+
+                } else {
+                    datikakshu = datikakshu + 1;
+                }
+            }
+          
             
             
             
@@ -321,221 +556,601 @@
         else if (Nianji == "鍏勾绾�") {
 
             var numnn = $("input[name='yuwencheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var yuwenselect = $("select[name='yuwenselect'][value_id='" + (i + 1) + "']").val();
             if (numnn != "") {
                 num = num + parseInt(numnn);
                 shijuannum = shijuannum + parseInt(numnn);
+
+                if (yuwenselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (yuwenselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (yuwenselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (yuwenselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (yuwenselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnnshuxue = $("input[name='shuxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var shuxueselect = $("select[name='shuxueselect'][value_id='" + (i + 1) + "']").val();
             if (numnnshuxue != "") {
                 num = num + parseInt(numnnshuxue);
                 shijuannum = shijuannum + parseInt(numnnshuxue);
+
+
+                if (shuxueselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (shuxueselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (shuxueselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (shuxueselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (shuxueselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnnyingyu = $("input[name='yingyucheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var yingyuselect = $("select[name='yingyuselect'][value_id='" + (i + 1) + "']").val();
             if (numnnyingyu != "") {
                 num = num + parseInt(numnnyingyu);
                 shijuannum = shijuannum + parseInt(numnnyingyu);
+
+                if (yingyuselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (yingyuselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (yingyuselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (yingyuselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (yingyuselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
 
             var numnnlishi = $("input[name='lishicheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var lishiselect = $("select[name='lishiselect'][value_id='" + (i + 1) + "']").val();
             if (numnnlishi != "") {
                 num = num + parseInt(numnnlishi);
                 shijuannum = shijuannum + parseInt(numnnlishi);
+
+                if (lishiselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (lishiselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (lishiselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (lishiselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (lishiselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnndili = $("input[name='dilicheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var diliselect = $("select[name='diliselect'][value_id='" + (i + 1) + "']").val();
             if (numnndili != "") {
                 num = num + parseInt(numnndili);
                 shijuannum = shijuannum + parseInt(numnndili);
+
+                if (diliselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (diliselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (diliselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (diliselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (diliselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnnshengwu = $("input[name='shengwucheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var shengwuselect = $("select[name='shengwuselect'][value_id='" + (i + 1) + "']").val();
             if (numnnshengwu != "") {
                 num = num + parseInt(numnnshengwu);
                 shijuannum = shijuannum + parseInt(numnnshengwu);
+
+                if (shengwuselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (shengwuselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (shengwuselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (shengwuselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (shengwuselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnnsixiang = $("input[name='sixiangpingdecheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var sixiangpingdeselect = $("select[name='sixiangpingdeselect'][value_id='" + (i + 1) + "']").val();
             if (numnnsixiang != "") {
                 num = num + parseInt(numnnsixiang);
                 shijuannum = shijuannum + parseInt(numnnsixiang);
+
+                if (sixiangpingdeselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (sixiangpingdeselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (sixiangpingdeselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (sixiangpingdeselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (sixiangpingdeselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
+            
             var numnnwuli = $("input[name='wulicheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var wuliselect = $("select[name='wuliselect'][value_id='" + (i + 1) + "']").val();
             if (numnnwuli != "") {
                 num = num + parseInt(numnnwuli);
                 shijuannum = shijuannum + parseInt(numnnwuli);
+
+                if (wuliselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (wuliselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (wuliselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (wuliselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (wuliselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
+
 
             var numnnyuwendatika = $("input[name='yuwendatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnyuwendatika != "") {
                 num = num + parseInt(numnnyuwendatika);
                 datikanum = datikanum + parseInt(numnnyuwendatika);
+
+                datikakshu = datikakshu + 1;
             }
             var numnnshuxuedatika = $("input[name='shuxuedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnshuxuedatika != "") {
                 num = num + parseInt(numnnshuxuedatika);
                 datikanum = datikanum + parseInt(numnnshuxuedatika);
+
+                datikakshu = datikakshu + 1;
             }
 
             var numnnyingyudatika = $("input[name='yingyudatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnyingyudatika != "") {
                 num = num + parseInt(numnnyingyudatika);
                 datikanum = datikanum + parseInt(numnnyingyudatika);
+
+                datikakshu = datikakshu + 1;
             }
             var numnnlishidatika = $("input[name='lishidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var lishidatikahebingcheckbox = $("input[name='lishidatikahebingcheckbox'][value_id='" + (i + 1) + "']").prop('checked');
+            var sixiangpingdedatikahebingcheckbox = $("input[name='sixiangpingdedatikahebingcheckbox'][value_id='" + (i + 1) + "']").prop('checked');
+
+
             if (numnnlishidatika != "") {
                 num = num + parseInt(numnnlishidatika);
                 datikanum = datikanum + parseInt(numnnlishidatika);
-            }
-            var numnndilidatika = $("input[name='dilidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
-            if (numnndilidatika != "") {
-                num = num + parseInt(numnndilidatika);
-                datikanum = datikanum + parseInt(numnndilidatika);
-            }
-            var numnnshengwudatika = $("input[name='shengwudatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
-            if (numnnshengwudatika != "") {
-                num = num + parseInt(numnnshengwudatika);
-                datikanum = datikanum + parseInt(numnnshengwudatika);
+                datikakshu = datikakshu + 1;
             }
             var numnnsixiangpingdedatika = $("input[name='sixiangpingdedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnsixiangpingdedatika != "") {
                 num = num + parseInt(numnnsixiangpingdedatika);
                 datikanum = datikanum + parseInt(numnnsixiangpingdedatika);
+
+                if (lishidatikahebingcheckbox && sixiangpingdedatikahebingcheckbox) {
+
+                } else {
+                    datikakshu = datikakshu + 1;
+                }
             }
+
+
+            var numnndilidatika = $("input[name='dilidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
+
+            var dilidatikahebingcheckbox = $("input[name='dilidatikahebingcheckbox'][value_id='" + (i + 1) + "']").prop('checked');
+            var shengwudatikahebingcheckbox = $("input[name='shengwudatikahebingcheckbox'][value_id='" + (i + 1) + "']").prop('checked');
+
+            if (numnndilidatika != "") {
+                num = num + parseInt(numnndilidatika);
+                datikanum = datikanum + parseInt(numnndilidatika);
+
+                datikakshu = datikakshu + 1;
+            }
+            var numnnshengwudatika = $("input[name='shengwudatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
+            if (numnnshengwudatika != "") {
+                num = num + parseInt(numnnshengwudatika);
+                datikanum = datikanum + parseInt(numnnshengwudatika);
+
+                if (dilidatikahebingcheckbox && shengwudatikahebingcheckbox) {
+
+                } else {
+                    datikakshu = datikakshu + 1;
+                }
+            }
+
+           
             var numnnwulidatika = $("input[name='wulidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnwulidatika != "") {
                 num = num + parseInt(numnnwulidatika);
                 datikanum = datikanum + parseInt(numnnwulidatika);
+
+                datikakshu = datikakshu + 1;
             }
 
         }
         else if (Nianji == "涔濆勾绾�") {
 
+
             var numnn = $("input[name='yuwencheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var yuwenselect = $("select[name='yuwenselect'][value_id='" + (i + 1) + "']").val();
             if (numnn != "") {
                 num = num + parseInt(numnn);
                 shijuannum = shijuannum + parseInt(numnn);
+
+                if (yuwenselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (yuwenselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (yuwenselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (yuwenselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (yuwenselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnnshuxue = $("input[name='shuxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var shuxueselect = $("select[name='shuxueselect'][value_id='" + (i + 1) + "']").val();
             if (numnnshuxue != "") {
                 num = num + parseInt(numnnshuxue);
                 shijuannum = shijuannum + parseInt(numnnshuxue);
+
+
+                if (shuxueselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (shuxueselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (shuxueselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (shuxueselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (shuxueselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnnyingyu = $("input[name='yingyucheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var yingyuselect = $("select[name='yingyuselect'][value_id='" + (i + 1) + "']").val();
             if (numnnyingyu != "") {
                 num = num + parseInt(numnnyingyu);
                 shijuannum = shijuannum + parseInt(numnnyingyu);
+
+                if (yingyuselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (yingyuselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (yingyuselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (yingyuselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (yingyuselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
 
             var numnnlishi = $("input[name='lishicheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var lishiselect = $("select[name='lishiselect'][value_id='" + (i + 1) + "']").val();
             if (numnnlishi != "") {
                 num = num + parseInt(numnnlishi);
                 shijuannum = shijuannum + parseInt(numnnlishi);
-            }
-            var numnnwuli = $("input[name='wulicheckboxinput'][value_id='" + (i + 1) + "']").val();
-            if (numnnwuli != "") {
-                num = num + parseInt(numnnwuli);
-                shijuannum = shijuannum + parseInt(numnnwuli);
-            }
-            var numnnhuaxue = $("input[name='huaxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
-            if (numnnhuaxue != "") {
-                num = num + parseInt(numnnhuaxue);
-                shijuannum = shijuannum + parseInt(numnnhuaxue);
+
+                if (lishiselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (lishiselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (lishiselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (lishiselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (lishiselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             
             var numnnsixiang = $("input[name='sixiangpingdecheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var sixiangpingdeselect = $("select[name='sixiangpingdeselect'][value_id='" + (i + 1) + "']").val();
             if (numnnsixiang != "") {
                 num = num + parseInt(numnnsixiang);
                 shijuannum = shijuannum + parseInt(numnnsixiang);
+
+                if (sixiangpingdeselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (sixiangpingdeselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (sixiangpingdeselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (sixiangpingdeselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (sixiangpingdeselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
-          
+
+            var numnnwuli = $("input[name='wulicheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var wuliselect = $("select[name='wuliselect'][value_id='" + (i + 1) + "']").val();
+            if (numnnwuli != "") {
+                num = num + parseInt(numnnwuli);
+                shijuannum = shijuannum + parseInt(numnnwuli);
+
+                if (wuliselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (wuliselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (wuliselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (wuliselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (wuliselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
+            }
+
+            var numnnhuaxue = $("input[name='huaxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var huaxueselect = $("select[name='huaxueselect'][value_id='" + (i + 1) + "']").val();
+            if (numnnhuaxue != "") {
+                num = num + parseInt(numnnhuaxue);
+                shijuannum = shijuannum + parseInt(numnnhuaxue);
+
+                if (huaxueselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (huaxueselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (huaxueselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (huaxueselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (huaxueselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
+            }
+            
+            
 
             var numnnyuwendatika = $("input[name='yuwendatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnyuwendatika != "") {
                 num = num + parseInt(numnnyuwendatika);
                 datikanum = datikanum + parseInt(numnnyuwendatika);
+
+                datikakshu = datikakshu + 1;
             }
             var numnnshuxuedatika = $("input[name='shuxuedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnshuxuedatika != "") {
                 num = num + parseInt(numnnshuxuedatika);
                 datikanum = datikanum + parseInt(numnnshuxuedatika);
+
+                datikakshu = datikakshu + 1;
             }
 
             var numnnyingyudatika = $("input[name='yingyudatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnyingyudatika != "") {
                 num = num + parseInt(numnnyingyudatika);
                 datikanum = datikanum + parseInt(numnnyingyudatika);
+
+                datikakshu = datikakshu + 1;
             }
             var numnnlishidatika = $("input[name='lishidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var lishidatikahebingcheckbox = $("input[name='lishidatikahebingcheckbox'][value_id='" + (i + 1) + "']").prop('checked');
+            var sixiangpingdedatikahebingcheckbox = $("input[name='sixiangpingdedatikahebingcheckbox'][value_id='" + (i + 1) + "']").prop('checked');
+
+
             if (numnnlishidatika != "") {
                 num = num + parseInt(numnnlishidatika);
                 datikanum = datikanum + parseInt(numnnlishidatika);
+                datikakshu = datikakshu + 1;
             }
+            var numnnsixiangpingdedatika = $("input[name='sixiangpingdedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
+            if (numnnsixiangpingdedatika != "") {
+                num = num + parseInt(numnnsixiangpingdedatika);
+                datikanum = datikanum + parseInt(numnnsixiangpingdedatika);
+
+                if (lishidatikahebingcheckbox && sixiangpingdedatikahebingcheckbox) {
+
+                } else {
+                    datikakshu = datikakshu + 1;
+                }
+            }
+
+
+           
+
 
             var numnnwulidatika = $("input[name='wulidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnwulidatika != "") {
                 num = num + parseInt(numnnwulidatika);
                 datikanum = datikanum + parseInt(numnnwulidatika);
+
+                datikakshu = datikakshu + 1;
             }
 
             var numnnhuaxuedatika = $("input[name='huaxuedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnhuaxuedatika != "") {
                 num = num + parseInt(numnnhuaxuedatika);
                 datikanum = datikanum + parseInt(numnnhuaxuedatika);
+
+                datikakshu = datikakshu + 1;
             }
-            var numnnsixiangpingdedatika = $("input[name='sixiangpingdedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
-            if (numnnsixiangpingdedatika != "") {
-                num = num + parseInt(numnnsixiangpingdedatika);
-                datikanum = datikanum + parseInt(numnnsixiangpingdedatika);
-            }
-             
+           
            
            
         }
         else if (Nianji == "楂樹竴") {
 
             var numnn = $("input[name='yuwencheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var yuwenselect = $("select[name='yuwenselect'][value_id='" + (i + 1) + "']").val();
             if (numnn != "") {
                 num = num + parseInt(numnn);
                 shijuannum = shijuannum + parseInt(numnn);
+
+                if (yuwenselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (yuwenselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (yuwenselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (yuwenselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (yuwenselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnnshuxue = $("input[name='shuxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var shuxueselect = $("select[name='shuxueselect'][value_id='" + (i + 1) + "']").val();
             if (numnnshuxue != "") {
                 num = num + parseInt(numnnshuxue);
                 shijuannum = shijuannum + parseInt(numnnshuxue);
+
+                if (shuxueselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (shuxueselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (shuxueselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (shuxueselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (shuxueselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnnyingyu = $("input[name='yingyucheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var yingyuselect = $("select[name='yingyuselect'][value_id='" + (i + 1) + "']").val();
             if (numnnyingyu != "") {
                 num = num + parseInt(numnnyingyu);
                 shijuannum = shijuannum + parseInt(numnnyingyu);
+
+                if (yingyuselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (yingyuselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (yingyuselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (yingyuselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (yingyuselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
 
             var numnnlishi = $("input[name='lishicheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var lishiselect = $("select[name='lishiselect'][value_id='" + (i + 1) + "']").val();
             if (numnnlishi != "") {
                 num = num + parseInt(numnnlishi);
                 shijuannum = shijuannum + parseInt(numnnlishi);
+
+                if (lishiselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (lishiselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (lishiselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (lishiselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (lishiselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnndili = $("input[name='dilicheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var diliselect = $("select[name='diliselect'][value_id='" + (i + 1) + "']").val();
             if (numnndili != "") {
                 num = num + parseInt(numnndili);
                 shijuannum = shijuannum + parseInt(numnndili);
+
+                if (diliselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (diliselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (diliselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (diliselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (diliselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnnwuli = $("input[name='wulicheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var wuliselect = $("select[name='wuliselect'][value_id='" + (i + 1) + "']").val();
             if (numnnwuli != "") {
                 num = num + parseInt(numnnwuli);
                 shijuannum = shijuannum + parseInt(numnnwuli);
+
+                if (wuliselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (wuliselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (wuliselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (wuliselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (wuliselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnnhuaxue = $("input[name='huaxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var huaxueselect = $("select[name='huaxueselect'][value_id='" + (i + 1) + "']").val();
             if (numnnhuaxue != "") {
                 num = num + parseInt(numnnhuaxue);
                 shijuannum = shijuannum + parseInt(numnnhuaxue);
+
+                if (huaxueselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (huaxueselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (huaxueselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (huaxueselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (huaxueselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
 
             var numnnzhengzhi = $("input[name='zhengzhicheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var zhengzhiselect = $("select[name='zhengzhiselect'][value_id='" + (i + 1) + "']").val();
             if (numnnzhengzhi != "") {
                 num = num + parseInt(numnnzhengzhi);
                 shijuannum = shijuannum + parseInt(numnnzhengzhi);
+
+                if (zhengzhiselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (zhengzhiselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (zhengzhiselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (zhengzhiselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (zhengzhiselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnnshengwu = $("input[name='shengwucheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var shengwuselect = $("select[name='shengwuselect'][value_id='" + (i + 1) + "']").val();
             if (numnnshengwu != "") {
                 num = num + parseInt(numnnshengwu);
                 shijuannum = shijuannum + parseInt(numnnshengwu);
+
+                if (shengwuselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (shengwuselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (shengwuselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (shengwuselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (shengwuselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
 
 
@@ -543,99 +1158,234 @@
             if (numnnyuwendatika != "") {
                 num = num + parseInt(numnnyuwendatika);
                 datikanum = datikanum + parseInt(numnnyuwendatika);
+
+                datikakshu = datikakshu + 1;
             }
             var numnnshuxuedatika = $("input[name='shuxuedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnshuxuedatika != "") {
                 num = num + parseInt(numnnshuxuedatika);
                 datikanum = datikanum + parseInt(numnnshuxuedatika);
+
+                datikakshu = datikakshu + 1;
             }
 
             var numnnyingyudatika = $("input[name='yingyudatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnyingyudatika != "") {
                 num = num + parseInt(numnnyingyudatika);
                 datikanum = datikanum + parseInt(numnnyingyudatika);
+
+                datikakshu = datikakshu + 1;
             }
             var numnnlishidatika = $("input[name='lishidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnlishidatika != "") {
                 num = num + parseInt(numnnlishidatika);
                 datikanum = datikanum + parseInt(numnnlishidatika);
+
+                datikakshu = datikakshu + 1;
             }
             var numnndilidatika = $("input[name='dilidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnndilidatika != "") {
                 num = num + parseInt(numnndilidatika);
                 datikanum = datikanum + parseInt(numnndilidatika);
+
+                datikakshu = datikakshu + 1;
             }
             var numnnwulidatika = $("input[name='wulidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnwulidatika != "") {
                 num = num + parseInt(numnnwulidatika);
                 datikanum = datikanum + parseInt(numnnwulidatika);
+
+                datikakshu = datikakshu + 1;
             }
 
             var numnnhuaxuedatika = $("input[name='huaxuedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnhuaxuedatika != "") {
                 num = num + parseInt(numnnhuaxuedatika);
                 datikanum = datikanum + parseInt(numnnhuaxuedatika);
+
+                datikakshu = datikakshu + 1;
             }
             var numnnzhengzhidatika = $("input[name='zhengzhidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnzhengzhidatika != "") {
                 num = num + parseInt(numnnzhengzhidatika);
                 datikanum = datikanum + parseInt(numnnzhengzhidatika);
+
+                datikakshu = datikakshu + 1;
             }
             var numnnshengwudatika = $("input[name='shengwudatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnshengwudatika != "") {
                 num = num + parseInt(numnnshengwudatika);
                 datikanum = datikanum + parseInt(numnnshengwudatika);
+
+                datikakshu = datikakshu + 1;
             }
         }
         else if (Nianji == "楂樹簩" || Nianji == "楂樹笁") {
 
 
             var numnn = $("input[name='yuwencheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var yuwenselect = $("select[name='yuwenselect'][value_id='" + (i + 1) + "']").val();
             if (numnn != "") {
                 num = num + parseInt(numnn);
                 shijuannum = shijuannum + parseInt(numnn);
+
+                if (yuwenselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (yuwenselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (yuwenselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (yuwenselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (yuwenselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnnshuxue = $("input[name='shuxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var shuxueselect = $("select[name='shuxueselect'][value_id='" + (i + 1) + "']").val();
             if (numnnshuxue != "") {
                 num = num + parseInt(numnnshuxue);
                 shijuannum = shijuannum + parseInt(numnnshuxue);
+
+                if (shuxueselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (shuxueselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (shuxueselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (shuxueselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (shuxueselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnnyingyu = $("input[name='yingyucheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var yingyuselect = $("select[name='yingyuselect'][value_id='" + (i + 1) + "']").val();
             if (numnnyingyu != "") {
                 num = num + parseInt(numnnyingyu);
                 shijuannum = shijuannum + parseInt(numnnyingyu);
+
+                if (yingyuselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (yingyuselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (yingyuselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (yingyuselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (yingyuselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
 
             var numnnlishi = $("input[name='lishicheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var lishiselect = $("select[name='lishiselect'][value_id='" + (i + 1) + "']").val();
             if (numnnlishi != "") {
                 num = num + parseInt(numnnlishi);
                 shijuannum = shijuannum + parseInt(numnnlishi);
+
+                if (lishiselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (lishiselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (lishiselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (lishiselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (lishiselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnndili = $("input[name='dilicheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var diliselect = $("select[name='diliselect'][value_id='" + (i + 1) + "']").val();
             if (numnndili != "") {
                 num = num + parseInt(numnndili);
                 shijuannum = shijuannum + parseInt(numnndili);
-            }
-            var numnnshengwu = $("input[name='shengwucheckboxinput'][value_id='" + (i + 1) + "']").val();
-            if (numnnshengwu != "") {
-                num = num + parseInt(numnnshengwu);
-                shijuannum = shijuannum + parseInt(numnnshengwu);
+
+                if (diliselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (diliselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (diliselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (diliselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (diliselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnnwuli = $("input[name='wulicheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var wuliselect = $("select[name='wuliselect'][value_id='" + (i + 1) + "']").val();
             if (numnnwuli != "") {
                 num = num + parseInt(numnnwuli);
                 shijuannum = shijuannum + parseInt(numnnwuli);
+
+                if (wuliselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (wuliselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (wuliselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (wuliselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (wuliselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
             var numnnhuaxue = $("input[name='huaxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var huaxueselect = $("select[name='huaxueselect'][value_id='" + (i + 1) + "']").val();
             if (numnnhuaxue != "") {
                 num = num + parseInt(numnnhuaxue);
                 shijuannum = shijuannum + parseInt(numnnhuaxue);
+
+                if (huaxueselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (huaxueselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (huaxueselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (huaxueselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (huaxueselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
 
             var numnnzhengzhi = $("input[name='zhengzhicheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var zhengzhiselect = $("select[name='zhengzhiselect'][value_id='" + (i + 1) + "']").val();
             if (numnnzhengzhi != "") {
                 num = num + parseInt(numnnzhengzhi);
                 shijuannum = shijuannum + parseInt(numnnzhengzhi);
+
+                if (zhengzhiselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (zhengzhiselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (zhengzhiselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (zhengzhiselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (zhengzhiselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
+            }
+            var numnnshengwu = $("input[name='shengwucheckboxinput'][value_id='" + (i + 1) + "']").val();
+            var shengwuselect = $("select[name='shengwuselect'][value_id='" + (i + 1) + "']").val();
+            if (numnnshengwu != "") {
+                num = num + parseInt(numnnshengwu);
+                shijuannum = shijuannum + parseInt(numnnshengwu);
+
+                if (shengwuselect == "4P") {
+                    shijuanpshu = shijuanpshu + 4;
+                } else if (shengwuselect == "6P") {
+                    shijuanpshu = shijuanpshu + 6;
+                } else if (shengwuselect == "8P") {
+                    shijuanpshu = shijuanpshu + 8;
+                } else if (shengwuselect == "6+4P") {
+                    shijuanpshu = shijuanpshu + 10;
+                } else if (shengwuselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                }
             }
 
 
@@ -643,48 +1393,66 @@
             if (numnnyuwendatika != "") {
                 num = num + parseInt(numnnyuwendatika);
                 datikanum = datikanum + parseInt(numnnyuwendatika);
+
+                datikakshu = datikakshu + 1;
             }
             var numnnshuxuedatika = $("input[name='shuxuedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnshuxuedatika != "") {
                 num = num + parseInt(numnnshuxuedatika);
                 datikanum = datikanum + parseInt(numnnshuxuedatika);
+
+                datikakshu = datikakshu + 1;
             }
 
             var numnnyingyudatika = $("input[name='yingyudatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnyingyudatika != "") {
                 num = num + parseInt(numnnyingyudatika);
                 datikanum = datikanum + parseInt(numnnyingyudatika);
+
+                datikakshu = datikakshu + 1;
             }
             var numnnlishidatika = $("input[name='lishidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnlishidatika != "") {
                 num = num + parseInt(numnnlishidatika);
                 datikanum = datikanum + parseInt(numnnlishidatika);
+
+                datikakshu = datikakshu + 1;
             }
             var numnndilidatika = $("input[name='dilidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnndilidatika != "") {
                 num = num + parseInt(numnndilidatika);
                 datikanum = datikanum + parseInt(numnndilidatika);
-            }
-            var numnnshengwudatika = $("input[name='shengwudatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
-            if (numnnshengwudatika != "") {
-                num = num + parseInt(numnnshengwudatika);
-                datikanum = datikanum + parseInt(numnnshengwudatika);
+
+                datikakshu = datikakshu + 1;
             }
             var numnnwulidatika = $("input[name='wulidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnwulidatika != "") {
                 num = num + parseInt(numnnwulidatika);
                 datikanum = datikanum + parseInt(numnnwulidatika);
+
+                datikakshu = datikakshu + 1;
             }
 
             var numnnhuaxuedatika = $("input[name='huaxuedatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnhuaxuedatika != "") {
                 num = num + parseInt(numnnhuaxuedatika);
                 datikanum = datikanum + parseInt(numnnhuaxuedatika);
+
+                datikakshu = datikakshu + 1;
             }
             var numnnzhengzhidatika = $("input[name='zhengzhidatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
             if (numnnzhengzhidatika != "") {
                 num = num + parseInt(numnnzhengzhidatika);
                 datikanum = datikanum + parseInt(numnnzhengzhidatika);
+
+                datikakshu = datikakshu + 1;
+            }
+            var numnnshengwudatika = $("input[name='shengwudatikacheckboxinput'][value_id='" + (i + 1) + "']").val();
+            if (numnnshengwudatika != "") {
+                num = num + parseInt(numnnshengwudatika);
+                datikanum = datikanum + parseInt(numnnshengwudatika);
+
+                datikakshu = datikakshu + 1;
             }
 
         }
@@ -704,6 +1472,9 @@
     $("#printCount").val(num);
     $("#ShijuanprintCount").val(shijuannum);
     $("#DatikaprintCount").val(datikanum);
+
+  
+
     var zj = $("#txtSumPrice").val();
     if (zj != "") {
         if (num == 0) {
@@ -713,7 +1484,14 @@
         }
        
     }
-    
+
+    if ($('#txtShejileixingName38').length > 0) {
+        $("#txtShejileixingName38").val(shijuanpshu);
+
+        $("#txtShejileixingNameneiye38").val(datikakshu);
+    }
+
+   
    
 }
 
@@ -2380,7 +3158,18 @@
                 $("select[name='zhengzhidatikaselect']").last().val(insideArry[i].zhengzhidatikaselect);
                 $("input[name='zhengzhidatikacheckboxinput']").last().val(insideArry[i].zhengzhidatikacheckboxinput);
 
-
+                if (insideArry[i].dilidatikahebingcheckbox != "") {
+                    $("input[name='dilidatikahebingcheckbox']").last().prop('checked', true);
+                }
+                if (insideArry[i].lishidatikahebingcheckbox != "") {
+                    $("input[name='lishidatikahebingcheckbox']").last().prop('checked', true);
+                }
+                if (insideArry[i].shengwudatikahebingcheckbox != "") {
+                    $("input[name='shengwudatikahebingcheckbox']").last().prop('checked', true);
+                }
+                if (insideArry[i].sixiangpingdedatikahebingcheckbox != "") {
+                    $("input[name='sixiangpingdedatikahebingcheckbox']").last().prop('checked', true);
+                }
                     
                
                 changgeNianji($("select[name='selNianji']").last());

--
Gitblit v1.9.1