Merge branch 'master' of http://gitlab.house365.com/xuzhou/njzsb

WebRoot/WEB-INF/pages/jfzm/Jfzm_view.jsp

@@ -104,8 +104,7 @@
             left: 590px;
             top: 130px;
             font-size: 24px;
-            color: red;
-            font-weight: bolder;
+            color: #a43635;
         }
         /*内部使用*/
         .f40 {

WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_View.jsp

@@ -384,6 +384,13 @@
 										<td width="35%">
 											<input id="cnjfhj" name="rfxmsfxx.cnjfhj" style="width:90%" value="${rfxmsfxx.cnjfhj}" readonly/>
 										</td>
+										<th width="15">反馈日期</th>
+										<td width="35%" >
+											<input style="width: 75%;" disabled name="rfxmsfxx.fkTime" id="fkTime" style="width: 140px"
+												   type="text" class="Wdate" value="${rfxmsfxx.fkTime}"
+												   onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" >
+										</td>
+
 									</tr>
 									<tr>
 										<th width="15">备注</th>

src/com/jshx/rfxm/web/RfxmAction.java

@@ -376,7 +376,7 @@ public class RfxmAction extends BaseAction
 			s.setUpdateTime(rfxm.getYzTime());
 			try {
 				double b = Double.parseDouble(s.getYjjemx());
-				if(b != 0 && s.getStatus() != null && s.getStatus() > 1) {
+				if(b != 0 && s.getStatus() != null && s.getStatus() > 1 && s.getStatus() != 3) {
 					s.setZslxdbh(s.getSfxmlxdbh());
 				} else {
 					s.setZslxdbh("");