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

优化报表，使其显示扩展信息

Browse Source
This commit is contained in:
季圣华
2020-12-27 15:10:43 +08:00
parent 76fd851ea1
commit e83ca1c5a7
7 changed files with 91 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erp_web/js/pages/bill/add_temp.js
View File

@@ -186,7 +186,7 @@ function bindSupplierEvent() {
success: function(res) {
if (res) {
$('#supplierDlg').dialog('close');
initSupplier(); //刷新供应商
inOutService.initSupplier(); //刷新供应商
}
}
});
@@ -319,7 +319,7 @@ function bindAccountEvent() {
success: function(res) {
if(res && res.code === 200) {
$('#accountDlg').dialog('close');
initSystemData_account(); //刷新账户
inOutService.initSystemData_account(); //刷新账户
}
},
//此处添加错误处理

2
erp_web/js/pages/bill/bill_detail.js
View File

@@ -52,7 +52,7 @@
var thisRows = res.data.page.rows;
for (var i = 0; i < thisRows.length; i++) {
if (thisRows[i].enabled) {
mPropertyList += thisRows[i].nativename + ",";
mPropertyList += thisRows[i].nativeName + ",";
}
}
if (mPropertyList) {

16
erp_web/pages/materials/materialProperty.html
View File

@@ -111,6 +111,13 @@
//loadFilter: pagerFilter,
columns: [[
{field: 'id', width: 10, align: "center", hidden: true},
{
title: '操作', field: 'op', align: "center", width: 80, formatter: function (value, rec, index) {
var str = '';
str += '<img src="/js/easyui/themes/icons/pencil.png" style="cursor: pointer;" onclick="editMaterialProperty(\'' + index + '\');"/>';
return str;
}
},
{title: '名称', field: 'nativeName', width: 100},
{
title: '是否启用', field: 'enabled', width: 100, formatter: function (value, rec) {
@@ -123,14 +130,7 @@
}
},
{title: '排序', field: 'sort', width: 100},
{title: '别名', field: 'anotherName', width: 100},
{
title: '操作', field: 'op', align: "center", width: 80, formatter: function (value, rec, index) {
var str = '';
str += '<img src="/js/easyui/themes/icons/pencil.png" style="cursor: pointer;" onclick="editMaterialProperty(\'' + index + '\');"/>&nbsp;<a onclick="editMaterialProperty(\'' + index + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
return str;
}
}
{title: '别名', field: 'anotherName', width: 100}
]],
onLoadError: function () {
$.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');

8
erp_web/pages/reports/stock_warning_report.html
View File

@@ -293,12 +293,16 @@
data: ({
currentPage: pageNo,
pageSize: pageSize,
projectId : $.trim($("#searchProjectId").val())
projectId : $.trim($("#searchProjectId").val()),
mpList: mPropertyList
}),
success: function (res) {
if(res && res.code === 200 && res.data) {
if (pageSize === 3000) {
window.location.href = "/depotItem/exportWarningExcel?browserType=" + getOs() + "&currentPage=" + pageNo + "&pageSize=" + pageSize + "&projectId=" + $.trim($("#searchProjectId").val()) ;
window.location.href = "/depotItem/exportWarningExcel?browserType=" + getOs()
+ "&currentPage=" + pageNo + "&pageSize=" + pageSize
+ "&projectId=" + $.trim($("#searchProjectId").val())
+ "&mpList=" + mPropertyList;
}
else {
//获取排序后的产品ID