Главная Обзор Помощь
Регистрация Вход
hs
/
jsgkj
2
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

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

ld_xuhx 8 лет назад
Родитель
9e3daa45da
Сommit
0525af67b3
18 измененных файлов с 78 добавлено и 38 удалено
Разделённый вид Показать статистику Diff
  1. 6 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/ax/axview.jsp
  2. 3 3
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/gq/gqmain.jsp
  3. 6 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/gq/gqview.jsp
  4. 6 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/md/mdview.jsp
  5. 10 3
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/mt/mtview.jsp
  6. 6 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/zyq/zyqview.jsp
  7. 7 10
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqedit.jsp
  8. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqmain.jsp
  9. 3 12
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgedit.jsp
  10. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgmain.jsp
  11. 6 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrbw/bwview.jsp
  12. 4 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgmain.jsp
  13. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqmain.jsp
  14. 4 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxmain.jsp
  15. 4 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/xkzzxmain.jsp
  16. 3 0
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/ctl/XkzbgCtl.java
  17. 3 0
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkyx/ctl/XkzyxCtl.java
  18. 3 0
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkzx/ctl/XkzzxCtl.java

+ 6 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/ax/axview.jsp
Просмотреть файл 

@@ -128,6 +128,11 @@
 
                   

 				</table>

 				<div  id="buttons">

+				<authz:hasPermission name="${appName}:ax:dtsh">

+					 <a class="btn btn-default btn-sm" href="#"  onclick="auditMap('ax','${record.zyid}','true')">

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

+							      地图审核</a>

+					</authz:hasPermission>

 					<a class="btn btn-default btn-sm" href="#"  onclick="ax.detail.back()">

 						<i class="glyphicon glyphicon-arrow-left"></i>返回

 					</a>

@@ -135,5 +140,6 @@
 
 			</div>

 		</div>

 	</div>

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

 </body>

 </html>

+ 3 - 3
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/gq/gqmain.jsp
Просмотреть файл 

@@ -115,17 +115,17 @@
 
 							<%-- <td>${gq.ssgkglbmzw }</td>

 							<td>${gq.gqnhhddm}</td> --%>

 							<td class="operatetd">

-							<authz:hasPermission name="${appName}:gkgl:main">

+							<authz:hasPermission name="${appName}:gqgl:main">

 								<a class="btn btn-default btn-xs" href="#" onclick="gq.main.view('${gq.id}')" title="查看">

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

 							            </a>

 							</authz:hasPermission>

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

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

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

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

 									          </a>

 				          </authz:hasPermission>

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

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

 									          <a class="btn btn-default btn-xs" href="#" onclick="gq.main.del('${gq.id}')" title="删除">

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

 									         </a>

+ 6 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/gq/gqview.jsp
Просмотреть файл 

@@ -150,6 +150,11 @@
 
 						</tr>

 					</table>

 					<div  id="buttons">

+					<authz:hasPermission name="${appName}:gqgl:dtsh">

+						<a class="btn btn-default btn-sm" href="#"  onclick="auditMap('gq','${record.zyid}','true')">

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

+							      地图审核</a>

+							     </authz:hasPermission>

 							             <a class="btn btn-default btn-sm" href="#"  onclick="gq.detail.back()">

 							   <i class="glyphicon glyphicon-arrow-left"></i> 

 							            返回</a>

@@ -158,6 +163,7 @@
 
 			

 		</div>

 	</div>

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

 </body>

 <%-- <body>

+ 6 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/md/mdview.jsp
Просмотреть файл 

@@ -118,6 +118,11 @@
 
 						</tr>

 					</table>

 					<div  id="buttons">

+					<authz:hasPermission name="${appName}:md:dtsh">

+					<a class="btn btn-default btn-sm" href="#"  onclick="auditMap('md','${record.zyid}','true')">

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

+							      地图审核</a>

+					</authz:hasPermission>		      

 							             <a class="btn btn-default btn-sm" href="#"  onclick="md.detail.back()">

 							   <i class="glyphicon glyphicon-arrow-left"></i> 

 							            返回</a>

@@ -126,5 +131,6 @@
 
 			

 		</div>

 	</div>

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

 </body>

 </html>

+ 10 - 3
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/mt/mtview.jsp
Просмотреть файл 

@@ -166,16 +166,23 @@
 
 						</tr> --%>

 					</table>

 					<div  id="buttons">

-							             <a class="btn btn-default btn-sm" href="#"  onclick="mt.detail.back()">

-							   <i class="glyphicon glyphicon-arrow-left"></i> 

-							            返回</a>

+					  <authz:hasPermission name="${appName}:mtxx:dtsh">

+					 <a class="btn btn-default btn-sm" href="#"  onclick="auditMap('mt','${record.zyid}','true')">

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

+							      地图审核</a>

+						</authz:hasPermission>

 							             <a class="btn btn-default btn-sm" href="#"  onclick="parent.main.menuClick('bwxx','泊位信息','/bw/main?ssjyr=${record.ssjyrzw}&ssmt=${record.id}&bz=${1}')">

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

 							            泊位信息</a>

+							            

+							             <a class="btn btn-default btn-sm" href="#"  onclick="mt.detail.back()">

+							   <i class="glyphicon glyphicon-arrow-left"></i> 

+							            返回</a>

           			</div>

 			</div>

 			

 		</div>

 	</div>

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

 </body>

 </html>

+ 6 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/zyq/zyqview.jsp
Просмотреть файл 

@@ -55,6 +55,11 @@
 
 					</tr>

 					</table>

 					<div  id="buttons">

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

+					<a class="btn btn-default btn-sm" href="#"  onclick="auditMap('zyq','${record.zyid}','true')">

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

+							      地图审核</a>

+						</authz:hasPermission>	      

 							   <a class="btn btn-default btn-sm" href="#"  onclick="zyq.detail.back()">

 							   <i class="glyphicon glyphicon-arrow-left"></i> 

 							            返回</a>

@@ -62,5 +67,6 @@
 
 			</div>

 		</div>

 	</div>

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

 </body>

 </html>

+ 7 - 10
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqedit.jsp
Просмотреть файл 

@@ -356,26 +356,23 @@
 
 							   <i class="glyphicon glyphicon-check"></i> 

 							            选择人员</a>

 					</c:if>

-                    <!-- 	<a class="btn btn-default btn-sm" href="###" onclick="jgsq.detail.save()">

-							   <i class="glyphicon glyphicon-floppy-disk"></i> 

-							            保存</a> -->

+                  

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

-							<c:if test="${flag == '' || flag == null}">

   

 					      <a class="btn btn-default btn-sm" href="###" onclick="jgsq.detail.submit()">

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

 							            提交</a>

-						</c:if>

-						<c:if test="${flag=='th'}">

-						<a class="btn btn-default btn-sm" href="###"  onclick="jgsq.detail.submitAudit()">

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

-						            提交</a>

+					

 						

 						<a class="btn btn-default btn-sm" href="###"  onclick="jgsq.detail.audit('N','${record.id}')">

 							   <i class="glyphicon glyphicon-ban-circle"></i> 

 							            退回</a>

 							       </c:if>

-							       </c:if>     

+						<c:if test="${ssFlag ==1 }">   

+						<a class="btn btn-default btn-sm" href="###" onclick="jgsq.detail.save()">

+							   <i class="glyphicon glyphicon-floppy-disk"></i> 

+							            保存</a>        

+							      </c:if>

 							             <a class="btn btn-default btn-sm" href="###"  onclick="jgsq.detail.back()">

 							   <i class="glyphicon glyphicon-arrow-left"></i> 

 							            返回</a>

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqmain.jsp
Просмотреть файл 

@@ -147,7 +147,7 @@
 
 							            <i class="glyphicon glyphicon-search"></i> 

 							            </a>

 							            </authz:hasPermission>

-							             <c:if test="${jgsq.recordStatus == 1 }">

+							             <c:if test="${jgsq.recordStatus == 1 && jgsq.sftb == 'N'}">

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

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

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

+ 3 - 12
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgedit.jsp
Просмотреть файл 

@@ -340,14 +340,7 @@
 
 					 <a class="btn btn-default btn-sm" href="###"  onclick="showRy()">

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

 							            选择人员</a>

-							            

-							            <c:if test="${flag == '' || flag == null}">

-  

-					      <a class="btn btn-default btn-sm" href="###" onclick="jsjdbg.detail.submit()">

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

-							            提交</a>

-						</c:if>

-						<c:if test="${flag=='th'}">

+					

 						<a class="btn btn-default btn-sm" href="###"  onclick="jsjdbg.detail.submit()">

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

 						            提交</a>

@@ -355,15 +348,13 @@
 
 						            <a class="btn btn-default btn-sm" href="###"  onclick="jsjdbg.detail.audit('N','${record.id}')">

 							   <i class="glyphicon glyphicon-ban-circle"></i> 

 							            退回</a>

-						</c:if>     

-					</c:if>

+					</c:if>     

+					

 					<c:if test="${ssFlag ==1 }">

                     	<a class="btn btn-default btn-sm" href="###" onclick="jsjdbg.detail.save()">

 							   <i class="glyphicon glyphicon-floppy-disk"></i> 

 							            保存</a>

 						</c:if>	            

-							

-						

 						

 							             <a class="btn btn-default btn-sm" href="###"  onclick="jsjdbg.detail.back()">

 							   <i class="glyphicon glyphicon-arrow-left"></i>

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdbg/jsjdbgmain.jsp
Просмотреть файл 

@@ -146,7 +146,7 @@
 
 							            <i class="glyphicon glyphicon-search"></i> 

 							            </a>

 							            </authz:hasPermission>

-							             <c:if test="${jsjdbg.recordStatus == 1 }">

+							             <c:if test="${jsjdbg.recordStatus == 1 && jsjdbg.sftb == 'N'}">

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

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

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

+ 6 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrbw/bwview.jsp
Просмотреть файл 

@@ -314,6 +314,11 @@
 
                    	</tr>

 			</table>

 			<div id="buttons">

+				<authz:hasPermission name="${appName}:bwxx:dtsh">      

+							      <a class="btn btn-default btn-sm" href="#"  onclick="auditMap('bw','${record.zyid}','true')">

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

+							      地图审核</a>

+							</authz:hasPermission>

 			    <a class="btn btn-default btn-sm" href="#"  onclick="bw.detail.back()">

 			   		<i class="glyphicon glyphicon-arrow-left"></i>返回

 			   	</a>

@@ -321,5 +326,6 @@
 
     	</div>

 	</div>

 </div>

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

 </body>

 </html>

+ 4 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgmain.jsp
Просмотреть файл 

@@ -119,8 +119,9 @@
 
 						<th width="20%">港口经营人</th>

 						<th width="20%">办公地点</th>

 						<th width="10%">法定代表</th>

-						<th width="10%">联系人 </th>

-						<th width="10%">联系电话</th>

+						<th width="8%">联系人 </th>

+						<th width="8%">联系电话</th>

+						<th width="8%">流程状态</th>

 						<th width="1%" class="operatetd">操作</th>

 					</tr>

 					 <c:forEach items="${list}" var="xkz" varStatus="status">

@@ -137,6 +138,7 @@
 
 							</td> 

 							<td>${xkz.lxr }</td>

 							<td>${xkz.dh }</td>

+							<td>${xkz.currentname }</td>

 							<td class="operatetd">

 								<a class="btn btn-default btn-xs" href="#" onclick="xkzbg.main.view('${xkz.id}')" title="查看">

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

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqmain.jsp
Просмотреть файл 

@@ -121,9 +121,9 @@
 
 						<th width="20%">港口经营人</th>

 						<th width="20%">办公地点</th>

 						<th width="15%">法定代表人</th>

-						<th width="15%">联系人 </th>

+						<th width="10%">联系人 </th>

 						<th width="10%">联系电话</th>

-						<th width="5%">流程状态</th>

+						<th width="10%">流程状态</th>

 						<th width="1%" class="operatetd">操作</th>

 					</tr>

 					 <c:forEach items="${list}" var="xkz" varStatus="status">

+ 4 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxmain.jsp
Просмотреть файл 

@@ -105,8 +105,9 @@
 
 						<th width="20%">港口经营人</th>

 						<th width="20%">办公地点</th>

 						<th width="15%">法定代表人</th>

-						<th width="15%">联系人 </th>

-						<th width="15%">联系电话</th>

+						<th width="10%">联系人 </th>

+						<th width="10%">联系电话</th>

+						<th width="10%">流程状态</th>

 						<th width="1%" class="operatetd">操作</th>

 						<!-- <th width="1%" class="operatetd">审核</th> -->

 					</tr>

@@ -118,6 +119,7 @@
 
 							<td>${xkz.fddbr }</td>

 							<td>${xkz.lxr }</td>

 							<td>${xkz.lxdh }</td>

+							<td>${xkz.currentname }</td>

 							<td class="operatetd">

 								<a class="btn btn-default btn-xs" href="#" onclick="xkzyx.main.view('${xkz.id}')" title="查看">

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

+ 4 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/xkzzxmain.jsp
Просмотреть файл 

@@ -106,8 +106,9 @@
 
 						<th width="20%">港口经营人</th>

 						<th width="20%">办公地点</th>

 						<th width="15%">法定代表人</th>

-						<th width="15%">联系人 </th>

-						<th width="15%">联系电话</th>

+						<th width="10%">联系人 </th>

+						<th width="10%">联系电话</th>

+						<th width="10%">流程状态</th>

 						<th width="1%" class="operatetd">操作</th>

 						<!-- <th width="1%" class="operatetd">审批 </th> -->

 					</tr>

@@ -119,6 +120,7 @@
 
 							<td>${xkz.fddbr }</td>

 							<td>${xkz.lxr }</td>

 							<td>${xkz.lxdh }</td>

+							<td>${xkz.currentname }</td>

 							<td class="operatetd">

 								<a class="btn btn-default btn-xs" href="#" onclick="xkzzx.main.view('${xkz.id}')" title="查看">

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

+ 3 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/ctl/XkzbgCtl.java
Просмотреть файл 

@@ -339,6 +339,9 @@ public class XkzbgCtl extends BaseWebCtl {
 
 							vo.setOpflag("1");

 						}

 					}

+					if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {

+						vo.setCurrentname("完成");

+					}

 					voList.add(vo);

 				}

 			}

+ 3 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkyx/ctl/XkzyxCtl.java
Просмотреть файл 

@@ -280,6 +280,9 @@ public class XkzyxCtl extends BaseWebCtl {
 
 							vo.setOpflag("1");

 						}

 					}

+					if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {

+						vo.setCurrentname("完成");

+					}

 					voList.add(vo);

 				}

 			}

+ 3 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkzx/ctl/XkzzxCtl.java
Просмотреть файл 

@@ -323,6 +323,9 @@ public class XkzzxCtl extends BaseWebCtl {
 
 						}

 

 					}

+					if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {

+						vo.setCurrentname("完成");

+					}

 					voList.add(vo);

 				}

 			}