From a5c67e27c22831e54e0a4b9eb22166368d446673 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 18 Mar 2021 15:27:03 +0800
Subject: [PATCH] 积分商城1

---
 zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-form.html |  103 ++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 80 insertions(+), 23 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 dec22fc..3d20568 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
@@ -42,7 +42,7 @@
                         <div class="panel-heading">基本信息</div>
                         <div class="panel-body">
                             <div class="form-group">
-                                <label class="col-sm-2 control-label">分类ID
+                                <label class="col-sm-2 control-label">产品分类
                                     <span class="text-danger">*</span>
                                 </label>
                                 <div class="col-sm-4">
@@ -69,6 +69,40 @@
                                            maxLength="1000" dataType="*"
                                            th:value="${obj.briefIntroduction}" nullmsg="产品简介不能为空">
                                 </div>
+                                <label class="col-sm-2 control-label">是否可分销
+                                    <span class="text-danger">*</span>
+                                </label>
+                                <div class="col-sm-4">
+                                    <select th:field="${obj.ableSales}" class="form-control select2 " size="1"
+                                            name="ableSales"
+                                            id="ableSales" style="width: 100%">
+                                        <option value="1" th:selected="${obj.ableSales == '1'}">可分销</option>
+                                        <option value="2" th:selected="${obj.ableSales == '2'}">不可分销</option>
+                                        </option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label">上架卖场
+                                    <span class="text-danger">*</span>
+                                </label>
+                                <div class="col-sm-4">
+                                    <select th:field="${obj.mallType}" class="form-control select2 " size="1"
+                                            name="mallType"
+                                            id="mallType" style="width: 100%">
+                                        <option value="1" th:selected="${obj.mallType == '1'}">微商城</option>
+                                        <option value="2" th:selected="${obj.mallType == '2'}">积分商城</option>
+                                        </option>
+                                    </select>
+                                </div>
+                                <label class="col-sm-2 control-label">积分商城分类
+                                    <span class="text-danger">*</span>
+                                </label>
+                                <div class="col-sm-4">
+                                    <select class="form-control select2 " size="1" name="scoreCategoryId"
+                                            id="scoreCategoryId" style="width: 100%">
+                                    </select>
+                                </div>
 
                             </div>
                             <div class="form-group">
@@ -87,14 +121,7 @@
                                            dataType="n" nullmsg="展示销量不能为空"
                                            th:value="${obj.dsVolume}" errormsg="请填写数字">
                                 </div>
-                                <!--<label class="col-sm-2 control-label">运费
-                                    <span class="text-danger">*</span>
-                                </label>
-                                <div class="col-sm-4">
-                                    <input autocomplete="off"   type="text" class="form-control" name="carriage"
-                                           maxLength="250" datatype="*"
-                                           th:value="${obj.carriage}" nullmsg="运费不能为空">
-                                </div>-->
+
                             </div>
                             <div class="form-group">
                                 <label class="col-sm-2 control-label">限购数量
@@ -226,11 +253,12 @@
                                     <th>规格图片地址<span class="text-danger">*</span></th>
                                     <th>库存<span class="text-danger">*</span></th>
                                     <th>价格<span class="text-danger">*</span></th>
-                                    <th>积分</th>
+                                    <th>消费可得积分</th>
                                     <th>关联ERP产品</th>
                                     <th>排序</th>
                                     <th>推广提成</th>
                                     <th>邀请提成</th>
+                                    <th>兑换所需积分</th>
                                     <th>操作</th>
                                 </tr>
                             </table>
@@ -395,6 +423,9 @@
     });
     $(function () {
         initSeclect("#parentId",[[${obj.categoryId}]]);
+        initScoreSeclect("#scoreCategoryId",[[${obj.scoreCategoryId}]]);
+
+
         initAttrSeclect("#attrIds");
         $("#mobileDetails").html(obj.mobileDetails);
         $("#pcDetails").html(obj.pcDetails);
@@ -538,6 +569,10 @@
             if (invitationPrice == null || typeof invitationPrice == 'undefined') {
                 invitationPrice = "";
             }
+   var scorePrice = shopSkus[c].scorePrice;
+            if (scorePrice == null || typeof scorePrice == 'undefined') {
+                scorePrice = "";
+            }
 
 
             var html=
@@ -554,6 +589,7 @@
                 +'<td><input autocomplete="off"   type="text" class="form-control"  value="'+sort+'" 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><i class="fa fa-trash form-control-static"	onclick="delThis(\''+trId+'\')"></i></td>'
                 +'</tr>';
             $("#skutable").find("tbody").append(html);
@@ -668,6 +704,22 @@
                     });
             });
     }
+    //初始化分积分商城分类ID
+    function initScoreSeclect(seler, def) {
+        $.AjaxProxy().invoke(basePath + "/admin/shopProductAttribute/showSonAttribute?attrCode=jfsccpfl&status=1",
+            function (loj) {
+                $(seler).createSelectTree(
+                    loj.attr("result").rows,
+                    {
+                        id: "attrId",
+                        parent: "parentId",
+                        value: "attrName",
+                        append: false,
+                        defaultValue: def,
+                        defaultHtml: ''
+                    });
+            });
+    }
 
     //添加图片节点
     function addImgTr() {
@@ -724,68 +776,72 @@
             if (i != 0) {
                 var tds = $(this).find("td");
                 var length = tds.length - 1;
-                var id = tds.eq(length - 10).find("input").val();
+                var id = tds.eq(length - 11).find("input").val();
                 if(id == null){
                     id ="";
                 }
                 sku.id = id;
 
                 //规格名称
-                var name = tds.eq(length - 9).find("input").val();
+                var name = tds.eq(length - 10).find("input").val();
                 if(name == null){
                     name = "";
                 }
                 sku.name = name;
 
                 //图片地址
-                var path = tds.eq(length - 8).find("img").attr("src");
+                var path = tds.eq(length - 9).find("img").attr("src");
                 if(path == null){
                     path = "";
                 }
                 sku.imgPath = path;
 
                 //库存
-                var stock = tds.eq(length - 7).find("input").val();
+                var stock = tds.eq(length - 8).find("input").val();
                 if(stock == ""){
                     stock = 0;
                 }
                 sku.stock = stock;
 
                 //价格
-                var price = tds.eq(length -6).find("input").val();
+                var price = tds.eq(length -7).find("input").val();
                 if(price == ""){
                     price =0;
                 }
                 sku.price = price;
 
                 //积分
-                var score = tds.eq(length - 5).find("input").val();
+                var score = tds.eq(length - 6).find("input").val();
                 if(score == ""){
                     score = 0;
                 }
                 sku.score = score;
 
                 //品种编码
-                var stockCode = tds.eq(length - 4).find("input").val();
+                var stockCode = tds.eq(length - 5).find("input").val();
                 if(stockCode == null || typeof stockCode == 'undefined'){
                     stockCode = '';
                 }
                 sku.stockCode = stockCode;
 
                 //排序
-                var sort = tds.eq(length - 3).find("input").val();
+                var sort = tds.eq(length - 4).find("input").val();
                 if(sort == ""){
                     sort = 0;
                 }
                 sku.sort = sort;
 
                 //推广提成
-                var sealesPrice = tds.eq(length - 2).find("input").val();
+                var sealesPrice = tds.eq(length - 3).find("input").val();
                 sku.sealesPrice = sealesPrice;
 
                 //邀请提成
-                var invitationPrice = tds.eq(length - 1).find("input").val();
+                var invitationPrice = tds.eq(length - 2).find("input").val();
                 sku.invitationPrice = invitationPrice;
+
+                //兑换所需积分
+                var scorePrice = tds.eq(length - 1).find("input").val();
+                sku.scorePrice = scorePrice;
 
                 skus.push(sku);
             }
@@ -793,6 +849,7 @@
 
         return skus;
     }
+
 
     /*验证sku表格中的参数*/
     function getSkusValues() {
@@ -803,7 +860,7 @@
             if (i != 0) {
                 var tds = $(this).find("td");
                 var length = tds.length - 1;
-                var name = tds.eq(length - 9).find("input").val();
+                var name = tds.eq(length - 10).find("input").val();
                 if(name == ""){
                     layer.msg("请填写规格名称",{
                         icon : 2,
@@ -821,7 +878,7 @@
                     return false;
                 }
 
-                var stock = tds.eq(length -7).find("input").val();
+                var stock = tds.eq(length -8).find("input").val();
                 if(stock == ""){
                     layer.msg("请填写库存",{
                         icon : 2,
@@ -830,7 +887,7 @@
                     flag = true;
                     return false;
                 }
-                var price = tds.eq(length - 6).find("input").val();
+                var price = tds.eq(length - 7 ).find("input").val();
                 if(price == ""){
                     layer.msg("请填写价格",{
                         icon : 2,

--
Gitblit v1.9.1