From ab4ea7b8f10c9b66aed9c2ea161a08b25c3851a7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 30 四月 2024 19:11:37 +0800
Subject: [PATCH] 2024.04新增内容
---
meiya-admin/src/main/webapp/WEB-INF/view/member/memMerchant/memMerchant_edit.html | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/meiya-admin/src/main/webapp/WEB-INF/view/member/memMerchant/memMerchant_edit.html b/meiya-admin/src/main/webapp/WEB-INF/view/member/memMerchant/memMerchant_edit.html
index 3869145..2323ad5 100644
--- a/meiya-admin/src/main/webapp/WEB-INF/view/member/memMerchant/memMerchant_edit.html
+++ b/meiya-admin/src/main/webapp/WEB-INF/view/member/memMerchant/memMerchant_edit.html
@@ -154,7 +154,7 @@
<div class="panel-body">
<div class="col-sm-6" id="goodsId_div" >
<#input_search_merchant_product id="goodsId" name="选择商品" showName="bName"
- show-fields="aGoodsNo,bName,dPrice,dPriceDale,ePriceMember,gBuyCount,fStock,hId" fields-alias="商品编号,商品名称,市场价,美天销售价,会员价,销售量,商品库存,商品ID" url="mallGoods/mallGoodsList?groupType=0" value="" required="true"/>
+ show-fields="aGoodsNo,bName,bbGrepName,dPrice,dPriceDale,ePriceMember,gBuyCount,fStock,hId,iSpecIds" fields-alias="商品编号,商品名称,规格名称,市场价,美天销售价,会员价,销售量,商品库存,商品ID,规格编号" url="mallGoods/mallGoodsList?groupType=0" value="" required="true"/>
</div>
<div class="col-sm-12">
<table id="macTable" data-mobile-responsive="true" data-click-to-select="true" class="table table-hover" style="margin-top: 0px;">
@@ -174,6 +174,14 @@
</th>
<th style="text-align: center; " data-field="passWord">
<div class="th-inner ">商品库存</div>
+ <div class="fht-cell"></div>
+ </th>
+ <th style="text-align: center; " data-field="iSpecIds">
+ <div class="th-inner ">规格编号</div>
+ <div class="fht-cell"></div>
+ </th>
+ <th style="text-align: center; " data-field="cGrepName">
+ <div class="th-inner ">规格名称</div>
<div class="fht-cell"></div>
</th>
<th style="text-align: center; " data-field="macIp">
@@ -206,12 +214,14 @@
@for(merchantGoods in merchantGoodsList){
<tr>
<td style="text-align: center; " data-name="classifyIdOne">${merchantGoods.id}</td>
- <td style="text-align: center; " data-name="classifyIdOne">${merchantGoods.goods_name}</td>
+ <td style="text-align: center; " data-name="classifyIdOne">${merchantGoods.goods_name!}</td>
<td style="text-align: center; " data-name="classifyIdOne">${merchantGoods.price}</td>
<td style="text-align: center; " data-name="classifyIdOne">${merchantGoods.stock}</td>
+ <td style="text-align: center; " data-name="classifyIdOne">${merchantGoods.spec_ids}</td>
+ <td style="text-align: center; " data-name="classifyIdOne">${merchantGoods.grep_name}</td>
<td style="text-align: center; " data-name="classifyIdOne">${merchantGoods.goods_no}</td>
- <td style="text-align: center; " data-name="classifyIdOne">${merchantGoods.price_sale}</td>
<td style="text-align: center; " data-name="classifyIdOne">${merchantGoods.price_member}</td>
+ <td style="text-align: center; " data-name="classifyIdOne">${merchantGoods.price_sale}</td>
<td style="text-align: center; " data-name="classifyIdOne">${merchantGoods.buy_count}</td>
<td style="text-align: center; " data-name="classifyIdOne"><input type="text" value="${merchantGoods.price_merchant}"></td>
<td style="text-align: center; " data-name="classifyIdOne">
--
Gitblit v1.7.1