Skip to content

Z
zxtb_to_ssfwpt
Commit 2b32dc8b authored by 彭令令's avatar 彭令令
Browse files
Options

Merge branch 'optimize' into produce 

# Conflicts:解决冲突
#	jsp/declare/index.html
#	static/biz/cancellation_grid.js
#	static/biz/declare_cxs_grid.js
#	static/biz/declare_grid.js
#	static/biz/overdue_grid.js
parents 055e84eb 3db1b1c5
Expand all Show whitespace changes
Inline Side-by-side
Showing with 936 additions and 774 deletions
jsp/declare/index.html
View file @ 2b32dc8b
......@@ -134,5 +134,4 @@
// // 弹出错误对话框
// }
</script>
</html>
\ No newline at end of file
static/biz/amend_grid.js
View file @ 2b32dc8b
This diff is collapsed.
static/biz/cancellation_grid.js
View file @ 2b32dc8b
......@@ -40,6 +40,7 @@ function getInitTable() {
if (companyInfo.content.sfyhzctsBz == 'Y') {
myAlert("提示", "尊敬的纳税人、缴费人，为进一步巩固拓展减税降费成效，助力市场主体纾困解难，对部分2020年底到期税费优惠政策（不包括社会保险费），您可暂按原政策文件规定申报享受优惠（原减免性质代码可继续使用）。详细情况可咨询主管税务分局、税务所或12366纳税服务热线。感谢您的理解与支持！！", "确定");
}
// tool.hjDialog(companyInfo.content.djxh)出口退税暂不上线
config.value = companyInfo.content.value // 不一定对
companyInfo.content.config = config
initpage = initPage(companyInfo.content);
......@@ -282,10 +283,8 @@ function initPage(companyInfo) {
deleteTable: "/tax_service/delete_single_sbb_info", //删除
declareTable: "/tax_service/declare", //申报
downloadFile: "/tax_service/load_declare_file" //下载申报文件接口
}
};
data.fillingFlag = "cancellation" // 填报标记
data.flag = '1' //清算标志 1是清算,空是正常开表
window.mlistener.selectRowData = data;
var openUrl = prefix + config.tableBridge; //测试环境
......@@ -354,7 +353,7 @@ function initPage(companyInfo) {
data: param,
type: "POST",
dataType: "JSON",
headers: { 'Authorization': sessionStorage.getItem("authorization_sbzj2") },
headers: { 'Encryption': sessionStorage.getItem("authorization_sbzj2") },
}).done(function(data) {
if (data.success) {
companyInfo = data.content;
......@@ -457,9 +456,9 @@ function initPage(companyInfo) {
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" //下载申报文件接口
}
};
data.fillingFlag = "cancellation" // 填报标记
......
static/biz/declare-overdue_grid.js
View file @ 2b32dc8b
......@@ -47,6 +47,7 @@ function getInitTable() {
if (companyInfo.bean.sfyhzctsBz == 'Y') {
myAlert("提示", "尊敬的纳税人、缴费人，为进一步巩固拓展减税降费成效，助力市场主体纾困解难，对部分2020年底到期税费优惠政策（不包括社会保险费），您可暂按原政策文件规定申报享受优惠（原减免性质代码可继续使用）。详细情况可咨询主管税务分局、税务所或12366纳税服务热线。感谢您的理解与支持！！", "确定");
}
// tool.hjDialog(companyInfo.bean.djxh)出口退税暂不上线
companyInfo.bean.config = config
companyInfo.bean.return = true;
initpage = initPage(companyInfo.bean);
......
static/biz/declare_cxs_grid.js
View file @ 2b32dc8b
......@@ -42,6 +42,7 @@ function getInitTable() {
} else {
yhsSyxx = {};
}
// tool.hjDialog(companyInfo.content.djxh)出口退税暂不上线
initpage = initPage(companyInfo.content);
} else {
hideLoading();
......
static/biz/declare_grid.js
View file @ 2b32dc8b
......@@ -4,7 +4,6 @@ var sbqDate = '';
var yearBblxDm = ['10414', '10420'];
var sfyhzctsBz = "";
var prefix = "";
var operateType = ""
$(function() {
if (config.environmental == 'test') {
prefix = "/web";
......@@ -33,7 +32,7 @@ function getInitTable() {
sessionStorage.setItem("authorization_sbzj2", authorization_sbzj2);
var companyInfo = data;
if (companyInfo.success) {
operateType = companyInfo.bean.operateType;
// tool.hjDialog(companyInfo.bean.djxh)出口退税暂不上线
zjhm = companyInfo.bean.zjhm
sfyhzctsBz = companyInfo.bean.sfyhzctsBz
if (companyInfo.bean.sfyhzctsBz == 'Y') {
......@@ -57,7 +56,6 @@ function getInitTable() {
} else {
hideLoading();
operateType = companyInfo.bean.operateType;
if (data.errmsg != undefined) {
alertWarning(data.errmsg);
} else {
......@@ -96,7 +94,7 @@ function getJjkjTag(djxh, nsrsbq) {
type: "post",
url: config.url + "/online/zxtb/get_yffyjjkcbz",
dataType: "json", // 请求方式为jsonp
headers: { 'Authorization': sessionStorage.getItem("authorization_sbzj2") },
headers: { 'Encryption': sessionStorage.getItem("authorization_sbzj2") },
// async: false
data: {
djxh: djxh,
......@@ -264,6 +262,7 @@ function initPage(companyInfo) {
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" //下载申报文件接口
}
......@@ -327,7 +326,7 @@ function initPage(companyInfo) {
showLoading();
var param = {
djxh: djxh,
operateType: operateType,
operateType: '3',
sbsq: date,
isFresh: type.toUpperCase() == "Y",
pzzlDm: companyInfo.pzzlDm,
......@@ -338,7 +337,7 @@ function initPage(companyInfo) {
data: param,
type: "POST",
dataType: "JSON",
headers: { 'Authorization': sessionStorage.getItem("authorization_sbzj2") },
headers: { 'Encryption': sessionStorage.getItem("authorization_sbzj2") },
}).done(function(data) {
if (data.success) {
if (data.bean.url == "error.jsp") {
......@@ -540,9 +539,9 @@ function initPage(companyInfo) {
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" //下载申报文件接口
}
};
submitData.fillingFlag = "normal" // 填报标记
......
static/biz/declare_union_grid.js
View file @ 2b32dc8b
......@@ -36,6 +36,7 @@ function getInitTable() {
if (companyInfo.bean.sfyhzctsBz == 'Y') {
myAlert("提示", "尊敬的纳税人、缴费人，为进一步巩固拓展减税降费成效，助力市场主体纾困解难，对部分2020年底到期税费优惠政策（不包括社会保险费），您可暂按原政策文件规定申报享受优惠（原减免性质代码可继续使用）。详细情况可咨询主管税务分局、税务所或12366纳税服务热线。感谢您的理解与支持！！", "确定");
}
// tool.hjDialog(companyInfo.bean.djxh)出口退税暂不上线
config.value = companyInfo.bean.value
companyInfo.bean.config = config
companyInfo.bean.return = true; /* @Author ygy @Date 10:12 2020/7/8 @Description 前端判断接口成功返回数据标记用于区分是否执行初始化table方法*/
......
static/biz/overdue_grid.js
View file @ 2b32dc8b
......@@ -48,6 +48,7 @@ function getInitTable() {
if (companyInfo.bean.sfyhzctsBz == 'Y') {
myAlert("提示", "尊敬的纳税人、缴费人，为进一步巩固拓展减税降费成效，助力市场主体纾困解难，对部分2020年底到期税费优惠政策（不包括社会保险费），您可暂按原政策文件规定申报享受优惠（原减免性质代码可继续使用）。详细情况可咨询主管税务分局、税务所或12366纳税服务热线。感谢您的理解与支持！！", "确定");
}
// tool.hjDialog(companyInfo.bean.djxh)出口退税暂不上线
companyInfo.bean.config = config
companyInfo.bean.return = true;
AuthorizationBz = companyInfo.bean.value
......@@ -266,7 +267,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: {
......@@ -275,9 +276,9 @@ function initPage(companyInfo) {
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" //下载申报文件接口
}
};
data.fillingFlag = "overdue" // 填报标记
......@@ -360,7 +361,7 @@ function initPage(companyInfo) {
data: param,
type: "POST",
dataType: "JSON",
headers: { 'Authorization': sessionStorage.getItem("authorization_sbzj2") },
headers: { 'Encryption': sessionStorage.getItem("authorization_sbzj2") },
}).done(function(data) {
if (data.success) {
drawGrid(data.bean);
......@@ -435,9 +436,9 @@ function initPage(companyInfo) {
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" //下载申报文件接口
}
};
data.fillingFlag = "overdue" // 填报标记
......@@ -531,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");
});
};
/**
......
static/biz/syntheticalReport_grid.js
View file @ 2b32dc8b
......@@ -52,6 +52,7 @@ function getInitTable() {
if (data.bean.sfyhzctsBz == 'Y') {
myAlert("提示", "尊敬的纳税人、缴费人，为进一步巩固拓展减税降费成效，助力市场主体纾困解难，对部分2020年底到期税费优惠政策（不包括社会保险费），您可暂按原政策文件规定申报享受优惠（原减免性质代码可继续使用）。详细情况可咨询主管税务分局、税务所或12366纳税服务热线。感谢您的理解与支持！！", "确定");
}
// tool.hjDialog(data.bean.djxh)出口退税暂不上线
zjhm = data.bean.zjhm
djxh = data.bean.djxh;
sbqDate = data.bean.sbsq;
......
static/biz/zhsbtc_grid.js
View file @ 2b32dc8b
......@@ -40,6 +40,7 @@ function getInitTable() {
if (companyInfo.bean.sfyhzctsBz == 'Y') {
myAlert("提示", "尊敬的纳税人、缴费人，为进一步巩固拓展减税降费成效，助力市场主体纾困解难，对部分2020年底到期税费优惠政策（不包括社会保险费），您可暂按原政策文件规定申报享受优惠（原减免性质代码可继续使用）。详细情况可咨询主管税务分局、税务所或12366纳税服务热线。感谢您的理解与支持！！", "确定");
}
// tool.hjDialog(companyInfo.bean.djxh)出口退税暂不上线
config.value = companyInfo.bean.value
companyInfo.bean.config = config
companyInfo.bean.return = true; /* @Author ygy @Date 10:12 2020/7/8 @Description 前端判断接口成功返回数据标记用于区分是否执行初始化table方法*/
......
static/tools/js/encapsulation.js
View file @ 2b32dc8b
This diff is collapsed.
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