删除无用扇,修改pet,修改插卡
此提交包含在:
@@ -577,7 +577,7 @@ public class ProductService {
|
||||
if ("1".equals(dto.getKindValue())) {
|
||||
priceList = new PriceUtils().getInsertCard(size, count);
|
||||
} else {
|
||||
if ("9".equals(dto.getKindValue()) || "10".equals(dto.getKindValue())) {
|
||||
if ("9".equals(dto.getKindValue()) || "10".equals(dto.getKindValue()) || "14".equals(dto.getKindValue()) || "15".equals(dto.getKindValue())) {
|
||||
dto.setKindValue("4");
|
||||
} else if ("11".equals(dto.getKindValue())) {
|
||||
dto.setKindValue("8");
|
||||
|
||||
@@ -26,11 +26,11 @@
|
||||
款式
|
||||
</p>
|
||||
<%-- <input type="radio" name="kindValue" lay-filter="kindValue" value="0" title="短铆钉">--%>
|
||||
<input type="radio" name="kindValue" lay-filter="kindValue" value="1" title="长铆钉" checked="checked">
|
||||
<%--<input type="radio" name="kindValue" lay-filter="kindValue" value="1" title="长铆钉" checked="checked">
|
||||
<input type="radio" name="kindValue" lay-filter="kindValue" value="2" title="普通中柄(卡扣)">
|
||||
<input type="radio" name="kindValue" lay-filter="kindValue" value="3" title="筷子柄">
|
||||
<input type="radio" name="kindValue" lay-filter="kindValue" value="4" title="团扇">
|
||||
<input type="radio" name="kindValue" lay-filter="kindValue" value="5" title="o柄">
|
||||
<input type="radio" name="kindValue" lay-filter="kindValue" value="5" title="o柄">--%>
|
||||
<input type="radio" name="kindValue" lay-filter="kindValue" value="6" title="竹柄扇">
|
||||
<p>
|
||||
规格
|
||||
|
||||
@@ -87,32 +87,45 @@
|
||||
款数
|
||||
</p>
|
||||
<div class="layui-form-item">
|
||||
<input type="text" placeholder="请输入整数" autocomplete="off" name="number" id="number" value="1" class="layui-input" lay-verify="number">
|
||||
<input type="text" placeholder="请输入整数" autocomplete="off" name="number" id="number" value="1"
|
||||
class="layui-input" lay-verify="number">
|
||||
</div>
|
||||
<p>
|
||||
客户旺旺
|
||||
</p>
|
||||
<div class="layui-form-item">
|
||||
<input type="text" placeholder="请输入客户旺旺号" autocomplete="off" name="wangwang" id="wangwang"
|
||||
class="layui-input">
|
||||
</div>
|
||||
<p>工艺</p>
|
||||
<div class="layui-form-item ui_normal">
|
||||
<input type="radio" name="craftQie" class="moqie" value="模切" lay-skin="primary" title="模切" checked="checked">
|
||||
<input type="radio" name="craftQie" class="moqie" value="模切" lay-skin="primary" title="模切"
|
||||
checked="checked">
|
||||
</div>
|
||||
<div class="layui-form-item auto" style="display: none;">
|
||||
<input type="radio" name="craftauto" value="击凸" lay-skin="primary" title="击凸" checked>
|
||||
<input type="radio" name="craftauto" value="压凹" lay-skin="primary" title="压凹">
|
||||
</div>
|
||||
<div class="ui_wq" style="display: none;">
|
||||
<input type="radio" name="craftQie" class="moqie" value="模切" lay-skin="primary" title="模切" checked="checked">
|
||||
<input type="radio" name="craftQie" class="moqie" value="模切" lay-skin="primary" title="模切"
|
||||
checked="checked">
|
||||
<input type="radio" name="craftTang" value="单面烫金" lay-skin="primary" title="单面烫金" checked="checked">
|
||||
<br/>
|
||||
<input type="radio" name="craftShua" value="无" lay-skin="primary" title="无" checked="checked">
|
||||
<input type="radio" name="craftShua" value="银铝箔纸" lay-skin="primary" title="银铝箔纸">
|
||||
<input type="radio" name="craftShua" value="金铝箔纸" lay-skin="primary" title="金铝箔纸">
|
||||
</div>
|
||||
<p>
|
||||
客户旺旺
|
||||
</p>
|
||||
<div class="layui-form-item">
|
||||
<input type="text" placeholder="请输入客户旺旺号" autocomplete="off" name="wangwang" id="wangwang" class="layui-input">
|
||||
</div>
|
||||
|
||||
<hr>
|
||||
<div class="layui-form-item">
|
||||
<button class="layui-btn" lay-submit="" lay-filter="acount_btn">计算</button>
|
||||
<button type="reset" class="layui-btn layui-btn-primary">重置</button>
|
||||
</div>
|
||||
<h2>计算结果-<button type="button" class="layui-btn layui-btn-primary layui-btn-sm copyResult" onclick="copyResult()">点击复制</button></h2>
|
||||
<h2>计算结果-
|
||||
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm copyResult"
|
||||
onclick="copyResult()">点击复制
|
||||
</button>
|
||||
</h2>
|
||||
<div>
|
||||
<textarea rows="13" cols="75" id="span_result" readonly="readonly"></textarea>
|
||||
<%@include file="../acountExpressFee.jsp" %>
|
||||
@@ -153,7 +166,18 @@
|
||||
dataType: "json",
|
||||
success: function (result) {
|
||||
$.each(result, function (index, item) {
|
||||
//哑金哑银凹凸插卡
|
||||
if (index == 9) {
|
||||
$('#kindValue').append(new Option("哑金插卡", index));//往下拉菜单里添加元素
|
||||
$('#kindValue').append(new Option("哑银插卡", 14));//往下拉菜单里添加元素
|
||||
}
|
||||
//亮金亮银凹凸插卡
|
||||
else if (index == 10) {
|
||||
$('#kindValue').append(new Option("亮金插卡", index));//往下拉菜单里添加元素
|
||||
$('#kindValue').append(new Option("亮银插卡", 15));//往下拉菜单里添加元素
|
||||
} else {
|
||||
$('#kindValue').append(new Option(item, index));//往下拉菜单里添加元素
|
||||
}
|
||||
});
|
||||
layui.form.render("select");
|
||||
}
|
||||
@@ -165,14 +189,21 @@
|
||||
// 清空轮播图
|
||||
$("#carousel").empty();
|
||||
$("#remark").empty();
|
||||
|
||||
let kindValue = $("#kindValue").val();
|
||||
if (kindValue == 14) {
|
||||
kindValue = 9;
|
||||
}
|
||||
if (kindValue == 15) {
|
||||
kindValue = 10;
|
||||
}
|
||||
let prams = {
|
||||
proTypeValue: $("#proTypeValue").val(),
|
||||
kindValue: kindValue
|
||||
}
|
||||
$.ajax({
|
||||
url: "${pageContext.request.contextPath}/getImgs",
|
||||
type: "GET",
|
||||
data:{
|
||||
proTypeValue : $("#proTypeValue").val(),
|
||||
kindValue : $("#kindValue").val()
|
||||
},
|
||||
data: prams,
|
||||
success: function (result) {
|
||||
for (let i = 0; i < result.length; i++) {
|
||||
// 只留一个remark
|
||||
@@ -198,6 +229,8 @@
|
||||
}
|
||||
}
|
||||
});
|
||||
$(".auto").find(":input").attr("disabled", true);
|
||||
$(".auto").hide();
|
||||
if (data.value == 7) {
|
||||
$(".ui_wq").find(":input").attr("disabled", false);
|
||||
$(".ui_wq").show();
|
||||
@@ -209,6 +242,10 @@
|
||||
$(".ui_wq").find(":input").attr("disabled", true);
|
||||
$(".ui_wq").hide();
|
||||
}
|
||||
if (data.value == 9 || data.value == 10 || data.value == 14 || data.value == 15) {
|
||||
$(".auto").find(":input").attr("disabled", false);
|
||||
$(".auto").show();
|
||||
}
|
||||
if (data.value == 1) {
|
||||
$(".size1").find(":input").attr("disabled", false);
|
||||
$(".size1").show();
|
||||
@@ -231,6 +268,7 @@
|
||||
$(".ui_size").hide();
|
||||
$(".ui_size").find(":input").attr("disabled", true);
|
||||
}
|
||||
form.render();
|
||||
});
|
||||
|
||||
//点击计算,计算价格
|
||||
@@ -243,16 +281,19 @@
|
||||
size = $(".ui_size :checked").val();
|
||||
} else {
|
||||
if (!size) {
|
||||
layer.msg('请填写尺寸!',{offset:['300px','300px']},function(){});
|
||||
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)) {
|
||||
layer.msg("[ 插卡 ]尺寸不能超过9*5.4 cm !",{offset:['300px','300px']},function(){});
|
||||
layer.msg("[ 插卡 ]尺寸不能超过9*5.4 cm !", {offset: ['300px', '300px']}, function () {
|
||||
});
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
var craftQie = $("input[name='craftQie']:checked").val();
|
||||
var craftauto = $("input[name='craftauto']:checked").val();
|
||||
var number = $("#number").val();
|
||||
var kindData = {
|
||||
0: "异形插牌",
|
||||
@@ -263,11 +304,13 @@
|
||||
5: "透明烫金插牌",
|
||||
7: "弯曲插卡",
|
||||
8: "400g卡纸双面烫金",
|
||||
9 :"哑金哑银凹凸插卡",
|
||||
10 :"亮金亮银凹凸插卡",
|
||||
9: "哑金插卡",
|
||||
10: "亮金插卡",
|
||||
11: "镭射银插卡",
|
||||
12: "400克旋转插卡单面烫金(烫银)",
|
||||
13 :"350克铜版纸印刷+凹凸"
|
||||
13: "350克铜版纸印刷+凹凸",
|
||||
14: "哑银插卡",
|
||||
15: "亮银插卡",
|
||||
};
|
||||
var kindValue = kindData[kind];
|
||||
$.ajax({
|
||||
@@ -276,7 +319,8 @@
|
||||
data: $(".big_box form").serialize(),
|
||||
success: function (result) {
|
||||
if (result.code == 100) {
|
||||
layer.msg(result.msg,{offset:['300px','300px']},function(){});
|
||||
layer.msg(result.msg, {offset: ['300px', '300px']}, function () {
|
||||
});
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -287,7 +331,11 @@
|
||||
craftQie += "," + $("input[name='craftShua']:checked").val();
|
||||
}
|
||||
}
|
||||
var span_result ='插卡 - ' + kindValue + ' - ' + size + "厘米 -" + craftQie + "(同款内容) "+'\n';
|
||||
if (kind == 9 || kind == 10 || kind == 14 || kind == 15) {
|
||||
craftQie += "," + craftauto;
|
||||
}
|
||||
var span_result = '插卡 - ' + kindValue + ' - ' + size + "厘米 - (同款内容) " + '\n';
|
||||
span_result += '工艺:' + craftQie + '\n';
|
||||
if (number > 1) {
|
||||
for (let i = 0; i < data.length; i++) {
|
||||
span_result += number + '款 各' + data[i].count + "个,共" + data[i].price + "元" + '\n'
|
||||
|
||||
@@ -250,12 +250,12 @@
|
||||
|
||||
if (number > 1) {
|
||||
for (let i = 0; i < data.length; i++) {
|
||||
span_result += number + '款 各' + data[i].count + "条,共" + data[i].price + "元" + '\n'
|
||||
span_result += number + '款 各' + data[i].count + "张,共" + data[i].price + "元" + '\n'
|
||||
data[i].number = number;
|
||||
}
|
||||
} else {
|
||||
for (let i = 0; i < data.length; i++) {
|
||||
span_result += number + '款 ' + data[i].count + "条,共" + data[i].price + "元" + '\n'
|
||||
span_result += number + '款 ' + data[i].count + "张,共" + data[i].price + "元" + '\n'
|
||||
data[i].number = number;
|
||||
}
|
||||
}
|
||||
|
||||
新增問題並參考
封鎖使用者