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

修改收款、付款、收入、支出、转账五张单据

Browse Source
This commit is contained in:
季圣华
2017-01-14 03:54:42 +08:00
parent eb1fa7f3c9
commit d65a3fe407
5 changed files with 2827 additions and 2845 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,11 +27,11 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>单据号：</td>
<td>单据编号：</td>
<td>
<input type="text" name="searchBillNo" id="searchBillNo" style="width:60px;"/>
</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;"/>
</td>
@@ -59,33 +59,32 @@
<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: 120px;"/>
<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:120px;"/>
</td>
<td>账户：</td>
<td style="padding:5px">
<select id="AccountId" name="AccountId" style="width:120px;"></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:120px;"></select>
<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">
<select name="HandsPersonId" id="HandsPersonId" style="width:120px;"></select>
<select name="HandsPersonId" id="HandsPersonId" style="width:110px;"></select>
</td>
<td>备注：</td>
<td style="width:50px;"></td>
<td style="padding:5px;width:110px;"></td>
</tr>
<tr>
<td>付款账户：</td>
<td style="padding:5px">
<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 120px;"/>
<select id="AccountId" name="AccountId" style="width:110px;"></select>
</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">
<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 110px;"/>
</td>
<td></td>
<td></td>
@@ -110,32 +109,30 @@
<table>
<tr>
<td>单据编号：</td>
<td style="padding:5px;width:120px;">
<td style="padding:5px;width:110px;">
<span id="BillNoShow"></span>
</td>
<td>单据日期：</td>
<td style="padding:5px;width:120px;">
<td style="padding:5px;width:110px;">
<span id="BillTimeShow"></span>
</td>
<td>账户：</td>
<td style="padding:5px;width:120px;">
<span id="AccountIdShow"></span>
</td>
<td>金额：</td>
<td style="padding:5px;width:120px;">
<span id="ChangeAmountShow"></span>
</td>
</tr>
<tr>
<td>单位：</td>
<td style="padding:5px">
<span id="OrganIdShow"></span>
</td>
<td>经手人：</td>
<td style="padding:5px">
<td style="padding:5px;width:110px;">
<span id="HandsPersonIdShow"></span>
</td>
<td>备注：</td>
<td style="width:50px;"></td>
<td style="padding:5px;width:110px;">
</tr>
<tr>
<td>付款账户：</td>
<td style="padding:5px">
<span id="AccountIdShow"></span>
</td>
<td>实付金额：</td>
<td style="padding:5px">
<span id="ChangeAmountShow"></span>
</td>
<td>单据备注：</td>
<td style="padding:5px">
<span id="RemarkShow"></span>
</td>
@@ -170,7 +167,6 @@
initSelectInfo_person(); //经手人信息
initSystemData_account(); //账户数据
initSelectInfo_account(); //账户信息
initSupplier(); //供应商
initTableData();
ininPager();
initForm();
@@ -214,16 +210,6 @@
}
}
//初始化单位信息
function initSupplier()
{
$('#OrganId').combobox({
url: "<%=path%>/supplier/findBySelect_sup.action",
valueField:'id',
textField:'supplier'
});
}
//获取财务员
function initSystemData_person()
{
@@ -653,7 +639,7 @@
BillTime : $.trim($("#BillTime").val()),
AccountId: $.trim($("#AccountId").val()),
ChangeAmount: $.trim($("#ChangeAmount").val()),
OrganId: $('#OrganId').combobox('getValue'),
//OrganId: $('#OrganId').combobox('getValue'),
HandsPersonId: $.trim($("#HandsPersonId").val()),
Remark: $.trim($("#Remark").val()),
clientIp:'<%=clientIp %>'

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

@@ -27,11 +27,11 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>单据号：</td>
<td>单据编号：</td>
<td>
<input type="text" name="searchBillNo" id="searchBillNo" style="width:60px;"/>
</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;"/>
</td>
@@ -59,33 +59,34 @@
<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: 120px;"/>
<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:120px;"/>
<input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:110px;"/>
</td>
<td>账户：</td>
<td>收款账户：</td>
<td style="padding:5px">
<select id="AccountId" name="AccountId" style="width:120px;"></select>
<select id="AccountId" name="AccountId" style="width:110px;"></select>
</td>
<td>金额：</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>往来单位：</td>
<td style="padding:5px">
<select name="OrganId" id="OrganId" style="width:120px;"></select>
<select name="OrganId" id="OrganId" style="width:110px;"></select>
</td>
<td>经手人：</td>
<td style="padding:5px">
<select name="HandsPersonId" id="HandsPersonId" style="width:120px;"></select>
<select name="HandsPersonId" id="HandsPersonId" style="width:110px;"></select>
</td>
<td>备注：</td>
<td>单据备注：</td>
<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: 110px;"/>
</td>
<td></td>
<td></td>
@@ -110,24 +111,24 @@
<table>
<tr>
<td>单据编号：</td>
<td style="padding:5px;width:120px;">
<td style="padding:5px;width:110px;">
<span id="BillNoShow"></span>
</td>
<td>单据日期：</td>
<td style="padding:5px;width:120px;">
<td style="padding:5px;width:110px;">
<span id="BillTimeShow"></span>
</td>
<td>账户：</td>
<td style="padding:5px;width:120px;">
<td>收款账户：</td>
<td style="padding:5px;width:110px;">
<span id="AccountIdShow"></span>
</td>
<td>金额：</td>
<td style="padding:5px;width:120px;">
<td>收款金额：</td>
<td style="padding:5px;width:110px;">
<span id="ChangeAmountShow"></span>
</td>
</tr>
<tr>
<td>单位：</td>
<td>往来单位：</td>
<td style="padding:5px">
<span id="OrganIdShow"></span>
</td>
@@ -135,7 +136,7 @@
<td style="padding:5px">
<span id="HandsPersonIdShow"></span>
</td>
<td>备注：</td>
<td>单据备注：</td>
<td style="padding:5px">
<span id="RemarkShow"></span>
</td>

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

@@ -27,11 +27,11 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>单据号：</td>
<td>单据编号：</td>
<td>
<input type="text" name="searchBillNo" id="searchBillNo" style="width:60px;"/>
</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;"/>
</td>
@@ -59,33 +59,34 @@
<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: 120px;"/>
<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:120px;"/>
<input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:110px;"/>
</td>
<td>账户：</td>
<td>付款账户：</td>
<td style="padding:5px">
<select id="AccountId" name="AccountId" style="width:120px;"></select>
<select id="AccountId" name="AccountId" style="width:110px;"></select>
</td>
<td>金额：</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>往来单位：</td>
<td style="padding:5px">
<select name="OrganId" id="OrganId" style="width:120px;"></select>
<select name="OrganId" id="OrganId" style="width:110px;"></select>
</td>
<td>经手人：</td>
<td style="padding:5px">
<select name="HandsPersonId" id="HandsPersonId" style="width:120px;"></select>
<select name="HandsPersonId" id="HandsPersonId" style="width:110px;"></select>
</td>
<td>备注：</td>
<td>单据备注：</td>
<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: 110px;"/>
</td>
<td></td>
<td></td>
@@ -110,24 +111,24 @@
<table>
<tr>
<td>单据编号：</td>
<td style="padding:5px;width:120px;">
<td style="padding:5px;width:110px;">
<span id="BillNoShow"></span>
</td>
<td>单据日期：</td>
<td style="padding:5px;width:120px;">
<td style="padding:5px;width:110px;">
<span id="BillTimeShow"></span>
</td>
<td>账户：</td>
<td style="padding:5px;width:120px;">
<td>付款账户：</td>
<td style="padding:5px;width:110px;">
<span id="AccountIdShow"></span>
</td>
<td>金额：</td>
<td style="padding:5px;width:120px;">
<td>付款金额：</td>
<td style="padding:5px;width:110px;">
<span id="ChangeAmountShow"></span>
</td>
</tr>
<tr>
<td>单位：</td>
<td>往来单位：</td>
<td style="padding:5px">
<span id="OrganIdShow"></span>
</td>
@@ -135,7 +136,7 @@
<td style="padding:5px">
<span id="HandsPersonIdShow"></span>
</td>
<td>备注：</td>
<td>单据备注：</td>
<td style="padding:5px">
<span id="RemarkShow"></span>
</td>

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

@@ -27,11 +27,11 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>单据号：</td>
<td>单据编号：</td>
<td>
<input type="text" name="searchBillNo" id="searchBillNo" style="width:60px;"/>
</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;"/>
</td>
@@ -59,33 +59,32 @@
<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: 120px;"/>
<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:120px;"/>
<input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:110px;"/>
</td>
<td>账户：</td>
<td>优惠金额：</td>
<td style="padding:5px">
<select id="AccountId" name="AccountId" style="width:120px;"></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>
<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>付款单位：</td>
<td style="padding:5px">
<select name="OrganId" id="OrganId" style="width:120px;"></select>
<select name="OrganId" id="OrganId" style="width:110px;"></select>
</td>
<td>经手人：</td>
<td style="padding:5px">
<select name="HandsPersonId" id="HandsPersonId" style="width:120px;"></select>
<select name="HandsPersonId" id="HandsPersonId" style="width:110px;"></select>
</td>
<td>备注：</td>
<td>单据备注：</td>
<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: 110px;"/>
</td>
<td></td>
<td></td>
@@ -117,17 +116,15 @@
<td style="padding:5px;width:120px;">
<span id="BillTimeShow"></span>
</td>
<td>账户：</td>
<td style="padding:5px;width:120px;">
<span id="AccountIdShow"></span>
</td>
<td>金额：</td>
<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>付款单位：</td>
<td style="padding:5px">
<span id="OrganIdShow"></span>
</td>
@@ -135,7 +132,7 @@
<td style="padding:5px">
<span id="HandsPersonIdShow"></span>
</td>
<td>备注：</td>
<td>单据备注：</td>
<td style="padding:5px">
<span id="RemarkShow"></span>
</td>

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

@@ -27,11 +27,11 @@
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>单据号：</td>
<td>单据编号：</td>
<td>
<input type="text" name="searchBillNo" id="searchBillNo" style="width:60px;"/>
</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;"/>
</td>
@@ -59,33 +59,32 @@
<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: 120px;"/>
<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:120px;"/>
<input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:110px;"/>
</td>
<td>账户：</td>
<td>优惠金额：</td>
<td style="padding:5px">
<select id="AccountId" name="AccountId" style="width:120px;"></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>
<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>收款单位：</td>
<td style="padding:5px">
<select name="OrganId" id="OrganId" style="width:120px;"></select>
<select name="OrganId" id="OrganId" style="width:110px;"></select>
</td>
<td>经手人：</td>
<td style="padding:5px">
<select name="HandsPersonId" id="HandsPersonId" style="width:120px;"></select>
<select name="HandsPersonId" id="HandsPersonId" style="width:110px;"></select>
</td>
<td>备注：</td>
<td>单据备注：</td>
<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: 110px;"/>
</td>
<td></td>
<td></td>
@@ -110,24 +109,22 @@
<table>
<tr>
<td>单据编号：</td>
<td style="padding:5px;width:120px;">
<td style="padding:5px;width:110px;">
<span id="BillNoShow"></span>
</td>
<td>单据日期：</td>
<td style="padding:5px;width:120px;">
<td style="padding:5px;width:110px;">
<span id="BillTimeShow"></span>
</td>
<td>账户：</td>
<td style="padding:5px;width:120px;">
<span id="AccountIdShow"></span>
</td>
<td>金额：</td>
<td style="padding:5px;width:120px;">
<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>收款单位：</td>
<td style="padding:5px">
<span id="OrganIdShow"></span>
</td>
@@ -135,7 +132,7 @@
<td style="padding:5px">
<span id="HandsPersonIdShow"></span>
</td>
<td>备注：</td>
<td>单据备注：</td>
<td style="padding:5px">
<span id="RemarkShow"></span>
</td>