bugfix

src/main/webapp/WEB-INF/views/modules/product-new/productEdit.jsp

@@ -1161,6 +1161,7 @@
         $("#inputForm").validate({
             ignore: "",
             submitHandler: function (form) {
+                event.preventDefault()
                 var flag = true;
                 var shopId = $("#shopId").val()*1;
                 var commodityType = $("input[name='commodityType']:checked").val();
@@ -1175,7 +1176,8 @@
                 }
                 var costCheckFlag = $("input[name='costCheckFlag']:checked").val();
                 var skus = $("#skus .sku")
-                skus.each(function() {
+                if (skus.length > 0) {
+                    skus.each(function() {
                     var cost = $(this)
                     if (costCheckFlag * 1 === 1) {
                         var costPrice = cost.find(".costPrice").val()
@@ -1197,12 +1199,12 @@
                         const num = costPrice*1 + organizeCostPrice*1 + cmCostPrice*1
                         if (shopId != 1161 ) {
                             if (num != price) {
-                                alertx("采美国定成本和需为机构价")
+                                alertx("采美固定成本之和需为机构价")
                                 flag = false;
                             }
                         }else {
                             if (num > price) {
-                                alertx("采美国定成本和不能大于机构价")
+                                alertx("采美固定成本之和不能大于机构价")
                                 flag = false;
                             }
                         }
@@ -1225,20 +1227,22 @@
                         const num = shopPercent*1 + organizePercent*1 + cmPercent*1
                         if (shopId != 1161 ) {
                             if (num != 100) {
-                                alertx("采美佣金比例和需为100")
+                                alertx("采美佣金比例之和需为100")
                                 flag = false;
                             }
                         }else {
                             if (num > 100) {
-                                alertx("采美佣金比例和不能大于100")
+                                alertx("采美佣金比例之和不能大于100")
                                 flag = false;
                             }
                         }
                     }
                 })
+                }
                 var mallCostCheckFlag = $("input[name='mallCostCheckFlag']:checked").val();
-                var mallSkus = $("#mallSkus")
-                mallSkus.each(function() {
+                var mallSkus = $("#mallSkus .sku")
+                if (mallSkus.length > 0) {
+                    mallSkus.each(function() {
                     var mallCost = $(this)
                     if (mallCostCheckFlag * 1 === 1) {
                         var mallCostPrice = mallCost.find(".costPrice").val()
@@ -1260,12 +1264,12 @@
                         const num = mallCostPrice*1 + mallOrganizeCostPrice*1 + mallCmCostPrice*1
                         if (shopId != 1161 ) {
                             if (num != mallprice) {
-                                alertx("丽格国定成本和需为机构价");
+                                alertx("丽格固定成本之和需为机构价");
                                 flag = false;
                             }
                         } else {
                             if (num > mallprice) {
-                                alertx("丽格国定成本和不能大于机构价")
+                                alertx("丽格固定成本之和不能大于机构价")
                                 flag = false;
                             }
                         }
@@ -1285,20 +1289,21 @@
                             alertx("请输入供应商比例");
                             flag = false;
                         }
-                        const num = mallShopPercent*1 + mallOrganizePercent*1 + cmPercent*1
+                        const num = mallShopPercent*1 + mallOrganizePercent*1 + mallCmPercent*1
                         if (shopId != 1161 ) {
                             if (num != 100) {
-                                alertx("丽格佣金比例和需为100");
+                                alertx("丽格佣金比例之和需为100");
                                 flag = false;
                             }
                         } else {
                             if (num > 100) {
-                                alertx("丽格佣金比例和不能大于100")
+                                alertx("丽格佣金比例之和不能大于100")
                                 flag = false;
                             }
                         }
                     }
                 })
+                }
                 if ($('#minBuyNumber:visible').length > 0) {
                     var minBuyNumber = $('#minBuyNumber').val();
                     if (minBuyNumber <= 0 || minBuyNumber == '') {