批量bug修改

@@ -61,5 +61,13 @@ common.edit.ajaxfileupload('#outletModify', batchExport('#sort-file', 'outletMod
 /*补货*/
 common.edit.ajaxfileupload('#supplyModify', batchExport('#brand-file', 'supplyModify'));
 /*基础商品导入*/
+$("#baseProduct").prop("disabled",true);
 common.edit.ajaxfileupload('#baseProduct', batchExport('#sort-file', 'baseProduct'));
+$(document).on("change","#brandId",function(){
+    if($(this).val()>0){
+        $("#baseProduct").prop("disabled",false);
+    }else{
+        $("#baseProduct").prop("disabled",true);
+    }
+});
 

@@ -247,12 +247,14 @@ $(document).on("click",".sortadd",function(){
 		return;
 	}
 	if(g.__e.validate()){
+		var goodsSizeList=$.extend({},ENUM.goodsSizeList);
+		goodsSizeList.salePrice=$("#salesPriceStr").val();
 		g.__rows.push({
 			"factoryCode": "",
 	        "goodsColorImage": "",
 	        goodsName: $(this).text(),
 			colorId: (+$(this).data("id")),
-	        goodsSizeList: [$.extend({},ENUM.goodsSizeList)],
+	        goodsSizeList: [goodsSizeList],
 	        isAdd:true
 	    });
 		g.reload();

@@ -18,9 +18,9 @@ var config = {
         // domain: 'http://172.16.6.124:8088/platform',//陈超
         //http://172.16.6.124:8088/platform/product/queryAllProductAttr
         //domain: 'http://172.16.6.227:8088/platform', //玛丽
-        // domain: 'http://192.168.102.202:8088/platform',
-        //domain:'http://172.16.9.8:8080/yohobuy-platform-web',//葛超
         domain: 'http://192.168.102.202:8088/platform',
+        //domain:'http://172.16.9.8:8080/yohobuy-platform-web',//葛超
+        // domain: 'http://192.168.102.202:8088/platform',
         //domain: 'http://172.16.6.239:8080', //孙杰翔
         loggers: {
             api: {

@@ -56,7 +56,14 @@
                 <tr>
                     <td rowspan="2">基础商品</td>
                     <td>上传EXCEL:</td>
-                    <td style="position: relative;"><input id="baseProduct" name="file" data-type="baseProduct" type="file" style="cursor: pointer; height: 37px; top: 8px;"></td>
+                    <td >
+                    <div class="panel-col" style="position: relative;">
+                        <input id="baseProduct" name="file" data-type="baseProduct" type="file" style="cursor: pointer; height: 37px; top: 8px;">
+                    </div>
+                    <div class="panel-col" style="line-height: 40px;position: relative;left: -60px;">
+                    <span class="red">必须输入品牌</span>
+                    </div>
+                    </td>
                 </tr>
                 <tr>
                     <td>说明：</td>