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

gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/jdjc/jdjcmain.jsp

@@ -150,7 +150,7 @@
 							<c:if test="${ jdjc.recordStatus  > 1 }">
 									<a class="btn btn-default btn-xs" href="#"
 									onclick="hisList('${jdjc.id}','jdjc')" title="流程历史"> <i
-										class="glyphicon glyphicon-list-alt"></i>
+										class="glyphicon glyphicon-retweet"></i>
 									</a>
 								</c:if>
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgbg/jgbgmain.jsp

@@ -153,7 +153,7 @@
 									<c:if test="${ jgbg.recordStatus  > 1 }">
 									<a class="btn btn-default btn-xs" href="#"
 									onclick="hisList('${jgbg.id}','jgbg')" title="流程历史"> <i
-										class="glyphicon glyphicon-list-alt"></i>
+										class="glyphicon glyphicon-retweet"></i>
 									</a>
 								</c:if>
 					        </td>

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

@@ -156,7 +156,7 @@
 									<c:if test="${ jgsq.recordStatus  > 1 }">
 									<a class="btn btn-default btn-xs" href="#"
 									onclick="hisList('${jgsq.id}','jgsq')" title="流程历史"> <i
-										class="glyphicon glyphicon-list-alt"></i>
+										class="glyphicon glyphicon-retweet"></i>
 									</a>
 								</c:if>
 								</c:if>

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

@@ -152,7 +152,7 @@
 									<c:if test="${ jsjdbg.recordStatus  > 1 }">
 									<a class="btn btn-default btn-xs" href="#"
 									onclick="hisList('${jsjdbg.id}','jsjdbg')" title="流程历史"> <i
-										class="glyphicon glyphicon-list-alt"></i>
+										class="glyphicon glyphicon-retweet"></i>
 									</a>
 								</c:if>
 					        </td>

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

@@ -62,6 +62,16 @@
 				fjgt(jsjdgl.detail.fjid32,'scbt32','tjbt32');
 				jsjdgl.detail.fjid33='${fjList33.fjid }';
 				fjgt(jsjdgl.detail.fjid33,'scbt33','tjbt33');
+				jsjdgl.detail.fjid34='${fjList34.fjid }';
+				fjgt(jsjdgl.detail.fjid34,'scbt34','tjbt34');
+				jsjdgl.detail.fjid35='${fjList35.fjid }';
+				fjgt(jsjdgl.detail.fjid35,'scbt35','tjbt35');
+				jsjdgl.detail.fjid36='${fjList36.fjid }';
+				fjgt(jsjdgl.detail.fjid36,'scbt36','tjbt34');
+				jsjdgl.detail.fjid37='${fjList37.fjid }';
+				fjgt(jsjdgl.detail.fjid37,'scbt37','tjbt37');
+				jsjdgl.detail.fjid38='${fjList38.fjid }';
+				fjgt(jsjdgl.detail.fjid38,'scbt38','tjbt38');
 			}else if(opflag== 4){
 				$("#sgtsjspli").addClass("active");
 				$("#sgtsjsp").addClass("tab-pane fade in active");
@@ -658,8 +668,7 @@
 					<a id="scbt33" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('33')">
 							           删除</a>
 					</td> 
-					</c:if>	   
-					 <c:if test="${ record.flowstatus > 0  }">         
+					</c:if>	         
 					<tr>
 					<td>4</td>
 					<td>审查会议纪要</td>
@@ -672,7 +681,14 @@
 					<td><span id="fbdw34">${recordfj34.fbdw }</span></td>
 					<td><span id="wjh34">${recordfj34.wjh }</span></td>
 					<td><span id="fbsj34">${recordfj34.fbsj }</span></td>
-				
+					<c:if test="${spflag!=3  && opflag == 3 }">
+					<td>
+					<a id="tjbt34" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('34')">
+							           添加</a>
+					<a id="scbt34" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('34')">
+							           删除</a>
+					</td> 
+					</c:if>	         
 				</tr>
 				<tr>
 					<td>5</td>
@@ -686,7 +702,14 @@
 					<td><span id="fbdw35">${recordfj35.fbdw }</span></td>
 					<td><span id="wjh35">${recordfj35.wjh }</span></td>
 					<td><span id="fbsj35">${recordfj35.fbsj }</span></td>
-					
+					<c:if test="${spflag!=3  && opflag == 3 }">
+					<td>
+					<a id="tjbt35" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('35')">
+							           添加</a>
+					<a id="scbt35" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('35')">
+							           删除</a>
+					</td> 
+					</c:if>	         
 				</tr>
 				<tr>
 					<td>6</td>
@@ -700,7 +723,14 @@
 					<td><span id="fbdw36">${recordfj36.fbdw }</span></td>
 					<td><span id="wjh36">${recordfj36.wjh }</span></td>
 					<td><span id="fbsj36">${recordfj36.fbsj }</span></td>
-					
+					<c:if test="${spflag!=3  && opflag == 3 }">
+					<td>
+					<a id="tjbt36" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('36')">
+							           添加</a>
+					<a id="scbt36" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('36')">
+							           删除</a>
+					</td> 
+					</c:if>	         
 				</tr>
 				<tr>
 					<td>7</td>
@@ -714,7 +744,14 @@
 					<td><span id="fbdw37">${recordfj37.fbdw }</span></td>
 					<td><span id="wjh37">${recordfj37.wjh }</span></td>
 					<td><span id="fbsj37">${recordfj37.fbsj }</span></td>
-					
+					<c:if test="${spflag!=3  && opflag == 3 }">
+					<td>
+					<a id="tjbt37" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('37')">
+							           添加</a>
+					<a id="scbt37" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('37')">
+							           删除</a>
+					</td> 
+					</c:if>	         
 				</tr>
 				<tr>
 					<td>8</td>
@@ -728,9 +765,15 @@
 					<td><span id="fbdw38">${recordfj38.fbdw }</span></td>
 					<td><span id="wjh38">${recordfj38.wjh }</span></td>
 					<td><span id="fbsj38">${recordfj38.fbsj }</span></td>
-					
+					<c:if test="${spflag!=3  && opflag == 3 }">
+					<td>
+					<a id="tjbt33" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('38')">
+							           添加</a>
+					<a id="scbt33" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('38')">
+							           删除</a>
+					</td> 
+					</c:if>	         
 				</tr>
-				</c:if>
 				<c:forEach items="${fjvolist3}" var="qtfj" varStatus="status">
 						<tr height="40px">
 						<c:if test="${ record.flowstatus > 0  }">
@@ -1618,11 +1661,13 @@
 					<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('Y','${record.id}')">
 							   <i class="glyphicon glyphicon-ok-sign"></i> 
 							            同意</a>
+					<c:if test="${ (spflag =='3' || spflag == '8') }">
 					<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.saveTbzt('${record.id}')">
 							   <i class="glyphicon glyphicon-ok-sign"></i> 
 							    转报省级</a>
 					</c:if>
 					</c:if>
+					</c:if>
 					<c:if test="${sfjyr==1 }">
 					<c:if test="${flag=='audit' }">
 					<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('Y','${record.id}')">

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

@@ -212,7 +212,7 @@
 							    </c:if>
 							<!-- </td>
 							<td class="operatetd"> -->
-							<c:if test="${jsjdgl.taskState!=null && jsjdgl.sftb == 'N' }">
+							<c:if test="${jsjdgl.taskState!=null  }">
 							<a class="btn btn-default btn-xs" href="#"  onclick="jsjdgl.main.banli('${jsjdgl.id}')" title="办理">
 									   <i class="glyphicon glyphicon-check"></i> 
 									          </a>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdzx/jsjdzxmain.jsp

@@ -152,7 +152,7 @@
 									<c:if test="${ jsjdzx.recordStatus  > 1 }">
 									<a class="btn btn-default btn-xs" href="#"
 									onclick="hisList('${jsjdzx.id}','jsjdzx')" title="流程历史"> <i
-										class="glyphicon glyphicon-list-alt"></i>
+										class="glyphicon glyphicon-retweet"></i>
 									</a>
 								</c:if>
 					        </td>

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

@@ -168,8 +168,8 @@
 									<input type="hidden" id="flag" value="${tzjhgl.flag}">	
 									<c:if test="${tzjhgl.flag==1 }">
 									          <a class="btn btn-default btn-xs" href="#"
-									onclick="parent.main.menuClick('jsjdgl','建设进度管理','/jsjdgl/view?id=${tzjhgl.xmid}')" title="项目进度信息">   
-										<i class="glyphicon glyphicon-tasks"></i> 
+									onclick="parent.main.menuClick('jsjdgl','建设进度管理','/jsjdgl/view?id=${tzjhgl.xmid}')" title="项目进度">   
+										<i class="glyphicon glyphicon-time"></i> 
 								            </a>
 								    </c:if>
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxglmain.jsp

@@ -163,13 +163,13 @@
 									<input type="hidden" id="flag" value="${xmxxgl.flag}">	
 									<c:if test="${xmxxgl.showjsjd=='Y' }">        
 							            <a class="btn btn-default btn-xs" href="#"
-									onclick="parent.main.menuClick('jsjdgl','建设进度管理','/jsjdgl2/xiugai?id=${xmxxgl.id}')" title="项目进度">
-									<i class="	glyphicon glyphicon-tasks"></i></a>
+									onclick="parent.main.menuClick('jsjdgl','建设进度管理','/jsjdgl/xiugai?id=${xmxxgl.id}')" title="项目进度">
+									<i class="glyphicon glyphicon-time"></i></a>
 							        </c:if> 
 							       <c:if test="${xmxxgl.flagForYear==1 }">       
 							       <a class="btn btn-default btn-xs" href="#"
 									onclick="parent.main.menuClick('tzjhgl','投资计划管理','/tzjhgl/main?xmid=${xmxxgl.id}')" title="年度计划">
-									<i class="glyphicon glyphicon-pencil"></i> 
+									<i class="glyphicon glyphicon-list-alt"></i> 
 									</a>     
 							       </c:if>
 							</td>

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

@@ -137,7 +137,7 @@
 								<c:if test="${ dcsb.recordStatus  > 1  }">
 									<a class="btn btn-default btn-xs" href="#"
 									onclick="hisList('${dcsb.id}','dcsb')" title="流程历史"> <i
-										class="glyphicon glyphicon-list-alt"></i>
+										class="glyphicon glyphicon-retweet"></i>
 									</a>
 								</c:if>
 								</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzns/xkznsmain.jsp

@@ -148,7 +148,7 @@
 						 		<c:if test="${ xkzns.recordStatus  > 1 }">
 									<a class="btn btn-default btn-xs" href="#"
 									onclick="hisList('${xkzns.id}','xkzns')" title="流程历史"> <i
-										class="glyphicon glyphicon-list-alt"></i>
+										class="glyphicon glyphicon-retweet"></i>
 									</a>
 								</c:if>
 					        </td>

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

@@ -157,7 +157,7 @@
 						 		<c:if test="${ xkz.recordStatus  > 1 }">
 									<a class="btn btn-default btn-xs" href="#"
 									onclick="hisList('${xkz.id}','xkzbg')" title="流程历史"> <i
-										class="glyphicon glyphicon-list-alt"></i>
+										class="glyphicon glyphicon-retweet"></i>
 									</a>
 								</c:if>
 								<c:if test="${ xkz.recordStatus == '2'}">

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

@@ -124,7 +124,6 @@
 						<th width="10%">联系人 </th>
 						<th width="20%">联系电话</th>
 						<th width="1%" class="operatetd">操作</th>
-						<th width="1%" class="operatetd">审核</th>
 					</tr>
 					 <c:forEach items="${list}" var="xkz" varStatus="status">
 						<tr class="tr_bg">
@@ -154,7 +153,7 @@
 						 		<c:if test="${ xkz.recordStatus  > 1 }">
 									<a class="btn btn-default btn-xs" href="#"
 									onclick="hisList('${xkz.id}','xkzsq')" title="流程历史"> <i
-										class="glyphicon glyphicon-list-alt"></i>
+										class="glyphicon glyphicon-retweet"></i>
 									</a>
 								</c:if>
 								<c:if test="${ xkz.recordStatus == '2'}">
@@ -163,14 +162,17 @@
 										class="glyphicon glyphicon-search"></i>
 									</a>
 								</c:if>
-							</td>
-							<td class="operatetd">
 							 <c:if test="${xkz.taskState =='Y'}">
 							 <a class="btn btn-default btn-xs" href="#"  onclick="xkzsq.main.banli('${xkz.id}')" title="办理">
 									   <i class="glyphicon glyphicon-check"></i> 
 									          </a>
 							 </c:if>
 							  <c:if test="${xkz.taskState =='TH'}">
+							<authz:hasPermission name="${appName}:gkjyxksq:delete">		          
+									          <a class="btn btn-default btn-xs" href="#" onclick="xkzsq.main.del('${xkz.id}')" title="删除">
+									   <i class="glyphicon glyphicon-trash"></i> 
+									         </a>
+									         </authz:hasPermission>
 							 <a class="btn btn-default btn-xs" href="#"  onclick="xkzsq.main.back('${xkz.id}')" title="办理">
 									   <i class="glyphicon glyphicon-check"></i> 
 									          </a>

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

@@ -138,7 +138,7 @@
 									   <c:if test="${ xkz.recordStatus  > 1 }">
 									<a class="btn btn-default btn-xs" href="#"
 									onclick="hisList('${xkz.id}','xkzyx')" title="流程历史"> <i
-										class="glyphicon glyphicon-list-alt"></i>
+										class="glyphicon glyphicon-retweet"></i>
 									</a>
 								</c:if>   
 								

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

@@ -139,7 +139,7 @@
 									<c:if test="${ xkz.recordStatus  > 1 }">
 									<a class="btn btn-default btn-xs" href="#"
 									onclick="hisList('${xkz.id}','xkzzx')" title="流程历史"> <i
-										class="glyphicon glyphicon-list-alt"></i>
+										class="glyphicon glyphicon-retweet"></i>
 									</a>
 								</c:if>
 								<c:if test="${ xkz.recordStatus == '2'}">

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

@@ -132,7 +132,7 @@
 						 		<c:if test="${ lhbg.recordStatus  > 1  && ssFlag ==0}">
 									<a class="btn btn-default btn-xs" href="#"
 									onclick="hisList('${lhbg.id}','lhbg')" title="流程历史"> <i
-										class="glyphicon glyphicon-list-alt"></i>
+										class="glyphicon glyphicon-retweet"></i>
 									</a>
 								</c:if>
 						

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

@@ -132,7 +132,7 @@
 								<c:if test="${ lhsq.recordStatus  > 1  && ssFlag ==0 }">
 									<a class="btn btn-default btn-xs" href="#"
 									onclick="hisList('${lhsq.id}','lhsq')" title="流程历史"> <i
-										class="glyphicon glyphicon-list-alt"></i>
+										class="glyphicon glyphicon-retweet"></i>
 									</a>
 								</c:if>
 							

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

@@ -134,7 +134,7 @@
 						 		<c:if test="${ lhyx.recordStatus  > 1 && ssFlag ==0}">
 									<a class="btn btn-default btn-xs" href="#"
 									onclick="hisList('${lhyx.id}','lhyx')" title="流程历史"> <i
-										class="glyphicon glyphicon-list-alt"></i>
+										class="glyphicon glyphicon-retweet"></i>
 									</a>
 								</c:if>