Skip to content

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

修改问题

parent 0f2fd3b1
Expand all Show whitespace changes
Inline Side-by-side
Showing with 106 additions and 183 deletions
WebRoot/WEB-INF/pages/account/paymentVoucher/PaymentVoucher_ZslxdList.jsp
View file @ afc2cb28
......@@ -22,7 +22,7 @@
async : false,
success: function(data){
if(data.result){
$.messager.confirm("提示", "确认要生成凭证吗？", function(result) {
$.messager.confirm("提示", "请核实费用到账是否正确", function(result) {
if(result){
$.ajax({
url : "${ctx}/jsp/paymentItemHis/scpz.action",
......@@ -31,9 +31,13 @@
data:{
id : row_Id
},
async : false
success:function (data) {
if(data.result) {
printZslxd(row_Id,data.zslxdbh,data.mjyj)
}
}
});
$.messager.alert("提示","操作成功")
search_paymentItemHis();
}
......
WebRoot/WEB-INF/pages/jfzm/Jfzm_List.jsp
View file @ afc2cb28
This diff is collapsed.
WebRoot/WEB-INF/pages/rfxm/Rfxm_List.jsp
View file @ afc2cb28
......@@ -214,9 +214,9 @@
{
field: 'jfhj', title: '缴费环节', width: 150, align: 'center', formatter: function (value, rec) {
if(rec.payment_link == 1) {
if(rec.paymentLink == 1) {
return "施工许可前";
} else if(rec.payment_link == 3) {
} else if(rec.paymentLink == 3) {
return "30日内";
} else {
return "";
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Add.jsp
View file @ afc2cb28
......@@ -316,8 +316,8 @@
</td>
</tr>
<tr>
<th width="15">缴费承诺环节</th>
<c:if test="${rxfm.paymentLink != 1 && rxfm.paymentLink != 3}">
<th width="15">缴费承诺环节${rfxm.paymentLink == 1}</th>
<c:if test="${rxfm.paymentLink == null}">
<td width="35%">
<input type="radio" class="rd" name="rfxmsfxx.cnjfhj" value="施工许可前" checked="checked"/>
施工许可前
......@@ -330,12 +330,12 @@
<input type="radio" name="rfxmsfxx.tqjn" value="1" checked="checked" />是
</td>
</c:if>
<c:if test="${rxfm.paymentLink =='1'}">
<c:if test="${rfxm.paymentLink == 1}">
<td width="35%">
施工许可前
</td>
</c:if>
<c:if test="${rxfm.paymentLink =='3'}">
<c:if test="${rfxm.paymentLink == 3}">
<td width="35%">
30日内
</td>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Detail.jsp
View file @ afc2cb28
......@@ -69,7 +69,7 @@
<%-- 查看收费信息 --%>
function view(row_id) {
var dt = new Date();
createSimpleWindow("win_rfxmsfxx","查看收费信息","${ctx}/jsp/rfxm/rfxmSfxxView.action?ids="+row_id+"&dt="+dt.getTime(),900,600);
createSimpleWindow("win_rfxmsfxxview","查看收费信息","${ctx}/jsp/rfxm/rfxmSfxxView.action?ids="+row_id+"&dt="+dt.getTime(),900,600);
}
<%-- 下载缴费信息附件 --%>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_View.jsp
View file @ afc2cb28
......@@ -45,51 +45,31 @@
var beizhu = $("#sfxxfhyj").val();
$("#flag").val(flag);
// document.myform1.action="rfxmSfxxReview.action";
// document.myform1.submit();
// parent.reloadDate();
// parent.close_win('win_rfxmsfxx');
if(flag == '2') {//通过
$.ajax({
async: false,
url: "${ctx}/jsp/rfxm/rfxmSfxxReview.action",
url: "${ctx}/jsp/rfxm/rfxmSfxxReviewCheck.action",
type: 'post',
dataType: 'json',
async: false,
data: {"rfxmsfxx.id":sfxxid, "rfxmsfxx.sfxxfhyj":beizhu, "flag":flag},
data: {"rfxmsfxx.id":sfxxid},
error: function () {
$.messager.alert('错误', '提交出错！');
$.messager.alert('错误', '校验出错！');
},
success: function (data) {
if (data.result) {
parent.reloadData();
$.messager.alert('提示', data.message,"info",function () {
parent.close_win('win_rfxmsfxx');
});
/!*return;*!/
} else {
abc="0";
if (!data.result) {
$.messager.alert('提示', data.message);
getTabWindow().reloadDate();
// $("#yzjg").html('添加失败!'+data.message);
setTimeout(function () { parent.close_win('win_rfxmsfxx'); }, 2000);
parent.close_win('win_rfxmsfxx');
return;
}
// window.location.reload();
var curTabWin = null;
var curTab = parent.$('#main-center').tabs('getSelected');
if (curTab && curTab.find('iframe').length > 0) {
curTabWin = curTab.find('iframe')[0].contentWindow;
} else {
document.myform1.action="rfxmSfxxReview.action";
document.myform1.submit();
}
var childWin = document.getElementById('iframe_sfxxTab').contentWindow;
childWin.reloadDate();
// parent.close_win("win_rfxmsfxx");
// parent.document.frames["sfxxTab"].reloadDate();
// reloadDate();
// /!*setTimeout(parent.close_win('win_rfxmsfxx'),1000);*!/
}
});
} else {
document.myform1.action="rfxmSfxxReview.action";
document.myform1.submit();
}
}
//验证收费信息
......@@ -399,7 +379,7 @@
<a href="#" class="btn_01" type="button" onclick="review(this, 2)">通过<b></b></a>&nbsp;
<a href="#" class="btn_01" type="button" onclick="review(this, 1)">退回<b></b></a>&nbsp;
</c:if>
<a href="#" class="btn_01" onclick="parent.close_win('win_rfxmsfxx');">关闭<b></b></a>
<a href="#" class="btn_01" onclick="parent.close_win('win_rfxmsfxxview');">关闭<b></b></a>
</td>
</tr>
</table>
......
src/com/jshx/jfzm/web/JfzmAction.java
View file @ afc2cb28
......@@ -49,20 +49,12 @@ public class JfzmAction extends BaseAction {
*/
private Pagination pagination;
String ghxkzbh;
String jfpzbh;
String xxbbh;
String ghxmbh;
String jsdwmc;
String gcxmmc;
String jfhj;
String hczt;
String id;
Rfxm rfxm = new Rfxm();
Xmxxb xmxxb = new Xmxxb();
PaymentItemHis paymentItemHis = new PaymentItemHis();
String id;
/**
......@@ -75,32 +67,50 @@ public class JfzmAction extends BaseAction {
if(pagination==null)
pagination = new Pagination(this.getRequest());
if (!TextUtils.isEmpty(ghxkzbh)){
paraMap.put("xkzh", "%" + ghxkzbh + "%");
}
if(null != rfxm){
if(!TextUtils.isEmpty(jfpzbh)) {
paraMap.put("zslxdbh", "%" + jfpzbh + "%");
//设置查询条件，开发人员可以在此增加过滤条件
/**
* "rfxm.xkzh": $("#xkzh").val(),
* "rfxm.zslxdbh": $("#zslxdbh").val(),
* "rfxm.xxylbbh": $("#xxylbbh").val(),
* "rfxm.xmbh": $("#xmbh").val(),
* "rfxm.jsdwmc": $("#jsdwmc").val(),
* "rfxm.gcxmmc": $("#gcxmmc").val(),
* "rfxm.paymentLink": $("#paymentLink").val(),
* "rfxm.isRfyz": $("#isRfyz").val(),
* "rfxm.mjyj": $("#mjyj").val()
*/
if (!TextUtils.isEmpty(rfxm.getXkzh())){
paraMap.put("xkzh", "%" + rfxm.getXkzh().trim() + "%");
}
if (!TextUtils.isEmpty(xxbbh)){
paraMap.put("xxbbh", "%" + xxbbh + "%");
if (!TextUtils.isEmpty(rfxm.getZslxdbh())){
paraMap.put("zslxdbh", "%" + rfxm.getZslxdbh().trim() + "%");
}
if (!TextUtils.isEmpty(ghxmbh)){
paraMap.put("xmbh", "%" + ghxmbh + "%");
if (!TextUtils.isEmpty(rfxm.getXxylbbh())){
paraMap.put("xxylbbh", "%" + rfxm.getXxylbbh().trim() + "%");
}
if (!TextUtils.isEmpty(jsdwmc)){
paraMap.put("jsdw", "%" + jsdwmc + "%");
if (!TextUtils.isEmpty(rfxm.getXmbh())){
paraMap.put("xmbh", "%" + rfxm.getXmbh().trim() + "%");
}
if (!TextUtils.isEmpty(gcxmmc)){
paraMap.put("jsdd", "%" + gcxmmc + "%");
if (!TextUtils.isEmpty(rfxm.getJsdwmc())){
paraMap.put("jsdwmc", "%" + rfxm.getJsdwmc().trim() + "%");
}
if (!TextUtils.isEmpty(rfxm.getGcxmmc())){
paraMap.put("gcxmmc", "%" + rfxm.getGcxmmc().trim() + "%");
}
//TODO 缴费环节、核查状态筛选
if (rfxm.getPaymentLink() != null && rfxm.getPaymentLink() > 0){
paraMap.put("paymentLink", rfxm.getPaymentLink());
}
if (rfxm.getIsRfyz() != null){
paraMap.put("isRfyz", rfxm.getIsRfyz());
}
if (!TextUtils.isEmpty(rfxm.getMjyj())){
paraMap.put("mjyj", rfxm.getMjyj().trim());
}
}
if(!this.getLoginUser().getIsSuperAdmin()){
String dwdm=zsdwService.getDwdm(this.getLoginUserDepartmentId());
paraMap.put("dwdm", dwdm);
......@@ -112,18 +122,19 @@ public class JfzmAction extends BaseAction {
//此处添加需要转换的一维代码，key是一维代码在数据对象中的属性名，value是一维代码的codeId
config.registerJsonValueProcessor(String.class,new CodeJsonValueProcessor(codeMap));
// final String filter = "isCwyz|id|slbh|isfdx|dwmc|xmmc|mjyj|dkxmslh|zsdw|dkmj|csmj|ptyjmj|ptyjje|ptymje|ptymmj|rfyjmj|rfyjje|rfymmj|rfymje|xqyjje|xqymmj|xqymje|xqyjmj|byyjmj|byyjje|byymmj|byymje|zyjje|zymje|warnFlag|accountbankId|lockFlag|xmbzj|zslxdbh|ECN|xmxxb|xmxxb.xxylb|xmxxb.";
// if (filter != null && filter.length() > 1) {
// config.setJsonPropertyFilter(new PropertyFilter() {
// public boolean apply(Object source, String name, Object value) {
// if (filter.indexOf(name + "|") != -1)
// return false;
// else
// return true;
// }
// });
// }
pagination = rfxmService.findByPage(pagination, paraMap);
for (int i = 0; i < pagination.list.size(); i++) {
Rfxm r = (Rfxm) pagination.list.get(i);
//TODO 1,判断是否显示同步按钮 2，判断是否置灰
boolean showTb;
boolean showDy;
boolean showYb;
boolean enableTb;
boolean enableDy;
boolean enableYb;
}
convObjectToJson(pagination, config);
}
......@@ -223,70 +234,6 @@ public class JfzmAction extends BaseAction {
this.pagination = pagination;
}
public String getGhxkzbh() {
return ghxkzbh;
}
public void setGhxkzbh(String ghxkzbh) {
this.ghxkzbh = ghxkzbh;
}
public String getJfpzbh() {
return jfpzbh;
}
public void setJfpzbh(String jfpzbh) {
this.jfpzbh = jfpzbh;
}
public String getXxbbh() {
return xxbbh;
}
public void setXxbbh(String xxbbh) {
this.xxbbh = xxbbh;
}
public String getGhxmbh() {
return ghxmbh;
}
public void setGhxmbh(String ghxmbh) {
this.ghxmbh = ghxmbh;
}
public String getJsdwmc() {
return jsdwmc;
}
public void setJsdwmc(String jsdwmc) {
this.jsdwmc = jsdwmc;
}
public String getGcxmmc() {
return gcxmmc;
}
public void setGcxmmc(String gcxmmc) {
this.gcxmmc = gcxmmc;
}
public String getJfhj() {
return jfhj;
}
public void setJfhj(String jfhj) {
this.jfhj = jfhj;
}
public String getHczt() {
return hczt;
}
public void setHczt(String hczt) {
this.hczt = hczt;
}
public String getId() {
return id;
}
......
src/com/jshx/paymentItemHis/web/PaymentItemHisAction.java
View file @ afc2cb28
......@@ -291,6 +291,7 @@ public class PaymentItemHisAction extends BaseAction
model.setIsCwyz("0");
model.setZslxdbh(paymentItemHisService.getPzbh() + 1 + "");//取出历史最大 + 1
paymentItemHisService.update(model);
this.getResponse().getWriter().println("{\"result\":true,\"zslxdbh\":\"" + model.getZslxdbh() + "\",\"mjyj\":\"" + model.getMjyj() + "\"}");
}
/**
......
src/com/jshx/rfxm/conf/struts-rfxm.xml
View file @ afc2cb28
......@@ -71,11 +71,13 @@
</action>
<!-- 复核收费信息，返回Json数据 -->
<action name="rfxmSfxxReview" class="com.jshx.rfxm.web.RfxmAction" method="rfxmSfxxReview">
<!-- <interceptor-ref name="tokenInterceptor" />-->
<!-- <interceptor-ref name="coreStack" />-->
<result name="reload" type="redirect">/common/successToSelf.jsp?windowId=win_rfxmsfxx2</result>
<!-- <result name="invalid.token">/invalid.jsp</result>-->
<interceptor-ref name="tokenInterceptor" />
<interceptor-ref name="coreStack" />
<result name="reload" type="redirect">/common/successToSelf.jsp?windowId=win_rfxmsfxxview</result>
<result name="invalid.token">/invalid.jsp</result>
</action>
<action name="rfxmSfxxReviewCheck" class="com.jshx.rfxm.web.RfxmAction" method="rfxmSfxxReviewCheck"></action>
<!-- 收费列表查询，返回Json数据 -->
<action name="rfxmSfView" class="com.jshx.rfxm.web.RfxmAction" method="sfView">
</action>
......
src/com/jshx/rfxm/web/RfxmAction.java
View file @ afc2cb28
......@@ -1508,54 +1508,39 @@ public class RfxmAction extends BaseAction
this.getResponse().getWriter().println("{\"result\":"+reviewTag+",\"message\":\"" + message + "!"+"\"}");
}
}
public void rfxmSfxxReviewCheck() throws IOException {
RfxmSfxx sfxx = rfxmSfxxService.getById(rfxmsfxx.getId());
boolean result = false;
String message;
if(sfxx.getSfxxjbr().equals(this.getLoginUser().getDisplayName())) {
message = "不允许复核自己添加的费用";
} else {
result = true;
message = "OK";
}
this.getResponse().getWriter().println("{\"result\":"+result+",\"message\":\"" + message + "!"+"\"}");
}
/**
* 复核收费信息
*/
public void rfxmSfxxReview() throws IOException {
String message = "";
boolean reviewFlag = false;
public String rfxmSfxxReview() throws IOException {
if (StringUtils.isNotBlank(flag) && null != rfxmsfxx) {
RfxmSfxx sfxx = rfxmSfxxService.getById(rfxmsfxx.getId());
//已生成缴款通知书的则允许复核,如有需要放开此段注释.
/*
Integer statusCnjfhj = sfxx.getStatusCnjfhj();
if (statusCnjfhj == 1) {
message = "已生成缴款通知书不允许修改!";
this.getResponse().getWriter().println("{\"result\":false,\"message\":\""+message+"\"}");
return null;
}
*/
if ("2".equalsIgnoreCase(flag)) {
//通过
if(sfxx.getSfxxjbr().equals(this.getLoginUser().getDisplayName())) {
message = "不允许复核自己添加的费用";
reviewFlag = false;
} else {
sfxx.setStatusJBFH(2);
sfxx.setFhTime(new Date());
sfxx.setSfxxfhr(this.getLoginUser().getDisplayName());
if (StringUtils.isNotBlank(rfxmsfxx.getSfxxfhyj())){
sfxx.setSfxxfhyj(rfxmsfxx.getSfxxfhyj());
}
message = "复核通过";
reviewFlag = true;
}
}else if ("1".equalsIgnoreCase(flag)){
rfxmSfxxService.update(sfxx);
} else {
//退回
rfxmSfxxService.deleteWithFlag(sfxx.getId());
message = "退回成功";
reviewFlag = true;
}else {
message = "操作失败,请刷新页面再试";
}
try {
if(reviewFlag) rfxmSfxxService.update(sfxx);
}catch (Exception e) {
message = "操作失败,请稍后再试";
}
this.getResponse().getWriter().println("{\"result\":"+reviewFlag+",\"message\":\"" + message + "!"+"\"}");
}
// return RELOAD;
return RELOAD;
}
public String jktzsView() throws IOException {
......@@ -1971,6 +1956,10 @@ public class RfxmAction extends BaseAction
rfxmsfxx.setJbTime(new Date());
rfxmsfxx.setStatusJBFH(0);
rfxm = rfxmService.getById(rfxm.getId());
if(rfxm.getPaymentLink() == null && rfxmsfxx.getCnjfhj() != null) {//如果项目没有缴费环节，则收费处可以补充
rfxm.setPaymentLink(rfxmsfxx.getCnjfhj().contains("30") ? 3 : 1);
rfxmService.update(rfxm);
}
rfxmsfxx.setZslxdbh(rfxm.getZslxdbh());
rfxmSfxxService.save(rfxmsfxx);
// }
......
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