zhuyiyi hai 3 meses
pai
achega
49c7a37842

+ 2 - 1
src/main/webapp/views/product/coupon.jsp

@@ -530,7 +530,6 @@
                                        title="糊成品">
                                 <input type="checkbox" name="craft" class="ui_hu" lay-filter="switch" value="糊半成品"
                                        title="糊半成品">
-
                             </div>
                         </div>
 
@@ -1361,6 +1360,8 @@
                 $(".lesspeijian").prop("checked", false);
                 $("#lesspeijian").hide();
                 $("#lesspeijian").find(":input").attr("disabled", true);
+                $(".ui_fm_l").show();
+                $('.ui_fm_l').find(":input").attr("disabled", false);
                 if (data.value == '直角卡片' || data.value == '异形卡片' || data.value == '贺卡' || data.value == '特种纸名片') {
                     if (data.elem.checked) {
                         $("#lesspeijian").show();

+ 3 - 3
src/main/webapp/views/product/stickers.jsp

@@ -1642,12 +1642,12 @@
                 });
                 return false;
             }
-            if (n_moq_num > 0 && n_moq_size == "") {
+            if (nmq == '内部模切' && n_moq_num > 0 && n_moq_size == "") {
                 layer.msg('请输入内模切尺寸!', {offset: ['300px', '300px']}, function () {
                 });
                 return false;
             }
-            if (n_moq_num > 0 && n_moq_size.indexOf("*") == -1) {
+            if (nmq == '内部模切' && n_moq_num > 0 && n_moq_size.indexOf("*") == -1) {
                 layer.msg('请输入内模切正确尺寸!', {offset: ['300px', '300px']}, function () {
                 });
                 return false;
@@ -1786,7 +1786,7 @@
                         craft_list.push($("input[name='craftPai']:checked").val())
                     }
                     if (nmq == '内部模切' && n_moq_num > 0) {
-                        craft_list.push("内部模切")
+                        craft_list.push("内部模切:" + n_moq_num +"/"+ n_moq_size)
                     }
                     span_result += kind + ' - ' + size + "厘米 - " + craft_list.join("-") + '\n';
 

+ 1 - 1
src/main/webapp/views/product/tag.jsp

@@ -50,7 +50,7 @@ class="layui-input" value="吊牌"> -->
         </select>
     </span>
 </div>
-<span class="craftSheng">
+<span class="craftSheng" style="display: flex;flex-wrap: wrap">
 	<input type="checkbox" class="craftSheng2" name="craftSheng" lay-filter="switch" value="棉绳" title="棉绳"
            lay-skin="primary">
     <input type="checkbox" class="craftSheng2" name="craftSheng" lay-filter="switch" value="配弹力绳" title="配弹力绳(15cm)"