Forráskód Böngészése

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

ld_xuhx 9 éve
szülő
commit
ad0dd7e3e5

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

@@ -145,6 +145,12 @@
 				fjgt(jsjdgl.detail.fjid81,'scbt81','tjbt81');
 				jsjdgl.detail.fjid82='${fjList82.fjid }';
 				fjgt(jsjdgl.detail.fjid82,'scbt82','tjbt82');
+				jsjdgl.detail.fjid83='${fjList83.fjid }';
+				fjgt(jsjdgl.detail.fjid83,'scbt83','tjbt83');
+				jsjdgl.detail.fjid84='${fjList84.fjid }';
+				fjgt(jsjdgl.detail.fjid84,'scbt84','tjbt84');
+				jsjdgl.detail.fjid85='${fjList85.fjid }';
+				fjgt(jsjdgl.detail.fjid85,'scbt85','tjbt85');
 			}else {
 				$("#axlyspli").addClass("active");
 				$("#axlysp").addClass("tab-pane fade in active");
@@ -568,9 +574,11 @@
 						<th width="10%">批文单位</th>
 						<th width="10%">文号</th>
 						<th width="10%">批文时间</th>
-						<c:if test="${spflag==3 && opflag == 3}">
+						<c:if test="${record.flowstatus == '' || record.flowstatus == null }">
+						<c:if test="${spflag==3 || opflag == 3}">
 						<th width="15%">操作</th>
 						</c:if>
+						</c:if>
 					</tr>
 				<tr height="40px">
 				    <td>
@@ -593,7 +601,7 @@
 					<td>
 								<span id="fbsj31">${recordfj31.fbsj }</span>
 					</td>
-					
+					<c:if test="${record.flowstatus == '' || record.flowstatus == null }">
 					<c:if test="${spflag!=3 && opflag == 3 }">
 					<td>
 					<a id="tjbt31" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('31')">
@@ -604,7 +612,8 @@
 					 </c:if>	           
 					<c:if test="${spflag==3  && opflag == 3 }">
 					<td></td>
-					</c:if>     
+					</c:if>  
+					</c:if>   
 				</tr>
 				
 				<tr height="40px">
@@ -628,7 +637,7 @@
 					<td>
 								<span id="fbsj32">${recordfj32.fbsj }</span>
 					</td>
-					
+					<c:if test="${record.flowstatus == '' || record.flowstatus == null }">
 					<c:if test="${spflag!=3  && opflag == 3 }">
 					<td>
 					<a id="tjbt32" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('32')">
@@ -639,7 +648,8 @@
 					</c:if>	           
 					<c:if test="${spflag==3  && opflag == 3 }">
 					<td></td>
-					</c:if>     
+					</c:if> 
+					</c:if>    
 				</tr>
 				<tr height="40px">
 				    <td>
@@ -662,7 +672,7 @@
 					<td>
 								<span id="fbsj33">${recordfj33.fbsj }</span>
 					</td>
-					
+					<c:if test="${record.flowstatus == '' || record.flowstatus == null }">
 					<c:if test="${spflag!=3  && opflag == 3 }">
 					<td>
 					<a id="tjbt33" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('33')">
@@ -673,7 +683,8 @@
 					</c:if>	  
 					<c:if test="${spflag==3  && opflag == 3 }">
 					<td></td>
-					</c:if>            
+					</c:if> 
+					</c:if>           
 					<tr>
 					<td>4</td>
 					<td>审查会议纪要</td>
@@ -686,6 +697,7 @@
 					<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="${record.flowstatus == '' || record.flowstatus == null }">
 					<c:if test="${spflag ==3  && opflag == 3 }">
 					<td>
 					<a id="tjbt34" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('34')">
@@ -696,7 +708,8 @@
 					</c:if>	 
 					<c:if test="${spflag!=3  && opflag == 3 }">
 					<td></td>
-					</c:if>        
+					</c:if>  
+					</c:if>      
 				</tr>
 				<tr>
 					<td>5</td>
@@ -710,6 +723,7 @@
 					<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="${record.flowstatus == '' || record.flowstatus == null }">
 					<c:if test="${spflag==3  && opflag == 3 }">
 					<td>
 					<a id="tjbt35" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('35')">
@@ -720,7 +734,8 @@
 					</c:if>	
 					<c:if test="${spflag!=3  && opflag == 3 }">
 					<td></td>
-					</c:if>            
+					</c:if> 
+					</c:if>           
 				</tr>
 				<tr>
 					<td>6</td>
@@ -734,6 +749,7 @@
 					<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="${record.flowstatus == '' || record.flowstatus == null }">
 					<c:if test="${spflag==3  && opflag == 3 }">
 					<td>
 					<a id="tjbt36" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('36')">
@@ -744,7 +760,8 @@
 					</c:if>	 
 					<c:if test="${spflag!=3  && opflag == 3 }">
 					<td></td>
-					</c:if>            
+					</c:if>    
+					 </c:if>   
 				</tr>
 				<tr>
 					<td>7</td>
@@ -758,6 +775,7 @@
 					<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="${record.flowstatus == '' || record.flowstatus == null }">
 					<c:if test="${spflag==3  && opflag == 3 }">
 					<td>
 					<a id="tjbt37" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('37')">
@@ -768,7 +786,8 @@
 					</c:if>	 
 					<c:if test="${spflag!=3  && opflag == 3 }">
 					<td></td>
-					</c:if>            
+					</c:if>    
+					</c:if>        
 				</tr>
 				<tr>
 					<td>8</td>
@@ -782,6 +801,7 @@
 					<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="${record.flowstatus == '' || record.flowstatus == null }">
 					<c:if test="${spflag==3  && opflag == 3 }">
 					<td>
 					<a id="tjbt38" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('38')">
@@ -792,7 +812,8 @@
 					</c:if>	 
 					<c:if test="${spflag!=3  && opflag == 3 }">
 					<td></td>
-					</c:if>            
+					</c:if> 
+					</c:if>           
 				</tr>
 				<c:forEach items="${fjvolist3}" var="qtfj" varStatus="status">
 						<tr height="40px">
@@ -1412,9 +1433,11 @@
 						<th width="10%">批文单位</th>
 						<th width="10%">文号</th>
 						<th width="10%">批文时间</th>
-						<c:if test="${spflag!=8 && opflag == 8  }">
+						<c:if test="${record.flowstatus == 2 || record.flowstatus == null }">
+						<c:if test="${spflag==8 || opflag == 8  }">
 						<th width="15%">操作</th>
 						</c:if>
+						</c:if>
 					</tr>
 				<tr height="40px">
 				    <td>
@@ -1437,7 +1460,7 @@
 					<td>
 								<span id="fbsj81">${recordfj81.fbsj }</span>
 					</td>
-					
+					<c:if test="${record.flowstatus == 2 || record.flowstatus == null }">
 					<c:if test="${spflag!=8 && opflag == 8 }">
 					<td>
 					<a id="tjbt81" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('81')">
@@ -1446,7 +1469,10 @@
 							           删除</a>
 					</td> 
 					 </c:if>	           
-					
+					 <c:if test="${spflag==8 && opflag == 8 }">
+					 <Td></Td>
+					 </c:if>	
+					 </c:if>
 				</tr>
 				
 				<tr height="40px">
@@ -1470,7 +1496,7 @@
 					<td>
 								<span id="fbsj82">${recordfj82.fbsj }</span>
 					</td>
-					
+					<c:if test="${record.flowstatus == 2 || record.flowstatus == null }">
 					<c:if test="${spflag!=8 && opflag == 8 }">
 					<td>
 					<a id="tjbt82" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('82')">
@@ -1479,9 +1505,12 @@
 							           删除</a>
 					</td> 
 					 </c:if>	           
-					
+					 <c:if test="${spflag==8 && opflag == 8 }">
+					 <Td></Td>
+					 </c:if>	
+					 </c:if>
 				</tr>
-				 <c:if test="${ record.flowstatus > 2  }">
+				
 				<tr>
 					<td>3</td>
 					<td>竣工验收鉴定书</td>
@@ -1494,7 +1523,21 @@
 					<td><span id="fbdw83">${recordfj83.fbdw }</span></td>
 					<td><span id="wjh83">${recordfj83.wjh }</span></td>
 					<td><span id="fbsj83">${recordfj83.fbsj }</span></td>
+					<c:if test="${record.flowstatus == 2 || record.flowstatus == null }">
+					<c:if test="${spflag==8 && opflag == 8 }">
+					<td>
+					<a id="tjbt83" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('83')">
+							           添加</a>
+					<a id="scbt83" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('83')">
+							           删除</a>
+					</td> 
+					 </c:if>
+					  <c:if test="${spflag!=8 && opflag == 8 }">
+					 <Td></Td>
+					 </c:if>
+					 </c:if>		    
 				</tr>
+				<Tr>
 					<td>4</td>
 					<td>专家审查意见</td>
 					<td><input type="hidden" class="form-control"
@@ -1506,6 +1549,19 @@
 					<td><span id="fbdw84">${recordfj84.fbdw }</span></td>
 					<td><span id="wjh84">${recordfj84.wjh }</span></td>
 					<td><span id="fbsj84">${recordfj84.fbsj }</span></td>
+					<c:if test="${record.flowstatus == 2 || record.flowstatus == null }">
+					<c:if test="${spflag==8 && opflag == 8 }">
+					<td>
+					<a id="tjbt84" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('84')">
+							           添加</a>
+					<a id="scbt84" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('84')">
+							           删除</a>
+					</td> 
+					 </c:if>	
+					  <c:if test="${spflag!=8 && opflag == 8 }">
+					 <Td></Td>
+					 </c:if>	    
+					 </c:if>
 				</tr>
 				<tr>
 					<td>5</td>
@@ -1519,8 +1575,21 @@
 					<td><span id="fbdw85">${recordfj85.fbdw }</span></td>
 					<td><span id="wjh85">${recordfj85.wjh }</span></td>
 					<td><span id="fbsj85">${recordfj85.fbsj }</span></td>
+					<c:if test="${record.flowstatus == 2 || record.flowstatus == null }">
+					<c:if test="${spflag==8 && opflag == 8 }">
+					<td>
+					<a id="tjbt85" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('85')">
+							           添加</a>
+					<a id="scbt85" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('85')">
+							           删除</a>
+					</td> 
+					 </c:if>
+					 <c:if test="${spflag!=8 && opflag == 8 }">
+					 <Td></Td>
+					 </c:if>	    
+					 </c:if>
 				</tr>
-				</c:if>
+				
 				<c:forEach items="${fjvolist8}" var="qtfj" varStatus="status">
 						<tr height="40px">
 							<td>${status.index+3}</td>
@@ -1538,7 +1607,7 @@
 				<td colspan=1 >
 			                           审批意见
 				</td>
-				<td colspan=5> 
+				<td colspan=6> 
 				     <textarea  class="form-control" name="spyj8" id="spyj8" style="height:100px;" value="${xmxxfb.yj }"></textarea>
 				</td>
 				</tr>
@@ -1677,47 +1746,69 @@
                     </c:if>
                     <c:if test="${sfjyr=='' }">
 					<c:if test="${flag=='audit' }">
-					<c:if test="${record.flowstatus == '1' || record.flowstatus == '3'  }">
-					<c:if test="${sfjyr!=1 }">	            
-					<a id="tuihuibt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('N','${record.id}')">
-							   <i class="glyphicon glyphicon-ban-circle"></i> 
-							            退回</a>
-					</c:if>
-						
-						
-					</c:if>
-					<c:if test="${record.flowstatus == '2' || record.flowstatus == '4' }">
+						<c:if test="${record.flowstatus == '1' || record.flowstatus == '3'  }">
+								<c:if test="${sfjyr!=1 }">	            
+								<a id="tuihuibt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('N','${record.id}')">
+									   <i class="glyphicon glyphicon-ban-circle"></i> 
+									            退回</a>
+							</c:if>
+							
+							
+						</c:if>
+					<c:if test="${ (spflag =='3' && record.flowstatus == '2') || (spflag =='8' && record.flowstatus == '4') }">
 						<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="${sfjyr!=1 }">	            
-					<a id="tuihuibt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('N','${record.id}')">
+						<a id="tuihuibt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('N','${record.id}')">
 							   <i class="glyphicon glyphicon-ban-circle"></i> 
-							            退回</a>
-					</c:if>
+							           退回</a>
 					</c:if>
+					</c:if> 
+					
+					
 					
 					<c:if test="${record.flowstatus == '' || record.flowstatus == null }">
-					<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('Y','${record.id}')">
+							<c:if test="${ (spflag =='3') }">
+							<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 test="${sfjyr!=1 }">	            
-					<a id="tuihuibt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('N','${record.id}')">
+							<a id="tuihuibt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('N','${record.id}')">
 							   <i class="glyphicon glyphicon-ban-circle"></i> 
-							            退回</a>
+							          退回</a>
+							          </c:if>
 					</c:if>
 					</c:if>	
 					
+					<c:if test="${  spflag == '8' && (record.flowstatus == 2 || record.flowstatus == '' || record.flowstatus == null )}">
+						<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>
+							<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 test="${sfjyr!=1 }">	            
+							<a id="tuihuibt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('N','${record.id}')">
+									   <i class="glyphicon glyphicon-ban-circle"></i> 
+									         退回</a>
+							</c:if>
 					</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}')">