Browse Source

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

ld_xuhx 8 years ago
parent
commit
581420469d

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

@@ -21,22 +21,26 @@
 		dcsb.main.init();
 		iFrameHeightIframe('${menuid}');//自适应高度
 	});
-	
-	
-	function exportExcelAll(data1,data2,data3,data4,data5,data6,data7,data8,data9,data10,data11){
-		
-		location.href=$.app+"/dcsb/exportExcelAll?szdid="+data1+"&szgkid="+data2+"&szgqid="+data3+"&gkjyr="+data4+"&zypmc="+data5+"&hwzl="+data6+"&shzt="+data7+"&zysjz_start="+data8+"&zysjz_end="+data9+"&zysjq_start="+data10+"&zysjq_end="+data11;
+
+	function exportExcelAll(data1, data2, data3, data4, data5, data6, data7,
+			data8, data9, data10, data11) {
+
+		location.href = $.app + "/dcsb/exportExcelAll?szdid=" + data1
+				+ "&szgkid=" + data2 + "&szgqid=" + data3 + "&gkjyr=" + data4
+				+ "&zypmc=" + data5 + "&hwzl=" + data6 + "&shzt=" + data7
+				+ "&zysjz_start=" + data8 + "&zysjz_end=" + data9
+				+ "&zysjq_start=" + data10 + "&zysjq_end=" + data11;
 		$.alert({
-   		    title: '提示',
-		    content: '导出数据中,请耐心等待!',
-		    confirm: function(){
-		    	}
+			title : '提示',
+			content : '导出数据中,请耐心等待!',
+			confirm : function() {
+			}
 		});
 	}
 </script>
 </head>
 <body>
-<jsp:include page="../../../showHistory.jsp"></jsp:include>
+	<jsp:include page="../../../showHistory.jsp"></jsp:include>
 	<div class="box">
 		<div class="box-content">
 			<form action="${app }/dcsb/main" id="dcsbform" method="post">
@@ -44,7 +48,7 @@
 					<table class="search_table" cellpadding="0" cellspacing="0">
 						<tr>
 							<th width="11%"></th>
-							<th width="22%"></th>	
+							<th width="22%"></th>
 							<th width="11%"></th>
 							<th width="22%"></th>
 							<th width="12%"></th>
@@ -66,63 +70,66 @@
 							<td><input type="text" class="form-control" name="zypmc"
 								value="${zypmc }"></td>
 							<td class="right">货物种类第一大类:&nbsp;</td>
-							<td><span id="hwzldydl"></span></td>	
-							
+							<td><span id="hwzldydl"></span></td>
+
 						</tr>
 						<tr>
-						
+
 							<td class="right">当前状态:&nbsp;</td>
 							<td><span id="shztsel"></span></td>
-							
+
 							<td class="right">作业时间起:&nbsp;</td>
 							<td>
-								<table style="width:90%;">
+								<table style="width: 90%;">
 									<tr>
-										<td>
-											<input style="width:100%;" id="d4311" type="text" class="Wdate" name="zysjq_start" value="${fn:substring(zysjq_start,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><input style="width: 100%;" id="d4311" type="text"
+											class="Wdate" name="zysjq_start"
+											value="${fn:substring(zysjq_start,0,10)}"
+											onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',maxDate: '#F{$dp.$D(\'d4312\',{d:0})}'})">
 										</td>
-										<td>
-											<input style="width:100%;" id="d4312" type="text" class="Wdate" name="zysjq_end" value="${fn:substring(zysjq_end,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',minDate: '#F{$dp.$D(\'d4311\',{d:0})}'})">	                
+										<td><span>~</span></td>
+										<td><input style="width: 100%;" id="d4312" type="text"
+											class="Wdate" name="zysjq_end"
+											value="${fn:substring(zysjq_end,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>
-								<table style="width:90%;">
+								<table style="width: 90%;">
 									<tr>
-										<td>
-											<input style="width:100%;" id="d4313" type="text" class="Wdate" name="zysjz_start" value="${fn:substring(zysjz_start,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',maxDate: '#F{$dp.$D(\'d4314\',{d:0})}'})">
-										</td>
-										<td>
-											<span>~</span>
+										<td><input style="width: 100%;" id="d4313" type="text"
+											class="Wdate" name="zysjz_start"
+											value="${fn:substring(zysjz_start,0,10)}"
+											onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',maxDate: '#F{$dp.$D(\'d4314\',{d:0})}'})">
 										</td>
-										<td>
-											<input style="width:100%;" id="d4314" type="text" class="Wdate" name="zysjz_end" value="${fn:substring(zysjz_end,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',minDate: '#F{$dp.$D(\'d4313\',{d:0})}'})">	                
+										<td><span>~</span></td>
+										<td><input style="width: 100%;" id="d4314" type="text"
+											class="Wdate" name="zysjz_end"
+											value="${fn:substring(zysjz_end,0,10)}"
+											onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',minDate: '#F{$dp.$D(\'d4313\',{d:0})}'})">
 										</td>
 									</tr>
 								</table>
 							</td>
 						</tr>
 						<tr>
-							<td class="right" colspan="6">
-							<a
+							<td class="right" colspan="6"><a
 								class="btn btn-default btn-sm" href="#"
 								onclick="dcsb.main.search()"> <i
 									class="glyphicon glyphicon-search"></i> 查询
-							</a> <a class="btn btn-default btn-sm" href="#"
-								onclick="dcsb.main.add()"> <i
-									class="glyphicon glyphicon-plus"></i> 新增
-							</a>
-							<a class="btn btn-default btn-sm" href="#"
-								onclick="exportExcelAll('${szd}','${szgk}','${szgq}','${gkjyr}','${zypmc}','${hwzl}','${shzt}','${zysjz_start}','${zysjz_end}','${zysjq_start}','${zysjq_end}')"> <i
-									class="glyphicon glyphicon-download-alt"></i> 导出
-							</a>
-							</td>
+							</a> <authz:hasPermission name="${appName}:dcsb:add">
+									<a class="btn btn-default btn-sm" href="#"
+										onclick="dcsb.main.add()"> <i
+										class="glyphicon glyphicon-plus"></i> 新增
+									</a>
+								</authz:hasPermission> <a class="btn btn-default btn-sm" href="#"
+								onclick="exportExcelAll('${szd}','${szgk}','${szgq}','${gkjyr}','${zypmc}','${hwzl}','${shzt}','${zysjz_start}','${zysjz_end}','${zysjq_start}','${zysjq_end}')">
+									<i class="glyphicon glyphicon-download-alt"></i> 导出
+							</a></td>
 						</tr>
 					</table>
 				</div>
@@ -134,7 +141,8 @@
 							<th width="10%">港口经营人</th>
 							<th width="10%">作业品名称</th>
 							<th width="10%">作业数量(吨)</th>
-							<th width="6%">货物种类<br>第一大类</th>
+							<th width="6%">货物种类<br>第一大类
+							</th>
 							<th width="7%">所在港口</th>
 							<th width="10%">所在港区</th>
 							<th width="8%">报告时间</th>
@@ -152,54 +160,53 @@
 								<td>${dcsb.szgq }</td>
 								<td>${fn:substring(dcsb.bgsj,0,10)}</td>
 								<td>${dcsb.shztzw}</td>
-								<td class="operatetd"><a class="btn btn-default btn-xs" href="#"
-									onclick="dcsb.main.view('${dcsb.id}')" title="查看"> <i
-										class="glyphicon glyphicon-search"></i> 
-								</a>
-									<c:if test="${ dcsb.recordStatus == 1 }">
-								 <a class="btn btn-default btn-xs" href="#"
-									onclick="dcsb.main.edit('${dcsb.id}')" title="编辑"> <i
-										class="glyphicon glyphicon-pencil"></i> 
-								</a> <a class="btn btn-default btn-xs" href="#"
-									onclick="dcsb.main.del('${dcsb.id}')" title="删除"> <i
-										class="glyphicon glyphicon-trash"></i> 
-								</a>
-								</c:if>
-								 <c:if test="${dcsb.taskState =='TH'}">
-							<a class="btn btn-default btn-xs" href="#"
-									onclick="dcsb.main.del('${dcsb.id}')"> <i
-										class="glyphicon glyphicon-trash" title="删除"></i> 
-								</a>
-							 </c:if>		
-								
-								
-								<c:if test="${ dcsb.recordStatus  > 1  }">
-									<a class="btn btn-default btn-xs" href="#"
-									onclick="hisList('${dcsb.id}','dcsb')" title="流程历史"> <i
-										class="glyphicon glyphicon-retweet"></i>
-									</a>
-								</c:if>
-								
-							
-							  <c:if test="${dcsb.taskState =='TH'}">
-							 <a class="btn btn-default btn-xs" href="#"  onclick="dcsb.main.back('${dcsb.id}')" title="办理">
-									   <i class="glyphicon glyphicon-check"></i> 
-									          </a>
-							 </c:if>			
-									
-							 <c:if test="${ dcsb.taskState =='Y'}">
-							 <a class="btn btn-default btn-xs" href="#"  onclick="dcsb.main.banli('${dcsb.id}')" title="办理">
-									   <i class="glyphicon glyphicon-check"></i> 
-									          </a>
-							 </c:if>
-							 </td>
+								<td class="operatetd"><a class="btn btn-default btn-xs"
+									href="#" onclick="dcsb.main.view('${dcsb.id}')" title="查看">
+										<i class="glyphicon glyphicon-search"></i>
+								</a> <c:if test="${ dcsb.recordStatus == 1 }">
+										<authz:hasPermission name="${appName}:dcsb:edit">
+											<a class="btn btn-default btn-xs" href="#"
+												onclick="dcsb.main.edit('${dcsb.id}')" title="编辑"> <i
+												class="glyphicon glyphicon-pencil"></i>
+											</a>
+										</authz:hasPermission>
+										<authz:hasPermission name="${appName}:dcsb:delete">
+											<a class="btn btn-default btn-xs" href="#"
+												onclick="dcsb.main.del('${dcsb.id}')" title="删除"> <i
+												class="glyphicon glyphicon-trash"></i>
+											</a>
+										</authz:hasPermission>
+
+									</c:if> <c:if test="${dcsb.taskState =='TH'}">
+										<authz:hasPermission name="${appName}:dcsb:delete">
+											<a class="btn btn-default btn-xs" href="#"
+												onclick="dcsb.main.del('${dcsb.id}')"> <i
+												class="glyphicon glyphicon-trash" title="删除"></i>
+											</a>
+										</authz:hasPermission>
+									</c:if> <c:if test="${ dcsb.recordStatus  > 1  }">
+										<a class="btn btn-default btn-xs" href="#"
+											onclick="hisList('${dcsb.id}','dcsb')" title="流程历史"> <i
+											class="glyphicon glyphicon-retweet"></i>
+										</a>
+									</c:if> <c:if test="${dcsb.taskState =='TH'}">
+										<a class="btn btn-default btn-xs" href="#"
+											onclick="dcsb.main.back('${dcsb.id}')" title="办理"> <i
+											class="glyphicon glyphicon-check"></i>
+										</a>
+									</c:if> <c:if test="${ dcsb.taskState =='Y'}">
+										<a class="btn btn-default btn-xs" href="#"
+											onclick="dcsb.main.banli('${dcsb.id}')" title="办理"> <i
+											class="glyphicon glyphicon-check"></i>
+										</a>
+									</c:if></td>
 							</tr>
 						</c:forEach>
 					</table>
 				</div>
 				<!-- 分页 -->
 				<jsp:include page="../../../pageinfo.jsp"></jsp:include>
-			</div>
+		</div>
 		</form>
 	</div>
 </body>

+ 4 - 3
gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/ctl/DcsbCtl.java

@@ -46,6 +46,7 @@ import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzsqEntity;
 import com.xt.jygl.workflow.entity.TaskInfoEntity;
 import com.xt.jygl.workflow.service.TaskInfoService;
+import com.xtframe.core.anon.auth.RequiresPermissions;
 import com.xtframe.core.base.ctl.WebJsonResult;
 import com.xtframe.core.support.SecurityMgr;
 import com.xtframe.sec.code.entity.CodeEntity;
@@ -667,7 +668,7 @@ public class DcsbCtl extends BaseWebCtl {
 
 	// 新增
 	@RequestMapping(value = "/add")
-	// @RequiresPermissions("dcsb:add")
+	@RequiresPermissions("dcsb:add")
 	public String add(Model model) {
 
 		UserEntity user = securityMgr.getCurrUser();
@@ -736,7 +737,7 @@ public class DcsbCtl extends BaseWebCtl {
 
 	// 修改
 	@RequestMapping(value = "/edit")
-	// @RequiresPermissions("dcsb:edit")
+    @RequiresPermissions("dcsb:edit")
 	public String edit(Model model, String id, String flag, String path, String type) {
 		model.addAttribute("flag", flag);
 		model.addAttribute("path", path);
@@ -1170,7 +1171,7 @@ public class DcsbCtl extends BaseWebCtl {
 	// 删除
 	@RequestMapping(value = "/delete")
 	@ResponseBody
-	// @RequiresPermissions("dcsb:delete")
+	@RequiresPermissions("dcsb:delete")
 	public WebJsonResult delete(Model model, String id) {
 		WebJsonResult wr = success();
 		try {