Commit add0b8f2 authored by 徐州's avatar 徐州

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

* 'master' of http://gitlab.house365.com/xuzhou/njzsb:
  打印预览章
  收费信息添加

# Conflicts:
#	WebRoot/WEB-INF/pages/rfdz/Rfdz_Detail.jsp
parents 3121dfb6 350f2f62
...@@ -20,37 +20,221 @@ ...@@ -20,37 +20,221 @@
text-decoration: none; text-decoration: none;
line-height: 180%; line-height: 180%;
} }
.f1{left:260px;top:195px}/* 建设单位(左) */ .f1 {
.f2{left:210px;top:222px}/* 项目性质(左) */ left: 250px;
.f3{left:180px;top:250px}/* 项目名称(左) */ top: 188px
.f4{left:180px;top:305px}/* 项目名称(左) */ }
.f5{left:180px;top:368px}/* 建筑面积(左)*/
.f6{left:200px;top:383px}/* 测算配套费(左) */ /* 建设单位(左) */
.f7{left:215px;top:436px} .f2 {
.f8{left:215px;top:465px} left: 200px;
.f9{left:155px;top:506px}/* 备注 */ top: 215px
.f10{left:185px;top:556px}/* 经办人 */ }
.f11{left:185px;top:610px}/* 领单人 */
.f12{left:195px;top:680px}/* 电子监管号 */ /* 项目性质(左) */
.f13{left:175px;top:710px}/* 年 */ .f3 {
.f14{left:240px;top:710px}/* 月 */ left: 170px;
.f15{left:285px;top:710px}/* 日 */ top: 243px
.f16{left:590px;top:667px}/* 电子监管号 */ }
.f17{left:610px;top:265px}
.f18{left:855px;top:265px} /* 项目名称(左) */
.f19{left:610px;top:310px} .f4 {
.f20{left:610px;top:355px} left: 170px;
.f21{left:610px;top:400px} top: 298px
.f22{left:610px;top:445px} }
.f23{left:610px;top:490px}
.f24{left:590px;top:590px} /* 项目名称(左) */
.f25{left:590px;top:613px} .f5 {
.f26{left:590px;top:640px} left: 170px;
.f27{left:805px;top:716px} top: 351px
.f28{left:875px;top:716px} }
.f29{left:930px;top:716px}
.f30{left:610px;top:486px} /* 建筑面积(左)*/
.f31{left:610px;top:506px} .f6 {
left: 190px;
top: 376px
}
/* 测算配套费(左) */
.f7 {
left: 205px;
top: 429px
}
.f8 {
left: 205px;
top: 458px
}
.f9 {
left: 145px;
top: 499px
}
/* 备注 */
.f10 {
left: 175px;
top: 549px
}
/* 经办人 */
.f11 {
left: 175px;
top: 607px
}
/* 领单人 */
.f12 {
left: 185px;
top: 673px
}
/* 电子监管号 */
.f13 {
left: 165px;
top: 707px
}
/* 年 */
.f14 {
left: 230px;
top: 707px
}
/* 月 */
.f15 {
left: 275px;
top: 707px
}
/* 日 */
.f16 {
left: 580px;
top: 660px
}
/* 电子监管号 */
.f17 {
left: 600px;
top: 258px
}
.f18 {
left: 855px;
top: 258px
}
.f19 {
left: 600px;
top: 303px
}
.f20 {
left: 600px;
top: 348px
}
.f21 {
left: 600px;
top: 393px
}
.f22 {
left: 600px;
top: 438px
}
.f23 {
left: 600px;
top: 483px
}
.f24 {
left: 580px;
top: 580px
}
.f25 {
left: 580px;
top: 605px
}
.f26 {
left: 580px;
top: 634px
}
.f27 {
left: 795px;
top: 709px
}
.f28 {
left: 865px;
top: 709px
}
.f29 {
left: 920px;
top: 709px
}
.f30 {
left: 600px;
top: 479px
}
.f31 {
left: 600px;
top: 499px
}
/*NO.PTF*/
.f32 {
left: 220px;
top: 123px;
font-size: 24px;
color: red;
font-weight: bolder;
}
/*NO.PTF*/
.f33 {
left: 920px;
top: 130px;
font-size: 24px;
color: red;
font-weight: bolder;
}
/*经办人*/
.f34 {
left: 155px;
top: 563px;
font-weight: bolder;
}
/*内部使用*/
.f35 {
left: 800px;
top: 408px;
color: red;
font-size: 20px;
background-color: #F2F7FD;
z-index: 99;
}
/*章1*/
.f36 {
left: 840px;
top: 620px;
}
.f36 img,
.f37 img {
width: 160px;
height: 160px;
}
/*章2*/
.f37 {
left: 250px;
top: 250px;
}
#page1 DIV { #page1 DIV {
position: absolute position: absolute
} }
...@@ -180,6 +364,12 @@ function updateZslxdbh(){ ...@@ -180,6 +364,12 @@ function updateZslxdbh(){
<div id='f30' draggable='true' class='f30'>规划许可证号:${xmxxb.xkzh}</div> <div id='f30' draggable='true' class='f30'>规划许可证号:${xmxxb.xkzh}</div>
<div id='f31' draggable='true' class='f31'>规划项目编号:${xmxxb.xmbh}</div> <div id='f31' draggable='true' class='f31'>规划项目编号:${xmxxb.xmbh}</div>
<div id='32' draggable='true' class='f32'>0002909</div>
<div id='33' draggable='true' class='f33'>0002909</div>
<div id='34' draggable='true' class='f34'>张三</div>
<div id='35' draggable='true' class='f35'>内部使用,严禁打印和下载</div>
<div id='36' draggable='true' class='f36'><img src="../img/zhang1.png" alt=""></div>
<div id='37' draggable='true' class='f37'><img src="../img/zhang1.png" alt=""></div>
</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">
......
...@@ -164,6 +164,7 @@ ...@@ -164,6 +164,7 @@
success: function (secondDatas) { success: function (secondDatas) {
// var data = eval('('+secondDatas+')'); // var data = eval('('+secondDatas+')');
var data = secondDatas.rows; var data = secondDatas.rows;
console.info(data)
if (secondDatas.total != undefined && secondDatas.total != "" && secondDatas.total > 0) { if (secondDatas.total != undefined && secondDatas.total != "" && secondDatas.total > 0) {
$("#shbmselect").empty(); $("#shbmselect").empty();
} }
...@@ -172,6 +173,7 @@ ...@@ -172,6 +173,7 @@
var option = '<option value="' + secondData + '">' + secondData + '</option>' var option = '<option value="' + secondData + '">' + secondData + '</option>'
$("#shbmselect").append(option) $("#shbmselect").append(option)
$("#sfxmmcselect").append(option)
}) })
/* //二级select展示 /* //二级select展示
...@@ -303,9 +305,9 @@ ...@@ -303,9 +305,9 @@
<tr> <tr>
<th width="15">收费项目名称</th> <th width="15">收费项目名称</th>
<td width="35%"> <td width="35%">
<select id="sfxmmcselect" name="zzhxmsfxx.sfxmmc" style="width: 91%" <select id="sfxmmcselect" name="zzhxmsfxx.shbm" style="width: 91%">
onchange="getShbmBySfxmmc()"> <%-- onchange="getShbmBySfxmmc()">--%>
<c:forEach items="${yzssxsfxmmcList}" var="obj"> <c:forEach items="${yzssxshbmList}" var="obj">
<option value="${obj}">${obj}</option> <option value="${obj}">${obj}</option>
</c:forEach> </c:forEach>
</select> </select>
...@@ -336,20 +338,19 @@ ...@@ -336,20 +338,19 @@
<tr> <tr>
<th width="15">承诺缴费环节</th> <th width="15">承诺缴费环节</th>
<td width="35%"> <td width="35%">
<input type="radio" name="zzhxmsfxx.cnjfhj" value="施工许可前" checked="checked" /> <input type="radio" name="zzhxmsfxx.sgxkq" value="施工许可前" checked="checked" />
施工许可前 施工许可前
<input type="radio" name="zzhxmsfxx.cnjfhj" value="竣工验收前" /> <input type="radio" name="zzhxmsfxx.jgxkq" value="竣工验收前" />
竣工验收前 竣工验收前
<input type="radio" name="zzhxmsfxx.cnjfhj" value="" /><input id="cnjfhj" <input type="radio" name="zzhxmsfxx.rn" value="" /><input id="cnjfhj"
name="zzhxmsfxx.cnjfhj" style="width:10%" />日内 name="zzhxmsfxx.cnjfhj" style="width:10%" />日内
</td> </td>
<th width="15">提前缴纳配套费</th> <th width="15">提前缴纳配套费</th>
<td width="35%"> <td width="35%">
<input type="radio" name="zzhxmsfxx.cnjfhj" value="施工许可前" checked="checked" /> <input type="radio" name="zzhxmsfxx.sgno" value="否" checked="checked" />
<input type="radio" name="zzhxmsfxx.cnjfhj" value="竣工验收前" /> <input type="radio" name="zzhxmsfxx.jgyes" value="是" />
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -413,9 +414,10 @@ ...@@ -413,9 +414,10 @@
<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'"> <%-- <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> <%-- </s:if>--%>
<a href="#" class="btn_01" type="button" onclick="verify1(this)">添加<b></b></a>&nbsp;
<a href="#" class="btn_01" onclick="parent.close_win('win_zzhxmsfxx');">关闭<b></b></a> <a href="#" class="btn_01" onclick="parent.close_win('win_zzhxmsfxx');">关闭<b></b></a>
</td> </td>
</tr> </tr>
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/conf" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/conf" type="java-resource" />
</content> </content>
<orderEntry type="jdk" jdkName="1.8 (2)" jdkType="JavaSDK" /> <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="lib" level="project" /> <orderEntry type="library" exported="" name="lib" level="project" />
<orderEntry type="library" exported="" name="fr-applet-8.0" level="project" /> <orderEntry type="library" exported="" name="fr-applet-8.0" level="project" />
......
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