优化 礼品充值和礼品销售
This commit is contained in:
季圣华
@@ -33,21 +33,17 @@
|
||||
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
|
||||
<table id="searchTable">
|
||||
<tr>
|
||||
<td>礼品卡：</td>
|
||||
<td>
|
||||
<input id="searchGiftId" name="searchGiftId" style="width:110px;" />
|
||||
</td>
|
||||
<td>单据编号：</td>
|
||||
<td>
|
||||
<input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/>
|
||||
<input type="text" name="searchNumber" id="searchNumber" 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> </td>
|
||||
<td>
|
||||
@@ -63,45 +59,36 @@
|
||||
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
|
||||
</div>
|
||||
|
||||
<div id="depotHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
|
||||
<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:50px"
|
||||
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
|
||||
<form id="depotHeadFM" method="post" novalidate>
|
||||
<table>
|
||||
<tr>
|
||||
<td>礼品卡：</td>
|
||||
<td style="padding:5px">
|
||||
<input id="GiftId" name="GiftId" style="width:120px;" />
|
||||
</td>
|
||||
<td>单据日期：</td>
|
||||
<td style="padding:5px">
|
||||
<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/>
|
||||
</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: 120px;"/>
|
||||
</td>
|
||||
<td style="width:50px;"></td>
|
||||
<td style="padding:5px;width:120px;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>经手人：</td>
|
||||
<td style="padding:5px">
|
||||
<select name="HandsPersonId" id="HandsPersonId" style="width:120px;"></select>
|
||||
</td>
|
||||
<td>单据备注：</td>
|
||||
<td style="padding:5px" colspan="3">
|
||||
<input name="Remark" id="Remark" class="easyui-validatebox" style="width:320px;"/>
|
||||
</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>商品列表：</td>
|
||||
<td colspan="7">
|
||||
<!-- 商品列表table -->
|
||||
<table id="materialData" style="top:100px;border-bottom-color:#FFFFFF"></table>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="width:70px;">单据日期：</td>
|
||||
<td style="padding:5px">
|
||||
<input type="text" name="OperTime" id="OperTime" 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">
|
||||
<input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
|
||||
</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td style="width:100px;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="9">
|
||||
<!-- 商品列表table -->
|
||||
<table id="materialData" 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>
|
||||
</table>
|
||||
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
|
||||
</form>
|
||||
@@ -110,46 +97,37 @@
|
||||
<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>
|
||||
</div>
|
||||
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
|
||||
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:50px"
|
||||
closed="true" modal="true" cache="false" collapsible="false" closable="true">
|
||||
<table>
|
||||
<tr>
|
||||
<td>发货仓库：</td>
|
||||
<td style="padding:5px;width:120px;">
|
||||
<span id="ProjectIdShow"></span>
|
||||
</td>
|
||||
<td>单据日期：</td>
|
||||
<td style="padding:5px;width:120px;">
|
||||
<span id="OperTimeShow"></span>
|
||||
</td>
|
||||
<td>单据编号：</td>
|
||||
<td style="padding:5px;width:120px;">
|
||||
<span id="NumberShow"></span>
|
||||
</td>
|
||||
<td style="width:50px;"></td>
|
||||
<td style="padding:5px;width:120px;">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>经手人：</td>
|
||||
<td style="padding:5px">
|
||||
<span id="HandsPersonIdShow"></span>
|
||||
</td>
|
||||
<td>单据备注：</td>
|
||||
<td style="padding:5px" colspan="3">
|
||||
<span id="RemarkShow"></span>
|
||||
</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>商品列表：</td>
|
||||
<td colspan="7">
|
||||
<!-- 商品列表table -->
|
||||
<table id="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<table>
|
||||
<tr>
|
||||
<td style="width:70px;">单据日期：</td>
|
||||
<td style="padding:5px;width:140px;">
|
||||
<span id="OperTimeShow"></span>
|
||||
</td>
|
||||
<td style="width:70px;">单据编号：</td>
|
||||
<td style="padding:5px;width:140px;">
|
||||
<span id="NumberShow"></span>
|
||||
</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td style="width:100px;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="9" style="width: 1130px;">
|
||||
<!-- 商品列表table -->
|
||||
<table id="materialDataShow" 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>
|
||||
</table>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@@ -33,21 +33,17 @@
|
||||
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
|
||||
<table id="searchTable">
|
||||
<tr>
|
||||
<td>发货仓库：</td>
|
||||
<td>
|
||||
<select name="searchProjectId" id="searchProjectId" style="width:80px;"></select>
|
||||
</td>
|
||||
<td>单据编号：</td>
|
||||
<td>
|
||||
<input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/>
|
||||
<input type="text" name="searchNumber" id="searchNumber" 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> </td>
|
||||
<td>
|
||||
@@ -63,48 +59,36 @@
|
||||
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
|
||||
</div>
|
||||
|
||||
<div id="depotHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
|
||||
<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:50px"
|
||||
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
|
||||
<form id="depotHeadFM" method="post" novalidate>
|
||||
<table>
|
||||
<tr>
|
||||
<td>发货仓库：</td>
|
||||
<td style="padding:5px">
|
||||
<select name="ProjectId" id="ProjectId" style="width:120px;"></select>
|
||||
</td>
|
||||
<td>单据日期：</td>
|
||||
<td style="padding:5px">
|
||||
<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/>
|
||||
</td>
|
||||
<td>经手人：</td>
|
||||
<td style="padding:5px">
|
||||
<select name="HandsPersonId" id="HandsPersonId" style="width:120px;"></select>
|
||||
</td>
|
||||
<td style="width:50px;"></td>
|
||||
<td style="padding:5px;width:120px;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>礼品卡：</td>
|
||||
<td style="padding:5px">
|
||||
<input id="GiftId" name="GiftId" style="width:120px;" />
|
||||
</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: 120px;"/>
|
||||
</td>
|
||||
<td>单据备注：</td>
|
||||
<td style="padding:5px">
|
||||
<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 120px;"/>
|
||||
</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>商品列表：</td>
|
||||
<td colspan="7">
|
||||
<!-- 商品列表table -->
|
||||
<table id="materialData" style="top:100px;border-bottom-color:#FFFFFF"></table>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="width:70px;">单据日期：</td>
|
||||
<td style="padding:5px">
|
||||
<input type="text" name="OperTime" id="OperTime" 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">
|
||||
<input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
|
||||
</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td style="width:100px;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="9">
|
||||
<!-- 商品列表table -->
|
||||
<table id="materialData" 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>
|
||||
</table>
|
||||
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
|
||||
</form>
|
||||
@@ -113,50 +97,37 @@
|
||||
<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>
|
||||
</div>
|
||||
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
|
||||
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:50px"
|
||||
closed="true" modal="true" cache="false" collapsible="false" closable="true">
|
||||
<table>
|
||||
<tr>
|
||||
<td>发货仓库：</td>
|
||||
<td style="padding:5px;width:120px;">
|
||||
<span id="ProjectIdShow"></span>
|
||||
</td>
|
||||
<td>单据日期：</td>
|
||||
<td style="padding:5px;width:120px;">
|
||||
<span id="OperTimeShow"></span>
|
||||
</td>
|
||||
<td>经手人：</td>
|
||||
<td style="padding:5px">
|
||||
<span id="HandsPersonIdShow"></span>
|
||||
</td>
|
||||
<td style="width:50px;"></td>
|
||||
<td style="padding:5px;width:120px;">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>礼品卡：</td>
|
||||
<td style="padding:5px;width:120px;">
|
||||
<span id="AllocationProjectIdShow"></span>
|
||||
</td>
|
||||
<td>单据编号：</td>
|
||||
<td style="padding:5px">
|
||||
<span id="NumberShow"></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="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<table>
|
||||
<tr>
|
||||
<td style="width:70px;">单据日期：</td>
|
||||
<td style="padding:5px;width:140px;">
|
||||
<span id="OperTimeShow"></span>
|
||||
</td>
|
||||
<td style="width:70px;">单据编号：</td>
|
||||
<td style="padding:5px;width:140px;">
|
||||
<span id="NumberShow"></span>
|
||||
</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td style="width:100px;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="9" style="width: 1130px;">
|
||||
<!-- 商品列表table -->
|
||||
<table id="materialDataShow" 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>
|
||||
</table>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@@ -174,9 +174,6 @@
|
||||
type:"post",
|
||||
url: "<%=path %>/depotHead/findGiftReport.action",
|
||||
dataType: "json",
|
||||
data: ({
|
||||
ProjectId: searchGiftId
|
||||
}),
|
||||
success: function (res) {
|
||||
var HeadIds = res.HeadIds;
|
||||
if(HeadIds) {
|
||||
|
||||
Reference in New Issue
Block a user