Skip to content

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

修改部分问题

parent 8ec6fc0c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 104 deletions
WebRoot/WEB-INF/pages/jfzm/Jfzm_List.jsp
View file @ ff86a91e
......@@ -483,17 +483,9 @@
copyrights: "杰创软件拥有版权 www.jatools.com"
}
var jatoolsPrinter = document.getElementById("jatoolsPrinter");
if("pre"==type){
updateZslxdbh();
jatoolsPrinter.printPreview(myDoc);
}else if("print"==type){
updateZslxdbh();
jatoolsPrinter.print(myDoc,true);
}
}
function updateZslxdbh(){
$.ajax({
url : "${ctx}/jsp/paymentVoucher/updateZslxdbh.action",
url : "${ctx}/jsp/jfzm/queryDetail.action",
type: 'post',
dataType: 'json',
data:{
......@@ -502,7 +494,9 @@
},
async : false,
});
jatoolsPrinter.print(myDoc,true);
}
</script>
</head>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Detail.jsp
View file @ ff86a91e
......@@ -18,32 +18,7 @@
console.log($("#id").val());
window.location.href="${ctx}/jsp/rfxm/downloadFile.action?ids="+id;
}
//生成缴款通知书;
/*function generateNotice(id){
$.ajax({
url: "/jsp/rfxm/produceNotice.action",
type: 'post',
dataType: 'json',
async: false,
data: {ids : $("#xbxb").val()},
error: function () {
$.messager.alert('错误', '提交出错！');
},
success: function (data) {
if (data.result) {
$("#yzjg").html('验证成功!');
alert("验证成功");
abc="1";
} else {
abc="0";
$("#yzjg").html('信息表编号重复!该项目状态:'+data.message);
}
}
});
console.log(id);
}*/
</script>
</head>
<body>
......@@ -197,68 +172,7 @@
</div>
</s:iterator>
</div>
<%--</c:forEach>--%>
<%--<table>
<tr>
<th width="15%">代收单位经办人</th>
<td width="35%" >${rfxm.dsdwjbr}</td>
</tr>
<tr>
<th width="15%">经办意见</th>
<td width="85%">${rfxm.jbyj}</td>
</tr>
<tr>
<th width="15%">代收单位复核人</th>
<td width="35%" >${rfxm.dsdwjbr}</td>
</tr>
<tr>
<th width="15%">复核意见</th>
<td width="85%">${rfxm.fhyj}</td>
</tr>
</table>--%>
<%--
<s:if test="attach.size()>0">
<table width="100%" id="table">
<tr>
<td width="15%" bgcolor="rgba(244, 244, 244, 1)">流程节点</td>
<td width="15%" bgcolor="rgba(244, 244, 244, 1)">附送材料</td>
<td width="25%" bgcolor="rgba(244, 244, 244, 1)">点击下载</td>
</tr>
<c:forEach var="c" items="${attach}">
<tr>
<td width="15%">${c.xmType}</td>
<td width="15%">${c.attachType}</td>
<td> <a href="javascript:opendoc('${c.id}')"><font style="color:blue">${c.attachname}</font></a> </br></td>
</tr>
</c:forEach>
</table>
</s:if>
<tr style="height: 120px">
<th width="15%">备注</th>
<td width="35%" colspan="3"><textarea style="height: 80%" name="sdjd.beizhu" value="${sdjd.beizhu}" type="text" maxlength="500" disabled="disabled">${sdjd.beizhu}</textarea></td>
</tr>
<tr>
<th width="15%">复核意见:</th>
<td width="35%" colspan="3"><textarea style="height: 80%" name="sdjd.beizhu" value="${sdjd.bxzd1}" type="text" maxlength="500" disabled="disabled">${sdjd.bxzd1}</textarea></td>
</tr>
<tr>
<td colspan="4" height="100px" style="text-align:center">
<a href="#" class="btn_01" onclick="parent.close_win('win_sdjd');">关闭<b></b></a>
<c:if test="${sdjd.urldz != '1'}">
&lt;%&ndash; <a href="${ctx}/jsp/sdjd/itPayRollDownloadTemplate.action?excel_Name=${sdjd.xxbbh}&urldz=${sdjd.urldz}"><p style="color:red">下载项目一览表编号</p></a> &ndash;%&gt;
</c:if>
</td>
</tr>
</table>--%>
<table width="100%" border="0">
<tr>
<td colspan="4" height="100px" style="text-align:center">
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_List.jsp
View file @ ff86a91e
......@@ -205,9 +205,9 @@
{ field: 'jsdwmc', title: '建设单位名称', width: 150, align: 'center' },
{ field: 'gcxmmc', title: '工程项目名称', width: 150, align: 'center' },
{
field: 'gcxmdd', title: '工程项目地点', width: 150, align: 'center'
field: 'gcxmdd', title: '工程项目地址', width: 150, align: 'center'
},
{ field: 'xxylbbh', title: '信息一览表编号', width: 150, align: 'center' },
// { field: 'xxylbbh', title: '信息一览表编号', width: 150, align: 'center' },
{
field: 'xkzh', title: '规划许可证号', width: 150, align: 'center'
},
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Add.jsp
View file @ ff86a91e
......@@ -335,10 +335,8 @@
</td>
<th width="15">提前缴纳配套费</th>
<td width="35%">
<input type="radio" name="zzhxmsfxx.tqjnptf" value="否" />
否
<input type="radio" name="zzhxmsfxx.tqjnptf" value="是" checked="checked" />
是
<input type="radio" name="zzhxmsfxx.tqjn" value="0" checked="checked" />否
<input type="radio" name="zzhxmsfxx.tqjn" value="1" />是
</td>
</tr>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Detail.jsp
View file @ ff86a91e
......@@ -156,7 +156,7 @@
{field:'yjjemx',title:'应缴金额明细',width:160},
{field:'shbm',title:'审核部门',width:160},
{field:'cnjfhj',title:'承诺缴费环节',width:160},
{field:'jfpz',title:'缴费凭证/反馈单编号',width:200,align:'center'},
{field:'zslxdbh',title:'缴费凭证/反馈单编号',width:200,align:'center'},
{field:'sfxxjbr',title:'信息录入人',width:160},
{field:'createTime',title:'录入时间',width:fixWidth(0.16)},
{field:'statusJBFH',title:'是否复核',width:160,formatter:function (value, rec) {
......
src/com/jshx/jfzm/conf/struts-jfzm.xml
View file @ ff86a91e
......@@ -14,5 +14,9 @@
<action name="jflist" class="com.jshx.jfzm.web.JfzmAction" method="list">
</action>
<action name="queryDetail" class="com.jshx.jfzm.web.JfzmAction" method="queryDetail">
</action>
</package>
</struts>
src/com/jshx/jfzm/web/JfzmAction.java
View file @ ff86a91e
......@@ -4,8 +4,12 @@ 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.rfxm.entity.Rfxm;
import com.jshx.rfxm.service.RfxmService;
import com.jshx.xmxxb.entity.Xmxxb;
import com.jshx.xmxxb.service.XmxxbService;
import com.jshx.zsdw.service.ZsdwService;
import com.neusoft.egov.utils.TextUtils;
import net.sf.json.JsonConfig;
......@@ -20,6 +24,10 @@ public class JfzmAction extends BaseAction {
@Autowired
RfxmService rfxmService;
@Autowired
XmxxbService xmxxbService;
@Autowired
PaymentItemHisService paymentItemHisService;
@Autowired
private ZsdwService zsdwService;
......@@ -38,6 +46,10 @@ public class JfzmAction extends BaseAction {
String jfhj;
String hczt;
Rfxm rfxm = new Rfxm();
Xmxxb xmxxb = new Xmxxb();
PaymentItemHis paymentItemHis = new PaymentItemHis();
/**
......@@ -110,6 +122,15 @@ public class JfzmAction extends BaseAction {
}
/**
* 打印缴费证明时，查询所需要的数据
*/
public void queryDetail() {
rfxm = rfxmService.getById(rfxm.getId());
xmxxb = xmxxbService.getById(rfxm.getXmxxbId());
paymentItemHis = paymentItemHisService.getById(rfxm.getPaymentHisId());
}
public Pagination getPagination() {
return pagination;
}
......
src/com/jshx/paymentItemHis/web/PaymentItemHisAction.java
View file @ ff86a91e
......@@ -269,11 +269,14 @@ public class PaymentItemHisAction extends BaseAction
rfxm.setXmdm(model.getXmxxb().getLxpw());
rfxm.setXmbh(model.getXmxxb().getXmbh());
rfxm.setMjyj(model.getXmxxb().getMjyj());
rfxm.setIsSl("002".equals(model.getXmxxb().getMjyj()) || "004".equals(model.getXmxxb().getMjyj()) ? 1 : 0);
rfxm.setIsSbj(!model.getXmxxb().getZsfw().contains("非市本级") ? 1 : 0);
rfxm.setIsRfyz(0);
rfxm.setIsTqdy(0);
rfxm.setIsSl(0);
rfxm.setXmxxbId(model.getXmxxb().getId());
rfxm.setPaymentHisId(model.getId());
rfxmService.save(rfxm);
}
}
......
src/com/jshx/rfxm/entity/Rfxm.java
View file @ ff86a91e
......@@ -269,6 +269,15 @@ public class Rfxm extends BaseModel
*/
private String mjyj;
/**
* 项目信息表id
*/
private String xmxxbId;
/**
* 财务到账id
*/
private String paymentHisId;
public String getMjyj() {
return mjyj;
}
......@@ -680,4 +689,20 @@ public class Rfxm extends BaseModel
public void setSfqy(String sfqy) {
this.sfqy = sfqy;
}
public String getXmxxbId() {
return xmxxbId;
}
public void setXmxxbId(String xmxxbId) {
this.xmxxbId = xmxxbId;
}
public String getPaymentHisId() {
return paymentHisId;
}
public void setPaymentHisId(String paymentHisId) {
this.paymentHisId = paymentHisId;
}
}
src/com/jshx/rfxm/entity/RfxmSfxx.java
View file @ ff86a91e
......@@ -72,7 +72,7 @@ public class RfxmSfxx extends BaseModel {
* 承诺缴费环节
* 1. 施工许可前
* 2. 竣工验收前
* 3. x日内
* 3. 30日内
*/
private String cnjfhj;
......@@ -83,6 +83,10 @@ public class RfxmSfxx extends BaseModel {
* 2 n日内
*/
private Integer typeCnjfhj;
/**
* 提前缴纳配套费
*/
private Integer tqjn;
/**
* 是否已经生成缴款通知书
......@@ -273,6 +277,8 @@ public class RfxmSfxx extends BaseModel {
private String showNameZm;
// 文件上传end
private String zslxdbh;
public RfxmSfxx() {}
// 2019-6-27 v4
......@@ -918,4 +924,20 @@ public class RfxmSfxx extends BaseModel {
public void setShowNameSq(String showNameSq) {
this.showNameSq = showNameSq;
}
public Integer getTqjn() {
return tqjn;
}
public void setTqjn(Integer tqjn) {
this.tqjn = tqjn;
}
public String getZslxdbh() {
return zslxdbh;
}
public void setZslxdbh(String zslxdbh) {
this.zslxdbh = zslxdbh;
}
}
src/com/jshx/rfxm/web/RfxmAction.java
View file @ ff86a91e
This diff is collapsed.
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