fe / yohobuy-portal-fe · Commits

Go to a project

Authored by 陶雨
Commit 2c43341fe22f0fa89ffec1f8bc70711519fd8212 2 parents c3a34c58 77b97cbe

Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6

Inline Side-by-side
Showing 5 changed files with 30 additions and 15 deletions
@@ -50,6 +50,7 @@ function batchExport(el, type) { @@ -50,6 +50,7 @@ function batchExport(el, type) {
50 } 50 }
51 if(response.data&&response.data.failFileReason.length){ 51 if(response.data&&response.data.failFileReason.length){
52 $("#message").html(response.data.failFileReason.join('/n')); 52 $("#message").html(response.data.failFileReason.join('/n'));
  53 + return false;
53 } 54 }
54 common.util.__tip(response.message, 'warning'); 55 common.util.__tip(response.message, 'warning');
55 56
@@ -434,6 +434,20 @@ e.on("validate",function(){ @@ -434,6 +434,20 @@ e.on("validate",function(){
434 return "销售价应该限定小于等于吊牌价"; 434 return "销售价应该限定小于等于吊牌价";
435 } 435 }
436 }); 436 });
  437 +
  438 +e.on("validate",function(){
  439 + var __index=0;
  440 + if(ag.rows.length>0){
  441 + for(var i in ag.rows){
  442 + if(ag.rows[i].val){
  443 + __index++;
  444 + }
  445 + }
  446 + }
  447 + if(!__index){
  448 + return "请选择非销售属性";
  449 + }
  450 +});
437 // 451 //
438 452
439 $(document).on("click","#btnReview",function(){ 453 $(document).on("click","#btnReview",function(){
@@ -18,9 +18,9 @@ var config = { @@ -18,9 +18,9 @@ var config = {
18 // domain: 'http://172.16.6.124:8088/platform',//陈超 18 // domain: 'http://172.16.6.124:8088/platform',//陈超
19 //http://172.16.6.124:8088/platform/product/queryAllProductAttr 19 //http://172.16.6.124:8088/platform/product/queryAllProductAttr
20 //domain: 'http://172.16.6.227:8088/platform', //玛丽 20 //domain: 'http://172.16.6.227:8088/platform', //玛丽
21 - domain: 'http://192.168.102.202:8088/platform',  
22 - //domain:'http://172.16.9.8:8080/yohobuy-platform-web',//葛超  
23 // domain: 'http://192.168.102.202:8088/platform', 21 // domain: 'http://192.168.102.202:8088/platform',
  22 + //domain:'http://172.16.9.8:8080/yohobuy-platform-web',//葛超
  23 + domain: 'http://192.168.102.202:8088/platform',
24 //domain: 'http://172.16.6.239:8080', //孙杰翔 24 //domain: 'http://172.16.6.239:8080', //孙杰翔
25 loggers: { 25 loggers: {
26 api: { 26 api: {
@@ -220,8 +220,17 @@ @@ -220,8 +220,17 @@
220 </div> 220 </div>
221 </div> 221 </div>
222 <div class="form-group"> 222 <div class="form-group">
  223 + <label class="col-sm-2 control-label">重点款<span class="red">*</span></label>
  224 + <div class="col-sm-2">
  225 + <label class="radio-inline">
  226 + <input type="radio" name="grade" value="1">是</label>
  227 + <label class="radio-inline">
  228 + <input type="radio" name="grade" value="0">否</label>
  229 + </div>
  230 + <input type="hidden" id="grade" value="[[grade||'0']]" for="radio" required/>
  231 +
223 [[if isAuditing==200]] 232 [[if isAuditing==200]]
224 - <label class="col-sm-2 control-label">适销季<span class="red">*</span></label> 233 + <label class="col-sm-1 control-label">适销季<span class="red">*</span></label>
225 <div class="col-sm-2"> 234 <div class="col-sm-2">
226 <label class="radio-inline"> 235 <label class="radio-inline">
227 <input type="checkbox" name="seasons" value="summer">夏</label> 236 <input type="checkbox" name="seasons" value="summer">夏</label>
@@ -231,18 +240,9 @@ @@ -231,18 +240,9 @@
231 <input type="checkbox" name="seasons" value="seasons">四季</label> 240 <input type="checkbox" name="seasons" value="seasons">四季</label>
232 <input type="hidden" id="seasons" name="seasons" value="[[seasons||'seasons']]" for="checkbox" placeholder="年龄层" /> 241 <input type="hidden" id="seasons" name="seasons" value="[[seasons||'seasons']]" for="checkbox" placeholder="年龄层" />
233 </div> 242 </div>
234 - [[else]]  
235 - <div class="col-sm-4"></div>  
236 [[/if]] 243 [[/if]]
237 244
238 - <label class="col-sm-1 control-label">重点款<span class="red">*</span></label>  
239 - <div class="col-sm-2">  
240 - <label class="radio-inline">  
241 - <input type="radio" name="grade" value="1">是</label>  
242 - <label class="radio-inline">  
243 - <input type="radio" name="grade" value="0">否</label>  
244 - </div>  
245 - <input type="hidden" id="grade" value="[[grade||'0']]" for="radio" required/> 245 +
246 </div> 246 </div>
247 247
248 <div class="form-group"> 248 <div class="form-group">
@@ -370,7 +370,7 @@ @@ -370,7 +370,7 @@
370 <label class="radio-inline"> 370 <label class="radio-inline">
371 <input type="radio" name="attr_[[__index]]" data-index=[[__index]] class="attr_input" value="[[item.text]]">[[item.text]]</label> 371 <input type="radio" name="attr_[[__index]]" data-index=[[__index]] class="attr_input" value="[[item.text]]">[[item.text]]</label>
372 [[/each]] 372 [[/each]]
373 -<input type="hidden" id="attr_[[__index]]" data-index='[[__index]]' value="[[val||'']]" [[required]] for="checkbox"/> 373 +<input type="hidden" id="attr_[[__index]]" data-index='[[__index]]' value="[[val||'']]" [[required]] for="radio"/>
374 [[/if]] 374 [[/if]]
375 375
376 [[if inputType=='select']] 376 [[if inputType=='select']]
@@ -132,7 +132,7 @@ @@ -132,7 +132,7 @@
132 <span>[[_item.sizeName]]</span> 132 <span>[[_item.sizeName]]</span>
133 </th> 133 </th>
134 <th>[[_item.salePrice]]</th> 134 <th>[[_item.salePrice]]</th>
135 - <th>[[_item.sizeName]]</th> 135 + <th>[[item.factoryCode]]</th>
136 <th>[[_item.barCode]]</th> 136 <th>[[_item.barCode]]</th>
137 <th>[[item.goodsName]]</th> 137 <th>[[item.goodsName]]</th>
138 [[if _item.isSuppled=="Y"]] 138 [[if _item.isSuppled=="Y"]]