Skip to content

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

修改部分问题

parent 853dd3f1
Hide whitespace changes
Inline Side-by-side
Showing with 269 additions and 82 deletions
WebRoot/WEB-INF/pages/jfzm/Jfzm_Fujian.jsp 0 → 100644
View file @ dc652385
<%@page language="java" pageEncoding="UTF-8" isELIgnored="false"%>
<%@include file="/common/header.jsp"%>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title><s:if test="flag=='add'">新增</s:if><s:else>修改</s:else>记录</title>
<%@include file="/common/jsLib.jsp"%>
<script type="text/javascript" src="${ctx}/webResources/js/alertify.min.js"></script>
<link rel="stylesheet" type="text/css" href="${ctx}/webResources/style/alertify.core.css">
<link rel="stylesheet" type="text/css" href="${ctx}/webResources/style/alertify.default.css">
<script type="text/javascript">
function scan(d){
var slb="${xmxxb.slbh}";
var dan="";
var dan=slb.substr(0,4)+slb.substr(slb.length-3,3)+"${xmxxb.dwdm}";
var text = "缴费凭证";
text=text+"_"+dan;
console.log(text);
window.open('${ctx}/scan.jsp?id='+encodeURIComponent(text));
}
function hufentg1(){
var s=$("#dwdm").val();
if("wqr"==s){
$.messager.confirm("提示","你暂时未划分征收单位是否提交?",function(result){
if(result){
hufentg();
}
});
}else{
hufentg();
}
}
</script>
</head>
<body>
<div class="page_dialog">
<div class="inner6px">
<div class="cell" style="width: 100%">
<form name="myform1" method="post" enctype="multipart/form-data" action="fujiantongbu.action">
<s:token />
<table width="100%" border="0">
<s:if test="wwjdclinfos.size()>0">
<tr>
<td width="8%" align="center">附件</td>
<td colspan="4"style="text-align: left; padding: 0 0 0 0px">
<table width="100%" id="table">
<c:forEach var="c" items="${wwjdclinfos}">
<tr>
<th style='text-align: left'; width="35%">${c.fjqm}:</th>
<td width="57%"> <a href="javascript:opendoc('${c.id}')"><font style="color:blue">${c.scwjm}</font></a> </br></td>
</tr>
</c:forEach>
</table>
</td>
</tr>
</s:if>
<tr>
<td width="8%">补充材料：</td>
<input type='text' name='id' value="" hidden="hidden" id="fileNameInput"/>
<input type='text' name='xmxxb.xxylb' value="${xmxxb.xxylb}" hidden="hidden" id="xmxxb.xxylb"/>
<th width="15%">附件显示名称</th>
<td width="31%"><select name="ids" >
<option value="缴费凭证">缴费凭证</option>
</select>
</td>
<th width="15%">选择文件</th>
<td style="text-align:left;" id='more' width='31%'><input type='file' name='file' onchange="fileChange()" id="fileInput" style="width: 60%;">
&nbsp;&nbsp;
<input type="button" value="扫描" onclick="scan(this)"/>
<a href="###"><img src="${ctx}/webResources/js/easyui-1.4.4/themes/icons/edit_remove.png"></a>
</td>
</tr>
<tr>
<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" onclick="parent.close_win('win_paymentItemHis');">关闭<b></b></a>
</td>
</tr>
</table>
</form>
</div></div></div>
<script>
function initGUI()
{
var a=0;
if('${wwsqys.bllx}' != '2')
{
$('#jm').attr('hidden','hidden');
a++;
}
if('${wwsqys.isbjdk}' != '1')
{
$('.bj').attr('hidden','hidden');
a = a+4;
}
$('#xmxx').attr('rowspan',15-a);
};
window.onload = function(){
//初始化控制同步按钮是否灰化
console.log("是否同步凭证："+'${jfpz}');
console.log("是否同步施工系统："+'${istbsgxt}');
if('yes' == '${jfpz}' && 'yes' == '${istbsgxt}' )
{
$('#jfpz').removeAttr("onclick");
$('#jfpz').css({color:"gray"});
$('#huancun').removeAttr("onclick");
$('#huancun').css({color:"gray"});
}
initGUI();
$('th').css("border-bottom","1px solid #B7B7B7");
};
function fileChange()
{
var filevalue = $('#fileInput').val();
var index = filevalue.lastIndexOf('\\');
var name = filevalue.substring(index+1);
console.log(name);
$('#fileNameInput').val(name);
}
function opendoc(id)
{
window.location.href="${ctx}/jsp/wwsqys/download.action?ids="+id;
}
function showUpload()
{
var fileIsupload = $('#fileInput').val();
if(fileIsupload)
{
document.myform1.submit();
}
else
{
$.messager.alert('提示','未选择文件！');
}
}
function sync(id){
$.messager.confirm("同步","确定要同步吗?",function(result){
if(result){
$.ajax({
url : "wwsqysSync.action",
type: 'post',
dataType: 'json',
async : false,
data:{
ids : id
},
error: function(){
$.messager.alert('错误','同步时出错！');
},
success: function(data){
if(data.result){
$.messager.alert('提示','同步成功！');
search_cktzs();
}else{
$.messager.alert('错误','同步时出错！'+data.info);
}
}
});
}
});
}
</script>
</body>
</html>
WebRoot/WEB-INF/pages/jfzm/Jfzm_List.jsp
View file @ dc652385
......@@ -460,7 +460,7 @@
}
function view(row_Id) {
var dt = new Date();
createSimpleWindow("win_zzhxm", "查看详细信息", "一站式查看.html?zzhxm.id=" + row_Id + "&dt=" + dt.getTime(), 850, 700);
createSimpleWindow("win_zzhxm", "查看详细信息", "/jsp/jfzm/fujian.action?id=" + row_Id + "&dt=" + dt.getTime(), 850, 700);
}
function addTabSfxx(row_Id) {
var dt = new Date();
......@@ -598,7 +598,7 @@
{
field: 'op1', title: '关联操作', width: 300, align: 'center', formatter: function (value, rec) {
return "<a class='btn_01_mini' onclick=asy_tb()>同步施工许可<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=one_book()>一般缴款书<b></b></a>";
......@@ -737,16 +737,38 @@
</body>
<script>
function asy_tb() {
$.messager.confirm("确定", "是否确定同步施工许可?", function (result) {
if (result) {
$.messager.alert('提示', "同步成功");
function asy_tb(id) {
$.messager.confirm("同步","确定要同步吗?",function(result){
if(result){
$.ajax({
url : "${ctx}/jsp/paymentVoucher/pinzhenSyncPz.action",
type: 'post',
dataType: 'json',
async : false,
data:{
ids : id
},
success: function(data){
if('true'==data.result1){
$.messager.alert('提示','同步成功！');
// search_cktzs();
}else{
$.messager.alert('错误','同步时出错！'+data.info);
}
},
error: function(data){
console.log(data);
$.messager.alert('错误','同步时出错！');
}
});
}
});
}
function one_book(row_Id) {
var dt = new Date();
createSimpleWindow("win_jfzm", "一般缴款书", "一般缴款书.html?jfzm.id=" + row_Id + "&dt=" + dt.getTime(), 850, 300);
createSimpleWindow("win_jfzm", "一般缴款书","${ctx}/jsp/jfzm/fujian.action", 990, 300);
}
</script>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Detail.jsp
View file @ dc652385
......@@ -115,22 +115,10 @@
<th width="15%">承诺缴费环节</th>
<%--<td width="35%" ><s:property value="#sfxx.cnjfhj"/></td>--%>
<td width="35%" ><s:property value="paymentItemHis.cnjfhj"/></td>
<%--<td width="35%" >${li.cnjfhj}</td>--%>
<%--<th width="15%">审核部门</th>--%>
<%--<td width="35%" >${li.shbm}</td>--%>
<%-- <th width="15%"></th>--%>
<%-- <td width="35%">--%>
<%-- <a href="javascript:opendoc('<s:property value="id"/>')"><font color="blue"><s:property value="attachname"/></font></a>--%>
<%-- </td>--%>
<th width="15%">一般缴款书编号</th>
<%--<td width="35%" ><s:property value="#sfxx.cnjfhj"/></td>--%>
<td width="35%" ><s:property value="paymentItemHis.ybjksbh"/></td>
<th width="15%">缴费凭证编号</th>
<td width="35%" ><s:property value="paymentItemHis.zslxdbh"/></td>
</tr>
<tr>
<th width="15%">缴费凭证编号</th>
<td width="35%" ><s:property value="paymentItemHis.zslxdbh"/></td>
</tr>
</table>
</div>
......@@ -211,9 +199,6 @@
<th width="15%">承诺缴费环节</th>
<%--<td width="35%" ><s:property value="#sfxx.cnjfhj"/></td>--%>
<td width="35%" ><s:property value="cnjfhj"/></td>
<th width="15%">项目联系单编号</th>
<%--<td width="35%" ><s:property value="#sfxx.cnjfhj"/></td>--%>
<td width="35%" ><s:property value="sfxmlxdbh"/></td>
</tr>
</table>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Add.jsp
View file @ dc652385
......@@ -353,8 +353,8 @@
</td>
<th width="15">提前缴纳配套费</th>
<td width="35%" class="showPt">
<input type="radio" name="zzhxmsfxx.tqjn" value="0" checked="checked" />否
<input type="radio" name="zzhxmsfxx.tqjn" value="1" checked="checked" />是
<input type="radio" name="rfxmsfxx.tqjn" value="0" checked="checked" />否
<input type="radio" name="rfxmsfxx.tqjn" value="1" checked="checked" />是
</td>
</tr>
<tr>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Edit.jsp
View file @ dc652385
......@@ -104,7 +104,7 @@
var shbm = $('#shbmselect option:selected') .val();//选中的值
$.ajax({
async: false,
url: "${ctx}/jsp/rfxm/rfxmSfxxCheck.action",
url: "${ctx}/jsp/rfxm/rfxmSfxxCheck.action?flag=edit",
type: 'post',
dataType: 'json',
async: false,
......@@ -360,10 +360,14 @@
</td>
<th width="15">提前缴纳配套费</th>
<td width="35%">
<input type="radio" name="zzhxmsfxx.tqjnptf" value="否" />
否
<input type="radio" name="zzhxmsfxx.tqjnptf" value="是" checked="checked" />
是
<c:if test="${rfxmsfxx.tqjn == 1}">
<input type="radio" name="rfxmsfxx.tqjn" value="0" />否
<input type="radio" name="rfxmsfxx.tqjn" value="1" checked="checked" />是
</c:if>
<c:if test="${rfxmsfxx.tqjn != 1}">
<input type="radio" name="rfxmsfxx.tqjn" value="0" checked="checked" />否
<input type="radio" name="rfxmsfxx.tqjn" value="1" />是
</c:if>
</td>
</tr>
......@@ -406,12 +410,6 @@
</div>
</div>
<table>
<tr>
<th width="15">复核意见</th>
<td width="85%">
<textarea id="sfxxfhyj" name="rfxmsfxx.sfxxfhyj" style="width: 95%" readonly>${rfxmsfxx.sfxxfhyj}</textarea>
</td>
</tr>
<tr>
<th width="15">备注</th>
<td width="85%">
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_View.jsp
View file @ dc652385
......@@ -42,19 +42,13 @@
}
function review(val, flag) {
var sfxxid = $("#sfxxid").val();
var beizhu = $("#beizhu").val();
<%--
/*if (beizhu != null && beizhu != "" && beizhu != undefined) {
window.location.href= "${ctx}/jsp/rfxm/rfxmSfxxReview.action?rfxmsfxx.id="+sfxxid+"&rfxmsfxx.sfxxfhyj="+beizhu+"&flag="+flag;
}else {
window.location.href= "${ctx}/jsp/rfxm/rfxmSfxxReview.action?rfxmsfxx.id="+sfxxid+"&flag="+flag;
}*/
--%>
var beizhu = $("#sfxxfhyj").val();
$("#flag").val(flag);
document.myform1.action="rfxmSfxxReview.action";
document.myform1.submit();
parent.reloadDate();
parent.close_win('win_rfxmsfxx');
// document.myform1.action="rfxmSfxxReview.action";
// document.myform1.submit();
// parent.reloadDate();
// parent.close_win('win_rfxmsfxx');
$.ajax({
async: false,
url: "${ctx}/jsp/rfxm/rfxmSfxxReview.action",
......@@ -67,9 +61,9 @@
},
success: function (data) {
if (data.result) {
// $("#yzjg").html('验证成功!');
parent.close_win('win_rfxmsfxx');
$.messager.alert('提示', data.message);
$.messager.alert('提示', data.message,"info",function () {
parent.close_win('win_rfxmsfxx');
});
/!*return;*!/
} else {
abc="0";
......@@ -349,16 +343,6 @@
<div id="payDiv" class="easyui-accordion" style="">
<div id="showTitle" class="" title="查看收费信息" data-options="iconCls:'icon-ok'" style="overflow:auto;padding:10px;">
<table width="100%" border="0" id="sfTable">
<tr>
<th width="15%">区域信息</th>
<td width="35%">
<input id="yzsqy" name="rfxmsfxx.yzsqy" style="width:90%" value="${rfxmsfxx.yzsqy}" readonly/>
</td>
<th width="15">代收单位</th>
<td width="35%">
<input id="dsdw" name="rfxmsfxx.dsdw" style="width:90%" value="${rfxmsfxx.dsdw}" readonly/>
</td>
</tr>
<tr>
<th width="15">收费项目名称</th>
<td width="35%">
......@@ -411,7 +395,7 @@
<tr>
<th width="15">复核意见</th>
<td width="85%">
<textarea id="beizhu" name="rfxmsfxx.sfxxfhyj" style="width: 95%" ></textarea>
<textarea id="sfxxfhyj" name="rfxmsfxx.sfxxfhyj" style="width: 95%"></textarea>
</td>
</tr>
</table>
......
src/com/jshx/jfzm/conf/struts-jfzm.xml
View file @ dc652385
......@@ -23,5 +23,9 @@
<result name="view">/WEB-INF/pages/jfzm/jfzm_print.jsp</result>
</action>
<action name="fujian" class="com.jshx.jfzm.web.JfzmAction" method="fujian">
<result name="edit">/WEB-INF/pages/jfzm/Jfzm_Fujian.jsp</result>
</action>
</package>
</struts>
src/com/jshx/jfzm/web/JfzmAction.java
View file @ dc652385
......@@ -137,6 +137,11 @@ public class JfzmAction extends BaseAction {
return VIEW;
}
public String fujian() {
return EDIT;
}
public Pagination getPagination() {
return pagination;
}
......
src/com/jshx/rfxm/conf/struts-rfxm.xml
View file @ dc652385
......@@ -71,10 +71,10 @@
</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_rfxmsfxx</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_rfxmsfxx</result>-->
<!-- <result name="invalid.token">/invalid.jsp</result>-->
</action>
<!-- 收费列表查询，返回Json数据 -->
<action name="rfxmSfView" class="com.jshx.rfxm.web.RfxmAction" method="sfView">
......
src/com/jshx/rfxm/web/RfxmAction.java
View file @ dc652385
......@@ -1511,7 +1511,7 @@ public class RfxmAction extends BaseAction
/**
* 复核收费信息
*/
public String rfxmSfxxReview() throws IOException {
public void rfxmSfxxReview() throws IOException {
String message = "";
boolean reviewFlag = false;
if (StringUtils.isNotBlank(flag) && null != rfxmsfxx) {
......@@ -1554,13 +1554,13 @@ public class RfxmAction extends BaseAction
message = "操作失败,请刷新页面再试";
}
try {
rfxmSfxxService.update(sfxx);
if(reviewFlag) rfxmSfxxService.update(sfxx);
}catch (Exception e) {
message = "操作失败,请稍后再试";
}
//this.getResponse().getWriter().println("{\"result\":"+reviewTag+",\"message\":\"" + message + "!"+"\"}");
this.getResponse().getWriter().println("{\"result\":"+reviewFlag+",\"message\":\"" + message + "!"+"\"}");
}
return RELOAD;
// return RELOAD;
}
public String jktzsView() throws IOException {
......@@ -2201,6 +2201,7 @@ public class RfxmAction extends BaseAction
sfxx.setCnjfhj(cnjfhj);
sfxx.setTypeCnjfhj(2);
sfxx.setTqjn(rfxmsfxx.getTqjn());
}
if (null != rfxmsfxx.getBeizhu() && !(rfxmsfxx.getBeizhu()).equalsIgnoreCase(sfxx.getBeizhu())) {
sfxx.setBeizhu(rfxmsfxx.getBeizhu());
......@@ -2294,18 +2295,21 @@ public class RfxmAction extends BaseAction
boolean status = true;
//TODO 这里可以校验选择的对不对
String message = "OK";
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;
if(!"edit".equals(flag)) {
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