From 3e55e48e000d22334364bcd9dfc6445e9631c70f Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Sun, 26 Nov 2023 22:21:18 +0800
Subject: [PATCH] blnka

---
 src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html |  126 +++++++++++++++++++++++++++++-------------
 1 files changed, 87 insertions(+), 39 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
index e0ef5d6..8f253a2 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -214,43 +214,44 @@
                                                            placeholder="" autoComplete="off" class="layui-input">
                                                 </div>
                                             </div>
-<!--                                            <div class="layui-col-lg6">-->
-<!--                                                <label class="layui-form-label febs-form-item-require">折扣价:</label>-->
-<!--                                                <div class="layui-input-block">-->
-<!--                                                    <input type="text" name="presentPrice" lay-verify="required"-->
-<!--                                                           placeholder="" autoComplete="off" class="layui-input">-->
-<!--                                                </div>-->
-<!--                                            </div>-->
-                                        </div>
-                                        <blockquote class="layui-elem-quote blue-border">代理价格</blockquote>
-                                        <div class="layui-row layui-col-space10 layui-form-item">
                                             <div class="layui-col-lg6">
-                                                <label class="layui-form-label febs-form-item-require">一级价格:</label>
+                                                <label class="layui-form-label febs-form-item-require">现价:</label>
                                                 <div class="layui-input-block">
-                                                    <input type="text" name="levelOnePrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
-                                                </div>
-                                            </div>
-                                            <div class="layui-col-lg6">
-                                                <label class="layui-form-label febs-form-item-require">二级价格:</label>
-                                                <div class="layui-input-block">
-                                                    <input type="text" name="levelTwoPrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="layui-row layui-col-space10 layui-form-item">
-                                            <div class="layui-col-lg6">
-                                                <label class="layui-form-label febs-form-item-require">三级价格:</label>
-                                                <div class="layui-input-block">
-                                                    <input type="text" name="levelThreePrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
+                                                    <input type="text" name="presentPrice" lay-verify="required"
+                                                           placeholder="" autoComplete="off" class="layui-input">
                                                 </div>
                                             </div>
                                         </div>
 
-<!--                                        <div class="layui-form-item">-->
-<!--                                            <label class="layui-form-label febs-form-item-require">成本价:</label>-->
-<!--                                            <div class="layui-input-block">-->
-<!--                                                <input type="text" name="costPrice" lay-verify="required" placeholder=""-->
-<!--                                                       autoComplete="off" class="layui-input">-->
+                                        <div class="layui-form-item">
+                                            <div class="layui-col-lg6">
+                                                <label class="layui-form-label febs-form-item-require">成本价:</label>
+                                                <div class="layui-input-block">
+                                                    <input type="text" name="costPrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
+                                                </div>
+                                            </div>
+                                        </div>
+<!--                                        <blockquote class="layui-elem-quote blue-border">代理价格</blockquote>-->
+<!--                                        <div class="layui-row layui-col-space10 layui-form-item">-->
+<!--                                            <div class="layui-col-lg6">-->
+<!--                                                <label class="layui-form-label febs-form-item-require">一级价格:</label>-->
+<!--                                                <div class="layui-input-block">-->
+<!--                                                    <input type="text" name="levelOnePrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                            <div class="layui-col-lg6">-->
+<!--                                                <label class="layui-form-label febs-form-item-require">二级价格:</label>-->
+<!--                                                <div class="layui-input-block">-->
+<!--                                                    <input type="text" name="levelTwoPrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                        <div class="layui-row layui-col-space10 layui-form-item">-->
+<!--                                            <div class="layui-col-lg6">-->
+<!--                                                <label class="layui-form-label febs-form-item-require">三级价格:</label>-->
+<!--                                                <div class="layui-input-block">-->
+<!--                                                    <input type="text" name="levelThreePrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">-->
+<!--                                                </div>-->
 <!--                                            </div>-->
 <!--                                        </div>-->
 
@@ -278,6 +279,16 @@
                                                 <label class="layui-form-label febs-form-item-require">邮费模板:</label>
                                                 <div class="layui-input-block">
                                                     <div id="carriage-rule"></div>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <blockquote class="layui-elem-quote blue-border">优惠卷设置</blockquote>
+                                        <div class="layui-form-item coupon-rule">
+                                            <div class="layui-col-lg6">
+                                                <label class="layui-form-label febs-form-item-require">优惠卷:</label>
+                                                <div class="layui-input-block">
+                                                    <div id="coupon-rule"></div>
                                                 </div>
                                             </div>
                                         </div>
@@ -440,6 +451,35 @@
             // initValue();
         })
 
+        var couponRule = xmSelect.render({
+            el: '#coupon-rule',
+            language: 'zn',
+            prop : {
+                value : 'id',
+                children : 'child'
+            },
+            iconfont: {
+                parent: 'hidden',
+            },
+            // radio: true,
+            clickClose: true,
+            tree: {
+                show: true,
+                //非严格模式
+                strict: false,
+            },
+            data: []
+        })
+
+        febs.get(ctx + 'admin/goods/couponTreeSet', null, function(res) {
+            couponRule.update({
+                data : res.data,
+                autoRow: true,
+            });
+
+            initValue();
+        })
+
         var carriageRule = xmSelect.render({
             el: '#carriage-rule',
             language: 'zn',
@@ -465,9 +505,8 @@
                 data : res.data,
                 autoRow: true,
             });
-
-            initValue();
         })
+
 
         var tableSkuData = [];
         var tableIns = table.render({
@@ -480,14 +519,13 @@
                 ,{field: 'index', title: '序号', width: 70}
                 ,{field: 'styleName', title: '样式', edit:'text', width:200}
                 ,{field: 'skuName', title: '规格', edit:'text', width:200}
-                ,{field: 'sample', title:'样品', width:100}
                 ,{field: 'goodsWeight', title: '重量', edit:'text', width:100}
-                // ,{field: 'presentPrice', title: '折扣价', edit:'text', width:100}
                 ,{field: 'originalPrice', title: '原价', edit:'text', width:100}
-                ,{field: 'levelOnePrice', title: '一级价格', edit:'text', width:100}
-                ,{field: 'levelTwoPrice', title: '二级价格', edit:'text', width:100}
-                ,{field: 'levelThreePrice', title: '三级价格', edit:'text', width:100}
-                // ,{field: 'costPrice', title: '成本价', edit:'text', width:100}
+                ,{field: 'presentPrice', title: '现价', edit:'text', width:100}
+                // ,{field: 'levelOnePrice', title: '一级价格', edit:'text', width:100}
+                // ,{field: 'levelTwoPrice', title: '二级价格', edit:'text', width:100}
+                // ,{field: 'levelThreePrice', title: '三级价格', edit:'text', width:100}
+                ,{field: 'costPrice', title: '成本价', edit:'text', width:100}
                 ,{templet: '#tableImgUpload', title: '缩略图', width:150}
                 ,{field: 'stock', title: '库存', edit:'text', width:100}
                 ,{field: 'skuVolume', title: '销量', edit:'text', width:100}
@@ -770,6 +808,8 @@
             arrCarriageRule.push(goodsInfo.carriageRuleId)
             carriageRule.setValue(arrCarriageRule);
 
+            couponRule.setValue(goodsInfo.couponIds);
+
             if (goodsInfo.isNormal == 2) {
                 $(".tc-set").show();
             }
@@ -822,6 +862,14 @@
         }
 
         form.on('submit(goods-update-form-submit)', function (data) {
+            let couponRuleList = couponRule.getValue();
+            if (couponRuleList.length > 0) {
+                var couponIds = [];
+                layui.each(couponRuleList, function (key, item) {
+                    couponIds.push(item.id)
+                });
+                data.field.couponIds=couponIds;
+            }
             data.field.goodsType=1;
             data.field.mailGoodsSkuDto = tableSkuData;
             data.field.delSkuId=delSku;

--
Gitblit v1.9.1