修改信封
这个提交包含在:
@@ -1735,9 +1735,18 @@ public class ProductService {
|
|||||||
if (priceList.size() >= 4) {
|
if (priceList.size() >= 4) {
|
||||||
priceList = priceList.subList(0, 4);
|
priceList = priceList.subList(0, 4);
|
||||||
}
|
}
|
||||||
|
List<String> carft_list = dto.getCraft() != null ? Arrays.asList(dto.getCraft()) : new ArrayList<>();
|
||||||
// 产品价格倍数
|
// 产品价格倍数
|
||||||
for (Product product : priceList) {
|
for (Product product : priceList) {
|
||||||
product.setPrice(Math.ceil(product.getPrice() * product.getPriceMultiple()));
|
product.setPrice(Math.ceil(product.getPrice() * product.getPriceMultiple()));
|
||||||
|
if (carft_list.contains("烫金")) {
|
||||||
|
if (carft_list.contains("2处")) {
|
||||||
|
product.setPrice(product.getPrice() + 100);
|
||||||
|
}
|
||||||
|
if (carft_list.contains("3处")) {
|
||||||
|
product.setPrice(product.getPrice() + 200);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// 根据款数重新算重量(重量在数据库中)
|
// 根据款数重新算重量(重量在数据库中)
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -10,6 +10,9 @@
|
|||||||
</head>
|
</head>
|
||||||
<!-- 彩色信封 -->
|
<!-- 彩色信封 -->
|
||||||
<style>
|
<style>
|
||||||
|
#craft_layout .layui-form-select .layui-edge {
|
||||||
|
right: 20px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
<body>
|
<body>
|
||||||
<div class="big_box">
|
<div class="big_box">
|
||||||
@@ -31,13 +34,16 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="layui-form-item" style="display:none;">
|
<div class="layui-form-item" style="display:none;">
|
||||||
<div class="layui-input-block">
|
<div class="layui-input-block">
|
||||||
<input type="radio" name="kindValue" lay-filter="k" class="kindValue" value="2" title="140克珠光冰白彩色信封">
|
<input type="radio" name="kindValue" lay-filter="k" class="kindValue" value="2"
|
||||||
<input type="radio" name="kindValue" lay-filter="k" class="kindValue" value="3" title="200克珠光冰白彩色信封">
|
title="140克珠光冰白彩色信封">
|
||||||
|
<input type="radio" name="kindValue" lay-filter="k" class="kindValue" value="3"
|
||||||
|
title="200克珠光冰白彩色信封">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="layui-form-item">
|
<div class="layui-form-item">
|
||||||
<div class="layui-input-block">
|
<div class="layui-input-block">
|
||||||
<input type="radio" name="kindValue" lay-filter="k" class="kindValue" value="4" title="250克高端珠光冰白烫金信封">
|
<input type="radio" name="kindValue" lay-filter="k" class="kindValue" value="4"
|
||||||
|
title="250克高端珠光冰白烫金信封">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<p>
|
<p>
|
||||||
@@ -132,20 +138,44 @@
|
|||||||
款数
|
款数
|
||||||
</p>
|
</p>
|
||||||
<div class="layui-form-item">
|
<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>
|
</div>
|
||||||
<p>
|
<p>
|
||||||
客户旺旺
|
客户旺旺
|
||||||
</p>
|
</p>
|
||||||
<div class="layui-form-item">
|
<div class="layui-form-item">
|
||||||
<input type="text" placeholder="请输入客户旺旺号" autocomplete="off" name="wangwang" id="wangwang" class="layui-input">
|
<input type="text" placeholder="请输入客户旺旺号" autocomplete="off" name="wangwang" id="wangwang"
|
||||||
|
class="layui-input">
|
||||||
|
</div>
|
||||||
|
<p>工艺</p>
|
||||||
|
<div id="craft_layout">
|
||||||
|
<input type="checkbox" name="craft" lay-filter="switch" value="烫金" title="烫金">
|
||||||
|
<div class="layui-inline" style="width: 100px">
|
||||||
|
<select name="craft" class="select">
|
||||||
|
<option value="1处">1处</option>
|
||||||
|
<option value="2处">2处</option>
|
||||||
|
<option value="3处">3处</option>
|
||||||
|
</select></div>
|
||||||
|
<div class="layui-inline" style="width: 100px">
|
||||||
|
<select name="craft" class="select">
|
||||||
|
<option value="金色">金色</option>
|
||||||
|
<option value="黑色">黑色</option>
|
||||||
|
<option value="红色">红色</option>
|
||||||
|
<option value="蓝色">蓝色</option>
|
||||||
|
<option value="银色">银色</option>
|
||||||
|
</select></div>
|
||||||
</div>
|
</div>
|
||||||
<hr>
|
<hr>
|
||||||
<div class="layui-form-item">
|
<div class="layui-form-item">
|
||||||
<button class="layui-btn" lay-submit="" lay-filter="acount_btn" id="queryCondBtn">计算</button>
|
<button class="layui-btn" lay-submit="" lay-filter="acount_btn" id="queryCondBtn">计算</button>
|
||||||
<button type="reset" class="layui-btn layui-btn-primary">重置</button>
|
<button type="reset" class="layui-btn layui-btn-primary">重置</button>
|
||||||
</div>
|
</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>
|
<div>
|
||||||
<textarea rows="11" cols="75" id="span_result" readonly="readonly"></textarea>
|
<textarea rows="11" cols="75" id="span_result" readonly="readonly"></textarea>
|
||||||
<%@include file="../acountExpressFee.jsp" %>
|
<%@include file="../acountExpressFee.jsp" %>
|
||||||
@@ -293,7 +323,8 @@ layui.use(['table','form','carousel'], function(){
|
|||||||
data: $(".big_box form").serialize(),
|
data: $(".big_box form").serialize(),
|
||||||
success: function (result) {
|
success: function (result) {
|
||||||
if (result.code == 100) {
|
if (result.code == 100) {
|
||||||
layer.msg(result.msg,{offset:['300px','300px']},function(){});
|
layer.msg(result.msg, {offset: ['300px', '300px']}, function () {
|
||||||
|
});
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
var data = result.data.proList;
|
var data = result.data.proList;
|
||||||
@@ -350,8 +381,27 @@ layui.use(['table','form','carousel'], function(){
|
|||||||
}
|
}
|
||||||
var kind = kindData[$('input[name="kindValue"]:checked').val()];
|
var kind = kindData[$('input[name="kindValue"]:checked').val()];
|
||||||
var number = $("#number").val();
|
var number = $("#number").val();
|
||||||
|
let craft_list = [];
|
||||||
|
$("input[name='craft']:checked").each(function () {
|
||||||
|
if (!$(this).is(':disabled')) {
|
||||||
|
craft_list.push($(this).val());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
if (craft_list.findIndex(x => x == "烫金") > -1) {
|
||||||
|
$("select[name='craft'] option:selected").each(function () {
|
||||||
|
if (!$(this).is(':disabled')) {
|
||||||
|
craft_list.push($(this).val());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
if (color == null) color = ""
|
if (color == null) color = ""
|
||||||
var span_result = kind + '\n' + kind2 + ' - ' + color + ' (同款内容)\n';
|
var span_result = kind + '\n' + kind2 + ' - ' + color + ' (同款内容)\n';
|
||||||
|
if (craft_list.length > 0) {
|
||||||
|
span_result += "工艺:" + craft_list.join(",") + '\n'
|
||||||
|
}
|
||||||
if (number > 1) {
|
if (number > 1) {
|
||||||
for (let i = 0; i < data.length; i++) {
|
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'
|
||||||
|
|||||||
在新工单中引用
屏蔽一个用户