Skip to content

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

非税通知书改为：非税缴款通知单

parent c0de0277
Show whitespace changes
Inline Side-by-side
Showing with 33 additions and 33 deletions
WebRoot/WEB-INF/pages/account/accountBank/AccountBank_Detail.jsp
View file @ b5e702fe
......@@ -11,7 +11,7 @@
}
function viewFs(fsId) {
createSimpleWindow("win_fstzs","打印非税通知书","${ctx}/jsp/fstzs/winPrintFstzs.action?id=" + fsId,900,700);
createSimpleWindow("win_fstzs","打印非税缴款通知单","${ctx}/jsp/fstzs/winPrintFstzs.action?id=" + fsId,900,700);
}
</script>
</head>
......
WebRoot/WEB-INF/pages/fstzs/Fstzs_Add.jsp
View file @ b5e702fe
......@@ -2,7 +2,7 @@
<%@include file="/common/header.jsp"%>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>生成非税通知书</title>
<title>生成非税缴款通知单</title>
<%@include file="/common/jsLib.jsp"%>
<style>
......
WebRoot/WEB-INF/pages/fstzs/Fstzs_Dsc.jsp
View file @ b5e702fe
......@@ -8,7 +8,7 @@
function addFstzs(id){
var dt=new Date();
createSimpleWindow("win_fstzs","生成非税通知书","${ctx}/jsp/fstzs/winAddFstzs.action?flag=add&id=" + id,900,700);
createSimpleWindow("win_fstzs","生成非税缴款通知单","${ctx}/jsp/fstzs/winAddFstzs.action?flag=add&id=" + id,900,700);
}
......@@ -31,7 +31,7 @@
$(function(){
$('#pagination').datagrid($.extend(window.dg_cm_pp_2,{
title:'待生成非税通知书项目列表',
title:'待生成非税缴款通知单项目列表',
url:'${ctx}/jsp/fstzs/fstzsXmList.action?status=0',
queryParams:{
"fstzsXm.slbh": $("#slbh").val(),
......@@ -42,7 +42,7 @@
columns:[[
{field:'op',title:'操作',width:140,align:'center',formatter:function(value,rec){
return "<a class='btn_01_mini' onclick=addFstzs('"+rec.id+"') >生成非税通知书<b></b></a>";
return "<a class='btn_01_mini' onclick=addFstzs('"+rec.id+"') >生成非税缴款通知单<b></b></a>";
}},
{field:'slbh',title:'受理编号',width:150},
{field:'jsdwmc',title:'建设单位名称',width:300},
......
WebRoot/WEB-INF/pages/fstzs/Fstzs_View.jsp
View file @ b5e702fe
......@@ -2,7 +2,7 @@
<%@include file="/common/header.jsp"%>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>查看非税通知书</title>
<title>查看非税缴款通知单</title>
<%@include file="/common/jsLib.jsp"%>
<style>
......
WebRoot/WEB-INF/pages/fstzs/Fstzs_Yjh.jsp
View file @ b5e702fe
......@@ -45,7 +45,7 @@
function dayin(id){
var dt=new Date();
createSimpleWindow("win_fstzs","打印非税通知书","${ctx}/jsp/fstzs/winPrintFstzs.action?id=" + id,900,700);
createSimpleWindow("win_fstzs","打印非税缴款通知单","${ctx}/jsp/fstzs/winPrintFstzs.action?id=" + id,900,700);
}
function reloadDate(){
......@@ -95,7 +95,7 @@
$(function(){
$('#pagination').datagrid($.extend(window.dg_cm_pp,{
title:'已激活非税通知书列表',
title:'已激活非税缴款通知单列表',
url:'${ctx}/jsp/fstzs/fstzsList.action',
queryParams:{
"fstzs.slbh": $("#slbh").val(),
......@@ -130,7 +130,7 @@
{field:'yjje',title:'金额',width:100},
{field:'pjdm',title:'票据代码',width:100},
{field:'jksh',title:'缴款书号',width:100},
{field:'status',title:'非税通知书状态',width:100,formatter: function (value, row, index){
{field:'status',title:'非税缴款通知单状态',width:100,formatter: function (value, row, index){
if (value == 1) return "正常";
return "已作废";
}}
......@@ -170,7 +170,7 @@
<td width="12%"><input name="fstzs.gcxmmc" id="gcxmmc" value="" type="text"></td>
<th width="12%">建设单位名称</th>
<td width="12%"><input name="fstzs.jsdwmc" id="jsdwmc" value="" type="text"></td>
<th width="15%">非税通知书状态</th>
<th width="15%">非税缴款通知单状态</th>
<td width="12%"><select name="rfxm.status" id="status" >
<option value="">请选择</option>
<option value="1">正常</option>
......
WebRoot/WEB-INF/pages/fstzs/Fstzs_Yjk.jsp
View file @ b5e702fe
......@@ -38,7 +38,7 @@
$(function(){
$('#pagination').datagrid($.extend(window.dg_cm_pp,{
title:'已缴款非税通知书列表',
title:'已缴款非税缴款通知单列表',
url:'${ctx}/jsp/fstzs/fstzsList.action?status=3',
queryParams:{
"fstzs.slbh": $("#slbh").val(),
......@@ -177,7 +177,7 @@
<th width="12%">建设单位名称</th>
<td width="12%"><input name="fstzs.jsdwmc" id="jsdwmc" value="" type="text"></td>
<th width="15%">非税通知书状态</th>
<th width="15%">非税缴款通知单状态</th>
<td width="12%"><select name="rfxm.status" id="status" >
<option value="">请选择</option>
<option value="1">正常</option>
......
WebRoot/WEB-INF/pages/fstzs/Fstzs_Ysc.jsp
View file @ b5e702fe
......@@ -8,13 +8,13 @@
function view(id){
var dt=new Date();
createSimpleWindow("win_fstzs","查看非税通知书","${ctx}/jsp/fstzs/winViewFstzs.action?id=" + id,900,700);
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/winAddFstzs.action?flag=edit&id=" + id,900,700);
createSimpleWindow("win_fstzs","修改非税缴款通知单","${ctx}/jsp/fstzs/winAddFstzs.action?flag=edit&id=" + id,900,700);
}
......@@ -84,7 +84,7 @@
$(function(){
$('#pagination').datagrid($.extend(window.dg_cm_pp_2,{
title:'已生成非税通知书列表',
title:'已生成非税缴款通知单列表',
url:'${ctx}/jsp/fstzs/fstzsXmList.action',
queryParams:{
"fstzsXm.slbh": $("#slbh").val(),
......
src/com/jshx/account/accountBank/web/AccountBankAction.java
View file @ b5e702fe
......@@ -425,7 +425,7 @@ public class AccountBankAction extends BaseAction
accountBankService.accountConfirmPending(orderId, ids, outcome, this.getLoginUser().getId(), identityService, runtimeService);
/**
* 办理时，直接生成非税通知书，不需要另外操作了
* 办理时，直接生成非税缴款通知单，不需要另外操作了
*/
if(!"1".equals(flag)) {
......@@ -454,9 +454,9 @@ public class AccountBankAction extends BaseAction
fstzsXmService.update(fstzsXm);
fstzsService.save(f);
msg = "同时该项目的非税通知书已变为已生成";
msg = "同时该项目的非税缴款通知单已变为已生成";
} else {
msg = "该项目存在已生成的非税通知书";
msg = "该项目存在已生成的非税缴款通知单";
}
......
src/com/jshx/fstzs/conf/struts-fstzs.xml
View file @ b5e702fe
......@@ -22,22 +22,22 @@
</action>
<!--生成非税通知书窗口-->
<!--生成非税缴款通知单窗口-->
<action name="winAddFstzs" class="com.jshx.fstzs.web.FstzsAction" method="winAddFstzs">
<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="winPrintFstzs" class="com.jshx.fstzs.web.FstzsAction" method="winFstzs">
<result name="view">/WEB-INF/pages/fstzs/Fstzs_Print.jsp</result>
</action>
<!--生成非税通知书操作-->
<!--生成非税缴款通知单操作-->
<action name="addFstzs" class="com.jshx.fstzs.web.FstzsAction" method="addFstzs">
<interceptor-ref name="tokenInterceptor" />
<interceptor-ref name="coreStack" />
......
src/com/jshx/fstzs/entity/Fstzs.java
View file @ b5e702fe
......@@ -9,7 +9,7 @@ import javax.persistence.*;
/**
* 实体类模板（目前仅适配MS-SQLServer数据库）
* @author jinx@caoz.
* 非税通知书-清单
* 非税缴款通知单-清单
* 1个项目可以对应多个清单文件
*
*/
......@@ -31,7 +31,7 @@ public class Fstzs extends BaseModel {
private String kpLsh;
/**
* 非税通知书状态
* 非税缴款通知单状态
* 0：默认，不显示在列表
* 1:已激活，正常
* 2：已作废
......
src/com/jshx/fstzs/entity/FstzsXm.java
View file @ b5e702fe
......@@ -15,7 +15,7 @@ import java.util.Date;
/**
* 实体类模板（目前仅适配MS-SQLServer数据库）
* @author jinx@caoz.
* 非税通知书-项目
* 非税缴款通知单-项目
*
*/
@SuppressWarnings("serial")
......@@ -63,7 +63,7 @@ public class FstzsXm extends BaseModel
/**
* 经办人
* 点击生成非税通知书的人
* 点击生成非税缴款通知单的人
*/
private String jbr;
......
src/com/jshx/fstzs/web/FstzsAction.java
View file @ b5e702fe
......@@ -114,7 +114,7 @@ public class FstzsAction extends BaseAction {
FstzsXm fstzsXm = new FstzsXm();
/**
* 非税通知书项目列表状态入参
* 非税缴款通知单项目列表状态入参
*/
Integer status;
String id;
......@@ -134,7 +134,7 @@ public class FstzsAction extends BaseAction {
*/
String jssj;
/**
* 非税通知书项目生成通知书的时候，上传的列表
* 非税缴款通知单项目生成通知书的时候，上传的列表
*/
List<Fstzs> fstzsList = new ArrayList<>();
......@@ -276,7 +276,7 @@ public class FstzsAction extends BaseAction {
}
/**
* 生成非税通知书窗口
* 生成非税缴款通知单窗口
* @return
*/
public String winAddFstzs() {
......@@ -314,7 +314,7 @@ public class FstzsAction extends BaseAction {
}
/**
* 生成非税通知书操作
* 生成非税缴款通知单操作
* @return
*/
public String addFstzs() {
......@@ -440,7 +440,7 @@ public class FstzsAction extends BaseAction {
}
/**
* 复核非税通知书
* 复核非税缴款通知单
* flag=0 通过 flag=1 退回
* @return
*/
......
src/com/jshx/paymentItemPending/service/impl/PaymentItemPendingServiceImpl.java
View file @ b5e702fe
......@@ -212,7 +212,7 @@ public class PaymentItemPendingServiceImpl extends BaseServiceImpl implements Pa
jktzsDao.save(jk);
xmxxbDao.update(xmb);
//保存项目到非税通知书表
//保存项目到非税缴款通知单表
FstzsXm xm = new FstzsXm();
xm.setXmxxb(xmb);
//获取收款人信息保存到项目中
......@@ -269,7 +269,7 @@ public class PaymentItemPendingServiceImpl extends BaseServiceImpl implements Pa
}
jk.setDycs("0");
this.save(dj);
//保存项目到非税通知书表
//保存项目到非税缴款通知单表
FstzsXm xm = new FstzsXm();
xm.setXmxxb(xmb);
//获取收款人信息保存到项目中
......
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