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

gkoa/trunk/gkoa/WebContent/WEB-INF/pages/fwgl/dbfw/zw.jsp

@@ -48,10 +48,10 @@
         	<td><a href="javascript:void(0);" onclick="fwgl.dbfw.detail.choosezw('${fwid}','02')">02厅港口局发文模板（上行文）.doc</a></td>
         </tr>
         <tr>
-        	<td><a href="javascript:void(0);" onclick="fwgl.dbfw.detail.choosezw('${fwid}','03')">03中共厅港口局党支部发文模板.doc</a></td>
+        	<td><a href="javascript:void(0);" onclick="fwgl.dbfw.detail.choosezw('${fwid}','03')">03中共厅港口局党组发文模板.doc</a></td>
         </tr>
         <tr>
-        	<td><a href="javascript:void(0);" onclick="fwgl.dbfw.detail.choosezw('${fwid}','04')">04中共厅港口局党支部厅港口局联合发文模板（下行文）.doc</a></td>
+        	<td><a href="javascript:void(0);" onclick="fwgl.dbfw.detail.choosezw('${fwid}','04')">04中共厅港口局党组厅港口局联合发文模板（下行文）.doc</a></td>
         </tr>
          <tr>
         	<td><a href="javascript:void(0);" onclick="fwgl.dbfw.detail.choosezw('${fwid}','05')">05厅港口局发文模板（局务会议纪要）.doc</a></td>

gkoa/trunk/gkoa/WebContent/WEB-INF/pages/jsta/dbjsta/zw.jsp

@@ -42,33 +42,33 @@
 	<h1>选择模板</h1>
     <table>
           <tr >
-        	<td ><a href="javascript:void(0);" onclick="jsta.dbjsta.detail.choosezw('${jstaid}','17')">建议提案厅内会办件模板.doc</a></td>
+        	<td ><a href="javascript:void(0);" onclick="jsta.dbjsta.detail.choosezw('${jstaid}','01')">01厅港口局发文模板（下行文、平行文）.doc</a></td>
         </tr>
-       <%--  <tr>
+        <tr>
         	<td><a href="javascript:void(0);" onclick="jsta.dbjsta.detail.choosezw('${jstaid}','02')">02厅港口局发文模板（上行文）.doc</a></td>
         </tr>
-        <tr>
+     <%--    <tr>
         	<td><a href="javascript:void(0);" onclick="jsta.dbjsta.detail.choosezw('${jstaid}','03')">03中共厅港口局党组发文模板.doc</a></td>
-        </tr> 
+        </tr> --%>
         <tr>
         	<td><a href="javascript:void(0);" onclick="jsta.dbjsta.detail.choosezw('${jstaid}','04')">03中共厅港口局党组厅港口局联合发文模板（下行文）.doc</a></td>
         </tr>
-        <tr>
+     <%--     <tr>
         	<td><a href="javascript:void(0);" onclick="jsta.dbjsta.detail.choosezw('${jstaid}','05')">05厅港口局发文模板（局务会议纪要）.doc</a></td>
-        </tr> 
-          <tr>
+        </tr> --%>
+        <%--  <tr>
         	<td><a href="javascript:void(0);" onclick="jsta.dbjsta.detail.choosezw('${jstaid}','06')">06厅港口局发文模板（专题会议纪要）.doc</a></td>
-        </tr> 
+        </tr> --%>
         <tr>
         	<td><a href="javascript:void(0);" onclick="jsta.dbjsta.detail.choosezw('${jstaid}','07')">04江苏省机关单位发电.doc</a></td>
         </tr>
-         <tr>
+    <%--     <tr>
         	<td><a href="javascript:void(0);" onclick="jsta.dbjsta.detail.choosezw('${jstaid}','08')">08签报模板.doc</a></td>
-        </tr> 
+        </tr> --%>
            <tr>
         	<td><a href="javascript:void(0);" onclick="jsta.dbjsta.detail.choosezw('${jstaid}','09')">05厅港口局便函.doc</a></td>
         </tr>
-          <tr>
+       <%--   <tr>
         	<td><a href="javascript:void(0);" onclick="jsta.dbjsta.detail.choosezw('${jstaid}','13')">10请示模版.doc</a></td>
         </tr>
          <tr>

gkoa/trunk/gkoa/WebContent/WEB-INF/pages/qbgl/dbqb/zw.jsp

@@ -39,7 +39,7 @@
 	<h1>选择模板</h1>
     <table >
          <tr >
-        	<td ><a href="javascript:void(0);" onclick="qbgl.dbqb.detail.choosezw('${qbid}','08')">签报模板.doc</a></td>
+        	<td ><a href="javascript:void(0);" onclick="qbgl.dbqb.detail.choosezw('${qbid}','01')">01厅港口局发文模板（下行文、平行文）.doc</a></td>
         </tr>
        <%--  <tr>
         	<td><a href="javascript:void(0);" onclick="qbgl.dbqb.detail.choosezw('${qbid}','02')">02厅港口局发文模板（上行文）.doc</a></td>

gkoa/trunk/gkoa/WebContent/WEB-INF/pages/userManage/usermain.jsp

@@ -57,7 +57,6 @@
 						<td width="20%">所在部门</td>
 						<td width="10%">排序号</td>
 						<td width="10%">权限</td>
-						<td width="10%">密码重置</td>
 					</tr>
 					<c:forEach items="${list}" var="vo">
 						<tr align="center">
@@ -67,11 +66,10 @@
 							<td>${vo.orgName }</td>
 							<td>${vo.sortno }</td>
 							<td><a href="#" onclick="user.main.setPermission('${vo.id}')">设置</a></td>
-							<td><a href="#" onclick="user.main.resetPwd('${vo.id}')">重置</a></td>
 						</tr>
 					</c:forEach>
 					<tr>
-						<td colspan="7" class="last_page_td"
+						<td colspan="6" class="last_page_td"
 							style="height: 28px; line-height: 31px;"><jsp:include
 								page="../include/pageinfo.jsp"></jsp:include></td>
 					</tr>

gkoa/trunk/gkoa/WebContent/static/xt/js/userManage/usermain.js

@@ -318,20 +318,3 @@ user.main.doOrgDel = function() {
     });
   
 }
-
-user.main.resetPwd=function(id){
-    $.messager.confirm("确认", "确定要重置密码吗？", function(msg) {
-        if (msg) {
-            $.post($.ctx + "/userManage/resetPwd", {
-                id :  id
-            }, function(data, status) {
-                if (data.success) {
-                    location.href=$.ctx + '/userManage/main?t='+new Date() ;
-                }
-                else {
-                    $.messager.showError(data.message);
-                }
-            }, "json");
-        }
-    });
-}