Skip to content

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

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

parents 5822aab5 b651d28a
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 29 deletions
static/biz/amend_grid.js
View file @ 79f5daef
...@@ -100,7 +100,7 @@ function initPage(companyInfo) { ...@@ -100,7 +100,7 @@ function initPage(companyInfo) {
data.fillingFlag = "corrections" // 填报标记 data.fillingFlag = "corrections" // 填报标记
data.saveUserId = "zxtb";// 用户id data.saveUserId = "zxtb";// 用户id
window.mlistener.selectRowData = data; window.mlistener.selectRowData = data;
window.open("/web/taxservicedesk/index.html#/taxTableList",'_blank'); window.open(config.ssfwptPage,'_blank');
}else { }else {
//TODO 跳转页面 //TODO 跳转页面
data.djxh = companyInfo.djxh; data.djxh = companyInfo.djxh;
...@@ -128,6 +128,7 @@ function initPage(companyInfo) { ...@@ -128,6 +128,7 @@ function initPage(companyInfo) {
var requestData = JSON.stringify(data); var requestData = JSON.stringify(data);
var falg = "amend"; var falg = "amend";
showLoading()
$.ajax({ $.ajax({
type: "POST", type: "POST",
// url: url + "/ssfwpt/amend/toGzPzzl", // url: url + "/ssfwpt/amend/toGzPzzl",
...@@ -137,18 +138,20 @@ function initPage(companyInfo) { ...@@ -137,18 +138,20 @@ function initPage(companyInfo) {
data: requestData data: requestData
}, },
success: function (data) { success: function (data) {
hideLoading()
localStorage.setItem("data", requestData); localStorage.setItem("data", requestData);
if (data.url == "../declare/edit.jsp") { if (data.url == "../declare/edit.jsp") {
window.open(companyInfo.config.webUrl+"declare/edit.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(requestData))); window.open(config.webUrl+"declare/edit.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(requestData)));
}else if (data.url == "../declare/yearReport.jsp") { }else if (data.url == "../declare/yearReport.jsp") {
window.open(companyInfo.config.webUrl+"declare/yearReport.html?falg="+'&params=' + encodeURI(JSON.stringify(requestData))); window.open(config.webUrl+"declare/yearReport.html?falg="+'&params=' + encodeURI(JSON.stringify(requestData)));
}else if (data.url == "../declare/yearReportGLB.jsp") { }else if (data.url == "../declare/yearReportGLB.jsp") {
window.open(companyInfo.config.webUrl+"declare/yearReportGLB.html?falg="+'&params=' + encodeURI(JSON.stringify(requestData))); window.open(config.webUrl+"declare/yearReportGLB.html?falg="+'&params=' + encodeURI(JSON.stringify(requestData)));
}else { }else {
window.open(companyInfo.config.webUrl+"error/index.html?falg="+'&params=' + encodeURI(JSON.stringify(requestData))); window.open(config.webUrl+"error/index.html?falg="+'&params=' + encodeURI(JSON.stringify(requestData)));
} }
}, },
error: function(xhr){ error: function(xhr){
hideLoading()
//jsonp 方式此方法不被触发 //jsonp 方式此方法不被触发
console.log("=======error======================") console.log("=======error======================")
} }
......
static/biz/cancellation_grid.js
View file @ 79f5daef
...@@ -133,7 +133,7 @@ function initPage(companyInfo) { ...@@ -133,7 +133,7 @@ function initPage(companyInfo) {
data.fillingFlag = "inventory" // 填报标记 data.fillingFlag = "inventory" // 填报标记
data.saveUserId = "zxtb";// 用户id data.saveUserId = "zxtb";// 用户id
window.mlistener.selectRowData = data; window.mlistener.selectRowData = data;
window.open("/web/taxservicedesk/index.html#/taxTableList",'_blank'); window.open(config.ssfwptPage,'_blank');
}else{ }else{
data.djxh = companyInfo.djxh; data.djxh = companyInfo.djxh;
data.iszzsybjc = companyInfo.iszzsybjc; // 一表申报代码 data.iszzsybjc = companyInfo.iszzsybjc; // 一表申报代码
...@@ -272,11 +272,12 @@ function initPage(companyInfo) { ...@@ -272,11 +272,12 @@ function initPage(companyInfo) {
submitData.fillingFlag = "inventory" // 填报标记 submitData.fillingFlag = "inventory" // 填报标记
data.saveUserId = "zxtb";// 用户id data.saveUserId = "zxtb";// 用户id
window.mlistener.selectRowData = submitData; window.mlistener.selectRowData = submitData;
window.open("/web/taxservicedesk/index.html#/taxTableList",'_blank'); window.open(config.ssfwptPage,'_blank');
}else { }else {
// var form = $("#changeForm"); // var form = $("#changeForm");
// form.find("#changeForm_data").val(JSON.stringify(submitData)); // form.find("#changeForm_data").val(JSON.stringify(submitData));
// form.submit(); // form.submit();
showLoading()
var falg = "declare"; var falg = "declare";
$.ajax({ $.ajax({
type: "POST", type: "POST",
...@@ -287,19 +288,21 @@ function initPage(companyInfo) { ...@@ -287,19 +288,21 @@ function initPage(companyInfo) {
data: JSON.stringify(submitData) data: JSON.stringify(submitData)
}, },
success: function (data) { success: function (data) {
hideLoading()
localStorage.setItem("data",JSON.stringify(submitData)); localStorage.setItem("data",JSON.stringify(submitData));
console.log("请求成功", data) console.log("请求成功", data)
if (data.url == "edit.jsp") { if (data.url == "edit.jsp") {
window.open(companyInfo.config.webUrl+"declare/edit.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(submitData))); window.open(config.webUrl+"declare/edit.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(submitData)));
}else if (data.url == "yearReport.jsp") { }else if (data.url == "yearReport.jsp") {
window.open(companyInfo.config.webUrl+"declare/yearReport.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(submitData))); window.open(config.webUrl+"declare/yearReport.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(submitData)));
}else if (data.url == "yearReportGLB.jsp") { }else if (data.url == "yearReportGLB.jsp") {
window.open(companyInfo.config.webUrl+"declare/yearReportGLB.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(submitData))); window.open(config.webUrl+"declare/yearReportGLB.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(submitData)));
}else { }else {
window.open(companyInfo.config.webUrl+"error/index.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(submitData))); window.open(config.webUrl+"error/index.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(submitData)));
} }
}, },
error: function(xhr){ error: function(xhr){
hideLoading()
//jsonp 方式此方法不被触发 //jsonp 方式此方法不被触发
console.log("=======error======================") console.log("=======error======================")
} }
......
static/biz/declare_grid.js
View file @ 79f5daef
...@@ -96,7 +96,7 @@ function initPage(companyInfo) { ...@@ -96,7 +96,7 @@ function initPage(companyInfo) {
data.fillingFlag = "normal" // 填报标记 data.fillingFlag = "normal" // 填报标记
data.saveUserId = "zxtb";// 用户id data.saveUserId = "zxtb";// 用户id
window.mlistener.selectRowData = data; window.mlistener.selectRowData = data;
window.open("/web/taxservicedesk/index.html#/taxTableList",'_blank'); window.open(config.ssfwptPage,'_blank');
}else { }else {
data.djxh = companyInfo.djxh; data.djxh = companyInfo.djxh;
data.iszzsybjc = companyInfo.iszzsybjc; // 一表申报代码 data.iszzsybjc = companyInfo.iszzsybjc; // 一表申报代码
...@@ -235,12 +235,13 @@ function initPage(companyInfo) { ...@@ -235,12 +235,13 @@ function initPage(companyInfo) {
submitData.fillingFlag = "normal" // 填报标记 submitData.fillingFlag = "normal" // 填报标记
submitData.saveUserId = "zxtb";// 用户id submitData.saveUserId = "zxtb";// 用户id
window.mlistener.selectRowData = submitData; window.mlistener.selectRowData = submitData;
window.open("/web/taxservicedesk/index.html#/taxTableList",'_blank'); window.open(config.ssfwptPage,'_blank');
}else { }else {
//"ssfwpt_zxtb" //"ssfwpt_zxtb"
// var form = $("#changeForm"); // var form = $("#changeForm");
// form.find("#changeForm_data").val(JSON.stringify(submitData)); // form.find("#changeForm_data").val(JSON.stringify(submitData));
// form.submit(); // form.submit();
showLoading()
var falg = "declare"; var falg = "declare";
$.ajax({ $.ajax({
type: "POST", type: "POST",
...@@ -251,21 +252,23 @@ function initPage(companyInfo) { ...@@ -251,21 +252,23 @@ function initPage(companyInfo) {
data: JSON.stringify(submitData) data: JSON.stringify(submitData)
}, },
success: function (data) { success: function (data) {
hideLoading()
console.log("taxInfo:", JSON.stringify(submitData)) console.log("taxInfo:", JSON.stringify(submitData))
localStorage.setItem("data",JSON.stringify(submitData)); localStorage.setItem("data",JSON.stringify(submitData));
if (data.url == "edit.jsp") { if (data.url == "edit.jsp") {
window.open(companyInfo.config.webUrl+"declare/edit.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(submitData))); window.open(config.webUrl+"declare/edit.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(submitData)));
}else if (data.url == "yearReport.jsp") { }else if (data.url == "yearReport.jsp") {
window.open(companyInfo.config.webUrl+"declare/yearReport.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(submitData))); window.open(config.webUrl+"declare/yearReport.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(submitData)));
}else if (data.url == "yearReportGLB.jsp") { }else if (data.url == "yearReportGLB.jsp") {
window.open(companyInfo.config.webUrl+"declare/yearReportGLB.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(submitData))); window.open(config.webUrl+"declare/yearReportGLB.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(submitData)));
}else { }else {
//因为后台不知道返回路径是什么样的就直接改成了else data.url == "error.jsp" //因为后台不知道返回路径是什么样的就直接改成了else data.url == "error.jsp"
window.open(companyInfo.config.webUrl+"error/index.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(submitData))); window.open(config.webUrl+"error/index.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(submitData)));
} }
}, },
error: function(xhr){ error: function(xhr){
//jsonp 方式此方法不被触发 //jsonp 方式此方法不被触发
hideLoading()
console.log("=======error======================") console.log("=======error======================")
} }
}) })
......
static/biz/overdue_grid.js
View file @ 79f5daef
...@@ -137,7 +137,7 @@ function initPage(companyInfo) { ...@@ -137,7 +137,7 @@ function initPage(companyInfo) {
data.fillingFlag = "overdue" // 填报标记 data.fillingFlag = "overdue" // 填报标记
data.saveUserId = "zxtb";// 用户id data.saveUserId = "zxtb";// 用户id
window.mlistener.selectRowData = data; window.mlistener.selectRowData = data;
window.open("/web/taxservicedesk/index.html#/taxTableList",'_blank'); window.open(config.ssfwptPage,'_blank');
}else{ }else{
data.djxh = djxh; data.djxh = djxh;
data.operateType = operateType; data.operateType = operateType;
...@@ -242,11 +242,12 @@ function initPage(companyInfo) { ...@@ -242,11 +242,12 @@ function initPage(companyInfo) {
submitData.fillingFlag = "inventory" // 填报标记 submitData.fillingFlag = "inventory" // 填报标记
data.saveUserId = "zxtb";// 用户id data.saveUserId = "zxtb";// 用户id
window.mlistener.selectRowData = submitData; window.mlistener.selectRowData = submitData;
window.open("/web/taxservicedesk/index.html#/taxTableList",'_blank'); window.open(config.ssfwptPage,'_blank');
}else { }else {
// var form = $("#changeForm"); // var form = $("#changeForm");
// form.find("#changeForm_data").val(JSON.stringify(submitData)); // form.find("#changeForm_data").val(JSON.stringify(submitData));
// form.submit(); // form.submit();
showLoading()
var falg = "declare"; var falg = "declare";
$.ajax({ $.ajax({
type: "POST", type: "POST",
...@@ -257,19 +258,21 @@ function initPage(companyInfo) { ...@@ -257,19 +258,21 @@ function initPage(companyInfo) {
data: JSON.stringify(submitData) data: JSON.stringify(submitData)
}, },
success: function (data) { success: function (data) {
hideLoading()
localStorage.setItem("data",JSON.stringify(submitData)); localStorage.setItem("data",JSON.stringify(submitData));
console.log("请求成功", data) console.log("请求成功", data)
if (data.url == "edit.jsp") { if (data.url == "edit.jsp") {
window.open(companyInfo.config.webUrl+"declare/edit.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(submitData))); window.open(config.webUrl+"declare/edit.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(submitData)));
}else if (data.url == "yearReport.jsp") { }else if (data.url == "yearReport.jsp") {
window.open(companyInfo.config.webUrl+"declare/yearReport.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(submitData))); window.open(config.webUrl+"declare/yearReport.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(submitData)));
}else if (data.url == "yearReportGLB.jsp") { }else if (data.url == "yearReportGLB.jsp") {
window.open(companyInfo.config.webUrl+"declare/yearReportGLB.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(submitData))); window.open(config.webUrl+"declare/yearReportGLB.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(submitData)));
}else { }else {
window.open(companyInfo.config.webUrl+"error/index.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(submitData))); window.open(config.webUrl+"error/index.html?falg="+falg+'&params=' + encodeURI(JSON.stringify(submitData)));
} }
}, },
error: function(xhr){ error: function(xhr){
hideLoading()
//jsonp 方式此方法不被触发 //jsonp 方式此方法不被触发
console.log("=======error======================") console.log("=======error======================")
} }
......
static/config.js
View file @ 79f5daef
...@@ -11,12 +11,18 @@ function getUrlParam (name) { ...@@ -11,12 +11,18 @@ function getUrlParam (name) {
if (r != null) return decodeURIComponent(r[2]); if (r != null) return decodeURIComponent(r[2]);
return null; return null;
} }
// 公共配置 // 公共配置 生产
/*var config = {
webUrl:"http://sbjs.tjsat.gov.cn:18001/web/onlineReport/jsp/", // 测试环境/生产环境
url:"",// 开发环境配置跨域设置 // 开发环境
spreadUrl:"sbjs.tjsat.gov.cn:18001",// 注册地址
ssfwptPage:"/web/taxservicedesk/index.html#/taxTableList",// 涉税服务平台填报页面地址
}*/
//公共配置 本地
var config = { var config = {
// webUrl:"http://sbjs.tjsat.gov.cn:18001/web/onlineReport/jsp/", // 测试环境/生产环境
webUrl:"http://localhost:8088/web/onlineReport/jsp/", // 开发环境 webUrl:"http://localhost:8088/web/onlineReport/jsp/", // 开发环境
url:"",// 开发环境配置跨域设置 // 开发环境 url:"",// 开发环境配置跨域设置 // 开发环境
// url:"",// 开发环境配置跨域设置 // 开发环境// 测试环境/生产环境
spreadUrl:"sbjs.tjsat.gov.cn:18001",// 注册地址 spreadUrl:"sbjs.tjsat.gov.cn:18001",// 注册地址
ssfwptPage:"/web/taxservicedesk/index.html#/taxTableList",// 涉税服务平台填报页面地址
} }
static/js/year/util.js
View file @ 79f5daef
...@@ -139,9 +139,8 @@ function addLeftItem(flag, NBindex) { ...@@ -139,9 +139,8 @@ function addLeftItem(flag, NBindex) {
} }
// selectNb(); // selectNb();
} }
assignmentLeftMuneClick(); assignmentLeftMuneClick();
selectNb(); // selectNb(); /* @Author ygy @Date 16:54 2020/6/29 @Description 年报表切换左侧菜单后样式没有改变*/
if (tableName == 'table_10414_002'){ if (tableName == 'table_10414_002'){
var JDJNBS_ND = GLOBAL_JSON.wsxx.JDJNBS_ND ? GLOBAL_JSON.wsxx.JDJNBS_ND.value : ""; var JDJNBS_ND = GLOBAL_JSON.wsxx.JDJNBS_ND ? GLOBAL_JSON.wsxx.JDJNBS_ND.value : "";
var ZFJGBZDM_ND = GLOBAL_JSON.wsxx.ZFJGBZDM_ND ? GLOBAL_JSON.wsxx.ZFJGBZDM_ND.value : ""; var ZFJGBZDM_ND = GLOBAL_JSON.wsxx.ZFJGBZDM_ND ? GLOBAL_JSON.wsxx.ZFJGBZDM_ND.value : "";
...@@ -152,7 +151,6 @@ function addLeftItem(flag, NBindex) { ...@@ -152,7 +151,6 @@ function addLeftItem(flag, NBindex) {
hideRowCol(index, "row", 42, false); hideRowCol(index, "row", 42, false);
} }
} }
if (tableName == 'table_10414_004'){ if (tableName == 'table_10414_004'){
var tableName_3 = 'table_10414_003'; var tableName_3 = 'table_10414_003';
var sheetIndex_3 = spread.getSheetIndex(tableName_3); var sheetIndex_3 = spread.getSheetIndex(tableName_3);
......
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