gyzz/openerp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改财务模块

Browse Source
This commit is contained in:
季圣华 2017-10-09 00:09:41 +08:00
parent e7782312de
commit dcc72c440c
9 changed files with 521 additions and 538 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sql/jsh_erp.sql
View File

File diff suppressed because one or more lines are too long

6
src/main/java/com/jsh/action/materials/AccountHeadAction.java
View File

@ -79,7 +79,7 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
accountHead.setBillNo(model.getBillNo());
try
{
accountHead.setBillTime(new Timestamp(Tools.parse(model.getBillTime(), "yyyy-MM-dd").getTime()));
accountHead.setBillTime(new Timestamp(Tools.parse(model.getBillTime(), "yyyy-MM-dd HH:mm:ss").getTime()));
}
catch (ParseException e)
{
@ -165,7 +165,7 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
accountHead.setBillNo(model.getBillNo());
try
{
accountHead.setBillTime(new Timestamp(Tools.parse(model.getBillTime(), "yyyy-MM-dd").getTime()));
accountHead.setBillTime(new Timestamp(Tools.parse(model.getBillTime(), "yyyy-MM-dd HH:mm:ss").getTime()));
}
catch (ParseException e)
{
@ -260,7 +260,7 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
item.put("AccountId", accountHead.getAccountId()==null?"":accountHead.getAccountId().getId());
item.put("AccountName", accountHead.getAccountId()==null?"":accountHead.getAccountId().getName());
item.put("BillNo", accountHead.getBillNo());
item.put("BillTime", Tools.getCurrentMonth(accountHead.getBillTime()));
item.put("BillTime", Tools.getCenternTime(accountHead.getBillTime()));
item.put("ChangeAmount", accountHead.getChangeAmount()==null?"":Math.abs(accountHead.getChangeAmount()));
item.put("TotalPrice", accountHead.getTotalPrice()==null?"":Math.abs(accountHead.getTotalPrice()));
item.put("Remark", accountHead.getRemark());

28
src/main/webapp/js/pages/financial/financial_base.js
View File

@ -239,7 +239,7 @@
},
{ field: 'OrganId',width:5, hidden:true},
{ title: '单据编号',field: 'BillNo',width:140},
{ title: '单据时间 ',field: 'BillTime',width:100},
{ title: '单据时间 ',field: 'BillTime',width:140},
{ title: '合计',field: 'TotalPrice',width:80},
{ title: '备注',field: 'Remark',width:100}
]],
@ -274,7 +274,7 @@
//初始化表格数据-明细列表-编辑状态
function initTableData_account(type,TotalPrice){
$('#accountData').datagrid({
height:300,
height:280,
rownumbers: false,
//动画效果
animate:false,
@ -282,17 +282,14 @@
singleSelect : true,
collapsible:false,
selectOnCheck:false,
//fitColumns:true,
//单击行是否选中
//checkOnSelect : false,
pagination: true,
checkOnSelect : false,
pagination: false,
//交替出现背景
striped : true,
showFooter: true,
//loadFilter: pagerFilter,
onClickRow: onClickRow,
pageSize: 50,
pageList: [50,100,150],
columns:[[
{ field: 'Id',width:35,align:"center",checkbox:true},
{ title: payTypeTitle,field: 'InOutItemId',width:230,hidden:itemType,
@ -323,7 +320,7 @@
}
}
},
{ title: '金额',field: 'EachAmount',editor:'validatebox',width:50},
{ title: '金额',field: 'EachAmount',editor:'validatebox',width:70},
{ title: '备注',field: 'Remark',editor:'validatebox',width:150}
]],
toolbar:[
@ -387,7 +384,7 @@
//初始化表格数据-明细列表-查看状态
function initTableData_account_show(TotalPrice){
$('#accountDataShow').datagrid({
height:300,
height:280,
rownumbers: true,
//动画效果
animate:false,
@ -395,21 +392,18 @@
singleSelect : true,
collapsible:false,
selectOnCheck:false,
//fitColumns:true,
//单击行是否选中
//checkOnSelect : false,
pagination: true,
checkOnSelect : false,
pagination: false,
//交替出现背景
striped : true,
showFooter: true,
//loadFilter: pagerFilter,
onClickRow: onClickRow,
pageSize: 50,
pageList: [50,100,150],
columns:[[
{ title: payTypeTitle, field: 'InOutItemName', width:230, hidden:itemType},
{ title: '账户名称', field: 'AccountName', width:230, hidden:moneyType},
{ title: '金额',field: 'EachAmount',width:50},
{ title: '金额',field: 'EachAmount',width:70},
{ title: '备注',field: 'Remark',width:150}
]],
onLoadError:function()
@ -606,8 +600,8 @@
function addAccountHead(){
$("#clientIp").val(clientIp);
$('#accountHeadFM').form('clear');
var thisDate = getNowFormatDate(); //当前日期
$("#BillTime").val(thisDate);
var thisDateTime = getNowFormatDateTime(); //当前时间
$("#BillTime").val(thisDateTime);
var thisNumber = getNowFormatDateNum(); //根据时间生成编号
$("#BillNo").val(amountNum + thisNumber).focus();
var addTitle = listTitle.replace("列表","信息");

119
src/main/webapp/pages/financial/advance_in.jsp
View File

@ -34,15 +34,15 @@
<tr>
<td>单据编号：</td>
<td>
<input type="text" name="searchBillNo" id="searchBillNo" style="width:60px;"/>
<input type="text" name="searchBillNo" id="searchBillNo" style="width:100px;"/>
</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:100px;"/>
</td>
<td>-</td>
<td>
<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
</td>
<td>&nbsp;</td>
<td>
@ -58,43 +58,44 @@
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="accountHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
<div id="accountHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
<form id="accountHeadFM" method="post" novalidate>
<table>
<tr>
<td>单据编号：</td>
<td style="padding:5px">
<input name="BillNo" id="BillNo" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 110px;"/>
</td>
<td>单据日期：</td>
<td style="padding:5px">
<input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:110px;"/>
</td>
<td>优惠金额：</td>
<td style="padding:5px">
<input type="text" name="ChangeAmount" id="ChangeAmount" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 110px;"></input>
</td>
<td>经手人：</td>
<td style="padding:5px;">
<select name="HandsPersonId" id="HandsPersonId" style="width:110px;"></select>
</td>
</tr>
<tr>
<td>付款会员：</td>
<td style="padding:5px">
<td style="width:60px;">付款会员：</td>
<td style="padding:5px;width:170px;">
<select name="OrganId" id="OrganId" style="width:110px;"></select>
</td>
<td>单据备注：</td>
<td style="padding:5px" colspan="5">
<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 475px;"/>
<td style="width:70px;">经手人：</td>
<td style="padding:5px;width:170px;">
<select name="HandsPersonId" id="HandsPersonId" style="width:110px;"></select>
</td>
<td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:170px;">
<input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate" style="width:140px;"/>
</td>
<td style="width:80px;">单据编号：</td>
<td style="padding:5px;width:170px;">
<input name="BillNo" id="BillNo" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
</td>
<td style="width:100px;"></td>
</tr>
<tr>
<td colspan="9">
<!-- 单据列表table -->
<table id="accountData" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
<tr>
<td>单据明细：</td>
<td colspan="7">
<!-- 单据列表table -->
<table id="accountData" style="top:100px;border-bottom-color:#FFFFFF"></table>
<td colspan="9">
<textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息" style="width: 1130px; height:35px;"></textarea>
</td>
</tr>
<tr>
<td>优惠金额：</td>
<td style="padding:5px">
<input type="text" name="ChangeAmount" id="ChangeAmount" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 110px;" />
</td>
</tr>
</table>
@ -105,43 +106,45 @@
<a href="javascript:void(0)" id="saveAccountHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelAccountHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#accountHeadDlg').dialog('close')">取消</a>
</div>
<div id="accountHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
<div id="accountHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
<td>单据编号：</td>
<td style="padding:5px;width:120px;">
<span id="BillNoShow"></span>
<td style="width:60px;">付款会员：</td>
<td style="padding:5px;width:140px;">
<span id="OrganIdShow"></span>
</td>
<td>单据日期：</td>
<td style="padding:5px;width:120px;">
<td style="width:70px;">经手人：</td>
<td style="padding:5px;width:130px;">
<span id="HandsPersonIdShow"></span>
</td>
<td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:130px;">
<span id="BillTimeShow"></span>
</td>
<td style="width:80px;">单据编号：</td>
<td style="padding:5px;width:130px;">
<span id="BillNoShow"></span>
</td>
<td style="width:100px;"></td>
</tr>
<tr>
<td colspan="9" style="width: 1130px;">
<!-- 单据列表table -->
<table id="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
<tr>
<td style="width:60px;">单据备注：</td>
<td colspan="8" style="height:35px;">
<span id="RemarkShow" style="width: 1070px; height:35px;"></span>
</td>
</tr>
<tr>
<td>优惠金额：</td>
<td style="padding:5px;width:120px;">
<span id="ChangeAmountShow"></span>
</td>
<td>经手人：</td>
<td style="padding:5px;width:120px;">
<span id="HandsPersonIdShow"></span>
</td>
</tr>
<tr>
<td>付款会员：</td>
<td style="padding:5px">
<span id="OrganIdShow"></span>
</td>
<td>单据备注：</td>
<td style="padding:5px" colspan="5">
<span id="RemarkShow"></span>
</td>
</tr>
<tr>
<td>单据明细：</td>
<td colspan="7">
<!-- 单据列表table -->
<table id="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
</table>
</div>

108
src/main/webapp/pages/financial/giro.jsp
View File

@ -34,15 +34,15 @@
<tr>
<td>单据编号：</td>
<td>
<input type="text" name="searchBillNo" id="searchBillNo" style="width:60px;"/>
<input type="text" name="searchBillNo" id="searchBillNo" style="width:100px;"/>
</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:100px;"/>
</td>
<td>-</td>
<td>
<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
</td>
<td>&nbsp;</td>
<td>
@ -58,25 +58,38 @@
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="accountHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
<div id="accountHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
<form id="accountHeadFM" method="post" novalidate>
<table>
<tr>
<td>单据编号：</td>
<td style="padding:5px">
<input name="BillNo" id="BillNo" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 110px;"/>
</td>
<td>单据日期：</td>
<td style="padding:5px">
<input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:110px;"/>
</td>
<td>经手人：</td>
<td style="padding:5px">
<td style="width:60px;">经手人：</td>
<td style="padding:5px;width:170px;">
<select name="HandsPersonId" id="HandsPersonId" style="width:110px;"></select>
</td>
<td style="width:50px;"></td>
<td style="padding:5px;width:110px;"></td>
<td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:170px;">
<input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate" style="width:140px;"/>
</td>
<td style="width:80px;">单据编号：</td>
<td style="padding:5px;width:170px;">
<input name="BillNo" id="BillNo" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
</td>
<td style="width:70px;"></td>
<td style="padding:5px">
</td>
<td style="width:100px;"></td>
</tr>
<tr>
<td colspan="9">
<!-- 单据列表table -->
<table id="accountData" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
<tr>
<td colspan="9">
<textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息" style="width: 1130px; height:35px;"></textarea>
</td>
</tr>
<tr>
<td>付款账户：</td>
@ -87,19 +100,6 @@
<td style="padding:5px">
<input type="text" name="ChangeAmount" id="ChangeAmount" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 110px;"></input>
</td>
<td>单据备注：</td>
<td style="padding:5px">
<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 110px;"/>
</td>
<td></td>
<td></td>
</tr>
<tr>
<td>单据明细：</td>
<td colspan="7">
<!-- 单据列表table -->
<table id="accountData" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
</table>
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
@ -109,24 +109,37 @@
<a href="javascript:void(0)" id="saveAccountHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelAccountHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#accountHeadDlg').dialog('close')">取消</a>
</div>
<div id="accountHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
<div id="accountHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
<td>单据编号：</td>
<td style="padding:5px;width:110px;">
<span id="BillNoShow"></span>
</td>
<td>单据日期：</td>
<td style="padding:5px;width:110px;">
<span id="BillTimeShow"></span>
</td>
<td>经手人：</td>
<td style="padding:5px;width:110px;">
<td style="width:60px;">经手人：</td>
<td style="padding:5px;width:130px;">
<span id="HandsPersonIdShow"></span>
</td>
<td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:130px;">
<span id="BillTimeShow"></span>
</td>
<td style="width:80px;">单据编号：</td>
<td style="padding:5px;width:130px;">
<span id="BillNoShow"></span>
</td>
<td style="width:50px;"></td>
<td style="padding:5px;width:110px;">
<td style="padding:5px;width:110px;"></td>
<td style="width:100px;"></td>
</tr>
<tr>
<td colspan="9" style="width: 1130px;">
<!-- 单据列表table -->
<table id="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
<tr>
<td style="width:60px;">单据备注：</td>
<td colspan="8" style="height:35px;">
<span id="RemarkShow" style="width: 1070px; height:35px;"></span>
</td>
</tr>
<tr>
<td>付款账户：</td>
@ -137,19 +150,6 @@
<td style="padding:5px">
<span id="ChangeAmountShow"></span>
</td>
<td>单据备注：</td>
<td style="padding:5px">
<span id="RemarkShow"></span>
</td>
<td></td>
<td></td>
</tr>
<tr>
<td>单据明细：</td>
<td colspan="7">
<!-- 单据列表table -->
<table id="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
</table>
</div>

129
src/main/webapp/pages/financial/item_in.jsp
View File

@ -34,15 +34,15 @@
<tr>
<td>单据编号：</td>
<td>
<input type="text" name="searchBillNo" id="searchBillNo" style="width:60px;"/>
<input type="text" name="searchBillNo" id="searchBillNo" style="width:100px;"/>
</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:100px;"/>
</td>
<td>-</td>
<td>
<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
</td>
<td>&nbsp;</td>
<td>
@ -58,49 +58,48 @@
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="accountHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
<div id="accountHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
<form id="accountHeadFM" method="post" novalidate>
<table>
<tr>
<td>单据编号：</td>
<td style="padding:5px">
<input name="BillNo" id="BillNo" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 110px;"/>
<td style="width:60px;">往来单位：</td>
<td style="padding:5px;width:170px;">
<select name="OrganId" id="OrganId" style="width:130px;"></select>
</td>
<td>单据日期：</td>
<td style="padding:5px">
<input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:110px;"/>
<td style="width:70px;">经手人：</td>
<td style="padding:5px;width:170px;">
<select name="HandsPersonId" id="HandsPersonId" style="width:110px;"></select>
</td>
<td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:170px;">
<input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate" style="width:140px;"/>
</td>
<td style="width:70px;">单据编号：</td>
<td style="padding:5px;width:170px;">
<input name="BillNo" id="BillNo" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
</td>
<td style="width:100px;"></td>
</tr>
<tr>
<td colspan="9">
<!-- 单据列表table -->
<table id="accountData" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
<tr>
<td colspan="9">
<textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息" style="width: 1130px; height:35px;"></textarea>
</td>
</tr>
<tr>
<td>收款账户：</td>
<td style="padding:5px">
<select id="AccountId" name="AccountId" style="width:110px;"></select>
</td>
<td>收款金额：</td>
<td>
<input type="text" name="ChangeAmount" id="ChangeAmount" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 60px;"></input>
</td>
</tr>
<tr>
<td>往来单位：</td>
<td style="padding:5px">
<select name="OrganId" id="OrganId" style="width:110px;"></select>
</td>
<td>经手人：</td>
<td style="padding:5px">
<select name="HandsPersonId" id="HandsPersonId" style="width:110px;"></select>
</td>
<td>单据备注：</td>
<td style="padding:5px">
<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 110px;"/>
</td>
<td></td>
<td></td>
</tr>
<tr>
<td>单据明细：</td>
<td colspan="7">
<!-- 单据列表table -->
<table id="accountData" style="top:100px;border-bottom-color:#FFFFFF"></table>
<input type="text" name="ChangeAmount" id="ChangeAmount" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 120px;" />
</td>
</tr>
</table>
@ -111,50 +110,50 @@
<a href="javascript:void(0)" id="saveAccountHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelAccountHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#accountHeadDlg').dialog('close')">取消</a>
</div>
<div id="accountHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
<div id="accountHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
<td>单据编号：</td>
<td style="padding:5px;width:110px;">
<span id="BillNoShow"></span>
<td style="width:60px;">往来单位：</td>
<td style="padding:5px;width:130px;">
<span id="OrganIdShow"></span>
</td>
<td>单据日期：</td>
<td style="padding:5px;width:110px;">
<td style="width:70px;">经手人：</td>
<td style="padding:5px;width:130px;">
<span id="HandsPersonIdShow"></span>
</td>
<td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:130px;">
<span id="BillTimeShow"></span>
</td>
<td style="width:80px;">单据编号：</td>
<td style="padding:5px;width:140px;">
<span id="BillNoShow"></span>
</td>
<td style="width:100px;"></td>
</tr>
<tr>
<td colspan="9" style="width: 1130px;">
<!-- 单据列表table -->
<table id="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
<tr>
<td style="width:60px;">单据备注：</td>
<td colspan="8" style="height:35px;">
<span id="RemarkShow" style="width: 1070px; height:35px;"></span>
</td>
</tr>
<tr>
<td>收款账户：</td>
<td style="padding:5px;width:110px;">
<td style="padding:5px;">
<span id="AccountIdShow"></span>
</td>
<td>收款金额：</td>
<td style="padding:5px;width:110px;">
<td style="padding:5px;">
<span id="ChangeAmountShow"></span>
</td>
</tr>
<tr>
<td>往来单位：</td>
<td style="padding:5px">
<span id="OrganIdShow"></span>
</td>
<td>经手人：</td>
<td style="padding:5px">
<span id="HandsPersonIdShow"></span>
</td>
<td>单据备注：</td>
<td style="padding:5px">
<span id="RemarkShow"></span>
</td>
<td></td>
<td></td>
</tr>
<tr>
<td>单据明细：</td>
<td colspan="7">
<!-- 单据列表table -->
<table id="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
</table>
</div>
</body>

126
src/main/webapp/pages/financial/item_out.jsp
View File

@ -34,15 +34,15 @@
<tr>
<td>单据编号：</td>
<td>
<input type="text" name="searchBillNo" id="searchBillNo" style="width:60px;"/>
<input type="text" name="searchBillNo" id="searchBillNo" style="width:100px;"/>
</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:100px;"/>
</td>
<td>-</td>
<td>
<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
</td>
<td>&nbsp;</td>
<td>
@ -58,49 +58,47 @@
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="accountHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
<div id="accountHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
<form id="accountHeadFM" method="post" novalidate>
<table>
<tr>
<td>单据编号：</td>
<td style="padding:5px">
<input name="BillNo" id="BillNo" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 110px;"/>
<td style="width:60px;">往来单位：</td>
<td style="padding:5px;width:170px;">
<select name="OrganId" id="OrganId" style="width:130px;"></select>
</td>
<td>单据日期：</td>
<td style="padding:5px">
<input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:110px;"/>
<td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:170px;">
<input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate" style="width:140px;"/>
</td>
<td style="width:70px;">单据编号：</td>
<td style="padding:5px;width:170px;">
<input name="BillNo" id="BillNo" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
</td>
<td style="width:70px;"></td>
<td style="padding:5px">
</td>
<td style="width:100px;"></td>
</tr>
<tr>
<td colspan="9">
<!-- 单据列表table -->
<table id="accountData" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
<tr>
<td colspan="9">
<textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息" style="width: 1130px; height:35px;"></textarea>
</td>
</tr>
<tr>
<td>付款账户：</td>
<td style="padding:5px">
<select id="AccountId" name="AccountId" style="width:110px;"></select>
</td>
<td>付款金额：</td>
<td>
<input type="text" name="ChangeAmount" id="ChangeAmount" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 60px;"></input>
</td>
</tr>
<tr>
<td>往来单位：</td>
<td style="padding:5px">
<select name="OrganId" id="OrganId" style="width:110px;"></select>
</td>
<td>经手人：</td>
<td style="padding:5px">
<select name="HandsPersonId" id="HandsPersonId" style="width:110px;"></select>
</td>
<td>单据备注：</td>
<td style="padding:5px">
<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 110px;"/>
</td>
<td></td>
<td></td>
</tr>
<tr>
<td>单据明细：</td>
<td colspan="7">
<!-- 单据列表table -->
<table id="accountData" style="top:100px;border-bottom-color:#FFFFFF"></table>
<input type="text" name="ChangeAmount" id="ChangeAmount" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 120px;" />
</td>
</tr>
</table>
@ -111,50 +109,48 @@
<a href="javascript:void(0)" id="saveAccountHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelAccountHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#accountHeadDlg').dialog('close')">取消</a>
</div>
<div id="accountHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
<div id="accountHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
<td>单据编号：</td>
<td style="padding:5px;width:110px;">
<span id="BillNoShow"></span>
<td style="width:60px;">往来单位：</td>
<td style="padding:5px;width:130px;">
<span id="OrganIdShow"></span>
</td>
<td>单据日期：</td>
<td style="padding:5px;width:110px;">
<td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:130px;">
<span id="BillTimeShow"></span>
</td>
<td style="width:80px;">单据编号：</td>
<td style="padding:5px;width:140px;">
<span id="BillNoShow"></span>
</td>
<td style="width:70px;"></td>
<td style="width:140px;"></td>
<td style="width:100px;"></td>
</tr>
<tr>
<td colspan="9" style="width: 1130px;">
<!-- 单据列表table -->
<table id="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
<tr>
<td style="width:60px;">单据备注：</td>
<td colspan="8" style="height:35px;">
<span id="RemarkShow" style="width: 1070px; height:35px;"></span>
</td>
</tr>
<tr>
<td>付款账户：</td>
<td style="padding:5px;width:110px;">
<td style="padding:5px;">
<span id="AccountIdShow"></span>
</td>
<td>付款金额：</td>
<td style="padding:5px;width:110px;">
<td style="padding:5px;">
<span id="ChangeAmountShow"></span>
</td>
</tr>
<tr>
<td>往来单位：</td>
<td style="padding:5px">
<span id="OrganIdShow"></span>
</td>
<td>经手人：</td>
<td style="padding:5px">
<span id="HandsPersonIdShow"></span>
</td>
<td>单据备注：</td>
<td style="padding:5px">
<span id="RemarkShow"></span>
</td>
<td></td>
<td></td>
</tr>
<tr>
<td>单据明细：</td>
<td colspan="7">
<!-- 单据列表table -->
<table id="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
</table>
</div>
</body>

121
src/main/webapp/pages/financial/money_in.jsp
View File

@ -34,15 +34,15 @@
<tr>
<td>单据编号：</td>
<td>
<input type="text" name="searchBillNo" id="searchBillNo" style="width:60px;"/>
<input type="text" name="searchBillNo" id="searchBillNo" style="width:100px;"/>
</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:100px;"/>
</td>
<td>-</td>
<td>
<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
</td>
<td>&nbsp;</td>
<td>
@ -58,49 +58,46 @@
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="accountHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
<div id="accountHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
<form id="accountHeadFM" method="post" novalidate>
<table>
<tr>
<td>单据编号：</td>
<td style="padding:5px">
<input name="BillNo" id="BillNo" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 110px;"/>
<td style="width:60px;">付款单位：</td>
<td style="padding:5px;width:170px;">
<select name="OrganId" id="OrganId" style="width:130px;"></select>
</td>
<td>单据日期：</td>
<td style="padding:5px">
<input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:110px;"/>
</td>
<td>优惠金额：</td>
<td style="padding:5px">
<input type="text" name="ChangeAmount" id="ChangeAmount" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 110px;"></input>
</td>
<td style="width:50px;"></td>
<td style="padding:5px;width:110px;"></td>
</tr>
<tr>
<td>付款单位：</td>
<td style="padding:5px">
<select name="OrganId" id="OrganId" style="width:110px;"></select>
</td>
<td>经手人：</td>
<td style="padding:5px">
<td style="width:70px;">经手人：</td>
<td style="padding:5px;width:170px;">
<select name="HandsPersonId" id="HandsPersonId" style="width:110px;"></select>
</td>
<td>单据备注：</td>
<td style="padding:5px">
<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 110px;"/>
<td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:170px;">
<input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate" style="width:140px;"/>
</td>
<td></td>
<td></td>
<td style="width:70px;">单据编号：</td>
<td style="padding:5px;width:170px;">
<input name="BillNo" id="BillNo" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
</td>
<td style="width:100px;"></td>
</tr>
<tr>
<td>单据明细：</td>
<td colspan="7">
<td colspan="9">
<!-- 单据列表table -->
<table id="accountData" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
<tr>
<td colspan="9">
<textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息" style="width: 1130px; height:35px;"></textarea>
</td>
</tr>
<tr>
<td>优惠金额：</td>
<td style="padding:5px">
<input type="text" name="ChangeAmount" id="ChangeAmount" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 110px;" />
</td>
</tr>
</table>
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
</form>
@ -109,47 +106,45 @@
<a href="javascript:void(0)" id="saveAccountHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelAccountHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#accountHeadDlg').dialog('close')">取消</a>
</div>
<div id="accountHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
<div id="accountHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
<td>单据编号：</td>
<td style="padding:5px;width:120px;">
<span id="BillNoShow"></span>
<td style="width:60px;">付款单位：</td>
<td style="padding:5px;width:130px;">
<span id="OrganIdShow"></span>
</td>
<td>单据日期：</td>
<td style="padding:5px;width:120px;">
<td style="width:70px;">经手人：</td>
<td style="padding:5px;width:130px;">
<span id="HandsPersonIdShow"></span>
</td>
<td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:130px;">
<span id="BillTimeShow"></span>
</td>
<td style="width:80px;">单据编号：</td>
<td style="padding:5px;width:140px;">
<span id="BillNoShow"></span>
</td>
<td style="width:100px;"></td>
</tr>
<tr>
<td colspan="9" style="width: 1130px;">
<!-- 单据列表table -->
<table id="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
<tr>
<td style="width:60px;">单据备注：</td>
<td colspan="8" style="height:35px;">
<span id="RemarkShow" style="width: 1070px; height:35px;"></span>
</td>
</tr>
<tr>
<td>优惠金额：</td>
<td style="padding:5px;width:120px;">
<span id="ChangeAmountShow"></span>
</td>
<td style="width:50px;"></td>
<td style="padding:5px;width:120px;">
</tr>
<tr>
<td>付款单位：</td>
<td style="padding:5px">
<span id="OrganIdShow"></span>
</td>
<td>经手人：</td>
<td style="padding:5px">
<span id="HandsPersonIdShow"></span>
</td>
<td>单据备注：</td>
<td style="padding:5px">
<span id="RemarkShow"></span>
</td>
<td></td>
<td></td>
</tr>
<tr>
<td>单据明细：</td>
<td colspan="7">
<!-- 单据列表table -->
<table id="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
</table>
</div>

115
src/main/webapp/pages/financial/money_out.jsp
View File

@ -34,15 +34,15 @@
<tr>
<td>单据编号：</td>
<td>
<input type="text" name="searchBillNo" id="searchBillNo" style="width:60px;"/>
<input type="text" name="searchBillNo" id="searchBillNo" style="width:100px;"/>
</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:100px;"/>
</td>
<td>-</td>
<td>
<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
</td>
<td>&nbsp;</td>
<td>
@ -58,49 +58,46 @@
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="accountHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
<div id="accountHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
<form id="accountHeadFM" method="post" novalidate>
<table>
<tr>
<td>单据编号：</td>
<td style="padding:5px">
<input name="BillNo" id="BillNo" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 110px;"/>
<td style="width:60px;">收款单位：</td>
<td style="padding:5px;width:170px;">
<select name="OrganId" id="OrganId" style="width:130px;"></select>
</td>
<td>单据日期：</td>
<td style="padding:5px">
<input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:110px;"/>
</td>
<td>优惠金额：</td>
<td style="padding:5px">
<input type="text" name="ChangeAmount" id="ChangeAmount" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 110px;"></input>
</td>
<td style="width:50px;"></td>
<td style="padding:5px;width:110px;"></td>
</tr>
<tr>
<td>收款单位：</td>
<td style="padding:5px">
<select name="OrganId" id="OrganId" style="width:110px;"></select>
</td>
<td>经手人：</td>
<td style="padding:5px">
<td style="width:70px;">经手人：</td>
<td style="padding:5px;width:170px;">
<select name="HandsPersonId" id="HandsPersonId" style="width:110px;"></select>
</td>
<td>单据备注：</td>
<td style="padding:5px">
<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 110px;"/>
<td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:170px;">
<input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:140px;"/>
</td>
<td></td>
<td></td>
<td style="width:70px;">单据编号：</td>
<td style="padding:5px;width:170px;">
<input name="BillNo" id="BillNo" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
</td>
<td style="width:100px;"></td>
</tr>
<tr>
<td>单据明细：</td>
<td colspan="7">
<td colspan="9">
<!-- 单据列表table -->
<table id="accountData" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
<tr>
<td colspan="9">
<textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息" style="width: 1130px; height:35px;"></textarea>
</td>
</tr>
<tr>
<td>优惠金额：</td>
<td style="padding:5px">
<input type="text" name="ChangeAmount" id="ChangeAmount" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 110px;" />
</td>
</tr>
</table>
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
</form>
@ -109,48 +106,46 @@
<a href="javascript:void(0)" id="saveAccountHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelAccountHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#accountHeadDlg').dialog('close')">取消</a>
</div>
<div id="accountHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
<div id="accountHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
<td>单据编号：</td>
<td style="padding:5px;width:110px;">
<span id="BillNoShow"></span>
</td>
<td>单据日期：</td>
<td style="padding:5px;width:110px;">
<span id="BillTimeShow"></span>
</td>
<td>优惠金额：</td>
<td style="padding:5px;width:110px;">
<span id="ChangeAmountShow"></span>
</td>
<td style="width:50px;"></td>
<td style="padding:5px;width:110px;">
</tr>
<tr>
<td>收款单位：</td>
<td style="padding:5px">
<td style="width:60px;">收款单位：</td>
<td style="padding:5px;width:130px;">
<span id="OrganIdShow"></span>
</td>
<td>经手人：</td>
<td style="padding:5px">
<td style="width:70px;">经手人：</td>
<td style="padding:5px;width:130px;">
<span id="HandsPersonIdShow"></span>
</td>
<td>单据备注：</td>
<td style="padding:5px">
<span id="RemarkShow"></span>
<td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:130px;">
<span id="BillTimeShow"></span>
</td>
<td></td>
<td></td>
<td style="width:80px;">单据编号：</td>
<td style="padding:5px;width:140px;">
<span id="BillNoShow"></span>
</td>
<td style="width:100px;"></td>
</tr>
<tr>
<td>单据明细：</td>
<td colspan="7">
<td colspan="9" style="width: 1130px;">
<!-- 单据列表table -->
<table id="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
<tr>
<td style="width:60px;">单据备注：</td>
<td colspan="8" style="height:35px;">
<span id="RemarkShow" style="width: 1070px; height:35px;"></span>
</td>
</tr>
<tr>
<td>优惠金额：</td>
<td style="padding:5px;width:120px;">
<span id="ChangeAmountShow"></span>
</td>
</tr>
</table>
</div>
</body>