@@ -1310,6 +1313,7 @@
layer.msg('[裁切- 模切 - 圆角]不能同时选择!', {offset: ['300px', '300px']}, {icon: 5});
return false;
}
+
if (data.value == "模切") {
if ($(data.elem).is(":checked")) {
$("#z4_craft .nomq").prop("checked", false).prop("disabled", true);
@@ -1518,6 +1522,10 @@
$("#craftForm")[0].reset();
$(".yhselect").hide();
$(".ydxselect").hide();
+ $(".yhydx").hide();
+ $(".yhydx").find(":input").attr("disabled", true);
+ $('input[class = mq]').prop('checked', false);
+ $('input[class = mq][value=直角裁切]').prop('checked', true);
if (data.value == 0 || data.value == 1) {
$("#kindValueForm")[0].reset();
$(".kindValue").show();
@@ -1549,6 +1557,7 @@
$(".switchCount").find(":input").attr("disabled", false);
$(".ui_fm_l").show();
$('.ui_fm_l').find(":input").attr("disabled", false);
+
form.on('radio(kindValue)', function (kindValueData) {
kindValue = kindValueData.value
$(".ui_fm_l").show();
@@ -1585,20 +1594,20 @@
$('.fm').hide();
$('.fm').prop('checked', false);
}
+ $('input[class = mq]').prop('checked', false);
+ $('input[class = mq][value=直角裁切]').prop('checked', true);
// 吊旗、腰封--300克铜版纸的时候勾选模切,且不能取消
if (data.value == 0) {
-
- $('input[class = mq]').prop('checked', true);
form.on('checkbox(switchMQ)', function (switchData) {
// 吊旗/吊牌的模切
if (!switchData.elem.checked) {
layer.msg('吊旗不能取消 [ 模切 ] 工艺!', {offset: ['300px', '300px']}, function () {
});
- $('input[class = mq]').prop('checked', true);
form.render('checkbox');
} else {
kindValueData.value = 1;
}
+
if (switchData.elem.checked) {
$(".disab").attr("disabled", true);
$('input[class = disab]').prop('checked', false);
@@ -1617,6 +1626,12 @@
if (kindValueData.value == 2) {
//$('input[class = mq]').prop('checked', true);
form.on('checkbox(switchMQ)', function (switchData) {
+ if ($(".mq:checked").length > 1) {
+ $(switchData.elem).next().attr("class", "layui-unselect layui-form-checkbox");
+ $(switchData.elem).prop("checked", false);
+ layer.msg('[裁切- 模切]不能同时选择!', {offset: ['300px', '300px']}, {icon: 5});
+ return false;
+ }
if (kindValueData.value == 2) {
// 吊旗/吊牌的模切
if (!switchData.elem.checked) {
@@ -1630,7 +1645,6 @@
}
})
} else {
- $('input[class = mq]').prop('checked', false);
}
}
form.render();
@@ -1787,7 +1801,6 @@
$("#craft").show();
$(".craft").show();
$(".craft").find(":input").attr("disabled", false);
- $('input[class = mq]').prop('checked', false);
$(".kindValue5").hide();
$(".kindValue5").attr("disabled", true);
$(".ui_shk_size").hide();
@@ -1867,7 +1880,6 @@
if (data.value == 7) {
$(".value7").find(":input").attr("checked", false);
$(".damaHide").hide();
- $('input[class = mq]').prop('checked', true);
$('input[class = cjkDisab]').prop('checked', false);
$(".cjkDisab").attr("disabled", true);
// 打码勾选--编码类型说明显示
@@ -2953,6 +2965,14 @@
layer.msg("[ 卡片 ]尺寸小于4*4 cm请以 [ 插卡 - 异形插牌 ] 报价!",{offset:['300px','300px']},function(){});
return false;
} */
+
+ if (couponKind != "少数量" && (kind == 1 || kind == 3 || kind == 4 || kind == 5 || kind == 7 || kind == 13)) {
+ if ($(".mq:checked").length == 0) {
+ layer.msg("请选择裁切类型", {offset: ['300px', '300px']}, function () {
+ });
+ return false;
+ }
+ }
var kindData = {
0: "吊旗",
1: "腰封",
@@ -2967,7 +2987,7 @@
10: "吸管套",
11: "圣诞卡",
13: "刮刮卡",
- "直角卡片": "直角卡片",
+ "直角卡片": "卡片",
"异形卡片": "异形卡片",
"腰封": "腰封",
"贺卡": "贺卡",
@@ -3412,7 +3432,6 @@
if (kind == 8) {
arr.push("模切")
} else {
- arr.push("直角裁切")
}
}
} else {
@@ -3420,7 +3439,6 @@
if (kind == 8) {
arr.push("模切")
} else {
- arr.push("直角裁切")
}
}
diff --git a/src/main/webapp/views/system/report/manage/addQuality.jsp b/src/main/webapp/views/system/report/manage/addQuality.jsp
index 0263170..1e6bb05 100644
--- a/src/main/webapp/views/system/report/manage/addQuality.jsp
+++ b/src/main/webapp/views/system/report/manage/addQuality.jsp
@@ -72,6 +72,8 @@
textImageList.forEach((item, index) => {
if (item != "" && (item.indexOf(".mp4") > -1 || item.indexOf(".MP4") > -1)) {
html += "
";
+ } else if (item != "" && (item.indexOf(".PDF") > -1 || item.indexOf(".pdf") > -1)) {
+ html += "

";
} else if (item != "") {
html += "

";
}
diff --git a/src/main/webapp/views/system/report/manage/quality.jsp b/src/main/webapp/views/system/report/manage/quality.jsp
index a8e0569..d9b2f76 100644
--- a/src/main/webapp/views/system/report/manage/quality.jsp
+++ b/src/main/webapp/views/system/report/manage/quality.jsp
@@ -73,6 +73,9 @@
let html = "
";
if (item != "" && (item.indexOf(".mp4") > -1 || item.indexOf(".MP4") > -1)) {
html += "
";
+ } else if (item != "" && (item.indexOf(".PDF") > -1 || item.indexOf(".pdf") > -1)) {
+ let pdfUrl = "/js/pdf/web/viewer.html?file=" + item.replace("https://dfdiyfile.oss-cn-fuzhou.aliyuncs.com/", "http://imagediy.lingtao8.com/");
+ html += "
";
} else if (item != "") {
html += "

";
}
@@ -137,6 +140,8 @@
let item = list[i];
if (item != "" && (item.indexOf(".mp4") > -1 || item.indexOf(".MP4") > -1)) {
html += "
";
+ } else if (item != "" && (item.indexOf(".PDF") > -1 || item.indexOf(".pdf") > -1)) {
+ html += "

";
} else if (item != "") {
html += "

";
}
@@ -229,6 +234,8 @@
textImageList.forEach((item, index) => {
if (item != "" && (item.indexOf(".mp4") > -1 || item.indexOf(".MP4") > -1)) {
html += "
";
+ } else if (item != "" && (item.indexOf(".PDF") > -1 || item.indexOf(".pdf") > -1)) {
+ html += "

";
} else if (item != "") {
html += "

";
}
diff --git a/src/main/webapp/views/system/report/reveal/quality.jsp b/src/main/webapp/views/system/report/reveal/quality.jsp
index 11c17fe..31f641e 100644
--- a/src/main/webapp/views/system/report/reveal/quality.jsp
+++ b/src/main/webapp/views/system/report/reveal/quality.jsp
@@ -61,6 +61,9 @@
let html = "
";
if (item != "" && (item.indexOf(".mp4") > -1 || item.indexOf(".MP4") > -1)) {
html += "
";
+ } else if (item != "" && (item.indexOf(".PDF") > -1 || item.indexOf(".pdf") > -1)) {
+ let pdfUrl = "/js/pdf/web/viewer.html?file=" + item.replace("https://dfdiyfile.oss-cn-fuzhou.aliyuncs.com/", "http://imagediy.lingtao8.com/");
+ html += "
";
} else if (item != "") {
html += "

";
}
@@ -109,7 +112,7 @@
title: '序号',
width: 50,
fixed: "left"
- },{
+ }, {
field: 'content',
title: '内容',
}, {
@@ -123,6 +126,8 @@
let item = list[i];
if (item != "" && (item.indexOf(".mp4") > -1 || item.indexOf(".MP4") > -1)) {
html += "
";
+ } else if (item != "" && (item.indexOf(".PDF") > -1 || item.indexOf(".pdf") > -1)) {
+ html += "

";
} else if (item != "") {
html += "

";
}