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

切换到jsh的版本

Browse Source
This commit is contained in:
qiankunpingtai
2019-11-08 20:34:36 +08:00
parent 9182e734fc
commit 7cabc39ab8
125 changed files with 1692 additions and 46688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erp_web/pages/financial/advance_in.html
View File

@@ -14,7 +14,7 @@
<script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/financial/advance_in.js"></script>
<script src="/js/pages/financial/financial_base.js"></script>
</head>
<body>
<!-- 数据显示table -->

2
erp_web/pages/financial/giro.html
View File

@@ -14,7 +14,7 @@
<script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/financial/giro.js"></script>
<script src="/js/pages/financial/financial_base.js"></script>
</head>
<body>
<!-- 数据显示table -->

2
erp_web/pages/financial/item_in.html
View File

@@ -14,7 +14,7 @@
<script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/financial/item_in.js"></script>
<script src="/js/pages/financial/financial_base.js"></script>
</head>
<body>
<!-- 数据显示table -->

2
erp_web/pages/financial/item_out.html
View File

@@ -14,7 +14,7 @@
<script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/financial/item_out.js"></script>
<script src="/js/pages/financial/financial_base.js"></script>
</head>
<body>
<!-- 数据显示table -->

2
erp_web/pages/financial/money_in.html
View File

@@ -14,7 +14,7 @@
<script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/financial/money_in.js"></script>
<script src="/js/pages/financial/financial_base.js"></script>
</head>
<body>
<!-- 数据显示table -->

2
erp_web/pages/financial/money_out.html
View File

@@ -14,7 +14,7 @@
<script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/financial/money_out.js"></script>
<script src="/js/pages/financial/financial_base.js"></script>
</head>
<body>
<!-- 数据显示table -->

54
erp_web/pages/manage/account.html
View File

@@ -129,18 +129,12 @@
},
{title: '备注', field: 'remark', width: 100},
{
title: '操作', field: 'op', align: "center", width: 210, formatter: function (value, rec,index) {
/**
* create by: qiankunpingtai
* create time: 2019/5/5 10:30
* website：https://qiankunpingtai.cn
* description:
* 修改效率低下的js实现
*/
title: '操作', field: 'op', align: "center", width: 210, formatter: function (value, rec) {
var str = '';
str += '<img src="/js/easyui-1.3.5/themes/icons/list.png" style="cursor: pointer;" onclick="showAccountInOutList(\'' + index + '\');"/>&nbsp;<a onclick="showAccountInOutList(\'' + index + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">流水</a>&nbsp;&nbsp;';
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editAccount(\'' + index + '\');"/>&nbsp;<a onclick="editAccount(\'' + index + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteAccount(\'' + rec.id + '\');"/>&nbsp;<a onclick="deleteAccount(\'' + rec.id + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.serialno + 'AaBb' + rec.initialamount + 'AaBb' + rec.currentamount + 'AaBb' + rec.remark;
str += '<img src="/js/easyui-1.3.5/themes/icons/list.png" style="cursor: pointer;" onclick="showAccountInOutList(\'' + rowInfo + '\');"/>&nbsp;<a onclick="showAccountInOutList(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">流水</a>&nbsp;&nbsp;';
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editAccount(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editAccount(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteAccount(\'' + rowInfo + '\');"/>&nbsp;<a onclick="deleteAccount(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
return str;
}
}
@@ -221,16 +215,16 @@
}
//删除结算账户
function deleteAccount(id) {
function deleteAccount(accountInfo) {
$.messager.confirm('删除确认', '确定要删除此结算账户吗？', function (r) {
if (r) {
// var accountTotalInfo = accountInfo.split("AaBb");
var accountTotalInfo = accountInfo.split("AaBb");
$.ajax({
type: "post",
url: "/account/batchDeleteAccountByIds",
dataType: "json",
data: ({
ids: id
ids: accountTotalInfo[0]
}),
success: function (res) {
if(res && res.code == 200) {
@@ -238,7 +232,7 @@
} else {
if(res && res.code == 601){
var jsondata={};
jsondata.ids=id;
jsondata.ids=accountTotalInfo[0];
jsondata.deleteType='2';
var type='single';
batDeleteAccountForceConfirm(res,"/account/batchDeleteAccountByIds",jsondata,type);
@@ -443,22 +437,23 @@
});
//编辑结算账户
function editAccount(index) {
var rowsdata = $("#tableData").datagrid("getRows")[index];
function editAccount(accountTotalInfo) {
var accountInfo = accountTotalInfo.split("AaBb");
var row = {
name: rowsdata.name,
serialNo: rowsdata.serialNo,
initialAmount: rowsdata.initialamount,
currentAmount: rowsdata.currentamount,
remark: rowsdata.remark
name: accountInfo[1],
serialNo: accountInfo[2],
initialAmount: accountInfo[3],
currentAmount: accountInfo[4],
remark: accountInfo[5]
};
oldAccount = rowsdata.name;
oldAccount = accountInfo[1];
$('#accountDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑结算账户');
$(".window-mask").css({width: webW, height: webH});
$('#accountFM').form('load', row);
accountID = accountInfo[0];
//焦点在名称输入框==定焦在输入文字后面
$("#account").val("").focus().val(rowsdata.name);
url = '/account/update?id=' + rowsdata.id;
$("#account").val("").focus().val(accountInfo[1]);
url = '/account/update?id=' + accountInfo[0];
}
//检查结算账户 名称是否存在 ++ 重名无法提示问题需要跟进
@@ -545,11 +540,10 @@
});
}
function showAccountInOutList(index) {
//获取当前行
var rowsdata = $("#tableData").datagrid("getRows")[index];
var accountId = rowsdata.id;
var initialAmount = rowsdata.serialno;
function showAccountInOutList(accountInfo) {
var info = accountInfo.split("AaBb");
var accountId = info[0];
var initialAmount = info[3];
$('#accountDetailListDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;查看账户流水');
$(".window-mask").css({width: webW, height: webH});
initAccountDetailData(accountId);

0
erp_web/pages/manage/app.html
View File

2
erp_web/pages/manage/customer.html
View File

@@ -13,7 +13,7 @@
<script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
<script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script type="text/javascript" src="/js/common/common.js"></script>
<script src="/js/pages/manage/customer.js"></script>
<script src="/js/pages/manage/supplier.js"></script>
</head>
<body>
<!-- 数据显示table -->

29
erp_web/pages/manage/depot.html
View File

@@ -483,26 +483,25 @@
});
//编辑信息
function editDepot(index) {
// var depotInfo = depotTotalInfo.split("AaBb");
var rowsdata = $("#tableData").datagrid("getRows")[index];
function editDepot(depotTotalInfo) {
var depotInfo = depotTotalInfo.split("AaBb");
$("#name").focus().val(rowsdata.name);
$("#sort").val(rowsdata.sort);
$("#remark").val(rowsdata.remark);
$("#address").val(rowsdata.address);
$("#warehousing").val(rowsdata.warehousing);
$("#truckage").val(rowsdata.truckage);
$("#principalName").val(transferUndefined(rowsdata.principalName));
$("#principal").val(transferUndefined(rowsdata.principal));
$("#name").focus().val(depotInfo[1]);
$("#sort").val(depotInfo[2]);
$("#remark").val(depotInfo[3]);
$("#address").val(depotInfo[4]);
$("#warehousing").val(depotInfo[5].replace("undefined",""));
$("#truckage").val(depotInfo[6].replace("undefined",""));
$("#principalName").val(depotInfo[7]);
$("#principal").val(depotInfo[8]);
$("#selectType").val("principal");
oldDepot = rowsdata.name;
oldDepot = depotInfo[1];
$('#depotDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑仓库信息');
$(".window-mask").css({width: webW, height: webH});
depotID = rowsdata.id;
depotID = depotInfo[0];
//焦点在名称输入框==定焦在输入文字后面
$("#name").val("").focus().val(rowsdata.name);
url = '/depot/update?id=' + rowsdata.id;
$("#name").val("").focus().val(depotInfo[1]);
url = '/depot/update?id=' + depotInfo[0];
}
//检查名称是否存在 ++ 重名无法提示问题需要跟进

43
erp_web/pages/manage/functions.html
View File

@@ -167,11 +167,11 @@
},
{title: '类型', field: 'type', width: 50},
{
title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec,index) {
title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec) {
var str = '';
// var rowInfo = rec.id + 'AaBb' + rec.number + 'AaBb' + rec.name + 'AaBb' + rec.pnumber + 'AaBb' + rec.url
// + 'AaBb' + rec.state + 'AaBb' + rec.sort + 'AaBb' + rec.enabled + 'AaBb' + rec.type + 'AaBb' + rec.pushbtn;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editFunctions(\'' + index + '\');"/>&nbsp;<a onclick="editFunctions(\'' + index + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
var rowInfo = rec.id + 'AaBb' + rec.number + 'AaBb' + rec.name + 'AaBb' + rec.pnumber + 'AaBb' + rec.url
+ 'AaBb' + rec.state + 'AaBb' + rec.sort + 'AaBb' + rec.enabled + 'AaBb' + rec.type + 'AaBb' + rec.pushbtn;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editFunctions(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editFunctions(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteFunctions(' + rec.id + ');"/>&nbsp;<a onclick="deleteFunctions(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
return str;
}
@@ -381,20 +381,19 @@
});
//编辑信息
function editFunctions(index) {
// var functionsInfo = functionsTotalInfo.split("AaBb");
var rowsdata = $("#tableData").datagrid("getRows")[index];
$("#Number").focus().val(rowsdata.number);
$("#Name").focus().val(rowsdata.name);
$("#PNumber").focus().val(rowsdata.pnumber);
$("#URL").focus().val(rowsdata.url);
$("#State").attr("checked", rowsdata.state === true ? true : false);
$("#Sort").focus().val(rowsdata.sort);
$("#Enabled").attr("checked", rowsdata.enabled === true ? true : false);
$("#Type").focus().val(rowsdata.type);
var pushbtn=rowsdata.pushbtn;
if (pushbtn) {
var arr = pushbtn.split(",");
function editFunctions(functionsTotalInfo) {
var functionsInfo = functionsTotalInfo.split("AaBb");
$("#Number").focus().val(functionsInfo[1]);
$("#Name").focus().val(functionsInfo[2]);
$("#PNumber").focus().val(functionsInfo[3]);
$("#URL").focus().val(functionsInfo[4]);
$("#State").attr("checked", functionsInfo[5] == 'true' ? true : false);
$("#Sort").focus().val(functionsInfo[6]);
$("#Enabled").attr("checked", functionsInfo[7] == 'true' ? true : false);
$("#Type").focus().val(functionsInfo[8]);
if (functionsInfo[9] !== "undefined" && functionsInfo[9] !== "") {
var arr = functionsInfo[9].split(",");
var pushBtnArray = [];
for (var i = 0; i < arr.length; i++) {
if (arr[i]) {
@@ -409,13 +408,13 @@
$("#PushBtn").combobox('setValues', '');
}
oldFunctions = rowsdata.name;
oldFunctions = functionsInfo[2];
$('#functionsDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑功能信息');
$(".window-mask").css({width: webW, height: webH});
functionsID = rowsdata.id;
functionsID = functionsInfo[0];
//焦点在名称输入框==定焦在输入文字后面
$("#Name").val("").focus().val(rowsdata.name);
url = '/functions/update?id=' + rowsdata.id;
$("#Name").val("").focus().val(functionsInfo[2]);
url = '/functions/update?id=' + functionsInfo[0];
}
//检查名称是否存在 ++ 重名无法提示问题需要跟进

43
erp_web/pages/manage/inOutItem.html
View File

@@ -136,18 +136,11 @@
{title: '类型', field: 'type', width: 100, align: "center"},
{title: '描述', field: 'remark', width: 200},
{
title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec,index) {
/**
* create by: qiankunpingtai
* create time: 2019/5/5 10:30
* website：https://qiankunpingtai.cn
* description:
* 修改效率低下的js实现
*/
title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec) {
var str = '';
// var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.type + 'AaBb' + rec.remark;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editInOutItem(\'' + index + '\');"/>&nbsp;<a onclick="editInOutItem(\'' + index + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteInOutItem(\'' + rec.id + '\');"/>&nbsp;<a onclick="deleteInOutItem(\'' + rec.id + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.type + 'AaBb' + rec.remark;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editInOutItem(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editInOutItem(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteInOutItem(\'' + rowInfo + '\');"/>&nbsp;<a onclick="deleteInOutItem(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
return str;
}
}
@@ -221,16 +214,16 @@
}
//删除收支项目
function deleteInOutItem(id) {
function deleteInOutItem(inOutItemInfo) {
$.messager.confirm('删除确认', '确定要删除此收支项目吗？', function (r) {
if (r) {
// var inOutItemTotalInfo = inOutItemInfo.split("AaBb");
var inOutItemTotalInfo = inOutItemInfo.split("AaBb");
$.ajax({
type: "post",
url: "/inOutItem/batchDeleteInOutItemByIds",
dataType: "json",
data: ({
ids: id
ids: inOutItemTotalInfo[0]
}),
success: function (res) {
if(res && res.code == 200) {
@@ -238,7 +231,7 @@
} else {
if(res && res.code == 601){
var jsondata={};
jsondata.ids=id;
jsondata.ids=inOutItemTotalInfo[0];
jsondata.deleteType='2';
var type='single';
batDeleteInOutItemForceConfirm(res,"/inOutItem/batchDeleteInOutItemByIds",jsondata,type);
@@ -400,23 +393,21 @@
});
//编辑收支项目
function editInOutItem(index) {
// var inOutItemInfo = inOutItemTotalInfo.split("AaBb");
//获取当前行
var rowsdata = $("#tableData").datagrid("getRows")[index];
function editInOutItem(inOutItemTotalInfo) {
var inOutItemInfo = inOutItemTotalInfo.split("AaBb");
var row = {
name: rowsdata.name,
type: rowsdata.type,
remark: rowsdata.remark
name: inOutItemInfo[1],
type: inOutItemInfo[2],
remark: inOutItemInfo[3]
};
oldInOutItem = rowsdata.name;
oldInOutItem = inOutItemInfo[1];
$('#inOutItemDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑收支项目');
$(".window-mask").css({width: webW, height: webH});
$('#inOutItemFM').form('load', row);
inOutItemID = rowsdata.id;
inOutItemID = inOutItemInfo[0];
//焦点在名称输入框==定焦在输入文字后面
$("#inOutItem").val("").focus().val(rowsdata.name);
url = '/inOutItem/update?id=' + rowsdata.id;
$("#inOutItem").val("").focus().val(inOutItemInfo[1]);
url = '/inOutItem/update?id=' + inOutItemInfo[0];
}
//检查收支项目 名称是否存在 ++ 重名无法提示问题需要跟进

2
erp_web/pages/manage/member.html
View File

@@ -13,7 +13,7 @@
<script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
<script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script type="text/javascript" src="/js/common/common.js"></script>
<script src="/js/pages/manage/member.js"></script>
<script src="/js/pages/manage/supplier.js"></script>
</head>
<body>
<!-- 数据显示table -->

33
erp_web/pages/manage/role.html
View File

@@ -117,17 +117,10 @@
{field: 'id', width: 35, align: "center", checkbox: true},
{title: '角色名称', field: 'name', width: 200},
{
title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec,index) {
/**
* create by: qiankunpingtai
* create time: 2019/5/5 10:30
* website：https://qiankunpingtai.cn
* description:
* 修改效率低下的js实现
*/
title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec) {
var str = '';
// var rowInfo = rec.id + 'AaBb' + rec.name;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editRole(\'' + index + '\');"/>&nbsp;<a onclick="editRole(\'' + index + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
var rowInfo = rec.id + 'AaBb' + rec.name;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editRole(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editRole(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteRole(' + rec.id + ');"/>&nbsp;<a onclick="deleteRole(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
return str;
}
@@ -320,18 +313,18 @@
});
//编辑信息
function editRole(index) {
// var roleInfo = roleTotalInfo.split("AaBb");
var rowsdata = $("#tableData").datagrid("getRows")[index];
$("#name").focus().val(rowsdata.name);
function editRole(roleTotalInfo) {
var roleInfo = roleTotalInfo.split("AaBb");
oldName = rowsdata.name;
$("#name").focus().val(roleInfo[1]);
oldName = roleInfo[1];
$('#roleDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑角色信息');
$(".window-mask").css({width: webW, height: webH});
roleID = rowsdata.id;
roleID = roleInfo[0];
//焦点在名称输入框==定焦在输入文字后面
$("#name").val("").focus().val(rowsdata.name);
url = '/role/update?id=' + rowsdata.id;
$("#name").val("").focus().val(roleInfo[1]);
url = '/role/update?id=' + roleInfo[0];
}
//检查名称是否存在 ++ 重名无法提示问题需要跟进
@@ -393,7 +386,9 @@
url: "/role/list",
dataType: "json",
data: ({
name: searchName,
search: JSON.stringify({
name: searchName
}),
currentPage: pageNo,
pageSize: pageSize
}),

13
erp_web/pages/manage/roleFunctions.html
View File

@@ -48,17 +48,16 @@
}
}
//cnodes = cnodes.substring(0, cnodes.length - 1);
// pnodes = pnodes.substring(0, pnodes.length - 1);
pnodes = pnodes.substring(0, pnodes.length - 1);
if (ctype == 'child') {
return cnodes;
}
else if("all"){
return cnodes+pnodes;
}else{
return pnodes;
else {
return pnodes
}
}
;
};
$(function () {
@@ -85,7 +84,7 @@
info: JSON.stringify({
type: type,
keyid: url_id,
value: GetNode('all')
value: GetNode('child')
})
},
dataType: "json",

44
erp_web/pages/manage/systemConfig.html
View File

@@ -133,18 +133,12 @@
}
},
{
title: '操作', field: 'op', width: 160, formatter: function (value, rec,index) {
/**
* create by: qiankunpingtai
* create time: 2019/5/6 9:33
* website：https://qiankunpingtai.cn
* description:
* 修改效率低下的js实现
*/
title: '操作', field: 'op', width: 160, formatter: function (value, rec) {
var str = '';
// var rowInfo = rec.id + 'AaBb' + rec.companyName + 'AaBb' + rec.companyContacts + 'AaBb' + rec.companyAddress
// + 'AaBb' + rec.companyTel + 'AaBb' + rec.companyFax + 'AaBb' + rec.companyPostCode;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editSystemConfig(\'' + index + '\');"/>&nbsp;<a onclick="editSystemConfig(\'' + index + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
var rowInfo = rec.id + 'AaBb' + rec.companyName + 'AaBb' + rec.companyContacts + 'AaBb' + rec.companyAddress
+ 'AaBb' + rec.companyTel + 'AaBb' + rec.companyFax + 'AaBb' + rec.companyPostCode
+ 'AaBb' + rec.depotFlag + 'AaBb' + rec.customerFlag;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editSystemConfig(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editSystemConfig(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteSystemConfig(' + rec.id + ');"/>&nbsp;<a onclick="deleteSystemConfig(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
return str;
}
@@ -357,26 +351,26 @@
});
//编辑系统配置信息
function editSystemConfig(index) {
// var systemConfigInfo = systemConfigTotalInfo.split("AaBb");
//获取当前行
var rowsdata = $("#tableData").datagrid("getRows")[index];
function editSystemConfig(systemConfigTotalInfo) {
var systemConfigInfo = systemConfigTotalInfo.split("AaBb");
var row = {
companyName: rowsdata.companyName,
companyContacts: rowsdata.companyContacts,
companyAddress: rowsdata.companyAddress,
companyTel: rowsdata.companyTel,
companyFax: rowsdata.companyFax,
companyPostCode: rowsdata.companyPostCode
companyName: systemConfigInfo[1],
companyContacts: systemConfigInfo[2],
companyAddress: systemConfigInfo[3],
companyTel: systemConfigInfo[4],
companyFax: systemConfigInfo[5],
companyPostCode: systemConfigInfo[6]
};
oldCompanyName = rowsdata.companyName;
oldCompanyName = systemConfigInfo[1];
$('#systemConfigDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑系统配置信息');
$(".window-mask").css({width: webW, height: webH});
$('#systemConfigFM').form('load', row);
systemConfigId = rowsdata.id;
systemConfigId = systemConfigInfo[0];
//焦点在名称输入框==定焦在输入文字后面
$("#companyName").val("").focus().val(rowsdata.companyName);
url = '/systemConfig/update?id=' + rowsdata.id;
$("#companyName").val("").focus().val(systemConfigInfo[1]);
$("#depotFlag").attr("checked", systemConfigInfo[7] == '1' ? true : false);
$("#customerFlag").attr("checked", systemConfigInfo[8] == '1' ? true : false);
url = '/systemConfig/update?id=' + systemConfigInfo[0];
}
//检查系统配置 名称是否存在 ++ 重名无法提示问题需要跟进

28
erp_web/pages/manage/unit.html
View File

@@ -110,17 +110,10 @@
{field: 'id', width: 35, align: "center", checkbox: true},
{
title: '操作', field: 'op', align: "center", width: 60,
formatter: function (value, rec,index) {
/**
* create by: qiankunpingtai
* create time: 2019/5/6 9:33
* website：https://qiankunpingtai.cn
* description:
* 修改效率低下的js实现
*/
formatter: function (value, rec) {
var str = '';
// var rowInfo = rec.id + 'AaBb' + rec.uname;
str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editUnit(\'' + index + '\');"/>&nbsp;&nbsp;&nbsp;';
var rowInfo = rec.id + 'AaBb' + rec.uname;
str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editUnit(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;';
str += '<img title="删除" src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteUnit(' + rec.id + ');"/>';
return str;
}
@@ -372,16 +365,15 @@
});
//编辑信息
function editUnit(index) {
// var unitInfo = unitTotalInfo.split("AaBb");
//获取当前行
var rowsdata = $("#tableData").datagrid("getRows")[index];
oldUnit = rowsdata.uname;
function editUnit(unitTotalInfo) {
var unitInfo = unitTotalInfo.split("AaBb");
oldUnit = unitInfo[1];
$('#unitDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑计量单位');
$(".window-mask").css({width: webW, height: webH});
unitID = rowsdata.id;
unitID = unitInfo[0];
//焦点在名称输入框==定焦在输入文字后面
var name = rowsdata.uname;
var name = unitInfo[1];
var basicName = name.substring(0, name.indexOf(",")); //基础单位
$("#basicName").val(basicName);
var otherItem = name.substring(name.indexOf(",") + 1);
@@ -391,7 +383,7 @@
lastNum = lastNum.replace(")", "");
$("#otherNum").val(lastNum);
$("#unitName").text(basicName);
url = '/unit/update?id=' + rowsdata.id;
url = '/unit/update?id=' + unitInfo[0];
}
//检查名称是否存在 ++ 重名无法提示问题需要跟进

53
erp_web/pages/manage/user.html
View File

@@ -186,20 +186,13 @@
{title: '描述', field: 'description', width: 130},
{field: 'orgaId',hidden:true, width: 10},
{
title: '操作', field: 'isystem', width: 150, formatter: function (value, rec,index) {
/**
* create by: qiankunpingtai
* create time: 2019/5/6 9:33
* website：https://qiankunpingtai.cn
* description:
* 修改效率低下的js实现
*/
title: '操作', field: 'isystem', width: 150, formatter: function (value, rec) {
var str = '';
// var rowInfo = rec.id + 'AaBb' + rec.username + 'AaBb' + rec.loginame + 'AaBb' + rec.position
// + 'AaBb' + rec.orgAbr + 'AaBb' + rec.email + 'AaBb' + rec.phonenum + 'AaBb' + rec.ismanager
// + 'AaBb' + rec.isystem + 'AaBb' + rec.description+'AaBb'+rec.orgaId+'AaBb'+rec.orgaUserRelId
// +'AaBb' + rec.userBlngOrgaDsplSeq ;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editUser(\'' + index + '\');"/>&nbsp;<a onclick="editUser(\'' + index + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
var rowInfo = rec.id + 'AaBb' + rec.username + 'AaBb' + rec.loginame + 'AaBb' + rec.position
+ 'AaBb' + rec.orgAbr + 'AaBb' + rec.email + 'AaBb' + rec.phonenum + 'AaBb' + rec.ismanager
+ 'AaBb' + rec.isystem + 'AaBb' + rec.description+'AaBb'+rec.orgaId+'AaBb'+rec.orgaUserRelId
+'AaBb' + rec.userBlngOrgaDsplSeq ;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editUser(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editUser(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
if (rec.id != rec.tenantId) {
str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteUser(' + rec.id + ');"/>&nbsp;<a onclick="deleteUser(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
}
@@ -449,34 +442,32 @@
});
//编辑用户信息
function editUser(index) {
// var usernameInfo = usernameTotalInfo.split("AaBb");
//获取当前行
var rowsdata = $("#tableData").datagrid("getRows")[index];
function editUser(usernameTotalInfo) {
var usernameInfo = usernameTotalInfo.split("AaBb");
var row = {
username: rowsdata.username,
loginame: rowsdata.loginame,
position: rowsdata.position,
email: rowsdata.email,
phonenum: rowsdata.phonenum,
description: rowsdata.description,
orgAbr: rowsdata.orgAbr===undefined?'':rowsdata.orgAbr,
orgaId: rowsdata.orgaId===undefined?'':rowsdata.orgaId,
orgaUserRelId:rowsdata.orgaUserRelId===undefined?'':rowsdata.orgaUserRelId,
userBlngOrgaDsplSeq:rowsdata.userBlngOrgaDsplSeq===undefined?'':rowsdata.userBlngOrgaDsplSeq
username: usernameInfo[1],
loginame: usernameInfo[2],
position: usernameInfo[3],
email: usernameInfo[5],
phonenum: usernameInfo[6],
description: usernameInfo[9],
orgAbr: usernameInfo[4]=='undefined'?'':usernameInfo[4],
orgaId: usernameInfo[10]=='undefined'?'':usernameInfo[10],
orgaUserRelId:usernameInfo[11]=='undefined'?'':usernameInfo[11],
userBlngOrgaDsplSeq:usernameInfo[12]=='undefined'?'':usernameInfo[12]
};
oldLoginName = rowsdata.username;
oldLoginName = usernameInfo[1];
$('#userDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑用户信息');
$(".window-mask").css({width: webW, height: webH});
$('#usernameFM').form('load', row);
userID = rowsdata.id;
userID = usernameInfo[0];
//焦点在名称输入框==定焦在输入文字后面
$("#username").val("").focus().val(rowsdata.username);
$("#username").val("").focus().val(usernameInfo[1]);
$("#loginame").attr("readonly","readonly");
/**机构选择*/
$("#selectType").val("org");
url = '/user/updateUser?id=' + rowsdata.id;
url = '/user/updateUser?id=' + usernameInfo[0];
}

2
erp_web/pages/manage/vendor.html
View File

@@ -13,7 +13,7 @@
<script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
<script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script type="text/javascript" src="/js/common/common.js"></script>
<script src="/js/pages/manage/vendor.js"></script>
<script src="/js/pages/manage/supplier.js"></script>
</head>
<body>
<!-- 数据显示table -->

1
erp_web/pages/materials/allocation_out_list.html
View File

@@ -16,7 +16,6 @@
<script src="/js/handlebars.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<!--<script src="/js/pages/materials/allocation_out_list.js"></script>-->
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>

1
erp_web/pages/materials/assemble_list.html
View File

@@ -16,7 +16,6 @@
<script src="/js/handlebars.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<!--<script src="/js/pages/materials/assemble_list.js"></script>-->
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>

2
erp_web/pages/materials/bill_detail.html
View File

@@ -14,7 +14,7 @@
<script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
<script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script src="/js/common/common.js"></script>
<!--<script src="/js/pages/materials/bill_detail.js"></script>-->
<script src="/js/pages/materials/bill_detail.js"></script>
</head>
<body>

6
erp_web/pages/materials/disassemble_list.html
View File

@@ -16,12 +16,6 @@
<script src="/js/handlebars.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<!--<script src="/js/pages/materials/disassemble_list.js"></script>-->
<script>
var kid = sessionStorage.getItem("userId");
var path = "<%=path%>";
var clientIp = "<%=clientIp%>";
</script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>
</head>

234
erp_web/pages/materials/material.html
View File

@@ -79,7 +79,7 @@
<td style="height:30px;">类别</td>
<td style="padding:5px" colspan="3">
<input name="parentName" id="parentName" style="width: 180px;height: 20px" readonly="readonly"/>
<a href="javascript:void(0)" class="l-btn l-btn-plain" group="" id="lookForSelectMaterialCategory">
<a href="javascript:void(0)" class="l-btn l-btn-plain" group="" id="lookForMaterialCategory">
<span class="l-btn-left"><span class="l-btn-text icon-search l-btn-icon-left"></span></span></a>
<input name="parentid" id="parentid" type="hidden"/>
</td>
@@ -277,18 +277,14 @@
<script type="text/javascript">
var materialCategoryList = null;
var types = "";
var setCategoryId = "1";
var cid = 1;
var multiple = 0; //倍数
var mPropertyList = null; //商品属性列表
var mPropertyListShort = ""; //商品属性列表-传值
var clickType = ""; //记录从哪里点击的类别弹窗
//初始化界面
$(function () {
//初始化系统基础信息
initMProperty();
initSystemData(1);
initSelectInfo("search_first");
initSelectInfo("edit_first");
manyUnitFun();
priceKeyUp();//价格触发事件
initMPropertyShort(); //初始化商品属性
@@ -323,7 +319,7 @@
});
}
function initSystemData(parentid_search) {
function initMCData(parentid_search) {
$.ajax({
type: "get",
url: "/materialCategory/getAllList",
@@ -336,6 +332,16 @@
success: function (res) {
if(res && res.code === 200){
materialCategoryList = res.data;
if (materialCategoryList != null) {
options = "";
for (var i = 0; i < materialCategoryList.length; i++) {
var materialCategory = materialCategoryList[i];
types += materialCategory.id + ',';
}
types += parentid_search;
} else {
types = parentid_search;
}
} else {
$.messager.alert('提示', '查找系统基础信息异常,请与管理员联系！', 'error');
return;
@@ -344,26 +350,6 @@
});
}
//初始化页面选项卡
function initSelectInfo(lei) {
var options = "";
if (materialCategoryList != null) {
options = "";
for (var i = 0; i < materialCategoryList.length; i++) {
var materialCategory = materialCategoryList[i];
if (0 == i) {
mcId = materialCategory.id;
}
options += '<option value="' + materialCategory.id + '">' + materialCategory.name + '</option>';
if (lei == "search_second" || lei == "type_second" || lei == "search_three") {
types += materialCategory.id + ',';
}
}
}
}
//防止表单提交重复
function initForm() {
$('#materialFM').form({
@@ -531,21 +517,14 @@
columns: [[
{field: 'id', width: 35, align: "center", checkbox: true},
{
title: '操作', field: 'op', align: "center", width: 60, formatter: function (value, rec,index) {
/**
* create by: qiankunpingtai
* create time: 2019/5/6 9:33
* website：https://qiankunpingtai.cn
* description:
* 修改效率低下的js实现
*/
title: '操作', field: 'op', align: "center", width: 60, formatter: function (value, rec) {
var str = '';
// var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.model + 'AaBb' + rec.color + 'AaBb' + rec.unit + 'AaBb' + rec.retailprice
// + 'AaBb' + rec.lowprice + 'AaBb' + rec.presetpriceone + 'AaBb' + rec.presetpricetwo + 'AaBb' + rec.remark + 'AaBb' + rec.standard
// + 'AaBb' + rec.color + 'AaBb' + rec.packing + 'AaBb' + rec.safetystock + 'AaBb' + rec.categoryid + 'AaBb' + rec.categoryName
// + 'AaBb' + rec.unitid + 'AaBb' + rec.unitName + 'AaBb' + rec.firstoutunit + 'AaBb' + rec.firstinunit
// + 'AaBb' + rec.mfrs + 'AaBb' + rec.otherfield1 + 'AaBb' + rec.otherfield2 + 'AaBb' + rec.otherfield3+ 'AaBb' + rec.enableserialnumber;
str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editMaterial(\'' + index + '\');"/>&nbsp;&nbsp;&nbsp;';
var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.model + 'AaBb' + rec.color + 'AaBb' + rec.unit + 'AaBb' + rec.retailprice
+ 'AaBb' + rec.lowprice + 'AaBb' + rec.presetpriceone + 'AaBb' + rec.presetpricetwo + 'AaBb' + rec.remark + 'AaBb' + rec.standard
+ 'AaBb' + rec.color + 'AaBb' + rec.packing + 'AaBb' + rec.safetystock + 'AaBb' + rec.categoryid + 'AaBb' + rec.categoryName
+ 'AaBb' + rec.unitid + 'AaBb' + rec.unitName + 'AaBb' + rec.firstoutunit + 'AaBb' + rec.firstinunit
+ 'AaBb' + rec.mfrs + 'AaBb' + rec.otherfield1 + 'AaBb' + rec.otherfield2 + 'AaBb' + rec.otherfield3+ 'AaBb' + rec.enableserialnumber;
str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editMaterial(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;';
str += '<img title="删除" src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteMaterial(' + rec.id + ');"/>';
return str;
}
@@ -565,41 +544,10 @@
},
{title: '安全存量', field: 'safetystock', width: 70},
{
title: '库存', field: 'abc', width: 70, formatter: function (value, rec) {
var monthTime = getNowFormatMonth();
var mId = rec.id; //商品id
var thisStock = 0;
//查询库存
$.ajax({
type: "get",
url: '/depotItem/findStockNumByMaterialId',
data: {
materialId: mId
},
dataType: "json",
success: function (res) {
if(res && res.code === 200) {
if (res.data && res.data.page && res.data.page[0]) {
thisStock = res.data.page[0].thisSum - 0;
if (thisStock > 0) {
$("#tablePanel .class-" + rec.id).text(thisStock); //延迟加载库存数据
$("#tablePanel .class-" + rec.id).css("color", "blue").css("text-decoration", "underline").css("cursor", "pointer");
$("#tablePanel .class-" + rec.id).off("click").on("click", function () {
$('#materialDetailListDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;查看出入库明细');
$(".window-mask").css({width: webW, height: webH});
initMaterialDetailData(mId);
getMaterialInOutList(mId, 1, initPageSize);
ininMaterialDetailPager(mId);
});
}
}
}
},
error: function () {
$.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
}
});
return "<span class='class-" + rec.id + "'>" + thisStock + "</span>";
title: '库存', field: 'stock', width: 70, formatter: function (value, rec) {
var str = '';
str += '<span title="查看出入库明细" class="n-link" onclick="findStockList(' + rec.id + ');">' + rec.stock + '</span>';
return str;
}
},
{title: '零售价', field: 'retailprice', width: 60,
@@ -717,7 +665,6 @@
pageSize: initPageSize,
pageList: initPageNum,
columns: [[
{
title: '单据编号', field: 'Number', width: 150,
formatter: function (value, row) {
@@ -726,10 +673,7 @@
},
{title: '类型', field: 'Type', width: 100},
{title: '数量', field: 'BasicNumber', width: 80},
{title: '仓库', field: 'depotName', width: 180},
{title: '日期', field: 'OperTime', width: 180},
{title: '调入仓库', field: 'depotInName', width: 180}
{title: '日期', field: 'OperTime', width: 180}
]],
onLoadError: function () {
$.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');
@@ -825,6 +769,14 @@
}
}
function findStockList(mId) {
$('#materialDetailListDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;查看出入库明细');
$(".window-mask").css({width: webW, height: webH});
initMaterialDetailData(mId);
getMaterialInOutList(mId, 1, initPageSize);
ininMaterialDetailPager(mId);
}
//删除商品信息
function deleteMaterial(materialID) {
$.messager.confirm('删除确认', '确定要删除此商品信息吗？', function (r) {
@@ -1061,13 +1013,8 @@
function setOutputFun() {
var name = $.trim($("#searchName").val());
var model = $.trim($("#searchModel").val());
if (setCategoryId != "1") {
cid = 2;
} else {
cid = 1;
}
window.location.href = "/material/exportExcel?browserType=" + getOs()
+ "&name=" + name + "&model=" + model + "&categoryId=" + cid + "&categoryIds=" + setCategoryId;
+ "&name=" + name + "&model=" + model + "&categoryIds=" + types;
}
//增加
var url;
@@ -1341,37 +1288,35 @@
}
//编辑信息
function editMaterial(index) {
// var materialInfo = materialTotalInfo.split("AaBb");
//获取当前行
var rowsdata = $("#tableData").datagrid("getRows")[index];
function editMaterial(materialTotalInfo) {
var materialInfo = materialTotalInfo.split("AaBb");
bindMProperty(); //根据商品属性绑定
$("#Name").focus().val(rowsdata.name);
$("#Color").focus().val(rowsdata.color);
$("#EnableSerialNumber").val(rowsdata.enableserialnumber=='1'?'1':'0');
$("#Name").focus().val(materialInfo[1]);
$("#Color").focus().val(materialInfo[11]);
$("#EnableSerialNumber").val(materialInfo[24]=='1'?'1':'0');
//商品类别id
$("#parentid").val(rowsdata.categoryid == undefined ? "" : rowsdata.categoryid );
$("#parentid").val(materialInfo[14] == "undefined" ? "" : materialInfo[14]);
//商品类别名称
$("#parentName").val(rowsdata.categoryName == undefined ? "" : rowsdata.categoryName );
mId = rowsdata.categoryid;
mName =rowsdata.categoryName;
$("#Packing").focus().val(rowsdata.packing);
$("#SafetyStock").focus().val(rowsdata.safetystock==undefined ? "" : rowsdata.safetystock);
$("#Model").val(rowsdata.model);
$("#Standard").val(rowsdata.standard == "undefined" ? "" : rowsdata.standard );
$("#Color").val(rowsdata.color == "undefined" ? "" : rowsdata.color );
$("#Mfrs").val(rowsdata.mfrs == "undefined" ? "" : rowsdata.mfrs );
$("#OtherField1").val(rowsdata.otherfield1 == "undefined" ? "" : rowsdata.otherfield1);
$("#OtherField2").val(rowsdata.otherfield2 == "undefined" ? "" : rowsdata.otherfield2 );
$("#OtherField3").val(rowsdata.otherfield3 == "undefined" ? "" : rowsdata.otherfield3);
$("#Unit").val(rowsdata.unit == "undefined" ? "" : rowsdata.unit);
$("#RetailPrice").val(rowsdata.retailprice == "undefined" ? "" : rowsdata.retailprice);
$("#LowPrice").val(rowsdata.lowprice == "undefined" ? "" : rowsdata.lowprice);
$("#PresetPriceOne").val(rowsdata.presetpriceone == "undefined" ? "" : rowsdata.presetpriceone);
$("#PresetPriceTwo").val(rowsdata.presetpricetwo == "undefined" ? "" :rowsdata.presetpricetwo);
$("#Remark").val(rowsdata.remark);
$("#manyUnit").val(rowsdata.unitid);
if (rowsdata.unitid != "undefined") {
$("#parentName").val(materialInfo[15] == "undefined" ? "" : materialInfo[15]);
mId = materialInfo[14];
mName = materialInfo[15];
$("#Packing").focus().val(materialInfo[12]);
$("#SafetyStock").focus().val(materialInfo[13]=="undefined" ? "" : materialInfo[13]);
$("#Model").val(materialInfo[2]);
$("#Standard").val(materialInfo[10] == "undefined" ? "" : materialInfo[10]);
$("#Color").val(materialInfo[3] == "undefined" ? "" : materialInfo[3]);
$("#Mfrs").val(materialInfo[20] == "undefined" ? "" : materialInfo[20]);
$("#OtherField1").val(materialInfo[21] == "undefined" ? "" : materialInfo[21]);
$("#OtherField2").val(materialInfo[22] == "undefined" ? "" : materialInfo[22]);
$("#OtherField3").val(materialInfo[23] == "undefined" ? "" : materialInfo[23]);
$("#Unit").val(materialInfo[4] == "undefined" ? "" : materialInfo[4]);
$("#RetailPrice").val(materialInfo[5] == "undefined" ? "" : materialInfo[5]);
$("#LowPrice").val(materialInfo[6] == "undefined" ? "" : materialInfo[6]);
$("#PresetPriceOne").val(materialInfo[7] == "undefined" ? "" : materialInfo[7]);
$("#PresetPriceTwo").val(materialInfo[8] == "undefined" ? "" : materialInfo[8]);
$("#Remark").val(materialInfo[9]);
$("#manyUnit").val(materialInfo[16]);
if (materialInfo[16] != "undefined") {
$("#manyUnitCheck").prop("checked", true);
//当前为选中状态
$("#Unit").hide();
@@ -1390,8 +1335,8 @@
firstOptions = firstOptions + basic + other;
$("#FirstOutUnit").empty().append('<option value="">(空)</option>').append(firstOptions); //首选出库单位
$("#FirstInUnit").empty().append('<option value="">(空)</option>').append(firstOptions); //首选入库单位
$("#FirstOutUnit").val(rowsdata.firstoutunit);//首选出库单位
$("#FirstInUnit").val(rowsdata.firstinunit);//首选入库单位
$("#FirstOutUnit").val(materialInfo[18]);//首选出库单位
$("#FirstInUnit").val(materialInfo[19]);//首选入库单位
}
}
else {
@@ -1408,7 +1353,7 @@
$.ajax({
url: '/material/findById',
data: {
id: rowsdata.id
id: materialInfo[0]
},
type: "get",
dataType: "json",
@@ -1437,24 +1382,24 @@
}
});
oldName = rowsdata.name;
oldModel = rowsdata.model;
oldColor = rowsdata.color;
oldStandard = rowsdata.standard;
oldMfrs = rowsdata.mfrs;
oldOtherField1 = rowsdata.otherfield1;
oldOtherField2 = rowsdata.otherfield2;
oldOtherField3 = rowsdata.otherfield3;
oldUnit = rowsdata.unit;
oldManyUnit = rowsdata.unitid;
oldName = materialInfo[1];
oldModel = materialInfo[2];
oldColor = materialInfo[11];
oldStandard = materialInfo[10];
oldMfrs = materialInfo[20];
oldOtherField1 = materialInfo[21];
oldOtherField2 = materialInfo[22];
oldOtherField3 = materialInfo[23];
oldUnit = materialInfo[4];
oldManyUnit = materialInfo[16];
$('#materialDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑商品信息');
$(".window-mask").css({width: webW, height: webH});
materialID = rowsdata.id;
materialID = materialInfo[0];
//焦点在名称输入框==定焦在输入文字后面
$("#Name").val("").focus().val(rowsdata.name);
$("#Name").val("").focus().val(materialInfo[1]);
//选中基本资料tab
$("#materialFM #tt .tabs li").first().click();
url = '/material/update?id=' + rowsdata.id;
url = '/material/update?id=' + materialInfo[0];
}
@@ -1477,12 +1422,6 @@
function showMaterialDetails(pageNo, pageSize) {
var name = $.trim($("#searchName").val());
var model = $.trim($("#searchModel").val());
if (setCategoryId != "1") {
cid = 2;
}
else {
cid = 1;
}
$.ajax({
type: "get",
url: "/material/list",
@@ -1491,8 +1430,7 @@
search: JSON.stringify({
name: name,
model: model,
categoryId: cid,
categoryIds: setCategoryId,
categoryIds: types,
mpList: mPropertyListShort
}),
currentPage: pageNo,
@@ -1516,8 +1454,9 @@
//重置按钮
$("#searchResetBtn").unbind().bind({
click: function () {
$("#searchParentName").val("");
$("#searchParentId").val("");
$("#searchName").val("");
setCategoryId = "1";
$("#searchModel").val("");
types = ""; //清空类别
//加载完以后重新初始化
@@ -1595,8 +1534,9 @@
}, 3300);
});
}
//查询父级商品类别
$("#lookForSelectMaterialCategory").on("click", function () {
//商品类别选择
function materialCategoryDlgFun() {
$('#forSelectMaterialCategoryDlg').dialog({
title: '商品类别选择',
width: webW/2,
@@ -1607,6 +1547,16 @@
modal: true,
resizable:true
});
}
//查询父级商品类别
$("#lookForSelectMaterialCategory").on("click", function () {
clickType = "selectBtn";
materialCategoryDlgFun();
});
$("#lookForMaterialCategory").on("click", function () {
clickType = "editBtn";
materialCategoryDlgFun();
});
</script>

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

@@ -124,17 +124,10 @@
{title: '排序', field: 'sort', width: 100},
{title: '别名', field: 'anothername', width: 100},
{
title: '操作', field: 'op', align: "center", width: 80, formatter: function (value, rec,index) {
/**
* create by: qiankunpingtai
* create time: 2019/5/6 9:33
* website：https://qiankunpingtai.cn
* description:
* 修改效率低下的js实现
*/
title: '操作', field: 'op', align: "center", width: 80, formatter: function (value, rec) {
var str = '';
// var rowInfo = rec.id + 'AaBb' + rec.nativename + 'AaBb' + rec.enabled + 'AaBb' + rec.sort + 'AaBb' + rec.anothername;
str += '<img src="/js/easyui-1.3.5/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;';
var rowInfo = rec.id + 'AaBb' + rec.nativename + 'AaBb' + rec.enabled + 'AaBb' + rec.sort + 'AaBb' + rec.anothername;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editMaterialProperty(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editMaterialProperty(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
return str;
}
}
@@ -218,20 +211,19 @@
});
//编辑信息
function editMaterialProperty(index) {
// var materialPropertyInfo = totalInfo.split("AaBb");
//获取当前行
var rowsdata = $("#tableData").datagrid("getRows")[index];
$("#nativeName").text(rowsdata.nativename);
$("#enabled").attr("checked", rowsdata.enabled == true ? true : false);
$("#sort").val(rowsdata.sort);
$("#anotherName").val(rowsdata.anothername);
function editMaterialProperty(totalInfo) {
var materialPropertyInfo = totalInfo.split("AaBb");
$("#nativeName").text(materialPropertyInfo[1]);
$("#enabled").attr("checked", materialPropertyInfo[2] == 'true' ? true : false);
$("#sort").val(materialPropertyInfo[3]);
$("#anotherName").val(materialPropertyInfo[4]);
$('#materialPropertyDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑商品属性');
$(".window-mask").css({width: webW, height: webH});
//焦点在名称输入框==定焦在输入文字后面
$("#nativeName").val("").focus().val(rowsdata.nativename);
url = '/materialProperty/update?id=' + rowsdata.id;
$("#nativeName").val("").focus().val(materialPropertyInfo[1]);
url = '/materialProperty/update?id=' + materialPropertyInfo[0];
}
//搜索处理

328
erp_web/pages/materials/material_forselect.html
View File

@@ -40,188 +40,186 @@
</table>
<table id="tableForSelectData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="materialDetailListDlg" class="easyui-dialog" style="width:900px;height:500px;padding:10px 20px" closed="true"
modal="true" collapsible="false" closable="true">
<table id="materialTableData" style="top:50px;border-bottom-color:#FFFFFF"></table>
</div>
<script type="text/javascript">
var setCategoryId = "1";
var cid = 1;
//初始化界面
$(function () {
//初始化系统基础信息
initTableData();
ininPager();
});
//初始化表格数据
function initTableData() {
//改变宽度和高度
$("#searchForSelectPanel").panel({width: webW/2-70});
$("#tableForSelectPanel").panel({width: webW/2-70});
$('#tableForSelectData').datagrid({
//title:'商品列表',
//iconCls:'icon-save',
//width:700,
height: heightInfo,
nowrap: false,
rownumbers: false,
//动画效果
animate: false,
//选中单行
singleSelect: true,
collapsible: false,
selectOnCheck: false,
//fitColumns:true,
//单击行是否选中
//checkOnSelect : false,
pagination: true,
//交替出现背景
striped: true,
//loadFilter: pagerFilter,
pageSize: initPageSize,
pageList: initPageNum,
columns: [[
{field: 'id', width: 35, align: "center", hidden: true},
{title: '品名', field: 'name', width: 150},
{title: '型号', field: 'model', width: 100},
{title: '类别', field: 'categoryName', width: 130},
{title: '单位', field: 'unit', width: 60}
]],
toolbar: [
],
onLoadError: function () {
$.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');
return;
},
onDblClickRow : function(rowIndex, rowData){
var selectType=$("#selectType").val();
console.log(rowData);
if(selectType=="lookForSelectMaterial"){
//单个添加序列号时选择
$("#materialId").val(rowData.id);
$("#materialName").val(rowData.name);
}else if(selectType=="batLookForSelectMaterial"){
//批量添加序列号时选择
$("#batAddMaterialName").val(rowData.name);
}
//关闭掉dialog
$("#forSelectMaterialDlg").dialog('close');
}
<script type="text/javascript">
var setCategoryId = "1";
var cid = 1;
//初始化界面
$(function () {
//初始化系统基础信息
initTableData();
ininPager();
});
dgResize();
showMaterialDetails(1, initPageSize);
}
//初始化表格数据
function initTableData() {
//改变宽度和高度
$("#searchForSelectPanel").panel({width: webW/2-70});
$("#tableForSelectPanel").panel({width: webW/2-70});
$('#tableForSelectData').datagrid({
//title:'商品列表',
//iconCls:'icon-save',
//width:700,
height: heightInfo,
nowrap: false,
rownumbers: false,
//动画效果
animate: false,
//选中单行
singleSelect: true,
collapsible: false,
selectOnCheck: false,
//fitColumns:true,
//单击行是否选中
//checkOnSelect : false,
pagination: true,
//交替出现背景
striped: true,
//loadFilter: pagerFilter,
pageSize: initPageSize,
pageList: initPageNum,
columns: [[
{field: 'id', width: 35, align: "center", hidden: true},
{title: '品名', field: 'name', width: 150},
{title: '型号', field: 'model', width: 100},
{title: '类别', field: 'categoryName', width: 130},
{title: '单位', field: 'unit', width: 60}
]],
toolbar: [
],
onLoadError: function () {
$.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');
return;
},
onDblClickRow : function(rowIndex, rowData){
var selectType=$("#selectType").val();
console.log(rowData);
if(selectType=="lookForSelectMaterial"){
//单个添加序列号时选择
$("#materialId").val(rowData.id);
$("#materialName").val(rowData.name);
}else if(selectType=="batLookForSelectMaterial"){
//批量添加序列号时选择
$("#batAddMaterialName").val(rowData.name);
//初始化键盘enter事件
$(document).keydown(function (event) {
//兼容 IE和firefox 事件
var e = window.event || event;
var k = e.keyCode || e.which || e.charCode;
//兼容 IE,firefox 兼容
var obj = e.srcElement ? e.srcElement : e.target;
//绑定键盘事件为 id是指定的输入框才可以触发键盘事件 13键盘事件 ---遗留问题 enter键效验 对话框会关闭问题
if (k == "13" && (obj.id == "CategoryLevel" || obj.id == "Name")) {
$("#saveMaterial").click();
}
//搜索按钮添加快捷键
if (k == "13" && (obj.id == "searchCategoryId" || (obj.id == "searchName"))) {
$("#searchForSelectBtn").click();
}
});
//分页信息处理
function ininPager() {
try {
var opts = $("#tableForSelectData").datagrid('options');
var pager = $("#tableForSelectData").datagrid('getPager');
pager.pagination({
onSelectPage: function (pageNum, pageSize) {
opts.pageNumber = pageNum;
opts.pageSize = pageSize;
pager.pagination('refresh',
{
pageNumber: pageNum,
pageSize: pageSize
});
showMaterialDetails(pageNum, pageSize);
}
});
}
catch (e) {
$.messager.alert('异常处理提示', "分页信息异常 : " + e.name + ": " + e.message, 'error');
}
}
//搜索处理
$("#searchForSelectBtn").unbind().bind({
click: function () {
showMaterialDetails(1, initPageSize);
var opts = $("#tableForSelectData").datagrid('options');
var pager = $("#tableForSelectData").datagrid('getPager');
opts.pageNumber = 1;
opts.pageSize = initPageSize;
pager.pagination('refresh', {
pageNumber: 1,
pageSize: initPageSize
});
}
});
function showMaterialDetails(pageNo, pageSize) {
var name = $.trim($("#searchForSelectName").val());
var model = $.trim($("#searchForSelectModel").val());
if (setCategoryId != "1") {
cid = 2;
}
else {
cid = 1;
}
$.ajax({
type: "get",
url: "/material/getMaterialEnableSerialNumberList",
dataType: "json",
data: ({
search: JSON.stringify({
name: name,
model: model
}),
currentPage: pageNo,
pageSize: pageSize
}),
success: function (res) {
if(res && res.code === 200){
if(res.data && res.data.page) {
$("#tableForSelectData").datagrid('loadData', res.data.page);
}
//关闭掉dialog
$("#forSelectMaterialDlg").dialog('close');
}
},
//此处添加错误处理
error: function () {
$.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
return;
});
dgResize();
showMaterialDetails(1, initPageSize);
}
//初始化键盘enter事件
$(document).keydown(function (event) {
//兼容 IE和firefox 事件
var e = window.event || event;
var k = e.keyCode || e.which || e.charCode;
//兼容 IE,firefox 兼容
var obj = e.srcElement ? e.srcElement : e.target;
//绑定键盘事件为 id是指定的输入框才可以触发键盘事件 13键盘事件 ---遗留问题 enter键效验 对话框会关闭问题
if (k == "13" && (obj.id == "CategoryLevel" || obj.id == "Name")) {
$("#saveMaterial").click();
}
//搜索按钮添加快捷键
if (k == "13" && (obj.id == "searchCategoryId" || (obj.id == "searchName"))) {
$("#searchForSelectBtn").click();
}
});
}
//重置按钮
$("#searchForSelectResetBtn").unbind().bind({
click: function () {
$("#searchForSelectName").val("");
setCategoryId = "1";
//加载完以后重新初始化
$("#searchForSelectBtn").click();
//分页信息处理
function ininPager() {
try {
var opts = $("#tableForSelectData").datagrid('options');
var pager = $("#tableForSelectData").datagrid('getPager');
pager.pagination({
onSelectPage: function (pageNum, pageSize) {
opts.pageNumber = pageNum;
opts.pageSize = pageSize;
pager.pagination('refresh',
{
pageNumber: pageNum,
pageSize: pageSize
});
showMaterialDetails(pageNum, pageSize);
}
});
}
catch (e) {
$.messager.alert('异常处理提示', "分页信息异常 : " + e.name + ": " + e.message, 'error');
}
}
});
//搜索处理
$("#searchForSelectBtn").unbind().bind({
click: function () {
showMaterialDetails(1, initPageSize);
var opts = $("#tableForSelectData").datagrid('options');
var pager = $("#tableForSelectData").datagrid('getPager');
opts.pageNumber = 1;
opts.pageSize = initPageSize;
pager.pagination('refresh', {
pageNumber: 1,
pageSize: initPageSize
});
}
});
function showMaterialDetails(pageNo, pageSize) {
var name = $.trim($("#searchForSelectName").val());
var model = $.trim($("#searchForSelectModel").val());
if (setCategoryId != "1") {
cid = 2;
}
else {
cid = 1;
}
$.ajax({
type: "get",
url: "/material/getMaterialEnableSerialNumberList",
dataType: "json",
data: ({
search: JSON.stringify({
name: name,
model: model
}),
currentPage: pageNo,
pageSize: pageSize
}),
success: function (res) {
if(res && res.code === 200){
if(res.data && res.data.page) {
$("#tableForSelectData").datagrid('loadData', res.data.page);
}
}
},
//此处添加错误处理
error: function () {
$.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
return;
}
});
}
//重置按钮
$("#searchForSelectResetBtn").unbind().bind({
click: function () {
$("#searchForSelectName").val("");
setCategoryId = "1";
//加载完以后重新初始化
$("#searchForSelectBtn").click();
}
});
</script>
</script>
</body>
</html>

17
erp_web/pages/materials/materialcategory_forselect.html
View File

@@ -46,8 +46,21 @@
function forSelectMaterialCategory(node) {
console.log(node);
$("#parentName").val(node.text);
$("#parentid").val(node.id);
if(clickType) {
if(clickType == "selectBtn") {
$("#searchParentName").val(node.text);
$("#searchParentId").val(node.id);
types = "";
initMCData(node.id);
} else if(clickType == "editBtn") {
$("#parentName").val(node.text);
$("#parentid").val(node.id);
}
}
else {
$("#parentName").val(node.text);
$("#parentid").val(node.id);
}
$('#forSelectMaterialCategoryDlg').dialog('close');
}
});

1
erp_web/pages/materials/other_in_list.html
View File

@@ -16,7 +16,6 @@
<script src="/js/handlebars.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<!--<script src="/js/pages/materials/other_in_list.js"></script>-->
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>

1
erp_web/pages/materials/other_out_list.html
View File

@@ -16,7 +16,6 @@
<script src="/js/handlebars.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<!--<script src="/js/pages/materials/other_out_list.js"></script>-->
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>

30
erp_web/pages/materials/person.html
View File

@@ -121,17 +121,10 @@
{title: '姓名', field: 'name', width: 180},
{title: '类型', field: 'type', width: 180},
{
title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec,index) {
/**
* create by: qiankunpingtai
* create time: 2019/5/6 9:33
* website：https://qiankunpingtai.cn
* description:
* 修改效率低下的js实现
*/
title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec) {
var str = '';
// var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.type;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editPerson(\'' + index + '\');"/>&nbsp;<a onclick="editPerson(\'' + index + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.type;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editPerson(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editPerson(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deletePerson(' + rec.id + ');"/>&nbsp;<a onclick="deletePerson(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
return str;
}
@@ -377,20 +370,19 @@
});
//编辑信息
function editPerson(index) {
// var personInfo = personTotalInfo.split("AaBb");
//获取当前行
var rowsdata = $("#tableData").datagrid("getRows")[index];
$("#Name").val(rowsdata.name);
$("#Type").val(rowsdata.type);
function editPerson(personTotalInfo) {
var personInfo = personTotalInfo.split("AaBb");
$("#Name").val(personInfo[1]);
$("#Type").val(personInfo[2]);
//oldPerson = personInfo[1];
$('#personDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑经手人信息');
$(".window-mask").css({width: webW, height: webH});
personID = rowsdata.id;
personID = personInfo[0];
//焦点在名称输入框==定焦在输入文字后面
$("#Name").val("").focus().val(rowsdata.name);
url = '/person/update?id=' + rowsdata.id;
$("#Name").val("").focus().val(personInfo[1]);
url = '/person/update?id=' + personInfo[0];
}
//搜索处理

1
erp_web/pages/materials/purchase_back_list.html
View File

@@ -16,7 +16,6 @@
<script src="/js/handlebars.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<!--<script src="/js/pages/materials/purchase_back_list.js"></script>-->
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>

1
erp_web/pages/materials/purchase_in_list.html
View File

@@ -16,7 +16,6 @@
<script src="/js/handlebars.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<!--<script src="/js/pages/materials/purchase_in_list.js"></script>-->
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>

1
erp_web/pages/materials/purchase_orders_list.html
View File

@@ -16,7 +16,6 @@
<script src="/js/handlebars.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<!--<script src="/js/pages/materials/purchase_orders_list.js"></script>-->
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>

1
erp_web/pages/materials/retail_back_list.html
View File

@@ -16,7 +16,6 @@
<script src="/js/handlebars.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<!--<script src="/js/pages/materials/retail_back_list.js"></script>-->
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>

1
erp_web/pages/materials/retail_out_list.html
View File

@@ -16,7 +16,6 @@
<script src="/js/handlebars.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<!--<script src="/js/pages/materials/retail_out_list.js"></script>-->
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>

1
erp_web/pages/materials/sale_back_list.html
View File

@@ -16,7 +16,6 @@
<script src="/js/handlebars.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<!--<script src="/js/pages/materials/sale_back_list.js"></script>-->
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>

1
erp_web/pages/materials/sale_orders_list.html
View File

@@ -16,7 +16,6 @@
<script src="/js/handlebars.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<!--<script src="/js/pages/materials/sale_orders_list.js"></script>-->
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>

1
erp_web/pages/materials/sale_out_list.html
View File

@@ -16,7 +16,6 @@
<script src="/js/handlebars.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<!--<script src="/js/pages/materials/sale_out_list.js"></script>-->
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>

23
erp_web/pages/reports/account_report.html
View File

@@ -93,17 +93,10 @@
{title: '本月发生额', field: 'thismonthamount', width: 100, align: "center"},
{title: '当前余额', field: 'currentamount', width: 100, align: "center"},
{
title: '操作', field: 'op', width: 100, align: "center", formatter: function (value, rec,index) {
/**
* create by: qiankunpingtai
* create time: 2019/5/6 9:33
* website：https://qiankunpingtai.cn
* description:
* 修改效率低下的js实现
*/
title: '操作', field: 'op', width: 100, align: "center", formatter: function (value, rec) {
var str = '';
// var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.serialno + 'AaBb' + rec.initialamount + 'AaBb' + rec.currentamount;
str += '<img src="/js/easyui-1.3.5/themes/icons/list.png" style="cursor: pointer;" onclick="showAccountInOutList(\'' + index + '\');"/>&nbsp;<a onclick="showAccountInOutList(\'' + index + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">流水</a>&nbsp;&nbsp;';
var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.serialno + 'AaBb' + rec.initialamount + 'AaBb' + rec.currentamount;
str += '<img src="/js/easyui-1.3.5/themes/icons/list.png" style="cursor: pointer;" onclick="showAccountInOutList(\'' + rowInfo + '\');"/>&nbsp;<a onclick="showAccountInOutList(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">流水</a>&nbsp;&nbsp;';
return str;
}
}
@@ -207,12 +200,10 @@
});
}
function showAccountInOutList(index) {
// var info = accountInfo.split("AaBb");
//获取当前行
var rowsdata = $("#tableData").datagrid("getRows")[index];
var accountId = rowsdata.id;
var initialAmount = rowsdata.initialamount;
function showAccountInOutList(accountInfo) {
var info = accountInfo.split("AaBb");
var accountId = info[0];
var initialAmount = info[3];
$('#accountDetailListDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;查看账户流水');
$(".window-mask").css({width: webW, height: webH});
initAccountDetailData(accountId);