Commit c0da78c0 authored by 徐州's avatar 徐州

修改问题

parent b710ceef
......@@ -52,8 +52,8 @@
.f30{left:585px;top:1031px}/* 日 */
.f31 {
left: 585px;
top: 408px
left: 295px;
top: 438px
}
.f32 {
......@@ -173,7 +173,7 @@ function updateZslxdbh(){
<div id='f8' draggable='true' class='f8'>${xmxxb.csmj}</div>
<div id='f9' draggable='true' class='f9'>${paymentItemHis.ptyjje}</div>
<div id='f12' draggable='true' class='f12'></div>
<div id='f13' draggable='true' class='f13'></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='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>
......
......@@ -498,7 +498,7 @@
$(function(){
doPrint()
parent.close_win('win_paymentVoucher')
parent.close_win('win_jfzm_view')
})
function doPrint() {
myDoc = {
......@@ -529,7 +529,7 @@
<tr>
<td colspan="4" height="100px" style="text-align:center">
<a href="#" class="btn_01" onclick="doPrint()">打印预览<b></b></a>
<a href="#" class="btn_01" onclick="parent.close_win('win_paymentVoucher');">关闭<b></b></a>
<a href="#" class="btn_01" onclick="parent.close_win('win_jfzm_view');">关闭<b></b></a>
</td>
</tr>
</table>
......
......@@ -568,7 +568,7 @@
<div id='f5' draggable='true' class='f5'>${xmxxb.zjsmj} 平方米</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='f8' draggable='true' class='f8'><fmt:formatNumber value="${paymentItemHis.ptymje}" pattern="#,##0.00#"/></div>
<div id='f9' draggable='true' class='f9'></div>
<div id='f10' draggable='true' class='f10'></div>
<div id='f11' draggable='true' class='f11'></div>
......
......@@ -159,6 +159,8 @@ public class JfzmAction extends BaseAction {
if(r.getIsRfyz() != null && r.getIsRfyz() == 1 && (r.getIsTb() == null || r.getIsTb() != 1)) {//人防用章后可以同步
r.setEnableTb(1);
} else if(r.getIsSbj() != 1) {//非市本级
r.setEnableTb(0);
} else if(sfxx != null && sfxx.getTqjn() != null && sfxx.getTqjn() == 1 && sfxx.getStatus() != 0 && (r.getIsTb() == null || r.getIsTb() != 1)) {//显示补录时可以同步
r.setEnableTb(1);
} else {
......
......@@ -376,7 +376,7 @@ public class RfxmAction extends BaseAction
s.setUpdateTime(rfxm.getYzTime());
try {
double b = Double.parseDouble(s.getYjjemx());
if(b != 0 && s.getStatus() != null && s.getStatus() > 0) {
if(b != 0 && s.getStatus() != null && s.getStatus() > 1) {
s.setZslxdbh(s.getSfxmlxdbh());
} else {
s.setZslxdbh("");
......
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