Skip to content

N
njzsb
Commit c7a4b24d 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:
  样式
  编号字段修改
  部分BUg修改

# Conflicts:
#	WebRoot/WEB-INF/pages/account/paymentVoucher/PaymentVoucherPrint_GuiHua.jsp
parents 10ad2e72 99469e06
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 15 deletions
WebRoot/WEB-INF/pages/account/paymentVoucher/PaymentVoucherPrint_GuiHua.jsp
View file @ c7a4b24d
...@@ -384,11 +384,11 @@ function updateZslxdbh(){ ...@@ -384,11 +384,11 @@ function updateZslxdbh(){
<div id='f30' draggable='true' class='f30'>规划许可证号：${xmxxb.xkzh}</div> <div id='f30' draggable='true' class='f30'>规划许可证号：${xmxxb.xkzh}</div>
<div id='f31' draggable='true' class='f31'>规划项目编号：${xmxxb.xmbh}</div> <div id='f31' draggable='true' class='f31'>规划项目编号：${xmxxb.xmbh}</div>
<c:if test="${paymentItemHis.isCwyz!='0'}">
<div id='32' draggable='true' class='f32'>${paymentItemHis.zslxdbh}</div> <div id='32' draggable='true' class='f32'>${paymentItemHis.zslxdbh}</div>
<div id='33' draggable='true' class='f33'>${paymentItemHis.zslxdbh}</div> <div id='33' draggable='true' class='f33'>${paymentItemHis.zslxdbh}</div>
<div id='34' draggable='true' class='f34'>${paymentItemHis.jbr}</br>${rfxm.jbr}</div> <div id='34' draggable='true' class='f34'>${paymentItemHis.jbr}</br>${rfxm.jbr}</div>
<c:if test="${paymentItemHis.isCwyz!='0'}">
<div id='37' draggable='true' class='f37'><img src="${ctx}/images/img/zhang1.png" alt=""></div> <div id='37' draggable='true' class='f37'><img src="${ctx}/images/img/zhang1.png" alt=""></div>
</c:if> </c:if>
<div id='36' draggable='true' class='f36'><img src="${ctx}/images/img/zhang3.png" alt=""></div> <div id='36' draggable='true' class='f36'><img src="${ctx}/images/img/zhang3.png" alt=""></div>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Add.jsp
View file @ c7a4b24d
...@@ -9,11 +9,12 @@ ...@@ -9,11 +9,12 @@
margin-top: -7px; margin-top: -7px;
} }
.showPt{ .showPt{
display: none;
visibility: hidden;
} }
.dis-bl{ .dis-bl{
display: block !important; visibility: initial !important;
width: 100%;
border: none !important; border: none !important;
line-height: 32px; line-height: 32px;
} }
...@@ -44,6 +45,10 @@ ...@@ -44,6 +45,10 @@
var flag1=true; var flag1=true;
var boolean1=true; var boolean1=true;
var message = ""; var message = "";
if ($("#yjjemx").val()=="" || $("#yjjemx").val()== undefined || $("#yjjemx").val()==null) {
$.messager.alert('提示', '请填写应缴金额明细!');
return
}
$("input[name=file1]").each(function(){ $("input[name=file1]").each(function(){
if($(this).val()!="") { if($(this).val()!="") {
var name = $(this).parent().siblings().find("input").val(); var name = $(this).parent().siblings().find("input").val();
...@@ -191,6 +196,7 @@ ...@@ -191,6 +196,7 @@
} }
} }
</script> </script>
</head> </head>
<body validform="true"> <body validform="true">
...@@ -298,26 +304,27 @@ ...@@ -298,26 +304,27 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<th width="90">收费项目联系单编号</th> <th width="15%">收费项目联系单编号</th>
<td width="35%"> <td width="35%">
<input id="sfxmlxdbh" name="rfxmsfxx.sfxmlxdbh" style="width:90%" maxlength="50"/> <input id="sfxmlxdbh" name="rfxmsfxx.sfxmlxdbh" style="width:90%" maxlength="50"/>
</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%"/> <input id="yjjemx" name="rfxmsfxx.yjjemx" style="width:90%" datatype="*1-50" errormsg='此项为必填' maxlength="50" onblur="numberCheck(this)"/>
<font style='color:red'>*</font>
</td> </td>
</tr> </tr>
<tr> <tr>
<th width="15">缴费承诺环节</th> <th width="15">缴费承诺环节</th>
<c:if test="${ rxfm.paymentLink == null}"> <c:if test="${ empty rfxm.paymentLink}">
<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"/>
施工许可前 施工许可前
<input type="radio" class="rd" name="rfxmsfxx.cnjfhj" value="30日内" />30日内 <input type="radio" class="rd" name="rfxmsfxx.cnjfhj" value="30日内" />30日内
</td> </td>
<th width="15">提前缴纳配套费</th> <th width="15" class="showPt" >提前缴纳配套费</th>
<td width="35%" class="showPt"> <td width="35%" class="showPt" >
<input type="radio" name="rfxmsfxx.tqjn" value="0" checked="checked" />否 <input type="radio" name="rfxmsfxx.tqjn" value="0" checked="checked" />否
<input type="radio" name="rfxmsfxx.tqjn" value="1" checked="checked" />是 <input type="radio" name="rfxmsfxx.tqjn" value="1" checked="checked" />是
</td> </td>
...@@ -401,9 +408,9 @@ ...@@ -401,9 +408,9 @@
<script> <script>
$(".rd").on('click',function () { $(".rd").on('click',function () {
if($(this).val()=='30日内'){ if($(this).val()=='30日内'){
$('.showPt').addClass('dis-bl') $('.showPt').classList.add('dis-bl')
}else{ }else{
$('.showPt').removeClass('dis-bl') $('.showPt').classList.remove('dis-bl')
} }
}) })
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Edit.jsp
View file @ c7a4b24d
...@@ -32,6 +32,10 @@ ...@@ -32,6 +32,10 @@
var flag1=true; var flag1=true;
var boolean1=true; var boolean1=true;
var message = ""; var message = "";
if ($("#yjjemx").val()=="" || $("#yjjemx").val()== undefined || $("#yjjemx").val()==null) {
$.messager.alert('提示', '请填写应缴金额明细!');
return
}
$("input[name=file1]").each(function(){ $("input[name=file1]").each(function(){
if($(this).val()!="") { if($(this).val()!="") {
var name = $(this).parent().siblings().find("input").val(); var name = $(this).parent().siblings().find("input").val();
...@@ -274,7 +278,7 @@ ...@@ -274,7 +278,7 @@
<table width="100%" border="0" id="sfTable"> <table width="100%" border="0" id="sfTable">
<tr> <tr>
<th width="90">收费项目名称</th> <th width="15">收费项目名称</th>
<td width="35%"> <td width="35%">
<select id="sfxmmcselect" name="rfxmsfxx.sfxmmc" style="width: 91%" onchange="getShbmBySfxmmc()"> <select id="sfxmmcselect" name="rfxmsfxx.sfxmmc" style="width: 91%" onchange="getShbmBySfxmmc()">
<c:forEach items="${yzssxsfxmmcList}" var="obj"> <c:forEach items="${yzssxsfxmmcList}" var="obj">
...@@ -302,13 +306,14 @@ ...@@ -302,13 +306,14 @@
</td> </td>
</tr> </tr>
<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" maxlength="50"/> <input id="sfxmlxdbh" name="rfxmsfxx.sfxmlxdbh" value="${rfxmsfxx.sfxmlxdbh}" style="width:90%" datatype="*1-50" maxlength="50"/>
</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%"/> <input id="yjjemx" name="rfxmsfxx.yjjemx" value="${rfxmsfxx.yjjemx}" style="width:90%" datatype="*1-50" errormsg='此项为必填' maxlength="50" onblur="numberCheck(this)"/>
<font style='color:red'>*</font>
</td> </td>
</tr> </tr>
<tr> <tr>
......
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