Commit b95ca4f8 by guanzhenshan

同上

parent aca45c69
......@@ -166,7 +166,7 @@ namespace Bailun.DC.Web.Areas.Logistics.Controllers
m.lettercount = item.Where(a => listconfig.Where(b => b.type == 6).Select(c => c.config_value).Contains(a.logistics_order_id)).Count(); //letter
m.percenl = m.hpackagecount / m.lettercount;
m.percenl = m.lettercount>0?m.hpackagecount / m.lettercount:0;
//需新增包裹数=1.2*信封transactionid数-包裹transactionid订单数
var need = ((m.lettercount * 1.2 - m.hpackagecount) > 0 ? (m.lettercount * 1.2 - m.hpackagecount) : 0);
......@@ -176,9 +176,9 @@ namespace Bailun.DC.Web.Areas.Logistics.Controllers
m.needcount_bg = Math.Ceiling(need);
//letter占比
m.percenz = decimal.Parse((m.lettercount*100 / m.ordercount).ToString("#0.00"));
m.percenz = m.ordercount>0? decimal.Parse((m.lettercount*100 / m.ordercount).ToString("#0.00")):0;
//包裹占比
m.percenh = decimal.Parse((m.hpackagecount*100 / m.ordercount).ToString("#0.00"));
m.percenh = m.ordercount>0?decimal.Parse((m.hpackagecount*100 / m.ordercount).ToString("#0.00")):0;
list.Add(m);
......@@ -195,7 +195,7 @@ namespace Bailun.DC.Web.Areas.Logistics.Controllers
};
countM.percenl = countM.hpackagecount / countM.lettercount;
countM.percenl = countM.lettercount>0? countM.hpackagecount / countM.lettercount:0;
var need1 = ((countM.lettercount * 1.2 - countM.hpackagecount) > 0 ? (countM.lettercount * 1.2 - countM.hpackagecount) : 0);
......@@ -246,7 +246,7 @@ namespace Bailun.DC.Web.Areas.Logistics.Controllers
}
return JsonConvert.SerializeObject(new { total = 25, rows = list, count_row = countM });
return JsonConvert.SerializeObject(new { total = list.Count, rows = list, count_row = countM });
}
}
......
......@@ -99,7 +99,7 @@
var url = '@Url.Content("~/Logistics/Home/EbayUkReportJson")' + '?' + $("#toolbar").serialize();
if (tb == undefined) {
tb = OnlyTable("roletable", columns, url, "", { showfooter: true, showCount:true});
tb = OnlyTable("roletable", columns, url, "", { showfooter: true, showCount: true }, undefined,1000);
}
else {
tb.bootstrapTable('refresh', { url: url });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment