From e53fcbe9fe844b7788b29c5106c1ac24d17c5535 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 08 May 2021 22:40:19 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-form.html | 114 +++++++++++++++++++++++++++++----------------------------
1 files changed, 58 insertions(+), 56 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-form.html b/zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-form.html
index e6b0421..d8ed383 100644
--- a/zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-form.html
@@ -144,42 +144,7 @@
</div>
</div>
- <div class="form-group">
- <label class="col-sm-2 control-label">是否为服务项目
- </label>
- <div class="col-sm-4">
- <select th:field="${obj.isService}" class="form-control " size="1"
- name="isService"
- id="isService" style="width: 100%">
- <option value="2" th:selected="${obj.isService == '2'}">否</option>
- <option value="1" th:selected="${obj.isService == '1'}">是</option>
- </option>
-
- </select>
- </div>
-
- <label class="col-sm-2 control-label">服务时长
- </label>
- <div class="col-sm-4">
- <input autocomplete="off" type="text" class="form-control" name="serviceTime"
- maxLength="50"
- th:value="${obj.serviceTime}" >
- </div>
-
-
- </div>
-
- <!--<div class="form-group">
-
- <label class="col-sm-2 control-label">真实销量
- </label>
- <div class="col-sm-4">
- <input autocomplete="off" type="text" class="form-control" name="rsVolume"
-
- th:value="${obj.rsVolume}" errormsg="请填写数字">
- </div>
- </div>-->
<div class="form-group">
<label class="col-sm-2 control-label">属性设置 </label>
<input autocomplete="off" name="attrs" id="attrs" type="hidden" >
@@ -256,8 +221,10 @@
<th>消费可得积分</th>
<th>关联ERP产品</th>
<th>排序</th>
+ <th>自购返佣</th>
<th>推广提成</th>
<th>邀请提成</th>
+ <th>兑换所需金额</th>
<th>兑换所需积分</th>
<th>操作</th>
</tr>
@@ -387,6 +354,9 @@
<input autocomplete="off" type="hidden" class="form-control" name="erpGoodsCode">
</div></td>
<td><input autocomplete="off" type="text" class="form-control" name=""></td>
+ <td><input autocomplete="off" type="text" class="form-control" name=""></td>
+ <td><input autocomplete="off" type="text" class="form-control" name=""></td>
+ <td><input autocomplete="off" type="text" class="form-control" name=""></td>
<td><input autocomplete="off" type="text" class="form-control" name=""></td>
<td><input autocomplete="off" type="text" class="form-control" name=""></td>
<td><i class="fa fa-trash form-control-static" onclick="delThis('trId')"></i></td>
@@ -560,7 +530,10 @@
if (goodsName == null || typeof stockCode == 'undefined') {
goodsName = "";
}
-
+ var selfPrice = shopSkus[c].selfPrice;
+ if (selfPrice == null || typeof selfPrice == 'undefined') {
+ selfPrice = "";
+ }
var sealesPrice = shopSkus[c].sealesPrice;
if (sealesPrice == null || typeof sealesPrice == 'undefined') {
sealesPrice = "";
@@ -572,6 +545,10 @@
var scorePrice = shopSkus[c].scorePrice;
if (scorePrice == null || typeof scorePrice == 'undefined') {
scorePrice = "";
+ }
+ var scoreCount = shopSkus[c].scoreCount;
+ if (scoreCount == null || typeof scoreCount == 'undefined') {
+ scoreCount = "";
}
@@ -587,9 +564,11 @@
+'<td><div id="erpNoDiv"><button class="btn btn-info" onclick="selectProduct(\'shopIdValue\',\''+trId+'\')"><i class="fa fa-plus"></i></button>'
+'<p class="form-control-static erpGoodsName">'+ goodsName +'</p><input autocomplete="off" class="form-control" type="hidden" value="'+stockCode+'" name="erpGoodsCode"></div></td>'
+'<td><input autocomplete="off" type="text" class="form-control" value="'+sort+'" name=""></td>'
+ +'<td><input autocomplete="off" type="text" class="form-control" value="'+selfPrice+'" name=""></td>'
+'<td><input autocomplete="off" type="text" class="form-control" value="'+sealesPrice+'" name=""></td>'
+'<td><input autocomplete="off" type="text" class="form-control" value="'+invitationPrice+'" name=""></td>'
+'<td><input autocomplete="off" type="text" class="form-control" value="'+scorePrice+'" name=""></td>'
+ +'<td><input autocomplete="off" type="text" class="form-control" value="'+scoreCount+'" name=""></td>'
+'<td><i class="fa fa-trash form-control-static" onclick="delThis(\''+trId+'\')"></i></td>'
+'</tr>';
$("#skutable").find("tbody").append(html);
@@ -653,10 +632,6 @@
layer.msg(result.info, {
icon : 2,
time : 1000,
- end:function(){
- parent.myGrid.serchData();
- MTools.closeForm()
- }
});
return null;
}
@@ -776,72 +751,77 @@
if (i != 0) {
var tds = $(this).find("td");
var length = tds.length - 1;
- var id = tds.eq(length - 11).find("input").val();
+ var id = tds.eq(length - 13).find("input").val();
if(id == null){
id ="";
}
sku.id = id;
//规格名称
- var name = tds.eq(length - 10).find("input").val();
+ var name = tds.eq(length - 12).find("input").val();
if(name == null){
name = "";
}
sku.name = name;
//图片地址
- var path = tds.eq(length - 9).find("img").attr("src");
+ var path = tds.eq(length - 11).find("img").attr("src");
if(path == null){
path = "";
}
sku.imgPath = path;
//库存
- var stock = tds.eq(length - 8).find("input").val();
+ var stock = tds.eq(length - 10).find("input").val();
if(stock == ""){
stock = 0;
}
sku.stock = stock;
//价格
- var price = tds.eq(length -7).find("input").val();
+ var price = tds.eq(length -9).find("input").val();
if(price == ""){
price =0;
}
sku.price = price;
//积分
- var score = tds.eq(length - 6).find("input").val();
+ var score = tds.eq(length - 8).find("input").val();
if(score == ""){
score = 0;
}
sku.score = score;
//品种编码
- var stockCode = tds.eq(length - 5).find("input").val();
+ var stockCode = tds.eq(length - 7).find("input").val();
if(stockCode == null || typeof stockCode == 'undefined'){
stockCode = '';
}
sku.stockCode = stockCode;
//排序
- var sort = tds.eq(length - 4).find("input").val();
+ var sort = tds.eq(length - 6).find("input").val();
if(sort == ""){
sort = 0;
}
sku.sort = sort;
-
//推广提成
- var sealesPrice = tds.eq(length - 3).find("input").val();
+ var selfPrice = tds.eq(length - 5).find("input").val();
+ sku.selfPrice = selfPrice;
+ //推广提成
+ var sealesPrice = tds.eq(length - 4).find("input").val();
sku.sealesPrice = sealesPrice;
//邀请提成
- var invitationPrice = tds.eq(length - 2).find("input").val();
+ var invitationPrice = tds.eq(length - 3).find("input").val();
sku.invitationPrice = invitationPrice;
- //兑换所需积分
- var scorePrice = tds.eq(length - 1).find("input").val();
+ //兑换所需金额
+ var scorePrice = tds.eq(length - 2).find("input").val();
sku.scorePrice = scorePrice;
+ //兑换所需积分
+ var scoreCount = tds.eq(length - 1).find("input").val();
+ sku.scoreCount = scoreCount;
skus.push(sku);
}
@@ -853,6 +833,11 @@
/*验证sku表格中的参数*/
function getSkusValues() {
+
+ var ableScorePay=$("#ableScorePay").val();
+ var ableSales=$("#ableSales").val();
+
+
var flag = false;
var reg = new RegExp("(^[1-9]([0-9]+)?(\\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\\.[0-9]([0-9])?$)");
$("#skutable tbody").find("tr").each(function(i) {
@@ -860,7 +845,24 @@
if (i != 0) {
var tds = $(this).find("td");
var length = tds.length - 1;
- var name = tds.eq(length - 10).find("input").val();
+
+
+ if(ableScorePay==1){
+ //兑换所需金额
+ var scorePrice = tds.eq(length - 2).find("input").val();
+ //兑换所需积分
+ var scoreCount = tds.eq(length - 1).find("input").val();
+ if(scorePrice == ""||scoreCount==""){
+ layer.msg("请填写兑换所需金额和积分",{
+ icon : 2,
+ time : 2000
+ });
+ flag = true;
+ return false;
+ }
+ }
+
+ var name = tds.eq(length - 12).find("input").val();
if(name == ""){
layer.msg("请填写规格名称",{
icon : 2,
@@ -878,7 +880,7 @@
return false;
}
- var stock = tds.eq(length -8).find("input").val();
+ var stock = tds.eq(length -10).find("input").val();
if(stock == ""){
layer.msg("请填写库存",{
icon : 2,
@@ -887,7 +889,7 @@
flag = true;
return false;
}
- var price = tds.eq(length - 7 ).find("input").val();
+ var price = tds.eq(length - 9 ).find("input").val();
if(price == ""){
layer.msg("请填写价格",{
icon : 2,
--
Gitblit v1.9.1