Skip to content

Z
zxtb_to_ssfwpt
Commit 055e84eb authored by 彭令令's avatar 彭令令
Browse files
Options

合并optimize分支代码

parent a1d0c5a6
Show whitespace changes
Inline Side-by-side
Showing with 126 additions and 33 deletions
jsp/declareOverdue/index.html
View file @ 055e84eb
......@@ -146,5 +146,44 @@
// alertWarning("请求失败！");
// }
</script>
<!-- IE8以下提示 -->
<script>
window.console = window.console || (function () {
var c = {}; c.log = c.warn = c.debug = c.info = c.error = c.time = c.dir = c.profile
= c.clear = c.exception = c.trace = c.assert = function () { };
return c;
})();
var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1; //判断是否IE<11浏览器
var isEdge = userAgent.indexOf("Edge") > -1 && !isIE; //判断是否IE的Edge浏览器
var isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf("rv:11.0") > -1;
if (isIE) {
var reIE = new RegExp("MSIE (\\d+\\.\\d+);");
reIE.test(userAgent);
var fIEVersion = parseFloat(RegExp["$1"]);
if (fIEVersion == 7) {
alert('您的浏览器版本过低，请使用IE9及以上浏览器或者使用浏览器极速模式');
// return 7;
} else if (fIEVersion == 8) {
alert('您的浏览器版本过低，请使用IE9及以上浏览器或者使用浏览器极速模式');
// return 8;
} else if (fIEVersion == 9) {
// return 9;
} else if (fIEVersion == 10) {
// return 10;
} else {
alert('您的浏览器版本过低，请使用IE9及以上浏览器或者使用浏览器极速模式');
// return 6;//IE版本<=7
}
} else if (isEdge) {
// alert('您的浏览器版本过低，请使用IE9及以上浏览器或者使用浏览器极速模式');
// return 'edge';//edge
} else if (isIE11) {
// return 11; //IE11
} else {
// return -1;//不是ie浏览器
}
document.write("<script type='text/javascript' src='./static/config.js?time=" + Math.random() + "'></" + "script" + ">")
</script>
</html>
\ No newline at end of file
jsp/overdue/index.html
View file @ 055e84eb
......@@ -144,5 +144,44 @@
// alertWarning("请求失败！");
// }
</script>
<!-- IE8以下提示 -->
<script>
window.console = window.console || (function () {
var c = {}; c.log = c.warn = c.debug = c.info = c.error = c.time = c.dir = c.profile
= c.clear = c.exception = c.trace = c.assert = function () { };
return c;
})();
var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1; //判断是否IE<11浏览器
var isEdge = userAgent.indexOf("Edge") > -1 && !isIE; //判断是否IE的Edge浏览器
var isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf("rv:11.0") > -1;
if (isIE) {
var reIE = new RegExp("MSIE (\\d+\\.\\d+);");
reIE.test(userAgent);
var fIEVersion = parseFloat(RegExp["$1"]);
if (fIEVersion == 7) {
alert('您的浏览器版本过低，请使用IE9及以上浏览器或者使用浏览器极速模式');
// return 7;
} else if (fIEVersion == 8) {
alert('您的浏览器版本过低，请使用IE9及以上浏览器或者使用浏览器极速模式');
// return 8;
} else if (fIEVersion == 9) {
// return 9;
} else if (fIEVersion == 10) {
// return 10;
} else {
alert('您的浏览器版本过低，请使用IE9及以上浏览器或者使用浏览器极速模式');
// return 6;//IE版本<=7
}
} else if (isEdge) {
// alert('您的浏览器版本过低，请使用IE9及以上浏览器或者使用浏览器极速模式');
// return 'edge';//edge
} else if (isIE11) {
// return 11; //IE11
} else {
// return -1;//不是ie浏览器
}
document.write("<script type='text/javascript' src='./static/config.js?time=" + Math.random() + "'></" + "script" + ">")
</script>
</html>
\ No newline at end of file
static/biz/cancellation_grid.js
View file @ 055e84eb
......@@ -2,7 +2,7 @@ var zjhm = '';
var initpage;
var yearBblxDm = ['10414', '10420'];
var ccxwsBblxDm = ['12101']
var Author;
var prefix = "";
$(function() {
if (config.environmental == 'test') {
......@@ -30,13 +30,13 @@ function getInitTable() {
hideLoading();
//el表达式变jq
// $("#token").attr("value","");
var Authorization = xhr.getResponseHeader("Authorization")
sessionStorage.setItem("Authorization", Authorization);
var authorization_sbzj2 = xhr.getResponseHeader("Encryption")
sessionStorage.setItem("authorization_sbzj2", authorization_sbzj2);
var companyInfo = data;
$("#djxh").attr("value", companyInfo.djxh);
if (companyInfo.returnCode == "00") {
zjhm = companyInfo.content.zjhm
Authorization = companyInfo.content.value
Author = companyInfo.content.value
if (companyInfo.content.sfyhzctsBz == 'Y') {
myAlert("提示", "尊敬的纳税人、缴费人，为进一步巩固拓展减税降费成效，助力市场主体纾困解难，对部分2020年底到期税费优惠政策（不包括社会保险费），您可暂按原政策文件规定申报享受优惠（原减免性质代码可继续使用）。详细情况可咨询主管税务分局、税务所或12366纳税服务热线。感谢您的理解与支持！！", "确定");
}
......@@ -50,6 +50,7 @@ function getInitTable() {
alertWarning(companyInfo.returnMessage);
if (!companyInfo.bean) {
companyInfo.bean = {};
Author = companyInfo.content.value
companyInfo.bean.djxh = getUrlParam("djxh");
companyInfo.bean.return = false;
}
......@@ -245,7 +246,7 @@ function initPage(companyInfo) {
// 财产行为税
if (ccxwsBblxDm.indexOf(data.bblxDm) != -1) {
// 测试环境start
var openUrl = config.ccxwsTaxTable + '?djxh=' + data.djxh + '&zsDjxh=' + data.zsDjxh + '&nsrsbh=' + data.nsrsbh + '&nsrmc=' + data.nsrmc + '&operateType=cancellation' + '&lybz=online' + '&Authorization=' + Authorization; //测试环境
var openUrl = config.ccxwsTaxTable + '?djxh=' + data.djxh + '&zsDjxh=' + data.zsDjxh + '&nsrsbh=' + data.nsrsbh + '&nsrmc=' + data.nsrmc + '&operateType=cancellation' + '&lybz=online' + '&Authorization=' + Author; //测试环境
// var openUrl = config.ccxwsTaxTable +'?lybz=online' +'&operateType=cancellation'+'&sblx=js' + '&token=' + data.token //正式环境
window.open(openUrl, '_blank');
} else if (data.sourceFlag == "ssfwpt_sbzj") {
......@@ -270,7 +271,7 @@ function initPage(companyInfo) {
}, 1000);
}
})
} else if (submitData.sourceFlag == "ssfwpt_sbzj_version_2") {
} else if (data.sourceFlag == "ssfwpt_sbzj_version_2") {
window.mlistener = {
selectRowData: {},
urlList: {
......@@ -353,7 +354,7 @@ function initPage(companyInfo) {
data: param,
type: "POST",
dataType: "JSON",
headers: { 'Authorization': sessionStorage.getItem("Authorization") },
headers: { 'Authorization': sessionStorage.getItem("authorization_sbzj2") },
}).done(function(data) {
if (data.success) {
companyInfo = data.content;
......
static/biz/declare_grid.js
View file @ 055e84eb
......@@ -4,6 +4,7 @@ var sbqDate = '';
var yearBblxDm = ['10414', '10420'];
var sfyhzctsBz = "";
var prefix = "";
var operateType = ""
$(function() {
if (config.environmental == 'test') {
prefix = "/web";
......@@ -28,10 +29,11 @@ function getInitTable() {
},
success: function(data, status, xhr) { //客户端jquery预先定义好的callback函数，成功获取跨域服务器上的json数据后，会动态执行这个callback函数
hideLoading();
var Authorization = xhr.getResponseHeader("Authorization")
sessionStorage.setItem("Authorization", Authorization);
var authorization_sbzj2 = xhr.getResponseHeader("Encryption")
sessionStorage.setItem("authorization_sbzj2", authorization_sbzj2);
var companyInfo = data;
if (companyInfo.success) {
operateType = companyInfo.bean.operateType;
zjhm = companyInfo.bean.zjhm
sfyhzctsBz = companyInfo.bean.sfyhzctsBz
if (companyInfo.bean.sfyhzctsBz == 'Y') {
......@@ -55,6 +57,7 @@ function getInitTable() {
} else {
hideLoading();
operateType = companyInfo.bean.operateType;
if (data.errmsg != undefined) {
alertWarning(data.errmsg);
} else {
......@@ -93,7 +96,7 @@ function getJjkjTag(djxh, nsrsbq) {
type: "post",
url: config.url + "/online/zxtb/get_yffyjjkcbz",
dataType: "json", // 请求方式为jsonp
headers: { 'Authorization': sessionStorage.getItem("Authorization") },
headers: { 'Authorization': sessionStorage.getItem("authorization_sbzj2") },
// async: false
data: {
djxh: djxh,
......@@ -324,7 +327,7 @@ function initPage(companyInfo) {
showLoading();
var param = {
djxh: djxh,
operateType: companyInfo.operateType,
operateType: operateType,
sbsq: date,
isFresh: type.toUpperCase() == "Y",
pzzlDm: companyInfo.pzzlDm,
......@@ -335,7 +338,7 @@ function initPage(companyInfo) {
data: param,
type: "POST",
dataType: "JSON",
headers: { 'Authorization': sessionStorage.getItem("Authorization") },
headers: { 'Authorization': sessionStorage.getItem("authorization_sbzj2") },
}).done(function(data) {
if (data.success) {
if (data.bean.url == "error.jsp") {
......
static/biz/overdue_grid.js
View file @ 055e84eb
......@@ -10,7 +10,8 @@ var initpage;
var yearBblxDm = ['10414', '10420'];
var ccxwsBblxDm = ['12101']
var prefix = "";
var Authorization = ""
var AuthorizationBz = ""
var operateType = "";
$(function() {
if (config.environmental == 'test') {
prefix = "/web";
......@@ -37,21 +38,25 @@ function getInitTable() {
hideLoading();
//el表达式变jq
// $("#token").attr("value","");
var Authorization = xhr.getResponseHeader("Authorization")
sessionStorage.setItem("Authorization", Authorization);
var authorization_sbzj2 = xhr.getResponseHeader("Encryption")
sessionStorage.setItem("authorization_sbzj2", authorization_sbzj2);
var companyInfo = data;
$("#djxh").attr("value", companyInfo.djxh);
if (companyInfo.success) {
operateType = companyInfo.bean.operateType;
config.value = companyInfo.bean.value
if (companyInfo.bean.sfyhzctsBz == 'Y') {
myAlert("提示", "尊敬的纳税人、缴费人，为进一步巩固拓展减税降费成效，助力市场主体纾困解难，对部分2020年底到期税费优惠政策（不包括社会保险费），您可暂按原政策文件规定申报享受优惠（原减免性质代码可继续使用）。详细情况可咨询主管税务分局、税务所或12366纳税服务热线。感谢您的理解与支持！！", "确定");
}
companyInfo.bean.config = config
companyInfo.bean.return = true;
Authorization = companyInfo.bean.value
AuthorizationBz = companyInfo.bean.value
initpage = initPage(companyInfo.bean);
} else {
AuthorizationBz = companyInfo.bean.value
operateType = companyInfo.bean.operateType;
config.value = companyInfo.bean.value
hideLoading();
if (companyInfo.errmsg != undefined) {
alertWarning(companyInfo.errmsg);
......@@ -97,9 +102,7 @@ function initPage(companyInfo) {
getIEVersion();
localStorage.setItem("cancellation", null);
var companyInfo = companyInfo;
var djxh = companyInfo.djxh;
var operateType = companyInfo.operateType;
var nowDate = ""; //用于缓存查询时间的变化
var submitData
......@@ -239,7 +242,7 @@ function initPage(companyInfo) {
// 财产行为税
if (ccxwsBblxDm.indexOf(data.bblxDm) != -1) {
// 测试环境start
var openUrl = config.ccxwsTaxTable + '?djxh=' + data.djxh + '&zsDjxh=' + data.zsDjxh + '&nsrsbh=' + data.nsrsbh + '&nsrmc=' + data.nsrmc + '&operateType=overdue' + '&lybz=online' + '&Authorization=' + Authorization; //测试环境
var openUrl = config.ccxwsTaxTable + '?djxh=' + data.djxh + '&zsDjxh=' + data.zsDjxh + '&nsrsbh=' + data.nsrsbh + '&nsrmc=' + data.nsrmc + '&operateType=overdue' + '&lybz=online' + '&Authorization=' + AuthorizationBz; //测试环境
// var openUrl = config.ccxwsTaxTable +'?lybz=online' +'&operateType=overdue' + '&sblx=yq' + '&token=' + data.token //正式环境
window.open(openUrl, '_blank');
} else if (data.sourceFlag == "ssfwpt_sbzj") {
......@@ -357,7 +360,7 @@ function initPage(companyInfo) {
data: param,
type: "POST",
dataType: "JSON",
headers: { 'Authorization': sessionStorage.getItem("Authorization") },
headers: { 'Authorization': sessionStorage.getItem("authorization_sbzj2") },
}).done(function(data) {
if (data.success) {
drawGrid(data.bean);
......@@ -528,12 +531,12 @@ function initPage(companyInfo) {
var changeDate = function(obj, dp) {
date = dp.cal.getNewDateStr();
nowDate = date;
getTaxOverdue(date, "N");
getTaxOverdue(date, "N","1");
};
var refresh = function() {
myConfirm("消息", "您确定需要重置申报清册吗？点击确定继续", "确定", "取消", function() {
getTaxOverdue(nowDate, "Y");
getTaxOverdue(nowDate, "Y","1");
});
};
/**
......
static/config_production.js
View file @ 055e84eb
/*
* @Author: your name
* @Date: 2022-02-27 16:20:26
* @LastEditTime: 2022-02-27 21:08:49
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \onlineReport\static\config_production.js
*/
/**
* @Author ygy
* @Description //TODO 获取地址栏参数
......@@ -12,7 +20,7 @@ function getUrlParam(name) {
return null;
}
// 公共配置
eval(unescape("var%20config%20%3D%20%7B%0A%20%20%20%20environmental%3A%22production%22%2C//production%20%u751F%u4EA7%20%20test%20%u6D4B%u8BD5%0A%20%20%20%20webUrl%3A%22/web/onlineReport/jsp/%22%2C%20//%20%u9884%u751F%u4EA7%u73AF%u5883%u89E3%u5F00%0A%20%20%20%20url%3A%22%22%2C//%20%u5F00%u53D1%u73AF%u5883%u914D%u7F6E%u8DE8%u57DF%u8BBE%u7F6E%20%20//%20%u5F00%u53D1%u73AF%u5883%0A%20%20%20%20value%3A%27%27%2C//%u52A0%u5BC6token%0A%09%20%20nsrsbq%3A%27%27%2C%0A%20%20%20%20spreadUrl%3A%22http%3A//sbjs.tjsat.gov.cn%22%2C//%20%u5C40%u7AEF%u751F%u4EA7%20%u503C%u4E3A%u7A7A%20%20%u5176%u4F59%u5168%u90E8%u6307%u5411%u5728%u7EBF%u7684%u57DF%u540D%0A%20%20%20%20ssfwptPage%3A%22/taxservicedesk/index.html%23/taxTableList%22%2C//%20%u6D89%u7A0E%u670D%u52A1%u5E73%u53F0%u586B%u62A5%u9875%u9762%u5730%u5740%20%u6708%u5B63%u62A5%0A%20%20%20%20yearTaxTable%3A%22/taxservicedesk/index.html%23/yearTaxTable%22%2C//%20%u6D89%u7A0E%u670D%u52A1%u5E73%u53F0%u586B%u62A5%u9875%u9762%u5730%u5740%20%u5E74%u62A5%0A%20%20%20%20zhsbPage%3A%22/taxservicedesk/index.html%23/syntheticalReport%22%2C//%20%u6D89%u7A0E%20%u7EFC%u5408%u7533%u62A5%u9875%u9762%0A%20%20%20%20taxFormComponent%3A%22/web/taxFormComponent/index.html%3Fparam%3D%22%2C//%20%u6D89%u7A0E%u670D%u52A1%u5E73%u53F0%u586B%u62A5%u9875%u9762%u5730%u5740%0A%20%20%20%20ccxwsTaxTable%3A%22/web/tax-plugin/index.html%22%2C//%u8D22%u4EA7%u884C%u4E3A%u7A0E%20%u7533%u62A5%20%u8DF3%u8F6C%u9875%u9762%0A%20%20%20%20collectPage%3A%22/propertybehaviortax/index.html%23/buttonFrame%22%2C//%u8D22%u4EA7%u884C%u4E3A%u7A0E%20%u91C7%u96C6%20%u8DF3%u8F6C%u586B%u62A5%u9875%u9762%0A%20%20%20%20tableBridge%3A%20%22/tableDisplayBusiness/index.html%23/taxRelated%22%2C%20//%u7A0E%u88682.0%20%u7A0E%u79CD%u5F00%u8868%u5C55%u793A%u9875%u9762%20%0A%7D"))
eval(unescape("var%20config%20%3D%20%7B%0A%20%20%20%20environmental%3A%22production%22%2C//production%20%u751F%u4EA7%20%20test%20%u6D4B%u8BD5%0A%20%20%20%20webUrl%3A%22/web/onlineReport/jsp/%22%2C%20//%20%u9884%u751F%u4EA7%u73AF%u5883%u89E3%u5F00%0A%20%20%20%20url%3A%22%22%2C//%20%u5F00%u53D1%u73AF%u5883%u914D%u7F6E%u8DE8%u57DF%u8BBE%u7F6E%20%20//%20%u5F00%u53D1%u73AF%u5883%0A%20%20%20%20value%3A%27%27%2C//%u52A0%u5BC6token%0A%09%20%20nsrsbq%3A%27%27%2C%0A%20%20%20%20spreadUrl%3A%22http%3A//sbjs.tjsat.gov.cn%22%2C//%20%u5C40%u7AEF%u751F%u4EA7%20%u503C%u4E3A%u7A7A%20%20%u5176%u4F59%u5168%u90E8%u6307%u5411%u5728%u7EBF%u7684%u57DF%u540D%0A%20%20%20%20ssfwptPage%3A%22/taxservicedesk/index.html%23/taxTableList%22%2C//%20%u6D89%u7A0E%u670D%u52A1%u5E73%u53F0%u586B%u62A5%u9875%u9762%u5730%u5740%20%u6708%u5B63%u62A5%0A%20%20%20%20yearTaxTable%3A%22/taxservicedesk/index.html%23/yearTaxTable%22%2C//%20%u6D89%u7A0E%u670D%u52A1%u5E73%u53F0%u586B%u62A5%u9875%u9762%u5730%u5740%20%u5E74%u62A5%0A%20%20%20%20zhsbPage%3A%22/taxservicedesk/index.html%23/syntheticalReport%22%2C//%20%u6D89%u7A0E%20%u7EFC%u5408%u7533%u62A5%u9875%u9762%0A%20%20%20%20taxFormComponent%3A%22/web/taxFormComponent/index.html%3Fparam%3D%22%2C//%20%u6D89%u7A0E%u670D%u52A1%u5E73%u53F0%u586B%u62A5%u9875%u9762%u5730%u5740%0A%20%20%20%20ccxwsTaxTable%3A%22/web/tax-plugin/index.html%22%2C//%u8D22%u4EA7%u884C%u4E3A%u7A0E%20%u7533%u62A5%20%u8DF3%u8F6C%u9875%u9762%0A%20%20%20%20collectPage%3A%22/propertybehaviortax/index.html%23/buttonFrame%22%2C//%u8D22%u4EA7%u884C%u4E3A%u7A0E%20%u91C7%u96C6%20%u8DF3%u8F6C%u586B%u62A5%u9875%u9762%0AtableBridge%3A%20%22/tableDisplayBusiness/index.html%23/taxRelated%22%2C%20//%u7A0E%u88682.0%20%u7A0E%u79CD%u5F00%u8868%u5C55%u793A%u9875%u9762%0A%7D"))
if (config.environmental == 'test') {
prefix = "/web";
config.ccxwsTaxTable = "http://dev-web.htyfw.com.cn/page/property_tax_plugin_web/index.html";
......
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