Commit 68aff400 authored by zqm's avatar zqm

1.优化2.0令牌名称

parent c3fd3255
......@@ -9,7 +9,7 @@ var initpage;
var nbbd10414 = "";
var nbbd10420 = "";
var prefix = "";
$(function () {
$(function() {
if (config.environmental == 'test') {
prefix = "/web";
} else if (config.environmental == 'production') {
......@@ -31,8 +31,10 @@ function getInitTable() {
sbsq: '',
pzzlDm: getUrlParam("pzzlDm")
},
success: function (data) { //客户端jquery预先定义好的callback函数,成功获取跨域服务器上的json数据后,会动态执行这个callback函数
success: function(data, status, xhr) { //客户端jquery预先定义好的callback函数,成功获取跨域服务器上的json数据后,会动态执行这个callback函数
hideLoading();
var authorization_sbzj2 = xhr.getResponseHeader("Encryption")
sessionStorage.setItem("authorization_sbzj2", authorization_sbzj2);
var companyInfo = data;
$("#djxh").attr("value", companyInfo.djxh);
if (companyInfo.success) {
......@@ -63,7 +65,7 @@ function getInitTable() {
// 弹出错误对话框
}
},
error: function (xhr) {
error: function(xhr) {
//jsonp 方式此方法不被触发
console.log("=======error======================")
}
......@@ -100,13 +102,13 @@ function initPage(companyInfo) {
* @author ygy
* @date 2018/12/16 20:30
*/
var taxAmendGrid = function (ddt) {
var taxAmendGrid = function(ddt) {
var declarationDateStart = $("#declarationDateStart").val();
var declarationDateEnd = $("#declarationDateEnd").val();
declareDate = declarationDateStart + " " + declarationDateEnd; // 临时存储date 可能用于时间比对,赋值给时间全局变量
var id = "#taxAmendGrid";
var buttonHtml = "更正申报";
var order = ["bblxMc", "djxh","zgswskfjMc","sbrq", "skssqq", "skssqz", "ybtse", "do"];
var order = ["bblxMc", "djxh", "zgswskfjMc", "sbrq", "skssqq", "skssqz", "ybtse", "do"];
var headerList = [{
name: "序号",
width: "3%"
......@@ -136,7 +138,8 @@ function initPage(companyInfo) {
}, {
name: "操作",
width: "10%"
}];
}
];
//渲染表
getTableDeclaration(id, order, headerList, ddt, buttonHtml);
}
......@@ -147,7 +150,7 @@ function initPage(companyInfo) {
* @author ygy
* @date 2018/12/16 20:31
*/
var getTableDeclaration = function (id, order, headerList, ddt, buttonHtml) {
var getTableDeclaration = function(id, order, headerList, ddt, buttonHtml) {
var tableObj = {
id: id, //tabel父元素的id
autoHeight: 10,
......@@ -164,7 +167,7 @@ function initPage(companyInfo) {
},
jsonReady: ddt,
callback: function (data, node) {
callback: function(data, node) {
data.operateType = '4';
data.sbbz = '4';
data.value = config.value;
......@@ -174,30 +177,30 @@ function initPage(companyInfo) {
};
data.fillingFlag = "corrections" // 填报标记
data.saveUserId = "zxtb"; // 用户id
data.zjhm = zjhm//证件号码
data.zjhm = zjhm //证件号码
window.mlistener.selectRowData = data;
if (yearBblxDm.indexOf(data.bblxDm) == -1) {
window.open(prefix + config.ssfwptPage, '_blank');
} else {
if(data.bblxDm=='10414'&&nbbd10414!='Y'){
if (data.bblxDm == '10414' && nbbd10414 != 'Y') {
myAlert("提示", "尊敬的纳税人:为了保证更正数据的准确性,只有在本系统申报的企业才可以进行更正操作。您未在本系统申报,不能在本系统更正。", "确定");
}else if(data.bblxDm=='10420'&&nbbd10420!='Y'){
} else if (data.bblxDm == '10420' && nbbd10420 != 'Y') {
myAlert("提示", "尊敬的纳税人:为了保证更正数据的准确性,只有在本系统申报的企业才可以进行更正操作。您未在本系统申报,不能在本系统更正。", "确定");
}else{
} else {
data.saveUserId = "zxtb_singleReport"; // 用户id
data.userId = "zxtb"; // userId
window.open(prefix + config.yearTaxTable, '_blank');
}
}
Object.defineProperty(mlistener, 'returnSelectRowData', {
set: function (val) {
setTimeout(function () {
set: function(val) {
setTimeout(function() {
param = { //根据后台接收方式进行修改
djxh: companyInfo.djxh, //登记序号
sbrqq: durationOfTaxStart, // 申报日期起
sbrqz: durationOfTaxEnd, // 申报日期止
gzCacheKey: companyInfo.gzCacheKey, //登记序号
zjhm:zjhm//证件号码
zjhm: zjhm //证件号码
}
getTaxAmendData(param);
}, 1000);
......@@ -211,7 +214,7 @@ function initPage(companyInfo) {
data.gzCacheKey = companyInfo.gzCacheKey;
data.checkTime = false;
if (data.bblxDm === '11602') {
var List = companyInfo.gzTaxInfos.filter(function (item) {
var List = companyInfo.gzTaxInfos.filter(function(item) {
return item.bblxDm == '10101' || item.bblxDm == '10102'
})
if (List.length === 0) {
......@@ -247,7 +250,7 @@ function initPage(companyInfo) {
* @date 2018/12/16 20:56
*/
$("#getAmendData").click(function () {
$("#getAmendData").click(function() {
var declarationDateStart = $("#declarationDateStart").val();
var declarationDateEnd = $("#declarationDateEnd").val();
var declarationDate = " ";
......@@ -268,7 +271,7 @@ function initPage(companyInfo) {
/**
* 获取的源数据进行数据处理
*/
var handleSourceData = function (temporaryDate, durationOfTaxStart, durationOfTaxEnd) {
var handleSourceData = function(temporaryDate, durationOfTaxStart, durationOfTaxEnd) {
// 遍历缓存数据,将符合条件的存储到新数组中(时间,申报表名称)
newData = [];
if (!durationOfTaxStart && !durationOfTaxEnd) {
......@@ -297,7 +300,7 @@ function initPage(companyInfo) {
* @date 2018/12/16 21:10
*/
var url = companyInfo.config.url;
var getTaxAmendData = function (param) {
var getTaxAmendData = function(param) {
param.value = config.value;
// TODO 开始加载等待动画
showLoading();
......@@ -305,8 +308,9 @@ function initPage(companyInfo) {
url: url + "/online/amend/getPzzlList",
data: param,
type: "POST",
dataType: "JSON"
}).done(function (data) {
dataType: "JSON",
headers: { 'Encryption': sessionStorage.getItem("authorization_sbzj2") },
}).done(function(data) {
if (data.success) {
zjhm = data.bean.zjhm
sourceData = data.bean.gzTaxInfos;
......@@ -316,7 +320,7 @@ function initPage(companyInfo) {
if (newData.length == 0) {
alertInfo("选择区间暂无数据");
}
sourceData.map(function (item) {
sourceData.map(function(item) {
item.ybtse = Number(item.ybtse)
})
companyInfo = data.bean;
......@@ -331,7 +335,7 @@ function initPage(companyInfo) {
alertWarning(data.returnMessage);
}
}
}).always(function (data) {
}).always(function(data) {
hideLoading();
});
......@@ -342,7 +346,7 @@ function initPage(companyInfo) {
* @author ygy
* @date 2018/12/17 13:58
*/
var taxAmendPaging = function (id, data) {
var taxAmendPaging = function(id, data) {
$("#taxAmendPaging").remove();
var html = '<div style="float:right;margin-right: 15px;" id="taxAmendPaging" class="page_divContainer">' +
'<div class="div-float"></div>';
......@@ -351,7 +355,7 @@ function initPage(companyInfo) {
pageNo: 1, //开始时选中的页数
pageSize: initPagingNum, //每页条数
totalSize: newData.length, //总条数
callback: function (num, num2) {
callback: function(num, num2) {
num = parseInt(num);
num2 = parseInt(num2);
if (parseInt(num2) != initPagingNum) {
......@@ -372,7 +376,7 @@ function initPage(companyInfo) {
* @param {默认第一页码} page
* @param {每页默认多少条} num
*/
var pagingDataFun = function (data, page, num) {
var pagingDataFun = function(data, page, num) {
pagingData = []; // 调用该方法,就清空原数组的数据
if (num >= data.length) {
pagingData = data;
......
......@@ -30,8 +30,8 @@ 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") {
......@@ -355,7 +355,7 @@ function initPage(companyInfo) {
data: param,
type: "POST",
dataType: "JSON",
headers: { 'Authorization': sessionStorage.getItem("Authorization") },
headers: { 'Encryption': sessionStorage.getItem("authorization_sbzj2") },
}).done(function(data) {
if (data.success) {
companyInfo = data.content;
......
......@@ -28,8 +28,8 @@ 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) {
tool.hjDialog(companyInfo.bean.djxh)
......@@ -94,7 +94,7 @@ function getJjkjTag(djxh, nsrsbq) {
type: "post",
url: config.url + "/online/zxtb/get_yffyjjkcbz",
dataType: "json", // 请求方式为jsonp
headers: { 'Authorization': sessionStorage.getItem("Authorization") },
headers: { 'Encryption': sessionStorage.getItem("authorization_sbzj2") },
// async: false
data: {
djxh: djxh,
......@@ -337,7 +337,7 @@ function initPage(companyInfo) {
data: param,
type: "POST",
dataType: "JSON",
headers: { 'Authorization': sessionStorage.getItem("Authorization") },
headers: { 'Encryption': sessionStorage.getItem("authorization_sbzj2") },
}).done(function(data) {
if (data.success) {
if (data.bean.url == "error.jsp") {
......
......@@ -38,8 +38,8 @@ 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) {
......@@ -361,7 +361,7 @@ function initPage(companyInfo) {
data: param,
type: "POST",
dataType: "JSON",
headers: { 'Authorization': sessionStorage.getItem("Authorization") },
headers: { 'Encryption': sessionStorage.getItem("authorization_sbzj2") },
}).done(function(data) {
if (data.success) {
drawGrid(data.bean);
......@@ -532,12 +532,12 @@ function initPage(companyInfo) {
var changeDate = function(obj, dp) {
date = dp.cal.getNewDateStr();
nowDate = date;
getTaxOverdue(date, "N","1");
getTaxOverdue(date, "N", "1");
};
var refresh = function() {
myConfirm("消息", "您确定需要重置申报清册吗?点击确定继续", "确定", "取消", function() {
getTaxOverdue(nowDate, "Y","1");
getTaxOverdue(nowDate, "Y", "1");
});
};
/**
......
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