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

优化入库、出库的前端UI，并修复相关BUG

Browse Source
This commit is contained in:
季圣华
2016-12-18 22:02:59 +08:00
parent 5b11628ec1
commit 77e30a07c8
20 changed files with 2846 additions and 2851 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
WebRoot/WEB-INF/classes/com/jsh/action/basic/AccountAction.class
View File

Binary file not shown.

BIN
WebRoot/WEB-INF/classes/com/jsh/action/basic/InOutItemAction.class
View File

Binary file not shown.

BIN
WebRoot/WEB-INF/classes/com/jsh/action/materials/PersonAction.class
View File

Binary file not shown.

1870
WebRoot/pages/financial/giro.jsp
View File

File diff suppressed because it is too large Load Diff

6
WebRoot/pages/financial/item_in.jsp
View File

@@ -8,7 +8,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>财务管理</title> <title>收入单</title>
<meta charset="utf-8"> <meta charset="utf-8">
<!-- 指定以IE8的方式来渲染 --> <!-- 指定以IE8的方式来渲染 -->
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/> <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
@@ -49,7 +49,7 @@
</div> </div>
<!-- 数据显示table --> <!-- 数据显示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" style="padding:1px;top:300px;" title="收入单列表" iconCls="icon-list" collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table> <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div> </div>
@@ -389,7 +389,7 @@
valueField:'Id', valueField:'Id',
textField:'InOutItemName', textField:'InOutItemName',
method:'get', method:'get',
url: "<%=path%>/inOutItem/findBySelect.action" url: "<%=path%>/inOutItem/findBySelect.action?type=in"
} }
} }
}, },

8
WebRoot/pages/financial/item_out.jsp
View File

@@ -8,7 +8,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>财务管理</title> <title>支出单</title>
<meta charset="utf-8"> <meta charset="utf-8">
<!-- 指定以IE8的方式来渲染 --> <!-- 指定以IE8的方式来渲染 -->
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/> <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
@@ -49,7 +49,7 @@
</div> </div>
<!-- 数据显示table --> <!-- 数据显示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" style="padding:1px;top:300px;" title="支出单列表" iconCls="icon-list" collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table> <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div> </div>
@@ -379,7 +379,7 @@
pageList: [50,100,150], pageList: [50,100,150],
columns:[[ columns:[[
{ field: 'Id',width:35,align:"center",checkbox:true}, { field: 'Id',width:35,align:"center",checkbox:true},
{ title: '收入项目',field: 'InOutItemId',width:230, { title: '支出项目',field: 'InOutItemId',width:230,
formatter:function(value,row,index){ formatter:function(value,row,index){
return row.InOutItemName; return row.InOutItemName;
}, },
@@ -389,7 +389,7 @@
valueField:'Id', valueField:'Id',
textField:'InOutItemName', textField:'InOutItemName',
method:'get', method:'get',
url: "<%=path%>/inOutItem/findBySelect.action" url: "<%=path%>/inOutItem/findBySelect.action?type=out"
} }
} }
}, },

1870
WebRoot/pages/financial/money_in.jsp
View File

File diff suppressed because it is too large Load Diff

1870
WebRoot/pages/financial/money_out.jsp
View File

File diff suppressed because it is too large Load Diff

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

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false"> <div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable"> <table id="searchTable">
<tr> <tr>
<td>仓库：</td> <td>发货仓库：</td>
<td> <td>
<select name="searchProjectId" id="searchProjectId" style="width:80px;"></select> <select name="searchProjectId" id="searchProjectId" style="width:80px;"></select>
</td> </td>
@@ -62,7 +62,7 @@
<form id="depotHeadFM" method="post" novalidate> <form id="depotHeadFM" method="post" novalidate>
<table> <table>
<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:120px;"></select>
</td> </td>
@@ -70,7 +70,7 @@
<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="AllocationProjectId" id="AllocationProjectId" style="width:120px;"></select>
</td> </td>
@@ -111,7 +111,7 @@
closed="true" modal="true" cache="false" collapsible="false" closable="true"> closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table> <table>
<tr> <tr>
<td>仓　库：</td> <td>发货仓库：</td>
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:120px;">
<span id="ProjectIdShow"></span> <span id="ProjectIdShow"></span>
</td> </td>
@@ -119,7 +119,7 @@
<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="AllocationProjectIdShow"></span> <span id="AllocationProjectIdShow"></span>
</td> </td>

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

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false"> <div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable"> <table id="searchTable">
<tr> <tr>
<td>仓库：</td> <td>收货仓库：</td>
<td> <td>
<select name="searchProjectId" id="searchProjectId" style="width:80px;"></select> <select name="searchProjectId" id="searchProjectId" style="width:80px;"></select>
</td> </td>
@@ -62,7 +62,7 @@
<form id="depotHeadFM" method="post" novalidate> <form id="depotHeadFM" method="post" novalidate>
<table> <table>
<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:120px;"></select>
</td> </td>
@@ -118,7 +118,7 @@
closed="true" modal="true" cache="false" collapsible="false" closable="true"> closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table> <table>
<tr> <tr>
<td>仓　库：</td> <td>收货仓库：</td>
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:120px;">
<span id="ProjectIdShow"></span> <span id="ProjectIdShow"></span>
</td> </td>

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

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false"> <div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable"> <table id="searchTable">
<tr> <tr>
<td>仓库：</td> <td>发货仓库：</td>
<td> <td>
<select name="searchProjectId" id="searchProjectId" style="width:80px;"></select> <select name="searchProjectId" id="searchProjectId" style="width:80px;"></select>
</td> </td>
@@ -62,7 +62,7 @@
<form id="depotHeadFM" method="post" novalidate> <form id="depotHeadFM" method="post" novalidate>
<table> <table>
<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:120px;"></select>
</td> </td>
@@ -111,7 +111,7 @@
closed="true" modal="true" cache="false" collapsible="false" closable="true"> closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table> <table>
<tr> <tr>
<td>仓　库：</td> <td>发货仓库：</td>
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:120px;">
<span id="ProjectIdShow"></span> <span id="ProjectIdShow"></span>
</td> </td>

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

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false"> <div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable"> <table id="searchTable">
<tr> <tr>
<td>仓库：</td> <td>发货仓库：</td>
<td> <td>
<select name="searchProjectId" id="searchProjectId" style="width:80px;"></select> <select name="searchProjectId" id="searchProjectId" style="width:80px;"></select>
</td> </td>
@@ -62,7 +62,7 @@
<form id="depotHeadFM" method="post" novalidate> <form id="depotHeadFM" method="post" novalidate>
<table> <table>
<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:120px;"></select>
</td> </td>
@@ -118,7 +118,7 @@
closed="true" modal="true" cache="false" collapsible="false" closable="true"> closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table> <table>
<tr> <tr>
<td>仓　库：</td> <td>发货仓库：</td>
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:120px;">
<span id="ProjectIdShow"></span> <span id="ProjectIdShow"></span>
</td> </td>

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

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false"> <div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable"> <table id="searchTable">
<tr> <tr>
<td>仓库：</td> <td>收货仓库：</td>
<td> <td>
<select name="searchProjectId" id="searchProjectId" style="width:80px;"></select> <select name="searchProjectId" id="searchProjectId" style="width:80px;"></select>
</td> </td>
@@ -62,7 +62,7 @@
<form id="depotHeadFM" method="post" novalidate> <form id="depotHeadFM" method="post" novalidate>
<table> <table>
<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:120px;"></select>
</td> </td>
@@ -118,7 +118,7 @@
closed="true" modal="true" cache="false" collapsible="false" closable="true"> closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table> <table>
<tr> <tr>
<td>仓　库：</td> <td>收货仓库：</td>
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:120px;">
<span id="ProjectIdShow"></span> <span id="ProjectIdShow"></span>
</td> </td>

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

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false"> <div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable"> <table id="searchTable">
<tr> <tr>
<td>仓库：</td> <td>收货仓库：</td>
<td> <td>
<select name="searchProjectId" id="searchProjectId" style="width:80px;"></select> <select name="searchProjectId" id="searchProjectId" style="width:80px;"></select>
</td> </td>
@@ -35,7 +35,7 @@
<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>
@@ -62,7 +62,7 @@
<form id="depotHeadFM" method="post" novalidate> <form id="depotHeadFM" method="post" novalidate>
<table> <table>
<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:120px;"></select>
</td> </td>
@@ -70,7 +70,7 @@
<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>
@@ -119,7 +119,7 @@
<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>

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

@@ -27,7 +27,7 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false"> <div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable"> <table id="searchTable">
<tr> <tr>
<td>仓库：</td> <td>发货仓库：</td>
<td> <td>
<select name="searchProjectId" id="searchProjectId" style="width:80px;"></select> <select name="searchProjectId" id="searchProjectId" style="width:80px;"></select>
</td> </td>
@@ -62,7 +62,7 @@
<form id="depotHeadFM" method="post" novalidate> <form id="depotHeadFM" method="post" novalidate>
<table> <table>
<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:120px;"></select>
</td> </td>
@@ -111,7 +111,7 @@
closed="true" modal="true" cache="false" collapsible="false" closable="true"> closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table> <table>
<tr> <tr>
<td>仓　库：</td> <td>发货仓库：</td>
<td style="padding:5px;width:120px;"> <td style="padding:5px;width:120px;">
<span id="ProjectIdShow"></span> <span id="ProjectIdShow"></span>
</td> </td>

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

@@ -291,9 +291,9 @@ public class AccountAction extends BaseAction<AccountModel>
for(Account account:dataList) for(Account account:dataList)
{ {
JSONObject item = new JSONObject(); JSONObject item = new JSONObject();
item.put("id", account.getId()); item.put("Id", account.getId());
//结算账户名称 //结算账户名称
item.put("name", account.getName()); item.put("AccountName", account.getName());
dataArray.add(item); dataArray.add(item);
} }
} }

6
src/com/jsh/action/basic/InOutItemAction.java
View File

@@ -308,6 +308,12 @@ public class InOutItemAction extends BaseAction<InOutItemModel>
* 拼接搜索条件 * 拼接搜索条件
*/ */
Map<String,Object> condition = new HashMap<String,Object>(); Map<String,Object> condition = new HashMap<String,Object>();
if(model.getType().equals("in")) {
condition.put("type_s_eq", "收入");
}
else if(model.getType().equals("out")) {
condition.put("type_s_eq", "支出");
}
condition.put("id_s_order", "desc"); condition.put("id_s_order", "desc");
return condition; return condition;
} }

7
src/com/jsh/action/materials/AccountItemAction.java
View File

@@ -1,30 +1,23 @@
package com.jsh.action.materials; package com.jsh.action.materials;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessException;
import com.jsh.base.BaseAction; import com.jsh.base.BaseAction;
import com.jsh.base.Log; import com.jsh.base.Log;
import com.jsh.util.AssetConstants;
import com.jsh.util.JshException;
import com.jsh.model.po.Asset;
import com.jsh.model.po.AccountHead; import com.jsh.model.po.AccountHead;
import com.jsh.model.po.AccountItem; import com.jsh.model.po.AccountItem;
import com.jsh.model.po.Logdetails; import com.jsh.model.po.Logdetails;
import com.jsh.model.po.Account; import com.jsh.model.po.Account;
import com.jsh.model.po.InOutItem; import com.jsh.model.po.InOutItem;
import com.jsh.model.vo.materials.AccountItemModel; import com.jsh.model.vo.materials.AccountItemModel;
import com.jsh.service.materials.AccountHeadIService;
import com.jsh.service.materials.AccountItemIService; import com.jsh.service.materials.AccountItemIService;
import com.jsh.util.PageUtil; import com.jsh.util.PageUtil;
import com.jsh.util.Tools;
/* /*
* 财务明细管理(收支|收付款|转账) * 财务明细管理(收支|收付款|转账)
* @author jishenghua qq:752718920 * @author jishenghua qq:752718920

4
src/com/jsh/action/materials/PersonAction.java
View File

@@ -232,10 +232,6 @@ public class PersonAction extends BaseAction<PersonModel>
personService.find(pageUtil); personService.find(pageUtil);
List<Person> dataList = pageUtil.getPageList(); List<Person> dataList = pageUtil.getPageList();
//开始拼接json数据
// {"total":28,"rows":[
// {"productid":"AV-CB-01","attr1":"Adult Male","itemid":"EST-18"}
// ]}
JSONObject outer = new JSONObject(); JSONObject outer = new JSONObject();
outer.put("total", pageUtil.getTotalCount()); outer.put("total", pageUtil.getTotalCount());
//存放数据json数组 //存放数据json数组

2
src/com/jsh/base/Log.java
View File

@@ -4,7 +4,7 @@ import org.apache.log4j.Logger;
/** /**
* 封装log4j日志信息，打印日志信息类 * 封装log4j日志信息，打印日志信息类
* @author ji/sheng/hua qq_752718920 * @author ji/sheng/hua qq_7527.18920
* @since 2014-01-22 * @since 2014-01-22
*/ */
public class Log public class Log