From 49b37bdd9089c17cb816d9a3b92134052a5a2e15 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 13 三月 2026 08:44:55 +0800
Subject: [PATCH] 20260312  所有要品牌选择界面的订单类型的“品牌”都删除 20260312 合版工单删除包装要求,后道及工艺要求不要尺寸

---
 CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js |  104 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 102 insertions(+), 2 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
index 1acba45..1b9df7a 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
@@ -219,6 +219,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (yuwenselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (yuwenselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
             var numnnshuxue = $("input[name='shuxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
@@ -235,6 +237,8 @@
                 } else if (shuxueselect == "6+4P") {
                     shijuanpshu = shijuanpshu + 10;
                 } else if (shuxueselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                } else if (shuxueselect == "8+4P") {
                     shijuanpshu = shijuanpshu + 12;
                 }
             }
@@ -253,6 +257,8 @@
                 } else if (pingdeselect == "6+4P") {
                     shijuanpshu = shijuanpshu + 10;
                 } else if (pingdeselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                } else if (pingdeselect == "8+4P") {
                     shijuanpshu = shijuanpshu + 12;
                 }
             }
@@ -274,6 +280,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (yuwenselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (yuwenselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
             var numnnshuxue = $("input[name='shuxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
@@ -291,6 +299,8 @@
                 } else if (shuxueselect == "6+4P") {
                     shijuanpshu = shijuanpshu + 10;
                 } else if (shuxueselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                } else if (shuxueselect == "8+4P") {
                     shijuanpshu = shijuanpshu + 12;
                 }
             }
@@ -310,6 +320,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (yingyuselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (yingyuselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
             var numnnpingde = $("input[name='pingdecheckboxinput'][value_id='" + (i + 1) + "']").val();
@@ -327,6 +339,8 @@
                 } else if (pingdeselect == "6+4P") {
                     shijuanpshu = shijuanpshu + 10;
                 } else if (pingdeselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                } else if (pingdeselect == "8+4P") {
                     shijuanpshu = shijuanpshu + 12;
                 }
             }
@@ -348,6 +362,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (kexueselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (kexueselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
         }
@@ -368,6 +384,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (yuwenselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (yuwenselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
             var numnnshuxue = $("input[name='shuxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
@@ -387,6 +405,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (shuxueselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (shuxueselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
             var numnnyingyu = $("input[name='yingyucheckboxinput'][value_id='" + (i + 1) + "']").val();
@@ -404,6 +424,8 @@
                 } else if (yingyuselect == "6+4P") {
                     shijuanpshu = shijuanpshu + 10;
                 } else if (yingyuselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                } else if (yingyuselect == "8+4P") {
                     shijuanpshu = shijuanpshu + 12;
                 }
             }
@@ -424,6 +446,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (lishiselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (lishiselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
             var numnndili = $("input[name='dilicheckboxinput'][value_id='" + (i + 1) + "']").val();
@@ -441,6 +465,8 @@
                 } else if (diliselect == "6+4P") {
                     shijuanpshu = shijuanpshu + 10;
                 } else if (diliselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                } else if (diliselect == "8+4P") {
                     shijuanpshu = shijuanpshu + 12;
                 }
             }
@@ -460,6 +486,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (shengwuselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (shengwuselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
             var numnnsixiang = $("input[name='sixiangpingdecheckboxinput'][value_id='" + (i + 1) + "']").val();
@@ -477,6 +505,8 @@
                 } else if (sixiangpingdeselect == "6+4P") {
                     shijuanpshu = shijuanpshu + 10;
                 } else if (sixiangpingdeselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                } else if (sixiangpingdeselect == "8+4P") {
                     shijuanpshu = shijuanpshu + 12;
                 }
             }
@@ -571,6 +601,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (yuwenselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (yuwenselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
             var numnnshuxue = $("input[name='shuxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
@@ -590,6 +622,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (shuxueselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (shuxueselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
             var numnnyingyu = $("input[name='yingyucheckboxinput'][value_id='" + (i + 1) + "']").val();
@@ -607,6 +641,8 @@
                 } else if (yingyuselect == "6+4P") {
                     shijuanpshu = shijuanpshu + 10;
                 } else if (yingyuselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                } else if (yingyuselect == "8+4P") {
                     shijuanpshu = shijuanpshu + 12;
                 }
             }
@@ -627,6 +663,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (lishiselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (lishiselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
             var numnndili = $("input[name='dilicheckboxinput'][value_id='" + (i + 1) + "']").val();
@@ -644,6 +682,8 @@
                 } else if (diliselect == "6+4P") {
                     shijuanpshu = shijuanpshu + 10;
                 } else if (diliselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                } else if (diliselect == "8+4P") {
                     shijuanpshu = shijuanpshu + 12;
                 }
             }
@@ -663,6 +703,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (shengwuselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (shengwuselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
             var numnnsixiang = $("input[name='sixiangpingdecheckboxinput'][value_id='" + (i + 1) + "']").val();
@@ -680,6 +722,8 @@
                 } else if (sixiangpingdeselect == "6+4P") {
                     shijuanpshu = shijuanpshu + 10;
                 } else if (sixiangpingdeselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                } else if (sixiangpingdeselect == "8+4P") {
                     shijuanpshu = shijuanpshu + 12;
                 }
             }
@@ -699,6 +743,8 @@
                 } else if (wuliselect == "6+4P") {
                     shijuanpshu = shijuanpshu + 10;
                 } else if (wuliselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                } else if (wuliselect == "8+4P") {
                     shijuanpshu = shijuanpshu + 12;
                 }
             }
@@ -801,6 +847,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (yuwenselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (yuwenselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
             var numnnshuxue = $("input[name='shuxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
@@ -820,6 +868,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (shuxueselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (shuxueselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
             var numnnyingyu = $("input[name='yingyucheckboxinput'][value_id='" + (i + 1) + "']").val();
@@ -837,6 +887,8 @@
                 } else if (yingyuselect == "6+4P") {
                     shijuanpshu = shijuanpshu + 10;
                 } else if (yingyuselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                } else if (yingyuselect == "8+4P") {
                     shijuanpshu = shijuanpshu + 12;
                 }
             }
@@ -857,6 +909,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (lishiselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (lishiselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
             
@@ -875,6 +929,8 @@
                 } else if (sixiangpingdeselect == "6+4P") {
                     shijuanpshu = shijuanpshu + 10;
                 } else if (sixiangpingdeselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                } else if (sixiangpingdeselect == "8+4P") {
                     shijuanpshu = shijuanpshu + 12;
                 }
             }
@@ -895,6 +951,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (wuliselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (wuliselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
 
@@ -913,6 +971,8 @@
                 } else if (huaxueselect == "6+4P") {
                     shijuanpshu = shijuanpshu + 10;
                 } else if (huaxueselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                } else if (huaxueselect == "8+4P") {
                     shijuanpshu = shijuanpshu + 12;
                 }
             }
@@ -1004,6 +1064,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (yuwenselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (yuwenselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
             var numnnshuxue = $("input[name='shuxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
@@ -1022,6 +1084,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (shuxueselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (shuxueselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
             var numnnyingyu = $("input[name='yingyucheckboxinput'][value_id='" + (i + 1) + "']").val();
@@ -1039,6 +1103,8 @@
                 } else if (yingyuselect == "6+4P") {
                     shijuanpshu = shijuanpshu + 10;
                 } else if (yingyuselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                } else if (yingyuselect == "8+4P") {
                     shijuanpshu = shijuanpshu + 12;
                 }
             }
@@ -1059,6 +1125,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (lishiselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (lishiselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
             var numnndili = $("input[name='dilicheckboxinput'][value_id='" + (i + 1) + "']").val();
@@ -1076,6 +1144,8 @@
                 } else if (diliselect == "6+4P") {
                     shijuanpshu = shijuanpshu + 10;
                 } else if (diliselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                } else if (diliselect == "8+4P") {
                     shijuanpshu = shijuanpshu + 12;
                 }
             }
@@ -1095,6 +1165,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (wuliselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (wuliselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
             var numnnhuaxue = $("input[name='huaxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
@@ -1112,6 +1184,8 @@
                 } else if (huaxueselect == "6+4P") {
                     shijuanpshu = shijuanpshu + 10;
                 } else if (huaxueselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                } else if (huaxueselect == "8+4P") {
                     shijuanpshu = shijuanpshu + 12;
                 }
             }
@@ -1132,6 +1206,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (zhengzhiselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (zhengzhiselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
             var numnnshengwu = $("input[name='shengwucheckboxinput'][value_id='" + (i + 1) + "']").val();
@@ -1149,6 +1225,8 @@
                 } else if (shengwuselect == "6+4P") {
                     shijuanpshu = shijuanpshu + 10;
                 } else if (shengwuselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                } else if (shengwuselect == "8+4P") {
                     shijuanpshu = shijuanpshu + 12;
                 }
             }
@@ -1239,6 +1317,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (yuwenselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (yuwenselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
             var numnnshuxue = $("input[name='shuxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
@@ -1257,6 +1337,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (shuxueselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (shuxueselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
             var numnnyingyu = $("input[name='yingyucheckboxinput'][value_id='" + (i + 1) + "']").val();
@@ -1274,6 +1356,8 @@
                 } else if (yingyuselect == "6+4P") {
                     shijuanpshu = shijuanpshu + 10;
                 } else if (yingyuselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                } else if (yingyuselect == "8+4P") {
                     shijuanpshu = shijuanpshu + 12;
                 }
             }
@@ -1294,6 +1378,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (lishiselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (lishiselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
             var numnndili = $("input[name='dilicheckboxinput'][value_id='" + (i + 1) + "']").val();
@@ -1311,6 +1397,8 @@
                 } else if (diliselect == "6+4P") {
                     shijuanpshu = shijuanpshu + 10;
                 } else if (diliselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                } else if (diliselect == "8+4P") {
                     shijuanpshu = shijuanpshu + 12;
                 }
             }
@@ -1330,6 +1418,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (wuliselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (wuliselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
             var numnnhuaxue = $("input[name='huaxuecheckboxinput'][value_id='" + (i + 1) + "']").val();
@@ -1347,6 +1437,8 @@
                 } else if (huaxueselect == "6+4P") {
                     shijuanpshu = shijuanpshu + 10;
                 } else if (huaxueselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                } else if (huaxueselect == "8+4P") {
                     shijuanpshu = shijuanpshu + 12;
                 }
             }
@@ -1367,6 +1459,8 @@
                     shijuanpshu = shijuanpshu + 10;
                 } else if (zhengzhiselect == "6+6P") {
                     shijuanpshu = shijuanpshu + 12;
+                } else if (zhengzhiselect == "8+4P") {
+                    shijuanpshu = shijuanpshu + 12;
                 }
             }
             var numnnshengwu = $("input[name='shengwucheckboxinput'][value_id='" + (i + 1) + "']").val();
@@ -1384,6 +1478,8 @@
                 } else if (shengwuselect == "6+4P") {
                     shijuanpshu = shijuanpshu + 10;
                 } else if (shengwuselect == "6+6P") {
+                    shijuanpshu = shijuanpshu + 12;
+                } else if (shengwuselect == "8+4P") {
                     shijuanpshu = shijuanpshu + 12;
                 }
             }
@@ -2508,6 +2604,7 @@
         }
     }
     else {
+        $(".Brand" + index).hide();
         if (paperId == "0") {
             $(".Brand" + index).hide();
             $(".gramWeight" + index).hide();
@@ -2518,7 +2615,7 @@
             $(".Qitazhi" + index).show();
         }
         else {
-            $(".Brand" + index).show();
+            //$(".Brand" + index).show();
             $(".gramWeight" + index).show();
             $(".Qitazhi" + index).hide();
             if (printTypeId == 27) {
@@ -3008,7 +3105,10 @@
         }
     }
 
-
+    //鎶ョ焊
+    if (printTypeId == 7) {
+        $("[name='printColor1']").val(dataJson.printColor1);
+    }
     //浣滀笟鏈�
     if (printTypeId == 37) {
         var insideArry = dataJson.InquiryWorkBookList;

--
Gitblit v1.9.1