build

xuhongyun
Commit e1c2257a66b21a580f0ec834fee1d975710f8347 1 parent 1367e8b4
Showing 4 changed files with 10 additions and 6 deletions
dist/yohobuy-shops-fe/4.8.3/jquery/goods.basegoods.Edit.js
dist/yohobuy-shops-fe/4.8.3/jquery/goods.netsale.Index.js
server/views/goods/basegoods/Batch.html
server/views/goods/basegoods/Edit.html
--- a/dist/yohobuy-shops-fe/4.8.3/jquery/goods.basegoods.Edit.js
View file @e1c2257
+++ b/dist/yohobuy-shops-fe/4.8.3/jquery/goods.basegoods.Edit.js
View file @e1c2257
@@ -168,12 +168,12 @@ webpackJsonp([3],[
 				}
 			},
 			{
-				display:"<label class='red'>厂家颜色、尺码、销售价、条码必填</label>",render:function(item){
+				display:"<label class='red'>厂家颜色、尺码、款型编码、销售价、条码必填</label>",render:function(item){
 					if(!item.isAdd&&!g.__gsm.hasOwnProperty(item.__index)){
 						g.__gsm[item.__index]=item.goodsSizeList.length;
 					}
 					var html=[];
-					html.push("<div class='form-group'><div class='col-sm-11 red'><input type=text value='"+item.factoryCode+"' data-index="+item.__index+"  class='modelCode form-control' placeholder='款型编码' /></div></div>");
+					html.push("<div class='form-group'><div class='col-sm-11 red'><input type=text value='"+item.factoryCode+"' data-index="+item.__index+"  class='modelCode form-control' placeholder='款型编码' required/></div></div>");
 					html.push("<dov class='rows'><div class='form-group'><div class='col-sm-2'>尺码</div><div class='col-sm-2'>销售价</div><div class='col-sm-2'>条码</div><div class='col-sm-2'>是否补货</div><div class='col-sm-2'>UPM条码</div></div></div>");
 					html.push('<div class="rows" id="rows__'+item.__index+'">');
 					item.goodsSizeList=item.goodsSizeList||[$.extend({},ENUM.goodsSizeList)];
--- a/dist/yohobuy-shops-fe/4.8.3/jquery/goods.netsale.Index.js
View file @e1c2257
+++ b/dist/yohobuy-shops-fe/4.8.3/jquery/goods.netsale.Index.js
View file @e1c2257
@@ -334,6 +334,9 @@ webpackJsonp([8],[
 	            return html.join('');
 	        }
 	    }, {
+	            display: 'SKC个数',
+	            name: 'skcNum'
+	        },{
 	        display: '操作',
 	        render: function (item) {
 	            var HtmArr = [];
@@ -532,7 +535,8 @@ webpackJsonp([8],[
 			render: function(item) {
 				return 'SKC：' + item.productSkc + '<br>' +
-					'颜色：' + item.goodsName;
+					'颜色：' + item.goodsName+ '<br>' +
+	            '厂家颜色：' + item.factoryGoodsName;
 			}
 		}, {
 			display: 'SKC上架操作（状态）',
--- a/server/views/goods/basegoods/Batch.html
View file @e1c2257
+++ b/server/views/goods/basegoods/Batch.html
View file @e1c2257
@@ -96,7 +96,7 @@
                     <td>说明：</td>
                     <td colspan="2">
                         1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br>
-                        2、第一行标题栏：<span style="color: #67D267;">货品名称、厂家编号、一级分类、二级分类、三级分类、四级分类（目前不用）、性别、货品年、货品季、吊牌价、销售价、色系、厂家颜色、款型（选填）、尺码、条码、能否补货、SKN计数、年龄层(多个用'|'分隔)、重点款型、UPM条码（选填）</span><br>
+                        2、第一行标题栏：<span style="color: #67D267;">货品名称、厂家编号(选填)、一级分类、二级分类、三级分类、四级分类（目前不用）、性别、货品年、货品季、吊牌价、销售价、色系、厂家颜色、款型编码、尺码、条码、能否补货、SKN计数、年龄层(多个用'|'分隔)、重点款型、UPM条码（选填）</span><br>
                         3、<a href="/ajax/link/baseproduct">下载样例</a>
                     </td>
                 </tr>
--- a/server/views/goods/basegoods/Edit.html
View file @e1c2257
+++ b/server/views/goods/basegoods/Edit.html
View file @e1c2257
@@ -113,9 +113,9 @@
             <div class="col-sm-4">
                 <div id="tree"></div>
             </div>
-            <label class="col-sm-1 control-label">厂家编号<span class="red">*</span></label>
+            <label class="col-sm-1 control-label">厂家编号</label>
             <div class="col-sm-2">
-                <input type="text" id="factoryCode" placeholder="厂家编号" value="[[factoryCode]]" class="form-control" required/>
+                <input type="text" id="factoryCode" placeholder="厂家编号" value="[[factoryCode]]" class="form-control" />
             </div>
         </div>
         <div class="form-group">