Skip to content

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

Merge branch 'master' of http://gitlab.house365.com/xuzhou/njzsb 

* 'master' of http://gitlab.house365.com/xuzhou/njzsb:
  提示字段修改
  修改
parents 6408bf46 ff6f2755
Expand all Show whitespace changes
Inline Side-by-side
Showing with 177 additions and 30 deletions
WebRoot/WEB-INF/pages/jfzm/jfzm_print.jsp
View file @ 8ca58606
......@@ -477,10 +477,32 @@
<img class='screen-only' src="${ctx}/images/img/gz.jpg" style="position:absolute;width:100%;height:100%"/>
<div id='f1' draggable='true' class='f1'>${rfxm.xxylbbh}</div>
<div id='f2' draggable='true' class='f2'>${rfxm.slbh}</div>
<div id='f3' draggable='true' class='f3'>${fn:substring(xmxxb.jsdw,0,13)}<br/>${fn:substring(xmxxb.jsdw,13,26)}<br/>${fn:substring(xmxxb.jsdw,26,-1)}<br/></div>
<div id='f4' draggable='true' class='f4'>${fn:substring(xmxxb.xmmc,0,13)}<br/>${fn:substring(xmxxb.xmmc,13,26)}<br/>${fn:substring(xmxxb.xmmc,26,-1)}</div>
<c:choose>
<c:when test="${fn:length(xmxxb.jsdw) <= 35 }"> <!--如果 -->
<div id='f3' draggable='true'
class='f3'>${fn:substring(xmxxb.jsdw,0,13)}<br/>${fn:substring(xmxxb.jsdw,13,26)}<br/>${fn:substring(xmxxb.jsdw,26,35)}
</div>
</c:when>
<c:otherwise> <!--否则 -->
<div id='f3' draggable='true'
class='f3'>${fn:substring(xmxxb.jsdw,0,13)}<br/>${fn:substring(xmxxb.jsdw,13,26)}<br/>${fn:substring(xmxxb.jsdw,26,35)}(最多显示35个字)
</div>
</c:otherwise>
</c:choose>
<c:choose>
<c:when test="${fn:length(xmxxb.xmmc) <= 35 }"> <!--如果 -->
<div id='f4' draggable='true'
class='f4'>${fn:substring(xmxxb.xmmc,0,13)}<br/>${fn:substring(xmxxb.xmmc,13,26)}<br/>${fn:substring(xmxxb.xmmc,26,35)}
</div>
</c:when>
<c:otherwise> <!--否则 -->
<div id='f4' draggable='true'
class='f4'>${fn:substring(xmxxb.xmmc,0,13)}<br/>${fn:substring(xmxxb.xmmc,13,26)}<br/>${fn:substring(xmxxb.xmmc,26,35)}(最多显示35个字)
</div>
</c:otherwise>
</c:choose>
<div id='f5' draggable='true' class='f5'>${xmxxb.zjsmj} 平方米</div>
<%-- <div id='f6' draggable='true' class='f6'><fmt:formatNumber value="${csptf}" pattern="#,##0.00#"/> 元</div>--%>
<div id='f6' draggable='true' class='f6'><fmt:formatNumber value="${xmxxb.sjcsje}" pattern="#,##0.00#"/> 元</div>
<div id='f7' draggable='true' class='f7'><fmt:formatNumber value="${paymentItemHis.ptyjje}" pattern="#,##0.00#"/> 元</div>
<div id='f8' draggable='true' class='f8'><fmt:formatNumber value="${paymentItemHis.ptyjmj}" pattern="#,##0.00#"/> 元</div>
<div id='f9' draggable='true' class='f9'></div>
......@@ -493,7 +515,7 @@
<div id='f16' draggable='true' class='f16'>${paymentItemHis.ECN}</div>
<div id='f17' draggable='true' class='f17'>${rfxm.xxylbbh}</div>
<div id='f18' draggable='true' class='f18'>${rfxm.slbh}</div>
<div id='f19' draggable='true' class='f19'>${xmxxb.jsdw}</div>
<div id='f19' draggable='true' class='f19'>${fn:substring(xmxxb.jsdw,0,30)}<br/>${fn:substring(xmxxb.jsdw,30,-1)}</div>
<div id='f20' draggable='true' class='f20'>${fn:substring(xmxxb.xmmc,0,30)}<br/>${fn:substring(xmxxb.xmmc,30,-1)}</div>
<div id='f21' draggable='true' class='f21'>${xmxxb.jsdd}</div>
<div id='f22' draggable='true' class='f22'>${xmxxb.zjsmj} 平方米</div>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Add.jsp
View file @ 8ca58606
......@@ -68,7 +68,7 @@
{
boolean1= false;
// $.messager.alert('提示',"请在"+name+"选中复选框");
message = "请选中复选框";
message = "征收联系单未勾选";
return;
}
......@@ -82,7 +82,7 @@
{
boolean1= false;
// $.messager.alert('提示',"请在"+name+"选中复选框");
message = "请选中复选框";
message = "税务反馈单未勾选";
return;
}
......@@ -96,7 +96,7 @@
{
boolean1= false;
// $.messager.alert('提示',"请在"+name+"选中复选框");
message = "请选中复选框";
message = "先行缴纳配套费的申请未勾选";
return;
}
......@@ -110,13 +110,13 @@
{
boolean1= false;
// $.messager.alert('提示',"请在"+name+"选中复选框");
message = "请选中复选框";
message = "完税证明未勾选";
return;
}
}
});
$("input[name=id]:checked").each(function(){
$("input[name=id1]:checked").each(function(){
var name = $(this).val();
value = $(this).parent().siblings().find("input").val();
value = value.substring(value.lastIndexOf("\\")+1);
......@@ -125,12 +125,73 @@
{
boolean1= false;
// $.messager.alert('提示',"请上传"+$(this).val()+"文件");
message = "请上传文件";
message = "征收联系单未上传";
return;
}
obj[value] = name;
obj1[value] = no;
});
$("input[name=id2]:checked").each(function(){
var name = $(this).val();
value = $(this).parent().siblings().find("input").val();
value = value.substring(value.lastIndexOf("\\")+1);
var no = $(this).parent().parent().find("input[name=wdno]").val();
if(value=="")
{
boolean1= false;
// $.messager.alert('提示',"请上传"+$(this).val()+"文件");
message = "税务反馈单未上传";
return;
}
obj[value] = name;
obj1[value] = no;
});
$("input[name=id3]:checked").each(function(){
var name = $(this).val();
value = $(this).parent().siblings().find("input").val();
value = value.substring(value.lastIndexOf("\\")+1);
var no = $(this).parent().parent().find("input[name=wdno]").val();
if(value=="")
{
boolean1= false;
// $.messager.alert('提示',"请上传"+$(this).val()+"文件");
message = "先行缴纳配套费的申请未上传";
return;
}
obj[value] = name;
obj1[value] = no;
});
$("input[name=id4]:checked").each(function(){
var name = $(this).val();
value = $(this).parent().siblings().find("input").val();
value = value.substring(value.lastIndexOf("\\")+1);
var no = $(this).parent().parent().find("input[name=wdno]").val();
if(value=="")
{
boolean1= false;
// $.messager.alert('提示',"请上传"+$(this).val()+"文件");
message = "完税证明未上传";
return;
}
obj[value] = name;
obj1[value] = no;
});
// $("input[name=id]:checked").each(function(){
// var name = $(this).val();
// value = $(this).parent().siblings().find("input").val();
// value = value.substring(value.lastIndexOf("\\")+1);
// var no = $(this).parent().parent().find("input[name=wdno]").val();
// if(value=="")
// {
// boolean1= false;
// // $.messager.alert('提示',"请上传"+$(this).val()+"文件");
// message = "请上传文件";
// return;
// }
// obj[value] = name;
// obj1[value] = no;
// });
$("#allFileName").val(JSON.stringify(obj));
$("#originFileName").val(JSON.stringify(obj1));
......@@ -159,7 +220,7 @@
var sfxmlxdbh = $('#sfxmlxdbh') .val();
var sfxmmc = $('#sfxmmcselect option:selected') .val();//选中的值
var shbm = $('#shbmselect option:selected') .val();//选中的值
return false
$.ajax({
async: false,
url: "${ctx}/jsp/rfxm/rfxmSfxxCheck.action",
......@@ -410,28 +471,28 @@
<td colspan="3" style="text-align:left;">
<table width="100%" id="table">
<tr>
<th width="20%" style="text-align: left;"><input name="id" type="checkbox" value="征收联系单"><span id='fujianm'>征收联系单:</span></th>
<th width="20%" style="text-align: left;"><input name="id1" type="checkbox" value="征收联系单"><span id='fujianm'>征收联系单:</span></th>
<td style="text-align: left;"width="20%" colspan="2">
<input type="file" name="file1" >
<input type="button" value="扫描" onclick="scan(this)"/>
</td>
</tr>
<tr>
<th width="20%" style="text-align: left;"><input name="id" type="checkbox" value="税务反馈单"><span id='fujianm'>税务反馈单:</span></th>
<th width="20%" style="text-align: left;"><input name="id2" type="checkbox" value="税务反馈单"><span id='fujianm'>税务反馈单:</span></th>
<td style="text-align: left;"width="20%" colspan="2">
<input type="file" name="file2" >
<input type="button" value="扫描" onclick="scan(this)"/>
</td>
</tr>
<tr>
<th width="20%" style="text-align: left;"><input name="id" type="checkbox" value="先行缴纳配套费的申请"><span id='fujianm'>先行缴纳配套费的申请:</span></th>
<th width="20%" style="text-align: left;"><input name="id3" type="checkbox" value="先行缴纳配套费的申请"><span id='fujianm'>先行缴纳配套费的申请:</span></th>
<td style="text-align: left;"width="20%" colspan="2">
<input type="file" name="file3" >
<input type="button" value="扫描" onclick="scan(this)"/>
</td>
</tr>
<tr>
<th width="20%" style="text-align: left;"><input name="id" type="checkbox" value="完税证明"><span id='fujianm'>完税证明:</span></th>
<th width="20%" style="text-align: left;"><input name="id4" type="checkbox" value="完税证明"><span id='fujianm'>完税证明:</span></th>
<td style="text-align: left;"width="20%" colspan="2">
<input type="file" name="file4" >
<input type="button" value="扫描" onclick="scan(this)"/>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Detail.jsp
View file @ 8ca58606
......@@ -34,6 +34,9 @@
.nohover:hover b{
background-position: right 0px;
}
.ye-use{
display: none;
}
</style>
<script type="text/javascript">
......@@ -109,6 +112,9 @@
},
async : false
});
$(".ye-use").css('display','inline-block')
$(".no_use").css('display','none')
$.messager.alert("提示","操作成功")
reloadDate()
}
......@@ -293,12 +299,14 @@
<td colspan="4" height="100px" style="text-align:center">
<c:if test="${rfxm.enableRfyz == 1}">
<c:if test="${rfxm.isSbj==1}">
<a id="noticeBtn0" href="#" class="btn_01"
<a id="noticeBtn0" href="#" class="btn_01 no_use"
onclick="generateNotice('${rfxm.id}');">人防费用章（市本级）<b></b></a>
<a href="#" style="opacity: 0.5" class="btn_01 nohover ye-use">人防费已用章（市本级）<b></b></a>
</c:if>
<c:if test="${rfxm.isSbj!=1}">
<a id="noticeBtn0" href="#" class="btn_01"
<a id="noticeBtn0" href="#" class="btn_01 no_use"
onclick="generateNotice('${rfxm.id}');">人防费用章（非市本级）<b></b></a>
<a href="#" style="opacity: 0.5" class="btn_01 nohover ye-use">人防费已用章（非市本级）<b></b></a>
</c:if>
</c:if>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Edit.jsp
View file @ 8ca58606
......@@ -38,6 +38,10 @@
return
}
}
if ($("#kprq").val() == "" || $("#kprq").val() == undefined || $("#kprq").val() == null) {
$.messager.alert('提示', '请选择反馈日期!');
return
}
$("input[name=file1]").each(function(){
if($(this).val()!="") {
var name = $(this).parent().siblings().find("input").val();
......@@ -46,13 +50,12 @@
{
boolean1= false;
// $.messager.alert('提示',"请在"+name+"选中复选框");
message = "请选中复选框";
message = "征收联系单未勾选";
return;
}
}
});
$("input[name=file2]").each(function(){
if($(this).val()!="") {
var name = $(this).parent().siblings().find("input").val();
......@@ -61,13 +64,12 @@
{
boolean1= false;
// $.messager.alert('提示',"请在"+name+"选中复选框");
message = "请选中复选框";
message = "税务反馈单未勾选";
return;
}
}
});
$("input[name=file3]").each(function(){
if($(this).val()!="") {
var name = $(this).parent().siblings().find("input").val();
......@@ -76,13 +78,12 @@
{
boolean1= false;
// $.messager.alert('提示',"请在"+name+"选中复选框");
message = "请选中复选框";
message = "先行缴纳配套费的申请未勾选";
return;
}
}
});
$("input[name=file4]").each(function(){
if($(this).val()!="") {
var name = $(this).parent().siblings().find("input").val();
......@@ -91,13 +92,13 @@
{
boolean1= false;
// $.messager.alert('提示',"请在"+name+"选中复选框");
message = "请选中复选框";
message = "完税证明未勾选";
return;
}
}
});
$("input[name=id]:checked").each(function(){
$("input[name=id1]:checked").each(function(){
var name = $(this).val();
value = $(this).parent().siblings().find("input").val();
value = value.substring(value.lastIndexOf("\\")+1);
......@@ -106,7 +107,52 @@
{
boolean1= false;
// $.messager.alert('提示',"请上传"+$(this).val()+"文件");
message = "请上传文件";
message = "征收联系单未上传";
return;
}
obj[value] = name;
obj1[value] = no;
});
$("input[name=id2]:checked").each(function(){
var name = $(this).val();
value = $(this).parent().siblings().find("input").val();
value = value.substring(value.lastIndexOf("\\")+1);
var no = $(this).parent().parent().find("input[name=wdno]").val();
if(value=="")
{
boolean1= false;
// $.messager.alert('提示',"请上传"+$(this).val()+"文件");
message = "税务反馈单未上传";
return;
}
obj[value] = name;
obj1[value] = no;
});
$("input[name=id3]:checked").each(function(){
var name = $(this).val();
value = $(this).parent().siblings().find("input").val();
value = value.substring(value.lastIndexOf("\\")+1);
var no = $(this).parent().parent().find("input[name=wdno]").val();
if(value=="")
{
boolean1= false;
// $.messager.alert('提示',"请上传"+$(this).val()+"文件");
message = "先行缴纳配套费的申请未上传";
return;
}
obj[value] = name;
obj1[value] = no;
});
$("input[name=id4]:checked").each(function(){
var name = $(this).val();
value = $(this).parent().siblings().find("input").val();
value = value.substring(value.lastIndexOf("\\")+1);
var no = $(this).parent().parent().find("input[name=wdno]").val();
if(value=="")
{
boolean1= false;
// $.messager.alert('提示',"请上传"+$(this).val()+"文件");
message = "完税证明未上传";
return;
}
obj[value] = name;
......@@ -414,33 +460,43 @@
</c:if>
</c:if>
</tr>
<tr>
<th width="15%">反馈日期</th>
<td width="35%" >
<input style="width: 75%;" name="zzhkppjList[${st.index}].kprq" id="kprq" style="width: 140px"
type="text" class="Wdate" value="${item1.kprq}"
onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" datatype="*1-30" errormsg='此项为必填'><font style='color:red'>*</font>
</td>
</tr>
<tr>
<th width="15">缴费情况:</th>
<td colspan="3" style="text-align:left;">
<table width="100%" id="table">
<tr>
<th width="20%" style="text-align: left;"><input name="id" type="checkbox" value="征收联系单"><span id='fujianm'>征收联系单:</span></th>
<th width="20%" style="text-align: left;"><input name="id1" type="checkbox" value="征收联系单"><span id='fujianm'>征收联系单:</span></th>
<td style="text-align: left;"width="20%" colspan="2">
<input type="file" name="file1" >
<input type="button" value="扫描" onclick="scan(this)"/>
</td>
</tr>
<tr>
<th width="20%" style="text-align: left;"><input name="id" type="checkbox" value="税务反馈单"><span id='fujianm'>税务反馈单:</span></th>
<th width="20%" style="text-align: left;"><input name="id2" type="checkbox" value="税务反馈单"><span id='fujianm'>税务反馈单:</span></th>
<td style="text-align: left;"width="20%" colspan="2">
<input type="file" name="file2" >
<input type="button" value="扫描" onclick="scan(this)"/>
</td>
</tr>
<tr>
<th width="20%" style="text-align: left;"><input name="id" type="checkbox" value="先行缴纳配套费的申请"><span id='fujianm'>先行缴纳配套费的申请:</span></th>
<th width="20%" style="text-align: left;"><input name="id3" type="checkbox" value="先行缴纳配套费的申请"><span id='fujianm'>先行缴纳配套费的申请:</span></th>
<td style="text-align: left;"width="20%" colspan="2">
<input type="file" name="file3" >
<input type="button" value="扫描" onclick="scan(this)"/>
</td>
</tr>
<tr>
<th width="20%" style="text-align: left;"><input name="id" type="checkbox" value="完税证明"><span id='fujianm'>完税证明:</span></th>
<th width="20%" style="text-align: left;"><input name="id4" type="checkbox" value="完税证明"><span id='fujianm'>完税证明:</span></th>
<td style="text-align: left;"width="20%" colspan="2">
<input type="file" name="file4" >
<input type="button" value="扫描" onclick="scan(this)"/>
......
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