Skip to content

N
njzsb
Commit 6ed0c40b authored by 徐州's avatar 徐州
Browse files
Options

111

parent 7b2c23f5
Hide whitespace changes
Inline Side-by-side
Showing with 212 additions and 195 deletions
WebRoot/WEB-INF/pages/fstzs/Fstzs_Add.jsp
View file @ 6ed0c40b
...@@ -72,183 +72,189 @@ ...@@ -72,183 +72,189 @@
<body validform="true"> <body validform="true">
<div class="page_dialog"> <div class="page_dialog">
<div class="inner6px"> <div class="inner6px">
<div class="cell" style="width: 100%"> <form name="myform1" method="post" enctype="multipart/form-data">
<table width="100%" border="0" class="ta-tb"> <s:token />
<input type="hidden" name="flag" value="${flag}">
<tr class="table-line-td"> <input type="hidden" name="rfxm.id" value="${fstzsXm.id}">
<th width="15%">建设单位</th>
<td width="35%">
<input id="jsdw" name="fstzsXm.jsdwmc" style="width:96%;margin-top: 6px;" value="${fstzsXm.jsdwmc}" disabled/>
</td>
</tr>
<tr>
<th width="15">工程项目名称</th>
<td width="35%">
<input id="gcxmmc" name="fstzsXm.gcxmmc" style="width:90%" value="${fstzsXm.gcxmmc}" disabled/>
</td>
<th width="15">缴款人手机号</th>
<td width="35%">
<input id="mobile" name="fstzsXm.mobile" style="width:90%" value="${fstzsXm.mobile}"/>
</td>
</tr>
<tr>
<th width="15">缴款人账号</th>
<td width="35%">
<input id="zhanghao" name="fstzsXm.zhanghao" style="width:90%" value="${fstzsXm.zhanghao}"/>
</td>
<th width="15">缴款人开户银行</th>
<td width="35%">
<input id="khh" name="fstzsXm.khh" style="width:90%" value="${fstzsXm.khh}"/>
</td>
</tr>
<tr>
<th width="15">缴款方式</th>
<td width="35%">
<input style="width:90%" value="直接解缴" disabled/>
</td>
<th width="15">缴款人类型</th>
<td width="35%">
<input style="width:90%" value="单位" disabled/>
</td>
</tr>
<tr>
<th width="15">应缴总面积(平方米)</th>
<td width="35%">
<input id="csmj" name="fstzsXm.paymentItemPending.csmj" style="width:90%" value="${fstzsXm.paymentItemPending.csmj}" disabled/>
</td>
<th width="15">收费标准(元)</th>
<td width="35%">
<input style="width:90%" value="150" disabled/>
</td>
</tr>
<tr>
<th width="15">征收单位名称</th>
<td width="35%">
<input id="zsdw" name="fstzsXm.kpsjgl.zsdw" style="width:90%" value="${fstzsXm.kpsjgl.zsdw}" disabled/>
</td>
<th width="15">征收单位编码</th>
<td width="35%">
<input id="zsdwbm" name="fstzsXm.kpsjgl.zsdwbm" style="width:90%" value="${fstzsXm.kpsjgl.zsdwbm}" disabled/>
</td>
</tr>
<tr>
<th width="15">区划码</th>
<td width="35%">
<input id="qhm" name="fstzsXm.kpsjgl.qhm" style="width:90%" value="${fstzsXm.kpsjgl.qhm}" disabled/>
</td>
<th width="15">收款人全称</th>
<td width="35%">
<input id="krqc" name="fstzsXm.kpsjgl.krqc" style="width:90%" value="${fstzsXm.kpsjgl.krqc}" disabled/>
</td>
</tr>
<tr>
<th width="15">收款人账号</th>
<td width="35%">
<input id="skrzh" name="fstzsXm.kpsjgl.skrzh" style="width:90%" value="${fstzsXm.kpsjgl.skrzh}" disabled/>
</td>
<th width="15">收款人开户行</th>
<td width="35%">
<input id="skrkhh" name="fstzsXm.kpsjgl.skrkhh" style="width:90%" value="${fstzsXm.kpsjgl.skrkhh}" disabled/>
</td>
</tr>
<tr>
<th width="15">项目编码</th>
<td width="35%">
<input id="xmbm" name="fstzsXm.kpsjgl.xmbm" style="width:90%" value="${fstzsXm.kpsjgl.xmbm}" disabled/>
</td>
<th width="15">收入项目名称</th>
<td width="35%">
<input id="srxmmc" name="fstzsXm.kpsjgl.srxmmc" style="width:90%" value="${fstzsXm.kpsjgl.srxmmc}" disabled/>
</td>
</tr>
<tr>
<th width="15">配套费应缴金额(元)</th>
<td width="35%">
<input id="yjje" name="fstzsXm.yjje" style="width:90%" value="${fstzsXm.yjje}" disabled/>
</td>
<th width="15">配套费应缴金额大写</th>
<td width="35%">
<input id="yjjedx" name="fstzsXm.yjjedx" style="width:90%" value="${fstzsXm.yjjedx}" disabled/>
</td>
</tr>
<tr class="table-line-td">
<th width="15">备注(限25字以内)</th>
<td width="35%">
<input id="beizhu" name="fstzsXm.beizhu" style="width:96%;margin-top: 6px;" value="${fstzsXm.beizhu}"/>
</td>
</tr>
</table>
<div style="margin-top: 20px;">
<div class="add-title">配套费</div>
<table class="add-table">
<thead>
<tr>
<th>序号</th>
<th>缴款人</th>
<th>计量单位</th>
<th>收费标准</th>
<th>应缴面积</th>
<th>应缴金额</th>
<th id="addOneRow"><img src="${ctx}/images/img/edit_add.png" alt=""></th>
</tr>
</thead>
<tbody class="add-tr">
<tr class="">
<td class="line-one line-xh">1</td>
<td class=" line-input"><span class="db-num db-num-text"></span><input class="db-input line-input-text" type="text" /></td>
<td class="line-one">元</td>
<td class="line-one">150</td>
<td class="line-one line-yjmj"></td>
<td class="line-input"><span class="db-num db-nums"></span><input class="db-input db-money"
type="text" /></td>
<td><span class="delOneRow"><img src="${ctx}/images/img/edit_remove.png" alt=""></span></td>
</tr>
</tbody>
<tr>
<td class="line-one">合计</td>
<td class="line-input"></td>
<td class="line-one"></td>
<td class="line-one"></td>
<td class="line-one"></td>
<td class="line-all"></td>
<td></td>
</tr>
</table>
</div>
<table width="100%" border="0" class="fu-advice"> <div class="cell" style="width: 100%">
<c:if test="${fstzsXm.status == 3}"> <table width="100%" border="0" class="ta-tb">
<tr >
<td width="0%" style="width: 0%"><div class="add-title">复核意见</div></td> <tr class="table-line-td">
<td width="100%"> <th width="15%">建设单位</th>
<textarea id="fhyj" name="fstzsXm.fhyj" style="width:96%;margin-top: 6px;" disabled>${fstzsXm.fhyj}</textarea> <td width="35%">
</td> <input id="jsdw" name="fstzsXm.jsdwmc" style="width:96%;margin-top: 6px;" value="${fstzsXm.jsdwmc}" disabled/>
</tr>
</c:if> </td>
</tr>
<tr>
<th width="15">工程项目名称</th>
<td width="35%">
<input id="gcxmmc" name="fstzsXm.gcxmmc" style="width:90%" value="${fstzsXm.gcxmmc}" disabled/>
</td>
<th width="15">缴款人手机号</th>
<td width="35%">
<input id="mobile" name="fstzsXm.mobile" style="width:90%" value="${fstzsXm.mobile}"/>
</td>
</tr>
<tr>
<th width="15">缴款人账号</th>
<td width="35%">
<input id="zhanghao" name="fstzsXm.zhanghao" style="width:90%" value="${fstzsXm.zhanghao}"/>
</td>
<th width="15">缴款人开户银行</th>
<td width="35%">
<input id="khh" name="fstzsXm.khh" style="width:90%" value="${fstzsXm.khh}"/>
</td>
</tr>
<tr>
<th width="15">缴款方式</th>
<td width="35%">
<input style="width:90%" value="直接解缴" disabled/>
</td>
<th width="15">缴款人类型</th>
<td width="35%">
<input style="width:90%" value="单位" disabled/>
</td>
</tr>
<tr>
<th width="15">应缴总面积(平方米)</th>
<td width="35%">
<input id="csmj" name="fstzsXm.paymentItemPending.csmj" style="width:90%" value="${fstzsXm.paymentItemPending.csmj}" disabled/>
</td>
<th width="15">收费标准(元)</th>
<td width="35%">
<input style="width:90%" value="150" disabled/>
</td>
</tr>
<tr>
<th width="15">征收单位名称</th>
<td width="35%">
<input id="zsdw" name="fstzsXm.kpsjgl.zsdw" style="width:90%" value="${fstzsXm.kpsjgl.zsdw}" disabled/>
</td>
<th width="15">征收单位编码</th>
<td width="35%">
<input id="zsdwbm" name="fstzsXm.kpsjgl.zsdwbm" style="width:90%" value="${fstzsXm.kpsjgl.zsdwbm}" disabled/>
</td>
</tr>
<tr> <tr>
<td colspan="4" align="center" style="position: relative;top: 20px;"> <th width="15">区划码</th>
<a href="###" class="btn_01" onclick="tjFstzs()" >提交<b></b></a>&nbsp; <td width="35%">
<input id="qhm" name="fstzsXm.kpsjgl.qhm" style="width:90%" value="${fstzsXm.kpsjgl.qhm}" disabled/>
<a href="###" class="btn_01" onclick="parent.close_win('win_fstzs');" >关闭<b></b></a>&nbsp; </td>
<th width="15">收款人全称</th>
<td width="35%">
<input id="krqc" name="fstzsXm.kpsjgl.krqc" style="width:90%" value="${fstzsXm.kpsjgl.krqc}" disabled/>
</td> </td>
</tr> </tr>
<tr>
<th width="15">收款人账号</th>
<td width="35%">
<input id="skrzh" name="fstzsXm.kpsjgl.skrzh" style="width:90%" value="${fstzsXm.kpsjgl.skrzh}" disabled/>
</td>
<th width="15">收款人开户行</th>
<td width="35%">
<input id="skrkhh" name="fstzsXm.kpsjgl.skrkhh" style="width:90%" value="${fstzsXm.kpsjgl.skrkhh}" disabled/>
</td>
</tr>
<tr>
<th width="15">项目编码</th>
<td width="35%">
<input id="xmbm" name="fstzsXm.kpsjgl.xmbm" style="width:90%" value="${fstzsXm.kpsjgl.xmbm}" disabled/>
</td>
<th width="15">收入项目名称</th>
<td width="35%">
<input id="srxmmc" name="fstzsXm.kpsjgl.srxmmc" style="width:90%" value="${fstzsXm.kpsjgl.srxmmc}" disabled/>
</td>
</tr>
<tr>
<th width="15">配套费应缴金额(元)</th>
<td width="35%">
<input id="yjje" name="fstzsXm.yjje" style="width:90%" value="${fstzsXm.yjje}" disabled/>
</td>
<th width="15">配套费应缴金额大写</th>
<td width="35%">
<input id="yjjedx" name="fstzsXm.yjjedx" style="width:90%" value="${fstzsXm.yjjedx}" disabled/>
</td>
</tr>
<tr class="table-line-td">
<th width="15">备注(限25字以内)</th>
<td width="35%">
<input id="beizhu" name="fstzsXm.beizhu" style="width:96%;margin-top: 6px;" value="${fstzsXm.beizhu}"/>
</td>
</tr>
</table>
<div style="margin-top: 20px;">
<div class="add-title">配套费</div>
<table class="add-table">
<thead>
<tr>
<th>序号</th>
<th>缴款人</th>
<th>计量单位</th>
<th>收费标准</th>
<th>应缴面积</th>
<th>应缴金额</th>
<th id="addOneRow"><img src="${ctx}/images/img/edit_add.png" alt=""></th>
</tr>
</thead>
<tbody class="add-tr">
<tr class="">
<td class="line-one line-xh">1</td>
<td class=" line-input"><span class="db-num db-num-text"></span><input class="db-input line-input-text" type="text" /></td>
<td class="line-one">元</td>
<td class="line-one">150</td>
<td class="line-one line-yjmj"></td>
<td class="line-input"><span class="db-num db-nums"></span><input class="db-input db-money"
type="text" /></td>
<td><span class="delOneRow"><img src="${ctx}/images/img/edit_remove.png" alt=""></span></td>
</tr>
</tbody>
<tr>
<td class="line-one">合计</td>
<td class="line-input"></td>
<td class="line-one"></td>
<td class="line-one"></td>
<td class="line-one"></td>
<td class="line-all"></td>
<td></td>
</tr>
</table> </table>
</div>
<table width="100%" border="0" class="fu-advice">
<c:if test="${fstzsXm.status == 3}">
<tr >
<td width="0%" style="width: 0%"><div class="add-title">复核意见</div></td>
<td width="100%">
<textarea id="fhyj" name="fstzsXm.fhyj" style="width:96%;margin-top: 6px;" disabled>${fstzsXm.fhyj}</textarea>
</td>
</tr>
</c:if>
<tr>
<td colspan="4" align="center" style="position: relative;top: 20px;">
<a href="###" class="btn_01" onclick="tijiao()" >提交<b></b></a>&nbsp;
<a href="###" class="btn_01" onclick="parent.close_win('win_fstzs');" >关闭<b></b></a>&nbsp;
</td>
</tr>
</table>
</div> </div>
</form>
</div> </div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
...@@ -388,8 +394,9 @@ ...@@ -388,8 +394,9 @@
numf = Number($(this).val()) numf = Number($(this).val())
}) })
function tjFstzs() { function tijiao() {
document.myform1.action="addFstzs.action";
document.myform1.submit();
} }
</script> </script>
......
WebRoot/WEB-INF/pages/fstzs/Fstzs_Dsc.jsp
View file @ 6ed0c40b
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
function addFstzs(id){ function addFstzs(id){
var dt=new Date(); var dt=new Date();
createSimpleWindow("win_fstzs","生成非税通知书","${ctx}/jsp/fstzs/winAddFstzs.action?id=" + id,900,700); createSimpleWindow("win_fstzs","生成非税通知书","${ctx}/jsp/fstzs/winAddFstzs.action?flag=add&id=" + id,900,700);
} }
......
WebRoot/WEB-INF/pages/fstzs/Fstzs_Ysc.jsp
View file @ 6ed0c40b
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
function edit(id){ function edit(id){
var dt=new Date(); var dt=new Date();
createSimpleWindow("win_fstzs","修改非税通知书","${ctx}/jsp/fstzs/winAddFstzs.action?id=" + id,900,700); createSimpleWindow("win_fstzs","修改非税通知书","${ctx}/jsp/fstzs/winAddFstzs.action?flag=edit&id=" + id,900,700);
} }
......
src/com/jshx/fstzs/web/FstzsAction.java
View file @ 6ed0c40b
...@@ -42,6 +42,11 @@ public class FstzsAction extends BaseAction { ...@@ -42,6 +42,11 @@ public class FstzsAction extends BaseAction {
*/ */
Integer status; Integer status;
String id; String id;
/**
* 区别新增与编辑
* add/edit
*/
String flag;
/** /**
* 非税通知书项目生成通知书的时候，上传的列表 * 非税通知书项目生成通知书的时候，上传的列表
*/ */
...@@ -171,27 +176,32 @@ public class FstzsAction extends BaseAction { ...@@ -171,27 +176,32 @@ public class FstzsAction extends BaseAction {
* @return * @return
*/ */
public String addFstzs() { public String addFstzs() {
FstzsXm dbXm = fstzsXmService.getById(id); if("add".equals(flag)) {
//更新数据库项目状态 FstzsXm dbXm = fstzsXmService.getById(id);
dbXm.setStatus(1);//状态改为已生成、待复核 //更新数据库项目状态
dbXm.setJbr(this.getLoginUser().getDisplayName()); dbXm.setStatus(1);//状态改为已生成、待复核
dbXm.setBeizhu(fstzsXm.getBeizhu()); dbXm.setJbr(this.getLoginUser().getDisplayName());
dbXm.setKhh(fstzsXm.getKhh()); dbXm.setBeizhu(fstzsXm.getBeizhu());
dbXm.setMobile(fstzsXm.getMobile()); dbXm.setKhh(fstzsXm.getKhh());
dbXm.setZhanghao(fstzsXm.getZhanghao()); dbXm.setMobile(fstzsXm.getMobile());
//TODO 添加多条记录到fstzs表 dbXm.setZhanghao(fstzsXm.getZhanghao());
if(fstzsList.size() > 0) { //TODO 添加多条记录到fstzs表
fstzsList.stream().map(i -> { if(fstzsList.size() > 0) {
i.setDelFlag(0); fstzsList.stream().map(i -> {
i.setStatus(0); i.setDelFlag(0);
i.setFstzsXm(fstzsXm); i.setStatus(0);
i.setGcxmmc(fstzsXm.getGcxmmc()); i.setFstzsXm(fstzsXm);
i.setJsdwmc(fstzsXm.getJsdwmc()); i.setGcxmmc(fstzsXm.getGcxmmc());
i.setSlbh(fstzsXm.getSlbh()); i.setJsdwmc(fstzsXm.getJsdwmc());
return i; i.setSlbh(fstzsXm.getSlbh());
}).forEach(i-> fstzsService.save(i)); return i;
fstzsXmService.update(dbXm); }).forEach(i-> fstzsService.save(i));
return RELOAD; fstzsXmService.update(dbXm);
return RELOAD;
}
} else {//edit
} }
return ERROR; return ERROR;
} }
......
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