purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化库存计算方式

Browse Source
This commit is contained in:
季圣华
2019-10-12 01:32:10 +08:00
parent 26bd62355d
commit ee8390559b
10 changed files with 253 additions and 677 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erp_web/js/pages/materials/in_out.js
View File

@@ -603,17 +603,14 @@
type: "get",
url: '/depotItem/findStockNumById',
data:{
projectId: depotId,
materialId: mId,
monthTime: monthTime,
currentPage: 1,
pageSize: 10
depotId: depotId,
mId: mId
},
dataType: "json",
success: function (res) {
if(res && res.code === 200) {
if (res.data && res.data.page && res.data.page[0]) {
var thisStock = res.data.page[0].thisSum;
if (res.data) {
var thisStock = res.data.stock;
if (type == "select") { //选择下拉框的时候
if (ratio != undefined && ratio != 1) {
loadRatio = ratio;

19
erp_web/pages/reports/in_out_stock_report.html
View File

@@ -71,14 +71,9 @@
//导出EXCEL
function exportExcel() {
$("#exprotBtn").off("click").on("click", function () {
if (!$("#searchPanel .total-count").text()) {
$.messager.alert('导出提示', '请先选择月份再进行查询！', 'error');
}
else {
showEachDetails(1, 3000);
//此处直接去做get请求，用下面的查询每月统计的方法，去获取list，参数长度虽长，但还是可以用get
//window.location.href = "/depotItem/exportExcel.action?browserType=" + getOs();
}
showEachDetails(1, 3000);
//此处直接去做get请求，用下面的查询每月统计的方法，去获取list，参数长度虽长，但还是可以用get
//window.location.href = "/depotItem/exportExcel.action?browserType=" + getOs();
});
}
@@ -314,7 +309,7 @@
var mIds = res.data.mIds;
if (mIds) {
if (pageSize === 3000) {
window.location.href = "/depotItem/exportExcel?browserType=" + getOs() + "&currentPage=" + pageNo + "&pageSize=" + pageSize + "&projectId=" + $.trim($("#searchProjectId").val()) + "&monthTime=" + $("#searchMonth").val() + "&headIds=" + HeadIds + "&materialIds=" + mIds;
window.location.href = "/depotItem/exportExcel?browserType=" + getOs() + "&currentPage=" + pageNo + "&pageSize=" + pageSize + "&depotId=" + $.trim($("#searchProjectId").val()) + "&monthTime=" + $("#searchMonth").val() + "&headIds=" + HeadIds + "&materialIds=" + mIds;
}
else {
$.ajax({
@@ -324,7 +319,7 @@
data: ({
currentPage: pageNo,
pageSize: pageSize,
projectId: $.trim($("#searchProjectId").val()),
depotId: $.trim($("#searchProjectId").val()),
monthTime: $("#searchMonth").val(),
headIds: HeadIds,
materialIds: mIds,
@@ -348,7 +343,7 @@
url: "/depotItem/totalCountMoney",
dataType: "json",
data: ({
projectId: $.trim($("#searchProjectId").val()),
depotId: $.trim($("#searchProjectId").val()),
monthTime: $("#searchMonth").val(),
headIds: HeadIds,
materialIds: mIds
@@ -360,7 +355,7 @@
if (count.lastIndexOf('.') > -1) {
count = count.substring(0, count.lastIndexOf('.') + 3);
}
$("#searchPanel .total-count").text("本月合计金额:" + count + "元");//本月合计金额
$("#searchTable .total-count").text("本月合计金额:" + count + "元");//本月合计金额
}
}
},