Skip to content

N
njzsb
Commit 3121dfb6 authored by 徐州's avatar 徐州
Browse files
Options

修改部分问题

parent e0cf1e9e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 34 deletions
WebRoot/WEB-INF/pages/jfzm/Jfzm_List.jsp
View file @ 3121dfb6
......@@ -44,7 +44,7 @@
}
function addTabSfxx(row_Id) {
var dt = new Date();
parent.addTab("sfxxTab", "收费信息", "/jsp/zzhxm/zzhxmSfxxDetail.action?zzhxm.id=" + row_Id + "&dt=" + dt.getTime(), 850, 700);
parent.addTab("sfxxTab", "收费信息", "/jsp/zzhxm/zzhxmSfxxDetail.action?id=" + row_Id + "&dt=" + dt.getTime(), 850, 700);
}
function noticeView(row_Id) {
var dt = new Date();
......
WebRoot/WEB-INF/pages/rfdz/Rfdz_Add.jsp 0 → 100644
View file @ 3121dfb6
This diff is collapsed.
WebRoot/WEB-INF/pages/rfdz/Rfdz_Detail.jsp
View file @ 3121dfb6
......@@ -37,7 +37,7 @@
function addNew4Sfxx(row_id) {
var dt = new Date();
// <%--createSimpleWindow("win_zzhxm","添加收费信息","${ctx}/jsp/zzhxm/zzhxmSfxxAdd.action?flag=add&zzhxm.id="+row_id+"&dt="+dt.getTime(),1172,600);--%>
createSimpleWindow("win_zzhxmsfxx", "添加收费信息","${ctx}/jsp/rfdz/RfdzEdit.action" , 900, 680);
createSimpleWindow("win_zzhxmsfxx", "添加收费信息","${ctx}/jsp/rfdz/RfdzSfxxAdd.action?paymentItem.id=" + row_id , 900, 680);
//<%--createWindow("win_zzhxmsfxx","添加收费信息","410px","210px",900,600,"${ctx}/jsp/zzhxm/zzhxmSfxxAdd.action?flag=add&zzhxm.id="+row_id+"&dt="+dt.getTime())--%>
}
//<%-- 修改收费信息 --%>
......@@ -200,16 +200,15 @@
<div class="inner12px">
<div class="cell">
<table width="100%">
<input id="ids" type="hidden" value="${zzhxm.id}">
<input id="jfdmwybh" type="hidden" value="${zzhxmJktzs.jfdmwybh}">
<input id="ids" type="hidden" value="${paymentItem.id}">
<tr>
<td>账户信息</td>
</tr>
<tr>
<th width="15%">代收单位名称</th>
<td width="35%">${zzhxm.dsdw}</td>
<td width="35%">${paymentItem.dwmc}</td>
<th width="15%">代收单位层级</th>
<td width="35%">${zzhxm.dsdwcj}</td>
<td width="35%">${paymentItem.dwmc}</td>
</tr>
</table>
<table>
......@@ -218,41 +217,41 @@
</tr>
<tr>
<th width="15%">项目代码</th>
<td width="35%">${zzhxm.xmdm}</td>
<td width="35%">${paymentItem.dwmc}</td>
<th width="15%">信息一览表编号</th>
<td width="35%">${zzhxm.xxylbbh}</td>
<td width="35%">${paymentItem.dwmc}</td>
</tr>
<tr>
<th width="15%">规划项目编号</th>
<td width="35%">${zzhxm.ghxmbh}</td>
<td width="35%">${paymentItem.dwmc}</td>
<th width="15%">建设单位名称</th>
<td width="35%">${zzhxm.jsdwmc}</td>
<td width="35%">${paymentItem.dwmc}</td>
</tr>
<tr>
<th width="15%" id='lianxidan'>规划许可证编号</th>
<td width="35%">${zzhxm.ghxkzbh}</td>
<td width="35%">${paymentItem.dwmc}</td>
<th width="15%">规划许可证类型</th>
<td width="35%">${zzhxm.ghxkzlx}</td>
<td width="35%">${paymentItem.dwmc}</td>
</tr>
<tr>
<th width="15%">工程项目名称</th>
<td width="35%">${zzhxm.gcxmmc}</td>
<td width="35%">${paymentItem.dwmc}</td>
<th width="15%">工程项目地点</th>
<td width="35%">${zzhxm.gcxmdd}</td>
<td width="35%">${paymentItem.dwmc}</td>
</tr>
<tr>
<th width="15%">地上建筑面积</th>
<td width="35%">${zzhxm.dsjzmj}</td>
<td width="35%">${paymentItem.dwmc}</td>
<th width="15%">地下建筑面积</th>
<td width="35%">${zzhxm.dxjzmj}</td>
<td width="35%">${paymentItem.dwmc}</td>
</tr>
<tr>
<th width="15%">建设单位联系人</th>
<td width="35%">${zzhxm.jsdwlxr}</td>
<td width="35%">${paymentItem.dwmc}</td>
<th width="15%">联系电话</th>
<td width="35%">${zzhxm.lxdh}</td>
<td width="35%">${paymentItem.dwmc}</td>
</tr>
<tr>
......@@ -262,7 +261,7 @@
<table width="100%" border="0">
<tr>
<td colspan="4" height="100px" style="text-align:center">
<s:if test="zzhxm.statusConstract == 0">
<s:if test="paymentItem.statusConstract == 0">
<a id="noticeBtn0" href="#" class="btn_01"
onclick="generateNotice(0);">人防费用章（市本级）<b></b></a>
</s:if>
......
WebRoot/WEB-INF/pages/rfdz/Rfdz_List.jsp
View file @ 3121dfb6
......@@ -27,7 +27,7 @@
function view_detail(row_Id) {
var dt = new Date();
// parent.addTab("sfxxTab", "收费信息", "收费信息.html?zzhxm.id=" + row_Id + "&dt=" + dt.getTime(), 850, 700);
parent.addTab("rfdzTab","收费信息","/jsp/rfdz/RfdzDetail.action?zzhxm.id="+row_Id+"&dt="+dt.getTime(),850,700);
parent.addTab("rfdzTab","收费信息","/jsp/rfdz/RfdzSfxxDetail.action?paymentItem.id="+row_Id+"&dt="+dt.getTime(),850,700);
}
function search_xmlb() {
var queryParams = {
......@@ -78,13 +78,36 @@
{ field: 'dwmc', title: '建设单位名称', width: 186, align: 'center' },
{ field: 'xmmc', title: '工程项目名称', width: 186, align: 'center' },
{ field: 'jsdd', title: '工程项目地点', width: 186, align: 'center' },
{ field: 'xkzh', title: '规划许可证号', width: 186, align: 'center' },
{
field: 'op2', title: '工程项目地点', width: 186, align: 'center', formatter: function (value, rec) {
return "<span>" + rec.xmxxb.jzdwdz + "</span>";
}
},
{
field: 'op3', title: '规划许可证号', width: 186, align: 'center', formatter: function (value, rec) {
return "<span>" + rec.xmxxb.xkzh + "</span>";
}
},
{ field: 'xmdm', title: '缴费环节', width: 150, align: 'center' },
{ field: 'zsfw', title: '二级统计单位', width: 186, align: 'center' },
{
field: 'op4', title: '缴费环节', width: 150, align: 'center', formatter: function (value, rec) {
if(rec.xmxxb.paymentLink == 1) {
return "<span>施工许可前</span>";
} else if(rec.xmxxb.paymentLink == 3) {
return "<span>30日内</span>";
}
return "<span></span>";
}
},
{
field: 'op5', title: '二级统计单位', width: 186, align: 'center', formatter: function (value, rec) {
return "<span>" + rec.xmxxb.zsfw + "</span>";
}
},
{ field: 'xmdm', title: '核查状态', width: 150, align: 'center' },
{ field: 'xmdm', title: '缴款通知书编号', width: 186, align: 'center' },
{ field: 'ECN', title: '缴款通知书编号', width: 186, align: 'center' },
{ field: 'zslxdbh', title: '缴款凭证编号', width: 186, align: 'center' },
]],
......@@ -104,35 +127,35 @@
<table width="100%">
<tr>
<th width="15%">规划许可证编号</th>
<td width="35%"><input name="zzhxm.ghxkzbh" id="ghxkzbh" value="" type="text"></td>
<td width="35%"><input name="ghxkzbh" id="ghxkzbh" value="" type="text"></td>
<th width="15%">缴费凭证编号</th>
<td width="35%"><input name="zzhxm.jfpzbh" id="jfpzbh" value="" type="text"></td>
<td width="35%"><input name="jfpzbh" id="jfpzbh" value="" type="text"></td>
</tr>
<tr>
<th width="15%">信息表编号</th>
<td width="35%"><input name="zzhxm.xxbbh" id="xxbbh" value="" type="text"></td>
<td width="35%"><input name="xxbbh" id="xxbbh" value="" type="text"></td>
<th width="15%">规划项目编号</th>
<td width="35%"><input name="zzhxm.ghxmbh" id="ghxmbh" value="" type="text"></td>
<td width="35%"><input name="ghxmbh" id="ghxmbh" value="" type="text"></td>
</tr>
<tr>
<th width="15%">建设单位名称</th>
<td width="35%"><input name="zzhxm.jsdwmc" id="jsdwmc" value="" type="text"></td>
<td width="35%"><input name="jsdwmc" id="jsdwmc" value="" type="text"></td>
<th width="15%">工程项目名称</th>
<td width="35%"><input name="zzhxm.gcxmmc" id="gcxmmc" value="" type="text"></td>
<td width="35%"><input name="gcxmmc" id="gcxmmc" value="" type="text"></td>
</tr>
<tr>
<th width="15%">缴费环节</th>
<td width="35%">
<select name="zzhxm.jfhj" id="jfhj">
<select name="jfhj" id="jfhj">
<option value="">请选择</option>
<option value="0">无</option>
<option value="1">施工许可前</option>
<option value="2">30日</option>
<option value="3">30日</option>
</select>
</td>
<th width="15%">核查状态</th>
<td width="35%">
<select name="zzhxm.hczt" id="hczt">
<select name="hczt" id="hczt">
<option value="">请选择</option>
<option value="0">无</option>
<option value="1">已同步</option>
......
src/com/jshx/rfdz/conf/struts-rfdz.xml
View file @ 3121dfb6
......@@ -13,6 +13,16 @@
<result name="success">/WEB-INF/pages/rfdz/Rfdz_Detail.jsp</result>
</action>
<!-- 跳转收费信息列表页面 -->
<action name="RfdzSfxxDetail" class="com.jshx.rfdz.web.RfdzAction" method="view">
<result name="view">/WEB-INF/pages/rfdz/Rfdz_Detail.jsp</result>
</action>
<!-- 跳转收费信息添加页面 -->
<action name="RfdzSfxxAdd" class="com.jshx.rfdz.web.RfdzAction" method="sfxxAdd">
<result name="edit">/WEB-INF/pages/zzhxm/Rfdz_Add.jsp</result>
</action>
<action name="RfdzEdit" >
<result name="success">/WEB-INF/pages/rfdz/Rfdz_Edit.jsp</result>
</action>
......
src/com/jshx/rfdz/web/RfdzAction.java
View file @ 3121dfb6
......@@ -4,20 +4,25 @@ import com.jshx.core.base.action.BaseAction;
import com.jshx.core.base.vo.Pagination;
import com.jshx.core.json.CodeJsonValueProcessor;
import com.jshx.core.json.DateJsonValueProcessor;
import com.jshx.paymentItemHis.entity.PaymentItemHis;
import com.jshx.paymentItemHis.service.PaymentItemHisService;
import com.jshx.rfdz.entity.Rfdz;
import com.jshx.rfdz.service.RfdzService;
import com.jshx.zsdw.service.ZsdwService;
import com.jshx.zzhxm.entity.ZzhxmSfxx;
import com.neusoft.egov.utils.TextUtils;
import net.sf.json.JsonConfig;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class RfdzAction extends BaseAction
{
String id;
String ghxkzbh;
String jfpzbh;
String xxbbh;
......@@ -26,6 +31,8 @@ public class RfdzAction extends BaseAction
String gcxmmc;
String jfhj;
String hczt;
PaymentItemHis paymentItem = new PaymentItemHis();
/**
* 分页信息
*/
......@@ -201,6 +208,22 @@ public class RfdzAction extends BaseAction
}
/**
* 人防到账列表点击收费信息
*/
public String view() {
if(paymentItem != null && !TextUtils.isEmpty(paymentItem.getId())) {
Map<String, Object> paraMap = new HashMap<>();
paymentItem = paymentItemHisService.getById(paymentItem.getId());
}
return VIEW;
}
public String sfxxAdd() {
view();
return EDIT;
}
public String getGhxkzbh() {
return ghxkzbh;
......@@ -297,4 +320,20 @@ public class RfdzAction extends BaseAction
public void setIds(String ids) {
this.ids = ids;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public PaymentItemHis getPaymentItem() {
return paymentItem;
}
public void setPaymentItem(PaymentItemHis paymentItem) {
this.paymentItem = paymentItem;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment