Skip to content

N
njzsb
Commit 7b2c23f5 authored by 徐州's avatar 徐州
Browse files
Options

修改部分问题

parent 4c4fa393
Show whitespace changes
Inline Side-by-side
Showing with 306 additions and 38 deletions
WebRoot/WEB-INF/pages/fstzs/Fstzs_Add.jsp
View file @ 7b2c23f5
......@@ -68,15 +68,6 @@
width: 100%;
}
</style>
<script>
var index4Sf = 1;
//验证收费信息
function verify1(data) {
}
</script>
</head>
<body validform="true">
<div class="page_dialog">
......@@ -137,47 +128,47 @@
</td>
</tr>
<tr>
<th width="15">征收单位名称</th>kpsjgl
<th width="15">征收单位名称</th>
<td width="35%">
<input id="zsdw" name="fstzsXm.kpsjgl.zsdw" style="width:90%" value="{{fstzsXm.kpsjgl.zsdw}}" disabled/>
<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/>
<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/>
<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/>
<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/>
<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/>
<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/>
<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/>
<input id="srxmmc" name="fstzsXm.kpsjgl.srxmmc" style="width:90%" value="${fstzsXm.kpsjgl.srxmmc}" disabled/>
</td>
</tr>
<tr>
......@@ -238,24 +229,25 @@
</tr>
</table>
</div>
<table width="100%" border="0" class="fu-advice">
<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="" name="fstzsXm.jsdwmc" style="width:96%;margin-top: 6px;" value="${fstzsXm.jsdwmc}" disabled></textarea>
<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="search_rfxm()" >通过<b></b></a>&nbsp;
<a href="###" class="btn_01" onclick="tjFstzs()" >提交<b></b></a>&nbsp;
<a href="###" class="btn_01" onclick="clear_form(document.myform);" >退回<b></b></a>&nbsp;
<a href="###" class="btn_01" onclick="parent.close_win('win_fstzs');" >关闭<b></b></a>&nbsp;
</td>
</tr>
</table>
</div>
</div>
</div>
......@@ -396,6 +388,9 @@
numf = Number($(this).val())
})
function tjFstzs() {
}
</script>
</body>
......
WebRoot/WEB-INF/pages/fstzs/Fstzs_View.jsp 0 → 100644
View file @ 7b2c23f5
<%@page language="java" pageEncoding="UTF-8" isELIgnored="false"%>
<%@include file="/common/header.jsp"%>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>查看非税通知书</title>
<%@include file="/common/jsLib.jsp"%>
<style>
.table-line-td>td{
width: 240%;
display: inline-block;
border-top: none;
border-bottom: none;
border-right: none;
}
.add-table {
width: 90% !important;
float: right;
}
.add-table,
.add-table td {
border: 1px solid #d9d9d9;
border-collapse: collapse;
text-align: center;
}
.add-table td {
width: 15%;
}
.add-table th {
text-align: center;
padding: 0;
}
.db-input {
display: none;
width: 80%;
}
.db-num {
width: 100%;
height: 20px;
display: inline-block;
}
.add-title{
display: inline-block;
text-align: right;
width: 69px;
color: #000;
font-size: 12px;
font-weight: bold;
}
.fu-advice{
position: relative;
top: 20px;
}
.fu-advice,.fu-advice td{
border: none !important;
}
.ta-tb tbody{
display: inherit;
width: 100%;
}
</style>
</head>
<body validform="true">
<div class="page_dialog">
<div class="inner6px">
<div class="cell" style="width: 100%">
<table width="100%" border="0" class="ta-tb">
<tr class="table-line-td">
<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}" disabled/>
</td>
</tr>
<tr>
<th width="15">缴款人账号</th>
<td width="35%">
<input id="zhanghao" name="fstzsXm.zhanghao" style="width:90%" value="${fstzsXm.zhanghao}" disabled/>
</td>
<th width="15">缴款人开户银行</th>
<td width="35%">
<input id="khh" name="fstzsXm.khh" style="width:90%" value="${fstzsXm.khh}" disabled/>
</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}" disabled/>
</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>
</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>
</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></td>
</tr>
</table>
</div>
<table width="100%" border="0" class="fu-advice">
<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;" value="${fstzsXm.fhyj}"></textarea>
</td>
</tr>
<tr>
<td colspan="4" align="center" style="position: relative;top: 20px;">
<a href="###" class="btn_01" onclick="tjFstzs()" >通过<b></b></a>&nbsp;
<a href="###" class="btn_01" onclick="clear_form(document.myform);" >退回<b></b></a>&nbsp;
</td>
</tr>
</table>
</div>
</div>
</div>
<script type="text/javascript">
function tjFstzs() {
}
</script>
</body>
</html>
WebRoot/WEB-INF/pages/fstzs/Fstzs_Ysc.jsp
View file @ 7b2c23f5
......@@ -14,13 +14,7 @@
function edit(id){
var dt=new Date();
createSimpleWindow("win_fstzs","修改非税通知书","${ctx}/jsp/fstzs/winViewFstzs.action?id=" + id,900,700);
}
function edit(id){
var dt=new Date();
createSimpleWindow("win_fstzs","修改非税通知书","${ctx}/jsp/fstzs/winViewFstzs.action?id=" + id,900,700);
createSimpleWindow("win_fstzs","修改非税通知书","${ctx}/jsp/fstzs/winAddFstzs.action?id=" + id,900,700);
}
......@@ -73,7 +67,7 @@
{field:'slbh',title:'受理编号',width:150},
{field:'jsdwmc',title:'建设单位名称',width:300},
{field:'gcxmmc',title:'工程项目名称',width:300},
{field:'yjje',title:'配套费应缴金额',width:150,formatter: function (value, row, index){
{field:'yjje',title:'配套费应缴金额',width:100,formatter: function (value, row, index){
if (row != null && ""!=value) {
return (parseFloat(value).toFixed(2) + '').replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,');
}
......@@ -81,10 +75,10 @@
{field:'zyjje',title:'项目总应缴金额',width:150,formatter: function (value, row, index){
return (parseFloat(row.paymentItemPending.zyjje).toFixed(2) + '').replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,');
}},
{field:'jzmj',title:'总建筑面积',width:150,formatter: function (value, row, index){
{field:'jzmj',title:'总建筑面积',width:100,formatter: function (value, row, index){
return row.paymentItemPending.csmj;
}},
{field:'status',title:'是否复核',width:150,formatter: function (value, row, index){
{field:'status',title:'是否复核',width:80,formatter: function (value, row, index){
if (value == 1) return "待复核";
if (value == 2) return "复核通过";
if (value == 3) return "待复不通过";
......
src/com/jshx/fstzs/conf/struts-fstzs.xml
View file @ 7b2c23f5
......@@ -27,6 +27,11 @@
<result name="view">/WEB-INF/pages/fstzs/Fstzs_Add.jsp</result>
</action>
<!--查看非税通知书窗口-->
<action name="winViewFstzs" class="com.jshx.fstzs.web.FstzsAction" method="winAddFstzs">
<result name="view">/WEB-INF/pages/fstzs/Fstzs_View.jsp</result>
</action>
<!--生成非税通知书操作-->
<action name="addFstzs" class="com.jshx.fstzs.web.FstzsAction" method="addFstzs">
<interceptor-ref name="tokenInterceptor" />
......
src/com/jshx/fstzs/entity/FstzsXm.java
View file @ 7b2c23f5
......@@ -88,6 +88,11 @@ public class FstzsXm extends BaseModel
*/
private String yjjedx;
/**
* 复核意见
*/
private String fhyj;
/**
* 对应项目信息主键
*/
......@@ -184,10 +189,6 @@ public class FstzsXm extends BaseModel
public void setYjje(String yjje) {
this.yjje = yjje;
try {
this.yjjedx = NumberToCN.number2CNMontrayUnit(new BigDecimal(yjje));
} catch (Exception e) {}
}
public String getYjjedx() {
......@@ -217,4 +218,12 @@ public class FstzsXm extends BaseModel
public void setKpsjgl(Kpsjgl kpsjgl) {
this.kpsjgl = kpsjgl;
}
public String getFhyj() {
return fhyj;
}
public void setFhyj(String fhyj) {
this.fhyj = fhyj;
}
}
src/com/jshx/fstzs/web/FstzsAction.java
View file @ 7b2c23f5
package com.jshx.fstzs.web;
import com.jshx.common.utils.NumberToCN;
import com.jshx.core.base.action.BaseAction;
import com.jshx.core.base.vo.Pagination;
import com.jshx.core.json.CodeJsonValueProcessor;
......@@ -12,6 +13,8 @@ import com.jshx.kpsjgl.service.KpsjglService;
import com.neusoft.egov.utils.TextUtils;
import net.sf.json.JsonConfig;
import org.springframework.beans.factory.annotation.Autowired;
import java.math.BigDecimal;
import java.util.*;
public class FstzsAction extends BaseAction {
......@@ -156,6 +159,10 @@ public class FstzsAction extends BaseAction {
*/
public String winAddFstzs() {
fstzsXm = fstzsXmService.getById(id);
try {
//金额转中文
fstzsXm.setYjjedx(NumberToCN.number2CNMontrayUnit(new BigDecimal(fstzsXm.getYjje())));
} catch (Exception e) {}
return VIEW;
}
......
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