From 7344a3c2ba79f749b1bbf31bc3a6b343ec742760 Mon Sep 17 00:00:00 2001
From: e <erzhongxmu@hotmail.com>
Date: Thu, 27 Jun 2019 10:39:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E4=BF=A1=E6=81=AF=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=93=81=E7=89=8C=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/zzjee/md/entity/MdGoodsEntity.java  |  1 +
 src/main/webapp/webpage/com/zzjee/md/mdGoods-add.jsp  | 10 ++++++++++
 .../webapp/webpage/com/zzjee/md/mdGoods-update.jsp    | 11 ++++++++++-
 .../webapp/webpage/com/zzjee/md/mdGoodsallList.jsp    |  3 +++
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zzjee/md/entity/MdGoodsEntity.java b/src/main/java/com/zzjee/md/entity/MdGoodsEntity.java
index 5b1bc95d..a5ca9561 100644
--- a/src/main/java/com/zzjee/md/entity/MdGoodsEntity.java
+++ b/src/main/java/com/zzjee/md/entity/MdGoodsEntity.java
@@ -88,6 +88,7 @@ public class MdGoodsEntity implements java.io.Serializable {
 	@Excel(name="商品条码")
 	private java.lang.String shpTiaoMa;
 	/**品牌图片*/
+	@Excel(name="品牌")
 	private java.lang.String ppTuPian;
 	/**保质期*/
 	@Excel(name="保质期")
diff --git a/src/main/webapp/webpage/com/zzjee/md/mdGoods-add.jsp b/src/main/webapp/webpage/com/zzjee/md/mdGoods-add.jsp
index bddf08cb..eb07830c 100644
--- a/src/main/webapp/webpage/com/zzjee/md/mdGoods-add.jsp
+++ b/src/main/webapp/webpage/com/zzjee/md/mdGoods-add.jsp
@@ -141,6 +141,16 @@ function counttiji(){
 									<span class="Validform_checktip" style="float:left;height:0px;"></span>
 									<label class="Validform_label" style="display: none">商品规格</label>
 								</div>
+								<div class="col-xs-3 text-center">
+									<b  >商品品牌</b>
+								</div>
+								<div class="col-xs-3">
+									<input id="ppTuPian" name="ppTuPian" type="text" class="form-control"
+										   ignore="ignore"
+									/>
+									<span class="Validform_checktip" style="float:left;height:0px;"></span>
+									<label class="Validform_label" style="display: none">商品品牌</label>
+								</div>
 						</div>
 			          
 							<div class="row show-grid">
diff --git a/src/main/webapp/webpage/com/zzjee/md/mdGoods-update.jsp b/src/main/webapp/webpage/com/zzjee/md/mdGoods-update.jsp
index 16771172..973fee8b 100644
--- a/src/main/webapp/webpage/com/zzjee/md/mdGoods-update.jsp
+++ b/src/main/webapp/webpage/com/zzjee/md/mdGoods-update.jsp
@@ -147,7 +147,16 @@
 									<span class="Validform_checktip" style="float:left;height:0px;"></span>
 									<label class="Validform_label" style="display: none">商品规格</label>
 								</div>
-
+								<div class="col-xs-3 text-center">
+									<b  >商品品牌</b>
+								</div>
+								<div class="col-xs-3">
+									<input id="ppTuPian" name="ppTuPian" type="text"  value='${mdGoodsPage.ppTuPian}' class="form-control"
+										   ignore="ignore"
+									/>
+									<span class="Validform_checktip" style="float:left;height:0px;"></span>
+									<label class="Validform_label" style="display: none">商品品牌</label>
+								</div>
 						</div>
 							<div class="row show-grid">
 			          <div class="col-xs-3 text-center">
diff --git a/src/main/webapp/webpage/com/zzjee/md/mdGoodsallList.jsp b/src/main/webapp/webpage/com/zzjee/md/mdGoodsallList.jsp
index 79b0fc10..5ed2e226 100644
--- a/src/main/webapp/webpage/com/zzjee/md/mdGoodsallList.jsp
+++ b/src/main/webapp/webpage/com/zzjee/md/mdGoodsallList.jsp
@@ -21,6 +21,9 @@
     
     <t:dgCol title="商品型号"  field="shpXingHao"  hidden="true"  queryMode="group"  width="120"></t:dgCol>
     <t:dgCol title="商品规格"  field="shpGuiGe"    queryMode="group"  width="80"></t:dgCol>
+      <t:dgCol title="商品品牌"  field="ppTuPian"    query="true" queryMode="single"  width="80"></t:dgCol>
+
+
     <t:dgCol title="商品颜色"  field="shpYanSe"  hidden="true"  queryMode="group"  width="120"></t:dgCol>
     <t:dgCol title="产品属性"  field="chpShuXing"  queryMode="single" dictionary="ba_goods_type,goods_type_code,goods_type_name"   width="120"></t:dgCol>
     <t:dgCol title="存放温层"  field="cfWenCeng"   query="true" queryMode="single" dictionary="ba_deg_type,deg_type_code,deg_type_name"  width="80"></t:dgCol>