Skip to content

N
njzsb
Commit 4f50997e 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:
  添加点击事件
  竖联字段

# Conflicts:
#	WebRoot/WEB-INF/pages/jfzm/Jfzm_List.jsp
parents ccb2ec37 fc37bba0
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 20 deletions
WebRoot/WEB-INF/pages/account/paymentVoucher/PaymentVoucherPrint_FangGaiBan.jsp
View file @ 4f50997e
...@@ -184,8 +184,10 @@ function updateZslxdbh(){ ...@@ -184,8 +184,10 @@ function updateZslxdbh(){
<div id='f28' draggable='true' class='f28'>${fn:substring(paymentItemHis.createTime,0,4)}</div> <div id='f28' draggable='true' class='f28'>${fn:substring(paymentItemHis.createTime,0,4)}</div>
<div id='f29' draggable='true' class='f29'>${fn:substring(paymentItemHis.createTime,5,7)}</div> <div id='f29' draggable='true' class='f29'>${fn:substring(paymentItemHis.createTime,5,7)}</div>
<div id='f30' draggable='true' class='f30'>${fn:substring(paymentItemHis.createTime,8,10)}</div> <div id='f30' draggable='true' class='f30'>${fn:substring(paymentItemHis.createTime,8,10)}</div>
<c:if test="${paymentItemHis.isCwyz!='0'}">
<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>
<div id='f32' draggable='true' class='f32'><img src="${ctx}/images/img/zhang1.png" alt=""></div> <div id='f32' draggable='true' class='f32'><img src="${ctx}/images/img/zhang1.png" alt=""></div>
</c:if>
</div> </div>
<OBJECT ID="jatoolsPrinter" CLASSID="CLSID:B43D3361-D075-4BE2-87FE-057188254255" <OBJECT ID="jatoolsPrinter" CLASSID="CLSID:B43D3361-D075-4BE2-87FE-057188254255"
codebase="/njzsb/plugin/jatoolsPrinter.cab#version=8,6,0,0" width="0" height="0"> codebase="/njzsb/plugin/jatoolsPrinter.cab#version=8,6,0,0" width="0" height="0">
......
WebRoot/WEB-INF/pages/jfzm/Jfzm_List.jsp
View file @ 4f50997e
...@@ -652,7 +652,7 @@ ...@@ -652,7 +652,7 @@
}, },
async : false, async : false,
}); });
var tp = ${rfxm.mjyj} == '002' || ${rfxm.mjyj} == '004' ? 1 : 2; var tp = '${rfxm.mjyj}' == '002' || '${rfxm.mjyj}' == '004' ? 1 : 2;
myDoc = { myDoc = {
settings: { settings: {
pageWidth: 2100, pageWidth: 2100,
...@@ -665,7 +665,7 @@ ...@@ -665,7 +665,7 @@
classesReplacedWhenPrint: new Array('.only_for_print{display:block}'), classesReplacedWhenPrint: new Array('.only_for_print{display:block}'),
copyrights: "杰创软件拥有版权 www.jatools.com" copyrights: "杰创软件拥有版权 www.jatools.com"
} }
jatoolsPrinter.print(myDoc,true); jatoolsPrinter.printPreview(myDoc);
} }
</script> </script>
...@@ -730,6 +730,7 @@ ...@@ -730,6 +730,7 @@
</div> </div>
</div> </div>
<%-- 横联 --%> <%-- 横联 --%>
<div>132</div>
<c:if test="${rfxm.mjyj != '002' && rfxm.mjyj != '004'}"> <c:if test="${rfxm.mjyj != '002' && rfxm.mjyj != '004'}">
<div id="page1" class='only_for_print pagestyle' style='width:210mm;height:140mm;position:relative;'> <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}/webResources/images/guihuaju.jpg" style="position:absolute;width:100%;height:100%"/>
...@@ -791,15 +792,15 @@ ...@@ -791,15 +792,15 @@
<div id="page1" class='only_for_print pagestyle' style='width:210mm;height:140mm;position:relative;'> <div id="page1" class='only_for_print pagestyle' style='width:210mm;height:140mm;position:relative;'>
<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'>${paymentItemHis.jsdw}</div>
<div id='f311' draggable='true' class='f311'>${paymentItemHis.zslxdbh}</div> <div id='f311' draggable='true' class='f311'>${paymentItemHis.zslxdbh}</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(paymentItemHis.xmmc,0,20)}<br />${fn:substring(paymentItemHis.xmmc,20,-1)}
</div> </div>
<div id='f511' draggable='true' class='f511'>${xmxxb.slbh}</div> <div id='f511' draggable='true' class='f511'>${paymentItemHis.slbh}</div>
<div id='f611' draggable='true' class='f611'>${xmxxb.jsdd}</div> <div id='f611' draggable='true' class='f611'>${paymentItemHis.jsdd}</div>
<div id='f711' draggable='true' class='f711'>${xmxxb.lianxiren}<br />${xmxxb.phone}</div> <div id='f711' draggable='true' class='f711'>${paymentItemHis.lianxiren}<br />${paymentItemHis.phone}</div>
<div id='f811' draggable='true' class='f811'>${xmxxb.csmj}</div> <div id='f811' draggable='true' class='f811'>${paymentItemHis.csmj}</div>
<div id='f911' draggable='true' class='f911'>${paymentItemHis.ptyjje}</div> <div id='f911' draggable='true' class='f911'>${paymentItemHis.ptyjje}</div>
<div id='f1211' draggable='true' class='f1211'></div> <div id='f1211' draggable='true' class='f1211'></div>
<div id='f1311' draggable='true' class='f1311'></div> <div id='f1311' draggable='true' class='f1311'></div>
...@@ -807,19 +808,19 @@ ...@@ -807,19 +808,19 @@
<div id='f1511' draggable='true' class='f1511'>${fn:substring(paymentItemHis.createTime,5,7)}</div> <div id='f1511' draggable='true' class='f1511'>${fn:substring(paymentItemHis.createTime,5,7)}</div>
<div id='f1611' draggable='true' class='f1611'>${fn:substring(paymentItemHis.createTime,8,10)}</div> <div id='f1611' draggable='true' class='f1611'>${fn:substring(paymentItemHis.createTime,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'>${paymentItemHis.jsdw}</div>
<div id='f1911' draggable='true' class='f1911'>${paymentItemHis.zslxdbh}</div> <div id='f1911' draggable='true' class='f1911'>${paymentItemHis.zslxdbh}</div>
<div id='f2011' draggable='true' class='f2011'> <div id='f2011' draggable='true' class='f2011'>
${fn:substring(xmxxb.xmmc,0,20)}<br />${fn:substring(xmxxb.xmmc,20,-1)}</div> ${fn:substring(paymentItemHis.xmmc,0,20)}<br />${fn:substring(paymentItemHis.xmmc,20,-1)}</div>
<div id='f2111' draggable='true' class='f2111'>${xmxxb.slbh}</div> <div id='f2111' draggable='true' class='f2111'>${paymentItemHis.slbh}</div>
<div id='f2211' draggable='true' class='f2211'>${xmxxb.jsdd}</div> <div id='f2211' draggable='true' class='f2211'>${paymentItemHis.jsdd}</div>
<div id='f2311' draggable='true' class='f2311'>${xmxxb.lianxiren}<br />${xmxxb.phone}</div> <div id='f2311' draggable='true' class='f2311'>${paymentItemHis.lianxiren}<br />${paymentItemHis.phone}</div>
<div id='f2411' draggable='true' class='f2411'>${xmxxb.csmj}</div> <div id='f2411' draggable='true' class='f2411'>${paymentItemHis.csmj}</div>
<div id='f2511' draggable='true' class='f2511'> <div id='f2511' draggable='true' class='f2511'>
</div> </div>
<div id='f2811' draggable='true' class='f2811'>${fn:substring(xmxxb.createTime,0,4)}</div> <div id='f2811' draggable='true' class='f2811'>${fn:substring(paymentItemHis.createTime,0,4)}</div>
<div id='f2911' draggable='true' class='f2911'>${fn:substring(xmxxb.createTime,5,7)}</div> <div id='f2911' draggable='true' class='f2911'>${fn:substring(paymentItemHis.createTime,5,7)}</div>
<div id='f3011' draggable='true' class='f3011'>${fn:substring(xmxxb.createTime,8,10)}</div> <div id='f3011' draggable='true' class='f3011'>${fn:substring(paymentItemHis.createTime,8,10)}</div>
<div id='f3111' draggable='true' class='f3111'><img src="${ctx}/images/img/zhang1.png" alt=""></div> <div id='f3111' draggable='true' class='f3111'><img src="${ctx}/images/img/zhang1.png" alt=""></div>
<div id='f3211' draggable='true' class='f3211'><img src="${ctx}/images/img/zhang1.png" alt=""></div> <div id='f3211' draggable='true' class='f3211'><img src="${ctx}/images/img/zhang1.png" alt=""></div>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Add.jsp
View file @ 4f50997e
...@@ -46,10 +46,18 @@ ...@@ -46,10 +46,18 @@
$.messager.alert('提示', '请填写收费项目联系单编号!'); $.messager.alert('提示', '请填写收费项目联系单编号!');
return return
} }
$(".rd").on('click',function () {
if($(this).val()=='30日内'){
}else{
if ($("#yjjemx").val()=="" || $("#yjjemx").val()== undefined || $("#yjjemx").val()==null) { if ($("#yjjemx").val()=="" || $("#yjjemx").val()== undefined || $("#yjjemx").val()==null) {
$.messager.alert('提示', '请填写应缴金额明细!'); $.messager.alert('提示', '请填写应缴金额明细!');
return return
} }
}
})
/*if ($("#shbm").val()=="" || $("#shbm").val()== undefined || $("#shbm").val()==null) { /*if ($("#shbm").val()=="" || $("#shbm").val()== undefined || $("#shbm").val()==null) {
$.messager.alert('提示', '请填写审核部门!'); $.messager.alert('提示', '请填写审核部门!');
return return
...@@ -121,7 +129,7 @@ ...@@ -121,7 +129,7 @@
async: false, async: false,
url: "${ctx}/jsp/rfxm/rfxmSfxxCheck.action", url: "${ctx}/jsp/rfxm/rfxmSfxxCheck.action",
type: 'post', type: 'post',
dataType: 'json',缴费承诺环节 dataType: 'json',
async: false, async: false,
data: {rfxmid : "${rfxm.id}","rfxmsfxx.cnjfhj":cnjfhj, "rfxmsfxx.yzsqy":yzsqy, "rfxmsfxx.dsdw":dsdw, "rfxmsfxx.sfxmmc":sfxmmc, "rfxmsfxx.shbm":shbm}, data: {rfxmid : "${rfxm.id}","rfxmsfxx.cnjfhj":cnjfhj, "rfxmsfxx.yzsqy":yzsqy, "rfxmsfxx.dsdw":dsdw, "rfxmsfxx.sfxmmc":sfxmmc, "rfxmsfxx.shbm":shbm},
error: function (data) { error: function (data) {
...@@ -399,9 +407,7 @@ ...@@ -399,9 +407,7 @@
<table width="100%" border="0"> <table width="100%" border="0">
<tr> <tr>
<td colspan="4" height="100px" style="text-align:center"> <td colspan="4" height="100px" style="text-align:center">
<s:if test="flag=='add'">
<a href="#" class="btn_01" type="button" onclick="verify1(this)">添加<b></b></a>&nbsp; <a href="#" class="btn_01" type="button" onclick="verify1(this)">添加<b></b></a>&nbsp;
</s:if>
<a href="#" class="btn_01" onclick="parent.close_win('win_rfxmsfxx');">关闭<b></b></a> <a href="#" class="btn_01" onclick="parent.close_win('win_rfxmsfxx');">关闭<b></b></a>
</td> </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