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

gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/hxhbgl/hxhbgladd.jsp

@@ -125,13 +125,13 @@
 						</td>
 					</tr>
 					<tr>
-						<th>内支线条数：&nbsp;</th>
+						<th>外贸内支线条数：&nbsp;</th>
 						<td >
 							<input type="text" class="form-control" name="nzxts" 
 							onkeyup="value=value.replace(/[^\d]/g,'') "
 							onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))">
 						</td>
-						<th>内支线航班数：&nbsp;</th>
+						<th>外贸内支线航班数：&nbsp;</th>
 						<td >
 							<input type="text" class="form-control" name="nzxhbs" 
 							onkeyup="value=value.replace(/[^\d]/g,'') "
@@ -139,7 +139,7 @@
 						</td>
 					</tr>
 					<tr>
-						<th>内支线备注：&nbsp;</th>
+						<th>外贸内支线备注：&nbsp;</th>
 						<td colspan="3">
 							<textarea class="form-control" style="width: 92.2%" name ="nzxbz" maxlength="200"></textarea>
 						</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/hxhbgl/hxhbgledit.jsp

@@ -120,14 +120,14 @@
 						</td>
 					</tr>
 					<tr>
-						<th>内支线条数：&nbsp;</th>
+						<th>外贸内支线条数：&nbsp;</th>
 						<td >
 							<input type="text" class="form-control" name="nzxts" 
 							onkeyup="value=value.replace(/[^\d]/g,'') "
 							onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))"
 							value="${record.nzxts }">
 						</td>
-						<th>内支线航班数：&nbsp;</th>
+						<th>外贸内支线航班数：&nbsp;</th>
 						<td >
 							<input type="text" class="form-control" name="nzxhbs" 
 							onkeyup="value=value.replace(/[^\d]/g,'') "
@@ -136,7 +136,7 @@
 						</td>
 					</tr>
 					<tr>
-						<th>内支线备注：&nbsp;</th>
+						<th>外贸内支线备注：&nbsp;</th>
 						<td colspan="3">
 							<textarea class="form-control" style="width: 92.2%" name ="nzxbz" maxlength="200" value="">${record.nzxbz }</textarea>
 						</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/hxhbgl/hxhbglview.jsp

@@ -83,17 +83,17 @@
 						</td>
 					</tr>
 					<tr>
-						<th>内支线条数：&nbsp;</th>
+						<th>外贸内支线条数：&nbsp;</th>
 						<td >
 							${record.nzxts }
 						</td>
-						<th>内支线航班数：&nbsp;</th>
+						<th>外贸内支线航班数：&nbsp;</th>
 						<td >
 							${record.nzxhbs }
 						</td>
 					</tr>
 					<tr>
-						<th>内支线备注：&nbsp;</th>
+						<th>外贸内支线备注：&nbsp;</th>
 						<td colspan="3">
 							${record.nzxbz }
 						</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/jdtxxx/jdtxxxadd.jsp

@@ -232,7 +232,7 @@
 			
 		</div>
 	</div>
-	<div id="loading" style="z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div> 
+	
 
 </body>
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/jdtxxx/jdtxxxedit.jsp

@@ -239,7 +239,7 @@
 			
 		</div>
 	</div>
-	<div id="loading" style="z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div> 
+	
 
 </body>
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/jdtxxx/jdtxxxview.jsp

@@ -11,8 +11,6 @@
 	<script type="text/javascript">
 		$(document).ready(function () {
 			iFrameHeightIframe('${menuid}');//自适应高度
-			jdtxxx.detail.path="${path}";
-			jdtxxx.detail.type="${type}";
 			/* initszdSelect('szdsel', '${record.szd}', 'showgk', '80%');
 			initgkSelect('gksel', '${record.szgk}','${record.szd}', 'showgq', '80%');
 			initgqSelect('gqsel', '${record.szgq }','${record.szd}', '${record.szgk}',null, '80%');

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqadd.jsp

@@ -222,7 +222,6 @@
 		</div>
 
 </div>
-<div id="loading" style="z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div> 
 </body>
 
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqdsadd.jsp

@@ -519,7 +519,7 @@
 		</div>
 	</div>
 	<div class="theme-popover-mask-tc" id="theme-popover-mask-tc"></div>
-<div id="loading" style="z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div> 
+
 </body>
 
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqdsedit.jsp

@@ -485,7 +485,6 @@
 	<div class="theme-popover-mask" id="theme-popover-mask"></div>
 	
 	</form>		
-	<div id="loading" style="z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div> 
 </body>
 
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqdsmain.jsp

@@ -174,13 +174,6 @@
 									          </a>
 							 </c:if>
 							  <c:if test="${jgsqds.taskState =='TH'}">
-							    <c:if test="${ssFlag == 1 }">
-									            <authz:hasPermission name="${appName}:jgsqds:delete"> 
-									          <a class="btn btn-default btn-xs" href="#" onclick="jgsqds.main.del('${jgsqds.id}')" title="删除">
-									   <i class="glyphicon glyphicon-trash"></i> 
-									         </a>
-									         </authz:hasPermission>
-									         </c:if>
 							 <a class="btn btn-default btn-xs" href="#"  onclick="jgsqds.main.back('${jgsqds.id}')" title="办理">
 									   <i class="glyphicon glyphicon-check"></i> 
 									          </a>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqdsview.jsp

@@ -15,8 +15,6 @@
 			jgsqds.detail.opflag="${opflag}"
 			jgsqds.detail.taskKey="${taskKey}";
 			jgsqds.detail.hqflag ="${hqflag}";
-			jgsqds.detail.path = "${path}";
-			jgsqds.detail.type="${type}";
 			jgsqds.detail.init();
 			$('.close').click(function(){
 				guanbi();

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqedit.jsp

@@ -378,7 +378,7 @@
 			
 			</div>
 		</div>
-	<div id="loading" style="z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div> 
+	
 </body>
 
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqview.jsp

@@ -15,8 +15,6 @@
 			jgsq.detail.opflag="${opflag}"
 			jgsq.detail.taskKey="${taskKey}";
 			jgsq.detail.hqflag ="${hqflag}";
-			jgsq.detail.path = "${path}";
-			jgsq.detail.type="${type}";
 			jgsq.detail.init();
 			$('.close').click(function(){
 				guanbi();

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgdsadd.jsp

@@ -471,7 +471,7 @@
 		</div>
 	</div>
 	<div class="theme-popover-mask-tc" id="theme-popover-mask-tc"></div>
-
+</body>
 
 	<div class="theme-popover" id="qtfjpopover" style="width: 900px;height: 400px;">
 <div class="theme-poptit">
@@ -577,6 +577,4 @@
 	</div>
 	<div class="theme-popover-mask" id="theme-popover-mask"></div>
 </form>
-<div id="loading" style="z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div>  
-</body>
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgdsedit.jsp

@@ -516,7 +516,6 @@
 	</div>
 	<div class="theme-popover-mask" id="theme-popover-mask"></div>
 	</form>		
-	<div id="loading" style="z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div>  
 </body>
 
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgdsmain.jsp

@@ -153,13 +153,11 @@
 									   <i class="glyphicon glyphicon-pencil"></i> 
 									          </a>
 									          </authz:hasPermission>
-									   <c:if test="${ssFlag == 1 }">
 									 <authz:hasPermission name="${appName}:jsjdbgds:delete">
 									          <a class="btn btn-default btn-xs" href="#" onclick="jsjdbgds.main.del('${jsjdbgds.id}')" title="删除">
 									   <i class="glyphicon glyphicon-trash"></i> 
 									        </a>
 									        </authz:hasPermission>
-									        </c:if>
 									         </c:if>
 									<c:if test="${ jsjdbgds.recordStatus  > 1 }">
 									<a class="btn btn-default btn-xs" href="#"
@@ -174,13 +172,6 @@
 									          </a>
 							 </c:if>
 							  <c:if test="${jsjdbgds.taskState =='TH'}">
-							   <c:if test="${ssFlag == 1 }">
-							  <authz:hasPermission name="${appName}:jsjdbgds:delete">
-									          <a class="btn btn-default btn-xs" href="#" onclick="jsjdbgds.main.del('${jsjdbgds.id}')" title="删除">
-									   <i class="glyphicon glyphicon-trash"></i> 
-									        </a>
-									        </authz:hasPermission>
-									        </c:if>
 							 <a class="btn btn-default btn-xs" href="#"  onclick="jsjdbgds.main.back('${jsjdbgds.id}')" title="办理">
 									   <i class="glyphicon glyphicon-check"></i> 
 									          </a>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgdsview.jsp

@@ -15,8 +15,6 @@
 			jsjdbgds.detail.opflag="${opflag}"
 			jsjdbgds.detail.taskKey="${taskKey}";
 			jsjdbgds.detail.hqflag ="${hqflag}";
-			jsjdbgds.detail.path = "${path}";
-			jsjdbgds.detail.type="${type}";
 			jsjdbgds.detail.init();
 			$('.close').click(function(){
 				guanbi();

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgview.jsp

@@ -15,8 +15,6 @@
 			jsjdbg.detail.opflag="${opflag}"
 			jsjdbg.detail.taskKey="${taskKey}";
 			jsjdbg.detail.hqflag ="${hqflag}";
-			jsjdbg.detail.path = "${path}";
-			jsjdbg.detail.type="${type}";
 			jsjdbg.detail.init();
 			$('.close').click(function(){
 				guanbi();

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjadd.jsp

@@ -256,7 +256,6 @@
 		</div>
 
 </div>
-<div id="loading" style="z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div>  
 </body>
 
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjdsadd.jsp

@@ -587,7 +587,6 @@
 	<div class="theme-popover-mask-tc" id="theme-popover-mask-tc"></div>
 			
 </form>
-<div id="loading" style="z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div>  
 </body>
 
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjdsedit.jsp

@@ -500,7 +500,6 @@
 	</div>
 	<div class="theme-popover-mask" id="theme-popover-mask"></div>
 </form>		
-<div id="loading" style="z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div>  
 </body>
 
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjdsmain.jsp

@@ -163,7 +163,7 @@
 									         </authz:hasPermission>
 									         </c:if>
 									         </c:if>
-									 <c:if test="${ssFlag == 1 }">        
+									 <c:if test="${ssFlag == 0 }">        
 									<c:if test="${ jsjdcbsjds.recordStatus  > 1 }">
 									<a class="btn btn-default btn-xs" href="#"
 									onclick="hisList('${jsjdcbsjds.id}','jsjdcbsjds')" title="流程历史"> <i
@@ -177,13 +177,6 @@
 									          </a>
 							 </c:if>
 							  <c:if test="${jsjdcbsjds.taskState =='TH'}">
-							   <c:if test="${ssFlag == 1 }"> 
-									          <authz:hasPermission name="${appName}:jsjdcbsjds:delete">
-									          <a class="btn btn-default btn-xs" href="#" onclick="jsjdcbsjds.main.del('${jsjdcbsjds.id}')" title="删除">
-									   <i class="glyphicon glyphicon-trash"></i> 
-									         </a>
-									         </authz:hasPermission>
-									         </c:if>
 							 <a class="btn btn-default btn-xs" href="#"  onclick="jsjdcbsjds.main.back('${jsjdcbsjds.id}')" title="办理">
 									   <i class="glyphicon glyphicon-check"></i> 
 									          </a>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjdsview.jsp

@@ -16,8 +16,6 @@
 		jsjdcbsjds.detail.opflag = "${opflag}"
 		jsjdcbsjds.detail.taskKey = "${taskKey}";
 		jsjdcbsjds.detail.hqflag ="${hqflag}";
-		jsjdcbsj.detail.path = "${path}";
-		jsjdcbsj.detail.type="${type}";
 		jsjdcbsjds.detail.init();
 		$('.close').click(function() {
 			guanbi();

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjedit.jsp

@@ -365,7 +365,7 @@
 			
 			</div>
 		</div>
-	<div id="loading" style="z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div>  
+	
 </body>
 
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjview.jsp

@@ -16,8 +16,6 @@
 		jsjdcbsj.detail.opflag = "${opflag}"
 		jsjdcbsj.detail.taskKey = "${taskKey}";
 		jsjdcbsj.detail.hqflag ="${hqflag}";
-		jsjdcbsj.detail.path = "${path}";
-		jsjdcbsj.detail.type="${type}";
 		jsjdcbsj.detail.init();
 		$('.close').click(function() {
 			guanbi();

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdgladd.jsp

@@ -347,11 +347,8 @@ text-align:center;
 							             <a class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.back()">
 							   <i class="glyphicon glyphicon-arrow-left"></i> 
 							            返回</a>
-							          
 							            
           			</div>
-          			
-
 <div class="theme-popover" id="qtfjpopover" style="width: 900px;height: 350px;">
 <div class="theme-poptit">
 <input type="hidden" class="form-control" id="qtfjid" name="qtfjid">
@@ -521,7 +518,6 @@ text-align:center;
 		</div>
 
 </div>
-<div id="loading" style="z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div>  
 </body>
 
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/tzjhgl/tzjhgladd.jsp

@@ -15,7 +15,7 @@
 			tzjhgl.detail.init();
 			initXmlbsel('xmlbsel','','80%');
 			initSfyzjbzsel('sfyzjbz','','change','80%');
-			/* tzjhgl.detail.jhnd('jhnd','','80%'); */
+			tzjhgl.detail.jhnd('jhnd','','80%');
 		});
 		function guanbipop(){
 			$('.theme-popover-mask-tc').fadeOut(100);
@@ -65,7 +65,7 @@
 						<tr>
 							<th><span class="needwrite">*</span>计划年度：&nbsp;</th>
 							<td>
-							<input type="text" class="form-control" name='jhnd' id="jhnd" maxlength="4"  onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')">
+								<div id="jhnd"></div>
 							</td>
 							<th><span class="needwrite">*</span>年度计划投资（万元）：&nbsp;</th>
 							<td >

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

@@ -61,13 +61,11 @@
 		<tr>
 			<th>码头：&nbsp;</th>
 			<td >
-			${recordvo.mtmc }
-				<!-- <span id="mtsel"></span> -->
+				<span id="mtsel"></span>
 			</td>
 			<th>泊位：&nbsp;</th>
 			<td >
-			${recordvo.bwmc }
-				<!-- <span id="bwsel"></span> -->
+				<span id="bwsel"></span>
 			</td>
 		</tr>
 		<tr>
@@ -84,13 +82,11 @@
 		<tr>
 			<th>进出港：&nbsp;</th>
 			<td >
-			${recordvo.jcgmc }
-				<!-- <span id="jcgsel"></span> -->
+				<span id="jcgsel"></span>
 			</td>
 			<th>内外贸：&nbsp;</th>
 			<td >
-			${recordvo.nwmmc }
-				<!-- <span id="nwmsel"></span> -->
+				<span id="nwmsel"></span>
 			</td>
 		</tr>
 		<tr>
@@ -122,7 +118,7 @@
 		<tr>
 			<th>作业品名称：&nbsp;</th>
 			<td >
-				${record.zypmc }
+				${record.cm }
 			</td>
 			 <th>作业数量（吨）：&nbsp;</th>
 			<td >

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/sssb/sssbadd.jsp

@@ -124,7 +124,9 @@
 	                        </td>
 	                        <th>检验报告（或证书）编号：&nbsp;</th>
 	                     	<td>
-	                     		<input type="text" class="form-control"  name="bh" maxlength="100" >
+	                     		<input type="text" class="form-control"  name="bh" maxlength="100" 
+	                     		onkeyup="value=value.replace(/[^\d]/g,'') "
+								onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))">
 	                     	</td>
 	                    </tr>
 	                    <tr>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/sssb/sssbedit.jsp

@@ -134,7 +134,9 @@
 	                        </td>
 	                        <th>检验报告（或证书）编号：&nbsp;</th>
 	                     	<td>
-	                     		<input type="text" class="form-control"  name="bh" value="${record.bh }" maxlength="100">
+	                     		<input type="text" class="form-control"  name="bh" value="${record.bh }" maxlength="100"
+	                     		onkeyup="value=value.replace(/[^\d]/g,'') "
+								onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))">
 	                     	</td>
 	                    </tr>
 	                    <tr>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzxx/xkzxxadd.jsp

@@ -195,7 +195,6 @@
 		</div>
 	</div>
 	</div>
-	<div id="loading" style="z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div> 
 </form>
 </body>
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzxx/xkzxxedit.jsp

@@ -188,6 +188,5 @@
 			</div>
 		</div>
 	</div>
-	<div id="loading" style="z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div> 
 </body>
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgaddmain.jsp

@@ -1040,6 +1040,6 @@
 			</div>
 	</div>
 </div>
-<div id="loading" style="top:780px;left:700px; z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div>  
+
 </body>
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgeditmain.jsp

@@ -917,6 +917,6 @@
 			</div>
 	</div>
 </div>			
-<div id="loading" style="top:780px;left:700px;z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div>  
+
 </body>
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgviewmain.jsp

@@ -458,9 +458,9 @@
 			   <i class="glyphicon glyphicon-ban-circle"></i> 
 			            退回</a>
 			            
-       <%--  <a class="btn btn-default btn-sm" href="#" onclick="xkzbg.detail.delData('${record.id}')">
+        <a class="btn btn-default btn-sm" href="#" onclick="xkzbg.detail.delData('${record.id}')">
   <i class="glyphicon glyphicon-trash"></i> 
-        删除</a> --%>
+        删除</a>
 	</c:if>
             <a class="btn btn-default btn-sm" href="#"  onclick="xkzbg.detail.back()">
   <i class="glyphicon glyphicon-arrow-left"></i> 

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqaddmain.jsp

@@ -947,6 +947,5 @@
 			</div>
 		</div>
 	</div>
-	<div id="loading" style="top:780px;left:700px;z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div>  
 </body>
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqeditmain.jsp

@@ -840,6 +840,6 @@
 			</div>
 	</div>
 </div>			
-<div id="loading" style="top:780px;left:700px;z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div>  
+
 </body>
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxaddmain.jsp

@@ -991,6 +991,6 @@
 		</div>
 	</div>
 	<div class="theme-popover-mask-tc" id="theme-popover-mask-tc"></div>
-	<div id="loading" style="top:780px;left:700px;z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div>  
+	
 </body>
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxeditmain.jsp

@@ -866,6 +866,6 @@
 		</div>
 	</div>
 	<div class="theme-popover-mask-tc" id="theme-popover-mask-tc"></div>
-	<div id="loading" style="top:780px;left:700px;z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div>  
+	
 </body>
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxjds.jsp

@@ -43,9 +43,9 @@
 			<td width="40%">${jds.ah }</td>
 		</tr>
 		<tr>
-			<td colspan="2">${jds.jyrmc }:</td>
-<%-- 			<td colspan="2"><input type="text" class="form-control" id="jyrmc" name="jyrmc" value="${jds.jyrmc }"></td> 
-			<td colspan="2"></td>--%>
+			<td colspan="2">${jds.jyrmc }</td>
+<%-- 			<td colspan="2"><input type="text" class="form-control" id="jyrmc" name="jyrmc" value="${jds.jyrmc }"></td> --%>
+			<td colspan="2">:</td>
 		</tr>
 		
 		<tr>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxviewmain.jsp

@@ -442,9 +442,9 @@
 							   <i class="glyphicon glyphicon-ban-circle"></i> 
 							            退回</a>
 							            
-							                <%--    <a class="btn btn-default btn-sm" href="#" onclick="xkzyx.detail.delData('${record.id}')">
+							                   <a class="btn btn-default btn-sm" href="#" onclick="xkzyx.detail.delData('${record.id}')">
 									   <i class="glyphicon glyphicon-trash"></i> 
-									         删除</a> --%>
+									         删除</a>
 					</c:if>
 	
 	

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/xkzzxaddmain.jsp

@@ -897,6 +897,5 @@
 			</div>
 		</div>
 	</div>
-	<div id="loading" style="z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div>  
 </body>
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/xkzzxeditmain.jsp

@@ -756,6 +756,6 @@
 			</div>
 	</div>
 </div>			
-<div id="loading" style="z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div>  
+
 </body>
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhbg/lhbgadd.jsp

@@ -172,6 +172,6 @@
 </div>
 	</div>		
 </form>	
-<div id="loading" style="z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div>  
+
 </body>
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhbg/lhbgedit.jsp

@@ -175,6 +175,5 @@
 	</div>
 	
 </form>
-<div id="loading" style="z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div>  
 </body>
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhbg/lhbgview.jsp

@@ -13,8 +13,6 @@
 <script type="text/javascript">
 		$(document).ready(function () {
 			lhbg.detail.taskKey="${taskKey}";
-			lhbg.detail.path = "${path}";
-			lhbg.detail.type = "${type}";
 			iFrameHeightIframe('gkjyr');//自适应高度
 			lhbg.detail.init();
 		});

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhsq/lhsqadd.jsp

@@ -361,6 +361,5 @@
 					</div>
 	</div>
 </form>
-<div id="loading" style="z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div>  
 </body>
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhsq/lhsqedit.jsp

@@ -362,6 +362,6 @@
 					</div>
 					
 	</form>
-<div id="loading" style="z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div>  
+
 </body>
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhsq/lhsqview.jsp

@@ -14,8 +14,6 @@
 <script type="text/javascript">
 	$(document).ready(function() {
 		lhsq.detail.taskKey="${taskKey}";
-		lhsq.detail.path = "${path}";
-		lhsq.detail.type = "${type}";
 		iFrameHeightIframe('gkjyr');//自适应高度
 		var root = $("#simple_new_menu");
 		$("#lhsqLi").addClass("active");

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhyx/lhyxadd.jsp

@@ -210,6 +210,6 @@
 		</div>	
 		</div>
 </form>	
-<div id="loading" style="z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div>  
+
 </body>
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhyx/lhyxedit.jsp

@@ -185,6 +185,6 @@
 </div>
 		</div>	
 	</form>
-<div id="loading" style="z-index: 100000"><img src="${app }/static/biz/image/load.gif" /></div>  
+
 </body>
 </html>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gklhxkgl/gkjylhyx/lhyxview.jsp

@@ -13,8 +13,6 @@
 <script type="text/javascript">
 		$(document).ready(function () {
 			lhyx.detail.taskKey="${taskKey}";
-			lhyx.detail.path = "${path}";
-			lhyx.detail.type = "${type}";
 			iFrameHeightIframe('gkjyr');//自适应高度
 			lhyx.detail.init();
 		});

gkjsjy/trunk/WebContent/WEB-INF/pages/set/user/usermain.jsp

@@ -70,14 +70,6 @@
 	                        	
                         </td>
                           </tr>
-                          <tr>
-                            <td class="right">
-                         	港口经营人 :&nbsp;
-                         </td>
-                        <td >
-	                        	<input type="text" class="form-control" name="jyrname"  value="${jyrname }">
-                        </td>
-                          </tr>
                         <tr>
                         <td class="right" colspan="6">
                         <authz:hasPermission name="${appName}:user:main">

gkjsjy/trunk/WebContent/WEB-INF/pages/sys/main.jsp

@@ -49,7 +49,7 @@
 			$.confirm({
 				confirmButton:'修改密码',
 			    title: '密码复杂度不满足要求的提示',
-			    content: '您当前密码不满足复杂度要求(8-16位并包括字母、数字、特殊字符)，当前密码还可以使用到2016年11月1日，建议您立即修改密码!',
+			    content: '您当前密码不满足复杂度要求(8-16位并包括字母、数字、特殊字符)，建议您立即修改密码!',
 			    confirm: function(){
 			    	main.shenbao();
 			    }