From 05d32271f646149609d8b42016e11cf95d8d5a84 Mon Sep 17 00:00:00 2001
From: liaoxujun@qq.com <liaoxujun@qq.com>
Date: 星期三, 10 四月 2024 11:18:05 +0800
Subject: [PATCH] 修改供应商价格显示
---
CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 162 insertions(+), 16 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 fd70cd8..2856e6f 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html
@@ -61,6 +61,12 @@
</div>
</div>
<div class="layui-form-item">
+ <label for="areaId" class="layui-form-label ">鎵�灞炲湴鍖�</label>
+ <div class="layui-input-block layui-inline-4 address-class">
+ <input type="hidden" name="areaId" value="{{d.data.areaId || '' }}">
+ </div>
+ </div>
+ <div class="layui-form-item">
<label for="bn" class="layui-form-label layui-form-required">鍟嗗搧缂栫爜</label>
<div class="layui-input-inline layui-inline-6">
<input name="goods[bn]" id="bn" lay-verType="tips" lay-verify="required|verifybn" value="{{d.data.model.bn }}" class="layui-input" lay-reqText="璇疯緭鍏ュ晢鍝佺紪鐮�" placeholder="璇疯緭鍏ヤ笉瓒呰繃30涓瓧绗﹀唴瀹�" />
@@ -306,15 +312,17 @@
<th>璐у彿</th>
<th>SKU</th>
<th>閲嶉噺(鍏�)</th>
- <th>璧犻�佺Н鍒�</th>
- <th>绉垎鏈�澶�<br />鍙姷閲戦</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>鏅�氱敤鎴疯喘涔拌繑鐜�</th>
+ <th>缁忛攢鍟嗙敤鎴疯喘涔拌繑鐜�</th>
+ <!-- <th>浜岀骇杩旂幇</th>
+ <!-- <th>涓夌骇杩旂幇</th> --> -->
<th>鍐荤粨搴撳瓨</th>
<th>鎿嶄綔</th>
</tr>
@@ -356,12 +364,12 @@
<td>
<input type="number" name="product[weight][]" value="{{item.weight}}" placeholder="閲嶉噺" class="layui-input layui-inline-1">
</td>
- <td>
+ <!-- <td>
<input type="number" name="product[points][]" value="{{item.points}}" placeholder="绉垎" class="layui-input layui-inline-1">
- </td>
- <td>
+ </td> -->
+ <!-- <td>
<input type="text" name="product[pointsDeduction][]" value="{{item.pointsDeduction}}" placeholder="閲戦" class="layui-input layui-inline-1">
- </td>
+ </td> -->
<td class="have-add-td">
<input type="number" name="product[stock][]" value="{{item.stock}}" placeholder="搴撳瓨" class="layui-input layui-inline-1 goods-stock">
</td>
@@ -369,20 +377,27 @@
<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[mktprice][]" value="{{item.mktprice}}" 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[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">
+ </td>
+ <!-- <td>
<input type="text" name="product[levelTwo][]" value="{{item.levelTwo}}" placeholder="浜岀骇杩旂幇" class="layui-input layui-inline-1">
</td>
<td>
<input type="text" name="product[levelThree][]" value="{{item.levelThree}}" placeholder="涓夌骇杩旂幇" class="layui-input layui-inline-1">
- </td>
+ </td> -->
<td>
{{item.freezeStock}}
</td>
@@ -462,11 +477,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>
@@ -560,7 +575,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>
@@ -633,6 +648,8 @@
<input type="checkbox" name="skuAttrValue" value="{{item}}" title="{{item}}" lay-filter="skuAttrValue-filter">
{{# }); }}
</script>
+
+ <script src="/views/liao.js"></script>
<script>
var $;
@@ -758,6 +775,119 @@
var btn = $('#openSpecBtn');
$(btn).html("鍙栨秷SKU");
}
+ /*****************************************************************/
+ //鍦板尯閫夋嫨
+
+ var expensiveItems = d.data.categories.data.filter(function(item) {
+ return item.price > 100;
+ });
+ var areaid=0;
+ var arelist= d.data.model?.areaCode?.split(",");
+
+ if(Array.isArray(arelist))
+ {
+ var u= arelist[arelist.length - 1]
+ let num = Number(u);
+ if(!Number.isNaN(num))
+ {
+ areaid=num;
+ }
+ }
+
+
+ coreHelper.Post("Api/Tools/GetAreaCheckedList", { id: areaid}, function (data) {
+
+
+ var str = "";
+ $.each(data, function (i, n) {
+
+ str += "<select lay-ignore name='areaId_" + (i + 1) + "' dep='" + (i + 1) + "' class='select-address'>";
+ str += `<option value= ${(d.data.areaId??0)===0?" selected='selected'":''} >璇烽�夋嫨</option>`;
+ if(n.list.length>0)
+ { $.each(n.list, function (h, z) {
+ if (n.hasOwnProperty('info') && n.info?.id == z.id) {
+ str += "<option value='" + z.id + "' selected='selected'>" + z.name + "</option>";
+ } else {
+ str += "<option value='" + z.id + "' >" + z.name + "</option>";
+ }
+ });
+ }
+ else
+ {
+ $.each(n.thisList, function (h, z) {
+ if (n.hasOwnProperty('info') && n.info?.id == z.id) {
+ str += "<option value='" + z.id + "' selected='selected'>" + z.name + "</option>";
+ } else {
+ str += "<option value='" + z.id + "' >" + z.name + "</option>";
+ }
+ });
+ }
+ str += "</select>";
+ });
+ $("input[name='areaId']").after(str);
+ //浠ヤ笂鏁版嵁杈撳嚭瀹岋紝浠ヤ笅缁戝畾浜嬩欢
+ $.each(data, function (i, n) {
+
+ if (i < (data.length)) {
+ $("select[name='areaId_" + (i + 1) + "']").change(function () {
+ changeareaIdArea(i + 1, data.length);
+ });
+ }
+ });
+ });
+
+ function changeareaIdArea(i, max_i) {
+
+ //娓呴櫎鍚庨潰鑺傜偣
+ for (var x = i + 1; x <= 6; x++) { //鏈�澶�6灞傦紝瓒冲浜�
+ $("select[name='areaId_" + x + "']").remove();
+ }
+ var val = $("select[name='areaId_" + i + "']").val();
+ if (val != "") {
+ //鍙栧瓙鑺傜偣鏁版嵁锛岀劧鍚庢樉绀轰笅涓�绾�
+ coreHelper.Post("Api/Tools/GetAreaChildren", { id: val }, function (e) {
+ if (debug) { console.log(e); } //寮�鍚皟璇曡繑鍥炴暟鎹�
+
+ if (e.length > 0) {
+ var str = "";
+ str += "<select lay-ignore name='areaId_" + (i + 1) + "' dep='" + (i + 1) + "' class='select-address'>";
+ str += "<option value='' >璇烽�夋嫨</option>";
+ $.each(e, function (h, z) {
+ str += "<option value='" + z.id + "' >" + z.name + "</option>";
+ });
+ str += "</select>";
+ $("select[name='areaId_" + i + "']").after(str);
+ //浠ヤ笂鏁版嵁杈撳嚭瀹岋紝浠ヤ笅缁戝畾浜嬩欢
+ $("select[name='areaId_" + (i + 1) + "']").change(function () {
+ changeareaIdArea(i + 1, i + 2);
+ });
+
+ //濡傛灉鏈夎繑鍥炲�硷紝灏辫鏄庣渷甯傚尯娌℃湁閫夋嫨鍒版渶缁堣妭鐐�
+ if (1 == 1) {
+ $("input[name='areaId']").val("");
+ } else {
+ $("input[name='areaId']").val($("select[name='areaId_" + i + "']").val());
+ }
+ } else {
+ $("input[name='areaId']").val($("select[name='areaId_" + i + "']").val());
+ }
+ });
+ } else {
+ if (1 == 1) {
+ $("input[name='areaId']").val("");
+ } else {
+ //绗竴绾х殑鍏冪礌灏辩洿鎺ヨ祴鍊间负绌哄氨鏄簡
+ if (i == 1) {
+ $("input[name='areaId']").val("");
+ } else {
+ i--;
+ $("input[name='areaId']").val($("select[name='areaId_" + i + "']").val());
+ }
+
+ }
+ }
+ }
+ /*****************************************************************/
// 娓叉煋鍟嗗搧鍒嗙被
var insXmSelGoodsCategoryId = xmSelect.render({
@@ -1817,6 +1947,18 @@
goods.stock = field['goods[stock]'];
goods.unit = field['goods[unit]'];
goods.weight = field['goods[weight]'];
+ goods.areaCode='';
+
+ if (isNumericString(field["areaId_1"])) {
+ goods.areaCode+=`${field["areaId_1"]}`;
+ if (isNumericString(field["areaId_2"]))
+ goods.areaCode+=`,${field["areaId_2"]}`;
+ if (isNumericString(field["areaId_3"]))
+ goods.areaCode+=`,${field["areaId_3"]}`;
+ } else {
+
+ }
+
goods.openSpec = parseInt(field.openSpec);
//澶氬弬鏁颁骇鍝佸簱鐢熸垚鍒楄〃闆嗗悎
var products = [];
@@ -1848,6 +1990,10 @@
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);
}
//浼氬憳浠锋牸妯″瀷
--
Gitblit v1.9.1