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

入库出库单据的js相关调整

Browse Source
This commit is contained in:
季圣华
2017-01-08 11:30:44 +08:00
parent 17387fb03c
commit 90de51bff7
13 changed files with 1344 additions and 3106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.project
View File

@@ -5,6 +5,11 @@
<projects> <projects>
</projects> </projects>
<buildSpec> <buildSpec>
<buildCommand>
<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name> <name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments> <arguments>
@@ -62,8 +67,8 @@
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature> <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>com.genuitec.eclipse.j2eedt.core.webnature</nature> <nature>com.genuitec.eclipse.j2eedt.core.webnature</nature>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature> <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures> </natures>
</projectDescription> </projectDescription>

2
.settings/.jsdtscope
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="WebRoot"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"> <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
<attributes> <attributes>
@@ -8,5 +7,6 @@
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/> <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
<classpathentry kind="src" path="WebRoot"/>
<classpathentry kind="output" path=""/> <classpathentry kind="output" path=""/>
</classpath> </classpath>

2
.settings/org.eclipse.wst.common.project.facet.core.xml
View File

@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<fixed facet="wst.jsdt.web"/>
<installed facet="java" version="1.6"/> <installed facet="java" version="1.6"/>
<installed facet="jst.web" version="2.5"/> <installed facet="jst.web" version="2.5"/>
<installed facet="wst.jsdt.web" version="1.0"/>
</faceted-project> </faceted-project>

2
WebRoot/js/HoorayOS_mini/js/hros.zoom.js
View File

@@ -16,7 +16,7 @@ HROS.zoom = (function(){
** 使用SWFObject.js插入flash ** 使用SWFObject.js插入flash
** http://www.cnblogs.com/wuxinxi007/archive/2009/10/27/1590709.html ** http://www.cnblogs.com/wuxinxi007/archive/2009/10/27/1590709.html
*/ */
swfobject.embedSWF('js/zoom.swf?onchange=HROS.zoom.check', 'zoombox', '10', '10', '6.0.0', 'expressInstall.swf', '', {allowScriptAccess : 'always', wmode : 'transparent', scale : 'noScale'}, {id : 'accessory_zoom', name : 'zoom_detect'}); //swfobject.embedSWF('js/zoom.swf?onchange=HROS.zoom.check', 'zoombox', '10', '10', '6.0.0', 'expressInstall.swf', '', {allowScriptAccess : 'always', wmode : 'transparent', scale : 'noScale'}, {id : 'accessory_zoom', name : 'zoom_detect'});
}, },
/* /*
** 为什么会有个参数o？其实我也不知道 ** 为什么会有个参数o？其实我也不知道

1982
WebRoot/js/pages/materials/in_out.js
View File

File diff suppressed because it is too large Load Diff

68
WebRoot/pages/materials/allocation_out_list.jsp
View File

@@ -2,7 +2,6 @@
<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
<% <%
String path = request.getContextPath(); String path = request.getContextPath();
String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
String clientIp = Tools.getCurrentUserIP(); String clientIp = Tools.getCurrentUserIP();
%> %>
<!DOCTYPE html> <!DOCTYPE html>
@@ -13,14 +12,20 @@
<!-- 指定以IE8的方式来渲染 --> <!-- 指定以IE8的方式来渲染 -->
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/> <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
<link rel="shortcut icon" href="<%=path%>/images/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="<%=path%>/images/favicon.ico" type="image/x-icon" />
<script type="text/javascript" src="<%=path %>/js/jquery-1.8.0.min.js"></script>
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/default/easyui.css"/> <link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/default/easyui.css"/>
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/icon.css"/> <link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/icon.css"/>
<link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" /> <link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" />
<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script> <script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script> <script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
<script type="text/javascript" src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script> <script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script type="text/javascript" src="<%=path %>/js/common/common.js"></script> <script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
<script src="<%=path %>/js/common/common.js"></script>
<script src="<%=path %>/js/pages/materials/in_out.js"></script>
<script>
var kid = ${sessionScope.user.id};
var path = "<%=path%>";
var clientIp = "<%=clientIp%>";
</script>
</head> </head>
<body> <body>
<!-- 查询 --> <!-- 查询 -->
@@ -31,11 +36,11 @@
<td> <td>
<select name="searchProjectId" id="searchProjectId" style="width:80px;"></select> <select name="searchProjectId" id="searchProjectId" style="width:80px;"></select>
</td> </td>
<td>单据号：</td> <td>单据编号：</td>
<td> <td>
<input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/> <input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/>
</td> </td>
<td>出库时间：</td> <td>单据日期：</td>
<td> <td>
<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/> <input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
</td> </td>
@@ -66,31 +71,31 @@
<td style="padding:5px"> <td style="padding:5px">
<select name="ProjectId" id="ProjectId" style="width:120px;"></select> <select name="ProjectId" id="ProjectId" style="width:120px;"></select>
</td> </td>
<td>出库时间：</td> <td>单据日期：</td>
<td style="padding:5px"> <td style="padding:5px">
<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/> <input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/>
</td> </td>
<td>收货仓库：</td> <td>经手人：</td>
<td style="padding:5px"> <td style="padding:5px">
<select name="AllocationProjectId" id="AllocationProjectId" style="width:120px;"></select> <select name="HandsPersonId" id="HandsPersonId" style="width:120px;"></select>
</td> </td>
<td style="width:50px;"></td> <td style="width:50px;"></td>
<td style="padding:5px;width:120px;"></td> <td style="padding:5px;width:120px;"></td>
</tr> </tr>
<tr> <tr>
<td>经手人：</td> <td>收货仓库：</td>
<td style="padding:5px"> <td style="padding:5px">
<select name="WareHousePersonId" id="WareHousePersonId" style="width:120px;"></select> <select name="AllocationProjectId" id="AllocationProjectId" style="width:120px;"></select>
</td> </td>
<td>备注：</td> <td>单据编号：</td>
<td style="padding:5px"><input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 120px;"/>
</td>
<td>单据备注：</td>
<td style="padding:5px"> <td style="padding:5px">
<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 120px;"/> <input name="Remark" id="Remark" class="easyui-validatebox" style="width: 120px;"/>
</td> </td>
<td>单据号：</td>
<td style="padding:5px"><input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 120px;"/>
</td>
<td></td> <td></td>
<td style="padding:5px"></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>商品列表：</td> <td>商品列表：</td>
@@ -115,33 +120,33 @@
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:120px;">
<span id="ProjectIdShow"></span> <span id="ProjectIdShow"></span>
</td> </td>
<td>出库时间：</td> <td>单据日期：</td>
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:120px;">
<span id="OperTimeShow"></span> <span id="OperTimeShow"></span>
</td> </td>
<td>收货仓库：</td> <td>经手人：</td>
<td style="padding:5px;width:120px;"> <td style="padding:5px">
<span id="AllocationProjectIdShow"></span> <span id="HandsPersonIdShow"></span>
</td> </td>
<td style="width:50px;"></td> <td style="width:50px;"></td>
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:120px;">
</td> </td>
</tr> </tr>
<tr> <tr>
<td>仓管员：</td> <td>收货仓库：</td>
<td style="padding:5px"> <td style="padding:5px;width:120px;">
<span id="WareHousePersonIdShow"></span> <span id="AllocationProjectIdShow"></span>
</td> </td>
<td>备注：</td> <td>单据编号：</td>
<td style="padding:5px">
<span id="RemarkShow"></span>
</td>
<td>单据号：</td>
<td style="padding:5px"> <td style="padding:5px">
<span id="NumberShow"></span> <span id="NumberShow"></span>
</td> </td>
<td>单据备注：</td>
<td style="padding:5px">
<span id="RemarkShow"></span>
</td>
<td></td> <td></td>
<td style="padding:5px"></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>商品列表：</td> <td>商品列表：</td>
@@ -154,6 +159,7 @@
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
return;
var depotList = null; var depotList = null;
var depotID = null; var depotID = null;
var supplierList = null; var supplierList = null;

82
WebRoot/pages/materials/other_in_list.jsp
View File

@@ -2,7 +2,6 @@
<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
<% <%
String path = request.getContextPath(); String path = request.getContextPath();
String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
String clientIp = Tools.getCurrentUserIP(); String clientIp = Tools.getCurrentUserIP();
%> %>
<!DOCTYPE html> <!DOCTYPE html>
@@ -13,14 +12,20 @@
<!-- 指定以IE8的方式来渲染 --> <!-- 指定以IE8的方式来渲染 -->
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/> <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
<link rel="shortcut icon" href="<%=path%>/images/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="<%=path%>/images/favicon.ico" type="image/x-icon" />
<script type="text/javascript" src="<%=path %>/js/jquery-1.8.0.min.js"></script>
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/default/easyui.css"/> <link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/default/easyui.css"/>
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/icon.css"/> <link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/icon.css"/>
<link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" /> <link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" />
<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script> <script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script> <script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
<script type="text/javascript" src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script> <script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script type="text/javascript" src="<%=path %>/js/common/common.js"></script> <script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
<script src="<%=path %>/js/common/common.js"></script>
<script src="<%=path %>/js/pages/materials/in_out.js"></script>
<script>
var kid = ${sessionScope.user.id};
var path = "<%=path%>";
var clientIp = "<%=clientIp%>";
</script>
</head> </head>
<body> <body>
<!-- 查询 --> <!-- 查询 -->
@@ -31,11 +36,11 @@
<td> <td>
<select name="searchProjectId" id="searchProjectId" style="width:80px;"></select> <select name="searchProjectId" id="searchProjectId" style="width:80px;"></select>
</td> </td>
<td>单据号：</td> <td>单据编号：</td>
<td> <td>
<input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/> <input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/>
</td> </td>
<td>入库时间：</td> <td>单据日期：</td>
<td> <td>
<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/> <input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
</td> </td>
@@ -66,38 +71,32 @@
<td style="padding:5px"> <td style="padding:5px">
<select name="ProjectId" id="ProjectId" style="width:120px;"></select> <select name="ProjectId" id="ProjectId" style="width:120px;"></select>
</td> </td>
<td>入库时间：</td> <td>单据日期：</td>
<td style="padding:5px"> <td style="padding:5px">
<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/> <input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/>
</td> </td>
<td>供应商：</td> <td>往来单位：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="OrganId" name="OrganId" style="width:120px;" /> <input id="OrganId" name="OrganId" style="width:120px;" />
</td> </td>
<td>采购人：</td> <td style="width:50px;"></td>
<td style="padding:5px"> <td style="padding:5px;width:120px;"></td>
<select name="HandsPersonId" id="HandsPersonId" style="width:120px;"></select>
</td>
</tr> </tr>
<tr> <tr>
<td>经手人：</td> <td>经手人：</td>
<td style="padding:5px"> <td style="padding:5px">
<select name="WareHousePersonId" id="WareHousePersonId" style="width:120px;"></select> <select name="HandsPersonId" id="HandsPersonId" style="width:120px;"></select>
</td> </td>
<td>结算方式：</td> <td>单据编号：</td>
<td style="padding:5px"> <td style="padding:5px">
<select name="SettlementWay" id="SettlementWay" style="width:120px;"> <input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 120px;"/>
<option value="现金">现金</option> </td>
<option value="记账">记账</option> <td>单据备注：</td>
</select>
</td>
<td>备注：</td>
<td style="padding:5px"> <td style="padding:5px">
<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 120px;"/> <input name="Remark" id="Remark" class="easyui-validatebox" style="width: 120px;"/>
</td> </td>
<td>单据号：</td> <td></td>
<td style="padding:5px"><input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 120px;"/> <td></td>
</td>
</tr> </tr>
<tr> <tr>
<td>商品列表：</td> <td>商品列表：</td>
@@ -122,36 +121,32 @@
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:120px;">
<span id="ProjectIdShow"></span> <span id="ProjectIdShow"></span>
</td> </td>
<td>入库时间：</td> <td>单据日期：</td>
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:120px;">
<span id="OperTimeShow"></span> <span id="OperTimeShow"></span>
</td> </td>
<td>供应商：</td> <td>往来单位：</td>
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:120px;">
<span id="OrganIdShow"></span> <span id="OrganIdShow"></span>
</td> </td>
<td>采购人：</td> <td style="width:50px;"></td>
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:120px;"></td>
<span id="HandsPersonIdShow"></span>
</td>
</tr> </tr>
<tr> <tr>
<td>仓管员：</td> <td>经手人：</td>
<td style="padding:5px"> <td style="padding:5px">
<span id="WareHousePersonIdShow"></span> <span id="HandsPersonIdShow"></span>
</td> </td>
<td>结算方式：</td> <td>单据编号：</td>
<td style="padding:5px">
<span id="SettlementWayShow"></span>
</td>
<td>备注：</td>
<td style="padding:5px">
<span id="RemarkShow"></span>
</td>
<td>单据号：</td>
<td style="padding:5px"> <td style="padding:5px">
<span id="NumberShow"></span> <span id="NumberShow"></span>
</td> </td>
<td>单据备注：</td>
<td style="padding:5px">
<span id="RemarkShow"></span>
</td>
<td></td>
<td></td>
</tr> </tr>
<tr> <tr>
<td>商品列表：</td> <td>商品列表：</td>
@@ -164,6 +159,7 @@
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
return;
var depotList = null; var depotList = null;
var depotID = null; var depotID = null;
var supplierList = null; var supplierList = null;

56
WebRoot/pages/materials/other_out_list.jsp
View File

@@ -2,7 +2,6 @@
<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
<% <%
String path = request.getContextPath(); String path = request.getContextPath();
String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
String clientIp = Tools.getCurrentUserIP(); String clientIp = Tools.getCurrentUserIP();
%> %>
<!DOCTYPE html> <!DOCTYPE html>
@@ -13,14 +12,20 @@
<!-- 指定以IE8的方式来渲染 --> <!-- 指定以IE8的方式来渲染 -->
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/> <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
<link rel="shortcut icon" href="<%=path%>/images/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="<%=path%>/images/favicon.ico" type="image/x-icon" />
<script type="text/javascript" src="<%=path %>/js/jquery-1.8.0.min.js"></script>
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/default/easyui.css"/> <link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/default/easyui.css"/>
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/icon.css"/> <link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/icon.css"/>
<link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" /> <link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" />
<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script> <script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script> <script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
<script type="text/javascript" src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script> <script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script type="text/javascript" src="<%=path %>/js/common/common.js"></script> <script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
<script src="<%=path %>/js/common/common.js"></script>
<script src="<%=path %>/js/pages/materials/in_out.js"></script>
<script>
var kid = ${sessionScope.user.id};
var path = "<%=path%>";
var clientIp = "<%=clientIp%>";
</script>
</head> </head>
<body> <body>
<!-- 查询 --> <!-- 查询 -->
@@ -31,11 +36,11 @@
<td> <td>
<select name="searchProjectId" id="searchProjectId" style="width:80px;"></select> <select name="searchProjectId" id="searchProjectId" style="width:80px;"></select>
</td> </td>
<td>单据号：</td> <td>单据编号：</td>
<td> <td>
<input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/> <input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/>
</td> </td>
<td>出库时间：</td> <td>单据日期：</td>
<td> <td>
<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/> <input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
</td> </td>
@@ -66,11 +71,11 @@
<td style="padding:5px"> <td style="padding:5px">
<select name="ProjectId" id="ProjectId" style="width:120px;"></select> <select name="ProjectId" id="ProjectId" style="width:120px;"></select>
</td> </td>
<td>出库时间：</td> <td>单据日期：</td>
<td style="padding:5px"> <td style="padding:5px">
<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/> <input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/>
</td> </td>
<td>客户：</td> <td>往来单位：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="OrganId" name="OrganId" style="width:120px;" /> <input id="OrganId" name="OrganId" style="width:120px;" />
</td> </td>
@@ -80,15 +85,15 @@
<tr> <tr>
<td>经手人：</td> <td>经手人：</td>
<td style="padding:5px"> <td style="padding:5px">
<select name="WareHousePersonId" id="WareHousePersonId" style="width:120px;"></select> <select name="HandsPersonId" id="HandsPersonId" style="width:120px;"></select>
</td> </td>
<td>备注：</td> <td>单据编号：</td>
<td style="padding:5px"><input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 120px;"/>
</td>
<td>单据备注：</td>
<td style="padding:5px"> <td style="padding:5px">
<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 120px;"/> <input name="Remark" id="Remark" class="easyui-validatebox" style="width: 120px;"/>
</td> </td>
<td>单据号：</td>
<td style="padding:5px"><input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 120px;"/>
</td>
<td></td> <td></td>
<td></td> <td></td>
</tr> </tr>
@@ -115,11 +120,11 @@
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:120px;">
<span id="ProjectIdShow"></span> <span id="ProjectIdShow"></span>
</td> </td>
<td>出库时间：</td> <td>单据日期：</td>
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:120px;">
<span id="OperTimeShow"></span> <span id="OperTimeShow"></span>
</td> </td>
<td>客户：</td> <td>往来单位：</td>
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:120px;">
<span id="OrganIdShow"></span> <span id="OrganIdShow"></span>
</td> </td>
@@ -128,20 +133,20 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td>仓管员：</td> <td>经手人：</td>
<td style="padding:5px"> <td style="padding:5px">
<span id="WareHousePersonIdShow"></span> <span id="HandsPersonIdShow"></span>
</td> </td>
<td>备注：</td> <td>单据编号：</td>
<td style="padding:5px">
<span id="RemarkShow"></span>
</td>
<td>单据号：</td>
<td style="padding:5px"> <td style="padding:5px">
<span id="NumberShow"></span> <span id="NumberShow"></span>
</td> </td>
<td>单据备注：</td>
<td style="padding:5px">
<span id="RemarkShow"></span>
</td>
<td></td> <td></td>
<td style="padding:5px"></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>商品列表：</td> <td>商品列表：</td>
@@ -154,6 +159,7 @@
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
return;
var depotList = null; var depotList = null;
var depotID = null; var depotID = null;
var supplierList = null; var supplierList = null;

88
WebRoot/pages/materials/purchase_back_list.jsp
View File

@@ -2,7 +2,6 @@
<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
<% <%
String path = request.getContextPath(); String path = request.getContextPath();
String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
String clientIp = Tools.getCurrentUserIP(); String clientIp = Tools.getCurrentUserIP();
%> %>
<!DOCTYPE html> <!DOCTYPE html>
@@ -13,14 +12,20 @@
<!-- 指定以IE8的方式来渲染 --> <!-- 指定以IE8的方式来渲染 -->
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/> <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
<link rel="shortcut icon" href="<%=path%>/images/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="<%=path%>/images/favicon.ico" type="image/x-icon" />
<script type="text/javascript" src="<%=path %>/js/jquery-1.8.0.min.js"></script>
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/default/easyui.css"/> <link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/default/easyui.css"/>
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/icon.css"/> <link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/icon.css"/>
<link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" /> <link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" />
<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script> <script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script> <script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
<script type="text/javascript" src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script> <script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script type="text/javascript" src="<%=path %>/js/common/common.js"></script> <script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
<script src="<%=path %>/js/common/common.js"></script>
<script src="<%=path %>/js/pages/materials/in_out.js"></script>
<script>
var kid = ${sessionScope.user.id};
var path = "<%=path%>";
var clientIp = "<%=clientIp%>";
</script>
</head> </head>
<body> <body>
<!-- 查询 --> <!-- 查询 -->
@@ -31,11 +36,11 @@
<td> <td>
<select name="searchProjectId" id="searchProjectId" style="width:80px;"></select> <select name="searchProjectId" id="searchProjectId" style="width:80px;"></select>
</td> </td>
<td>单据号：</td> <td>单据编号：</td>
<td> <td>
<input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/> <input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/>
</td> </td>
<td>入库时间：</td> <td>单据日期：</td>
<td> <td>
<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/> <input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
</td> </td>
@@ -64,39 +69,37 @@
<tr> <tr>
<td>发货仓库：</td> <td>发货仓库：</td>
<td style="padding:5px"> <td style="padding:5px">
<select name="ProjectId" id="ProjectId" style="width:120px;"></select> <select name="ProjectId" id="ProjectId" style="width:110px;"></select>
</td> </td>
<td>入库时间：</td> <td>单据日期：</td>
<td style="padding:5px"> <td style="padding:5px">
<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/> <input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:110px;"/>
</td> </td>
<td>供应商：</td> <td>收货单位：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="OrganId" name="OrganId" style="width:120px;" /> <input id="OrganId" name="OrganId" style="width:110px;" />
</td> </td>
<td>采购人：</td> <td>经手人：</td>
<td style="padding:5px"> <td style="padding:5px">
<select name="HandsPersonId" id="HandsPersonId" style="width:120px;"></select> <select name="HandsPersonId" id="HandsPersonId" style="width:110px;"></select>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>经手人：</td> <td>收款账户：</td>
<td style="padding:5px"> <td style="padding:5px">
<select name="WareHousePersonId" id="WareHousePersonId" style="width:120px;"></select> <select name="AccountId" id="AccountId" style="width:110px;"></select>
</td> </td>
<td>结算方式：</td> <td>收款金额：</td>
<td style="padding:5px"> <td style="padding:5px">
<select name="SettlementWay" id="SettlementWay" style="width:120px;"> <input id="ChangeAmount" name="ChangeAmount" data-changeamount="0" style="width:110px;" />
<option value="现金">现金</option>
<option value="记账">记账</option>
</select>
</td> </td>
<td>备注：</td> <td>单据编号：</td>
<td style="padding:5px"> <td style="padding:5px">
<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 120px;"/> <input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 110px;"/>
</td> </td>
<td>单据号：</td> <td>单据备注：</td>
<td style="padding:5px"><input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 120px;"/> <td style="padding:5px">
<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 110px;"/>
</td> </td>
</tr> </tr>
<tr> <tr>
@@ -119,39 +122,39 @@
<table> <table>
<tr> <tr>
<td>发货仓库：</td> <td>发货仓库：</td>
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:110px;">
<span id="ProjectIdShow"></span> <span id="ProjectIdShow"></span>
</td> </td>
<td>入库时间：</td> <td>单据日期：</td>
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:110px;">
<span id="OperTimeShow"></span> <span id="OperTimeShow"></span>
</td> </td>
<td>供应商：</td> <td>收货单位：</td>
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:110px;">
<span id="OrganIdShow"></span> <span id="OrganIdShow"></span>
</td> </td>
<td>采购人：</td> <td>经手人：</td>
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:110px;">
<span id="HandsPersonIdShow"></span> <span id="HandsPersonIdShow"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>仓管员：</td> <td>收款账户：</td>
<td style="padding:5px"> <td style="padding:5px">
<span id="WareHousePersonIdShow"></span> <span id="AccountIdShow"></span>
</td> </td>
<td>结算方式：</td> <td>收款金额：</td>
<td style="padding:5px"> <td style="padding:5px">
<span id="SettlementWayShow"></span> <span id="ChangeAmountShow"></span>
</td> </td>
<td>备注：</td> <td>单据编号：</td>
<td style="padding:5px">
<span id="RemarkShow"></span>
</td>
<td>单据号：</td>
<td style="padding:5px"> <td style="padding:5px">
<span id="NumberShow"></span> <span id="NumberShow"></span>
</td> </td>
<td>单据备注：</td>
<td style="padding:5px">
<span id="RemarkShow"></span>
</td>
</tr> </tr>
<tr> <tr>
<td>商品列表：</td> <td>商品列表：</td>
@@ -164,6 +167,7 @@
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
return;
var depotList = null; var depotList = null;
var depotID = null; var depotID = null;
var supplierList = null; var supplierList = null;

1034
WebRoot/pages/materials/purchase_in_list.jsp
View File

File diff suppressed because it is too large Load Diff

982
WebRoot/pages/materials/sale_back_list.jsp
View File

File diff suppressed because it is too large Load Diff

93
WebRoot/pages/materials/sale_out_list.jsp
View File

@@ -2,7 +2,6 @@
<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> <%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
<% <%
String path = request.getContextPath(); String path = request.getContextPath();
String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
String clientIp = Tools.getCurrentUserIP(); String clientIp = Tools.getCurrentUserIP();
%> %>
<!DOCTYPE html> <!DOCTYPE html>
@@ -13,14 +12,20 @@
<!-- 指定以IE8的方式来渲染 --> <!-- 指定以IE8的方式来渲染 -->
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/> <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
<link rel="shortcut icon" href="<%=path%>/images/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="<%=path%>/images/favicon.ico" type="image/x-icon" />
<script type="text/javascript" src="<%=path %>/js/jquery-1.8.0.min.js"></script>
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/default/easyui.css"/> <link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/default/easyui.css"/>
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/icon.css"/> <link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/icon.css"/>
<link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" /> <link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" />
<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script> <script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script> <script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
<script type="text/javascript" src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script> <script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script type="text/javascript" src="<%=path %>/js/common/common.js"></script> <script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
<script src="<%=path %>/js/common/common.js"></script>
<script src="<%=path %>/js/pages/materials/in_out.js"></script>
<script>
var kid = ${sessionScope.user.id};
var path = "<%=path%>";
var clientIp = "<%=clientIp%>";
</script>
</head> </head>
<body> <body>
<!-- 查询 --> <!-- 查询 -->
@@ -31,11 +36,11 @@
<td> <td>
<select name="searchProjectId" id="searchProjectId" style="width:80px;"></select> <select name="searchProjectId" id="searchProjectId" style="width:80px;"></select>
</td> </td>
<td>单据号：</td> <td>单据编号：</td>
<td> <td>
<input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/> <input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/>
</td> </td>
<td>出库时间：</td> <td>单据日期：</td>
<td> <td>
<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/> <input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
</td> </td>
@@ -64,33 +69,37 @@
<tr> <tr>
<td>发货仓库：</td> <td>发货仓库：</td>
<td style="padding:5px"> <td style="padding:5px">
<select name="ProjectId" id="ProjectId" style="width:120px;"></select> <select name="ProjectId" id="ProjectId" style="width:110px;"></select>
</td> </td>
<td>出库时间：</td> <td>单据日期：</td>
<td style="padding:5px"> <td style="padding:5px">
<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/> <input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:110px;"/>
</td> </td>
<td>客户：</td> <td>购买单位：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="OrganId" name="OrganId" style="width:120px;" /> <input id="OrganId" name="OrganId" style="width:110px;" />
</td> </td>
<td style="width:50px;"></td>
<td style="padding:5px;width:120px;"></td>
</tr>
<tr>
<td>经手人：</td> <td>经手人：</td>
<td style="padding:5px"> <td style="padding:5px">
<select name="WareHousePersonId" id="WareHousePersonId" style="width:120px;"></select> <select name="HandsPersonId" id="HandsPersonId" style="width:110px;"></select>
</td> </td>
<td>备注：</td> </tr>
<tr>
<td>收款账户：</td>
<td style="padding:5px"> <td style="padding:5px">
<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 120px;"/> <select name="AccountId" id="AccountId" style="width:110px;"></select>
</td> </td>
<td>单据号：</td> <td>收款金额：</td>
<td style="padding:5px"><input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 120px;"/> <td style="padding:5px">
<input id="ChangeAmount" name="ChangeAmount" data-changeamount="0" style="width:110px;" />
</td>
<td>单据编号：</td>
<td style="padding:5px"><input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 110px;"/>
</td>
<td>单据备注：</td>
<td style="padding:5px">
<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 110px;"/>
</td> </td>
<td></td>
<td></td>
</tr> </tr>
<tr> <tr>
<td>商品列表：</td> <td>商品列表：</td>
@@ -112,36 +121,39 @@
<table> <table>
<tr> <tr>
<td>发货仓库：</td> <td>发货仓库：</td>
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:110px;">
<span id="ProjectIdShow"></span> <span id="ProjectIdShow"></span>
</td> </td>
<td>出库时间：</td> <td>单据日期：</td>
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:110px;">
<span id="OperTimeShow"></span> <span id="OperTimeShow"></span>
</td> </td>
<td>客户：</td> <td>购买单位：</td>
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:110px;">
<span id="OrganIdShow"></span> <span id="OrganIdShow"></span>
</td> </td>
<td style="width:50px;"></td> <td>经手人：</td>
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:110px;">
<span id="HandsPersonIdShow"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>仓管员：</td> <td>收款账户：</td>
<td style="padding:5px"> <td style="padding:5px">
<span id="WareHousePersonIdShow"></span> <span id="AccountIdShow"></span>
</td> </td>
<td>备注：</td> <td>收款金额：</td>
<td style="padding:5px"> <td style="padding:5px">
<span id="RemarkShow"></span> <span id="ChangeAmountShow"></span>
</td> </td>
<td>单据号：</td> <td>单据编号：</td>
<td style="padding:5px"> <td style="padding:5px">
<span id="NumberShow"></span> <span id="NumberShow"></span>
</td> </td>
<td></td> <td>单据备注：</td>
<td style="padding:5px"></td> <td style="padding:5px">
<span id="RemarkShow"></span>
</td>
</tr> </tr>
<tr> <tr>
<td>商品列表：</td> <td>商品列表：</td>
@@ -154,6 +166,7 @@
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
return;
var depotList = null; var depotList = null;
var depotID = null; var depotID = null;
var supplierList = null; var supplierList = null;

40
src/com/jsh/action/basic/AccountAction.java
View File

@@ -167,6 +167,46 @@ public class AccountAction extends BaseAction<AccountModel>
, tipType, "更新结算账户ID为 "+ model.getAccountID() + " " + tipMsg + "！", "更新结算账户" + tipMsg)); , tipType, "更新结算账户ID为 "+ model.getAccountID() + " " + tipMsg + "！", "更新结算账户" + tipMsg));
} }
/**
* 更新结算账户金额
* @return
*/
public void updateAmount()
{
Boolean flag = false;
try
{
Account Account = accountService.get(model.getAccountID());
Account.setCurrentAmount(model.getCurrentAmount());
accountService.update(Account);
flag = true;
tipMsg = "成功";
tipType = 0;
}
catch (DataAccessException e)
{
Log.errorFileSync(">>>>>>>>>>>>>修改结算账户ID为 ： " + model.getAccountID() + "信息失败", e);
flag = false;
tipMsg = "失败";
tipType = 1;
}
finally
{
try
{
toClient(flag.toString());
}
catch (IOException e)
{
Log.errorFileSync(">>>>>>>>>>>>修改结算账户回写客户端结果异常", e);
}
}
logService.create(new Logdetails(getUser(), "更新结算账户", model.getClientIp(),
new Timestamp(System.currentTimeMillis())
, tipType, "更新结算账户ID为 "+ model.getAccountID() + " " + tipMsg + "！", "更新结算账户" + tipMsg));
}
/** /**
* 批量删除指定ID结算账户 * 批量删除指定ID结算账户
* @return * @return