Authored by dongjunjie

yoho币bug

... ... @@ -146,7 +146,9 @@ function ajaxUploadSubmit(importAuditorId){
},function(rs){
if(rs.code == 200){
common.util.__tip("批量导入保存成功!", "success");
location.href = '';
setTimeout(function() {
location.href = '';
}, 1000);
}else{
common.util.__tip(rs.data.message);
}
... ... @@ -182,6 +184,14 @@ function clearImportResult(){
$("#yohoCoinImportResult").hide();
}
//批量导入确认—校验审核人
function isNeedImportAuditor(){
$.each(importYohoCoinData, function(index,value){
if(value.isNeedAudit || value.salesPrice * pricePercent <= value.needAuditCoin) return true;
});
return false;
}
//吊牌价跟销售价校验
function checkPrice(retailPrice, salesPrice){
if(retailPrice == salesPrice){
... ... @@ -293,7 +303,7 @@ $(document).on('click', '.btn-delete-yohoCoin', function() {
//批量导入结果列表确定
$(document).on('click', '.btn-submit-yohoCoin', function() {
var importAuditorIdInput = $("#importAuditor");
if(isNeedAudit){
if(isNeedImportAuditor()){
if(!checkAuditor(importAuditorIdInput)){
return false;
}
... ...
... ... @@ -128,14 +128,14 @@
<div class="dataTables_wrapper no-footer" id="yohoCoin_table"></div>
<div class="panel bulk-import" id="yohoCoin_import">
<a id="return-btn" href="javascript:;" class="btn btn-primary">返回列表</a>
<a id="return-btn" href="javascript:;" class="btn btn-info">返回列表</a>
<table class="table table-bordered" style="border:1px solid #ddd; margin-top: 10px">
<tr>
<td width="120px" style="line-height: 37px"><b>上传EXCEL:</b></td>
<td style="position: relative;">
<input id="yohoCoinUpload" name="file" type="file" style="cursor: pointer; height: 37px; top: 8px;">
<div class="file-name btn btn-info">请选择文件</div>
<div class="file-name btn btn-primary">请选择文件</div>
</td>
</tr>
<tr>
... ...