修改香薰卡尺寸，新增杯垫材质

src/main/java/lingtao/net/service/ProductService.java

@@ -281,7 +281,9 @@ public class ProductService {
             width = Math.abs(width);
             size = other_size;
         }
-
+        if ("杯垫".equals(proType) && "13".equals(dto.getKindValue())) {
+            proType = "香薰卡";
+        }
         // 返回的价格集合
         List<Product> priceList = new ArrayList<Product>();
         switch (proType) {
@@ -5264,8 +5266,8 @@ public class ProductService {
             base_price = 35;
             min_price = 60;
         }
-        width = width + 4;
-        length = length + 4;
+        width = width * 10 + 4;
+        length = length * 10 + 4;
 
         double max = 1;
 

src/main/webapp/views/product/aromatherapyCard.jsp

@@ -31,7 +31,7 @@
                 </select>
             </div>
             <p>
-                尺寸(MM/毫米) <span style="font-size: 14px; color: red">输入格式: 长 * 宽</span>
+                尺寸(CM/厘米) <span style="font-size: 14px; color: red">输入格式: 长 * 宽</span>
             </p>
             <div class="layui-form-item" id="ui_size">
                 <input type="text" name="size" id="size" placeholder="格式:长*宽" class="layui-input" autocomplete="off">
@@ -64,7 +64,7 @@
                     <option value="栀子花">栀子花</option>
                     <option value="玫瑰">玫瑰</option>
                     <option value="水蜜桃">水蜜桃</option>
-                    <option value="奥迪真我">奥迪真我</option>
+                    <option value="迪奥真我">迪奥真我</option>
                     <option value="古龙">古龙</option>
                     <option value="海洋">海洋</option>
                     <option value="驱蚊香">驱蚊香</option>
@@ -313,13 +313,13 @@
                 });
                 return false;
             }
-            if ((size.split("*")[0] > 420 || size.split("*")[1] > 285) && (size.split("*")[1] > 420 || size.split("*")[0] > 285)) {
-                layer.msg('最大尺寸420*285MM！', {offset: ['300px', '300px']}, function () {
+            if ((size.split("*")[0] > 42 || size.split("*")[1] > 28.5) && (size.split("*")[1] > 42 || size.split("*")[0] > 28.5)) {
+                layer.msg('最大尺寸42*28.5cm！', {offset: ['300px', '300px']}, function () {
                 });
                 return false;
             }
-            if ((size.split("*")[0] < 10 || size.split("*")[1] < 10)) {
-                layer.msg('最小尺寸10*10MM！', {offset: ['300px', '300px']}, function () {
+            if ((size.split("*")[0] < 1 || size.split("*")[1] < 1)) {
+                layer.msg('最小尺寸1*1cm！', {offset: ['300px', '300px']}, function () {
                 });
                 return false;
             }
@@ -365,7 +365,7 @@
                     }
                     var data = result.data.proList;
 
-                    var span_result = '香薰卡 - ' + kind + ' - ' + size + ' MM (同款内容)\n';
+                    var span_result = '香薰卡 - ' + kind + ' - ' + size + ' CM (同款内容)\n';
 
                     span_result += `工艺：` + craft.join(",") + '\n';
 

src/main/webapp/views/product/coaster.jsp

@@ -52,6 +52,7 @@
                 <input type="radio" name="kindValue" lay-filter="kindValue" value="10" title="轻羽（1.5mm厚度）">
                 <input type="radio" name="kindValue" lay-filter="kindValue" value="11" title="简单（1.0mm厚度)">
                 <input type="radio" name="kindValue" lay-filter="kindValue" value="12" title="透明PVC">
+                <input type="radio" name="kindValue" lay-filter="kindValue" value="13" title="香薰卡">
             </div>
             <div class="tagOther">
                 <div class="layui-form-item pvcCraft" style="display: none">
@@ -86,7 +87,7 @@
                     </select>
                 </div>
                 <div class="layui-form-item fixcount" style="display: none">
-                    <select name="count" class="select">
+                    <select name="count" class="select" disabled>
                         <option value="50">50</option>
                         <option value="100">100</option>
                         <option value="200">200</option>
@@ -95,13 +96,59 @@
                     </select>
                 </div>
                 <div class="layui-form-item pvcCraft" style="display: none">
-                    <input type="text" name="count" placeholder="请输入整数" class="layui-input" autocomplete="off">
+                    <input type="text" name="count" placeholder="请输入整数" class="layui-input" autocomplete="off" disabled>
+                </div>
+                <div class="layui-form-item aromatherCraft" style="display: none">
+                    <input type="text" name="count" placeholder="请输入整数" class="layui-input" autocomplete="off" disabled>
                 </div>
                 <p>款数</p>
                 <div class="layui-form-item">
                     <input type="text" placeholder="请输入整数" autocomplete="off"
                            name="number" id="number" value="1" class="layui-input" lay-verify="number">
                 </div>
+                <div class="layui-form-item aromatherCraft" style="display: none">
+                    <p>
+                        规格
+                    </p>
+                    <div class="layui-form-item">
+                        <select name="kind" class="select" lay-search>
+                            <option value="1">300克</option>
+                            <option value="2">600克</option>
+                            <option value="3">1000克</option>
+                        </select>
+                    </div>
+                    <p>
+                        香味
+                    </p>
+                    <div class="layui-form-item" id="xiangwei">
+                        <select name="craft" class="select">
+                            <option value="桂花">桂花</option>
+                            <option value="爱马仕大地">爱马仕大地</option>
+                            <option value="白茶">白茶</option>
+                            <option value="东方风韵">东方风韵</option>
+                            <option value="咖啡">咖啡</option>
+                            <option value="柑橘">柑橘</option>
+                            <option value="栀子花">栀子花</option>
+                            <option value="玫瑰">玫瑰</option>
+                            <option value="水蜜桃">水蜜桃</option>
+                            <option value="迪奥真我">迪奥真我</option>
+                            <option value="古龙">古龙</option>
+                            <option value="海洋">海洋</option>
+                            <option value="驱蚊香">驱蚊香</option>
+                            <option value="苹果">苹果</option>
+                            <option value="薰衣草">薰衣草</option>
+                            <option value="凤梨">凤梨</option>
+                            <option value="蔚蓝">蔚蓝</option>
+                            <option value="乌木沉香">乌木沉香</option>
+                            <option value="蓝风铃">蓝风铃</option>
+                            <option value="小苍兰">小苍兰</option>
+                            <option value="柠檬香">柠檬香</option>
+                            <option value="茉莉">茉莉</option>
+                            <option value="邂逅">邂逅</option>
+                            <option value="无味">无味</option>
+                        </select>
+                    </div>
+                </div>
                 <p>
                     客户旺旺
                 </p>
@@ -219,6 +266,68 @@
                         <input type="radio" name="craftQieType" value="专色uv" title="专色uv"/>
                     </div>
                 </div>
+                <div class="layui-form-item aromatherCraft" id="aromatherCraft" style="display: none">
+                    <p>
+                        工艺
+                    </p>
+                    <div class="layui-form-item" id='z4_craft'>
+                        <div class="layui-input-block">
+                            印面工艺：
+                            <input type="checkbox" name="craft" lay-filter="ui_craft" value="单面" title="单面" checked>
+                            <input type="checkbox" name="craft" lay-filter="ui_craft" value="双面" title="双面">
+                        </div>
+                        <div class="layui-input-block">
+                            裁切工艺：
+                            <input type="checkbox" name="craft" lay-filter="ui_craft" value="直角裁切" title="直角裁切" checked>
+                            <input type="checkbox" name="craft" lay-filter="ui_craft" value="异形模切" title="异形模切">
+                        </div>
+
+                        <div class="layui-input-block">
+                            常见工艺：
+                            <input type="checkbox" name="craft" lay-filter="ui_craft" value="打孔" title="打孔">
+                        </div>
+                        <div class="layui-input-block">
+                            包装：
+                            <input type="checkbox" name="craft" lay-filter="ui_craft" value="单独包装" title="单独包装" checked>
+                            <input type="checkbox" name="craft" lay-filter="ui_craft" value="真空包装" title="真空包装">
+                            <input type="checkbox" name="craft" lay-filter="ui_craft" value="无需包装" title="无需包装">
+                        </div>
+
+                        <div class="layui-input-block">
+                            配件：
+                            <input type="checkbox" class="peijian" name="craft" lay-filter="peijian" value="配涤纶丝带"
+                                   title="配涤纶丝带">
+                            <input type="checkbox" class="peijian" name="craft" lay-filter="peijian" value="配吊牌绳"
+                                   title="配吊牌绳">
+                            <input type="checkbox" class="peijian" name="craft" lay-filter="peijian" value="配弹力绳"
+                                   title="配弹力绳">
+                        </div>
+                        <div class="layui-input-block">
+                            穿配件：
+                            <input type="checkbox" class="peijian" name="craft" lay-filter="peijian" value="穿涤纶丝带"
+                                   title="穿涤纶丝带">
+                            <input type="checkbox" class="peijian" name="craft" lay-filter="peijian" value="穿吊牌绳"
+                                   title="穿吊牌绳">
+                            <input type="checkbox" class="peijian" name="craft" lay-filter="peijian" value="穿弹力绳"
+                                   title="穿弹力绳">
+                            <div class="layui-inline shengz scolor" style="width: 110px;display: none">
+                                <select class="select" name="shen_color">
+                                    <option value="白色绳子">白色绳子</option>
+                                    <option value="黑色绳子">黑色绳子</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-input-block" id="peijian_ui" style="display: none">
+                            配件颜色：
+                            <div class="layui-inline shengz scolor" style="width: 110px;">
+                                <select class="select" name="shen_color">
+                                    <option value="白色绳子">白色绳子</option>
+                                    <option value="黑色绳子">黑色绳子</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
             <hr>
             <div class="layui-form-item">
@@ -265,6 +374,9 @@
             $(".pvcCraft").hide();
             $(".pvcCraft").find(":input").attr("disabled", true);
             $(".pvcCraft").find("select").attr("disabled", true);
+            $(".aromatherCraft").hide();
+            $(".aromatherCraft").find(":input").attr("disabled", true);
+            $(".aromatherCraft").find("select").attr("disabled", true);
             $("#jtcolor").hide();
             $("#tangcolor").hide();
             $("#tangtype").hide();
@@ -289,7 +401,7 @@
                 $(".pvcCraft").show();
                 $(".pvcCraft").find(":input").attr("disabled", false);
                 $(".pvcCraft").find("select").attr("disabled", false);
-            } else {
+            } else if (kindValueData.value != 13) {
                 $(".diycount").show();
                 $(".diycount").find(":input").attr("disabled", false);
                 $(".diycount").find("select").attr("disabled", false);
@@ -319,6 +431,11 @@
                         $("#leishe_layout").find("select").attr("disabled", false);
                     }
                 }
+            } else if (kindValueData.value == 13) {
+                $(".aromatherCraft").show();
+                $(".aromatherCraft").find(":input").attr("disabled", false);
+                $(".aromatherCraft").find("select").attr("disabled", false);
+                $(".pvcCraft")
             }
 
             form.render();
@@ -407,6 +524,10 @@
                 }
                 data.kindValue = kindValue;
             }
+            if(kindValue == 13){
+                data.proTypeValue = "香薰卡";
+                delete data.kindValue;
+            }
             $.ajax({
                 url: "${pageContext.request.contextPath}/getImgs",
                 type: "GET",
@@ -442,7 +563,80 @@
                 }
             });
         };
+        const carft_list1 = ["单面", "双面"];
+
+        const carft_list2 = ["直角裁切", "异形模切"];
 
+        const carft_list3 = ["单独包装", "真空包装", "无需包装"];
+
+        const carft_list4 = ["穿涤纶丝带", "穿吊牌绳", "穿弹力绳"];
+        const carft_list5 = ["配涤纶丝带", "配吊牌绳", "配弹力绳"];
+        form.on('checkbox(ui_craft)', function (data) {
+            let craft_list = [];
+            craft_list.push($("select[name='craft'] option:selected").val());
+            $("input[name='craft']:checked").each(function () {
+                    if (!$(this).is(':disabled')) {
+                        craft_list.push($(this).val());
+                    }
+                }
+            );
+
+            const carft1 = carft_list1.filter(craft => craft_list.includes(craft));
+            if (carft1.length > 1) {
+                $(data.elem).prop("checked", false);
+                layer.msg("印面工艺不能同时选择", {offset: ['300px', '300px']}, function () {
+                });
+                form.render();
+                return false;
+            }
+            const carft2 = carft_list2.filter(craft => craft_list.includes(craft));
+            if (carft2.length > 1) {
+                $(data.elem).prop("checked", false);
+                layer.msg("裁切工艺不能同时选择", {offset: ['300px', '300px']}, function () {
+                });
+                form.render();
+                return false;
+            }
+            const carft3 = carft_list3.filter(craft => craft_list.includes(craft));
+            if (carft3.length > 1) {
+                $(data.elem).prop("checked", false);
+                layer.msg("包装工艺不能同时选择", {offset: ['300px', '300px']}, function () {
+                });
+                form.render();
+                return false;
+            }
+        })
+        form.on('checkbox(peijian)', function (data) {
+            let craft_list = [];
+            $(".peijian:checked").each(function () {
+                    if (!$(this).is(':disabled')) {
+                        craft_list.push($(this).val());
+                    }
+                }
+            );
+            const carft4 = carft_list4.filter(craft => craft_list.includes(craft));
+            const carft5 = carft_list5.filter(craft => craft_list.includes(craft));
+            if (carft4.length > 0 && carft5.length > 0) {
+                $(data.elem).next().attr("class", "layui-unselect layui-form-checkbox");
+                $(data.elem).prop("checked", false);
+                layer.msg('配 - 穿只能选择一种！', {offset: ['300px', '300px']}, {icon: 5});
+                return false;
+            }
+            if (carft4.length > 1) {
+                $(data.elem).next().attr("class", "layui-unselect layui-form-checkbox");
+                $(data.elem).prop("checked", false);
+                layer.msg('穿只能选择一种！', {offset: ['300px', '300px']}, {icon: 5});
+                return false;
+            }
+            if ($(data.elem).is(":checked")) {
+                $("#peijian_ui").show();
+                $("#peijian_ui .scolor select").prop("disabled", false);
+            } else {
+                $("#peijian_ui").hide();
+                $("#peijian_ui .scolor select").prop("disabled", true);
+            }
+            form.render();
+        })
         // 点击计算，计算价格
         form.on('submit(acount_btn)', function (data) {
 
@@ -515,13 +709,58 @@
                 }
 
             }
+            if (kindValue == "13") {
+                arr = [];
+                if ((size.split("*")[0] > 42 || size.split("*")[1] > 28.5) && (size.split("*")[1] > 42 || size.split("*")[0] > 28.5)) {
+                    layer.msg('最大尺寸42*28.5cm！', {offset: ['300px', '300px']}, function () {
+                    });
+                    return false;
+                }
+                if ((size.split("*")[0] < 1 || size.split("*")[1] < 1)) {
+                    layer.msg('最小尺寸1*1cm！', {offset: ['300px', '300px']}, function () {
+                    });
+                    return false;
+                }
+                arr.push($("#xiangwei select[name='craft'] option:selected").val());
+                arr.push($(".aromatherCraft select[name='kind'] option:selected").text());
+                $("input:checkbox[name='craft']:checked").each(function (i) {
+                    // 没有被禁用的工艺加到arr中
+                    if (!$(this).is(':disabled')) {
+                        if (carft_list4.indexOf($(this).val()) > -1) {
+                            arr.push($(this).val() + $("#peijian_ui select[name='shen_color'] option:selected").val());
+                        } else {
+                            arr.push($(this).val());
+                        }
+                    }
+                });
+
+                const carft1 = carft_list1.filter(item => arr.includes(item));
+                if (carft1.length == 0) {
+                    layer.msg("请选择印面工艺", {offset: ['300px', '300px']}, function () {
+                    });
+                    return false;
+                }
+                const carft2 = carft_list2.filter(item => arr.includes(item));
+                if (carft2.length == 0) {
+                    layer.msg("请选择裁切工艺", {offset: ['300px', '300px']}, function () {
+                    });
+                    return false;
+                }
+                const carft3 = carft_list3.filter(item => arr.includes(item));
+                if (carft3.length == 0) {
+                    layer.msg("请选择包装工艺", {offset: ['300px', '300px']}, function () {
+                    });
+                    return false;
+                }
+            }
             kindValueData = {
                 3: "350克铜版纸",
                 6: "600克铜版纸",
                 4: "900克双胶纸",
                 10: "轻羽",
                 11: "简单",
-                12: "透明PVC"
+                12: "透明PVC",
+                13: "香薰卡"
             };
             $.ajax({
                 url: "${path}/getThanSum",
@@ -555,6 +794,8 @@
                         let size1 = $("select[name='size1'] option:selected").val();
                         let craft_list = ['规格' + size1, craftQie, craftQieType];
                         span_result += "工艺： " + craft_list.join(",") + "\n";
+                    } else if (kindValue == "13") {
+                        span_result += `工艺：` + arr.join(",") + '\n';
                     } else {
                         let aotu = $("input[name='aotu']:checked").val();
                         let craft = $("input[name='craft']:checked").val();
@@ -571,7 +812,7 @@
                         } else if (craft == "烫镭射银") {
                             let ys = $("input[name='tcolor']:checked").val();
                             craft_list.push(ys);
-                        }else{
+                        } else {
                             craft_list.push(craft);
                         }
                         span_result += "工艺： " + craft_list.join(",") + "\n";