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

gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/tzgg/ggxx/ggxxadd.jsp

@@ -173,7 +173,7 @@
 						<tr>
 							<th>发布人：&nbsp;</th>
 							<td><input type="text" class="form-control" readonly="readonly" value="${user.name }"></td>
-							<th><span class="needwrite">*</span>发布时间：&nbsp;</th>
+							<th><span class="needwrite">*</span>发布日期：&nbsp;</th>
 							<td>
 							<input type="text" class="Wdate" name="fbsj" value="${fbsj }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/tzgg/ggxx/ggxxedit.jsp

@@ -180,7 +180,7 @@
 						<tr>
 							<th>发布人：&nbsp;</th>
 							<td><input type="text" class="form-control" readonly="readonly" value="${record.fbr }" ></td>
-							<th><span class="needwrite">*</span>发布时间：&nbsp;</th>
+							<th><span class="needwrite">*</span>发布日期：&nbsp;</th>
 							<td>
 							<input type="text" class="Wdate" name="fbsj" value="${fn:substring(record.fbsj,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">
 							</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/tzgg/ggxx/ggxxmain.jsp

@@ -37,42 +37,19 @@
 						<th width="20%"></th>
 					</tr>
 					<tr>
-                    <tr>
-                        <td class="right">
-                         	发布时间起:&nbsp;
-                         </td>
-                       
-							<td>
-							<input id="d4311" class="Wdate" style="width:80%;" name="startDate"  value="${startDate}"  type="text" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',maxDate: '#F{$dp.$D(\'d4312\',{d:0})}'})">
-								</td>
-							
-							<td class="middle">
-	                        ~
-	                        </td>
-							<td>
-							<input id="d4312" class="Wdate" style="width:80%;" name="endDate" value="${endDate}" type="text" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',minDate: '#F{$dp.$D(\'d4311\',{d:0})}'})">	                
-								</td>
-	                        	
-                       <td class="right">
-                         	发布人   :&nbsp;
-                         </td>
-                        <td >
-	                        	<input type="text" class="form-control" name="fbr"   value="${fbr }">
-	                        	
-                        </td>
-                        </tr>
-                        <tr>
+					  <tr>
                          <td class="right">
                          	标题:&nbsp;
                          </td>
                          	<td>
                          	<input type="text" class="form-control"  name="title"  value="${title }">
                          	</td>
-                         	
-                         	<td class="right">公告类型:&nbsp;</td>
-                         	<td>
-                         	<div id="gglxsel"></div>
-                         	</td>
+                         	<td class="right">
+                         	发布人   :&nbsp;
+                        	 </td>
+                       		 <td >
+	                        	<input type="text" class="form-control" name="fbr"   value="${fbr }">
+                       		 </td>
                          	<td class="right">状态:&nbsp;</td>
                          	<td>
                          	<select class='selectpicker' name="zt" >
@@ -82,6 +59,28 @@
                          	</select>
                          	</td>
                         </tr>
+                    <tr>
+                        <td class="right">
+                         	发布日期起:&nbsp;
+                         </td>
+                       
+							<td>
+							<input id="d4311" class="Wdate" style="width:80%;" name="startDate"  value="${startDate}"  type="text" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',maxDate: '#F{$dp.$D(\'d4312\',{d:0})}'})">
+								</td>
+							
+							<td class="middle">
+	                        ~
+	                        </td>
+							<td>
+							<input id="d4312" class="Wdate" style="width:80%;" name="endDate" value="${endDate}" type="text" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',minDate: '#F{$dp.$D(\'d4311\',{d:0})}'})">	                
+								</td>
+	                       	<td class="right">公告类型:&nbsp;</td>
+                         	<td>
+                         		<div id="gglxsel"></div>
+                         	</td> 	
+                       
+                      </tr>
+                      
                         <tr>
                         <td class="right" colspan="6">
                         <authz:hasPermission name="${appName}:ggxx:main">
@@ -107,7 +106,7 @@
 						<th width="10%">公告类型</th>
 						<th width="20%">相关附件</th>
 						<th width="10%">已阅读数量</th>
-						<th width="10%">发布时间</th>
+						<th width="10%">发布日期</th>
 						<th width="10%">发布人</th>
 						<th width="5%">公告状态</th>
 						<th width="1%" class="operatetd">操作</th>
@@ -137,7 +136,7 @@
 							              <c:if test="${ ggxx.fbzt == 1 && ggxx.flag == 1}">
 							     
 									          <a class="btn btn-default btn-xs" href="#" onclick="ggxx.main.detail('${ggxx.id}')" title="阅读详情">
-									    <i class="glyphicon glyphicon-search"></i> 
+									    <i class="glyphicon glyphicon-file"></i> 
 									         </a>
 									       
 									 </c:if>

gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/tzgg/ggxx/ggxxview.jsp

@@ -38,7 +38,7 @@
 	</tr>
 	<tr>
 		<td align="center">
-		<h4>发布单位：${record.fbdw } &nbsp;&nbsp;&nbsp;&nbsp;发布时间：${fn:substring(record.fbsj,0,10)} </h4></td>
+		<h4>发布单位：${record.fbdw } &nbsp;&nbsp;&nbsp;&nbsp;发布日期：${fn:substring(record.fbsj,0,10)} </h4></td>
 	</tr>
 	<tr height="250px" >
 		<td style="padding-left: 50px">${record.zw }</td>