Skip to content

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

修改问题

parent 956e2002
Show whitespace changes
Inline Side-by-side
Showing with 116 additions and 131 deletions
WebRoot/WEB-INF/pages/jfzm/Jfzm_Fujian.jsp
View file @ 31839919
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<tr> <tr>
<td colspan="5" height="100px" style="text-align:center"> <td colspan="5" height="100px" style="text-align:center">
<a href="#" class="btn_01" type="submit" onclick="showUpload()" id="huancun">缓存<b></b></a>&nbsp; <a href="#" class="btn_01" type="submit" onclick="showUpload()" id="huancun">缓存<b></b></a>&nbsp;
<a href="#" class="btn_01" onclick="parent.close_win('win_paymentItemHis');">关闭<b></b></a> <a href="#" class="btn_01" onclick="parent.close_win('win_jfzm');">关闭<b></b></a>
</td> </td>
</tr> </tr>
</table> </table>
......
WebRoot/WEB-INF/pages/jfzm/Jfzm_List.jsp
View file @ 31839919
...@@ -597,11 +597,14 @@ ...@@ -597,11 +597,14 @@
{ {
field: 'op1', title: '关联操作', width: 300, align: 'center', formatter: function (value, rec) { field: 'op1', title: '关联操作', width: 300, align: 'center', formatter: function (value, rec) {
if(rec.isSl || rec.paymentLink != '3') {
return " <a class='btn_01_mini' onclick=doPrint('" + rec.id + "')>打印缴费凭证<b></b></a>\n" +
" <a class='btn_01_mini' onclick=one_book()>一般缴款书<b></b></a>";
} else {
return "<a class='btn_01_mini' onclick=asy_tb('" + rec.xxylbbh + "')>同步施工许可<b></b></a>\n" + return "<a class='btn_01_mini' onclick=asy_tb('" + rec.xxylbbh + "')>同步施工许可<b></b></a>\n" +
" <a class='btn_01_mini' onclick=doPrint('" + rec.id + "')>打印缴费凭证<b></b></a>\n" + " <a class='btn_01_mini' onclick=doPrint('" + rec.id + "')>打印缴费凭证<b></b></a>\n" +
" <a class='btn_01_mini' onclick=one_book()>一般缴款书<b></b></a>"; " <a class='btn_01_mini' onclick=one_book()>一般缴款书<b></b></a>";
}
} }
}, },
...@@ -644,33 +647,6 @@ ...@@ -644,33 +647,6 @@
function doPrint(id) { function doPrint(id) {
createSimpleWindow("win_paymentVoucher","打印缴费凭证","${ctx}/jsp/jfzm/print.action?id="+id,350,100); createSimpleWindow("win_paymentVoucher","打印缴费凭证","${ctx}/jsp/jfzm/print.action?id="+id,350,100);
// var jatoolsPrinter = document.getElementById("jatoolsPrinter");
<%--$.ajax({--%>
<%-- url : "${ctx}/jsp/jfzm/queryDetail.action",--%>
<%-- type: 'post',--%>
<%-- dataType: 'json',--%>
<%-- data:{--%>
<%-- id : id--%>
<%-- },--%>
<%-- success: function (data) {--%>
<%-- alert(data)--%>
<%-- }--%>
<%--});--%>
<%--var tp = '${rfxm.mjyj}' == '002' || '${rfxm.mjyj}' == '004' ? 1 : 2;--%>
<%--myDoc = {--%>
<%-- settings: {--%>
<%-- pageWidth: 2100,--%>
<%-- pageHeight: 1400,--%>
<%-- orientation: tp},--%>
<%-- documents: document,--%>
<%-- marginIgnored:true,--%>
<%-- dragDesigner: {viewSource:true},--%>
<%-- settingsID: 'mydoc3',--%>
<%-- classesReplacedWhenPrint: new Array('.only_for_print{display:block}'),--%>
<%-- copyrights: "杰创软件拥有版权 www.jatools.com"--%>
<%--}--%>
<%--jatoolsPrinter.printPreview(myDoc);--%>
} }
</script> </script>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Add.jsp
View file @ 31839919
...@@ -38,31 +38,6 @@ ...@@ -38,31 +38,6 @@
//验证收费信息 //验证收费信息
function verify1(data) { function verify1(data) {
/*if ($("#sfxmmc").val()=="" || $("#sfxmmc").val()== undefined || $("#sfxmmc").val()==null) {
$.messager.alert('提示', '请填写收费项目名称!');
return
}*/
if ($("#sfxmlxdbh").val()=="" || $("#sfxmlxdbh").val()== undefined || $("#sfxmlxdbh").val()==null) {
$.messager.alert('提示', '请填写收费项目联系单编号!');
return
}
$(".rd").on('click',function () {
if($(this).val()=='30日内'){
}else{
if ($("#yjjemx").val()=="" || $("#yjjemx").val()== undefined || $("#yjjemx").val()==null) {
$.messager.alert('提示', '请填写应缴金额明细!');
return
}
}
})
/*if ($("#shbm").val()=="" || $("#shbm").val()== undefined || $("#shbm").val()==null) {
$.messager.alert('提示', '请填写审核部门!');
return
}*/
var value; var value;
var obj={}; var obj={};
var obj1={}; var obj1={};
...@@ -333,18 +308,16 @@ ...@@ -333,18 +308,16 @@
<tr> <tr>
<th width="90">收费项目联系单编号</th> <th width="90">收费项目联系单编号</th>
<td width="35%"> <td width="35%">
<input id="sfxmlxdbh" name="rfxmsfxx.sfxmlxdbh" style="width:90%" datatype="*1-50" errormsg='此项为必填' maxlength="50"/> <input id="sfxmlxdbh" name="rfxmsfxx.sfxmlxdbh" style="width:90%" maxlength="50"/>
<font style='color:red'>*</font>
</td> </td>
<th width="15">应缴金额</th> <th width="15">应缴金额</th>
<td width="35%"> <td width="35%">
<input id="yjjemx" name="rfxmsfxx.yjjemx" style="width:90%" <%--datatype="*1-50" errormsg='此项为必填' maxlength="50"--%> onblur="numberCheck(this)"/> <input id="yjjemx" name="rfxmsfxx.yjjemx" style="width:90%"/>
<font style='color:red'>*</font>
</td> </td>
</tr> </tr>
<tr> <tr>
<th width="15">缴费承诺环节</th> <th width="15">缴费承诺环节</th>
<c:if test="${rxfm.paymentLink ==''}"> <c:if test="${rxfm.paymentLink != 1 && rxfm.paymentLink != 3}">
<td width="35%"> <td width="35%">
<input type="radio" class="rd" name="rfxmsfxx.cnjfhj" value="施工许可前" checked="checked"/> <input type="radio" class="rd" name="rfxmsfxx.cnjfhj" value="施工许可前" checked="checked"/>
施工许可前 施工许可前
...@@ -393,7 +366,7 @@ ...@@ -393,7 +366,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<th width="20%" style="text-align: left;"><input name="id" checked="checked" type="checkbox" value="先行缴纳配套费的申请"><span id='fujianm'>先行缴纳配套费的申请:</span></th> <th width="20%" style="text-align: left;"><input name="id" type="checkbox" value="先行缴纳配套费的申请"><span id='fujianm'>先行缴纳配套费的申请:</span></th>
<td style="text-align: left;"width="20%" colspan="2"> <td style="text-align: left;"width="20%" colspan="2">
<input type="file" name="file1" > <input type="file" name="file1" >
<input type="button" value="扫描" onclick="scan(this)"/> <input type="button" value="扫描" onclick="scan(this)"/>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Detail.jsp
View file @ 31839919
...@@ -139,14 +139,7 @@ ...@@ -139,14 +139,7 @@
{field:'op',title:'操作',width:130,align:'left',formatter:function(value,rec){ {field:'op',title:'操作',width:130,align:'left',formatter:function(value,rec){
var btnTag = ""; var btnTag = "";
if(rec.id.length > 0) { if(rec.id.length > 0) {
if(rec.statusJBFH == 2){
btnTag += "<a class='btn_01_mini' onclick=view('"+rec.id+"') >查看<b></b></a>"; btnTag += "<a class='btn_01_mini' onclick=view('"+rec.id+"') >查看<b></b></a>";
}else {
btnTag += "<a class='btn_01_mini' onclick=view('"+rec.id+"') >查看<b></b></a>"+
"<c:if test='<%=permissions.containsKey("修改收费信息")%>'>"+
"<a class='btn_01_mini' onclick=edit(0,'"+rec.id+"') >修改<b></b></a>"+
"</c:if>";
}
if (rec.tqjn == 1 && rec.statusJBFH == 2) {//延后缴纳并且已通过核验，显示补录 if (rec.tqjn == 1 && rec.statusJBFH == 2) {//延后缴纳并且已通过核验，显示补录
btnTag += "<a class='btn_01_mini' onclick=edit(1,'"+rec.id+"') >补录<b></b></a>" btnTag += "<a class='btn_01_mini' onclick=edit(1,'"+rec.id+"') >补录<b></b></a>"
} }
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Edit.jsp
View file @ 31839919
...@@ -26,23 +26,6 @@ ...@@ -26,23 +26,6 @@
//验证收费信息 //验证收费信息
function verify1(data) { function verify1(data) {
/*if ($("#sfxmmc").val()=="" || $("#sfxmmc").val()== undefined || $("#sfxmmc").val()==null) {
$.messager.alert('提示', '请填写收费项目名称!');
return
}*/
if ($("#sfxmlxdbh").val()=="" || $("#sfxmlxdbh").val()== undefined || $("#sfxmlxdbh").val()==null) {
$.messager.alert('提示', '请填写收费项目联系单编号!');
return
}
if ($("#yjjemx").val()=="" || $("#yjjemx").val()== undefined || $("#yjjemx").val()==null) {
$.messager.alert('提示', '请填写应缴金额明细!');
return
}
/*if ($("#shbm").val()=="" || $("#shbm").val()== undefined || $("#shbm").val()==null) {
$.messager.alert('提示', '请填写审核部门!');
return
}*/
var value; var value;
var obj={}; var obj={};
var obj1={}; var obj1={};
...@@ -324,30 +307,15 @@ ...@@ -324,30 +307,15 @@
<tr> <tr>
<th width="15">收费项目联系单编号</th> <th width="15">收费项目联系单编号</th>
<td width="35%"> <td width="35%">
<input id="sfxmlxdbh" name="rfxmsfxx.sfxmlxdbh" value="${rfxmsfxx.sfxmlxdbh}" style="width:90%" datatype="*1-50" errormsg='此项为必填' maxlength="50"/> <input id="sfxmlxdbh" name="rfxmsfxx.sfxmlxdbh" value="${rfxmsfxx.sfxmlxdbh}" style="width:90%" datatype="*1-50" maxlength="50"/>
<font style='color:red'>*</font>
</td> </td>
<th width="15">应缴金额</th> <th width="15">应缴金额</th>
<td width="35%"> <td width="35%">
<input id="yjjemx" name="rfxmsfxx.yjjemx" value="${rfxmsfxx.yjjemx}" style="width:90%" onblur="numberCheck(this)"/> <input id="yjjemx" name="rfxmsfxx.yjjemx" value="${rfxmsfxx.yjjemx}" style="width:90%"/>
<font style='color:red'>*</font>
</td> </td>
</tr> </tr>
<tr> <tr>
<th width="15">缴费承诺环节</th> <th width="15">缴费承诺环节</th>
<c:if test="${rxfm.paymentLink ==''}">
<td width="35%">
<input type="radio" class="rd" name="rfxmsfxx.cnjfhj" value="施工许可前" checked="checked"/>
施工许可前
<input type="radio" class="rd" name="rfxmsfxx.cnjfhj" value="30日内" />30日内
</td>
<th width="15">提前缴纳配套费</th>
<td width="35%" class="showPt">
<input type="radio" name="rfxmsfxx.tqjn" value="0" checked="checked" />否
<input type="radio" name="rfxmsfxx.tqjn" value="1" checked="checked" />是
</td>
</c:if>
<c:if test="${rxfm.paymentLink =='1'}"> <c:if test="${rxfm.paymentLink =='1'}">
<td width="35%"> <td width="35%">
施工许可前 施工许可前
...@@ -358,11 +326,12 @@ ...@@ -358,11 +326,12 @@
30日内 30日内
</td> </td>
<th width="15">提前缴纳配套费</th> <th width="15">提前缴纳配套费</th>
<td width="35%" > <c:if test="${rfxmsfxx.tqjn =='0'}">
<input type="radio" name="rfxmsfxx.tqjn" value="0" checked="checked" />否 是
<input type="radio" name="rfxmsfxx.tqjn" value="1" checked="checked" />是 </c:if>
</td> <c:if test="${rfxmsfxx.tqjn =='1'}">
是
</c:if>
</c:if> </c:if>
</tr> </tr>
<tr> <tr>
...@@ -384,7 +353,7 @@ ...@@ -384,7 +353,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<th width="20%" style="text-align: left;"><input name="id" checked="checked" type="checkbox" value="先行缴纳配套费的申请"><span id='fujianm'>先行缴纳配套费的申请:</span></th> <th width="20%" style="text-align: left;"><input name="id" type="checkbox" value="先行缴纳配套费的申请"><span id='fujianm'>先行缴纳配套费的申请:</span></th>
<td style="text-align: left;"width="20%" colspan="2"> <td style="text-align: left;"width="20%" colspan="2">
<input type="file" name="file1" > <input type="file" name="file1" >
<input type="button" value="扫描" onclick="scan(this)"/> <input type="button" value="扫描" onclick="scan(this)"/>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_View.jsp
View file @ 31839919
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
}, },
success: function (data) { success: function (data) {
if (data.result) { if (data.result) {
getTabWindow().reloadDate();
$.messager.alert('提示', data.message,"info",function () { $.messager.alert('提示', data.message,"info",function () {
parent.close_win('win_rfxmsfxx'); parent.close_win('win_rfxmsfxx');
}); });
...@@ -93,23 +94,6 @@ ...@@ -93,23 +94,6 @@
//验证收费信息 //验证收费信息
function verify1(data) { function verify1(data) {
// /!*if ($("#sfxmmc").val()=="" || $("#sfxmmc").val()== undefined || $("#sfxmmc").val()==null) {
// $.messager.alert('提示', '请填写收费项目名称!');
// return
// }
// if ($("#sfxmlxdbh").val()=="" || $("#sfxmlxdbh").val()== undefined || $("#sfxmlxdbh").val()==null) {
// $.messager.alert('提示', '请填写收费项目联系单编号!');
// return
// }
// if ($("#yjjemx").val()=="" || $("#yjjemx").val()== undefined || $("#yjjemx").val()==null) {
// $.messager.alert('提示', '请填写应缴金额明细!');
// return
// }
// /!*if ($("#shbm").val()=="" || $("#shbm").val()== undefined || $("#shbm").val()==null) {
// $.messager.alert('提示', '请填写审核部门!');
// return
// }
var value; var value;
var obj={}; var obj={};
var obj1={}; var obj1={};
......
src/com/jshx/jfzm/conf/struts-jfzm.xml
View file @ 31839919
...@@ -27,5 +27,12 @@ ...@@ -27,5 +27,12 @@
<result name="edit">/WEB-INF/pages/jfzm/Jfzm_Fujian.jsp</result> <result name="edit">/WEB-INF/pages/jfzm/Jfzm_Fujian.jsp</result>
</action> </action>
<action name="fujiantongbu" class="com.jshx.jfzm.web.JfzmAction" method="fujiantongbu">
<interceptor-ref name="tokenInterceptor" />
<interceptor-ref name="coreStack" />
<result name="reload" type="redirect">/common/successToSelf.jsp?windowId=win_jfzm</result>
<result name="invalid.token">/invalid.jsp</result>
</action>
</package> </package>
</struts> </struts>
src/com/jshx/jfzm/web/JfzmAction.java
View file @ 31839919
package com.jshx.jfzm.web; package com.jshx.jfzm.web;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.jshx.common.utils.FileUtils;
import com.jshx.core.base.action.BaseAction; import com.jshx.core.base.action.BaseAction;
import com.jshx.core.base.vo.Pagination; import com.jshx.core.base.vo.Pagination;
import com.jshx.core.json.CodeJsonValueProcessor; import com.jshx.core.json.CodeJsonValueProcessor;
import com.jshx.core.json.DateJsonValueProcessor; import com.jshx.core.json.DateJsonValueProcessor;
import com.jshx.core.utils.StringUtil;
import com.jshx.core.utils.Struts2Util; import com.jshx.core.utils.Struts2Util;
import com.jshx.core.utils.SysPropertiesUtil;
import com.jshx.paymentItemHis.entity.PaymentItemHis; import com.jshx.paymentItemHis.entity.PaymentItemHis;
import com.jshx.paymentItemHis.service.PaymentItemHisService; import com.jshx.paymentItemHis.service.PaymentItemHisService;
import com.jshx.rfxm.entity.Rfxm; import com.jshx.rfxm.entity.Rfxm;
import com.jshx.rfxm.service.RfxmService; import com.jshx.rfxm.service.RfxmService;
import com.jshx.wwjdclinfo.entity.Wwjdclinfo;
import com.jshx.wwsqys.entity.Wwsqys;
import com.jshx.xmxxb.entity.Xmxxb; import com.jshx.xmxxb.entity.Xmxxb;
import com.jshx.xmxxb.service.XmxxbService; import com.jshx.xmxxb.service.XmxxbService;
import com.jshx.zsdw.service.ZsdwService; import com.jshx.zsdw.service.ZsdwService;
import com.neusoft.egov.utils.TextUtils; import com.neusoft.egov.utils.TextUtils;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import net.sf.json.JsonConfig; import net.sf.json.JsonConfig;
import org.activiti.editor.language.json.converter.util.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
public class JfzmAction extends BaseAction { public class JfzmAction extends BaseAction {
...@@ -142,6 +150,71 @@ public class JfzmAction extends BaseAction { ...@@ -142,6 +150,71 @@ public class JfzmAction extends BaseAction {
return EDIT; return EDIT;
} }
private File file; //文件上传
/**
* 凭证上传
* 先缓存至服务器
*/
public String fujiantongbu() throws Exception
{
String fileName1="";
String rubiaopath ="";
//id : uploadName;ids:uploadShowName
if(file!=null && StringUtil.isNotEmpty(id))
{
//TODO 上传文件
String path = SysPropertiesUtil.jdlj(this.getRequest())
+ File.separator+ "wwupload"+ File.separator+"bjcl" +File.separator+xmxxb.getXxylb()+File.separator;
rubiaopath = "wwupload"+ File.separator+"bjcl" +File.separator+xmxxb.getXxylb()+File.separator+id;
rubiaopath = rubiaopath.replaceAll("\\\\", "/").trim();
path = path.replaceAll("\\\\", "/").trim();
fileName1 = FileUtils.uploadFile(file,id, path);
}
// Wwjdclinfo wwjdclinfo = new Wwjdclinfo();
// wwjdclinfo.setDeptId(this.getLoginUserDepartmentId());
// wwjdclinfo.setDelFlag(0);
// xmxxb = xmxxbService.getByXxylb(xmxxb.getXxylb());
//// List<Wwsqys> ls = wwsqysService.findxxylb(xmxxb.getXxylb());
// if(xmxxb != null && "9".equals(xmxxb.getHfsz()))
// {
// List<Wwsqys> wwsqyss = wwsqysService.findxxylb(xmxxb.getXxylb());
// wwjdclinfo.setWwsqbh(wwsqyss.get(0).getWwsqbh());
// }
// else
// {
// wwjdclinfo.setWwsqbh("xxsbxm");
// }
//
// wwjdclinfo.setScdz(rubiaopath);
// wwjdclinfo.setScwjm(id);
// wwjdclinfo.setFjqm(ids);
//// wwjdclinfo.setWwsqbh(wwsqys.getWwsqbh());
// wwjdclinfo.setXxylb(xmxxb.getXxylb());
// //查询表中是否存在，若存在则覆盖
// Map<String, Object> paraMap = new HashMap<String, Object>();
// Pagination pagination =new Pagination(1,100);
// paraMap.put("xxylb",xmxxb.getXxylb());
// paraMap.put("fjqm",ids);
// pagination = wwjdclinfoService.findByPage(pagination,paraMap);
// List<Wwjdclinfo> wwjdclinfos = pagination.getListOfObject();
// if(CollectionUtils.isEmpty(wwjdclinfos))
// {
// wwjdclinfoService.save(wwjdclinfo);
// }
// else
// {
// Wwjdclinfo wwjdclinfo1 = wwjdclinfos.get(0);
// wwjdclinfo1.setFjqm(ids);
// wwjdclinfo1.setScwjm(id);
// wwjdclinfo1.setScdz(rubiaopath);
// wwjdclinfoService.update(wwjdclinfo1);
// }
return RELOAD;
}
public Pagination getPagination() { public Pagination getPagination() {
return pagination; return pagination;
} }
......
src/com/jshx/rfxm/entity/Rfxm.java
View file @ 31839919
...@@ -283,6 +283,21 @@ public class Rfxm extends BaseModel ...@@ -283,6 +283,21 @@ public class Rfxm extends BaseModel
*/ */
public String jbr; public String jbr;
/**
* 同步次数
* 可以补录的，可以同步2次
* 不能补录的，只能通过一次
*/
public String tongbu;
public String getTongbu() {
return tongbu;
}
public void setTongbu(String tongbu) {
this.tongbu = tongbu;
}
public String getJbr() { public String getJbr() {
return jbr; return jbr;
} }
......
src/com/jshx/rfxm/web/RfxmAction.java
View file @ 31839919
...@@ -1542,12 +1542,7 @@ public class RfxmAction extends BaseAction ...@@ -1542,12 +1542,7 @@ public class RfxmAction extends BaseAction
} }
}else if ("1".equalsIgnoreCase(flag)){ }else if ("1".equalsIgnoreCase(flag)){
//退回 //退回
sfxx.setStatusJBFH(1); rfxmSfxxService.deleteWithFlag(sfxx.getId());
sfxx.setFhTime(new Date());
sfxx.setSfxxfhr(this.getLoginUser().getDisplayName());
if (StringUtils.isNotBlank(rfxmsfxx.getSfxxfhyj())) {
sfxx.setSfxxfhyj(rfxmsfxx.getSfxxfhyj());
}
message = "退回成功"; message = "退回成功";
reviewFlag = true; reviewFlag = true;
}else { }else {
......
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