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

* 'master' of http://gitlab.house365.com/xuzhou/njzsb:
  章显示
  更换凭证

WebRoot/WEB-INF/pages/account/paymentVoucher/PaymentVoucherPrint_GuiHua.jsp

@@ -166,17 +166,20 @@
 
 .f27 {
 	left: 795px;
-	top: 709px
+	top: 709px;
+	z-index:99
 }
 
 .f28 {
 	left: 865px;
-	top: 709px
+	top: 709px;
+	z-index:99
 }
 
 .f29 {
 	left: 920px;
-	top: 709px
+	top: 709px;
+	z-index:99
 }
 
 .f30 {
@@ -202,6 +205,7 @@
 	font-size: 24px;
 	color: red;
 	font-weight: bolder;
+
 }
 /*经办人*/
 .f34 {
@@ -222,6 +226,7 @@
 .f36 {
 	left: 840px;
 	top: 620px;
+	z-index:98
 }
 
 .f36 img,
@@ -346,7 +351,7 @@ function updateZslxdbh(){
 		</div></div></div>
 	</form>
 	<div id="page1" class='only_for_print pagestyle' style='width:210mm;height:140mm;position:relative;'>
-		<img class='screen-only' src="${ctx}/webResources/images/guihuaju.jpg" style="position:absolute;width:100%;height:100%"/>
+		<img class='screen-only' src="${ctx}/images/img/gz.jpg" style="position:absolute;width:100%;height:100%"/>
 		<div id='f1' draggable='true' class='f1'>${xmxxb.xxylb}</div>
 		<div id='f2' draggable='true' class='f2'>${xmxxb.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)}</div>
@@ -389,15 +394,23 @@ function updateZslxdbh(){
 		<div id='36' draggable='true' class='f36'><img src="${ctx}/images/img/zhang3.png" alt=""></div>
 
 		<c:choose>
-			<c:when test="${rfxm.isSbj=='1'}">    <!--如果 -->
-				<div id='38' draggable='true' class='f38'><img src="${ctx}/images/img/zhang2.png" alt=""></div>
-				<div id='39' draggable='true' class='f39'><img src="${ctx}/images/img/zhang2.png" alt=""></div>
-			</c:when>
-
-			<c:otherwise>  <!--否则 -->
-				<div id='38' draggable='true' class='f38'><img src="${ctx}/images/img/zhang4.png" alt=""></div>
-				<div id='39' draggable='true' class='f39'><img src="${ctx}/images/img/zhang4.png" alt=""></div>
-			</c:otherwise>
+            <c:when test="${empty rfxm}">
+                <div id='35' draggable='true' class='f35'>内部使用，严禁打印和下载</div>
+            </c:when>
+            <c:otherwise>
+                <c:choose>
+                    <c:when test="${rfxm.isSbj=='1'}"> <!--如果 -->
+                    <div id='38' draggable='true' class='f38'><img src="${ctx}/images/img/zhang2.png" alt=""></div>
+                    <div id='39' draggable='true' class='f39'><img src="${ctx}/images/img/zhang2.png" alt=""></div>
+                    </c:when>
+
+                    <c:otherwise>  <!--否则 -->
+                        <div id='38' draggable='true' class='f38'><img src="${ctx}/images/img/zhang4.png" alt=""></div>
+                        <div id='39' draggable='true' class='f39'><img src="${ctx}/images/img/zhang4.png" alt=""></div>
+                    </c:otherwise>
+                </c:choose>
+            </c:otherwise>
+
 		</c:choose>
 
 	</div>

WebRoot/WEB-INF/pages/jfzm/jfzm_print.jsp

@@ -162,17 +162,20 @@
 
         .f27 {
             left: 795px;
-            top: 709px
+            top: 709px;
+            z-index:99
         }
 
         .f28 {
             left: 865px;
-            top: 709px
+            top: 709px;
+            z-index:99
         }
 
         .f29 {
             left: 920px;
-            top: 709px
+            top: 709px;
+            z-index:99
         }
 
         .f30 {
@@ -218,6 +221,7 @@
         .f36 {
             left: 840px;
             top: 620px;
+            z-index:98
         }
 
         .f36 img,
@@ -516,17 +520,25 @@
             <div id='37' draggable='true' class='f37'><img src="${ctx}/images/img/zhang1.png" alt=""></div>
         </c:if>
         <div id='36' draggable='true' class='f36'><img src="${ctx}/images/img/zhang3.png" alt=""></div>
-
+        
         <c:choose>
-            <c:when test="${rfxm.isSbj=='1'}">    <!--如果 -->
-                <div id='38' draggable='true' class='f38'><img src="${ctx}/images/img/zhang2.png" alt=""></div>
-                <div id='39' draggable='true' class='f39'><img src="${ctx}/images/img/zhang2.png" alt=""></div>
+            <c:when test="${empty rfxm}">
+                <div id='35' draggable='true' class='f35'>内部使用，严禁打印和下载</div>
             </c:when>
-
-            <c:otherwise>  <!--否则 -->
-                <div id='38' draggable='true' class='f38'><img src="${ctx}/images/img/zhang4.png" alt=""></div>
-                <div id='39' draggable='true' class='f39'><img src="${ctx}/images/img/zhang4.png" alt=""></div>
+            <c:otherwise>
+                <c:choose>
+                    <c:when test="${rfxm.isSbj=='1'}"> <!--如果 -->
+                        <div id='38' draggable='true' class='f38'><img src="${ctx}/images/img/zhang2.png" alt=""></div>
+                        <div id='39' draggable='true' class='f39'><img src="${ctx}/images/img/zhang2.png" alt=""></div>
+                    </c:when>
+
+                    <c:otherwise>  <!--否则 -->
+                        <div id='38' draggable='true' class='f38'><img src="${ctx}/images/img/zhang4.png" alt=""></div>
+                        <div id='39' draggable='true' class='f39'><img src="${ctx}/images/img/zhang4.png" alt=""></div>
+                    </c:otherwise>
+                </c:choose>
             </c:otherwise>
+
         </c:choose>
 
     </div>