fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by chenchao
Commit 8380bb6dcd5e7bd0fd00c218cb8d111bbe2620be 1 parent af6fb879

split deposit advance and advace product

Inline Side-by-side
Showing 2 changed files with 23 additions and 6 deletions
@@ -45,19 +45,34 @@ @@ -45,19 +45,34 @@
45 3、<a href="/ajax/link/modifyFactoryCode">下载样例</a> 45 3、<a href="/ajax/link/modifyFactoryCode">下载样例</a>
46 </td> 46 </td>
47 </tr> 47 </tr>
  48 + <!-- 定金预售商品 -->
48 <tr> 49 <tr>
49 - <td rowspan="2">预售商品</td>  
50 - <td>上传EXCEL:</td>  
51 - <td style="position: relative;"><input id="AdvanceModify" name="file" data-type="brandProperty" type="file" style="cursor: pointer; height: 37px; top: 8px;"></td>  
52 - </tr> 50 + <td rowspan="2">定金预售商品</td>
  51 + <td>上传EXCEL:</td>
  52 + <td style="position: relative;"><input id="depositAdvanceModify" name="file" data-type="brandProperty" type="file" style="cursor: pointer; height: 37px; top: 8px;"></td>
  53 + </tr>
53 <tr> 54 <tr>
54 <td>说明：</td> 55 <td>说明：</td>
55 <td colspan="2"> 56 <td colspan="2">
56 1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br> 57 1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br>
57 - 2、第一行标题栏：<span style="color: #67D267;">SKN|是否预售|预计到货时间|预付定金</span><br> 58 + 2、第一行标题栏：<span style="color: #67D267;">SKN|是否预售|预计到货时间|预付定金|定金翻倍</span><br>
58 3、<a href="/ajax/link/djys">下载样例</a> 59 3、<a href="/ajax/link/djys">下载样例</a>
59 </td> 60 </td>
60 </tr> 61 </tr>
  62 + <!-- 普通预售商品 -->
  63 + <tr>
  64 + <td rowspan="2">普通预售商品</td>
  65 + <td>上传EXCEL:</td>
  66 + <td style="position: relative;"><input id="advanceModify" name="file" data-type="brandProperty" type="file" style="cursor: pointer; height: 37px; top: 8px;"></td>
  67 + </tr>
  68 + <tr>
  69 + <td>说明：</td>
  70 + <td colspan="2">
  71 + 1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br>
  72 + 2、第一行标题栏：<span style="color: #67D267;">SKN|是否预售|预计到货时间</span><br>
  73 + 3、<a href="/ajax/link/advancePrd">下载样例</a>
  74 + </td>
  75 + </tr>
61 <tr> 76 <tr>
62 <td rowspan="2">支付尾款时间</td> 77 <td rowspan="2">支付尾款时间</td>
63 <td>上传EXCEL:</td> 78 <td>上传EXCEL:</td>
@@ -77,7 +77,9 @@ common.edit.ajaxfileupload('#factoryCodeModify', batchExport('#brand-file', 'sku @@ -77,7 +77,9 @@ common.edit.ajaxfileupload('#factoryCodeModify', batchExport('#brand-file', 'sku
77 $("#baseProduct").prop("disabled",true); 77 $("#baseProduct").prop("disabled",true);
78 common.edit.ajaxfileupload('#baseProduct', batchExport('#sort-file', 'baseProduct')); 78 common.edit.ajaxfileupload('#baseProduct', batchExport('#sort-file', 'baseProduct'));
79 /*定金预售*/ 79 /*定金预售*/
80 -common.edit.ajaxfileupload('#AdvanceModify', _advanceImport('depositAdvance')); 80 +common.edit.ajaxfileupload('#depositAdvanceModify', _advanceImport('depositAdvance'));
  81 +/*普通预售*/
  82 +common.edit.ajaxfileupload('#advanceModify', _advanceImport('advancePrdImport'));
81 /*定金预售支付尾款时间*/ 83 /*定金预售支付尾款时间*/
82 common.edit.ajaxfileupload('#AdvanceTimeModify', _advanceImport('depositAdvanceTime')); 84 common.edit.ajaxfileupload('#AdvanceTimeModify', _advanceImport('depositAdvanceTime'));
83 85