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

新增-零售退货的功能

Browse Source
This commit is contained in:
季圣华
2017-06-21 23:59:13 +08:00
parent 6c9c0bc4a6
commit 8b856182dd
2 changed files with 217 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/webapp/js/pages/materials/in_out.js
View File

@@ -429,7 +429,7 @@
var footer =$("#depotHeadFM .datagrid-footer"); var footer =$("#depotHeadFM .datagrid-footer");
var input = ".datagrid-editable-input"; var input = ".datagrid-editable-input";
body.find("[field='OperNumber']").find(input).val(1); body.find("[field='OperNumber']").find(input).val(1);
if(listSubType == "零售") { if(listSubType == "零售" || listSubType == "零售退货") {
body.find("[field='UnitPrice']").find(input).val(retailPrice); body.find("[field='UnitPrice']").find(input).val(retailPrice);
body.find("[field='AllPrice']").find(input).val(retailPrice); body.find("[field='AllPrice']").find(input).val(retailPrice);
allPrice = retailPrice; allPrice = retailPrice;
@@ -446,7 +446,7 @@
}); });
TotalPrice = TotalPrice + allPrice; TotalPrice = TotalPrice + allPrice;
footer.find("[field='AllPrice']").find("div").text((TotalPrice).toFixed(2)); footer.find("[field='AllPrice']").find("div").text((TotalPrice).toFixed(2));
if(listSubType == "零售"){ if(listSubType == "零售" || listSubType == "零售退货") {
$("#ChangeAmount, #getAmount").val((TotalPrice).toFixed(2)); $("#ChangeAmount, #getAmount").val((TotalPrice).toFixed(2));
$("#backAmount").val(0); $("#backAmount").val(0);
} }
@@ -979,7 +979,7 @@
}); });
TotalPrice = TotalPrice + UnitPrice*OperNumber; TotalPrice = TotalPrice + UnitPrice*OperNumber;
footer.find("[field='AllPrice']").find("div").text((TotalPrice).toFixed(2)); footer.find("[field='AllPrice']").find("div").text((TotalPrice).toFixed(2));
if(listSubType == "零售"){ if(listSubType == "零售" || listSubType == "零售退货") {
$("#ChangeAmount, #getAmount").val((TotalPrice).toFixed(2)); $("#ChangeAmount, #getAmount").val((TotalPrice).toFixed(2));
$("#backAmount").val(0); $("#backAmount").val(0);
} }
@@ -1054,7 +1054,7 @@
}); });
TotalPrice = TotalPrice + UnitPrice*OperNumber; TotalPrice = TotalPrice + UnitPrice*OperNumber;
footer.find("[field='AllPrice']").find("div").text((TotalPrice).toFixed(2)); footer.find("[field='AllPrice']").find("div").text((TotalPrice).toFixed(2));
if(listSubType == "零售"){ if(listSubType == "零售" || listSubType == "零售退货") {
$("#ChangeAmount, #getAmount").val((TotalPrice).toFixed(2)); $("#ChangeAmount, #getAmount").val((TotalPrice).toFixed(2));
$("#backAmount").val(0); $("#backAmount").val(0);
} }
@@ -1072,7 +1072,7 @@
}); });
TotalPrice = TotalPrice + AllPrice; TotalPrice = TotalPrice + AllPrice;
footer.find("[field='AllPrice']").find("div").text((TotalPrice).toFixed(2)); footer.find("[field='AllPrice']").find("div").text((TotalPrice).toFixed(2));
if(listSubType == "零售"){ if(listSubType == "零售" || listSubType == "零售退货") {
$("#ChangeAmount, #getAmount").val((TotalPrice).toFixed(2)); $("#ChangeAmount, #getAmount").val((TotalPrice).toFixed(2));
$("#backAmount").val(0); $("#backAmount").val(0);
} }

191
src/main/webapp/pages/materials/retail_back_list.jsp
View File

@@ -6,7 +6,7 @@
%> %>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>零售退货</title> <title>零售退货</title>
<meta charset="utf-8"> <meta charset="utf-8">
<!-- 指定以IE8的方式来渲染 --> <!-- 指定以IE8的方式来渲染 -->
@@ -15,6 +15,7 @@
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/default/easyui.css"/> <link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/default/easyui.css"/>
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/icon.css"/> <link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/icon.css"/>
<link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" /> <link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" />
<link type="text/css" rel="stylesheet" href="<%=path %>/css/retail_list.css" />
<script src="<%=path %>/js/jquery-1.8.0.min.js"></script> <script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script> <script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script> <script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
@@ -26,13 +27,13 @@
var path = "<%=path%>"; var path = "<%=path%>";
var clientIp = "<%=clientIp%>"; var clientIp = "<%=clientIp%>";
</script> </script>
</head> </head>
<body> <body>
<!-- 查询 --> <!-- 查询 -->
<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>
@@ -55,115 +56,169 @@
</td> </td>
</tr> </tr>
</table> </table>
</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>
<div id="depotHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px" <div id="depotHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true"> closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
<form id="depotHeadFM" method="post" novalidate> <form id="depotHeadFM" method="post" novalidate>
<table> <table>
<tr> <tr>
<td>会员卡号：</td>
<td style="padding:5px">
<input id="OrganId" name="OrganId" style="width:110px;" />
</td>
<td>收货仓库：</td> <td>收货仓库：</td>
<td style="padding:5px"> <td style="padding:5px">
<select name="ProjectId" id="ProjectId" style="width:110px;"></select> <select name="ProjectId" id="ProjectId" style="width:110px;"></select>
</td> </td>
<td>单据编号：</td>
<td style="padding:5px">
<input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 130px;"/>
</td>
<td>单据日期：</td> <td>单据日期：</td>
<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:110px;"/> <input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width: 125px;"/>
</td> </td>
<td>退货单位：</td> </tr>
<td style="padding:5px"> <tr>
<input id="OrganId" name="OrganId" style="width:110px;" /> <td>单据备注：</td>
<td style="padding:5px" colspan="5">
<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 292px;"/>
</td> </td>
<td>经手人：</td> </tr>
<td style="padding:5px"> <tr>
<select name="HandsPersonId" id="HandsPersonId" style="width:110px;"></select> <td colspan="6">
<!-- 商品列表table -->
<table id="materialData" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
<td colspan="2" valign="top">
<table width="100%" class="retail-amount">
<tr>
<td colspan="2">实付金额</td>
</tr>
<tr>
<td colspan="2">
<input id="ChangeAmount" name="ChangeAmount" class="change-amount" readonly="readonly" data-changeamount="0" />
</td>
</tr>
<tr>
<td colspan="2">付款金额</td>
</tr>
<tr>
<td colspan="2">
<input id="getAmount" name="getAmount" onKeypress="return (/[\d.]/.test(String.fromCharCode(event.keyCode)))" class="get-amount" data-changeamount="0" />
</td>
</tr>
<tr>
<td colspan="2">找零</td>
</tr>
<tr>
<td colspan="2">
<input id="backAmount" name="backAmount" class="back-amount" readonly="readonly" data-changeamount="0" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td>付款账户：</td> <td>付款账户：</td>
<td style="padding:5px"> <td>
<select name="AccountId" id="AccountId" style="width:110px;"></select> <select name="AccountId" id="AccountId" style="width: 117px;"></select>
</td>
<td>付款金额：</td>
<td style="padding:5px">
<input id="ChangeAmount" name="ChangeAmount" data-changeamount="0" style="width:110px;" />
</td>
<td>单据编号：</td>
<td style="padding:5px">
<input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 110px;"/>
</td>
<td>单据备注：</td>
<td style="padding:5px">
<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 110px;"/>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>商品列表：</td> <td>经手人：</td>
<td colspan="7"> <td>
<!-- 商品列表table --> <select name="HandsPersonId" id="HandsPersonId" style="width: 117px;"></select>
<table id="materialData" style="top:100px;border-bottom-color:#FFFFFF"></table> </td>
</tr>
</table>
</td> </td>
</tr> </tr>
</table> </table>
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/> <input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
</form> </form>
</div> </div>
<div id="dlg-buttons"> <div id="dlg-buttons">
<a href="javascript:void(0)" id="saveDepotHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a> <a href="javascript:void(0)" id="saveDepotHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a> <a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
</div> </div>
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px" <div id="depotHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
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:110px;">
<span id="ProjectIdShow"></span>
</td>
<td>单据日期：</td>
<td style="padding:5px;width:110px;">
<span id="OperTimeShow"></span>
</td>
<td>退货单位：</td>
<td style="padding:5px;width:110px;"> <td style="padding:5px;width:110px;">
<span id="OrganIdShow"></span> <span id="OrganIdShow"></span>
</td> </td>
<td>经手人：</td> <td>发货仓库：</td>
<td style="padding:5px;width:110px;"> <td style="padding:5px;width:110px;">
<span id="HandsPersonIdShow"></span> <span id="ProjectIdShow"></span>
</td>
<td>单据编号：</td>
<td style="padding:5px;width:130px;">
<span id="NumberShow"></span>
</td>
<td>单据日期：</td>
<td style="padding:5px;width:125px;">
<span id="OperTimeShow"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>付款账户：</td>
<td style="padding:5px;width:110px;">
<span id="AccountIdShow"></span>
</td>
<td>付款金额：</td>
<td style="padding:5px;width:110px;">
<span id="ChangeAmountShow"></span>
</td>
<td>单据编号：</td>
<td style="padding:5px;width:110px;">
<span id="NumberShow"></span>
</td>
<td>单据备注：</td> <td>单据备注：</td>
<td style="padding:5px;width:110px;"> <td style="padding:5px;width:292px;" colspan="5">
<span id="RemarkShow"></span> <span id="RemarkShow"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>商品列表：</td> <td colspan="6">
<td colspan="7">
<!-- 商品列表table --> <!-- 商品列表table -->
<table id="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table> <table id="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td> </td>
<td colspan="2" valign="top">
<table width="100%" class="retail-amount-show">
<tr>
<td colspan="2">实收金额</td>
</tr>
<tr>
<td colspan="2">
<span id="ChangeAmountShow" class="change-amount-show"></span>
</td>
</tr>
<tr>
<td colspan="2">收款金额</td>
</tr>
<tr>
<td colspan="2">
<span id="getAmountShow" class="get-amount-show"></span>
</td>
</tr>
<tr>
<td colspan="2">找零</td>
</tr>
<tr>
<td colspan="2">
<span id="backAmountShow" class="back-amount-show"></span>
</td>
</tr>
<tr>
<td>收款账户：</td>
<td align="left" style="width:110px;">
<span id="AccountIdShow"></span>
</td>
</tr>
<tr>
<td>经手人：</td>
<td align="left" style="width:110px;">
<span id="HandsPersonIdShow"></span>
</td>
</tr> </tr>
</table> </table>
</div> </td>
</body> </tr>
</table>
</div>
</body>
</html> </html>