Skip to content

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

修改问题

parent 0faaf80c
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 12 deletions
WebRoot/WEB-INF/pages/account/paymentVoucher/PaymentVoucherPrint_FangGaiBan.jsp
View file @ 5aa35cec
...@@ -173,7 +173,6 @@ function updateZslxdbh(){ ...@@ -173,7 +173,6 @@ function updateZslxdbh(){
<div id='f8' draggable='true' class='f8'>${xmxxb.csmj}</div> <div id='f8' draggable='true' class='f8'>${xmxxb.csmj}</div>
<div id='f9' draggable='true' class='f9'>${paymentItemHis.ptyjje}</div> <div id='f9' draggable='true' class='f9'>${paymentItemHis.ptyjje}</div>
<div id='f12' draggable='true' class='f12'></div> <div id='f12' draggable='true' class='f12'></div>
<div id='f13' draggable='true' class='f13'>${paymentItemHis.jbr}</div>
<div id='f14' draggable='true' class='f14'>${fn:substring(paymentItemHis.jfpzTime,0,4)}</div> <div id='f14' draggable='true' class='f14'>${fn:substring(paymentItemHis.jfpzTime,0,4)}</div>
<div id='f15' draggable='true' class='f15'>${fn:substring(paymentItemHis.jfpzTime,5,7)}</div> <div id='f15' draggable='true' class='f15'>${fn:substring(paymentItemHis.jfpzTime,5,7)}</div>
<div id='f16' draggable='true' class='f16'>${fn:substring(paymentItemHis.jfpzTime,8,10)}</div> <div id='f16' draggable='true' class='f16'>${fn:substring(paymentItemHis.jfpzTime,8,10)}</div>
...@@ -191,6 +190,7 @@ function updateZslxdbh(){ ...@@ -191,6 +190,7 @@ function updateZslxdbh(){
<div id='f29' draggable='true' class='f29'>${fn:substring(paymentItemHis.jfpzTime,5,7)}</div> <div id='f29' draggable='true' class='f29'>${fn:substring(paymentItemHis.jfpzTime,5,7)}</div>
<div id='f30' draggable='true' class='f30'>${fn:substring(paymentItemHis.jfpzTime,8,10)}</div> <div id='f30' draggable='true' class='f30'>${fn:substring(paymentItemHis.jfpzTime,8,10)}</div>
<c:if test="${paymentItemHis.isCwyz!='0'}"> <c:if test="${paymentItemHis.isCwyz!='0'}">
<div id='f13' draggable='true' class='f13'>${paymentItemHis.jbr}</div>
<div id='f31' draggable='true' class='f31'><img src="${ctx}/images/img/zhang1.png" alt=""></div> <div id='f31' draggable='true' class='f31'><img src="${ctx}/images/img/zhang1.png" alt=""></div>
</c:if> </c:if>
<div id='f32' draggable='true' class='f32'><img src="${ctx}/images/img/zhang3.png" alt=""></div> <div id='f32' draggable='true' class='f32'><img src="${ctx}/images/img/zhang3.png" alt=""></div>
......
WebRoot/WEB-INF/pages/account/paymentVoucher/PaymentVoucherPrint_GuiHua.jsp
View file @ 5aa35cec
...@@ -654,8 +654,9 @@ ...@@ -654,8 +654,9 @@
<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}&nbsp;&nbsp;&nbsp;${rfxm.jbr}</div>
<c:if test="${paymentItemHis.isCwyz!='0'}"> <c:if test="${paymentItemHis.isCwyz!='0'}">
<div id='34' draggable='true' class='f34'>${paymentItemHis.jbr}&nbsp;&nbsp;&nbsp;${rfxm.jbr}</div>
<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/account/paymentVoucher/PaymentVoucher_ZslxdList.jsp
View file @ 5aa35cec
...@@ -212,9 +212,9 @@ ...@@ -212,9 +212,9 @@
{ {
console.log('rec.isCwyz=',rec.isCwyz) console.log('rec.isCwyz=',rec.isCwyz)
if(rec.isCwyz !='1') {//财务未用章 if(rec.isCwyz !='1') {//财务未用章
return "<a class='btn_01_mini' onclick=printZslxd('"+rec.id+"','"+rec.zslxdbh+"','"+rec.mjyj+"') >预览凭证<b></b></a>&nbsp;<a class='btn_01_mini' onclick=cwyz('"+rec.id+"')>财务用章<b></b></a>&nbsp;<a class='btn_01_mini' onclick=viewdd('"+rec.xmxxb.xxylb+"')>附件补充<b></b></a>"; return "<a class='btn_01_mini' onclick=printZslxd('"+rec.id+"','"+rec.zslxdbh+"','"+rec.mjyj+"') >预览凭证<b></b></a>&nbsp;<a class='btn_01_mini' onclick=cwyz('"+rec.id+"')>财务用章<b></b></a>&nbsp;<a class='btn_01_mini' onclick=viewdd('"+rec.xmxxb.xxylb+"')>材料查看<b></b></a>";
} else { } else {
return "<a class='btn_01_mini' onclick=printZslxd('"+rec.id+"','"+rec.zslxdbh+"','"+rec.mjyj+"') >预览凭证<b></b></a>&nbsp;<a class='btn_01_mini' onclick=viewdd('"+rec.xmxxb.xxylb+"')>附件补充<b></b></a>"; return "<a class='btn_01_mini' onclick=printZslxd('"+rec.id+"','"+rec.zslxdbh+"','"+rec.mjyj+"') >预览凭证<b></b></a>&nbsp;<a class='btn_01_mini' onclick=viewdd('"+rec.xmxxb.xxylb+"')>材料查看<b></b></a>";
} }
......
WebRoot/WEB-INF/pages/jfzm/jfzm_print.jsp
View file @ 5aa35cec
...@@ -474,8 +474,8 @@ ...@@ -474,8 +474,8 @@
} }
.f3111 { .f3111 {
left: 585px; left: 295px;
top: 408px; top: 438px;
font-size: 15.8px; font-size: 15.8px;
} }
...@@ -664,7 +664,7 @@ ...@@ -664,7 +664,7 @@
<img src="${ctx}/webResources/images/fanggaiban.jpg" style="position:absolute;width:100%;height:100%"/> <img src="${ctx}/webResources/images/fanggaiban.jpg" style="position:absolute;width:100%;height:100%"/>
<div id='f111' draggable='true' class='f111'>${paymentItemHis.ECN}</div> <div id='f111' draggable='true' class='f111'>${paymentItemHis.ECN}</div>
<div id='f211' draggable='true' class='f211'>${xmxxb.jsdw}</div> <div id='f211' draggable='true' class='f211'>${xmxxb.jsdw}</div>
<div id='f311' draggable='true' class='f311'>${paymentItemHis.zslxdbh}</div> <div id='f311' draggable='true' class='f311'>${xmxxb.xxylb}</div>
<div id='f411' draggable='true' class='f411'> <div id='f411' draggable='true' class='f411'>
${fn:substring(xmxxb.xmmc,0,20)}<br />${fn:substring(xmxxb.xmmc,20,-1)} ${fn:substring(xmxxb.xmmc,0,20)}<br />${fn:substring(xmxxb.xmmc,20,-1)}
</div> </div>
...@@ -680,7 +680,7 @@ ...@@ -680,7 +680,7 @@
<div id='f1611' draggable='true' class='f1611'>${fn:substring(paymentItemHis.jfpzTime,8,10)}</div> <div id='f1611' draggable='true' class='f1611'>${fn:substring(paymentItemHis.jfpzTime,8,10)}</div>
<div id='f1711' draggable='true' class='f1711'>${paymentItemHis.ECN}</div> <div id='f1711' draggable='true' class='f1711'>${paymentItemHis.ECN}</div>
<div id='f1811' draggable='true' class='f1811'>${xmxxb.jsdw}</div> <div id='f1811' draggable='true' class='f1811'>${xmxxb.jsdw}</div>
<div id='f1911' draggable='true' class='f1911'>${paymentItemHis.zslxdbh}</div> <div id='f1911' draggable='true' class='f1911'>${xmxxb.xxylb}</div>
<div id='f2011' draggable='true' class='f2011'> <div id='f2011' draggable='true' class='f2011'>
${fn:substring(paymentItemHis.xmmc,0,20)}<br />${fn:substring(xmxxb.xmmc,20,-1)}</div> ${fn:substring(paymentItemHis.xmmc,0,20)}<br />${fn:substring(xmxxb.xmmc,20,-1)}</div>
<div id='f2111' draggable='true' class='f2111'>${rfxm.slbh}</div> <div id='f2111' draggable='true' class='f2111'>${rfxm.slbh}</div>
......
src/com/jshx/account/paymentVoucher/web/PaymentVoucherAction.java
View file @ 5aa35cec
...@@ -1056,7 +1056,7 @@ public class PaymentVoucherAction extends BaseAction ...@@ -1056,7 +1056,7 @@ public class PaymentVoucherAction extends BaseAction
if(null != xmxxb){ if(null != xmxxb){
if(!"0".equals(xmxxb.getIssptg())){ if(!"0".equals(xmxxb.getIssptg())){
result = false; result = false;
message = "该项目审批未通过，暂时无法打印！"; message = "该项目审批未通过，暂时无法生成凭证！";
}else{ }else{
//判断此项目是否解锁，若解锁则无需判断此单位的催缴记录（业务要求：有催缴记录的单位未缴清费用之前所有项目不允许打印） //判断此项目是否解锁，若解锁则无需判断此单位的催缴记录（业务要求：有催缴记录的单位未缴清费用之前所有项目不允许打印）
if(!Constant.STATUS_LOCK_2.equals(paymentItemHis.getLockFlag())){ if(!Constant.STATUS_LOCK_2.equals(paymentItemHis.getLockFlag())){
......
src/com/jshx/account/paymentVoucher/web/PaymentVoucherNewAction.java
View file @ 5aa35cec
...@@ -240,7 +240,7 @@ public class PaymentVoucherNewAction extends BaseAction { ...@@ -240,7 +240,7 @@ public class PaymentVoucherNewAction extends BaseAction {
if(null != xmxxb){ if(null != xmxxb){
if(!"0".equals(xmxxb.getIssptg())){ if(!"0".equals(xmxxb.getIssptg())){
result = false; result = false;
message = "该项目审批未通过，暂时无法打印！"; message = "该项目审批未通过，暂时无法生成凭证！";
}else{ }else{
//判断此项目是否解锁，若解锁则无需判断此单位的催缴记录（业务要求：有催缴记录的单位未缴清费用之前所有项目不允许打印） //判断此项目是否解锁，若解锁则无需判断此单位的催缴记录（业务要求：有催缴记录的单位未缴清费用之前所有项目不允许打印）
if(!Constant.STATUS_LOCK_2.equals(paymentItemHis.getLockFlag())){ if(!Constant.STATUS_LOCK_2.equals(paymentItemHis.getLockFlag())){
......
src/com/jshx/jfzm/web/JfzmAction.java
View file @ 5aa35cec
...@@ -149,11 +149,11 @@ public class JfzmAction extends BaseAction { ...@@ -149,11 +149,11 @@ public class JfzmAction extends BaseAction {
if(r.getPaymentHisId() != null) { if(r.getPaymentHisId() != null) {
PaymentItemHis pih = paymentItemHisService.getById(r.getPaymentHisId()); PaymentItemHis pih = paymentItemHisService.getById(r.getPaymentHisId());
Map<String, Object> pm = new HashMap<>(); Map<String, Object> pm = new HashMap<>();
pm.put("rfxmid", id); pm.put("rfxmid", r.getId());
List<RfxmSfxx> rfxmSfxxList = rfxmSfxxService.findRfxmSfxx(pm); List<RfxmSfxx> rfxmSfxxList = rfxmSfxxService.findRfxmSfxx(pm);
RfxmSfxx sfxx = rfxmSfxxList == null || rfxmSfxxList.size() == 0 ? null : rfxmSfxxList.get(0); RfxmSfxx sfxx = rfxmSfxxList == null || rfxmSfxxList.size() == 0 ? null : rfxmSfxxList.get(0);
//TODO 1,判断是否显示同步按钮 2，判断是否置灰 // 1,判断是否显示同步按钮 2，判断是否置灰
r.setShowTb(r.getIsSl() != 1 ? 1 : 0);//房改办,竖联,不显示施工许可 r.setShowTb(r.getIsSl() != 1 ? 1 : 0);//房改办,竖联,不显示施工许可
try { try {
......
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