From d7fec17e093788d71dcd89bb0d94030a9f6ecfae Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期一, 13 五月 2024 14:25:38 +0800
Subject: [PATCH] 调整显示顺序
---
CoreCms.Net.Web.Admin/wwwroot/views/good/goods/details.html | 39 +++++++++++--------
CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html | 35 ++++++++---------
CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html | 43 +++++++++++----------
3 files changed, 62 insertions(+), 55 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html
index 5288dba..0505773 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html
@@ -189,7 +189,7 @@
1銆侀�夋嫨瀵瑰簲鐨勩�愬晢鍝佺被鍨嬨�戯紝灏嗚繘鍏ュSKU璐у搧妯″紡銆傚悓鏃跺鏋滅被鍒湁鍙傛暟锛屼篃灏嗚繘琛屾樉绀鸿缃��<br />
2銆佽缃SKU鍚庯紝鍟嗗搧鏈韩鐨勪环鏍煎彧鍋氬澶栧睍绀虹敤锛屽疄闄呬互杩涘叆鍟嗗搧璇︽儏閫夋嫨涓嶅悓璐у搧涓哄噯銆�<br />
3銆佽揣鍝丼KU缁勫悎灞炴�у�煎彧鏀寔锛氫腑鏂囥�佽嫳鏂囥�佹暟瀛椼�佸ぇ鍐欑鍙凤紝灏忓啓绗﹀彿涓変釜锛�-銆�/銆�.锛夛級<br />
- 4銆佽揣鍙峰繀椤讳负SN瀛楁瘝寮�澶�<br />
+ 4銆佽揣鍝佺紪鐮佸繀椤讳负SN瀛楁瘝寮�澶�<br />
5銆佸鏋滀笉璁剧疆鍗曡揣鍝侀噸閲忥紝灏嗛粯璁や娇鐢ㄥ晢鍝侀噸閲忎负1涓崟浣嶇殑閲嶉噺銆�
</blockquote>-->
@@ -197,7 +197,7 @@
<label for="brandId" class="layui-form-label">浣ｉ噾璁剧疆</label>
<div class="layui-input-inline layui-inline-6" pane>
{{# layui.each(d.data.productsDistributionType, function(index, item){ }}
- <input type="radio" name="goods[productsDistributionType]" value="{{ item.value }}" title="{{ item.description }}" {{item.value===1?'checked="checked"':''}}>
+ <input type="radio" name="goods[productsDistributionType]" value="{{ item.value }}" title="{{ item.description }}" {{item.value===2?'checked="checked"':''}}>
{{# }); }}
</div>
</div>
@@ -456,21 +456,19 @@
<tr>
<th>榛樿璐у搧</th>
<th>鍥剧墖</th>
- <th>璐у彿</th>
+ <th>璐у搧缂栫爜</th>
<th>SKU</th>
<th>閲嶉噺(鍏�)</th>
- <!-- <th>璧犻�佺Н鍒�</th>
- <th>绉垎鏈�澶�<br />鍙姷閲戦</th> -->
- <th>搴撳瓨</th>
+ <th>搴撳瓨鏁伴噺</th>
+ <th style="width: 60px;">寤鸿闆跺敭浠�</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>鎺ㄥ箍鐢ㄦ埛璐拱杩旂幇</th>
<!-- <th>浜岀骇杩旂幇</th>
- <th>涓夌骇杩旂幇</th> -->
+ <!-- <th>涓夌骇杩旂幇</th> --> -->
<th>鎿嶄綔</th>
</tr>
</thead>
@@ -502,7 +500,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">
@@ -521,6 +519,9 @@
<input type="number" name="product[stock][]" value="{{item.stock}}" placeholder="搴撳瓨" class="layui-input layui-inline-1 goods-stock">
</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>
@@ -529,9 +530,7 @@
<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">
- </td>
+
<td>
<input type="text" name="product[distributionCutMoney][]" value="{{item.distributionCutMoney||'0'}}" placeholder="缁忛攢鍟嗚喘涔拌繑鐜�" class="layui-input layui-inline-1">
</td>
@@ -1205,7 +1204,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浣嶅瓧绗︼紝涓斾笉鑳藉嚭鐜扮┖鏍�'],
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/details.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/details.html
index c5fc8ff..e28905c 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/details.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/details.html
@@ -203,18 +203,21 @@
<th>鍥剧墖</th>
<th>璐у彿</th>
<th>SKU</th>
- <th>鍐荤粨搴撳瓨</th>
+
<th>閲嶉噺(鍏�)</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>涓夌骇杩旂幇</th> -->
+ <!-- <th>璧犻�佺Н鍒�</th>
+ <th>绉垎鏈�澶�<br />鍙姷閲戦</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> --> -->
</tr>
</thead>
<tbody id="productsTbody">
@@ -242,9 +245,7 @@
<td>
{{item.spesDesc}}
</td>
- <td>
- {{item.freezeStock}}
- </td>
+
<td>
{{item.weight}}
</td>
@@ -253,16 +254,20 @@
{{item.stock}}
</td>
<td>
- {{item.price}}
+ {{item.freezeStock}}
</td>
<td>
- {{item.costprice}}
+ {{item.mktprice}}
</td>
+ <td>
+ {{item.price}}
+ </td>
+
<td>
{{item.distributionPrice}}
</td>
<td>
- {{item.mktprice}}
+ {{item.costprice}}
</td>
<td>
{{item.distributionCutMoney}}
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 d0f84ff..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,22 +309,23 @@
<tr>
<th>榛樿璐у搧</th>
<th>鍥剧墖</th>
- <th>璐у彿</th>
+ <th>璐у搧缂栫爜</th>
<th>SKU</th>
<th>閲嶉噺(鍏�)</th>
<!-- <th>璧犻�佺Н鍒�</th>
<th>绉垎鏈�澶�<br />鍙姷閲戦</th> -->
- <th>搴撳瓨</th>
+ <th>搴撳瓨鏁伴噺</th>
+ <th>鍐荤粨搴撳瓨</th>
+ <th style="width: 60px;">寤鸿闆跺敭浠�</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>鎺ㄥ箍鐢ㄦ埛璐拱杩旂幇</th>
<!-- <th>浜岀骇杩旂幇</th>
<!-- <th>涓夌骇杩旂幇</th> --> -->
- <th>鍐荤粨搴撳瓨</th>
+
<th>鎿嶄綔</th>
</tr>
</thead>
@@ -356,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">
@@ -375,23 +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">
+ <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[distributionCutMoney][]" value="{{item.distributionCutMoney||'0'}}" placeholder="缁忛攢鍟嗚喘涔拌繑鐜�" class="layui-input layui-inline-1">
- </td>
- <td>
- <input type="text" name="product[cutMoney][]" value="{{item.cutMoney||'0'}}" 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">
@@ -399,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>
@@ -1299,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浣嶅瓧绗︼紝涓斾笉鑳藉嚭鐜扮┖鏍�'],
--
Gitblit v1.9.1