|
@@ -146,7 +146,9 @@ function ajaxUploadSubmit(importAuditorId){ |
|
@@ -146,7 +146,9 @@ function ajaxUploadSubmit(importAuditorId){ |
|
146
|
},function(rs){
|
146
|
},function(rs){
|
|
147
|
if(rs.code == 200){
|
147
|
if(rs.code == 200){
|
|
148
|
common.util.__tip("批量导入保存成功！", "success");
|
148
|
common.util.__tip("批量导入保存成功！", "success");
|
|
149
|
- location.href = '';
|
149
|
+ setTimeout(function() {
|
|
|
|
150
|
+ location.href = '';
|
|
|
|
151
|
+ }, 1000);
|
|
150
|
}else{
|
152
|
}else{
|
|
151
|
common.util.__tip(rs.data.message);
|
153
|
common.util.__tip(rs.data.message);
|
|
152
|
}
|
154
|
}
|
|
@@ -182,6 +184,14 @@ function clearImportResult(){ |
|
@@ -182,6 +184,14 @@ function clearImportResult(){ |
|
182
|
$("#yohoCoinImportResult").hide();
|
184
|
$("#yohoCoinImportResult").hide();
|
|
183
|
}
|
185
|
}
|
|
184
|
|
186
|
|
|
|
|
187
|
+//批量导入确认—校验审核人
|
|
|
|
188
|
+function isNeedImportAuditor(){
|
|
|
|
189
|
+ $.each(importYohoCoinData, function(index,value){
|
|
|
|
190
|
+ if(value.isNeedAudit || value.salesPrice * pricePercent <= value.needAuditCoin) return true;
|
|
|
|
191
|
+ });
|
|
|
|
192
|
+ return false;
|
|
|
|
193
|
+}
|
|
|
|
194
|
+
|
|
185
|
//吊牌价跟销售价校验
|
195
|
//吊牌价跟销售价校验
|
|
186
|
function checkPrice(retailPrice, salesPrice){
|
196
|
function checkPrice(retailPrice, salesPrice){
|
|
187
|
if(retailPrice == salesPrice){
|
197
|
if(retailPrice == salesPrice){
|
|
@@ -293,7 +303,7 @@ $(document).on('click', '.btn-delete-yohoCoin', function() { |
|
@@ -293,7 +303,7 @@ $(document).on('click', '.btn-delete-yohoCoin', function() { |
|
293
|
//批量导入结果列表确定
|
303
|
//批量导入结果列表确定
|
|
294
|
$(document).on('click', '.btn-submit-yohoCoin', function() {
|
304
|
$(document).on('click', '.btn-submit-yohoCoin', function() {
|
|
295
|
var importAuditorIdInput = $("#importAuditor");
|
305
|
var importAuditorIdInput = $("#importAuditor");
|
|
296
|
- if(isNeedAudit){
|
306
|
+ if(isNeedImportAuditor()){
|
|
297
|
if(!checkAuditor(importAuditorIdInput)){
|
307
|
if(!checkAuditor(importAuditorIdInput)){
|
|
298
|
return false;
|
308
|
return false;
|
|
299
|
}
|
309
|
}
|
