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

从源更新

Browse Source
This commit is contained in:
qiankunpingtai
2019-11-04 14:18:24 +08:00
parent eb7756542c c13026d3d6
commit 6a0e9ff20f
20 changed files with 364 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/materials/allocation_out_list.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>
@@ -133,5 +134,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

@@ -17,6 +17,7 @@
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/materials/assemble_list.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>

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

@@ -138,5 +138,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

@@ -17,6 +17,7 @@
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/materials/other_in_list.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>
@@ -144,5 +145,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

@@ -17,6 +17,7 @@
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/materials/other_out_list.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>
@@ -137,5 +138,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

@@ -17,6 +17,7 @@
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/materials/purchase_back_list.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>
@@ -53,7 +54,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>
@@ -140,7 +141,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>
@@ -269,5 +270,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

@@ -17,6 +17,7 @@
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/materials/purchase_in_list.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>
@@ -53,7 +54,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>
@@ -155,7 +156,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>
@@ -287,5 +288,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

@@ -198,5 +198,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

@@ -17,6 +17,7 @@
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/materials/retail_back_list.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>
@@ -209,5 +210,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

@@ -17,6 +17,7 @@
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/materials/retail_out_list.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>
@@ -247,5 +248,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

@@ -17,6 +17,7 @@
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/materials/sale_back_list.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>
@@ -53,7 +54,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>
@@ -269,5 +270,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

@@ -200,5 +200,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

@@ -17,6 +17,7 @@
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/materials/sale_out_list.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>
@@ -53,7 +54,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>
@@ -120,7 +121,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>
@@ -147,7 +154,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>
@@ -280,5 +287,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}}