Commit 64a0fdf9 authored by 彭令令's avatar 彭令令

合并optimize分支

parent 9ee59de7
......@@ -10,7 +10,7 @@ var nbbd10414 = "";
var nbbd10420 = "";
var prefix = "";
$(function() {
if (config.environmental == 'test' || config.environmental =='preProduce') {
if (config.environmental == 'test' || config.environmental == 'preProduce') {
prefix = "/web";
} else if (config.environmental == 'production') {
prefix = "/web/online";
......@@ -39,6 +39,7 @@ function getInitTable() {
$("#djxh").attr("value", companyInfo.djxh);
if (companyInfo.success) {
zjhm = companyInfo.bean.zjhm
sfyhzctsBz = companyInfo.bean.sfyhzctsBz
// var skssqz = companyInfo.bean.sbqz.replace('-','')
// if (companyInfo.bean.sfyhzctsBz == 'Y'&&skssqz<='20210331') {
// myAlert("提示", "尊敬的纳税人、缴费人,为进一步巩固拓展减税降费成效,助力市场主体纾困解难,对部分2020年底到期税费优惠政策(不包括社会保险费),您可暂按原政策文件规定申报享受优惠(原减免性质代码可继续使用)。详细情况可咨询主管税务分局、税务所或12366纳税服务热线。感谢您的理解与支持!!", "确定");
......@@ -207,6 +208,34 @@ function initPage(companyInfo) {
}, 1000);
}
})
} else if (data.sourceFlag == "ssfwpt_sbzj_version_2") { //税表组件2.0
window.mlistener = {
selectRowData: {},
urlList: {
getMenu: '/tax_service/getBbLb', //菜单接口
openTable: "/tax_service/open_table", //开表接口
getData: "/tax_service/get_data", //提取数据接口
saveTable: "/tax_service/save_single_sbb_info", //保存
deleteTable: "/tax_service/delete_single_sbb_info", //删除
checkTaxTable: "/tax_service/report_data_validate", //表间校验
declareTable: "/tax_service/declare", //申报
downloadFile: "/tax_service/load_declare_file", //下载申报文件接口
correctTax: "/tax_service/get_gz_tax_and_declare" //更正接口
}
};
data.sfyhzctsBz = sfyhzctsBz //首次进表标志
data.fillingFlag = "corrections" // 填报标记
data.flag = '' //清算标志 1是清算,空是正常开表
window.mlistener.selectRowData = data;
var openUrl = prefix + config.tableBridge; //测试环境
window.open(openUrl, '_blank');
Object.defineProperty(mlistener, 'returnSelectRowData', {
set: function(val) {
setTimeout(function() {
getTaxDeclaration(sbqDate, "N", '2');
}, 1000);
}
})
} else {
//TODO 跳转页面
data.djxh = companyInfo.djxh;
......@@ -310,7 +339,9 @@ function initPage(companyInfo) {
data: param,
type: "POST",
dataType: "JSON",
headers: { 'Encryption': sessionStorage.getItem("authorization_sbzj2") },
headers: {
'Encryption': sessionStorage.getItem("authorization_sbzj2")
},
}).done(function(data) {
if (data.success) {
zjhm = data.bean.zjhm
......
......@@ -287,6 +287,7 @@ function initPage(companyInfo) {
downloadFile: "/tax_service/load_declare_file" //下载申报文件接口
}
};
data.fillingFlag = "cancellation" // 填报标记
data.flag = '1' //清算标志 1是清算,空是正常开表
window.mlistener.selectRowData = data;
var openUrl = prefix + config.tableBridge; //测试环境
......
......@@ -3,13 +3,13 @@ var sbqDate = '';
var djxh = "";
var taxInfos = [];
var Authorization = ""
// var zhsbPzzl = "10101|10102|11602|10401|10402|11901|11503|10902";
// var zhsbPzzl = "10101|10102|11602|10401|10402|11901|11503|10902";
var zhsbPzzl = "10101|10102|11602|10401|10402|10110|10902|10112|10113";
// 10110:房产税 10902:印花税 10112:城镇土地使用税 10113:土地增值税
var prefix = "";
$(function () {
if (config.environmental == 'test' || config.environmental =='preProduce') {
$(function() {
if (config.environmental == 'test' || config.environmental == 'preProduce') {
prefix = "/web";
} else if (config.environmental == 'production') {
prefix = "/web/online";
......@@ -33,8 +33,10 @@ function getInitTable() {
// beforeSend:function(){
// myAlert("提示", "正在获取初始化信息", "确定")
// },
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);
//el表达式变jqa
// $("#token").attr("value","");
if (data.code == '99') {
......@@ -86,7 +88,7 @@ function getInitTable() {
config.return = true;
initpage = initPage(companyInfo.bean);
if (skssq == '20210930') {
getJjkjTag(djxh,companyInfo.bean.sbsq.replace(/\-/g, ""))
getJjkjTag(djxh, companyInfo.bean.sbsq.replace(/\-/g, ""))
}
} else {
hideLoading();
......@@ -104,17 +106,17 @@ function getInitTable() {
initpage = initPage(companyInfo.bean);
// 弹出错误对话框
}
$("#getInputValue").on("focus", function () {
$("#getInputValue").on("focus", function() {
WdatePicker({
isShowClear: false,
dateFmt: 'yyyy-MM',
onpicking: function (dp) {
onpicking: function(dp) {
initpage.changeDate(this, dp);
}
});
});
},
error: function (xhr) {
error: function(xhr) {
hideLoading();
//jsonp 方式此方法不被触发
console.log("=======error======================")
......@@ -123,20 +125,21 @@ function getInitTable() {
}
// pll 所得税弹框
// 获取研发费用加计扣减标志
function getJjkjTag(djxh,nsrsbq) {
function getJjkjTag(djxh, nsrsbq) {
$.ajax({
type: "post",
url: config.url + "/online/zxtb/get_yffyjjkcbz",
dataType: "json", // 请求方式为jsonp
headers: { 'Encryption': sessionStorage.getItem("authorization_sbzj2") },
// async: false
data: {
djxh: djxh,
nsrsbq:nsrsbq
nsrsbq: nsrsbq
},
success: function (data) { //客户端jquery预先定义好的callback函数,成功获取跨域服务器上的json数据后,会动态执行这个callback函数
success: function(data) { //客户端jquery预先定义好的callback函数,成功获取跨域服务器上的json数据后,会动态执行这个callback函数
hideLoading();
var companyInfo = data;
if (companyInfo.returnCode=='00') {
if (companyInfo.returnCode == '00') {
// console.log('9月7号这个接口返回成功啦!!!!')
if (companyInfo.content == 'Y') {
myAlert("提示", "按照最新政策规定,企业(负面清单行业除外)自2021年三季度预缴开始,可就前三季度研发费用申报享受加计扣除。同时,制造业享受研发费用加计扣除比例由75%提高到100%。", "确定");
......@@ -151,7 +154,7 @@ function getJjkjTag(djxh,nsrsbq) {
// 弹出错误对话框
}
},
error: function (xhr) {
error: function(xhr) {
hideLoading();
//jsonp 方式此方法不被触发
console.log("=======error======================")
......@@ -180,7 +183,7 @@ function initPage(companyInfo) {
/**
* 展示税种申报信息
*/
var showTax = function (taxInfo) {
var showTax = function(taxInfo) {
if (taxInfo.length > 0) {
for (var i = 0; i < taxInfo.length; i++) {
if (taxInfo[i].sbrq) {
......@@ -222,7 +225,7 @@ function initPage(companyInfo) {
* @param {*} ddt
* @param {*} buttonHtml
*/
var getTableDeclaration = function (id, order, headerList, ddt, buttonHtml, promptStatement) {
var getTableDeclaration = function(id, order, headerList, ddt, buttonHtml, promptStatement) {
var tableObj = {
id: id, //tabel父元素的id
autoHeight: ddt.length > 0 ? 10 : "",
......@@ -240,7 +243,7 @@ function initPage(companyInfo) {
pageSize: ddt.length
},
jsonReady: ddt,
callback: function (data, node) {
callback: function(data, node) {
window.mlistener = {
zhsbData: {
token: getUrlParam("token"),
......@@ -249,13 +252,13 @@ function initPage(companyInfo) {
taxInfos: taxInfos,
value: config.value,
zjhm: zjhm,
Authorization:Authorization
Authorization: Authorization
},
};
window.open(prefix + config.zhsbPage, '_blank');
Object.defineProperty(mlistener, 'returnSelectRowData', {
set: function (val) {
setTimeout(function () {
set: function(val) {
setTimeout(function() {
getTaxDeclaration(sbqDate, "N", '2', true);
}, 1000);
}
......@@ -277,7 +280,7 @@ function initPage(companyInfo) {
if (companyInfo) {
url = companyInfo.config.url;
}
var getTaxDeclaration = function (date, type, refreshSbzt, update) {
var getTaxDeclaration = function(date, type, refreshSbzt, update) {
// TODO 开始加载等待动画
showLoading();
var param = {
......@@ -296,7 +299,7 @@ function initPage(companyInfo) {
// beforeSend:function(){
// myAlert("提示", "正在获取初始化信息", "确定")
// },
}).done(function (data) {
}).done(function(data) {
if (data.success) {
zjhm = data.bean.zjhm
if (data.bean.url == "error.jsp") {
......@@ -339,8 +342,8 @@ function initPage(companyInfo) {
},
};
Object.defineProperty(mlistener, 'returnSelectRowData', {
set: function (val) {
setTimeout(function () {
set: function(val) {
setTimeout(function() {
getTaxDeclaration(sbqDate, "N", '2', true);
}, 1000);
}
......@@ -350,7 +353,7 @@ function initPage(companyInfo) {
myAlert("提示", "重置清册成功", "确定")
}
if (skssq == '20210930') {
getJjkjTag(djxh,sbqDate.replace(/\-/g, ""))
getJjkjTag(djxh, sbqDate.replace(/\-/g, ""))
}
} else {
if (data.errmsg != undefined) {
......@@ -359,23 +362,23 @@ function initPage(companyInfo) {
alertWarning(data.returnMessage);
}
}
}).always(function (data) {
}).always(function(data) {
hideLoading();
});
};
/**
* 隐藏modal
*/
var closeModal = function () {
var closeModal = function() {
$('#ybName').html("");
$('#dName').html("");
$('#myMask').hide();
$('#myModal').hide();
}
var drawGrid = function (bean) {
var drawGrid = function(bean) {
//两个表合成一个表
$.each(bean.financialInfos, function (i, item) {
$.each(bean.financialInfos, function(i, item) {
bean.taxInfos.push(item);
});
if (bean.taxInfos.length == 0) {
......@@ -392,23 +395,23 @@ function initPage(companyInfo) {
* @param {*} obj
* @param {*} dp
*/
var changeDate = function (obj, dp) {
var changeDate = function(obj, dp) {
date = dp.cal.getNewDateStr();
nowdate = date; // 给缓存时间赋值
// 加了一个延时,时间改变后时间框没有收起隐藏就加载数据,没有找到好的解决办法,暂时用延时处理
sbqDate = date
setTimeout(function () {
setTimeout(function() {
getTaxDeclaration(date, "N", '1', false);
}, 50);
};
var refresh = function () {
myConfirm("消息", "您确定需要重置申报清册吗?点击确定继续", "确定", "取消", function () {
var refresh = function() {
myConfirm("消息", "您确定需要重置申报清册吗?点击确定继续", "确定", "取消", function() {
getTaxDeclaration(nowdate, "Y", '1', false);
});
};
//申报方式 当iszzsybjc=01同时pzzlDm=010101时,调用改方法
var declarationMethod = function (statu) {
var declarationMethod = function(statu) {
submitData.ybjcState = statu;
submitData.value = config.value;
//需要判断在线还是税表的开关
......@@ -423,8 +426,8 @@ function initPage(companyInfo) {
window.mlistener.selectRowData = submitData;
window.open(prefix + config.ssfwptPage, '_blank');
Object.defineProperty(mlistener, 'returnSelectRowData', {
set: function (val) {
setTimeout(function () {
set: function(val) {
setTimeout(function() {
getTaxDeclaration(sbqDate, "N", '2', true);
}, 1000);
}
......@@ -443,7 +446,7 @@ function initPage(companyInfo) {
data: {
data: JSON.stringify(submitData)
},
success: function (data) {
success: function(data) {
hideLoading()
if (data.code == 99 || data.code == "99") {
if (data.errmsg != undefined) {
......@@ -474,7 +477,7 @@ function initPage(companyInfo) {
form.find("#changeForm_data").val(JSON.stringify(submitData));
form.submit();
},
error: function (xhr) {
error: function(xhr) {
//jsonp 方式此方法不被触发
if (data.returnMessage == undefined) {
if (data.returnMessage == undefined) {
......@@ -498,7 +501,7 @@ function initPage(companyInfo) {
* @param {} params
*/
$("#reset,#reset1").on("click", refresh);
$("#goRecord").click(function () {
$("#goRecord").click(function() {
//TODO 调用备案接口
});
// 格式化后台返回的时间
......@@ -508,7 +511,7 @@ function initPage(companyInfo) {
drawGrid(companyInfo);
}
//页面出现滚动条,监听滚动条变化将高赋值给模态框
window.onscroll = function () {
window.onscroll = function() {
$("#myModal").css("top", $(document).scrollTop() + 235);
}
return {
......
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