Commit 494a23be authored by 徐州's avatar 徐州

修改部分问题

parent 4f8dabcd
......@@ -59,17 +59,19 @@
success: function(data){
if(data.result){
$.messager.confirm("提示", "确认要财务用章?", function(result) {
$.ajax({
url : "${ctx}/jsp/paymentItemHis/cwyz.action",
type: 'post',
dataType: 'json',
data:{
id : row_Id
},
async : false
});
$.messager.alert("提示","操作成功")
search_paymentItemHis();
if(result) {
$.ajax({
url : "${ctx}/jsp/paymentItemHis/cwyz.action",
type: 'post',
dataType: 'json',
data:{
id : row_Id
},
async : false
});
$.messager.alert("提示","操作成功")
search_paymentItemHis();
}
});
}else{
......
......@@ -172,7 +172,7 @@
$(function(){
$('#pagination').datagrid($.extend(window.dg_cm_pp_2,{
title:'项目管理列表',
title:'人防费核查项目列表',
url:'rfxmQuery.action',
queryParams:{
"rfxm.xkzh": $("#xkzh").val(),
......@@ -259,7 +259,7 @@
<td width="35%"><input name="rfxm.zslxdbh" id="zslxdbh" value="" type="text"></td>
</tr>
<tr>
<th width="15%">信息表编号</th>
<th width="15%">信息一览表编号</th>
<td width="35%"><input name="rfxm.xxylbbh" id="xxylbbh" value="" type="text"></td>
<th width="15%">规划项目编号</th>
<td width="35%"><input name="rfxm.xmbh" id="xmbh" value="" type="text"></td>
......
......@@ -62,17 +62,19 @@
<%-- 人防用章 --%>
function generateNotice(id){
$.messager.confirm("提示", "确认要人防用章?", function(result) {
$.ajax({
url : "${ctx}/jsp/rfxm/rfyz.action",
type: 'post',
dataType: 'json',
data:{
ids : id
},
async : false
});
$.messager.alert("提示","操作成功")
reloadDate()
if(result) {
$.ajax({
url : "${ctx}/jsp/rfxm/rfyz.action",
type: 'post',
dataType: 'json',
data:{
ids : id
},
async : false
});
$.messager.alert("提示","操作成功")
reloadDate()
}
});
}
......
......@@ -390,7 +390,7 @@
<tr>
<th width="15">缴费凭证编号</th>
<td width="35%">
<input id="cnjfhj" name="rfxmsfxx.cnjfhj" style="width:90%" value="${rfxmsfxx.cnjfhj}" readonly/>
<input id="zslxdbh" name="rfxmsfxx.zslxdbh" style="width:90%" value="${rfxmsfxx.zslxdbh}" readonly/>
</td>
</tr>
<tr>
......
......@@ -1212,7 +1212,7 @@ public class RfxmAction extends BaseAction
if(!TextUtils.isEmpty(rfxm.getPaymentHisId())) {
PaymentItemHis paymentItemHis = paymentItemHisService.getById(rfxm.getPaymentHisId());
RfxmSfxx sfxx = new RfxmSfxx();
sfxx.setSfxmmc(paymentItemHis.getXmmc());
sfxx.setSfxmmc("城市基础设施配套费");
sfxx.setSfxmlxdbh(paymentItemHis.getZslxdbh());
sfxx.setYjjemx(paymentItemHis.getZyjje());
sfxx.setShbm(paymentItemHis.getZsdw());
......@@ -2294,19 +2294,18 @@ public class RfxmAction extends BaseAction
boolean status = true;
//TODO 这里可以校验选择的对不对
String message = "OK";
//TODO 先注释起来,不然不方便测试
// Map<String, Object> query = new HashMap<>();
// query.put("rfxmid",rfxmid);
// if(pagination==null) {
// pagination = new Pagination(this.getRequest());
// }
// Pagination byPage = rfxmSfxxService.findByPage(pagination, query);
// if(byPage.totalCount > 0) {
// status = false;
// message = "只允许添加一条记录";
// this.getResponse().getWriter().println("{\"result\":"+status+",\"message\":\""+message+"\"}");
// return;
// }
Map<String, Object> query = new HashMap<>();
query.put("rfxmid",rfxmid);
if(pagination==null) {
pagination = new Pagination(this.getRequest());
}
Pagination byPage = rfxmSfxxService.findByPage(pagination, query);
if(byPage.totalCount > 0) {
status = false;
message = "只允许添加一条记录";
this.getResponse().getWriter().println("{\"result\":"+status+",\"message\":\""+message+"\"}");
return;
}
this.getResponse().getWriter().println("{\"result\":"+status+",\"message\":\""+message+"\"}");
}
......
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