修改卡片300克打孔工艺

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

@@ -1112,6 +1112,7 @@ public class ProductService {
                         }
                         if ("异形模切".equals(dto.getCraftQie())) {
                             craft.add("模切");
+                            craft.remove("打孔");
                         }
                         if (!"".equals(dto.getCraftTang())) {
                             craft.add(dto.getCraftTang());

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

@@ -36,7 +36,7 @@
     }
 
     #z4_craft .layui-form-select .layui-edge {
-        right: 40px;
+        right: 20px;
     }
 
     #peijian_ui .layui-form-select .layui-edge {
@@ -500,10 +500,16 @@
 							      	<input type="checkbox" name="craft" class="dk disab max cjkDisab"
                                            lay-filter="switch" value="打孔" title="打孔">
 								</span>
+<%--                            <div class="layui-inline edge dakongHide" style="width:60px;display:none">--%>
+<%--                                <select name="dakong" class="select dakong" lay-filter="dakong">--%>
+<%--                                    <option value="1" selected>1</option>--%>
+<%--                                    <option value="2">2</option>--%>
+<%--                                </select>--%>
+<%--                            </div>--%>
                             <div class="layui-inline edge dakongHide" style="width:60px;display:none">
-                                <select name="dakong" class="select dakong" lay-filter="dakong">
-                                    <option value="1" selected>1</option>
-                                    <option value="2">2</option>
+                                <select class="select wkong layui-inline">
+                                    <option value="3mm" selected>3mm</option>
+                                    <option value="5mm">5mm</option>
                                 </select>
                             </div>
                             <input type="checkbox" name="craft" class="yj disab max cjkDisab" lay-filter="switch"
@@ -699,6 +705,12 @@
 
                         <input type="checkbox" name="craft" class="nomq" lay-filter="switchCrafts" value="打孔"
                                title="打孔"/>
+                        <div class="layui-inline dakonghide" style="width:60px;display:none">
+                            <select class="select wkong">
+                                <option value="3mm" selected>3mm</option>
+                                <option value="5mm">5mm</option>
+                            </select>
+                        </div>
                         <input type="checkbox" name="craft" value="打码" lay-filter="switchCrafts" title="打码"/>
                         <div class="layui-inline maxianhide" style="width:60px;display:none">
                             <select name="maxian" class="select maxian">
@@ -1307,6 +1319,7 @@
                     $("#z4_craft .dadianxianhide").hide();
                     $("#z4_craft .yahenghide").hide();
                     $("#z4_craft .maxianhide").hide();
+                    $("#z4_craft .dakonghide").hide();
                     $("#z4_craft .caiqie").prop("checked", true);
                     form.on('checkbox(switchMQ)', function (data) {
                         let mqLength = $("#z4_craft .mq:checked").length;
@@ -1350,6 +1363,13 @@
                                 $("#z4_craft .maxianhide").hide();
                             }
                         }
+                        if (data.value == "打孔") {
+                            if ($(data.elem).is(":checked")) {
+                                $("#z4_craft .dakonghide").show();
+                            } else {
+                                $("#z4_craft .dakonghide").hide();
+                            }
+                        }
                         form.render('checkbox');
                     });
                 } else {
@@ -1839,14 +1859,7 @@
                     })
                 } else if (data.value == 8) {
                     $('.ui_door_fm').prop('checked', true);
-                    form.on('checkbox(switch)', function (switchData) {
-                        if (!switchData.elem.checked && switchData.value == "双面覆哑膜") {
-                            layer.msg('门挂牌不能取消 [覆膜] 工艺！', {offset: ['300px', '300px']}, function () {
-                            });
-                            $('.ui_door_fm').prop('checked', true);
-                            form.render('checkbox');
-                        }
-                    })
+
                 }
                 if (data.value == 13) {
                     $("input[name='fmType']").prop('checked', false);
@@ -2626,9 +2639,15 @@
                         return false;
                     }
                 }
+                var kind = $('input[name="kind"]:checked').val();
 
+                if (kind == 8 && !data.elem.checked && data.value == "双面覆哑膜") {
+                    layer.msg('门挂牌不能取消 [覆膜] 工艺！', {offset: ['300px', '300px']}, function () {
+                    });
+                    $('.ui_door_fm').prop('checked', true);
+                    form.render('checkbox');
+                }
                 // 产品品种
-                var kind = $('input[name="kind"]:checked').val();
 
                 // 腰封4*4cm内无法选择【单面覆膜】工艺
                 /* if (data.value == '单面覆膜') {
@@ -3071,6 +3090,11 @@
                             }
 
                         }
+                        if ($(this).val() === '打孔') {
+
+                            arr.push("打孔" + $(".wkong:enabled option:selected").val())
+                            return;
+                        }
                         if ($(this).val() === '尼龙绳') {
                             arr.push($(".select_nilongshen select[name='craft'] option:selected").val() + "-" + $("select[name='shen_color'] option:selected").val())
                             return;

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

@@ -35,6 +35,10 @@
     #tcolor_type .layui-form-select .layui-edge {
         right: 20px;
     }
+
+    .dakongHide .layui-form-select .layui-edge {
+        right: 20px;
+    }
 </style>
 <body>
 <div class="big_box">
@@ -129,25 +133,20 @@
                         工艺
                     </p>
                     <div class="layui-input-block">
-                        <input type="radio" name="craftQie" lay-filter="craftQie" la value="直角打孔" title="直角打孔" checked>
-                        <input type="radio" name="craftQie" lay-filter="craftQie" value="异形模切" title="异形模切">
-                        |&nbsp;&nbsp;&nbsp;
-                        <input type="radio" name="craftMo" lay-filter="craftMo" la value="双面覆哑膜" title="双面覆哑膜" checked>
-                        <input type="radio" name="craftMo" lay-filter="craftMo" value="不覆膜" title="不覆膜">
-                        |&nbsp;&nbsp;&nbsp;
-                        <!-- <input type="checkbox" class="craftSheng" name="craftSheng" lay-filter="switch" value="棉绳" title="棉绳" lay-skin="primary">
-                        |&nbsp;&nbsp;&nbsp;  -->
-                        <input type="checkbox" name="aotu" lay-filter="switch" value="击凸" title="击凸" lay-skin="primary">
-                        <input type="checkbox" name="aotu" lay-filter="switch" value="压凹" title="压凹" lay-skin="primary">
-                        <span id="color_type" class="layui-inline" style="display: none;width: 100px">
-                            <select name="craft" class="select" disabled>
-                                <option value="无色" selected>无色</option>
-                                <option value="有色">有色</option>
-                                <option value="有色加凹凸">有色加激凸/有色加压凹</option>
-                            </select>
-                        </span>
-                        |&nbsp;&nbsp;&nbsp;
-                        <div>
+                        <div class="layui-input-block">
+                            裁切工艺：
+                            <input type="radio" name="craftQie" lay-filter="craftQie" la value="直角裁切" title="直角裁切"
+                                   checked>
+                            <input type="radio" name="craftQie" lay-filter="craftQie" value="异形模切" title="异形模切">
+                        </div>
+                        <div class="layui-input-block">
+                            覆膜工艺：
+                            <input type="radio" name="craftMo" lay-filter="craftMo" la value="双面覆哑膜" title="双面覆哑膜"
+                                   checked>
+                            <%--                            <input type="radio" name="craftMo" lay-filter="craftMo" value="不覆膜" title="不覆膜">--%>
+                        </div>
+                        <div class="layui-input-block">
+                            烫金工艺：
                             <input type="checkbox" class="tang" name="craftTang" lay-filter="switch" value="单面烫金"
                                    title="单面烫金" lay-skin="primary">
                             <input type="checkbox" class="tang" name="craftTang" lay-filter="switch" value="双面烫金"
@@ -163,7 +162,30 @@
                                 </div>
                             </span>
                         </div>
+                        <div class="layui-input-block">
+                            常见工艺：
+                            <input type="checkbox" name="aotu" lay-filter="switch" value="击凸" title="击凸"
+                                   lay-skin="primary">
+                            <input type="checkbox" name="aotu" lay-filter="switch" value="压凹" title="压凹"
+                                   lay-skin="primary">
+                            <span id="color_type" class="layui-inline" style="display: none;width: 100px">
+                                <select name="craft" class="select" disabled>
+                                    <option value="无色" selected>无色</option>
+                                    <option value="有色">有色</option>
+                                    <option value="有色加凹凸">有色加激凸/有色加压凹</option>
+                                </select>
+                            </span>
+                            <input type="checkbox" name="craft" lay-filter="switch" value="打孔" title="打孔"
+                                   lay-skin="primary" checked>
+                            <div class="layui-inline edge dakongHide" style="width:80px;">
+                                <select class="select wkong layui-inline">
+                                    <option value="3mm" selected>3mm</option>
+                                    <option value="5mm">5mm</option>
+                                </select>
+                            </div>
+                        </div>
                         <div class="craft_lius">
+                            配件：
                             <input type="checkbox" class="lius" name="craft" lay-filter="ui_lius" value="流苏" title="流苏">
                             <input type="checkbox" class="biez" name="craft" lay-filter="ui_lius" value="别针" title="别针">
                             <input type="checkbox" class="shengz" name="craft" lay-filter="ui_lius" value="绳子"
@@ -276,17 +298,17 @@
             $("#remark").empty();
             let html = "预计发货时间:<br>";
             if (kindValue == "3") {
-                if (craftQie == "直角打孔" && !craftTang && !auto) {
+                if (craftQie == "直角裁切" && !craftTang && !auto) {
                     html += "福建：(2天发货) 圆通 顺丰<br>"
                     html += "广东：(2天发货) 中通 顺丰<br>"
                 }
-                if (craftQie == "直角打孔" && craftTang == "单面烫金") {
-                    html += "福建：直角打孔、单面烫金(3-4天发货) 圆通 顺丰<br>"
-                    html += "广东：直角打孔、单面烫金(3-4天发货) 中通 顺丰<br>"
+                if (craftQie == "直角裁切" && craftTang == "单面烫金") {
+                    html += "福建：直角裁切、单面烫金(3-4天发货) 圆通 顺丰<br>"
+                    html += "广东：直角裁切、单面烫金(3-4天发货) 中通 顺丰<br>"
                 }
-                if (craftQie == "直角打孔" && craftTang == "双面烫金") {
-                    html += "福建：直角打孔、双面烫金(3-4天发货) 圆通 顺丰<br>"
-                    html += "广东：直角打孔、双面烫金(3-4天发货) 中通 顺丰<br>"
+                if (craftQie == "直角裁切" && craftTang == "双面烫金") {
+                    html += "福建：直角裁切、双面烫金(3-4天发货) 圆通 顺丰<br>"
+                    html += "广东：直角裁切、双面烫金(3-4天发货) 中通 顺丰<br>"
                 }
                 if (craftQie == "异形模切" && !craftTang && !auto) {
                     html += "福建：异形模切(3-4天发货) 圆通 顺丰<br>"
@@ -300,9 +322,9 @@
                     html += "福建：异形模切、双面烫金(4-5天发货) 圆通 顺丰<br>"
                     html += "广东：异形模切、双面烫金(4-5天发货) 中通 顺丰<br>"
                 }
-                if (craftQie == "直角打孔" && (auto == "击凸" || auto == "压凹")) {
-                    html += "福建：直角打孔、击凸、压凹(3-4天发货) 圆通 顺丰<br>"
-                    html += "广东：直角打孔、击凸、压凹(3-4天发货) 中通 顺丰<br>"
+                if (craftQie == "直角裁切" && (auto == "击凸" || auto == "压凹")) {
+                    html += "福建：直角裁切、击凸、压凹(3-4天发货) 圆通 顺丰<br>"
+                    html += "广东：直角裁切、击凸、压凹(3-4天发货) 中通 顺丰<br>"
                 }
                 if (craftQie == "异形模切" && (auto == "击凸" || auto == "压凹")) {
                     html += "福建：异形模切、击凸、压凹(4-5天发货) 圆通 顺丰<br>"
@@ -523,6 +545,11 @@
                     $(".craftSheng .tscolor").prop("disabled", true);
                 }
             }
+            if (!data.elem.checked && data.value == "打孔") {
+                layer.msg('不能取消 [打孔] 工艺！', {offset: ['300px', '300px']}, function () {
+                });
+                $(data.elem).prop("checked", true);
+            }
             form.render();
             getRemoker()
         })
@@ -542,7 +569,7 @@
             if (stickerKind == "常规") {
                 if (kindValueData.value == '3') {
                     $(".switchCount").show();
-                    if (craftQie == "直角打孔") {
+                    if (craftQie == "直角裁切") {
                         $(".count").show();
                         $(".count").find(":input").attr("disabled", false);
                     }
@@ -607,12 +634,12 @@
         $("#mqCount").attr("disabled", true);
         // 默认直角打孔，禁用第二尺寸
         // $(".addOrCutClothes").hide();
-        var craftQie = "直角打孔";
+        var craftQie = "直角裁切";
         form.on('radio(craftQie)', function (data) {
             // 选中工艺标识
             craftQie = data.value;
             // 自定义数量没选中
-            if (data.value == "直角打孔") {
+            if (data.value == "直角裁切") {
                 // 禁用第二尺寸
                 // $(".addOrCutClothes").hide();
                 countClothes = 0;
@@ -651,7 +678,7 @@
                 $("#zjCount").attr("disabled", true);
             } else {
                 choose = false;
-                if (craftQie == "直角打孔") {
+                if (craftQie == "直角裁切") {
                     $(".count").show();
                     $("#zjCount").attr("disabled", false);
                 } else {
@@ -737,7 +764,7 @@
                         }
                         form.render();
                     }
-                } else if (craftQie == "直角打孔") {
+                } else if (craftQie == "直角裁切") {
                     $("#proTypeValue").val("服装吊牌");
                     $("input[name='kindValue']:checked").val(3);
                 }
@@ -854,11 +881,12 @@
                                     } else if ($(this).val() == "弹力绳捆") {
                                         arr.push(szColor + "配弹力绳(" + Math.ceil(data[0].count * 20 / 5000) + "捆)");
                                         shengku = true;
+                                    } else if ($(this).val() == "打孔") {
+                                        arr.push($(this).val() + $(".wkong option:selected").val());
                                     } else {
                                         arr.push($(this).val());
-                                    }
-
 
+                                    }
                                 }
                             }
                         });
@@ -866,6 +894,7 @@
                     if (craftQie == "异形模切") {
                         craftQie = "不限形状";
                     }
+
                     var span_result = '服装吊牌 - ' + kindValueData[kindValue] + ' - ' + size + '厘米\n';
                     if (stickerKind == "常规") {
                         let shengz = $(".shengz:checked").length;
@@ -903,7 +932,7 @@
                                 if (shengku) {
                                     price_text = "," + Math.ceil(data[i].count * 20 / 5000) + "捆";
                                 }
-                                span_result += data[i].count + "张" + data[i].price + "元" + price_text + '\n'
+                                span_result += number + '款 各' + data[i].count + "张，共" + data[i].price + "元" + price_text + '\n'
                                 data[i].number = number;
                             }
                         }