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

Merge branch 'master' of https://gitee.com/jishenghua/JSH_ERP

Browse Source
This commit is contained in:
cjl
2019-01-23 14:01:00 +08:00
parent 309d575c5d dd6f7d8a51
commit 4744dee4fb
13 changed files with 157 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
erp_web/pages/manage/log.html
View File

@@ -178,18 +178,15 @@
//初始化系统基础信息
function initSystemData() {
$.ajax({
type: "post",
url: "/log/getBasicData.action",
type: "get",
url: "/user/getAllList",
//设置为同步
async: false,
dataType: "json",
success: function (systemInfo) {
success: function (res) {
//成功关闭loading
userList = systemInfo.showModel.map.userList;
var msgTip = systemInfo.showModel.msgTip;
if (msgTip == "exceptoin") {
$.messager.alert('提示', '查找系统基础信息异常,请与管理员联系！', 'error');
return;
if(res && res.code === 200){
userList = res.data.userList;
}
}
});
@@ -198,7 +195,6 @@
//初始化页面选项卡
function initSelectInfo() {
var options = "";
if (userList != null) {
options = "";
for (var i = 0; i < userList.length; i++) {

2
erp_web/pages/reports/in_detail.html
View File

@@ -292,7 +292,7 @@
}),
success: function (res) {
if(res && res.code === 200 && res.data) {
$("#tableData").datagrid('loadData', res.data.rows);
$("#tableData").datagrid('loadData', res.data);
}
},
//此处添加错误处理

2
erp_web/pages/reports/in_material_count.html
View File

@@ -281,7 +281,7 @@
}),
success: function (res) {
if(res && res.code === 200 && res.data) {
$("#tableData").datagrid('loadData', res.data.rows);
$("#tableData").datagrid('loadData', res.data);
}
},
//此处添加错误处理

2
erp_web/pages/reports/out_detail.html
View File

@@ -292,7 +292,7 @@
}),
success: function (res) {
if(res && res.code === 200 && res.data) {
$("#tableData").datagrid('loadData', res.data.rows);
$("#tableData").datagrid('loadData', res.data);
}
},
//此处添加错误处理

2
erp_web/pages/reports/out_material_count.html
View File

@@ -281,7 +281,7 @@
}),
success: function (res) {
if(res && res.code === 200 && res.data) {
$("#tableData").datagrid('loadData', res.data.rows);
$("#tableData").datagrid('loadData', res.data);
}
},
//此处添加错误处理