基础商品bug修改

@@ -50,6 +50,7 @@ function batchExport(el, type) {
             }
             if(response.data&&response.data.failFileReason.length){
                 $("#message").html(response.data.failFileReason.join('/n'));
+                return false;
             }
             common.util.__tip(response.message, 'warning');
             

@@ -434,6 +434,20 @@ e.on("validate",function(){
 		return "销售价应该限定小于等于吊牌价";
 	}
 });
+
+e.on("validate",function(){
+	var __index=0;
+	if(ag.rows.length>0){
+		for(var i in ag.rows){
+			if(ag.rows[i].val){
+				__index++;
+			}
+		}
+	}
+	if(!__index){
+		return "请选择非销售属性";
+	}
+});
 //
 
 $(document).on("click","#btnReview",function(){

@@ -220,8 +220,17 @@
             </div>
         </div>
         <div class="form-group">
+         <label class="col-sm-2 control-label">重点款<span class="red">*</span></label>
+            <div class="col-sm-2">
+                <label class="radio-inline">
+                    <input type="radio" name="grade" value="1">是</label>
+                <label class="radio-inline">
+                    <input type="radio" name="grade" value="0">否</label>
+            </div>
+            <input type="hidden" id="grade" value="[[grade||'0']]" for="radio" required/>
+
         [[if isAuditing==200]]
-            <label class="col-sm-2 control-label">适销季<span class="red">*</span></label>
+            <label class="col-sm-1 control-label">适销季<span class="red">*</span></label>
             <div class="col-sm-2">
                 <label class="radio-inline">
                     <input type="checkbox" name="seasons" value="summer">夏</label>
@@ -231,18 +240,9 @@
                     <input type="checkbox" name="seasons" value="seasons">四季</label>
                 <input type="hidden" id="seasons" name="seasons" value="[[seasons||'seasons']]" for="checkbox" placeholder="年龄层" />
             </div>
-        [[else]]
-            <div class="col-sm-4"></div>
         [[/if]]
             
-             <label class="col-sm-1 control-label">重点款<span class="red">*</span></label>
-            <div class="col-sm-2">
-                <label class="radio-inline">
-                    <input type="radio" name="grade" value="1">是</label>
-                <label class="radio-inline">
-                    <input type="radio" name="grade" value="0">否</label>
-            </div>
-            <input type="hidden" id="grade" value="[[grade||'0']]" for="radio" required/>
+            
         </div>
 
         <div class="form-group">
@@ -370,7 +370,7 @@
 <label class="radio-inline">
     <input type="radio" name="attr_[[__index]]" data-index=[[__index]] class="attr_input" value="[[item.text]]">[[item.text]]</label>
 [[/each]]
-<input type="hidden" id="attr_[[__index]]" data-index='[[__index]]' value="[[val||'']]" [[required]] for="checkbox"/>
+<input type="hidden" id="attr_[[__index]]" data-index='[[__index]]' value="[[val||'']]" [[required]] for="radio"/>
 [[/if]]
 
 [[if inputType=='select']]

@@ -132,7 +132,7 @@
                         <span>[[_item.sizeName]]</span>
                         </th>
                         <th>[[_item.salePrice]]</th>
-                        <th>[[_item.sizeName]]</th>
+                        <th>[[item.factoryCode]]</th>
                         <th>[[_item.barCode]]</th>
                         <th>[[item.goodsName]]</th>
                         [[if _item.isSuppled=="Y"]]