YOHOBUY / yohobuy-union · Commits

Go to a project

Authored by gemingdan
Commit 86feb0808633bfe5533c0eef2e151694acf7b94a 1 parent 669926c9

推手返佣后台

Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
... ... @@ -60,7 +60,7 @@ public class UnionShareBrandRebateExportImpl implements IBusinessExportService {
UnionShareBrandRebateExportBo bo = new UnionShareBrandRebateExportBo();
BeanUtils.copyProperties(l,bo);
bo.setRebatePercentStr(l.getType() == 1 ? "默认":l.getRebate()/100 + "%") ;
bo.setStateStr(l.getState() == 1 ? "品牌状态" : l.getState() == 2 ? "开启" : "关闭");
bo.setStateStr(l.getState() == 1 ? "开启" : "关闭");
results.add(bo);
});
return results;
... ...
... ... @@ -18,8 +18,8 @@
<input class="easyui-combobox" id="state" style="width:150px;" data-options="editable:false"/>
<a id="searchBtn" class="easyui-linkbutton btn-info">查询</a>
<a id="addBtn" class="easyui-linkbutton btn-primary" style="margin-left: 10px">新增</a>
<a id="exportBtn" class="easyui-linkbutton btn-primary" style="margin-left: 10px">导出</a>
<a id="batchImportBtn" class="easyui-linkbutton btn-primary" style="margin-left: 10px">批量导入</a>
<a id="exportBtn" class="easyui-linkbutton btn-success" style="margin-left: 10px; width:54px; height:37px">导出</a>
<a id="batchImportBtn" class="easyui-linkbutton btn-success" style="margin-left: 10px">批量导入</a>
</div>
</div>
... ... @@ -118,7 +118,7 @@
if(rowData.type == 1){
return "默认" ;
}
return value/100 + "%"
return value/100 + "%";
}
}, {
title: "品牌返佣状态",
... ...