Skip to content

Z
zxtb_to_ssfwpt
Commit a367758b authored by 刘明珠's avatar 刘明珠
Browse files
Options

Merge branch 'integrateFirst' of http://114.115.168.181/lushihao/zxtb_to_ssfwpt into integrateFirst

parents ef989cd7 748c14d2
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 17 deletions
jsp/declare/yearReport.html
View file @ a367758b
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</head> </head>
<body class="body"> <body class="body">
<div class="header">、、 <div class="header">
<div class="title"> <div class="title">
<p> <p>
<span class="caption">当前报表：</span> <span class="caption">当前报表：</span>
...@@ -625,7 +625,7 @@ ...@@ -625,7 +625,7 @@
<script type="text/javascript" src="/web/onlineReport/static/js/year/fomula.js?v=20"></script> <script type="text/javascript" src="/web/onlineReport/static/js/year/fomula.js?v=20"></script>
<script type="text/javascript" src="/web/onlineReport/static/js/year/tool.js?v=20"></script> <script type="text/javascript" src="/web/onlineReport/static/js/year/tool.js?v=20"></script>
<script type="text/javascript" src="/web/onlineReport/static/js/year/specialHandler.js?v=20"></script> <script type="text/javascript" src="/web/onlineReport/static/js/year/specialHandler.js?v=20"></script>
<script type="text/javascript" src="/web/onlineReport/static/js/year/result.js?v=20"></script> <script type="text/javascript" src="/web/onlineReport/static/js/year/result.js?v=21"></script>
<script type="text/javascript" src="/web/onlineReport/static/tools/js/My97DatePicker/WdatePicker.js?v=1.1"></script> <script type="text/javascript" src="/web/onlineReport/static/tools/js/My97DatePicker/WdatePicker.js?v=1.1"></script>
</body> </body>
......
static/biz/config.js
View file @ a367758b
...@@ -13,8 +13,8 @@ function getUrlParam (name) { ...@@ -13,8 +13,8 @@ function getUrlParam (name) {
} }
// 公共配置 // 公共配置
var config = { var config = {
// webUrl:"http://sbjs.tjsat.gov.cn:8088/web/onlineReport/jsp/declare/", // webUrl:"http://sbjs.tjsat.gov.cn:8088/web/onlineReport/jsp/",
webUrl:"http://localhost:8088/web/onlineReport/jsp/", webUrl:"http://localhost:8088/web/onlineReport/jsp/",
url:"http://192.168.106.23:8091",// 开发环境配置跨域设置 url:"",// 开发环境配置跨域设置
} }
static/js/tax/initLoader.js
View file @ a367758b
...@@ -1155,7 +1155,7 @@ function isSqwsb() { ...@@ -1155,7 +1155,7 @@ function isSqwsb() {
}else{ }else{
init10401(); init10401();
} }
}else if(GLOBAL_JSON.pzzlDm == '10101'){ }else if(GLOBAL_JSON.pzzlDm == '10101'){/*
var djxh = ""; var djxh = "";
var sssqQ = ""; var sssqQ = "";
var sssqZ = ""; var sssqZ = "";
...@@ -1184,7 +1184,7 @@ function isSqwsb() { ...@@ -1184,7 +1184,7 @@ function isSqwsb() {
if(data && data.responseBean){ if(data && data.responseBean){
var info = JSON.parse(data.responseBean) var info = JSON.parse(data.responseBean)
if (GLOBAL_JSON.isSqwsb == "Y") { if (GLOBAL_JSON.isSqwsb == "Y") {
/* myAlert("提示", "该申报种类上期未申报！", "确定", function () {});*/ /!* myAlert("提示", "该申报种类上期未申报！", "确定", function () {});*!/
}else{ }else{
if("Y" == info.sfgx || "Y" == info.sfsb10 || "Y" == info.sfsb15){ if("Y" == info.sfgx || "Y" == info.sfsb10 || "Y" == info.sfsb15){
}else{ }else{
...@@ -1201,8 +1201,8 @@ function isSqwsb() { ...@@ -1201,8 +1201,8 @@ function isSqwsb() {
error:function (data) { error:function (data) {
console.log(data); console.log(data);
} }
}); });*/
}else{ }else{/*
if(GLOBAL_JSON.pzzlDm == '10102'){ if(GLOBAL_JSON.pzzlDm == '10102'){
var sbqr = GLOBAL_JSON.sbqr ? GLOBAL_JSON.sbqr : 202000; var sbqr = GLOBAL_JSON.sbqr ? GLOBAL_JSON.sbqr : 202000;
...@@ -1255,7 +1255,7 @@ function isSqwsb() { ...@@ -1255,7 +1255,7 @@ function isSqwsb() {
value += "<br>尊敬的纳税人，您好！为全面贯彻党中央国务院减税降费决策部署，落实好提高增值税小规模纳税人起征点政策，申报系统会帮助您判断是否可以享受免征增值税政策，在您申报的过程中可能会出现一些提示信息，请您认真阅读，并按照相关指引进行操作，非常感谢您的支持配合！！"; value += "<br>尊敬的纳税人，您好！为全面贯彻党中央国务院减税降费决策部署，落实好提高增值税小规模纳税人起征点政策，申报系统会帮助您判断是否可以享受免征增值税政策，在您申报的过程中可能会出现一些提示信息，请您认真阅读，并按照相关指引进行操作，非常感谢您的支持配合！！";
myAlert("提示", value, "确定", function () {}); myAlert("提示", value, "确定", function () {});
} }
} }*/
} }
} }
......
static/js/year/result.js
View file @ a367758b
...@@ -20,8 +20,9 @@ var GLOBAL_SHEET_REQUIRED = {}; ...@@ -20,8 +20,9 @@ var GLOBAL_SHEET_REQUIRED = {};
$(document).ready(function () { $(document).ready(function () {
console.log(GLOBAL_JSON) console.log(GLOBAL_JSON)
// GLOBAL_JSON.param["HYMXDM"]["1"] = 6851; // GLOBAL_JSON.param["HYMXDM"]["1"] = 6851;
var topBtnHtml;
var topBtnHtml = '<button class="htbutton" id="storageBtn"> 暂存 </button> <button class="htbutton" id="saveBtn"> 保存 </button> <button class="htbutton import" id="zcfxts"> 政策风险扫描 </button> <button class="htbutton import" id="uploadDataBtn"> 申报 </button> <button class="htbutton" id="exportOutBtn"> 导出 </button> <button class="htbutton" id="resetCurrentBtn" title="重置当前报表数据"> 重置当前报表 </button> <button class="htbutton resetAll" id="resetBtn" title="重置所有报表数据"> 全部重置 </button>'; topBtnHtml ='<button class="htbutton" id="resultFloat"> 查看校验 </button> '
topBtnHtml = '<button class="htbutton" id="storageBtn"> 暂存 </button> <button class="htbutton" id="saveBtn"> 保存 </button> <button class="htbutton import" id="zcfxts"> 政策风险扫描 </button> <button class="htbutton import" id="uploadDataBtn"> 申报 </button> <button class="htbutton" id="exportOutBtn"> 导出 </button> <button class="htbutton" id="resetCurrentBtn" title="重置当前报表数据"> 重置当前报表 </button> <button class="htbutton resetAll" id="resetBtn" title="重置所有报表数据"> 全部重置 </button>';
var NbBtnHtml = '<button class="htbutton import" id="saveNb"> 保存 </button>'; var NbBtnHtml = '<button class="htbutton import" id="saveNb"> 保存 </button>';
$("body").on("input", "#xw_value", function () { $("body").on("input", "#xw_value", function () {
...@@ -96,7 +97,8 @@ function selectNb() { ...@@ -96,7 +97,8 @@ function selectNb() {
type: "POST", type: "POST",
url: URL +"/ssfwpt/declare/save", url: URL +"/ssfwpt/declare/save",
data: { data: {
data: JSON.stringify(NB_cache_data) data: JSON.stringify(NB_cache_data),
taxInfo: localStorage.getItem("data")
}, },
dataType: "json", dataType: "json",
success: function success(data, textStatus, jqXHR) { success: function success(data, textStatus, jqXHR) {
......
static/js/yearGLB/result.js
View file @ a367758b
...@@ -19,9 +19,10 @@ var GLOBAL_SHEET_REQUIRED = {}; ...@@ -19,9 +19,10 @@ var GLOBAL_SHEET_REQUIRED = {};
$(document).ready(function () { $(document).ready(function () {
console.log(GLOBAL_JSON) console.log(GLOBAL_JSON)
var topBtnHtml = '<button class="htbutton" id="storageBtn"> 暂存 </button> <button class="htbutton" id="saveBtn"> 保存 </button> <button class="htbutton import" id="uploadDataBtn"> 申报 </button> <button class="htbutton" id="exportOutBtn"> 导出 </button> <button class="htbutton" id="resetCurrentBtn" title="重置当前报表数据"> 重置当前报表 </button> <button class="htbutton resetAll" id="resetBtn" title="重置所有报表数据"> 全部重置 </button>'; var topBtnHtml;
topBtnHtml ='<button class="htbutton" id="resultFloat"> 查看校验 </button> '
var NbBtnHtml = '<button class="htbutton import" id="saveNb"> 保存 </button>'; topBtnHtml += '<button class="htbutton" id="storageBtn"> 暂存 </button> <button class="htbutton" id="saveBtn"> 保存 </button> <button class="htbutton import" id="uploadDataBtn"> 申报 </button> <button class="htbutton" id="exportOutBtn"> 导出 </button> <button class="htbutton" id="resetCurrentBtn" title="重置当前报表数据"> 重置当前报表 </button> <button class="htbutton resetAll" id="resetBtn" title="重置所有报表数据"> 全部重置 </button>';
var NbBtnHtml = '<button class="htbutton import" id="saveNb"> 保存 </button>';
$("body").on("input", "#xw_value", function () { $("body").on("input", "#xw_value", function () {
$("body").attr("data_xwValue", $("#xw_value").val()); $("body").attr("data_xwValue", $("#xw_value").val());
}); });
...@@ -108,7 +109,8 @@ function selectNb() { ...@@ -108,7 +109,8 @@ function selectNb() {
type: "POST", type: "POST",
url: URL +"/ssfwpt/declare/save", url: URL +"/ssfwpt/declare/save",
data: { data: {
data: JSON.stringify(NB_cache_data) data: JSON.stringify(NB_cache_data),
taxInfo: localStorage.getItem("data")
}, },
dataType: "json", dataType: "json",
success: function success(data, textStatus, jqXHR) { success: function success(data, textStatus, jqXHR) {
...@@ -1138,7 +1140,8 @@ function saveData(operateType) { ...@@ -1138,7 +1140,8 @@ function saveData(operateType) {
type: "POST", type: "POST",
url: url, url: url,
data: { data: {
data: JSON.stringify(pagedata) data: JSON.stringify(pagedata),
taxInfo: localStorage.getItem("data")
}, },
dataType: "json", dataType: "json",
success: function success(data, textStatus, jqXHR) { success: function success(data, textStatus, jqXHR) {
......
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