fe / yohobuy-portal-fe · Commits

Go to a project

Authored by weiqingting
Commit 4f19f69925c92ce20fb0d44b2d9ac7eaa1ddc1cc 1 parent 2813112c

批量bug修改

Inline Side-by-side
Showing 4 changed files with 21 additions and 4 deletions
@@ -61,5 +61,13 @@ common.edit.ajaxfileupload('#outletModify', batchExport('#sort-file', 'outletMod @@ -61,5 +61,13 @@ common.edit.ajaxfileupload('#outletModify', batchExport('#sort-file', 'outletMod
61 /*补货*/ 61 /*补货*/
62 common.edit.ajaxfileupload('#supplyModify', batchExport('#brand-file', 'supplyModify')); 62 common.edit.ajaxfileupload('#supplyModify', batchExport('#brand-file', 'supplyModify'));
63 /*基础商品导入*/ 63 /*基础商品导入*/
  64 +$("#baseProduct").prop("disabled",true);
64 common.edit.ajaxfileupload('#baseProduct', batchExport('#sort-file', 'baseProduct')); 65 common.edit.ajaxfileupload('#baseProduct', batchExport('#sort-file', 'baseProduct'));
  66 +$(document).on("change","#brandId",function(){
  67 + if($(this).val()>0){
  68 + $("#baseProduct").prop("disabled",false);
  69 + }else{
  70 + $("#baseProduct").prop("disabled",true);
  71 + }
  72 +});
65 73
@@ -247,12 +247,14 @@ $(document).on("click",".sortadd",function(){ @@ -247,12 +247,14 @@ $(document).on("click",".sortadd",function(){
247 return; 247 return;
248 } 248 }
249 if(g.__e.validate()){ 249 if(g.__e.validate()){
  250 + var goodsSizeList=$.extend({},ENUM.goodsSizeList);
  251 + goodsSizeList.salePrice=$("#salesPriceStr").val();
250 g.__rows.push({ 252 g.__rows.push({
251 "factoryCode": "", 253 "factoryCode": "",
252 "goodsColorImage": "", 254 "goodsColorImage": "",
253 goodsName: $(this).text(), 255 goodsName: $(this).text(),
254 colorId: (+$(this).data("id")), 256 colorId: (+$(this).data("id")),
255 - goodsSizeList: [$.extend({},ENUM.goodsSizeList)], 257 + goodsSizeList: [goodsSizeList],
256 isAdd:true 258 isAdd:true
257 }); 259 });
258 g.reload(); 260 g.reload();
@@ -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: {
@@ -56,7 +56,14 @@ @@ -56,7 +56,14 @@
56 <tr> 56 <tr>
57 <td rowspan="2">基础商品</td> 57 <td rowspan="2">基础商品</td>
58 <td>上传EXCEL:</td> 58 <td>上传EXCEL:</td>
59 - <td style="position: relative;"><input id="baseProduct" name="file" data-type="baseProduct" type="file" style="cursor: pointer; height: 37px; top: 8px;"></td> 59 + <td >
  60 + <div class="panel-col" style="position: relative;">
  61 + <input id="baseProduct" name="file" data-type="baseProduct" type="file" style="cursor: pointer; height: 37px; top: 8px;">
  62 + </div>
  63 + <div class="panel-col" style="line-height: 40px;position: relative;left: -60px;">
  64 + <span class="red">必须输入品牌</span>
  65 + </div>
  66 + </td>
60 </tr> 67 </tr>
61 <tr> 68 <tr>
62 <td>说明：</td> 69 <td>说明：</td>