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

* 'master' of http://gitlab.house365.com/xuzhou/njzsb:
  新字段

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

@@ -206,6 +206,27 @@
 									<th width="15%">承诺缴费环节</th>
 										<%--<td width="35%" ><s:property value="#sfxx.cnjfhj"/></td>--%>
 									<td width="35%" ><s:property value="cnjfhj"/></td>
+									<th width="15%">反馈日期</th>
+										<%--<td width="35%" ><s:property value="#sfxx.cnjfhj"/></td>--%>
+									<td width="35%" ><s:property value=""/></td>
+								</tr>
+								<tr>
+									<th width="15%">信息录入人</th>
+										<%--<td width="35%" ><s:property value="#sfxx.cnjfhj"/></td>--%>
+									<td width="35%" ><s:property value=""/></td>
+									<th width="15%">复核人</th>
+										<%--<td width="35%" ><s:property value="#sfxx.cnjfhj"/></td>--%>
+									<td width="35%" ><s:property value=""/></td>
+								</tr>
+								<tr>
+									<th width="15%">经办备注</th>
+										<%--<td width="35%" ><s:property value="#sfxx.cnjfhj"/></td>--%>
+									<td width="35%" ><s:property value=""/></td>
+								</tr>
+								<tr>
+									<th width="15%">复核意见</th>
+										<%--<td width="35%" ><s:property value="#sfxx.cnjfhj"/></td>--%>
+									<td width="35%" ><s:property value=""/></td>
 								</tr>
 
 							</table>

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

@@ -327,11 +327,17 @@
 										<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="zzhkppjList[${st.index}].kprq" id="kprq" style="width: 140px"
+												   type="text" class="Wdate" value="${item1.kprq}"
+												   onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" >
+										</td>
 									</tr>
 									<tr>
-										<th width="15">缴费凭证编号</th>
+										<th width="15">备注</th>
 										<td width="35%">
-											<input id="zslxdbh" name="rfxmsfxx.zslxdbh" style="width:90%" value="${rfxmsfxx.zslxdbh}" readonly/>
+											<input id="zslxdbh" name="rfxmsfxx.beizhu" disabled style="width:90%" value="${rfxmsfxx.zslxdbh}" readonly/>
 										</td>
 									</tr>
 								</table>
@@ -386,11 +392,17 @@
 										<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="zzhkppjList[${st.index}].kprq" id="kprq" style="width: 140px"
+												   type="text" class="Wdate" value="${item1.kprq}"
+												   onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" >
+										</td>
 									</tr>
 									<tr>
-										<th width="15">缴费凭证编号</th>
+										<th width="15">备注</th>
 										<td width="35%">
-											<input id="zslxdbh" name="rfxmsfxx.zslxdbh" style="width:90%" value="${rfxmsfxx.zslxdbh}" readonly/>
+											<input id="zslxdbh" name="rfxmsfxx.beizhu" style="width:90%" value="${rfxmsfxx.zslxdbh}" readonly/>
 										</td>
 									</tr>
 									<tr>