diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java index c507751..84720af 100644 --- a/src/main/java/lingtao/net/service/ProductService.java +++ b/src/main/java/lingtao/net/service/ProductService.java @@ -6851,7 +6851,7 @@ public class ProductService { } if (craftList.contains("打孔")) { for (Product product : priceList) { - product.setPrice(Math.ceil(product.getPrice() + (0.03 * product.getCount() > 30 ? 0.03 * product.getCount() : 30))); + product.setPrice(Math.ceil(product.getPrice() + (0.03 * product.getCount() > 20 ? 0.03 * product.getCount() : 20))); } } if (!"特种纸名片".equals(dto.getProTypeValue()) && craftList.contains("单面烫金")) { diff --git a/src/main/webapp/views/product/specialCard2.jsp b/src/main/webapp/views/product/specialCard2.jsp index be5c46c..8e45ffd 100644 --- a/src/main/webapp/views/product/specialCard2.jsp +++ b/src/main/webapp/views/product/specialCard2.jsp @@ -506,6 +506,16 @@ }) form.on("checkbox(mianka)", function (data) { let craft_list = []; + let size = $(".sizeSpecialCard").val(); + let kindValueSelect = $(".kindValueSelect option:checked").text(); + if (kindValueSelect != "500克拉丝闪银卡" && kindValueSelect != "500克拉丝闪金卡" && kindValueSelect != '素芸') { + + } else { + size = $("input[name='ls_size']").val(); + } + if (kindValueSelect == '素芸') { + size = $("input[name='size']").val(); + } $("input[name='craft']:checked").each(function () { if (!$(this).is(':disabled')) { craft_list.push($(this).val()); @@ -549,11 +559,13 @@ return false; } if (craft_list.indexOf("打码") > -1 && craft_list.indexOf("异形模切") > -1) { - $(data.elem).next().attr("class", "layui-unselect layui-form-checkbox"); - $(data.elem).prop("checked", false); - layer.msg("打码 - 异形模切不能同时选择", {offset: ['300px', '300px']}, function () { - }); - return false; + if ((size.split("*")[0] < 9 || size.split("*")[1] < 5.4) || (size.split("*")[0] < 5.4 || size.split("*")[1] < 9)) { + $(data.elem).next().attr("class", "layui-unselect layui-form-checkbox"); + $(data.elem).prop("checked", false); + layer.msg("打码 - 异形模切不能同时选择", {offset: ['300px', '300px']}, function () { + }); + return false; + } } if (craft_list.indexOf("击凸") > -1 || craft_list.indexOf("压凹") > -1) { @@ -600,6 +612,22 @@ // $('.niupikaNoMQCraft').removeAttr('disabled'); // } // } + let size = $(".sizeSpecialCard").val(); + let kindValueSelect = $(".kindValueSelect option:checked").text(); + if (kindValueSelect != "500克拉丝闪银卡" && kindValueSelect != "500克拉丝闪金卡" && kindValueSelect != '素芸') { + + } else { + size = $("input[name='ls_size']").val(); + } + if (kindValueSelect == '素芸') { + size = $("input[name='size']").val(); + } + $("input[name='craft']:checked").each(function () { + if (!$(this).is(':disabled')) { + craft_list.push($(this).val()); + } + } + ); let craft_list = []; $("input[name='craft']:checked").each(function () { if (!$(this).is(':disabled')) { @@ -609,11 +637,13 @@ ); let kindValue = $("select[name='kindValue'] option:selected").val(); if (craft_list.indexOf("打码") > -1 && craft_list.indexOf("异形模切") > -1) { - $(data.elem).next().attr("class", "layui-unselect layui-form-checkbox"); - $(data.elem).prop("checked", false); - layer.msg("打码 - 异形模切不能同时选择", {offset: ['300px', '300px']}, function () { - }); - return false; + if ((size.split("*")[0] < 9 || size.split("*")[1] < 5.4) || (size.split("*")[0] < 5.4 || size.split("*")[1] < 9)) { + $(data.elem).next().attr("class", "layui-unselect layui-form-checkbox"); + $(data.elem).prop("checked", false); + layer.msg("打码 - 异形模切不能同时选择", {offset: ['300px', '300px']}, function () { + }); + return false; + } } if (craft_list.indexOf("压痕") > -1 && craft_list.indexOf("异形模切") > -1) { $(data.elem).next().attr("class", "layui-unselect layui-form-checkbox"); @@ -646,7 +676,7 @@ $("#dama").find("select").attr("disabled", false); } else { $("#dama").hide(); - $("#dama").find("select").attr("disabled", true); + // $("#dama").find("select").attr("disabled", true); } form.render();