From d7c7a6e9d05eec7b38b41b8ae39f373f650ca891 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期三, 15 五月 2024 14:48:03 +0800
Subject: [PATCH] no message

---
 CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html |   56 +++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html
index bc12bf6..47a6359 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html
@@ -183,7 +183,7 @@
                                 1銆侀�夋嫨瀵瑰簲鐨勩�愬晢鍝佺被鍨嬨�戯紝灏嗚繘鍏ュSKU璐у搧妯″紡銆傚悓鏃跺鏋滅被鍒湁鍙傛暟锛屼篃灏嗚繘琛屾樉绀鸿缃��<br/>
                                 2銆佽缃SKU鍚庯紝鍟嗗搧鏈韩鐨勪环鏍煎彧鍋氬澶栧睍绀虹敤锛屽疄闄呬互杩涘叆鍟嗗搧璇︽儏閫夋嫨涓嶅悓璐у搧涓哄噯銆�<br/>
                                 3銆佽揣鍝丼KU缁勫悎灞炴�у�煎彧鏀寔锛氫腑鏂囥�佽嫳鏂囥�佹暟瀛椼�佸ぇ鍐欑鍙凤紝灏忓啓绗﹀彿涓変釜锛�-銆�/銆�.锛夛級<br/>
-                                4銆佽揣鍙峰繀椤讳负SN瀛楁瘝寮�澶�<br/>
+                                4銆佽揣鍝佺紪鐮佸繀椤讳负SN瀛楁瘝寮�澶�<br/>
                                 5銆佸鏋滀笉璁剧疆鍗曡揣鍝侀噸閲忥紝灏嗛粯璁や娇鐢ㄥ晢鍝侀噸閲忎负1涓崟浣嶇殑閲嶉噺銆�
                             </blockquote>-->
 
@@ -309,19 +309,23 @@
             <tr>
                 <th>榛樿璐у搧</th>
                 <th>鍥剧墖</th>
-                <th>璐у彿</th>
+                <th>璐у搧缂栫爜</th>
                 <th>SKU</th>
                 <th>閲嶉噺(鍏�)</th>
                 <!-- <th>璧犻�佺Н鍒�</th>
                 <th>绉垎鏈�澶�<br />鍙姷閲戦</th> -->
-                <th>搴撳瓨</th>
-                <th><i class="required-color">*</i>閿�鍞环</th>
-                <th>鎴愭湰浠�</th>
-                <th>甯傚満浠�</th>
-                <th>涓�绾ц繑鐜�</th>
-                <!-- <th>浜岀骇杩旂幇</th>
-                <th>涓夌骇杩旂幇</th> -->
+                <th>搴撳瓨鏁伴噺</th>
                 <th>鍐荤粨搴撳瓨</th>
+                <th style="width: 60px;">寤鸿闆跺敭浠�</th>
+                <th><i class="required-color">*</i>閿�鍞环</th>
+                <th>缁忛攢鍟嗕环</th>
+                <th>鎴愭湰浠�</th>               
+                
+                <th style="width: 60px;">鎺ㄥ箍缁忛攢鍟嗛噰璐繑鐜�</th>
+                <th>鎺ㄥ箍鐢ㄦ埛璐拱杩旂幇</th>
+                <!-- <th>浜岀骇杩旂幇</th>
+                <!-- <th>涓夌骇杩旂幇</th> --> -->
+          
                 <th>鎿嶄綔</th>
             </tr>
         </thead>
@@ -353,7 +357,7 @@
                     </div>
                 </td>
                 <td>
-                    <input type="text" name="product[sn][]" value="{{item.sn}}" placeholder="璐у彿" class="layui-input layui-inline-3">
+                    <input type="text" name="product[sn][]" value="{{item.sn}}" placeholder="璐у搧缂栫爜" class="layui-input layui-inline-3">
                 </td>
                 <td>
                     <input type="hidden" name="product[spesDesc][]" value="{{item.spesDesc}}" placeholder="SKU" class="layui-input">
@@ -372,16 +376,27 @@
                     <input type="number" name="product[stock][]" value="{{item.stock}}" placeholder="搴撳瓨" class="layui-input layui-inline-1 goods-stock">
                 </td>
                 <td>
+                    {{item.freezeStock}}
+                </td>
+                <td>
+                    <input type="text" name="product[mktprice][]" value="{{item.mktprice}}" placeholder="寤鸿闆跺敭浠�" class="layui-input layui-inline-1">
+                </td>
+                <td>
                     <input type="text" name="product[price][]" value="{{item.price}}" placeholder="閿�鍞环" class="layui-input layui-inline-1">
+                </td>
+                <td>
+                 
+                    <input type="text" name="product[distributionPrice][]" value="{{item.distributionPrice||'0'}}" placeholder="缁忛攢鍟嗕环" class="layui-input layui-inline-1">
                 </td>
                 <td>
                     <input type="text" name="product[costprice][]" value="{{item.costprice}}" placeholder="鎴愭湰浠�" class="layui-input layui-inline-1">
                 </td>
+               
                 <td>
-                    <input type="text" name="product[mktprice][]" value="{{item.mktprice}}" placeholder="甯傚満浠�" class="layui-input layui-inline-1">
+                    <input type="text" name="product[distributionCutMoney][]" value="{{item.distributionCutMoney||'0'}}" placeholder="鎺ㄥ箍缁忛攢鍟嗛噰璐繑鐜�" class="layui-input layui-inline-1">
                 </td>
                 <td>
-                    <input type="text" name="product[levelOne][]" value="{{item.levelOne}}" placeholder="缁忛攢鍟嗚繑鐜�" class="layui-input layui-inline-1">
+                    <input type="text" name="product[cutMoney][]" value="{{item.cutMoney||'0'}}" placeholder="鎺ㄥ箍鏅�氱敤鎴疯喘涔拌繑鐜�" class="layui-input layui-inline-1">
                 </td>
                 <!-- <td>
                     <input type="text" name="product[levelTwo][]" value="{{item.levelTwo}}" placeholder="浜岀骇杩旂幇" class="layui-input layui-inline-1">
@@ -389,9 +404,7 @@
                 <td>
                     <input type="text" name="product[levelThree][]" value="{{item.levelThree}}" placeholder="涓夌骇杩旂幇" class="layui-input layui-inline-1">
                 </td> -->
-                <td>
-                    {{item.freezeStock}}
-                </td>
+             
                 <td>
                     <a class="layui-btn layui-btn-danger layui-btn-xs del-class" lay-active="delTr">鍒犻櫎</a>
                 </td>
@@ -468,11 +481,11 @@
                 <div class="layui-input-inline">
                     <button type="button" class="layui-btn  layui-btn-warm layui-btn-sm" lay-active="getGenerateSpecBtn"><i class="layui-icon layui-icon-export"></i>鐢熸垚SKU璐у搧鍒楄〃</button>
                 </div>
-                <div class="layui-input-inline">
+                <!-- <div class="layui-input-inline">
                     <button type="button" class="aKeySetBtn layui-btn layui-btn-warm layui-btn-sm">
                         <i class="layui-icon layui-icon-set"></i>涓�閿缃�
                     </button>
-                </div>
+                </div> -->
             </div>
         </div>
         <div id="more_spec"></div>
@@ -566,7 +579,7 @@
                             </div>
                         </div>
                         <div class="layui-form-item">
-                            <label class="layui-form-label">甯傚満浠�</label>
+                            <label class="layui-form-label">鎸囧闆跺敭浠�</label>
                             <div class="layui-input-inline layui-inline-2">
                                 <input class="layui-input" id="oneKeySetMktPrice">
                             </div>
@@ -1289,7 +1302,7 @@
                 form.verify({
                     money: [/((^[1-9]\d*)|^0)(\.\d{0,2}){0,1}$/, '璇疯緭鍏ラ噾棰�'],
                     verifybn: [/^[\S]{0,30}$/, '鍟嗗搧缂栫爜鏈�澶у彧鍏佽杈撳叆30浣嶅瓧绗︼紝涓斾笉鑳藉嚭鐜扮┖鏍�'],
-                    verifysn: [/^[\S]{0,30}$/, '璐у彿鏈�澶у彧鍏佽杈撳叆30浣嶅瓧绗︼紝涓斾笉鑳藉嚭鐜扮┖鏍�'],
+                    verifysn: [/^[\S]{0,30}$/, '璐у搧缂栫爜鏈�澶у彧鍏佽杈撳叆30浣嶅瓧绗︼紝涓斾笉鑳藉嚭鐜扮┖鏍�'],
                     verifyname: [/^.{0,200}$/, '鍟嗗搧鍚嶇О鏈�澶у彧鍏佽杈撳叆200浣嶅瓧绗�'],
                     verifybrief: [/^.{0,255}$/, '鍟嗗搧绠�浠嬫渶澶у彧鍏佽杈撳叆255浣嶅瓧绗︼紝涓斾笉鑳藉嚭鐜扮┖鏍�'],
                     verifyimageIds: [/^[\S]{0,255}$/, '榛樿鍥剧墖 鍥剧墖id鏈�澶у彧鍏佽杈撳叆255浣嶅瓧绗︼紝涓斾笉鑳藉嚭鐜扮┖鏍�'],
@@ -1981,7 +1994,12 @@
                             productModel.levelThree = field['product[levelThree][' + i + ']'];
                             productModel.pointsDeduction = field['product[pointsDeduction][' + i + ']'];
                             productModel.points = field['product[points][' + i + ']'];
+                            //娣诲姞 鐧惧垎鍏垫硶
+                            productModel.distributionPrice = field['product[distributionPrice][' + i + ']'];
+                            productModel.distributionCutMoney = field['product[distributionCutMoney][' + i + ']'];
+                            productModel.cutMoney = field['product[cutMoney][' + i + ']'];
                             products.push(productModel);
+                            
                         }
                         //浼氬憳浠锋牸妯″瀷
                         var gradePrice = [];

--
Gitblit v1.9.1