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

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

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

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

@@ -106,7 +106,9 @@
 		<tr>
 			<th colspan="2">提交材料清单:&nbsp;</th>
 					<td colspan="3">
+					<c:if test="${ssFlag == 1 }"> 
 					<a href="#" class="file">上传<input type="file" name="file" id="fjid" onchange="xkzns.detail.submitFile()"/></a>
+					</c:if>
 					<table  id="tableId" style="width: 100%">
 						<tr>
 						<td style="width:40%;text-align: center;">上传附件名称</td>
@@ -137,9 +139,11 @@
 		   <i class="glyphicon glyphicon-check"></i> 
 		            选择人员</a>
 		</c:if>
+		 <c:if test="${ssFlag ==1 }">
   	<a class="btn btn-default btn-sm" href="#" onclick="lhbg.detail.save()">
   <i class="glyphicon glyphicon-floppy-disk"></i> 
            保存</a>
+           </c:if>
            <c:if test="${ssFlag ==0 }">
   	<a class="btn btn-default btn-sm" href="#" onclick="lhbg.detail.submit()">
   <i class="glyphicon glyphicon-share"></i> 

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

@@ -113,8 +113,8 @@
 								<a class="btn btn-default btn-xs" href="#" onclick="lhbg.main.view('${lhbg.id}')" title=" 查看">
 							            <i class="glyphicon glyphicon-search"></i> 
 							           </a>
-							 <c:if test="${lhbg.recordStatus == 1 }">     
-							      <c:if test="${ssFlag == 1 && lhbg.sftb == 'N'}"> 
+							 <c:if test="${lhbg.recordStatus == 1 && lhbg.sftb == 'N' }">     
+							      <c:if test="${ssFlag == 1 }"> 
 							     <a class="btn btn-default btn-xs" href="#"  onclick="lhbg.main.submit('${lhbg.id}')" title="同步">
 						   <i class="glyphicon glyphicon-share"></i>
 						            </a>

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

@@ -163,7 +163,9 @@
 								<tr>
 									<th>申请材料清单：&nbsp;</th>
 									<td colspan="3">
+									<c:if test="${ssFlag ==1 }">
 										<a href="#" class="file">上传<input type="file" name="file" id="fjid" onchange="lhsq.detail.submitFile()"/></a>
+										</c:if>
 										<table  id="tableId" style="width: 100%">
 											<tr>
 											<td style="width:40%;text-align: center;">上传附件名称</td>
@@ -172,12 +174,12 @@
 											<c:forEach items="${fjlist }" var="fj" varStatus="status">
 												<tr align="center">
 												<td><a class='main_title' href='/jsjy/accessory/download?id=${fj.fjid }'>${fj.fjmc }</a></td>
+												
+												<td>
 												<c:if test="${ssFlag ==1 }">
-												<td><a class="btn btn-default btn-xs" href="#" onclick="lhyx.detail.delFj('${fj.id}',this)">删除</a></td>
-												</c:if>
-												<c:if test="${ssFlag ==0 }">
-												<td></td>
+												<a class="btn btn-default btn-xs" href="#" onclick="lhyx.detail.delFj('${fj.id}',this)">删除</a>
 												</c:if>
+												</td>
 												</tr>
 											</c:forEach>
 										</table>

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

@@ -116,8 +116,8 @@
 								<a class="btn btn-default btn-xs" href="#" onclick="lhyx.main.view('${lhyx.id}')" title="查看">
 							            <i class="glyphicon glyphicon-search"></i> 
 							           </a>
-							 <c:if test="${lhyx.recordStatus == 1 }">     
-							      <c:if test="${ssFlag == 1 && lhyx.sftb == 'N'  }"> 
+							 <c:if test="${lhyx.recordStatus == 1  && lhyx.sftb == 'N' }">     
+							      <c:if test="${ssFlag == 1  }"> 
 							     <a class="btn btn-default btn-xs" href="#"  onclick="lhyx.main.submit('${lhyx.id}')" title="同步">
 						  			 <i class="glyphicon glyphicon-share"></i>
 						            </a>

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/ctl/LhbgCtl.java

@@ -247,7 +247,10 @@ public class LhbgCtl extends BaseWebCtl {
 		String currName = "";
 		TaskInfoEntity taskinfo = taskInfoService.findByStep(id, LhbgEntity.PROCESS_DEFINITION_KEY);
 		if (taskinfo != null) {
-			if ("kssc".equals(taskinfo.getTaskKey())) {
+			if("sljbr".equals(taskinfo.getTaskKey())) {
+				roleCode = Constants.ROLE_KS;
+				currName = "科室审查";
+			}if ("kssc".equals(taskinfo.getTaskKey())) {
 				roleCode = Constants.ROLE_FGLD;
 				currName = "分管领导审批";
 			} else if ("fgldsp".equals(taskinfo.getTaskKey())) {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/ctl/LhsqCtl.java

@@ -143,7 +143,7 @@ public class LhsqCtl extends BaseWebCtl {
 						if ("1".equals(entity.getFlowstatus())) {
 							vo.setCurrentname("退回地市");
 						} else if ("2".equals(entity.getFlowstatus())) {
-							vo.setCurrentname("完成且数据已同步");
+							vo.setCurrentname("完成");
 						}
 					}
 
@@ -305,7 +305,10 @@ public class LhsqCtl extends BaseWebCtl {
 		String currName = "";
 		TaskInfoEntity taskinfo = taskInfoService.findByStep(id, LhsqEntity.PROCESS_DEFINITION_KEY);
 		if (taskinfo != null) {
-			if ("kssc".equals(taskinfo.getTaskKey())) {
+			if("sljbr".equals(taskinfo.getTaskKey())) {
+				roleCode = Constants.ROLE_KS;
+				currName = "科室审查";
+			}else if ("kssc".equals(taskinfo.getTaskKey())) {
 				roleCode = Constants.ROLE_FGLD;
 				currName = "分管领导审批";
 			} else if ("fgldsp".equals(taskinfo.getTaskKey())) {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/ctl/LhyxCtl.java

@@ -261,7 +261,10 @@ public class LhyxCtl extends BaseWebCtl {
 		String currName = "";
 		TaskInfoEntity taskinfo = taskInfoService.findByStep(id, LhyxEntity.PROCESS_DEFINITION_KEY);
 		if (taskinfo != null) {
-			if ("kssc".equals(taskinfo.getTaskKey())) {
+			if("sljbr".equals(taskinfo.getTaskKey())) {
+				roleCode = Constants.ROLE_KS;
+				currName = "科室审查";
+			}if ("kssc".equals(taskinfo.getTaskKey())) {
 				roleCode = Constants.ROLE_FGLD;
 				currName = "分管领导审批";
 			} else if ("fgldsp".equals(taskinfo.getTaskKey())) {