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

从源更新

Browse Source
This commit is contained in:
caijulong
2019-11-01 15:55:03 +08:00
parent 07d4055bb6 e143114260
commit ce51fec3d9
486 changed files with 133424 additions and 9281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,11 +14,11 @@
<script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script type="text/javascript" src="/js/common/outlook_in.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>名&nbsp;&nbsp;&nbsp;&nbsp;称：</td>
@@ -46,11 +46,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>
<div id="accountDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
@@ -181,6 +176,7 @@
return;
}
});
dgResize();
showAccountDetails(1, initPageSize);
}
@@ -584,8 +580,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},

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

@@ -1,539 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title>应用管理</title>
<meta charset="utf-8">
<!-- 指定以IE8的方式来渲染 -->
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
<link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
<link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
<link type="text/css" rel="stylesheet" href="/css/common.css"/>
<link href="/js/fileUploadQT/css/iconfont.css" rel="stylesheet" type="text/css"/>
<link href="/js/fileUploadQT/css/fileUpload.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
<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 src="/js/fileUploadQT/js/fileUpload.js"></script>
<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 id="searchTable">
<tr>
<td>名称：</td>
<td>
<input type="text" name="searchName" id="searchName" style="width:100px;"/>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>种类：</td>
<td>
<input type="text" name="searchType" id="searchType" style="width:100px;"/>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>
</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>
<div id="appDlg" class="easyui-dialog" style="width:600px;padding:10px 20px;top:20px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
<form id="appFM" method="post" enctype="multipart/form-data">
<table>
<tr>
<td style="width: 50px;height: 20px">代号</td>
<td style="padding:1px"><input name="Number" id="Number" class="easyui-textbox" style="width: 150px;height: 20px"/></td>
<td style="width: 50px;height: 20px">名称</td>
<td style="padding:1px"><input name="Name" id="Name" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 150px;height: 20px"/></td>
<td style="width: 50px;height: 20px">拉伸</td>
<td style="padding:1px"><input name="ReSize" id="ReSize" type="checkbox" style="width: 50px;height: 20px"/></td>
</tr>
<tr>
<td>类型</td>
<td style="padding:1px"><input name="Type" id="Type" class="easyui-textbox" style="width: 150px;height: 20px"/></td>
<td>链接</td>
<td style="padding:1px"><input name="URL" id="URL" class="easyui-textbox" style="width: 150px;height: 20px"/></td>
<td>最大化</td>
<td style="padding:1px"><input name="OpenMax" id="OpenMax" type="checkbox" style="width: 50px;height: 20px"/></td>
</tr>
<tr>
<td>宽度</td>
<td style="padding:1px"><input name="Width" id="Width" class="easyui-textbox" style="width: 150px;height: 20px"/></td>
<td>高度</td>
<td style="padding:1px"><input name="Height" id="Height" class="easyui-textbox" style="width: 150px;height: 20px"/></td>
<td>Flash</td>
<td style="padding:1px"><input name="Flash" id="Flash" type="checkbox" style="width: 50px;height: 20px"/></td>
</tr>
<tr>
<td>排序号</td>
<td style="padding:1px"><input name="Sort" id="Sort" class="easyui-textbox" style="width: 150px;height: 20px"/></td>
<td>种类</td>
<td style="padding:1px"><input name="ZL" id="ZL" class="easyui-textbox" style="width: 150px;height: 20px"/></td>
<td>启用</td>
<td style="padding:1px"><input name="Enabled" id="Enabled" type="checkbox" style="width: 50px;height: 20px"/></td>
</tr>
<tr>
<td>备注</td>
<td style="padding:1px" colspan="5"><input name="Remark" id="Remark" class="easyui-textbox" style="width: 480px;height: 20px"/></td>
</tr>
<tr>
<td>图标</td>
<td style="padding:1px" colspan="5">
<div id="Icon" class="fileUploadContent"></div>
</td>
</tr>
</table>
</form>
</div>
<div id="dlg-buttons">
<a href="javascript:void(0)" id="saveApp" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelApp" class="easyui-linkbutton" iconCls="icon-cancel"
onclick="javascript:$('#appDlg').dialog('close')">取消</a>
</div>
<script type="text/javascript">
//初始化界面
$(function () {
initTableData();
ininPager();
initForm();
});
//防止表单提交重复
function initForm() {
$('#appFM').form({
onSubmit: function () {
return false;
}
});
}
//初始化表格数据
function initTableData() {
$('#tableData').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", checkbox: true},
{title: '代号', field: 'number', width: 50},
{title: '应用名称', field: 'name', width: 100},
{title: '类型', field: 'type', width: 50},
{
title: '图标', field: 'icon', width: 100, formatter: function (value, row) {
if (value != null) {
return "<img alt='图标' style='width:32px;height:32px;' src=\"../../upload/images/deskIcon/" + value + "\" />";
}
}
},
{title: '链接', field: 'url', width: 100},
{title: '宽度', field: 'width', width: 50},
{title: '高度', field: 'height', width: 50},
{
title: '拉伸', field: 'resize', width: 50, formatter: function (value) {
return value ? "开" : "关";
}
},
{
title: '最大化', field: 'openmax', width: 50, formatter: function (value) {
return value ? "开" : "关";
}
},
{
title: 'Flash', field: 'flash', width: 50, formatter: function (value) {
return value ? "开" : "关";
}
},
{title: '种类', field: 'zl', width: 50},
{title: '排序号', field: 'sort', width: 50},
{title: '备注', field: 'remark', width: 50},
{
title: '启用', field: 'enabled', width: 50, formatter: function (value) {
return value ? "开" : "关";
}
},
{
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实现
*/
var str = '';
// var rowInfo = rec.id + 'AaBb' + rec.number + 'AaBb' + rec.name + 'AaBb' + rec.type + 'AaBb' + rec.icon
// + 'AaBb' + rec.url + 'AaBb' + rec.width + 'AaBb' + rec.height + 'AaBb' + rec.resize + 'AaBb' + rec.openmax
// + 'AaBb' + rec.flash + 'AaBb' + rec.zl + 'AaBb' + rec.sort + 'AaBb' + rec.remark + 'AaBb' + rec.enabled;
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editApp(\'' + index + '\');"/>&nbsp;<a onclick="editApp(\'' + 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="deleteApp(' + rec.id + ');"/>&nbsp;<a onclick="deleteApp(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
return str;
}
}
]],
toolbar: [
{
id: 'addApp',
text: '增加',
iconCls: 'icon-add',
handler: function () {
addApp();
}
},
{
id: 'deleteApp',
text: '删除',
iconCls: 'icon-remove',
handler: function () {
batDeleteApp();
}
}
],
onLoadError: function () {
$.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');
return;
}
});
showAppDetails(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 == "Number" || obj.id == "Name" || obj.id == "Type" || obj.id == "Icon" || obj.id == "URL"
|| obj.id == "Width" || obj.id == "Height" || obj.id == "ZL" || obj.id == "Sort" || obj.id == "Remark")) {
$("#saveApp").click();
}
//搜索按钮添加快捷键
if (k == "13" && (obj.id == "searchName" || obj.id == "searchType")) {
$("#searchBtn").click();
}
});
//分页信息处理
function ininPager() {
try {
var opts = $("#tableData").datagrid('options');
var pager = $("#tableData").datagrid('getPager');
pager.pagination({
onSelectPage: function (pageNum, pageSize) {
opts.pageNumber = pageNum;
opts.pageSize = pageSize;
pager.pagination('refresh', {
pageNumber: pageNum,
pageSize: pageSize
});
showAppDetails(pageNum, pageSize);
}
});
}
catch (e) {
$.messager.alert('异常处理提示', "分页信息异常 : " + e.name + ": " + e.message, 'error');
}
}
//删除应用信息
function deleteApp(appID) {
$.messager.confirm('删除确认', '确定要删除此应用信息吗？', function (r) {
if (r) {
$.ajax({
type: "post",
url: "/app/batchDeleteAppByIds",
dataType: "json",
data: ({
ids: appID
}),
success: function (res) {
if(res && res.code == 200) {
$("#searchBtn").click();
} else {
$.messager.alert('删除提示', '删除应用信息失败，请稍后再试！', 'error');
}
},
//此处添加错误处理
error: function () {
$.messager.alert('删除提示', '删除应用信息异常，请稍后再试！', 'error');
return;
}
});
}
});
}
//批量删除
function batDeleteApp() {
var row = $('#tableData').datagrid('getChecked');
if (row.length == 0) {
$.messager.alert('删除提示', '没有记录被选中！', 'info');
return;
}
if (row.length > 0) {
$.messager.confirm('删除确认', '确定要删除选中的' + row.length + '条应用信息吗？', function (r) {
if (r) {
var ids = "";
for (var i = 0; i < row.length; i++) {
if (i == row.length - 1) {
ids += row[i].id;
break;
}
ids += row[i].id + ",";
}
$.ajax({
type: "post",
url: "/app/batchDeleteAppByIds",
dataType: "json",
async: false,
data: ({
ids: ids
}),
success: function (res) {
if(res && res.code === 200) {
$("#searchBtn").click();
$(":checkbox").attr("checked", false);
} else {
$.messager.alert('删除提示', '删除应用信息失败，请稍后再试！', 'error');
}
},
//此处添加错误处理
error: function () {
$.messager.alert('删除提示', '删除应用信息异常，请稍后再试！', 'error');
return;
}
});
}
});
}
}
//增加
var url;
var appID = 0;
//保存编辑前的名称
var orgApp = "";
function addApp() {
$('#appFM').form('clear');
$('#appDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加应用信息');
$(".window-mask").css({width: webW, height: webH});
$("#name").val("").focus();
orgApp = "";
appID = 0;
url = '/app/add';
$("#Icon").empty();//清除上传控件数据
$(".fileUploadContent").initUpload({
"uploadUrl": "/app/uploadImg",//上传文件信息地址
"progressUrl": "#",//获取进度信息地址，可选，注意需要返回的data格式如下（{bytesRead: 102516060, contentLength: 102516060, items: 1, percent: 100, startTime: 1489223136317, useTime: 2767}）
//"showSummerProgress":false,//总进度条，默认限制
//"size":350,//文件大小限制，单位kb,默认不限制
"maxFileNumber": 1,//文件个数限制，为整数
//"filelSavePath":"",//文件上传地址，后台设置的根目录
//"beforeUpload":beforeUploadFun,//在上传前执行的函数
//"onUpload":onUploadFun, //在上传后执行的函数
autoCommit: true, //文件是否自动上传
"fileType": ['png', 'jpg']//文件类型限制，默认不限制，注意写的是文件后缀
});
}
//保存信息
$("#saveApp").off("click").on("click", function () {
if (checkAppName()) {
return;
}
var infoObj = $("#appFM").serializeObject();
if($("#Icon .fileItem .fileName").length){
infoObj.Icon = $.trim($("#Icon .fileItem .fileName").text());
}
infoObj.ReSize = $("#ReSize").is(':checked');
infoObj.OpenMax = $("#OpenMax").is(':checked');
infoObj.Flash = $("#Flash").is(':checked');
infoObj.Enabled = $("#Enabled").is(':checked');
$.ajax({
url: url,
type: "post",
dataType: "json",
data: ({
info: JSON.stringify(infoObj)
}),
success: function(res) {
if(res && res.code === 200) {
$('#appDlg').dialog('close');
//加载完以后重新初始化
var opts = $("#tableData").datagrid('options');
showAppDetails(opts.pageNumber, opts.pageSize);
} else {
$.messager.alert('提示', '保存应用信息异常，请稍后再试！', 'error');
return;
}
},
//此处添加错误处理
error: function () {
$.messager.alert('提示', '保存应用信息异常，请稍后再试！', 'error');
return;
}
});
});
//编辑信息
function editApp(index) {
//获取当前行
var rowsdata = $("#tableData").datagrid("getRows")[index];
// var appInfo = appTotalInfo.split("AaBb");
$("#Number").focus().val(rowsdata.number);
$("#Name").val(rowsdata.name);
$("#Type").val(rowsdata.type);
//$("#Icon").val(appInfo[4]);
$("#URL").val(rowsdata.url);
$("#Width").val(rowsdata.width);
$("#Height").val(rowsdata.height);
$("#ReSize").attr("checked", rowsdata.resize === true ? true : false);
$("#OpenMax").attr("checked", rowsdata.openmax === true ? true : false);
$("#Flash").attr("checked", rowsdata.flash === true ? true : false);
$("#ZL").val(rowsdata.zl);
$("#Sort").val(rowsdata.sort);
$("#Remark").val(rowsdata.remark);
$("#Enabled").attr("checked", rowsdata.enabled === true ? true : false);
orgApp = rowsdata.name;
$('#appDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑应用信息');
$(".window-mask").css({width: webW, height: webH});
appID = rowsdata.id;
//焦点在名称输入框==定焦在输入文字后面
$("#name").val("").focus().val(rowsdata.name);
url = '/app/update?id=' + rowsdata.id;
}
//检查名称是否存在 ++ 重名无法提示问题需要跟进
function checkAppName() {
var name = $.trim($("#Name").val());
//表示是否存在 true == 存在 false = 不存在
var flag = false;
//开始ajax名称检验，不能重名
if (name.length > 0 && (orgApp.length == 0 || name != orgApp)) {
$.ajax({
type: "get",
url: "/app/checkIsNameExist",
dataType: "json",
async: false,
data: ({
id: appID,
name: name
}),
success: function (res) {
if(res && res.code === 200) {
if(res.data && res.data.status) {
flag = res.data.status;
if (flag) {
$.messager.alert('提示', '应用名称已经存在', 'info');
return;
}
}
}
},
//此处添加错误处理
error: function () {
$.messager.alert('提示', '检查应用名称是否存在异常，请稍后再试！', 'error');
return;
}
});
}
return flag;
}
//搜索处理
$("#searchBtn").unbind().bind({
click: function () {
showAppDetails(1, initPageSize);
var opts = $("#tableData").datagrid('options');
var pager = $("#tableData").datagrid('getPager');
opts.pageNumber = 1;
opts.pageSize = initPageSize;
pager.pagination('refresh', {
pageNumber: 1,
pageSize: initPageSize
});
}
});
function showAppDetails(pageNo, pageSize) {
var searchName = $.trim($("#searchName").val());
var searchType = $.trim($("#searchType").val());
$.ajax({
type: "get",
url: "/app/list",
dataType: "json",
data: ({
search: JSON.stringify({
name: searchName,
type: searchType
}),
currentPage: pageNo,
pageSize: pageSize
}),
success: function (res) {
if(res && res.code === 200){
if(res.data && res.data.page) {
$("#tableData").datagrid('loadData', res.data.page);
}
}
},
//此处添加错误处理
error: function () {
$.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
return;
}
});
}
//重置按钮
$("#searchResetBtn").unbind().bind({
click: function () {
$("#searchName").val("");
$("#searchType").val("");
//加载完以后重新初始化
$("#searchBtn").click();
}
});
</script>
</body>
</html>

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

@@ -16,9 +16,8 @@
<script src="/js/pages/manage/customer.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>名&nbsp;&nbsp;&nbsp;&nbsp;称：</td>
@@ -47,11 +46,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>
<div id="supplierDlg" class="easyui-dialog" style="width:580px;padding:10px 20px"

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

@@ -15,9 +15,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>
@@ -167,11 +161,11 @@
{field: 'id', width: 35, align: "center", checkbox: true},
{
title: '操作', field: 'op', align: "center", width: 60,
formatter: function (value, rec,index) {
formatter: function (value, rec) {
var str = '';
// var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.sort + 'AaBb' + rec.remark + 'AaBb'
// + rec.address + 'AaBb' + rec.warehousing + 'AaBb' + rec.truckage+'AaBb'+ transferUndefined(rec.principalName)+'AaBb'+transferUndefined(rec.principal);
str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepot(\'' + index + '\');"/>&nbsp;&nbsp;&nbsp;';
var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.sort + 'AaBb' + rec.remark + 'AaBb'
+ rec.address + 'AaBb' + rec.warehousing + 'AaBb' + rec.truckage+'AaBb'+ transferUndefined(rec.principalName)+'AaBb'+transferUndefined(rec.principal);
str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepot(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;';
str += '<img title="删除" src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteDepot(' + rec.id + ');"/>';
return str;
}
@@ -227,6 +221,7 @@
return;
}
});
dgResize();
showDepotDetails(1, initPageSize);
}
@@ -477,7 +472,6 @@
//加载完以后重新初始化
var opts = $("#tableData").datagrid('options');
showDepotDetails(opts.pageNumber, opts.pageSize);
$.messager.alert('提示', '保存成功，请给用户分配该仓库才能使用！', 'info');
}
},
//此处添加错误处理

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

@@ -15,9 +15,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>
@@ -206,6 +200,7 @@
return;
}
});
dgResize();
showFunctionsDetails(1, initPageSize);
}

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

@@ -16,9 +16,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>名&nbsp;&nbsp;&nbsp;&nbsp;称：</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>
<div id="inOutItemDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
@@ -181,6 +175,7 @@
return;
}
});
dgResize();
showInOutItemDetails(1, initPageSize);
}

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

@@ -15,9 +15,8 @@
<script type="text/javascript" src="/js/common/common.js"></script>
</head>
<body>
<!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:10px;position: center;" 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>
@@ -25,13 +24,17 @@
<input type="text" name="searchOperation" id="searchOperation" style="width:90px;"/>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>操作人员：</td>
<td>
<select name="searchUsernameID" id="searchUsernameID" style="width:90px;"/>
</td>
<td>&nbsp;</td>
<td>开始时间：</td>
<td>
<input type="text" name="searchBeginTime" id="searchBeginTime" class="easyui-datetimebox"
style="width:135px;"/>
</td>
<td>&nbsp;</td>
<td>操作IP：</td>
<td>
@@ -39,6 +42,14 @@
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr>
<td>操作详情：</td>
<td>
<input type="text" name="searchDesc" id="searchDesc" style="width:90px;"/>
</td>
<td>&nbsp;</td>
<td>操作状态：</td>
<td>
<select name="searchStatus" id="searchStatus" style="width:90px;">
@@ -47,37 +58,21 @@
<option value="1">失败</option>
</select>
</td>
</tr>
<tr>
<td>开始时间：</td>
<td>
<input type="text" name="searchBeginTime" id="searchBeginTime" class="easyui-datebox"
style="width:90px;"/>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>结束时间：</td>
<td>
<input type="text" name="searchEndTime" id="searchEndTime" class="easyui-datebox" style="width:90px;"/>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>操作详情：</td>
<td>
<input type="text" name="searchDesc" id="searchDesc" style="width:90px;"/>
<input type="text" name="searchEndTime" id="searchEndTime" class="easyui-datetimebox"
style="width:135px;"/>
</td>
<td>&nbsp;</td>
<td colspan="3">
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>
</td>
<td>&nbsp;</td>
<td>&nbsp;</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="height:340px;top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<script type="text/javascript">
@@ -118,20 +113,20 @@
pageList: initPageNum,
columns: [[
{title: '操作模块', field: 'operation', width: 120},
{title: '操作人员', field: 'username', width: 80, align: "center"},
{title: '操作IP', field: 'clientip', width: 90, align: "center"},
{title: '操作时间', field: 'createtime', width: 130, align: "center"},
{title: '操作详情', field: 'remark', width: 260},
{title: '操作状态',field: 'status',width:70,align:"center",formatter:function(value){
{title: '操作详情', field: 'contentdetails', width: 350},
{title: '操作人员', field: 'username', width: 100, align: "center"},
{title: '操作状态',field: 'status',width:80,align:"center",formatter:function(value){
return value? "失败":"成功";
}},
{title: '备注', field: 'remark', width: 150}
{title: '操作IP', field: 'clientip', width: 100, align: "center"},
{title: '操作时间', field: 'createTimeStr', width: 150, align: "center"}
]],
onLoadError: function () {
$.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');
return;
}
});
dgResize();
showLogDetails(1, initPageSize);
}

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

@@ -16,9 +16,8 @@
<script src="/js/pages/manage/member.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>名&nbsp;&nbsp;&nbsp;&nbsp;称：</td>
@@ -47,11 +46,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>
<div id="supplierDlg" class="easyui-dialog" style="width:600px;padding:10px 20px"

3
erp_web/pages/manage/organization.html
View File

@@ -20,8 +20,7 @@
</head>
<body>
<!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="机构列表" iconCls="icon-list"
collapsible="true" closable="false">
<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="机构列表" iconCls="icon-list">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF">
</table>
</div>

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

@@ -18,9 +18,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>
@@ -39,11 +38,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>
@@ -162,6 +156,7 @@
return;
}
});
dgResize();
showRoleDetails(1, initPageSize);
}

30
erp_web/pages/manage/serialNumber.html
View File

@@ -15,11 +15,11 @@
<script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script type="text/javascript" src="/js/common/outlook_in.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>
@@ -38,11 +38,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>
<input id="selectType" hidden="hidden" />
</div>
@@ -121,7 +116,7 @@
<td style="width:80px;">序列号数量</td>
<td style="padding:5px;width:180px;">
<input name="batAddTotal" id="batAddTotal" class="easyui-numberbox"
data-options="min:0,max:10000"
data-options="min:0,max:500"
style="width: 180px;height: 20px"/>
</td>
<td></td>
@@ -220,21 +215,16 @@
{title: '单据编号', align: "center", field: 'depotHeadNumber', width: 140,
formatter: function (value, row) {
if(row.depotHeadNumber){
return "<a class='n-link' onclick=\"newTab('" + row.depotHeadNumber + "','../materials/bill_detail.html?n=" + row.depotHeadNumber + "&type=" + row.depotHeadType + "','')\">"
+ row.depotHeadNumber + "</a>";
return '<a class="n-link" onclick="turnBillDetailPage(\'' + row.depotHeadNumber + '\''+',\'' + row.depotHeadType + '\');">' + row.depotHeadNumber + '</a>';
} else {
return '';
}
return '';
}
},
{title: '已卖出', align: "center", field: 'isSell', width: 60 , formatter: function (value) {
return value=='1' ? "是" : "否";
}
},
{title: '已删除', align: "center", field: 'deleteFlag', width: 60, formatter: function (value) {
return value=='1' ? "是" : "否";
}
},
{title: '创建时间',align: "center", field: 'createTime', width: 140,formatter: formatDatebox},
{title: '更新时间', align: "center", field: 'updateTime', width: 140,formatter: formatDatebox},
{title: '备注',align: "center", field: 'remark',width: 200}
@@ -272,6 +262,7 @@
return;
}
});
dgResize();
showSerialNumberDetails(1, initPageSize);
}
//分页信息处理
@@ -514,9 +505,6 @@
success: function (res) {
if(res && res.code === 200){
if(res.data && res.data.page) {
if(res.data.page.total==0){
$.messager.alert('查询提示', '没有对应数据！', 'warning');
}
$("#tableData").datagrid('loadData', res.data.page);
}
}
@@ -578,7 +566,7 @@
$(".window-mask").css({width: webW, height: webH});
$('#batAddMaterialName').val('');
$('#batAddSerialNumberInput').val('');
$('#batAddTotal').val('100');
$('#batAddTotal').val('10');
$('#batAddremark').val('');
url = '/serialNumber/batAddSerialNumber';
}

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

@@ -18,9 +18,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>
@@ -31,14 +30,9 @@
<td>&nbsp;</td>
<td>
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;&nbsp;
</td>
</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>
@@ -70,6 +64,14 @@
<label id="companyPostCodeLabel">公司邮编&nbsp;&nbsp;</label>
<input name="companyPostCode" id="companyPostCode" style="width: 220px;height: 20px"/>
</div>
<div class="fitem" style="padding:5px">
<label id="depotFlagLabel">仓库开关&nbsp;&nbsp;</label>
<input name="depotFlag" id="depotFlag" type="checkbox" style="width: 220px;height: 20px" title="勾选后需要到用户列表配置权限"/>
</div>
<div class="fitem" style="padding:5px">
<label id="customerFlagLabel">客户开关&nbsp;&nbsp;</label>
<input name="customerFlag" id="customerFlag" type="checkbox" style="width: 220px;height: 20px" title="勾选后需要到用户列表配置权限"/>
</div>
</form>
</div>
<div id="dlg-buttons">
@@ -86,6 +88,16 @@
//初始化表格数据
function initTableData() {
function parseFlag(value) {
var flagName = "";
if (value =="1") {
flagName = "<span style='color:green'>启用</span>";
}
else {
flagName = "<span style='color:red'>关闭</span>";
}
return flagName;
}
$('#tableData').datagrid({
height: heightInfo,
nowrap: false,
@@ -108,6 +120,18 @@
{title: '公司电话', field: 'companyTel', width: 120, align: "center"},
{title: '公司传真', field: 'companyFax', width: 120, align: "center"},
{title: '公司邮编', field: 'companyPostCode', width: 80, align: "center"},
{
title: '仓库开关', field: 'depotFlag', width: 80, align: "center",
formatter: function (value) {
return parseFlag(value);
}
},
{
title: '客户开关', field: 'customerFlag', width: 80, align: "center",
formatter: function (value) {
return parseFlag(value);
}
},
{
title: '操作', field: 'op', width: 160, formatter: function (value, rec,index) {
/**
@@ -149,6 +173,7 @@
return;
}
});
dgResize();
showSystemConfigDetails(1, initPageSize);
}
@@ -305,12 +330,15 @@
$("#companyName").val("").focus();
return;
}
var infoObj = $("#systemConfigFM").serializeObject();
infoObj.depotFlag = $("#depotFlag").is(':checked')?"1":"0";
infoObj.customerFlag = $("#customerFlag").is(':checked')?"1":"0";
$.ajax({
url: url,
type: "post",
dataType: "json",
data: {
info: JSON.stringify($("#systemConfigFM").serializeObject())
info: JSON.stringify(infoObj)
},
success: function(res) {
if(res && res.code === 200) {
@@ -365,7 +393,7 @@
async: false,
data: ({
id: systemConfigId,
companyName: companyName
name: companyName
}),
success: function (res) {
if(res && res.code === 200) {

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

@@ -15,9 +15,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>
@@ -31,11 +30,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>
@@ -156,6 +150,7 @@
return;
}
});
dgResize();
showUnitDetails(1, initPageSize);
}

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

@@ -18,9 +18,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>
@@ -45,11 +44,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>
@@ -113,11 +107,27 @@
<script type="text/javascript">
//初始化界面
$(function () {
initConfig();
initTableData();
ininPager();
browserFit();
});
//初始化配置
function initConfig() {
$("#btnSetDepart").hide();
$("#btnSetCustomer").hide();
var config = getSystemConfig();
if(config) {
if(config.depotFlag == "1") {
$("#btnSetDepart").show();
}
if(config.customerFlag == "1") {
$("#btnSetCustomer").show();
}
}
}
//浏览器适配
function browserFit() {
if (getOs() == 'MSIE') {
@@ -172,8 +182,8 @@
{title: '部门', field: 'orgAbr', width: 115, align: "center"},
{title: '电子邮箱', field: 'email', width: 150, align: "center"},
{title: '电话号码', field: 'phonenum', width: 150, align: "center"},
{title: '用户排序', field: 'userBlngOrgaDsplSeq', width: 50, align: "center"},
{title: '描述', field: 'description', width: 150},
{title: '用户排序', field: 'userBlngOrgaDsplSeq', width: 60, align: "center"},
{title: '描述', field: 'description', width: 130},
{field: 'orgaId',hidden:true, width: 10},
{
title: '操作', field: 'isystem', width: 150, formatter: function (value, rec,index) {
@@ -223,6 +233,7 @@
return;
}
});
dgResize();
showUserDetails(1, initPageSize);
}

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

@@ -16,9 +16,8 @@
<script src="/js/pages/manage/vendor.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>名&nbsp;&nbsp;&nbsp;&nbsp;称：</td>
@@ -47,11 +46,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>
<div id="supplierDlg" class="easyui-dialog" style="width:580px;padding:10px 20px"