优化 礼品充值和礼品销售

src/main/java/com/jsh/action/materials/DepotHeadAction.java

@@ -723,9 +723,6 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
 
 	private Map<String,Object> getConditionHead_Gift_In() {
 		Map<String,Object> condition = new HashMap<String,Object>();
-		if(model.getProjectId()!=null) {
-			condition.put("AllocationProjectId_n_eq", model.getProjectId());
-		}
 		return condition;
 	}
 

src/main/java/com/jsh/dao/materials/DepotItemDAO.java

@@ -97,16 +97,16 @@ public class DepotItemDAO extends BaseDAO<DepotItem> implements DepotItemIDAO
 		//多表联查,多表连查，此处用到了createSQLQuery，可以随便写sql语句，很方便
 		Query query;
 		StringBuffer queryString = new StringBuffer();
-		queryString.append("select sum(OperNumber) as OperNumber from jsh_depotitem,jsh_depothead  where jsh_depotitem.HeaderId = jsh_depothead.id and SubType='" + subType +"'");
+		queryString.append("select sum(OperNumber) as OperNumber from jsh_depotitem,jsh_depothead  where jsh_depotitem.HeaderId = jsh_depothead.id and jsh_depothead.SubType='" + subType +"'");
 		if(ProjectId!=null) {
 			if(type.equals("in")){
-				queryString.append(" and AllocationProjectId='" + ProjectId +"'"); //礼品充值时
+				queryString.append(" and jsh_depotitem.AnotherDepotId='" + ProjectId +"'"); //礼品充值时
 			}
 			else if(type.equals("out")){
-				queryString.append(" and  DepotId='" + ProjectId +"'");
+				queryString.append(" and  jsh_depotitem.DepotId='" + ProjectId +"'");
 			}
 		}
-		queryString.append(" and MaterialId ="+ MId);
+		queryString.append(" and jsh_depotitem.MaterialId ="+ MId);
 		query = this.getHibernateTemplate().getSessionFactory().getCurrentSession().createSQLQuery(queryString + SearchConditionUtil.getCondition(pageUtil.getAdvSearch()));
 		pageUtil.setTotalCount(query.list().size());
 		pageUtil.setPageList(query.list());

src/main/webapp/js/pages/materials/in_out.js

@@ -474,7 +474,7 @@
 			});
 		}
 		var isShowLastMoneyColumn = false; //是否显示优惠后金额和价税合计,true为隐藏,false为显示
-		if(listSubType == "调拨" || listSubType == "其它" || listSubType == "零售" || listSubType == "零售退货"){
+		if(listSubType == "调拨" || listSubType == "其它" || listSubType == "零售" || listSubType == "零售退货" || listSubType == "礼品充值" || listSubType == "礼品销售"){
 			isShowLastMoneyColumn = true; //隐藏
 		}
 		$('#tableData').datagrid({
@@ -581,7 +581,7 @@
 								loadRatio = thisRatio;
 							}
 						}
-						else if(listSubType === "销售" || listSubType === "销售退货"){
+						else if(listSubType === "销售" || listSubType === "销售退货" || listTitle == "礼品充值" || listTitle == "礼品销售"){
 							unitSetInput = rec.rows[0].FirstOutUnit;
 							if(basicUnit==unitSetInput){
 								loadRatio = 1;
@@ -668,11 +668,36 @@
 		var ratio = 1; //比例
 		var monthTime = getNowFormatMonth();
 		var isShowAnotherDepot = true; //显示对方仓库,true为隐藏,false为显示
+		var depotHeadName = ""; //仓库名称
+		var depotUrl = ""; //仓库接口地址
+		var depotTextField = ""; //仓库下拉名称
+		var anotherDepotHeadName = ""; //对方仓库的列的标题
+		var anotherDepotUrl = ""; //对方仓库接口地址
+		var anotherDepotTextField = "";
 		if(listSubType == "调拨"){
 			isShowAnotherDepot = false; //调拨时候显示对方仓库
+			anotherDepotHeadName = "调入仓库";
+			anotherDepotUrl = path + '/depot/findDepotByUserId.action?UBType=UserDepot&UBKeyId='+kid;
+			anotherDepotTextField = "depotName";
+		}
+		if(listSubType == "礼品充值"){
+			isShowAnotherDepot = false; //礼品充值时候显示礼品卡
+			anotherDepotHeadName = "礼品卡";
+			anotherDepotUrl = path + "/depot/findGiftByType.action?type=1";
+			anotherDepotTextField = "name";
+		}
+		if(listSubType == "礼品销售"){
+			depotHeadName = "礼品卡";
+			depotUrl = path + "/depot/findGiftByType.action?type=1";
+			depotTextField = "name";
+		}
+		else {
+			depotHeadName = "仓库名称";
+			depotUrl = path + '/depot/findDepotByUserId.action?UBType=UserDepot&UBKeyId='+kid;
+			depotTextField = "depotName";
 		}
 		var isShowTaxColumn = false; //是否显示税率相关的列,true为隐藏,false为显示
-		if(listSubType == "调拨" || listSubType == "其它" || listSubType == "零售" || listSubType == "零售退货"){
+		if(listSubType == "调拨" || listSubType == "其它" || listSubType == "零售" || listSubType == "零售退货" || listSubType == "礼品充值" || listSubType == "礼品销售"){
 			isShowTaxColumn = true; //隐藏
 		}
 		$('#materialData').datagrid({
@@ -694,7 +719,7 @@
 			onClickRow: onClickRow,
 			columns:[[
 			  	{ field: 'Id',width:35,align:"center",checkbox:true},
-				{ title: '仓库名称', field: 'DepotId', editor: 'validatebox', width: 90,
+				{ title: depotHeadName, field: 'DepotId', editor: 'validatebox', width: 90,
 					formatter: function (value, row, index) {
 						return row.DepotName;
 					},
@@ -702,9 +727,9 @@
 						type: 'combobox',
 						options: {
 							valueField: 'id',
-							textField: 'depotName',
+							textField: depotTextField,
 							method: 'get',
-							url: path + '/depot/findDepotByUserId.action?UBType=UserDepot&UBKeyId='+kid,
+							url: depotUrl,
 							onSelect:function(rec){
 								var depotId = rec.id;
 								body =$("#depotHeadFM .datagrid-body");
@@ -797,7 +822,7 @@
 															loadRatio = ratio;
 														}
 													}
-													else if(listSubType === "销售" || listSubType === "销售退货"){
+													else if(listSubType === "销售" || listSubType === "销售退货" || listSubType === "礼品充值" || listSubType === "礼品销售"){
 														unitSetInput = res.rows[0].FirstOutUnit;
 														if(basicUnit==unitSetInput){
 															loadRatio = 1;
@@ -837,7 +862,7 @@
 																if(listTitle == "采购入库列表" || listTitle == "销售退货列表" || listTitle == "其它入库列表") {
 																	UnitPrice = basicPresetPriceOne;
 																}
-																else if(listTitle == "销售出库列表" || listTitle == "采购退货列表" || listTitle == "其它出库列表" || listTitle == "调拨出库列表") {
+																else if(listTitle == "销售出库列表" || listTitle == "采购退货列表" || listTitle == "其它出库列表" || listTitle == "调拨出库列表" || listTitle == "礼品充值列表" || listTitle == "礼品销售列表") {
 																	UnitPrice = basicPresetPriceTwo;
 																}
 																body.find("[field='Stock']").find(input).val(stock); //修改库存
@@ -846,7 +871,7 @@
 																if(listTitle == "采购入库列表" || listTitle == "销售退货列表" || listTitle == "其它入库列表") {
 																	UnitPrice = otherPresetPriceOne;
 																}
-																else if(listTitle == "销售出库列表" || listTitle == "采购退货列表" || listTitle == "其它出库列表" || listTitle == "调拨出库列表") {
+																else if(listTitle == "销售出库列表" || listTitle == "采购退货列表" || listTitle == "其它出库列表" || listTitle == "调拨出库列表" || listTitle == "礼品充值列表" || listTitle == "礼品销售列表") {
 																	UnitPrice = otherPresetPriceTwo;
 																}
 																body.find("[field='Stock']").find(input).val((stock/ratio).toFixed(2)); //修改库存
@@ -883,7 +908,7 @@
 														}
 													}
 												}
-												else if(listTitle == "销售出库列表" || listTitle == "采购退货列表" || listTitle == "其它出库列表" || listTitle == "调拨出库列表") {
+												else if(listTitle == "销售出库列表" || listTitle == "采购退货列表" || listTitle == "其它出库列表" || listTitle == "调拨出库列表" || listTitle == "礼品充值列表" || listTitle == "礼品销售列表") {
 													if(res.rows[0].Unit) { //如果存在计量单位信息
 														detailPrice = presetPriceTwo;
 													}
@@ -923,7 +948,7 @@
 		            }
 			    },
 				{ title: '库存',field: 'Stock',editor:'validatebox',width:70},
-				{ title: '调入仓库',field: 'AnotherDepotId',editor:'validatebox',hidden:isShowAnotherDepot,width:90,
+				{ title: anotherDepotHeadName, field: 'AnotherDepotId',editor:'validatebox',hidden:isShowAnotherDepot,width:90,
 					formatter: function (value, row, index) {
 						return row.AnotherDepotName;
 					},
@@ -931,9 +956,9 @@
 						type: 'combobox',
 						options: {
 							valueField: 'id',
-							textField: 'depotName',
+							textField: anotherDepotTextField,
 							method: 'get',
-							url: path + '/depot/findDepotByUserId.action?UBType=UserDepot&UBKeyId='+kid
+							url: anotherDepotUrl
 						}
 					}
 				},
@@ -1018,11 +1043,24 @@
 	//初始化表格数据-商品列表-查看状态
 	function initTableData_material_show(TotalPrice){
 		var isShowAnotherDepot = true; //显示对方仓库,true为隐藏,false为显示
+		var anotherDepotHeadName = ""; //对方仓库的列的标题
+		var depotHeadName = ""; //仓库的列的标题
 		if(listSubType == "调拨"){
 			isShowAnotherDepot = false; //调拨时候显示对方仓库
+			anotherDepotHeadName = "调入仓库";
+		}
+		if(listSubType == "礼品充值"){
+			isShowAnotherDepot = false; //礼品充值时候显示礼品卡
+			anotherDepotHeadName = "礼品卡";
+		}
+		if(listSubType == "礼品销售"){
+			depotHeadName = "礼品卡";
+		}
+		else {
+			depotHeadName = "仓库名称";
 		}
 		var isShowTaxColumn = false; //是否显示税率相关的列,true为隐藏,false为显示
-		if(listSubType == "调拨" || listSubType == "其它" || listSubType == "零售" || listSubType == "零售退货"){
+		if(listSubType == "调拨" || listSubType == "其它" || listSubType == "零售" || listSubType == "零售退货" || listSubType == "礼品充值" || listSubType == "礼品销售"){
 			isShowTaxColumn = true; //隐藏
 		}
 		$('#materialDataShow').datagrid({
@@ -1040,9 +1078,9 @@
 			showFooter: true,
 			onClickRow: onClickRow,
 			columns:[[
-				{ title: '仓库名称',field: 'DepotName',editor:'validatebox',width:90},
+				{ title: depotHeadName,field: 'DepotName',editor:'validatebox',width:90},
 				{ title: '品名(型号)(制造商)(包装)',field: 'MaterialName',width:230},
-				{ title: '调入仓库',field: 'AnotherDepotName',hidden:isShowAnotherDepot,width:90},
+				{ title: anotherDepotHeadName,field: 'AnotherDepotName',hidden:isShowAnotherDepot,width:90},
 				{ title: '单位',field: 'Unit',editor:'validatebox',width:70},
 				{ title: '数量',field: 'OperNumber',editor:'validatebox',width:70},
 				{ title: '单价',field: 'UnitPrice',editor:'validatebox',width:70},
@@ -1747,9 +1785,7 @@
 			return flag;
 		}
 		//保存信息
-		$("#saveDepotHead").unbind().bind({
+		$("#saveDepotHead").off("click").on("click",function(){
-			click:function()
-			{
 			if(!$('#depotHeadFM').form('validate')){
 				return;
 			}
@@ -1836,29 +1872,9 @@
 				var OrganId = null, ProjectId = null,AllocationProjectId = null;
 				var ChangeAmount = $.trim($("#ChangeAmount").val());
 				var TotalPrice = $("#depotHeadFM .datagrid-footer [field='AllPrice'] div").text();
-					if(listSubType === "礼品销售") {
-						ProjectId = $('#GiftId').combobox('getValue'); //礼品卡
-					}
-					else {
-						ProjectId =  $.trim($("#ProjectId").val());
-					}
-					if(listSubType ==="调拨"){
-
-					}
-					else if(listSubType ==="礼品充值"){
-						AllocationProjectId =  $('#GiftId').combobox('getValue'); //礼品卡
-					}
-					if(listSubType === "礼品销售") {
-						OrganId = orgDefaultId;
-					}
-					else if(listSubType ==="礼品充值"){
-						OrganId = null;
-					}
-					else {
 				if($('#OrganId').length){
 					OrganId = $('#OrganId').combobox('getValue');
 				}
-					}
 				if(listSubType === "采购"||listSubType === "零售退货"||listSubType === "销售退货"){
 					//付款为负数
 					ChangeAmount = 0 - ChangeAmount;
@@ -1986,7 +2002,6 @@
 					}
 				});
 			}
-			}
 		});
 
 		//初始化键盘enter事件
@@ -2424,13 +2439,6 @@
 	}
 
 	function showDepotHeadDetails(pageNo,pageSize){
-		var ProjectId = null;
-		if(listSubType === "礼品销售") {
-			ProjectId = $('#searchGiftId').combobox('getValue'); //礼品卡
-		}
-		else {
-			ProjectId = $.trim($("#searchProjectId").val());
-		}
 		$.ajax({
 			type:"post",
 			url: path + "/depotHead/findBy.action",

src/main/webapp/pages/materials/gift_out_list.jsp

@@ -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>&nbsp;</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="width:70px;">单据日期：</td>
 						<td style="padding:5px">
-					<input id="GiftId" name="GiftId" style="width:120px;" />
+						<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate" style="width:140px;"/>
 						</td>
-                <td>单据日期：</td>
+						<td style="width:70px;">单据编号：</td>
 						<td style="padding:5px">
-                <input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/>
+							<input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
-                </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>
+						<td></td>
+						<td></td>
+						<td style="width:100px;"></td>
 					</tr>
 					<tr>
-	            <td>商品列表：</td>
+						<td colspan="9">
-	            <td colspan="7">
 							<!-- 商品列表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,45 +97,36 @@
 	        <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="width:70px;">单据日期：</td>
-	            <td style="padding:5px;width:120px;">
+					<td style="padding:5px;width:140px;">
-                <span id="ProjectIdShow"></span>
-                </td>
-                <td>单据日期：</td>
-                <td style="padding:5px;width:120px;">
 						<span id="OperTimeShow"></span>
 					</td>
-	            <td>单据编号：</td>
+					<td style="width:70px;">单据编号：</td>
-	            <td style="padding:5px;width:120px;">
+					<td style="padding:5px;width:140px;">
 						<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>
+					<td></td>
+					<td></td>
+					<td style="width:100px;"></td>
 				</tr>
 				<tr>
-	            <td>商品列表：</td>
+					<td colspan="9" style="width: 1130px;">
-	            <td colspan="7">
 						<!-- 商品列表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>

src/main/webapp/pages/materials/gift_recharge_list.jsp

@@ -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>&nbsp;</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="width:70px;">单据日期：</td>
 						<td style="padding:5px">
-                <select name="ProjectId" id="ProjectId" style="width:120px;"></select>
+							<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate" style="width: 140px;"/>
 						</td>
-                <td>单据日期：</td>
+						<td style="width:70px;">单据编号：</td>
 						<td style="padding:5px">
-                <input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/>
+							<input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
-                </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>
+						<td></td>
+						<td></td>
+						<td style="width:100px;"></td>
 					</tr>
 					<tr>
-	            <td>商品列表：</td>
+						<td colspan="9">
-	            <td colspan="7">
 							<!-- 商品列表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,49 +97,36 @@
 	        <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="width:70px;">单据日期：</td>
-	            <td style="padding:5px;width:120px;">
+					<td style="padding:5px;width:140px;">
-                <span id="ProjectIdShow"></span>
-                </td>
-                <td>单据日期：</td>
-                <td style="padding:5px;width:120px;">
 						<span id="OperTimeShow"></span>
 					</td>
-                <td>经手人：</td>
+					<td style="width:70px;">单据编号：</td>
-	            <td style="padding:5px">
+					<td style="padding:5px;width:140px;">
-	            <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>
+					<td></td>
+					<td></td>
+					<td style="width:100px;"></td>
 				</tr>
 				<tr>
-	            <td>商品列表：</td>
+					<td colspan="9" style="width: 1130px;">
-	            <td colspan="7">
 						<!-- 商品列表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>

src/main/webapp/pages/reports/gift_manage_report.jsp

@@ -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) {