从源更新
This commit is contained in:
@@ -16,11 +16,11 @@
|
||||
<script type="text/javascript" src="/js/common/outlook_in.js"></script>
|
||||
<script type="text/javascript" src="/js/My97DatePicker/WdatePicker.js"></script>
|
||||
<script type="text/javascript" src="/js/common/common.js"></script>
|
||||
<script src="/js/common/jsherp.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<!-- 查询 -->
|
||||
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
|
||||
closable="false">
|
||||
<!-- 数据显示table -->
|
||||
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="结算账户列表" iconCls="icon-list">
|
||||
<table id="searchTable">
|
||||
<tr>
|
||||
<td>名称:</td>
|
||||
@@ -45,11 +45,6 @@
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<!-- 数据显示table -->
|
||||
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="结算账户列表" iconCls="icon-list"
|
||||
collapsible="true" closable="false">
|
||||
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
|
||||
</div>
|
||||
|
||||
@@ -118,6 +113,7 @@
|
||||
return;
|
||||
}
|
||||
});
|
||||
dgResize();
|
||||
showAccountDetails(1, initPageSize);
|
||||
}
|
||||
|
||||
@@ -247,8 +243,7 @@
|
||||
{
|
||||
title: '单据编号', field: 'number', width: 150,
|
||||
formatter: function (value, row) {
|
||||
return "<a class='n-link' onclick=\"newTab('" + row.number + "','../materials/bill_detail.html?n=" + row.number + "&type=" + row.type + "','')\">"
|
||||
+ row.number + "</a>";
|
||||
return '<a class="n-link" onclick="turnBillDetailPage(\'' + row.number + '\''+',\'' + row.type + '\');">' + row.number + '</a>';
|
||||
}
|
||||
},
|
||||
{title: '类型', field: 'type', width: 100},
|
||||
|
||||
@@ -17,9 +17,8 @@
|
||||
<script type="text/javascript" src="/js/common/common.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<!-- 查询 -->
|
||||
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
|
||||
closable="false">
|
||||
<!-- 数据显示table -->
|
||||
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="进货统计列表" iconCls="icon-list">
|
||||
<table id="searchTable">
|
||||
<tr>
|
||||
<td>月份:</td>
|
||||
@@ -36,11 +35,6 @@
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<!-- 数据显示table -->
|
||||
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="进货统计列表" iconCls="icon-list"
|
||||
collapsible="true" closable="false">
|
||||
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
|
||||
</div>
|
||||
|
||||
@@ -111,7 +105,16 @@
|
||||
{title: '名称', field: 'MaterialName', width: 60},
|
||||
{title: '型号', field: 'MaterialModel', width: 80},
|
||||
{title: '扩展信息', field: 'MaterialOther', width: 150},
|
||||
{title: '单位', field: 'MaterialUnit', width: 80},
|
||||
{title: '单位', field: 'MaterialUnit', width: 80,
|
||||
formatter: function (value, row) {
|
||||
if(value) {
|
||||
return value;
|
||||
} else if(row.UName) {
|
||||
var uName = row.UName;
|
||||
return uName.substring(0,uName.indexOf(","));
|
||||
}
|
||||
}
|
||||
},
|
||||
{title: '进货数量', field: 'InSum', width: 60},
|
||||
{title: '进货金额', field: 'InSumPrice', width: 60},
|
||||
{title: '退货数量', field: 'OutSum', width: 60},
|
||||
@@ -122,6 +125,7 @@
|
||||
return;
|
||||
}
|
||||
});
|
||||
dgResize();
|
||||
}
|
||||
|
||||
//初始化键盘enter事件
|
||||
@@ -201,7 +205,7 @@
|
||||
var mIds = res.data.mIds;
|
||||
if (mIds) {
|
||||
$.ajax({
|
||||
type: "get",
|
||||
type: "post",
|
||||
url: "/depotItem/buyIn",
|
||||
dataType: "json",
|
||||
data: ({
|
||||
|
||||
@@ -16,11 +16,11 @@
|
||||
<script type="text/javascript" src="/js/common/outlook_in.js"></script>
|
||||
<script type="text/javascript" src="/js/My97DatePicker/WdatePicker.js"></script>
|
||||
<script type="text/javascript" src="/js/common/common.js"></script>
|
||||
<script src="/js/common/jsherp.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<!-- 查询 -->
|
||||
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
|
||||
closable="false">
|
||||
<!-- 数据显示table -->
|
||||
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="客户对账列表" iconCls="icon-list">
|
||||
<table id="searchTable">
|
||||
<tr>
|
||||
<td>客户:</td>
|
||||
@@ -51,11 +51,6 @@
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<!-- 数据显示table -->
|
||||
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="客户对账列表" iconCls="icon-list"
|
||||
collapsible="true" closable="false">
|
||||
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
|
||||
</div>
|
||||
|
||||
@@ -108,8 +103,7 @@
|
||||
{
|
||||
title: '单据编号', field: 'number', width: 140,
|
||||
formatter: function (value, row) {
|
||||
return "<a class='n-link' onclick=\"newTab('" + row.number + "','../materials/bill_detail.html?n=" + row.number + "&type=" + row.type + "','')\">"
|
||||
+ row.number + "</a>";
|
||||
return '<a class="n-link" onclick="turnBillDetailPage(\'' + row.number + '\''+',\'' + row.type + '\');">' + row.number + '</a>';
|
||||
}
|
||||
},
|
||||
{title: '类型', field: 'type', width: 100},
|
||||
@@ -124,6 +118,7 @@
|
||||
return;
|
||||
}
|
||||
});
|
||||
dgResize();
|
||||
}
|
||||
|
||||
//初始化键盘enter事件
|
||||
|
||||
@@ -16,11 +16,11 @@
|
||||
<script type="text/javascript" src="/js/common/outlook_in.js"></script>
|
||||
<script type="text/javascript" src="/js/My97DatePicker/WdatePicker.js"></script>
|
||||
<script type="text/javascript" src="/js/common/common.js"></script>
|
||||
<script src="/js/common/jsherp.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<!-- 查询 -->
|
||||
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
|
||||
closable="false">
|
||||
<!-- 数据显示table -->
|
||||
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="入库明细列表" iconCls="icon-list">
|
||||
<table id="searchTable">
|
||||
<tr>
|
||||
<td>供应商:</td>
|
||||
@@ -51,11 +51,6 @@
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<!-- 数据显示table -->
|
||||
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="入库明细列表" iconCls="icon-list"
|
||||
collapsible="true" closable="false">
|
||||
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
|
||||
</div>
|
||||
|
||||
@@ -154,17 +149,21 @@
|
||||
//初始化页面选项卡
|
||||
function initSelectInfo_depot() {
|
||||
var options = "";
|
||||
|
||||
if (depotList != null) {
|
||||
options = "";
|
||||
for (var i = 0; i < depotList.length; i++) {
|
||||
var depot = depotList[i];
|
||||
|
||||
if (userdepot != null) {
|
||||
if (userdepot.indexOf("[" + depot.id + "]") != -1) {
|
||||
options += '<option value="' + depot.id + '">' + depot.name + '</option>';
|
||||
depotString = depotString + depot.id + ",";
|
||||
var config = getSystemConfig();
|
||||
if(config && config.depotFlag == "1") {
|
||||
if (userdepot != null) {
|
||||
if (userdepot.indexOf("[" + depot.id + "]") != -1) {
|
||||
options += '<option value="' + depot.id + '">' + depot.name + '</option>';
|
||||
depotString = depotString + depot.id + ",";
|
||||
}
|
||||
}
|
||||
} else {
|
||||
options += '<option value="' + depot.id + '">' + depot.name + '</option>';
|
||||
depotString = depotString + depot.id + ",";
|
||||
}
|
||||
}
|
||||
depotString = depotString.substring(0, depotString.length - 1);
|
||||
@@ -191,8 +190,7 @@
|
||||
{
|
||||
title: '单据编号', field: 'number', width: 140,
|
||||
formatter: function (value, row) {
|
||||
return "<a class='n-link' onclick=\"newTab('" + row.number + "','../materials/bill_detail.html?n=" + row.number + "&type=" + row.newType + "','')\">"
|
||||
+ row.number + "</a>";
|
||||
return '<a class="n-link" onclick="turnBillDetailPage(\'' + row.number + '\''+',\'' + row.newType + '\');">' + row.number + '</a>';
|
||||
}
|
||||
},
|
||||
{title: '商品名称', field: 'mname', width: 120},
|
||||
@@ -209,6 +207,7 @@
|
||||
return;
|
||||
}
|
||||
});
|
||||
dgResize();
|
||||
}
|
||||
|
||||
//初始化键盘enter事件
|
||||
|
||||
@@ -17,9 +17,8 @@
|
||||
<script type="text/javascript" src="/js/common/common.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<!-- 查询 -->
|
||||
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
|
||||
closable="false">
|
||||
<!-- 数据显示table -->
|
||||
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="入库汇总列表" iconCls="icon-list">
|
||||
<table id="searchTable">
|
||||
<tr>
|
||||
<td>供应商:</td>
|
||||
@@ -50,11 +49,6 @@
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<!-- 数据显示table -->
|
||||
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="入库汇总列表" iconCls="icon-list"
|
||||
collapsible="true" closable="false">
|
||||
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
|
||||
</div>
|
||||
|
||||
@@ -153,17 +147,21 @@
|
||||
//初始化页面选项卡
|
||||
function initSelectInfo_depot() {
|
||||
var options = "";
|
||||
|
||||
if (depotList != null) {
|
||||
options = "";
|
||||
for (var i = 0; i < depotList.length; i++) {
|
||||
var depot = depotList[i];
|
||||
|
||||
if (userdepot != null) {
|
||||
if (userdepot.indexOf("[" + depot.id + "]") != -1) {
|
||||
options += '<option value="' + depot.id + '">' + depot.name + '</option>';
|
||||
depotString = depotString + depot.id + ",";
|
||||
var config = getSystemConfig();
|
||||
if(config && config.depotFlag == "1") {
|
||||
if (userdepot != null) {
|
||||
if (userdepot.indexOf("[" + depot.id + "]") != -1) {
|
||||
options += '<option value="' + depot.id + '">' + depot.name + '</option>';
|
||||
depotString = depotString + depot.id + ",";
|
||||
}
|
||||
}
|
||||
} else {
|
||||
options += '<option value="' + depot.id + '">' + depot.name + '</option>';
|
||||
depotString = depotString + depot.id + ",";
|
||||
}
|
||||
}
|
||||
depotString = depotString.substring(0, depotString.length - 1);
|
||||
@@ -198,6 +196,7 @@
|
||||
return;
|
||||
}
|
||||
});
|
||||
dgResize();
|
||||
}
|
||||
|
||||
//初始化键盘enter事件
|
||||
|
||||
@@ -17,9 +17,8 @@
|
||||
<script type="text/javascript" src="/js/common/common.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<!-- 查询 -->
|
||||
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
|
||||
closable="false">
|
||||
<!-- 数据显示table -->
|
||||
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="库存状况列表" iconCls="icon-list">
|
||||
<table id="searchTable">
|
||||
<tr>
|
||||
<td>仓库:</td>
|
||||
@@ -43,11 +42,6 @@
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<!-- 数据显示table -->
|
||||
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="库存状况列表" iconCls="icon-list"
|
||||
collapsible="true" closable="false">
|
||||
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
|
||||
</div>
|
||||
|
||||
@@ -77,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();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -145,16 +134,19 @@
|
||||
//初始化页面选项卡
|
||||
function initSelectInfo_depot() {
|
||||
var options = "";
|
||||
|
||||
if (depotList != null) {
|
||||
options = "";
|
||||
for (var i = 0; i < depotList.length; i++) {
|
||||
var depot = depotList[i];
|
||||
|
||||
if (userdepot != null) {
|
||||
if (userdepot.indexOf("[" + depot.id + "]") != -1) {
|
||||
options += '<option value="' + depot.id + '">' + depot.name + '</option>';
|
||||
var config = getSystemConfig();
|
||||
if(config && config.depotFlag == "1") {
|
||||
if (userdepot != null) {
|
||||
if (userdepot.indexOf("[" + depot.id + "]") != -1) {
|
||||
options += '<option value="' + depot.id + '">' + depot.name + '</option>';
|
||||
}
|
||||
}
|
||||
} else {
|
||||
options += '<option value="' + depot.id + '">' + depot.name + '</option>';
|
||||
}
|
||||
}
|
||||
$("#searchProjectId").empty().append(options);
|
||||
@@ -215,28 +207,20 @@
|
||||
{title: '名称', field: 'MaterialName', width: 60},
|
||||
{title: '型号', field: 'MaterialModel', width: 80},
|
||||
{title: '扩展信息', field: 'MaterialOther', width: 150},
|
||||
{title: '单位', field: 'MaterialUnit', width: 80},
|
||||
{
|
||||
title: '单价', field: 'UnitPrice', width: 60, formatter: function (value, row, index) {
|
||||
return value.toFixed(2);
|
||||
}
|
||||
},
|
||||
{title: '单位', field: 'unitName', width: 80},
|
||||
{title: '单价', field: 'UnitPrice', width: 60},
|
||||
{title: '上月结存数量', field: 'prevSum', width: 80},
|
||||
{title: '入库数量', field: 'InSum', width: 60},
|
||||
{title: '出库数量', field: 'OutSum', width: 60},
|
||||
{title: '本月结存数量', field: 'thisSum', width: 80},
|
||||
{
|
||||
title: '结存金额', field: 'thisAllPrice', width: 60,
|
||||
formatter: function (value, row, index) {
|
||||
return value.toFixed(2);
|
||||
}
|
||||
}
|
||||
{title: '结存金额', field: 'thisAllPrice', width: 60}
|
||||
]],
|
||||
onLoadError: function () {
|
||||
$.messager.alert('页面加载提示', '页面加载异常,请稍后再试!', 'error');
|
||||
return;
|
||||
}
|
||||
});
|
||||
dgResize();
|
||||
}
|
||||
|
||||
//初始化键盘enter事件
|
||||
@@ -325,17 +309,17 @@
|
||||
var mIds = res.data.mIds;
|
||||
if (mIds) {
|
||||
if (pageSize === 3000) {
|
||||
window.location.href = "/depotItem/exportExcel?browserType=" + getOs() + "¤tPage=" + pageNo + "&pageSize=" + pageSize + "&projectId=" + $.trim($("#searchProjectId").val()) + "&monthTime=" + $("#searchMonth").val() + "&headIds=" + HeadIds + "&materialIds=" + mIds;
|
||||
window.location.href = "/depotItem/exportExcel?browserType=" + getOs() + "¤tPage=" + pageNo + "&pageSize=" + pageSize + "&depotId=" + $.trim($("#searchProjectId").val()) + "&monthTime=" + $("#searchMonth").val() + "&headIds=" + HeadIds + "&materialIds=" + mIds;
|
||||
}
|
||||
else {
|
||||
$.ajax({
|
||||
type: "get",
|
||||
type: "post",
|
||||
url: "/depotItem/findByAll",
|
||||
dataType: "json",
|
||||
data: ({
|
||||
currentPage: pageNo,
|
||||
pageSize: pageSize,
|
||||
projectId: $.trim($("#searchProjectId").val()),
|
||||
depotId: $.trim($("#searchProjectId").val()),
|
||||
monthTime: $("#searchMonth").val(),
|
||||
headIds: HeadIds,
|
||||
materialIds: mIds,
|
||||
@@ -355,11 +339,11 @@
|
||||
|
||||
//总金额
|
||||
$.ajax({
|
||||
type: "get",
|
||||
type: "post",
|
||||
url: "/depotItem/totalCountMoney",
|
||||
dataType: "json",
|
||||
data: ({
|
||||
projectId: $.trim($("#searchProjectId").val()),
|
||||
depotId: $.trim($("#searchProjectId").val()),
|
||||
monthTime: $("#searchMonth").val(),
|
||||
headIds: HeadIds,
|
||||
materialIds: mIds
|
||||
@@ -371,7 +355,7 @@
|
||||
if (count.lastIndexOf('.') > -1) {
|
||||
count = count.substring(0, count.lastIndexOf('.') + 3);
|
||||
}
|
||||
$("#searchPanel .total-count").text("本月合计金额:" + count + "元");//本月合计金额
|
||||
$("#searchTable .total-count").text("本月合计金额:" + count + "元");//本月合计金额
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -16,11 +16,11 @@
|
||||
<script type="text/javascript" src="/js/common/outlook_in.js"></script>
|
||||
<script type="text/javascript" src="/js/My97DatePicker/WdatePicker.js"></script>
|
||||
<script type="text/javascript" src="/js/common/common.js"></script>
|
||||
<script src="/js/common/jsherp.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<!-- 查询 -->
|
||||
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
|
||||
closable="false">
|
||||
<!-- 数据显示table -->
|
||||
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="出库明细列表" iconCls="icon-list">
|
||||
<table id="searchTable">
|
||||
<tr>
|
||||
<td>客户:</td>
|
||||
@@ -51,11 +51,6 @@
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<!-- 数据显示table -->
|
||||
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="出库明细列表" iconCls="icon-list"
|
||||
collapsible="true" closable="false">
|
||||
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
|
||||
</div>
|
||||
|
||||
@@ -154,17 +149,21 @@
|
||||
//初始化页面选项卡
|
||||
function initSelectInfo_depot() {
|
||||
var options = "";
|
||||
|
||||
if (depotList != null) {
|
||||
options = "";
|
||||
for (var i = 0; i < depotList.length; i++) {
|
||||
var depot = depotList[i];
|
||||
|
||||
if (userdepot != null) {
|
||||
if (userdepot.indexOf("[" + depot.id + "]") != -1) {
|
||||
options += '<option value="' + depot.id + '">' + depot.name + '</option>';
|
||||
depotString = depotString + depot.id + ",";
|
||||
var config = getSystemConfig();
|
||||
if(config && config.depotFlag == "1") {
|
||||
if (userdepot != null) {
|
||||
if (userdepot.indexOf("[" + depot.id + "]") != -1) {
|
||||
options += '<option value="' + depot.id + '">' + depot.name + '</option>';
|
||||
depotString = depotString + depot.id + ",";
|
||||
}
|
||||
}
|
||||
} else {
|
||||
options += '<option value="' + depot.id + '">' + depot.name + '</option>';
|
||||
depotString = depotString + depot.id + ",";
|
||||
}
|
||||
}
|
||||
depotString = depotString.substring(0, depotString.length - 1);
|
||||
@@ -191,8 +190,7 @@
|
||||
{
|
||||
title: '单据编号', field: 'number', width: 140,
|
||||
formatter: function (value, row) {
|
||||
return "<a class='n-link' onclick=\"newTab('" + row.number + "','../materials/bill_detail.html?n=" + row.number + "&type=" + row.newType + "','')\">"
|
||||
+ row.number + "</a>";
|
||||
return '<a class="n-link" onclick="turnBillDetailPage(\'' + row.number + '\''+',\'' + row.newType + '\');">' + row.number + '</a>';
|
||||
}
|
||||
},
|
||||
{title: '商品名称', field: 'mname', width: 120},
|
||||
@@ -209,6 +207,7 @@
|
||||
return;
|
||||
}
|
||||
});
|
||||
dgResize();
|
||||
}
|
||||
|
||||
//初始化键盘enter事件
|
||||
|
||||
@@ -17,9 +17,8 @@
|
||||
<script type="text/javascript" src="/js/common/common.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<!-- 查询 -->
|
||||
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
|
||||
closable="false">
|
||||
<!-- 数据显示table -->
|
||||
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="出库汇总列表" iconCls="icon-list">
|
||||
<table id="searchTable">
|
||||
<tr>
|
||||
<td>客户:</td>
|
||||
@@ -50,11 +49,6 @@
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<!-- 数据显示table -->
|
||||
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="出库汇总列表" iconCls="icon-list"
|
||||
collapsible="true" closable="false">
|
||||
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
|
||||
</div>
|
||||
|
||||
@@ -153,17 +147,21 @@
|
||||
//初始化页面选项卡
|
||||
function initSelectInfo_depot() {
|
||||
var options = "";
|
||||
|
||||
if (depotList != null) {
|
||||
options = "";
|
||||
for (var i = 0; i < depotList.length; i++) {
|
||||
var depot = depotList[i];
|
||||
|
||||
if (userdepot != null) {
|
||||
if (userdepot.indexOf("[" + depot.id + "]") != -1) {
|
||||
options += '<option value="' + depot.id + '">' + depot.name + '</option>';
|
||||
depotString = depotString + depot.id + ",";
|
||||
var config = getSystemConfig();
|
||||
if(config && config.depotFlag == "1") {
|
||||
if (userdepot != null) {
|
||||
if (userdepot.indexOf("[" + depot.id + "]") != -1) {
|
||||
options += '<option value="' + depot.id + '">' + depot.name + '</option>';
|
||||
depotString = depotString + depot.id + ",";
|
||||
}
|
||||
}
|
||||
} else {
|
||||
options += '<option value="' + depot.id + '">' + depot.name + '</option>';
|
||||
depotString = depotString + depot.id + ",";
|
||||
}
|
||||
}
|
||||
depotString = depotString.substring(0, depotString.length - 1);
|
||||
@@ -198,6 +196,7 @@
|
||||
return;
|
||||
}
|
||||
});
|
||||
dgResize();
|
||||
}
|
||||
|
||||
//初始化键盘enter事件
|
||||
|
||||
@@ -17,9 +17,8 @@
|
||||
<script type="text/javascript" src="/js/common/common.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<!-- 查询 -->
|
||||
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
|
||||
closable="false">
|
||||
<!-- 数据显示table -->
|
||||
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="销售统计列表" iconCls="icon-list">
|
||||
<table id="searchTable">
|
||||
<tr>
|
||||
<td>月份:</td>
|
||||
@@ -37,11 +36,6 @@
|
||||
<td>当前销售总额:<span class="first-total">0</span> <span class="tip">注:此处包含零售+批发销售</span></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<!-- 数据显示table -->
|
||||
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="销售统计列表" iconCls="icon-list"
|
||||
collapsible="true" closable="false">
|
||||
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
|
||||
</div>
|
||||
|
||||
@@ -110,15 +104,24 @@
|
||||
pageSize: 10,
|
||||
pageList: [10, 50, 100],
|
||||
columns: [[
|
||||
{title: '名称', field: 'MaterialName', width: 60, align: "center"},
|
||||
{title: '型号', field: 'MaterialModel', width: 80, align: "center"},
|
||||
{title: '扩展信息', field: 'MaterialOther', width: 150, align: "center"},
|
||||
{title: '单位', field: 'MaterialUnit', width: 80, align: "center"},
|
||||
{title: '销售数量', field: 'OutSum', width: 60, align: "center"},
|
||||
{title: '销售金额', field: 'OutSumPrice', width: 60, align: "center"},
|
||||
{title: '退货数量', field: 'InSum', width: 60, align: "center"},
|
||||
{title: '退货金额', field: 'InSumPrice', width: 60, align: "center"},
|
||||
{title: '实际销售金额', field: 'OutInSumPrice', width: 80, align: "center"}
|
||||
{title: '名称', field: 'MaterialName', width: 60},
|
||||
{title: '型号', field: 'MaterialModel', width: 80},
|
||||
{title: '扩展信息', field: 'MaterialOther', width: 150},
|
||||
{title: '单位', field: 'MaterialUnit', width: 80,
|
||||
formatter: function (value, row) {
|
||||
if(value) {
|
||||
return value;
|
||||
} else if(row.UName) {
|
||||
var uName = row.UName;
|
||||
return uName.substring(0,uName.indexOf(","));
|
||||
}
|
||||
}
|
||||
},
|
||||
{title: '销售数量', field: 'OutSum', width: 60},
|
||||
{title: '销售金额', field: 'OutSumPrice', width: 60},
|
||||
{title: '退货数量', field: 'InSum', width: 60},
|
||||
{title: '退货金额', field: 'InSumPrice', width: 60},
|
||||
{title: '实际销售金额', field: 'OutInSumPrice', width: 80}
|
||||
|
||||
]],
|
||||
onLoadError: function () {
|
||||
@@ -126,6 +129,7 @@
|
||||
return;
|
||||
}
|
||||
});
|
||||
dgResize();
|
||||
}
|
||||
|
||||
//初始化键盘enter事件
|
||||
@@ -206,7 +210,7 @@
|
||||
var mIds = res.data.mIds;
|
||||
if (mIds) {
|
||||
$.ajax({
|
||||
type: "get",
|
||||
type: "post",
|
||||
url: "/depotItem/saleOut",
|
||||
dataType: "json",
|
||||
data: ({
|
||||
|
||||
@@ -17,9 +17,8 @@
|
||||
<script type="text/javascript" src="/js/common/common.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<!-- 查询 -->
|
||||
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
|
||||
closable="false">
|
||||
<!-- 数据显示table -->
|
||||
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="库存预警列表" iconCls="icon-list">
|
||||
<table id="searchTable">
|
||||
<tr>
|
||||
<td>仓库:</td>
|
||||
@@ -38,11 +37,6 @@
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<!-- 数据显示table -->
|
||||
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="库存预警列表" iconCls="icon-list"
|
||||
collapsible="true" closable="false">
|
||||
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
|
||||
</div>
|
||||
|
||||
@@ -139,16 +133,19 @@
|
||||
//初始化页面选项卡
|
||||
function initSelectInfo_depot() {
|
||||
var options = "";
|
||||
|
||||
if (depotList != null) {
|
||||
options = "";
|
||||
for (var i = 0; i < depotList.length; i++) {
|
||||
var depot = depotList[i];
|
||||
|
||||
if (userdepot != null) {
|
||||
if (userdepot.indexOf("[" + depot.id + "]") != -1) {
|
||||
options += '<option value="' + depot.id + '">' + depot.name + '</option>';
|
||||
var config = getSystemConfig();
|
||||
if(config && config.depotFlag == "1") {
|
||||
if (userdepot != null) {
|
||||
if (userdepot.indexOf("[" + depot.id + "]") != -1) {
|
||||
options += '<option value="' + depot.id + '">' + depot.name + '</option>';
|
||||
}
|
||||
}
|
||||
} else {
|
||||
options += '<option value="' + depot.id + '">' + depot.name + '</option>';
|
||||
}
|
||||
}
|
||||
$("#searchProjectId").empty().append(options);
|
||||
@@ -221,6 +218,7 @@
|
||||
return;
|
||||
}
|
||||
});
|
||||
dgResize();
|
||||
}
|
||||
|
||||
//初始化键盘enter事件
|
||||
|
||||
@@ -16,11 +16,11 @@
|
||||
<script type="text/javascript" src="/js/common/outlook_in.js"></script>
|
||||
<script type="text/javascript" src="/js/My97DatePicker/WdatePicker.js"></script>
|
||||
<script type="text/javascript" src="/js/common/common.js"></script>
|
||||
<script src="/js/common/jsherp.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<!-- 查询 -->
|
||||
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
|
||||
closable="false">
|
||||
<!-- 数据显示table -->
|
||||
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="供应商对账列表" iconCls="icon-list">
|
||||
<table id="searchTable">
|
||||
<tr>
|
||||
<td>供应商:</td>
|
||||
@@ -51,11 +51,6 @@
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<!-- 数据显示table -->
|
||||
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="供应商对账列表" iconCls="icon-list"
|
||||
collapsible="true" closable="false">
|
||||
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
|
||||
</div>
|
||||
|
||||
@@ -107,8 +102,7 @@
|
||||
{
|
||||
title: '单据编号', field: 'number', width: 140,
|
||||
formatter: function (value, row) {
|
||||
return "<a class='n-link' onclick=\"newTab('" + row.number + "','../materials/bill_detail.html?n=" + row.number + "&type=" + row.type + "','')\">"
|
||||
+ row.number + "</a>";
|
||||
return '<a class="n-link" onclick="turnBillDetailPage(\'' + row.number + '\''+',\'' + row.type + '\');">' + row.number + '</a>';
|
||||
}
|
||||
},
|
||||
{title: '类型', field: 'type', width: 100},
|
||||
@@ -123,6 +117,7 @@
|
||||
return;
|
||||
}
|
||||
});
|
||||
dgResize();
|
||||
}
|
||||
|
||||
//初始化键盘enter事件
|
||||
|
||||
Reference in New Issue
Block a user