首页 发现 帮助
注册 登录
hs
/
jsgkj
2
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

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

ld_xuhx 8 年之前
父节点
c3a2c8a49f
当前提交
eb53972c62
共有 15 个文件被更改，包括 94 次插入 和 33 次删除
分列视图 显示文件统计
  1. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/cbselect.jsp
  2. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/xzdwxxgl/xzglryxx/xzglrymain.jsp
  3. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/zyq/zyqmain.jsp
  4. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/cghzyxxgl/dcsb/dcsbadd.jsp
  5. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/gkjyrmain.jsp
  6. 13 14
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/jyradd.jsp
  7. 12 7
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/jyredit.jsp
  8. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/jyrview.jsp
  9. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgmain.jsp
  10. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/dcxxadd.jsp
  11. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqmain.jsp
  12. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxmain.jsp
  13. 51 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/pageinforcb.jsp
  14. 5 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/sys/main.jsp
  15. 2 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/sys/todo.jsp

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/cbselect.jsp
查看文件 

@@ -51,7 +51,7 @@
 
 				    </tbody>

 				</table>

 				<!-- 分页处 -->

-			<jsp:include page="pageinfoforjyr.jsp"></jsp:include>

+			<jsp:include page="pageinforcb.jsp"></jsp:include>

 			</div>

 	</div>

 	<div class="theme-popover-mask" id="cbselectmaskdiv"></div>

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/xzdwxxgl/xzglryxx/xzglrymain.jsp
查看文件 

@@ -76,7 +76,7 @@
 
 							   <i class="glyphicon glyphicon-pencil"></i> 

 							            编辑部门/处科室</a>

 							 <a class="btn btn-default btn-sm" href="#"  onclick="xzglry.main.deletebm()">

-							   <i class="glyphicon glyphicon-wrench"></i> 

+							   <i class="glyphicon glyphicon-trash"></i> 

 							            删除部门/处科室</a>	

 	                        	

                         </td>

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/zyq/zyqmain.jsp
查看文件 

@@ -103,7 +103,7 @@
 
 							</authz:hasPermission>

 							<authz:hasPermission name="${appName}:zyqgl:edit">

 								 <a class="btn btn-default btn-xs" href="#"  onclick="zyq.main.edit('${zyq.id}')" title="编辑">

-									   <i class="glyphicon glyphicon-wrench"></i> 

+									   <i class="glyphicon glyphicon-pencil"></i> 

 									          </a>

 							</authz:hasPermission>

 							<authz:hasPermission name="${appName}:zyqgl:delete">

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/cghzyxxgl/dcsb/dcsbadd.jsp
查看文件 

@@ -49,7 +49,7 @@
 
 </head>

 

 <body onscroll="scrolldate()">

-<jsp:include page="../../../jyrselect.jsp"></jsp:include>

+<%-- <jsp:include page="../../../jyrselect.jsp"></jsp:include> --%>

 	<div class="box" >

 		<div class="box-content" >

 			<div class="apply_fill">

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/gkjyrmain.jsp
查看文件 

@@ -195,8 +195,8 @@
 
 								<c:if test="${gkjyr.recordStatus == 1 }">

 								<authz:hasPermission name="${appName}:jyrjbxx:edit">

 								 <a class="btn btn-default btn-xs" href="#"

-									onclick="gkjyr.main.edit('${gkjyr.id}')" title=""> <i

-										class="glyphicon glyphicon-wrench"></i> 

+									onclick="gkjyr.main.edit('${gkjyr.id}')" title="编辑"> <i

+										class="glyphicon glyphicon-pencil"></i> 

 								</a> 

 								</authz:hasPermission>

 								<authz:hasPermission name="${appName}:jyrjbxx:delete">

+ 13 - 14
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/jyradd.jsp
查看文件 

@@ -51,19 +51,20 @@
 
 							<td><span id="sfwhqysel"></span></td>

 						</tr>

 						<tr>

-							<th><span class="needwrite">*</span>经营人名称：</th>

-							<td colspan="3" ><input type="text" class="form-control" name="gkjyr" maxlength="200" style="width:99%">

-							</td>

 							<th>行政区划：</th>

-							<td>

+							<td colspan="2">

 								<div id="xzqhsel"></div>

 							</td>

 							<th>企业性质：<!-- 行政区划： --></th>

-							<td><span id="qyxzsel"></span></td>

-							

-							<!-- <th></th>

-							<td>

-							</td> -->

+							<td colspan="2"><span id="qyxzsel"></span></td>

+								<th>主营货种：</th>

+							<td><input type="text" class="form-control" name="zyhz" maxlength="200">

+							</td>

+						</tr>

+						<tr>

+							<th><span class="needwrite">*</span>经营人名称：</th>

+							<td colspan="7" ><input type="text" class="form-control" name="gkjyr" maxlength="200" style="width:99%">

+							</td>

 						</tr>

 						<tr>

 							<th>办公地址：</th>

@@ -75,7 +76,7 @@
 
 								onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))"

 								maxlength="400">

 							</td>

-							

+						

 						</tr>

 						<!-- <tr>

 							<th>经营许可证号<br>编号：</th>

@@ -98,9 +99,7 @@
 
 							<th>经营区域：</th>

 							<td colspan="5"><input type="text" class="form-control" name="jyqy" maxlength="2000" style="width:99%">

 							</td>

-							<th>主营货种：</th>

-							<td><input type="text" class="form-control" name="zyhz" maxlength="200">

-							</td>

+							

 						</tr> -->

 						<tr>

 							<th><span class="needwrite">*</span>法定代表人<br>姓名：</th>

@@ -256,7 +255,7 @@
 
 						<tr>

 							<th>储罐数量（个）：</th>

 							<td colspan="2"><input readonly = "readonly" type="text"  class="form-control" name="cgsl" maxlength="100" style="width:97.5%"></td>

-							<th>储罐总容量<br>（立方米）：</th>

+							<th>罐体总容积<br>（立方米）：</th>

 							<td colspan="4"><input readonly = "readonly" type="text"  class="form-control" name="cgzrl" maxlength="100" style="width:98.75%"></td>

 						</tr>

 					</table>

+ 12 - 7
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/jyredit.jsp
查看文件 

@@ -54,16 +54,21 @@
 
 							<td  width="10%"><span id="sfwhqysel"></span></td>

 							</tr>

 						<tr>

-							<th>经营人名称：</th>

-							<td colspan="3"><input type="text" class="form-control" value="${gkjyr.gkjyr}" name="gkjyr" maxlength="200" style="width:99%">

-							</td>

+							

 							<th>行政区划：</th>

-							<td>

+							<td colspan="2">

 								<div id="xzqhsel"></div>

 							</td>

 							<th>企业性质：<!-- 行政区划： --></th>

-							<td><span id="qyxzsel"></span></td>

-						

+							<td colspan="2"><span id="qyxzsel"></span></td>

+							<th>主营货种：</th>

+							<td><input type="text" class="form-control" value="${gkjyr.zyhz}" name="zyhz" maxlength="200">

+							</td>

+						</tr>

+						<tr>

+							<th>经营人名称：</th>

+							<td colspan="7"><input type="text" class="form-control" value="${gkjyr.gkjyr}" name="gkjyr" maxlength="200" style="width:99%">

+							</td>

 						</tr>

 						<tr>

 							<th>办公地址：</th>

@@ -263,7 +268,7 @@
 
 						<tr>

 							<th>储罐数量（个）：</th>

 							<td colspan="2"><input readonly = "readonly" type="text"  class="form-control" value="${gkjyr.cgsl}" name="cgsl" maxlength="100" style="width:97.5%"></td>

-							<th>储罐总容量<br>（立方米）：</th>

+							<th>罐体总容积<br>（立方米）：</th>

 							<td colspan="4"><input readonly = "readonly" type="text"  class="form-control" value="${gkjyr.cgzrl}" name="cgzrl" maxlength="100" style="width:98.75%"></td>

 						</tr>

 					</table>

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/jyrview.jsp
查看文件 

@@ -231,7 +231,7 @@
 
 						<tr>

 							<th>储罐数量（个）：</th>

 							<td colspan="2">${gkjyr.cgsl}</td>

-							<th>储罐总容量<br>（立方米）：</th>

+							<th>罐体总容积<br>（立方米）：</th>

 							<td colspan="4">${gkjyr.cgzrl}</td>

 						</tr>

 					</table>

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgmain.jsp
查看文件 

@@ -168,7 +168,7 @@
 
 									<c:if test ="${xkz.opflag == 1 }">

 								<a class="btn btn-default btn-xs" href="#"

 									onclick="parent.main.menuClick('xkzxx','许可证信息','/xkzxx/editxkz?id=${xkz.id}&status=12')"  title="发证"> <i

-										class="glyphicon glyphicon-search"></i>

+										class="glyphicon glyphicon-th-list"></i>

 										</a>

 								</c:if>

 								<c:if test="${xkz.taskState =='Y'}">

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/dcxxadd.jsp
查看文件 

@@ -119,7 +119,7 @@ function clickdc(){
 
 					str+="<td>"+dc.wxpdczw+"</td>";

 					str+="<td>";

 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxview('"+dc.id+"')\"> <i class='glyphicon glyphicon-search'></i> 查看</a>";

-					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxedit('"+dc.id+"')\"> <i class='glyphicon glyphicon-wrench'></i> 编辑</a>";

+					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxedit('"+dc.id+"')\"> <i class='glyphicon glyphicon-pencil'></i> 编辑</a>";

 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxdelete('"+dc.id+"')\"> <i class='glyphicon glyphicon-trash'></i> 删除</a>";

 					str+="</td>";

 					str+="</tr>";

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqmain.jsp
查看文件 

@@ -165,7 +165,7 @@
 
 								<c:if test ="${xkz.opflag == 1 }">

 								<a class="btn btn-default btn-xs" href="#"

 									onclick="parent.main.menuClick('xkzxx','许可证信息','/xkzxx/editxkz?id=${xkz.id}&status=11')"  title="发证"> <i

-										class="glyphicon glyphicon-search"></i>

+										class="glyphicon glyphicon-th-list"></i>

 										</a>

 								</c:if>

 							 <c:if test="${xkz.taskState =='Y'}">

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxmain.jsp
查看文件 

@@ -151,7 +151,7 @@
 
 									<c:if test ="${xkz.opflag == 1 }">

 								<a class="btn btn-default btn-xs" href="#"

 									onclick="parent.main.menuClick('xkzxx','许可证信息','/xkzxx/editxkz?id=${xkz.id}&status=13')"  title="发证"> <i

-										class="glyphicon glyphicon-search"></i>

+										class="glyphicon glyphicon-th-list"></i>

 										</a>

 								</c:if>   

 									  <c:if test="${xkz.taskState =='Y'}">

+ 51 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/pageinforcb.jsp
查看文件 

@@ -0,0 +1,51 @@
 
+<%@ page contentType="text/html;charset=UTF-8"%>
 
+
 
+<script>
 
+/* $(document).ready(function () {
 
+	pageinfo3();
 
+}); */
 
+</script>
 
+
 
+<table class="search_button_table" >
 
+		<tr>
 
+			<td></td>
 
+         <td style="text-align: center;">
 
+            <%--  <select id="pagesize"
 
+		name="rows" num="${page.rows}"><option value="10">10</option>
 
+			<option value="20">20</option></select> --%>
 
+       <!--   </td>
 
+         <td style="text-align: center;"> -->
 
+             <a href="#" id="pagefirst" style="color: #618fbc;"><i class="glyphicon glyphicon-step-backward" ></i> </a>
 
+			 <a href="#" id="pageprev" style="color: #618fbc;"><i class="glyphicon glyphicon glyphicon-chevron-left"></i> </a>
 
+			 <span>第</span>
 
+			 <spna><input type="text" 
+		id="pagejump" name="page" style="width: 50px;"></spna>
 
+		<span>页</span>
 
+		<span id="gongpage"></span>
 
+			 <a href="#" id="pagenext" style="color: #618fbc;"><i class="glyphicon glyphicon glyphicon-chevron-right"></i> </a>
 
+			 <a href="#" id="pagelast" style="color: #618fbc;"><i class="glyphicon glyphicon-step-forward"></i> </a>
 
+          </td>
 
+         <td style="text-align: right;">
 
+				<span id="nowshow"> </span>,<span class="all_page" id="gongsize"></span>
 
+         </td>
 
+     </tr>
 
+    </table>
 
+<input type="hidden"  id="pagecur">
 
+<input type="hidden"  id="pagetotal">
 
+<input type="hidden"  id="pagesort" name="sort">
 
+<input type="hidden"  id="pageorder" name="order"> 
+<!-- <div class="pages">
 
+	<input class="selected" type="text" value="1" readonly="readonly">
 
+	<input type="text" value="2" readonly="readonly">
 
+	<input type="text" value="3" readonly="readonly">
 
+	<input type="text" value="4" readonly="readonly">
 
+	<input type="text" value="5" readonly="readonly">
 
+	<input type="text" value="6" readonly="readonly">
 
+	<input type="text" value="7" readonly="readonly">
 
+	<input type="text" value="8" readonly="readonly">
 
+	<input type="text" value="9" readonly="readonly">
 
+	<input type="text" value="10" readonly="readonly">
 
+	<span>1/18页</span>
 
+	<input type="text" style="width: 50px;" value="下一页" readonly="readonly">
 
+</div>
 
+ -->

+ 5 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/sys/main.jsp
查看文件 

@@ -136,8 +136,11 @@
 
 			        <div id="tips_main">
 
 			            <div id="tips_main_0" style="display:none;">
 
 			            	<p id="xkzwarn"></p>
 
-			            	<p id="jdtxwarn"></p>
 
+			            	<!-- <p id="jdtxwarn"></p> -->
 
 			            	<p id="tzggwarn"></p>
 
+			            	<p id="jsjdcbsjwarn"></p>
 
+			            	<p id="jsjdbgwarn"></p>
 
+			            	<p id="jgsqwarn"></p>
 
 			            </div>
 
 			
 			            <div id="tips_main_1" >
 
@@ -147,6 +150,7 @@
 
 						 <p style="color:#FFF;">许可证变更【<span id="xkzbgnum" onclick="main.menuClick('todo','待办一览','/todo?type=xkzbg')" style="cursor: pointer;"></span>】</p>	
 						 <p style="color:#FFF;">许可证延续【<span id="xkzyxnum" onclick="main.menuClick('todo','待办一览','/todo?type=xkzyx')" style="cursor: pointer;"></span>】</p>	
 						 <p style="color:#FFF;">许可证注销【<span id="xkzzxnum" onclick="main.menuClick('todo','待办一览','/todo?type=xkzzx')" style="cursor: pointer;"></span>】</p>	
+		                 <p style="color:#FFF;">监督提醒【<span id="jdtxnum" onclick="main.menuClick('todo','待办一览','/todo?type=jdtx')" style="cursor: pointer;"></span>】</p>	
 		                </div>
 
 		                <div id="sjdiv" style="display: none">
 
 		                 <p style="color:#FFF;">理货申请【<span id="lhsqnum" onclick="main.menuClick('todo','待办一览','/todo?type=lhsq')" style="cursor: pointer;"></span>】</p>

+ 2 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/sys/todo.jsp
查看文件 

@@ -53,6 +53,7 @@
 
 	                        		<option value="xkzbg">许可证变更</option>

 	                        		<option value="xkzyx">许可证延续</option>

 	                        		<option value="xkzzx">许可证注销</option>

+	                        		<option value="jdtx">监督提醒</option>

 	                        		<option value="qt">其他</option>

 	                        		</c:if>

 	                        		<c:if test="${ssflag == 0 }">

@@ -62,6 +63,7 @@
 
 	                        		<option value="jsjdcbsj">建设进度初步设计申请</option>

 	                        		<option value="jsjdbg">建设进度初步设计变更</option>

 	                        		<option value="jgsq">建设进度竣工申请</option>

+	                        		<option value="jdtx">监督提醒申请</option>

 	                        		</c:if>

 	                        		

 	                        	</select>