Skip to content

N
njzsb
Commit de93a306 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 7492f0fd f03c2eb0
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 12 deletions
WebRoot/WEB-INF/pages/account/paymentVoucher/PaymentVoucherPrint_GuiHua.jsp
View file @ de93a306
......@@ -417,7 +417,7 @@ function updateZslxdbh(){
<c:otherwise> <!--否则 -->
<c:choose>
<c:when test="${paymentLink == 3 && tgjn =='1'}"> <!--如果 -->
<c:when test="${paymentLink == 3 && tgjn =='1' && status !='0'}"> <!--如果 -->
<div id='40' draggable='true' class='f40'>人防费未缴，仅用于 <br> 办理施工许可</div>
</c:when>
<c:otherwise> <!--否则 -->
......
WebRoot/WEB-INF/pages/jfzm/jfzm_print.jsp
View file @ de93a306
......@@ -477,8 +477,8 @@
<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'>${xmxxb.jsdw}<br/></div>
<div id='f4' draggable='true' class='f4'>${xmxxb.xmmc}</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>
<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='f7' draggable='true' class='f7'><fmt:formatNumber value="${paymentItemHis.ptyjje}" pattern="#,##0.00#"/> 元</div>
......@@ -493,8 +493,8 @@
<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='f20' draggable='true' class='f20'>${xmxxb.xmmc}</div>
<div id='f19' draggable='true' class='f19'>${fn:substring(xmxxb.jsdw,0,13)}<br/>${fn:substring(xmxxb.jsdw,13,26)}<br/>${fn:substring(xmxxb.jsdw,26,-1)}</div>
<div id='f20' draggable='true' class='f20'>${fn:substring(xmxxb.xmmc,0,13)}<br/>${fn:substring(xmxxb.xmmc,13,26)}<br/>${fn:substring(xmxxb.xmmc,26,-1)}</div>
<div id='f21' draggable='true' class='f21'>${xmxxb.jsdd}</div>
<div id='f22' draggable='true' class='f22'>${xmxxb.zjsmj} 平方米</div>
<div id='f23' draggable='true' class='f23'></div>
......@@ -545,7 +545,7 @@
<c:otherwise> <!--否则 -->
<c:choose>
<c:when test="${paymentLink == 3 && tgjn =='1'}"> <!--如果 -->
<c:when test="${paymentLink == 3 && tgjn =='1' && status !='0'}"> <!--如果 -->
<div id='40' draggable='true' class='f40'>人防费未缴，仅用于 <br> 办理施工许可</div>
</c:when>
<c:otherwise> <!--否则 -->
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Edit.jsp
View file @ de93a306
......@@ -32,9 +32,11 @@
var flag1=true;
var boolean1=true;
var message = "";
if ($("#yjjemx").val()=="" || $("#yjjemx").val()== undefined || $("#yjjemx").val()==null) {
$.messager.alert('提示', '请填写应缴金额明细!');
return
if($(".yjjemx").is(':visible') == true){
if ($("#yjjemx").val() == "" || $("#yjjemx").val() == undefined || $("#yjjemx").val() == null) {
$.messager.alert('提示', '请填写人防费应缴金额!');
return
}
}
$("input[name=file1]").each(function(){
if($(this).val()!="") {
......@@ -356,10 +358,36 @@
<td width="35%">
<input id="sfxmlxdbh" name="rfxmsfxx.sfxmlxdbh" value="${rfxmsfxx.sfxmlxdbh}" style="width:90%" datatype="*1-50" maxlength="50"/>
</td>
<th width="15">应缴金额</th>
<td width="35%">
<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>
<c:if test="${ empty rfxm.paymentLink}">
<td width="35%" class="showyj">
<input class="yjjemx" id="yjjemx" name="rfxmsfxx.yjjemx" value="${rfxmsfxx.yjjemx}"
style="width:90%;margin-top: 6px;" datatype="*1-50" errormsg='此项为必填'
maxlength="50" onblur="numberCheck(this)"/>
<font style='color:red'>*</font>
</td>
<td width="35%" class="yjstyle">
<input name="rfxmsfxx.yjjemx" value="${rfxmsfxx.yjjemx}"
style="width:90%;margin-top: 6px;"/>
</td>
</c:if>
<c:if test="${rfxm.paymentLink == 1}">
<td width="35%" class="showyj">
<input class="yjjemx" id="yjjemx" value="${rfxmsfxx.yjjemx}"
name="rfxmsfxx.yjjemx" style="width:90%;margin-top: 6px;"
datatype="*1-50" errormsg='此项为必填' maxlength="50"
onblur="numberCheck(this)"/>
<font style='color:red'>*</font>
</td>
</c:if>
<c:if test="${rfxm.paymentLink == 3}">
<td width="35%">
<input id="yjjemx" value="${rfxmsfxx.yjjemx}" name="rfxmsfxx.yjjemx"
style="width:90%;margin-top: 6px;"/>
</td>
</c:if>
</td>
</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