From 13c790147a5b15291026a2e2047a27f60d5e08b6 Mon Sep 17 00:00:00 2001 From: AlanGao Date: Sat, 7 Apr 2018 14:02:24 +0800 Subject: [PATCH] format jsp --- src/main/webapp/login.jsp | 374 +- src/main/webapp/logout.jsp | 36 +- src/main/webapp/pages/asset/asset.jsp | 3005 ++++++++-------- src/main/webapp/pages/asset/home.jsp | 153 +- src/main/webapp/pages/asset/report.jsp | 1937 +++++----- src/main/webapp/pages/common/admin.jsp | 38 +- src/main/webapp/pages/common/foot.jsp | 28 +- src/main/webapp/pages/common/head.jsp | 318 +- src/main/webapp/pages/common/home.jsp | 1442 ++++---- src/main/webapp/pages/common/main.jsp | 205 +- src/main/webapp/pages/common/menu.jsp | 431 ++- .../webapp/pages/common/templateforjsp.jsp | 56 +- .../webapp/pages/financial/advance_in.jsp | 304 +- src/main/webapp/pages/financial/giro.jsp | 314 +- src/main/webapp/pages/financial/item_in.jsp | 320 +- src/main/webapp/pages/financial/item_out.jsp | 314 +- src/main/webapp/pages/financial/money_in.jsp | 304 +- src/main/webapp/pages/financial/money_out.jsp | 303 +- src/main/webapp/pages/manage/account.jsp | 1195 +++--- src/main/webapp/pages/manage/app.jsp | 1145 +++--- src/main/webapp/pages/manage/assetname.jsp | 1409 ++++---- src/main/webapp/pages/manage/category.jsp | 951 +++-- src/main/webapp/pages/manage/customer.jsp | 371 +- src/main/webapp/pages/manage/depot.jsp | 989 +++-- src/main/webapp/pages/manage/depotGift.jsp | 998 +++-- src/main/webapp/pages/manage/functions.jsp | 1108 +++--- src/main/webapp/pages/manage/home.jsp | 153 +- src/main/webapp/pages/manage/inOutItem.jsp | 916 +++-- src/main/webapp/pages/manage/log.jsp | 569 ++- src/main/webapp/pages/manage/member.jsp | 371 +- src/main/webapp/pages/manage/role.jsp | 992 +++-- src/main/webapp/pages/manage/roleApp.jsp | 263 +- .../webapp/pages/manage/roleFunctions.jsp | 259 +- src/main/webapp/pages/manage/rolePushBtn.jsp | 503 +-- src/main/webapp/pages/manage/systemConfig.jsp | 269 +- src/main/webapp/pages/manage/unit.jsp | 907 +++-- src/main/webapp/pages/manage/user.jsp | 1178 +++--- src/main/webapp/pages/manage/vendor.jsp | 371 +- .../pages/materials/allocation_out_list.jsp | 273 +- .../webapp/pages/materials/assemble_list.jsp | 273 +- .../webapp/pages/materials/bill_detail.jsp | 49 +- .../pages/materials/disassemble_list.jsp | 273 +- .../webapp/pages/materials/gift_out_list.jsp | 273 +- .../pages/materials/gift_recharge_list.jsp | 273 +- src/main/webapp/pages/materials/material.jsp | 3200 ++++++++--------- .../pages/materials/materialProperty.jsp | 531 +-- .../pages/materials/materialcategory.jsp | 1143 +++--- .../webapp/pages/materials/other_in_list.jsp | 294 +- .../webapp/pages/materials/other_out_list.jsp | 283 +- src/main/webapp/pages/materials/person.jsp | 963 +++-- .../pages/materials/purchase_back_list.jsp | 750 ++-- .../pages/materials/purchase_in_list.jsp | 755 ++-- .../pages/materials/retail_back_list.jsp | 408 ++- .../pages/materials/retail_out_list.jsp | 482 +-- .../webapp/pages/materials/sale_back_list.jsp | 550 +-- .../webapp/pages/materials/sale_out_list.jsp | 555 +-- src/main/webapp/pages/other/clock.jsp | 265 +- src/main/webapp/pages/other/preview.jsp | 49 +- .../webapp/pages/reports/account_report.jsp | 608 ++-- .../webapp/pages/reports/buy_in_report.jsp | 508 ++- .../webapp/pages/reports/customer_account.jsp | 714 ++-- .../pages/reports/gift_manage_report.jsp | 506 +-- src/main/webapp/pages/reports/in_detail.jsp | 650 ++-- .../pages/reports/in_material_count.jsp | 629 ++-- .../pages/reports/in_out_stock_report.jsp | 838 +++-- src/main/webapp/pages/reports/out_detail.jsp | 638 ++-- .../pages/reports/out_material_count.jsp | 629 ++-- .../webapp/pages/reports/sale_out_report.jsp | 516 ++- .../webapp/pages/reports/vendor_account.jsp | 714 ++-- src/main/webapp/pages/user/password.jsp | 263 +- src/main/webapp/pages/user/userCustomer.jsp | 259 +- src/main/webapp/pages/user/userDepot.jsp | 261 +- src/main/webapp/pages/user/userRole.jsp | 261 +- src/main/webapp/pages/user/userinfo.jsp | 376 +- 74 files changed, 22152 insertions(+), 22659 deletions(-) diff --git a/src/main/webapp/login.jsp b/src/main/webapp/login.jsp index ae683370..2ba2e716 100644 --- a/src/main/webapp/login.jsp +++ b/src/main/webapp/login.jsp @@ -1,200 +1,184 @@ -<%@page import="com.jsh.util.Tools"%> -<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> +<%@page import="com.jsh.util.Tools" %> +<%@ page language="java" pageEncoding="utf-8" %> <% - String path = request.getContextPath(); - String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getLocalIp(request); + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + path + "/"; + String clientIp = Tools.getLocalIp(request); %> - - ERP系统 - - - - - - - - - -
-
-
-

login

-

- -

-

- -

- - - - - -
- -
-
- - + + ERP系统 + + + + + + + + + +
+
+
+

login

+

+ +

+

+ +

+ + + + + +
+ +
+
+ + \ No newline at end of file diff --git a/src/main/webapp/logout.jsp b/src/main/webapp/logout.jsp index b2a734e7..1497cb1d 100644 --- a/src/main/webapp/logout.jsp +++ b/src/main/webapp/logout.jsp @@ -1,26 +1,26 @@ -<%@ page language="java" pageEncoding="utf-8"%> +<%@ page language="java" pageEncoding="utf-8" %> <% -String path = request.getContextPath(); -String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + path + "/"; %> - + + - - - - - - - - - -
+ + + + + + + + + +
diff --git a/src/main/webapp/pages/asset/asset.jsp b/src/main/webapp/pages/asset/asset.jsp index 21ff00cc..2560b9a0 100644 --- a/src/main/webapp/pages/asset/asset.jsp +++ b/src/main/webapp/pages/asset/asset.jsp @@ -1,1556 +1,1463 @@ -<%@page import="com.jsh.util.Tools"%> -<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> +<%@page import="com.jsh.util.Tools" %> +<%@ page language="java" pageEncoding="utf-8" %> <% - String path = request.getContextPath(); - String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getLocalIp(request); + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + path + "/"; + String clientIp = Tools.getLocalIp(request); %> - - 资产管理 - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - -
资产名称： - -   资产类型： - -   用户姓名： - -
状        态： - -   供  应  商： - -     - 查询   - 重置 -
-
- - -
-
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
资产名称： - -   增加资产 -   状        态： - -
 
位        置： - -   用        户： - -    -
 
订购单价： -   元 -   购买日期： - -
 
有效日期： - -   保修日期： - -
 
资产编号： - -   序   列   号： - -
 
资产标签： - -   供   应   商： - -   增加供应商 -
 
描        述： - -
- -
-
- - -
-
-
- - -
-
- - -
-
- - -
-
- - -
- -
-
-
- 保存 - 取消 -
- - -
-
- -
- - -
-
- - -
-
- - -
-
- - -
-
- - -
- -
-
-
- 保存 - 取消 -
- -
-
-
- - -
- -
- - -
-
- - -
-
- - -
-
- - -
-
- - -
- -
-
- 保存 - 取消 -
-
- - -
-
- - -
- -
- - -
- -
- 保存 - 取消 -
-
- - -
-
-
- - -
- - -
- 导入 - 取消 -
-
-
- -
-
编辑
-
删除
-
-
取消
-
- + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
资产名称： + +   资产类型： + +   用户姓名： + +
状        态： + +   供  应  商： + +     + 查询   + 重置 +
+
+ + +
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
资产名称： + +   增加资产 +   状        态： + +
 
位        置： + +   用        户： + +    +
 
订购单价： +   元 +   购买日期： + +
 
有效日期： + +   保修日期： + +
 
资产编号： + +   序   列   号： + +
 
资产标签： + +   供   应   商： + +   增加供应商 +
 
描        述： + +
+ +
+
+ + +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+
+
+ 保存 + 取消 +
+ + +
+
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+
+
+ 保存 + 取消 +
+ +
+
+
+ + +
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+
+ 保存 + 取消 +
+
+ + +
+
+ + +
+ +
+ + +
+ +
+ 保存 + 取消 +
+
+ + +
+
+
+ + +
+ + +
+ 导入 + 取消 +
+
+
+ +
+
编辑
+
删除
+
+
取消
+
+ - + } + } + }); + + //检查名称是否存在 ++ 重名无法提示问题需要跟进 + function checkAssetName() { + var assetName = $.trim($("#assetName").val()); + //表示是否存在 true == 存在 false = 不存在 + var flag = false; + //开始ajax名称检验，不能重名 + if (assetName.length > 0) { + $.ajax({ + type: "post", + url: "<%=path %>/assetname/checkIsNameExist.action", + dataType: "json", + async: false, + data: ({ + assetNameID: 0, + assetName: assetName + }), + success: function (tipInfo) { + flag = tipInfo; + if (tipInfo) { + $.messager.alert('提示', '资产名称已经存在', 'info'); + return; + } + }, + //此处添加错误处理 + error: function () { + $.messager.alert('提示', '检查资产名称是否存在异常，请稍后再试！', 'error'); + return; + } + }); + } + return flag; + } + + //增加用户名称 + $("#addUserName").unbind().bind({ + click: function () { + $('#userDlg').dialog('open').dialog('setTitle', ' 增加用户'); + $('#usernameFM').form('clear'); + var row = { + clientIp: '<%=clientIp %>' + }; + $('#usernameFM').form('load', row); + $("#username").focus(); + } + }); + + //保存用户信息 + $("#saveusername").unbind().bind({ + click: function () { + if (checkusernameName()) + return; + + var reg = /^([0-9])+$/; + var phonenum = $.trim($("#phonenum0").val()); + if (phonenum.length > 0 && !reg.test(phonenum)) { + $.messager.alert('提示', '电话号码只能是数字', 'info'); + $("#phonenum").val("").focus(); + return; + } + + $('#usernameFM').form('submit', { + url: '<%=path %>/user/create.action', + onSubmit: function () { + return $(this).form('validate'); + }, + success: function (result) { + var result = eval('(' + result + ')'); + if (!result) { + $.messager.show({ + title: '错误提示', + msg: '保存用户信息失败，请稍后重试!' + }); + } + else { + $('#userDlg').dialog('close'); + //初始化系统基础信息 + initSystemData(); + //初始化页面系统基础信息选项卡 + initSelectInfo(); + } + } + }); + } + }); + + //检查用户 名称是否存在 ++ 重名无法提示问题需要跟进 + function checkusernameName() { + var usernameName = $.trim($("#username").val()); + //表示是否存在 true == 存在 false = 不存在 + var flag = false; + //开始ajax名称检验，不能重名 + if (usernameName.length > 0) { + $.ajax({ + type: "post", + url: "<%=path %>/user/checkIsNameExist.action", + dataType: "json", + async: false, + data: ({ + userID: 0, + username: usernameName + }), + success: function (tipInfo) { + flag = tipInfo; + if (tipInfo) { + $.messager.alert('提示', '用户名称已经存在', 'info'); + return; + } + }, + //此处添加错误处理 + error: function () { + $.messager.alert('提示', '检查用户名称是否存在异常，请稍后再试！', 'error'); + return; + } + }); + } + return flag; + } + + //增加供应商名称 + $("#addSupplerName").unbind().bind({ + click: function () { + $('#supplierDlg').dialog('open').dialog('setTitle', ' 增加供应商'); + $('#supplierFM').form('clear'); + + var row = { + clientIp: '<%=clientIp %>' + }; + $('#supplierFM').form('load', row); + + $("#supplier").focus(); + } + }); + + //保存供应商信息 + $("#saveSupplier").unbind().bind({ + click: function () { + if (checkSupplierName()) + return; + + var reg = /^([0-9])+$/; + var phonenum = $.trim($("#phonenum").val()); + if (phonenum.length > 0 && !reg.test(phonenum)) { + $.messager.alert('提示', '电话号码只能是数字', 'info'); + $("#phonenum").val("").focus(); + return; + } + + $('#supplierFM').form('submit', { + url: '<%=path %>/supplier/create.action', + onSubmit: function () { + return $(this).form('validate'); + }, + success: function (result) { + var result = eval('(' + result + ')'); + if (!result) { + $.messager.show({ + title: '错误提示', + msg: '保存供应商信息失败，请稍后重试!' + }); + } + else { + $('#supplierDlg').dialog('close'); + //初始化系统基础信息 + initSystemData(); + //初始化页面系统基础信息选项卡 + initSelectInfo(); + } + } + }); + } + }); + + //检查供应商 名称是否存在 ++ 重名无法提示问题需要跟进 + function checkSupplierName() { + var supplierName = $.trim($("#supplier").val()); + //表示是否存在 true == 存在 false = 不存在 + var flag = false; + //开始ajax名称检验，不能重名 + if (supplierName.length > 0) { + $.ajax({ + type: "post", + url: "<%=path %>/supplier/checkIsNameExist.action", + dataType: "json", + async: false, + data: ({ + supplierID: 0, + supplier: supplierName + }), + success: function (tipInfo) { + flag = tipInfo; + if (tipInfo) { + $.messager.alert('提示', '供应商名称已经存在', 'info'); + //alert("供应商名称已经存在"); + //$("#supplier").val(""); + return; + } + }, + //此处添加错误处理 + error: function () { + $.messager.alert('提示', '检查供应商名称是否存在异常，请稍后再试！', 'error'); + return; + } + }); + } + return flag; + } + + //分页信息处理 + 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 + }); + showAssetDetails(pageNum, pageSize); + } + }); + } + catch (e) { + $.messager.alert('异常处理提示', "分页信息异常 : " + e.name + ": " + e.message, 'error'); + } + } + + //初始化系统基础信息 + function initSystemData() { + $.ajax({ + type: "post", + url: "<%=path%>/asset/getBasicData.action", + //设置为同步 + async: false, + dataType: "json", + success: function (systemInfo) { + //成功关闭loading + userList = systemInfo.showModel.map.userList; + categoryList = systemInfo.showModel.map.categoryList; + supplierList = systemInfo.showModel.map.supplierList; + nameList = systemInfo.showModel.map.assetnameList; + var msgTip = systemInfo.showModel.msgTip; + if (msgTip == "exceptoin") { + $.messager.alert('提示', '查找系统基础信息异常,请与管理员联系！', 'error'); + return; + } + } + }); + } + + //初始化页面选项卡 + function initSelectInfo() { + var options = ""; + if (nameList != null) { + for (var i = 0; i < nameList.length; i++) { + var nameInfo = nameList[i]; + if (0 == i) { + nameID = nameInfo.id; + } + options += ''; + } + $("#assetNameID").empty().append(options); + $("#searchAssetNameID").empty().append('').append(options); + } + + if (userList != null) { + options = ""; + for (var i = 0; i < userList.length; i++) { + var user = userList[i]; + if (0 == i) { + userID = user.id + } + options += ''; + } + $("#userID").empty().append(options); + $("#searchuserID").empty().append('').append(options); + + } + + if (categoryList != null) { + options = ""; + for (var i = 0; i < categoryList.length; i++) { + var category = categoryList[i]; + if (0 == i) { + categoryID = category.id; + } + options += ''; + } + $("#searchCategoryID").empty().append('').append(options); + $("#category").empty().append(options); + } + + if (supplierList != null) { + options = ""; + for (var i = 0; i < supplierList.length; i++) { + var supplier = supplierList[i]; + if (0 == i) { + supplierID = supplier.id; + } + options += ''; + } + $("#supplierID").empty().append(options); + $("#searchSupplierID").empty().append('').append(options); + } + } + + //控制用户数据是否可用 + $("#status").unbind().bind({ + change: function () { + if ($(this).val() == 1 || $(this).val() == 2) { + $("#userID").removeAttr("disabled").css({width: "200px"}); + $("#addUserName").show(); + } + else { + $("#userID").attr("disabled", "true").css({width: "230px"}); + $("#addUserName").hide(); + } + } + }); + + //删除资产信息 + function deleteAsset(assetID) { + $.messager.confirm('删除确认', '确定要删除此资产信息吗？', function (r) { + if (r) { + $.ajax({ + type: "post", + url: "<%=path %>/asset/delete.action", + dataType: "json", + data: ({ + assetID: assetID, + clientIp: '<%=clientIp %>' + }), + success: function (tipInfo) { + var msg = tipInfo.showModel.msgTip; + if (msg == '成功') { + //$('#tableData').datagrid('reload'); + //加载完以后重新初始化 + $("#searchBtn").click(); + //var opts = $("#tableData").datagrid('options'); + //showAssetDetails(opts.pageNumber,opts.pageSize); + } + else + $.messager.alert('删除提示', '删除资产信息失败，请稍后再试！', 'error'); + }, + //此处添加错误处理 + error: function () { + $.messager.alert('删除提示', '删除资产信息异常，请稍后再试！', 'error'); + return; + } + }); + } + }); + } + + //批量删除资产 + function batDeleteAsset() { + 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; + } + //alert(row[i].id); + ids += row[i].id + ","; + } + $.ajax({ + type: "post", + url: "<%=path %>/asset/batchDelete.action", + dataType: "json", + async: false, + data: ({ + assetIDs: ids, + clientIp: '<%=clientIp %>' + }), + success: function (tipInfo) { + var msg = tipInfo.showModel.msgTip; + if (msg == '成功') { + //$('#tableData').datagrid('reload'); + //加载完以后重新初始化 + $("#searchBtn").click(); + $(":checkbox").attr("checked", false); + } + else + $.messager.alert('删除提示', '删除资产信息失败，请稍后再试！', 'error'); + }, + //此处添加错误处理 + error: function () { + $.messager.alert('删除提示', '删除资产信息异常，请稍后再试！', 'error'); + return; + } + }); + } + }); + } + } + + //增加资产 + var url; + var assetID = 0; + + function addAsset() { + $('#assetDlg').dialog('open').dialog('setTitle', ' 增加资产'); + $(".window-mask").css({width: webW - 20, height: webH}); + $('#assetFM').form('clear'); + $("#userID").attr("disabled", "true"); + $("#assetNameID").focus(); + var row = { + assetNameID: nameID, + assetCategoryID: categoryID, + userID: userID, + supplierID: supplierID, + status: 0, + clientIp: '<%=clientIp %>' + }; + $('#assetFM').form('load', row); + $("#saveKeepAsset").show(); + assetID = 0; + url = '<%=path %>/asset/create.action'; + } + + //保存资产信息 + $("#saveKeepAsset").unbind().bind({ + click: function () { + $('#assetFM').form('submit', { + url: url, + onSubmit: function () { + return $(this).form('validate'); + }, + success: function (result) { + var result = eval('(' + result + ')'); + if (!result) { + $.messager.show({ + title: '错误提示', + msg: '保存资产信息失败，请稍后重试!' + }); + } + else { + $("#serialnum").val(""); + $("#assetnum").val("").focus(); + var opts = $("#tableData").datagrid('options'); + showAssetDetails(opts.pageNumber, opts.pageSize); + } + } + }); + } + }); + + //保存资产信息 + $("#saveAsset").unbind().bind({ + click: function () { + $('#assetFM').form('submit', { + url: url, + onSubmit: function () { + return $(this).form('validate'); + }, + success: function (result) { + var result = eval('(' + result + ')'); + if (!result) { + $.messager.show({ + title: '错误提示', + msg: '保存资产信息失败，请稍后重试!' + }); + } + else { + $('#assetDlg').dialog('close'); + var opts = $("#tableData").datagrid('options'); + showAssetDetails(opts.pageNumber, opts.pageSize); + } + } + }); + } + }); + + //编辑资产信息 + function editAsset(assetTotalInfo) { + $("#saveKeepAsset").hide(); + var assetInfo = assetTotalInfo.split("AaBb"); + var row = { + assetNameID: assetInfo[1], + assetCategoryID: assetInfo[3], + location: assetInfo[7], + status: assetInfo[6], + userID: assetInfo[4], + price: assetInfo[2], + purchasedate: assetInfo[5], + supplierID: assetInfo[10], + periodofvalidity: assetInfo[8], + warrantydate: assetInfo[9], + assetnum: assetInfo[13], + serialnum: assetInfo[14], + labels: assetInfo[11], + supplierID: assetInfo[10], + description: assetInfo[12], + clientIp: '<%=clientIp %>' + }; + + if (assetInfo[6] == 1 || assetInfo[6] == 2) + $("#userID").removeAttr("disabled"); + else + $("#userID").attr("disabled", "true"); + + $('#assetDlg').dialog('open').dialog('setTitle', ' 编辑资产信息'); + $(".window-mask").css({width: webW - 20, height: webH}); + $('#assetFM').form('load', row); + assetID = assetInfo[0]; + $("#assetNameID").focus(); + url = '<%=path %>/asset/update.action?assetID=' + assetInfo[0]; + } + + //搜索处理 + $("#searchBtn").unbind().bind({ + click: function () { + showAssetDetails(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 showAssetDetails(pageNo, pageSize) { + $.ajax({ + type: "post", + url: "<%=path %>/asset/findBy.action", + dataType: "json", + data: ({ + assetNameID: $.trim($("#searchAssetNameID").val()), + assetCategoryID: $.trim($("#searchCategoryID").val()), + userID: $.trim($("#searchuserID").val()), + status: $.trim($("#searchStatus").val()), + supplierID: $.trim($("#searchSupplierID").val()), + pageNo: pageNo, + pageSize: pageSize + }), + success: function (data) { + $("#tableData").datagrid('loadData', data); + //$('#tableData').datagrid('reload'); + }, + //此处添加错误处理 + error: function () { + $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error'); + return; + } + }); + } + + //重置按钮 + $("#searchResetBtn").unbind().bind({ + click: function () { + $("#searchAssetNameID").val(""); + $("#searchCategoryID").val(""); + $("#searchuserID").val(""); + $("#searchStatus").val(""); + $("#searchSupplierID").val(""); + + //加载完以后重新初始化 + $("#searchBtn").click(); + } + }); + + \ No newline at end of file diff --git a/src/main/webapp/pages/asset/home.jsp b/src/main/webapp/pages/asset/home.jsp index 9c2434d9..5392f0e0 100644 --- a/src/main/webapp/pages/asset/home.jsp +++ b/src/main/webapp/pages/asset/home.jsp @@ -1,76 +1,87 @@ -<%@page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> <% -String path = request.getContextPath(); -String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + path + "/"; %> - - - - - - - 首页说明 - - - - - - - - - - - - - -
-    - 资产管理 -
-

-      - 资产管理是记录资产明细，包括资产名称、资产类型、供应商、使用用户等信息，通过资产管理，可以记录平时资产明细，管理资产信息。资产管理包括增加，修改，删除、搜索消费信息等功能点。报表图表最多显示十条报表记录。 -

- + + + + + + + 首页说明 + + + + + + + + + + + + + +
+    + 资产管理 +
+

+      + 资产管理是记录资产明细，包括资产名称、资产类型、供应商、使用用户等信息，通过资产管理，可以记录平时资产明细，管理资产信息。资产管理包括增加，修改，删除、搜索消费信息等功能点。报表图表最多显示十条报表记录。 +

+ \ No newline at end of file diff --git a/src/main/webapp/pages/asset/report.jsp b/src/main/webapp/pages/asset/report.jsp index 7033fe3b..82d167ba 100644 --- a/src/main/webapp/pages/asset/report.jsp +++ b/src/main/webapp/pages/asset/report.jsp @@ -1,991 +1,964 @@ -<%@page import="com.jsh.util.Tools"%> -<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> +<%@page import="com.jsh.util.Tools" %> +<%@ page language="java" pageEncoding="utf-8" %> <% - String path = request.getContextPath(); - String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getLocalIp(request); + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + path + "/"; + String clientIp = Tools.getLocalIp(request); %> - - 资产管理 - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
资产名称： - -   资产类型： - -   用户姓名： - -   状        态： - -
供    应    商： - -   统计类型： - -   是否前十： - -     - 查询   - 重置 -
-
- - + + 资产管理 + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
资产名称： + +   资产类型： + +   用户姓名： + +   状        态： + +
供    应    商： + +   统计类型： + +   是否前十： + +     + 查询   + 重置 +
+
+ + <%--
--%> <%--
--%> <%--
--%> -
-
-
-
综合图
-
-
-
柱状图
-
-
-
饼状图
-
-
-
折现图
-
-
- -
- - - +
+
+
+
综合图
+
+
+
柱状图
+
+
+
饼状图
+
+
+
折现图
+
+
+ +
+ + + \ No newline at end of file diff --git a/src/main/webapp/pages/common/admin.jsp b/src/main/webapp/pages/common/admin.jsp index 8f506d0b..90ec374b 100644 --- a/src/main/webapp/pages/common/admin.jsp +++ b/src/main/webapp/pages/common/admin.jsp @@ -1,24 +1,24 @@ -<%@page import="com.jsh.util.Tools"%> -<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> +<%@page import="com.jsh.util.Tools" %> +<%@ page language="java" pageEncoding="utf-8" %> <% - String path = request.getContextPath(); - String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getLocalIp(request); + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + path + "/"; + String clientIp = Tools.getLocalIp(request); %> - - ERP系统 - - - - - - - - - - - - + + ERP系统 + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/pages/common/foot.jsp b/src/main/webapp/pages/common/foot.jsp index 470e2671..b3337b56 100644 --- a/src/main/webapp/pages/common/foot.jsp +++ b/src/main/webapp/pages/common/foot.jsp @@ -1,19 +1,19 @@ -<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> +<%@ page language="java" pageEncoding="utf-8" %> <% - String path = request.getContextPath(); - String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + path + "/"; %> - - 资产管理 - - - - - - - - - + + 资产管理 + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/pages/common/head.jsp b/src/main/webapp/pages/common/head.jsp index 578c7c62..9bfb5003 100644 --- a/src/main/webapp/pages/common/head.jsp +++ b/src/main/webapp/pages/common/head.jsp @@ -1,167 +1,161 @@ -<%@page import="com.jsh.util.Tools"%> -<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> +<%@page import="com.jsh.util.Tools" %> +<%@ page language="java" pageEncoding="utf-8" %> <% - String path = request.getContextPath(); - String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getLocalIp(request); + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + path + "/"; + String clientIp = Tools.getLocalIp(request); %> - - 资产管理 - - - - - - - - - - - + + 资产管理 + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/pages/common/home.jsp b/src/main/webapp/pages/common/home.jsp index 597bed70..5c6f243b 100644 --- a/src/main/webapp/pages/common/home.jsp +++ b/src/main/webapp/pages/common/home.jsp @@ -1,727 +1,725 @@ -<%@page import="com.jsh.util.Tools"%> -<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> +<%@page import="com.jsh.util.Tools" %> +<%@ page language="java" pageEncoding="utf-8" %> <% - String path = request.getContextPath(); - String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; - String clientIp = Tools.getLocalIp(request); - String type = request.getParameter("type"); - String location = "首页"; - if(null != type) - location = "资产管理 >资产概况"; + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + path + "/"; + String clientIp = Tools.getLocalIp(request); + String type = request.getParameter("type"); + String location = "首页"; + if (null != type) + location = "资产管理 >资产概况"; %> - - erp - - - - - - - - - - - - - - -
- -
-
-
-
综合图
-
-
- -
-
-
折现图
-
-
-
-
-
饼状图
-
-
-
- - -
-
-
- - - + + erp + + + + + + + + + + + + + + +
+ +
+
+
+
综合图
+
+
+ +
+
+
折现图
+
+
+
+
+
饼状图
+
+
+
+ + +
+
+
+ + + \ No newline at end of file diff --git a/src/main/webapp/pages/common/main.jsp b/src/main/webapp/pages/common/main.jsp index 2f6b55a4..a00ad906 100644 --- a/src/main/webapp/pages/common/main.jsp +++ b/src/main/webapp/pages/common/main.jsp @@ -1,8 +1,8 @@ -<%@page import="com.jsh.util.Tools"%> -<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> +<%@page import="com.jsh.util.Tools" %> +<%@ page language="java" pageEncoding="utf-8" %> <% - String path = request.getContextPath(); - String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + path + "/"; String clientIp = Tools.getLocalIp(request); %> @@ -10,111 +10,122 @@ ERP系统 - - + + -
- -
-
-
您正在使用的IE浏览器版本过低，
我们建议您升级或者更换浏览器，以便体验顺畅、兼容、安全的互联网。
-
选择一款新浏览器吧
-
- ie浏览器 - 谷歌浏览器 - 火狐浏览器 - opera浏览器 - safari浏览器 -
-
[ 对IE6说再见 ]
+
+ +
+
+
您正在使用的IE浏览器版本过低，
我们建议您升级或者更换浏览器，以便体验顺畅、兼容、安全的互联网。
+
选择一款新浏览器吧
+
+ ie浏览器 + 谷歌浏览器 + 火狐浏览器 + opera浏览器 + safari浏览器 +
+
[ 对IE6说再见 ]
- -
-
​​
×
-
-
-
-
-
-
-
- - - - - ${sessionScope.user.username} - -
+
+ +
+
+
​​
+ ×
+
+
+
+
+
+
+
+
+
+
+ + + + + ${sessionScope.user.username} +
-
-
-
-
-
-
-
-
-
- - - - - - - - - - - - - - - - +
+
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + - - + + - + //判断是否存在session，如果不存在就跳到登录界面 + function UserOut() { + var kid = ${sessionScope.user.id}; + if (!kid) { + top.location.href = '../../'; + } + } + + setInterval(UserOut, 5000); //每5秒检测一次 + }); + + \ No newline at end of file diff --git a/src/main/webapp/pages/common/menu.jsp b/src/main/webapp/pages/common/menu.jsp index 1c24b836..47efd963 100644 --- a/src/main/webapp/pages/common/menu.jsp +++ b/src/main/webapp/pages/common/menu.jsp @@ -1,254 +1,237 @@ -<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> +<%@ page language="java" pageEncoding="utf-8" %> <% - String path = request.getContextPath(); - String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + path + "/"; %> - - - - - - - - - - - - + + + + + + + + + + + + -
-