Skip to content

N
njzsb
Commit b3a07f50 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:
  人防相关信息
parents 25a2a826 58177a84
Hide whitespace changes
Inline Side-by-side
Showing with 205 additions and 90 deletions
WebRoot/WEB-INF/pages/rfxm/Rfxm_Detail.jsp
View file @ b3a07f50
......@@ -118,7 +118,7 @@
<tr>
<th width="15%" id='lianxidan'>规划许可证编号</th>
<td width="35%" >${rfxm.ghxkzbh}</td>
<th width="15%">规划许可证类型</th>
<th width="15%">二级统计单位</th>
<td width="35%">${rfxm.ghxkzlx}</td>
</tr>
<tr>
......@@ -168,7 +168,7 @@
<%--<td width="35%" ><s:property value="#sfxx.sfxmmc"/></td>--%>
<%--<td width="35%" ><c:out value="${s}.sfxmmc"></c:out></td>--%>
<td width="35%" ><s:property value="sfxmmc"/></td>
<th width="15%">收费项目联系单编号</th>
<th width="15%">缴款通知书编号</th>
<td width="35%" ><s:property value="sfxmlxdbh"/></td>
<%--<td width="35%" >${li.sfxmzslxdbh}</td>--%>
<%--<td width="35%" ><s:property value="#sfxx.sfxmzslxdbh"/></td>--%>
......@@ -190,11 +190,55 @@
<%--<td width="35%" >${li.cnjfhj}</td>--%>
<%--<th width="15%">审核部门</th>--%>
<%--<td width="35%" >${li.shbm}</td>--%>
<th width="15%">附件</th>
<td width="35%">
<a href="javascript:opendoc('<s:property value="id"/>')"><font color="blue"><s:property value="attachname"/></font></a>
</td>
<%-- <th width="15%"></th>--%>
<%-- <td width="35%">--%>
<%-- <a href="javascript:opendoc('<s:property value="id"/>')"><font color="blue"><s:property value="attachname"/></font></a>--%>
<%-- </td>--%>
<th width="15%">一般缴款书编号</th>
<%--<td width="35%" ><s:property value="#sfxx.cnjfhj"/></td>--%>
<td width="35%" ><s:property value="cnjfhj"/></td>
</tr>
<tr>
<th width="15%">缴费凭证编号</th>
<td width="35%" ><s:property value="yjjemx"/></td>
</tr>
</table>
</div>
</s:iterator>
</div>
<div class="easyui-accordion" style="">
<s:iterator value="rfxmSfxx" id="array">
<div class="" title="<s:property value='sfxmmc'/>" data-options="iconCls:'icon-ok'" style="overflow:auto;padding:10px;">
<table id="sfTable">
<input type="hidden" id="id" name="id" value="<s:property value='id'/>">
<tr>
<th width="15%">收费项目名称</th>
<%--<td width="35%" ><s:property value="#sfxx.sfxmmc"/></td>--%>
<%--<td width="35%" ><c:out value="${s}.sfxmmc"></c:out></td>--%>
<td width="35%" ><s:property value="sfxmmc"/></td>
<th width="15%">收费项目联系单编号</th>
<td width="35%" ><s:property value="sfxmlxdbh"/></td>
<%--<td width="35%" >${li.sfxmzslxdbh}</td>--%>
<%--<td width="35%" ><s:property value="#sfxx.sfxmzslxdbh"/></td>--%>
</tr>
<tr>
<th width="15%">应缴金额明细</th>
<td width="35%" ><s:property value="yjjemx"/></td>
<%--<td width="35%" >${li.yjjemx}</td>--%>
<%--<td width="35%" ><s:property value="#sfxx.yjjemx"/></td>--%>
<th width="15%">审核部门</th>
<%--<td width="35%" ><s:property value="#sfxx.shbm"/></td>--%>
<td width="35%" ><s:property value="shbm"/></td>
<%--<td width="35%" >${li.shbm}</td>--%>
</tr>
<tr>
<th width="15%">承诺缴费环节</th>
<%--<td width="35%" ><s:property value="#sfxx.cnjfhj"/></td>--%>
<td width="35%" ><s:property value="cnjfhj"/></td>
</tr>
</table>
</div>
</s:iterator>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_List.jsp
View file @ b3a07f50
......@@ -203,8 +203,7 @@
// return "<a class='btn_01_mini' onclick=addTabSfxx('"+rec.id+"') >收费信息<b></b></a><a class='btn_01_mini' onclick=noticeView('"+rec.id+"')>通知书<b></b></a>";
/*return "<a class='btn_01_mini' onclick=view('"+rec.id+"') >查看<b></b></a><!-- &nbsp;<a class='btn_01_mini' onclick=edit('"+rec.id+"')>修改<b></b></a> -->";*/
}},
/*{field:'accountName',title:'子账户名称',width:180},
{field:'accountDetail',title:'子账户账号',width:180},
/*
{field:'accountStatus',title:'子账户状态',width:180,formatter:function(value,rec){
if(rec.accountStatus == '0'){
return "未激活";
......@@ -223,24 +222,26 @@
}
}},*/
/*{field:'createTime',title:'创建时间',width:fixWidth(0.16)},*/
{field:'xmdm',title:'项目代码',width:186},
{field:'ghxkzbh',title:'规划许可证编号',width:172},
{field:'jsdwmc',title:'建设单位名称',width:345},
{field:'gcxmmc',title:'工程项目名称',width:325},
{field:'gcxmdd',title:'工程项目地点',width:215},
{field:'insertType',title:'录入类型',width:215,formatter:function(value,rec){
if (rec.insertType == null || rec.insertType == "" || rec.insertType == undefined) {
return "未知类型";
}
if (rec.insertType == 0) {
return "接口录入";
}else if (rec.insertType == 1) {
return "页面录入";
}else {
return "未知";
}
{field:'xmdm',title:'项目代码',width:186},
{ field: 'jsdwmc', title: '建设单位名称', width: 150, align: 'center' },
{ field: 'gcxmmc', title: '工程项目名称', width: 150, align: 'center' },
{
field: 'gcxmdd', title: '工程项目地点', width: 150, align: 'center'
},
{ field: 'xxylbbh', title: '信息一览表编号', width: 150, align: 'center' },
{
field: 'ghxkbh', title: '规划许可证号', width: 150, align: 'center'
},
}},
{
field: 'jfhj', title: '缴费环节', width: 150, align: 'center'
},
{
field: 'ejtjdw', title: '二级统计单位', width: 150, align: 'center'
},
{ field: 'rffyz', title: '人防费用章', width: 150, align: 'center' },
{ field: 'jktzsbh', title: '缴款通知书编号', width: 150, align: 'center' },
{ field: 'jkpzbh', title: '缴款凭证编号', width: 150, align: 'center' },
/*{field:'sfxmmc',title:'添加收费信息',width:200,align:'center',formatter:function(value,rec){
return "<a class='btn_01_mini' onclick=addNew4Sfxx('"+rec.id+"') >添加收费信息<b></b></a>&nbsp;<a class='btn_01_mini' onclick=addTabSfxx('"+rec.id+"') >查看收费信息<b></b></a>";
......@@ -276,8 +277,8 @@
<tr>
<th width="15%">规划许可证编号</th>
<td width="35%"><input name="rfxm.ghxkzbh" id="ghxkzbh" value="" type="text"></td>
<th width="15%">项目代码</th>
<td width="35%"><input name="rfxm.xmdm" id="xmdm" value="" type="text"></td>
<th width="15%">缴费凭证编号</th>
<td width="35%"><input name="rfxm.jfpzbh" id="jfpzbh" value="" type="text"></td>
</tr>
<tr>
<th width="15%">信息表编号</th>
......@@ -285,6 +286,45 @@
<th width="15%">规划项目编号</th>
<td width="35%"><input name="rfxm.ghxmbh" id="ghxmbh" value="" type="text"></td>
</tr>
<tr>
<th width="15%">建设单位名称</th>
<td width="35%"><input name="rfxm.jsdwmc" id="jsdwmc" value="" type="text"></td>
<th width="15%">工程项目名称</th>
<td width="35%"><input name="rfxm.gcxmmc" id="gcxmmc" value="" type="text"></td>
</tr>
<tr>
<th width="15%">缴费环节</th>
<td width="35%">
<select name="jfhj" id="jfhj">
<option value="">请选择</option>
<option value="0">无</option>
<option value="1">施工许可前</option>
<option value="3">30日</option>
</select>
</td>
<th width="15%">人防费是否用章</th>
<td width="35%">
<select name="hczt" id="hczt">
<option value="">请选择</option>
<option value="0">无</option>
<option value="1">是</option>
<option value="2">否</option>
</select>
</td>
</tr>
<tr>
<th width="15%">项目来源</th>
<td width="35%">
<select id="mjyj" name="xmxxb.mjyj" value="${xmxxb.mjyj}" >
<option value="000">无</option>
<option value="001">规划(正常)</option>
<option value="002">房产测绘(超建面积)</option>
<option value="003">交易登记</option>
<option value="004">房改办(经营用房)</option>
<option value="005">规划(变更)</option>
</select>
</td>
</tr>
<%--
<tr>
<th width="15%">子账户状态</th>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Add.jsp
View file @ b3a07f50
......@@ -242,7 +242,7 @@
<td width="35%">
<input id="ghxkzbh" name="rfxm.ghxkzbh" style="width:90%" value="${rfxm.ghxkzbh}" disabled/>
</td>
<th width="15">规划许可证类型</th>
<th width="15">二级统计单位</th>
<td width="35%">
<input id="ghxkzlx" name="rfxm.ghxkzlx" value="${rfxm.ghxkzlx}" disabled/>
</td>
......@@ -293,16 +293,7 @@
<div id="payDiv" class="easyui-accordion" style="">
<div id="showTitle" class="" title="添加收费信息" data-options="iconCls:'icon-ok'" style="overflow:auto;padding:10px;">
<table width="100%" border="0" id="sfTable">
<tr>
<th width="15%">区域信息</th>
<td width="35%">
<input id="yzsqy" name="rfxmsfxx.yzsqy" style="width:90%" value="${yzsqy}" readonly/>
</td>
<th width="15">代收单位</th>
<td width="35%">
<input id="dsdw" name="rfxmsfxx.dsdw" style="width:90%" value="${dsdw}" readonly/>
</td>
</tr>
<tr>
<th width="15">收费项目名称</th>
<td width="35%">
......@@ -322,7 +313,7 @@
</td>
</tr>
<tr>
<th width="15">收费项目联系单编号</th>
<th width="90">收费项目联系单编号</th>
<td width="35%">
<input id="sfxmlxdbh" name="rfxmsfxx.sfxmlxdbh" style="width:90%" datatype="*1-50" errormsg='此项为必填' maxlength="50"/>
<font style='color:red'>*</font>
......@@ -334,21 +325,50 @@
</td>
</tr>
<tr>
<th width="15">承诺缴费环节</th>
<th width="15">缴费承诺环节</th>
<td width="35%">
<input type="radio" name="rfxmsfxx.cnjfhj" value="施工许可前" checked="checked"/>
施工许可前
<input type="radio" name="rfxmsfxx.cnjfhj" value="竣工验收前"/>
竣工验收前
<input type="radio" name="rfxmsfxx.cnjfhj" value="" /><input id="cnjfhj" name="rfxmsfxx.cnjfhj" style="width:10%"/>日内
<input type="radio" name="rfxmsfxx.cnjfhj" value="30日内" />30日内
</td>
<th width="15">提前缴纳配套费</th>
<td width="35%">
<input type="radio" name="zzhxmsfxx.tqjnptf" value="否" />
否
<input type="radio" name="zzhxmsfxx.tqjnptf" value="是" checked="checked" />
是
</td>
</tr>
<tr>
<th width="15">附件:</th>
<th width="15">缴费情况:</th>
<td colspan="3" style="text-align:left;">
<table width="100%" id="table">
<tr>
<th width="20%" style="text-align: left;"><input name="id" checked="checked" type="checkbox" value="收费信息表"><span id='fujianm'>核准收费信息表:</span></th>
<th width="20%" style="text-align: left;"><input name="id" type="checkbox" value="征收联系单"><span id='fujianm'>征收联系单:</span></th>
<td style="text-align: left;"width="20%" colspan="2">
<input type="file" name="file1" >
<input type="button" value="扫描" onclick="scan(this)"/>
</td>
</tr>
<tr>
<th width="20%" style="text-align: left;"><input name="id" type="checkbox" value="税务反馈单"><span id='fujianm'>税务反馈单:</span></th>
<td style="text-align: left;"width="20%" colspan="2">
<input type="file" name="file1" >
<input type="button" value="扫描" onclick="scan(this)"/>
</td>
</tr>
<tr>
<th width="20%" style="text-align: left;"><input name="id" checked="checked" type="checkbox" value="先行缴纳配套费的申请"><span id='fujianm'>先行缴纳配套费的申请:</span></th>
<td style="text-align: left;"width="20%" colspan="2">
<input type="file" name="file1" >
<input type="button" value="扫描" onclick="scan(this)"/>
</td>
</tr>
<tr>
<th width="20%" style="text-align: left;"><input name="id" type="checkbox" value="完税证明"><span id='fujianm'>完税证明:</span></th>
<td style="text-align: left;"width="20%" colspan="2">
<input type="file" name="file1" >
<input type="button" value="扫描" onclick="scan(this)"/>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Detail.jsp
View file @ b3a07f50
......@@ -174,13 +174,11 @@
{field:'id',hidden:'true'},
{field:'jfdmwybh',hidden:'true'},
{field:'sfxmmc',title:'收费项目名称',width:160},
{field:'sfxmlxdbh',title:'收费项目联系单编号',width:160},
{field:'sfxmlxdbh',title:'缴费通知书/联系单编号',width:160},
{field:'yjjemx',title:'应缴金额明细',width:160},
{field:'shbm',title:'审核部门',width:160},
{field:'cnjfhj',title:'承诺缴费环节',width:160},
{field:'showName',title:'附件',width:200,align:'center',formatter:function(value,rec){
return "<a class='' title='点击下载附件' style='cursor:pointer' onclick=opendoc('"+rec.id+"') >"+rec.showName+"<b></b></a>&nbsp;";
}},
{field:'jfpz',title:'缴费凭证/反馈单编号',width:200,align:'center'},
{field:'sfxxjbr',title:'信息录入人',width:160},
{field:'createTime',title:'录入时间',width:fixWidth(0.16)},
{field:'statusJBFH',title:'是否复核',width:160,formatter:function (value, rec) {
......@@ -288,24 +286,11 @@
<table width="100%" border="0">
<tr>
<td colspan="4" height="100px" style="text-align:center">
<s:if test="rfxm.statusConstract == 0">
<a id="noticeBtn0" href="#" class="btn_01" onclick="generateNotice(0);">生成施工前缴款通知书<b></b></a>
</s:if>
<s:else>
<a href="javascript:return false;" class="btn_01"><i class="edit" style="opacity: 0.5">已生成施工前缴款通知书</i><b></b></a>
</s:else>
<s:if test="rfxm.statusComplete == 0">
<a id="noticeBtn1" href="#" class="btn_01" onclick="generateNotice(1);">生成竣工前缴款通知书<b></b></a>
</s:if>
<s:else>
<a href="javascript:return false;" class="btn_01"><i class="edit" style="opacity: 0.5">已生成竣工前缴款通知书</i><b></b></a>
</s:else>
<s:if test="rfxm.statusWithinTheDay == 0">
<a id="noticeBtn2" href="#" class="btn_01" onclick="generateNotice(2);">生成N日内缴款通知书<b></b></a>
</s:if>
<s:else>
<a href="javascript:return false;" class="btn_01"><i class="edit" style="opacity: 0.5">已生成N日内缴款通知书</i><b></b></a>
</s:else>
<a id="noticeBtn0" href="#" class="btn_01"
onclick="generateNotice(0);">人防费用章（市本级）<b></b></a>
<a href="javascript:return false;" class="btn_01"><i class="edit"
style="opacity: 0.5">人防费用章（非市本级）</i><b></b></a>
<%--<a href="#" class="btn_01" onclick="generateNotice(1);">竣工前缴款<b></b></a>
<a href="#" class="btn_01" onclick="generateNotice(2);">N日内缴款<b></b></a>--%>
<%--<a href="#" class="btn_01" onclick="parent.close_win('win_rfxm');">关闭<b></b></a>--%>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_Edit.jsp
View file @ b3a07f50
......@@ -240,7 +240,7 @@
<td width="35%">
<input id="ghxkzbh" name="rfxm.ghxkzbh" style="width:90%" value="${rfxm.ghxkzbh}" disabled/>
</td>
<th width="15">规划许可证类型</th>
<th width="15">二级统计单位</th>
<td width="35%">
<input id="ghxkzlx" name="rfxm.ghxkzlx" value="${rfxm.ghxkzlx}" disabled/>
</td>
......@@ -292,18 +292,9 @@
<div id="payDiv" class="easyui-accordion" style="">
<div id="showTitle" class="" title="修改收费信息" data-options="iconCls:'icon-ok'" style="overflow:auto;padding:10px;">
<table width="100%" border="0" id="sfTable">
<tr>
<th width="15%">区域信息</th>
<td width="35%">
<input id="yzsqy" name="rfxmsfxx.yzsqy" style="width:90%" value="${rfxmsfxx.yzsqy}" readonly/>
</td>
<th width="15">代收单位</th>
<td width="35%">
<input id="dsdw" name="rfxmsfxx.dsdw" style="width:90%" value="${rfxmsfxx.dsdw}" readonly/>
</td>
</tr>
<tr>
<th width="15">收费项目名称</th>
<th width="90">收费项目名称</th>
<td width="35%">
<select id="sfxmmcselect" name="rfxmsfxx.sfxmmc" style="width: 91%" onchange="getShbmBySfxmmc()">
<c:forEach items="${yzssxsfxmmcList}" var="obj">
......@@ -343,7 +334,7 @@
</td>
</tr>
<tr>
<th width="15">承诺缴费环节</th>
<th width="15">缴费承诺环节</th>
<td width="35%">
<c:if test="${rfxmsfxx.cnjfhj eq '施工许可前'}">
<input type="radio" name="rfxmsfxx.cnjfhj" value="施工许可前" checked="checked"/>
......@@ -367,19 +358,48 @@
<input type="radio" name="rfxmsfxx.cnjfhj" value="" checked="checked" /><input id="cnjfhj" name="rfxmsfxx.cnjfhj" value="${fn:replace(rfxmsfxx.cnjfhj, '日内', '')}" style="width:10%"/>日内
</c:if>
</td>
<th width="15">提前缴纳配套费</th>
<td width="35%">
<input type="radio" name="zzhxmsfxx.tqjnptf" value="否" />
否
<input type="radio" name="zzhxmsfxx.tqjnptf" value="是" checked="checked" />
是
</td>
</tr>
<tr>
<th width="15">附件:</th>
<th width="15">缴费情况:</th>
<td colspan="3" style="text-align:left;">
<table width="100%" id="table">
<tr>
<th width="20%" style="text-align: left;"><input name="id" checked="checked" type="checkbox" value="收费信息表"><span id='fujianm'>核准收费信息表:</span></th>
<td style="text-align: left;"width="20%" colspan="2">
<input type="file" name="file1" >
<input type="button" value="扫描" onclick="scan(this)"/>
</td>
</tr>
</table>
<table width="100%" id="table">
<tr>
<th width="20%" style="text-align: left;"><input name="id" type="checkbox" value="征收联系单"><span id='fujianm'>征收联系单:</span></th>
<td style="text-align: left;"width="20%" colspan="2">
<input type="file" name="file1" >
<input type="button" value="扫描" onclick="scan(this)"/>
</td>
</tr>
<tr>
<th width="20%" style="text-align: left;"><input name="id" type="checkbox" value="税务反馈单"><span id='fujianm'>税务反馈单:</span></th>
<td style="text-align: left;"width="20%" colspan="2">
<input type="file" name="file1" >
<input type="button" value="扫描" onclick="scan(this)"/>
</td>
</tr>
<tr>
<th width="20%" style="text-align: left;"><input name="id" checked="checked" type="checkbox" value="先行缴纳配套费的申请"><span id='fujianm'>先行缴纳配套费的申请:</span></th>
<td style="text-align: left;"width="20%" colspan="2">
<input type="file" name="file1" >
<input type="button" value="扫描" onclick="scan(this)"/>
</td>
</tr>
<tr>
<th width="20%" style="text-align: left;"><input name="id" type="checkbox" value="完税证明"><span id='fujianm'>完税证明:</span></th>
<td style="text-align: left;"width="20%" colspan="2">
<input type="file" name="file1" >
<input type="button" value="扫描" onclick="scan(this)"/>
</td>
</tr>
</table>
</tr>
</table>
......
WebRoot/WEB-INF/pages/rfxm/Rfxm_Sfxx_View.jsp
View file @ b3a07f50
......@@ -298,7 +298,7 @@
<td width="35%">
<input id="ghxkzbh" name="rfxm.ghxkzbh" style="width:90%" value="${rfxm.ghxkzbh}" disabled/>
</td>
<th width="15">规划许可证类型</th>
<th width="15">二级统计单位</th>
<td width="35%">
<input id="ghxkzlx" name="rfxm.ghxkzlx" value="${rfxm.ghxkzlx}" disabled/>
</td>
......@@ -371,7 +371,7 @@
</td>
</tr>
<tr>
<th width="15">收费项目联系单编号</th>
<th width="15">缴款通知书编号</th>
<td width="35%">
<input id="sfxmlxdbh" name="rfxmsfxx.sfxmlxdbh" value="${rfxmsfxx.sfxmlxdbh}" style="width:90%" readonly/>
<font style='color:red'>*</font>
......@@ -388,6 +388,12 @@
<input id="cnjfhj" name="rfxmsfxx.cnjfhj" style="width:90%" value="${rfxmsfxx.cnjfhj}" readonly/>
</td>
</tr>
<tr>
<th width="15">缴费凭证编号</th>
<td width="35%">
<input id="cnjfhj" name="rfxmsfxx.cnjfhj" style="width:90%" value="${rfxmsfxx.cnjfhj}" readonly/>
</td>
</tr>
<tr>
<th width="15">附件:</th>
<td width="35%">
......
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