git-svn-id: https://192.168.57.71/svn/jsgkj@1794 931142cf-59ea-a443-aa0e-51397b428577

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/cghzyxxgl/dcsb/dcsbmain.jsp

@@ -62,15 +62,22 @@
 							<td class="right">当前状态：&nbsp;</td>
 							<td><span id="shztsel"></span></td>
 							
-							<td class="right">作业时间起：&nbsp;</td>
-							<td><input id="d4311" type="text" class="Wdate" name="zysjq"
-								value="${fn:substring(zysjq,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',maxDate: '#F{$dp.$D(\'d4312\',{d:0})}'})">
+							<td class="right">作业时间：&nbsp;</td>
+							<td>
+								<table style="width:90%;">
+									<tr>
+										<td>
+											<input style="width:100%;" id="d4311" type="text" class="Wdate" name="zysjq" value="${fn:substring(zysjq,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',maxDate: '#F{$dp.$D(\'d4312\',{d:0})}'})">
+										</td>
+										<td>
+											<span>~</span>
+										</td>
+										<td>
+											<input style="width:100%;" id="d4312" type="text" class="Wdate" name="zysjz" value="${fn:substring(zysjz,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',minDate: '#F{$dp.$D(\'d4311\',{d:0})}'})">	                
+										</td>
+									</tr>
+								</table>
 							</td>
-							<td class="right">作业时间止：&nbsp;</td>
-							<td><input id="d4312" type="text" class="Wdate" name="zysjz"
-								value="${fn:substring(zysjz,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',minDate: '#F{$dp.$D(\'d4311\',{d:0})}'})">
-							</td>
-							
 						</tr>
 						<tr>
 							<td class="right" colspan="6">

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/cghzyxxgl/dcsbybb/dcsbybbmain.jsp

@@ -67,14 +67,20 @@
 							<td><span id="hwzldydl"></span></td>
 
 							<td class="right">作业时间起：&nbsp;</td>
-							 <td><input id="d4311" type="text" class="Wdate" name="zysjq"
-								value="${fn:substring(zysjq,0,10)}"
-								onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',maxDate: '#F{$dp.$D(\'d4312\',{d:0})}'})">
-							</td>
-							<td class="right">作业时间止：&nbsp;</td>
-							<td><input id="d4312" type="text" class="Wdate" name="zysjz"
-								value="${fn:substring(zysjz,0,10)}"
-								onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',minDate: '#F{$dp.$D(\'d4311\',{d:0})}'})">
+							<td>
+								<table style="width:90%;">
+									<tr>
+										<td>
+											<input style="width:100%" id="d4311" type="text" class="Wdate" name="zysjq" value="${fn:substring(zysjq,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM',maxDate: '#F{$dp.$D(\'d4312\',{d:0})}'})">
+										</td>
+										<td>
+											<span>~</span>
+										</td>
+										<td>
+											<input style="width:100%" id="d4312" type="text" class="Wdate" name="zysjz" value="${fn:substring(zysjz,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM',minDate: '#F{$dp.$D(\'d4311\',{d:0})}'})">
+										</td>
+									</tr>
+								</table>
 							</td>
 
 						</tr>
@@ -105,14 +111,14 @@
 					<table class="main_table" cellpadding="0" cellspacing="0">
 						<tr>
 							<th width="3%">序号</th>
-							<th width="7%">所在港口</th>
-							<th width="7%">所在港区</th>
 							<th width="10%">港口经营人</th>
-							<th width="8%">货物种类第一大类</th>
 							<th width="6%">进出港</th>
 							<th width="6%">内外贸</th>
 							<th width="8%">作业数量（吨）</th>
 							<th width="8%">作业数量（TEU）</th>
+							<th width="8%">货物种类第一大类</th>
+							<th width="7%">所在港口</th>
+							<th width="7%">所在港区</th>
 							<%-- <c:if test="${jyr==null}">
 							<th width="8%">修正作业数量（吨）</th>
 							<th width="8%">修正作业数量（TEU）</th>
@@ -123,14 +129,14 @@
 						<c:forEach items="${list}" var="dcsbybb" varStatus="status">
 							<tr>
 								<td>${status.index+1 }</td>
-								<td>${dcsbybb.szgk }</td>
-								<td>${dcsbybb.szgq }</td>
 								<td>${dcsbybb.ssjyr }</td>
-								<td>${dcsbybb.hwzlzw}</td>
 								<td>${dcsbybb.jcg}</td>
 								<td>${dcsbybb.nwm}</td>
 								<td>${dcsbybb.zysl}</td>
 								<td>${dcsbybb.zyslteu}</td>
+								<td>${dcsbybb.hwzlzw}</td>
+								<td>${dcsbybb.szgk }</td>
+								<td>${dcsbybb.szgq }</td>
 							<%-- 	<c:if test="${jyr==null}">
 								<td>${dcsbybb.zyslxg}</td>
 								<td>${dcsbybb.zyslteuxg}</td>

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/cghzyxxgl/dcsbybb/dcsbybbmain.js

@@ -4,17 +4,6 @@
  */
 $.namespace("dcsbybb.main");
 
-//所在地返回值
-dcsbybb.main.szdbackData = null;
-//所在港口返回值
-dcsbybb.mainszgkbackData = null;
-//所在港区返回值
-dcsbybb.main.szgqbackData = null;
-
-dcsbybb.main.hwzlbackData = null;
-dcsbybb.main.jcgbackData = null;
-dcsbybb.main.nwmbackData = null;
-
 dcsbybb.main.init = function() {
 	dcsbybb.main.$popWin = $('#popWin');
 	// 把form传入，构造翻页控件

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/ctl/DcsbybbCtl.java

@@ -133,7 +133,7 @@ public class DcsbybbCtl extends BaseWebCtl {
 				} else if (isGET(request)) {
 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "hwzl", "dydlid");
 				}
-				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
 				Date date;
 				if (StringUtils.isNotEmpty(zysjq)) {
 					try {
@@ -231,7 +231,7 @@ public class DcsbybbCtl extends BaseWebCtl {
 		model.addAttribute("list", voList);
 		model.addAttribute("gkjyr",  CacheSearchCondition.cacheSCmapVal(cacheSCmap, "gkjyr"));
 		model.addAttribute("szgk",  CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid"));
-		model.addAttribute("szgq",  CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szdgq"));
+		model.addAttribute("szgq",  CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid"));
 		model.addAttribute("szd",  CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szdid"));
 		model.addAttribute("jcg",  CacheSearchCondition.cacheSCmapVal(cacheSCmap, "jcg"));
 		model.addAttribute("nwm",  CacheSearchCondition.cacheSCmapVal(cacheSCmap, "nwm"));