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

增加结算账户在单据界面的新增功能

Browse Source
This commit is contained in:
季圣华
2019-11-03 00:12:16 +08:00
parent f832857445
commit 9405f29aed
16 changed files with 330 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erp_web/pages/materials/allocation_out_list.html
View File

@@ -16,6 +16,7 @@
<script src="/js/handlebars.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>
</head>
@@ -132,5 +133,6 @@
<a href="javascript:void(0)" id="cancelDepotHeadShow" class="easyui-linkbutton" iconCls="icon-cancel"
onclick="javascript:$('#depotHeadDlgShow').dialog('close')">取消</a>
</div>
<div id="depot"></div>
</body>
</html>

2
erp_web/pages/materials/assemble_list.html
View File

@@ -16,6 +16,7 @@
<script src="/js/handlebars.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>
</head>
@@ -131,5 +132,6 @@
<a href="javascript:void(0)" id="cancelDepotHeadShow" class="easyui-linkbutton" iconCls="icon-cancel"
onclick="javascript:$('#depotHeadDlgShow').dialog('close')">取消</a>
</div>
<div id="depot"></div>
</body>
</html>

1
erp_web/pages/materials/disassemble_list.html
View File

@@ -132,5 +132,6 @@
<a href="javascript:void(0)" id="cancelDepotHeadShow" class="easyui-linkbutton" iconCls="icon-cancel"
onclick="javascript:$('#depotHeadDlgShow').dialog('close')">取消</a>
</div>
<div id="depot"></div>
</body>
</html>

2
erp_web/pages/materials/other_in_list.html
View File

@@ -16,6 +16,7 @@
<script src="/js/handlebars.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>
</head>
@@ -143,5 +144,6 @@
onclick="javascript:$('#depotHeadDlgShow').dialog('close')">取消</a>
</div>
<div id="supplier"></div>
<div id="depot"></div>
</body>
</html>

2
erp_web/pages/materials/other_out_list.html
View File

@@ -16,6 +16,7 @@
<script src="/js/handlebars.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>
</head>
@@ -136,5 +137,6 @@
<a href="javascript:void(0)" id="cancelDepotHeadShow" class="easyui-linkbutton" iconCls="icon-cancel"
onclick="javascript:$('#depotHeadDlgShow').dialog('close')">取消</a>
</div>
<div id="depot"></div>
</body>
</html>

6
erp_web/pages/materials/purchase_back_list.html
View File

@@ -16,6 +16,7 @@
<script src="/js/handlebars.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>
</head>
@@ -52,7 +53,7 @@
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
<form id="depotHeadFM" method="post" novalidate>
<table>
@@ -139,7 +140,7 @@
<a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel"
onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
</div>
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
@@ -268,5 +269,6 @@
<a href="javascript:void(0)" id="saveOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
</div>
<div id="depot"></div>
</body>
</html>

6
erp_web/pages/materials/purchase_in_list.html
View File

@@ -16,6 +16,7 @@
<script src="/js/handlebars.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>
</head>
@@ -52,7 +53,7 @@
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
<form id="depotHeadFM" method="post" novalidate>
<table>
@@ -154,7 +155,7 @@
<a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel"
onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
</div>
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
@@ -286,5 +287,6 @@
</div>
<div id="supplier"></div>
<div id="depot"></div>
<div id="account"></div>
</body>
</html>

1
erp_web/pages/materials/purchase_orders_list.html
View File

@@ -197,5 +197,6 @@
<a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
</div>
<div id="supplier"></div>
<div id="depot"></div>
</body>
</html>

2
erp_web/pages/materials/retail_back_list.html
View File

@@ -16,6 +16,7 @@
<script src="/js/handlebars.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>
</head>
@@ -208,5 +209,6 @@
<a href="javascript:void(0)" id="cancelDepotHeadShow" class="easyui-linkbutton" iconCls="icon-cancel"
onclick="javascript:$('#depotHeadDlgShow').dialog('close')">取消</a>
</div>
<div id="depot"></div>
</body>
</html>

2
erp_web/pages/materials/retail_out_list.html
View File

@@ -16,6 +16,7 @@
<script src="/js/handlebars.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>
</head>
@@ -246,5 +247,6 @@
<a href="javascript:void(0)" id="cancelDepotHeadAccountDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
</div>
<div id="supplier"></div>
<div id="depot"></div>
</body>
</html>

6
erp_web/pages/materials/sale_back_list.html
View File

@@ -16,6 +16,7 @@
<script src="/js/handlebars.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>
</head>
@@ -52,7 +53,7 @@
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
<form id="depotHeadFM" method="post" novalidate>
<table>
@@ -138,7 +139,7 @@
<a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel"
onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
</div>
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
@@ -268,5 +269,6 @@
<a href="javascript:void(0)" id="saveOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
</div>
<div id="depot"></div>
</body>
</html>

1
erp_web/pages/materials/sale_orders_list.html
View File

@@ -199,5 +199,6 @@
<a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
</div>
<div id="supplier"></div>
<div id="depot"></div>
</body>
</html>

15
erp_web/pages/materials/sale_out_list.html
View File

@@ -16,6 +16,7 @@
<script src="/js/handlebars.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>
</head>
@@ -52,7 +53,7 @@
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
<form id="depotHeadFM" method="post" novalidate>
<table>
@@ -119,7 +120,13 @@
<tr>
<td>结算账户：</td>
<td style="padding:5px">
<select name="AccountId" id="AccountId" style="width:120px;"></select>
<div class="account-list">
<select name="AccountId" id="AccountId" style="width:110px;"></select>
</div>
<div class="add-account-btn">
<img id="addAccount" src="/js/easyui-1.3.5/themes/icons/edit_add.png"
style="cursor: pointer;" alt="增加结算账户" title="增加结算账户"/>
</div>
<img class="many-account-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"
style="display: none;"/>
</td>
@@ -146,7 +153,7 @@
<a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel"
onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
</div>
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
@@ -279,5 +286,7 @@
<a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
</div>
<div id="supplier"></div>
<div id="depot"></div>
<div id="account"></div>
</body>
</html>

32
erp_web/pages/template/base.html
View File

@@ -141,4 +141,36 @@
<a href="javascript:void(0)" id="saveDepot">保存</a>
<a href="javascript:void(0)" id="cancelDepot" onclick="javascript:$('#depotDlg').dialog('close')">取消</a>
</div>
{{/if}}
{{#if accountSelect}}
<div id="accountDlg" style="width:380px;padding:10px 20px" buttons="#accountDlgBtn">
<form id="accountFM">
<table>
<tr>
<td>名称</td>
<td style="padding:5px">
<input name="name" id="name" style="width: 230px;height: 20px"/>
</td>
</tr>
<tr>
<td>编号</td>
<td style="padding:5px">
<input name="serialNo" id="serialNo" style="width: 230px;height: 20px"/>
</td>
</tr>
<tr>
<td>期初金额</td>
<td style="padding:5px">
<input name="initialAmount" id="initialAmount" style="width: 230px;height: 20px"></input>
</td>
</tr>
</table>
</form>
</div>
<div id="accountDlgBtn">
<a href="javascript:void(0)" id="saveAccount" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelAccount" iconCls="icon-cancel"
onclick="javascript:$('#accountDlg').dialog('close')">取消</a>
</div>
{{/if}}