Commit e6654841 authored by 于广洋's avatar 于广洋

涉税与在线串联

parent ad03be18
......@@ -80,7 +80,7 @@
<script src="/web/onlineReport/static/tools/js/encapsulation.js?v=1.3"></script>
<script src="/web/onlineReport/static/tools/js/minScroll.js?v=1.1"></script>
<script src="/web/onlineReport/static/tools/js/My97DatePicker/WdatePicker.js?v=1.1"></script>
<script src=""></script>
<script src="/web/onlineReport/static/biz/getJgxxRyxx.js?v=1.0"></script>
<script src="/web/onlineReport/static/biz/amend_grid.js?v=1.0"></script>
<script>
// <!-- // 使用 el 表达式,将返回的信息写到此处,然后调用页面绘制方法绘制页面
......@@ -94,25 +94,17 @@
// -->
var initpage;
$(function(){
getJgxxRyxx();
//
var url = "http://192.168.105.153:8091";
function GetQueryValue(queryName) {
var query = decodeURI(window.location.search.substring(1));
var vars = query.split("&");
for (var i = 0; i < vars.length; i++) {
var pair = vars[i].split("=");
if (pair[0] == queryName) { return pair[1]; }
}
return null;
}
$.ajax({
type: "GET",
type: "post",
url: url + "/ssfwpt/amend/index",
dataType: "json", // 请求方式为jsonp
// async: false,
data: {
djxh: GetQueryValue("djxh"),
nsrsbh: GetQueryValue("nsrsbh"),
djxh: jgxxRyxx.qyxxCacheVoList[0].djxh,
nsrsbh: jgxxRyxx.qyxxCacheVoList[0].nsrsbh,
token: '',
sbsq: '',
pzzlDm: ''
......@@ -123,6 +115,72 @@
var companyInfo = data;
$("#djxh").attr("value", companyInfo.djxh);
if (companyInfo.success) {
companyInfo.bean.gzTaxInfos.push(
{
"sbxxId":"20200612181124bda9492c2fe34faeb3f4f686260363eb",
"ssdabh":"91120225MA05KP981U",
"djxh":"10111258010000000525",
"nsrsbq":"202006",
"nsrmc":"",
"nsqxDm":"06",
"zsxmDm":"10101",
"bblxDm":"10101",
"bblxMc":"增值税纳税申报表(适用于一般纳税人)",
"sksssjq":"20200501",
"sksssjz":"20200531",
"multiPatch":"N",
"nsrsbh":"91120225MA05KP981U",
"sbrq":null,
"sbzt":"N",
"jkzt":"N",
"jkrq":null,
"bczt":"Y",
"sourceFlag":"ssfwpt_sbzj",
"pcDm":1,
"flag":"FLAG_91120225MA05KP981U_10111258010000000525_20200501_20200531_10101_10101_1",
"type":"taxName",
"flKey":"1",
"zgswskfjDm":null,
"hyDm":null,
"sfyczb":"N",
"sbbz":"3",
"qsbz":"N",
"sbjg":null,
"tsxx":null,
"se":null,
"swjgmc":null,
"gzFlag":"0",
"sbuuid":"",
"pzxh":"",
"sbrq1":"",
"yzpzzlDm":"",
"ybtse":"",
"kjzd":"",
"checkTime":false,
"gdsbz":"G",
"initTableArrs":"",
"initTableData":"",
"iszzsybjc":"01",
"nssbq":"202006",
"operateType":"",
"pzzlDm":"10101",
"pzzlMc":"增值税纳税申报表(适用于一般纳税人)",
"sbbsx":"06",
"sbqx":"2020-07-15",
"sssqQ":"2020-05-01",
"sssqZ":"2020-05-31",
"token":"",
"uuId":"202006121953128099738d26dc480497b6ed2c09183acf",
"ybjcState":"N",
"sbbdm":null,
"skssqq":null,
"skssqz":null,
"gzcs":null,
"nsqxdm":null,
"nssbqq2":null,
"nssbqz2":null
}
);
initpage = initPage(companyInfo.bean);
} else {
alertWarning("请求失败!");
......
......@@ -48,6 +48,7 @@
<script src="/web/onlineReport/static/tools/js/encapsulation.js?v=1.2"></script>
<script src="/web/onlineReport/static/tools/js/minScroll.js?v=1.1"></script>
<script src="/web/onlineReport/static/tools/js/My97DatePicker/WdatePicker.js?v=1.1"></script>
<script src="/web/onlineReport/static/biz/getJgxxRyxx.js?v=2.0"></script>
<script src="/web/onlineReport/static/biz/cancellation_grid.js?v=1.0"></script>
<script>
// // <!-- // 使用 el 表达式,将返回的信息写到此处,然后调用页面绘制方法绘制页面
......@@ -73,24 +74,16 @@
var initpage;
$(function(){
//
getJgxxRyxx();
var url = "http://192.168.105.153:8091";
function GetQueryValue(queryName) {
var query = decodeURI(window.location.search.substring(1));
var vars = query.split("&");
for (var i = 0; i < vars.length; i++) {
var pair = vars[i].split("=");
if (pair[0] == queryName) { return pair[1]; }
}
return null;
}
$.ajax({
type: "GET",
url: url + "/ssfwpt/cancellation/index",
dataType: "json", // 请求方式为jsonp
// async: false,
data: {
djxh: GetQueryValue("djxh"),
nsrsbh: GetQueryValue("nsrsbh"),
djxh: jgxxRyxx.qyxxCacheVoList[0].djxh,
nsrsbh: jgxxRyxx.qyxxCacheVoList[0].nsrsbh,
token: '',
sbsq: '',
pzzlDm: ''
......
......@@ -88,6 +88,7 @@
<script src="/web/onlineReport/static/tools/js/encapsulation.js?v=1.3"></script>
<script src="/web/onlineReport/static/tools/js/minScroll.js?v=1.1"></script>
<script src="/web/onlineReport/static/tools/js/My97DatePicker/WdatePicker.js?v=1.1"></script>
<script src="/web/onlineReport/static/biz/getJgxxRyxx.js?v=2.0"></script>
<script src="/web/onlineReport/static/biz/declare_grid.js?v=1.0"></script>
<script>
// <!-- // 使用 el 表达式,将返回的信息写到此处,然后调用页面绘制方法绘制页面
......@@ -111,24 +112,16 @@
var initpage;
$(function(){
//
getJgxxRyxx();
var url = "http://192.168.105.153:8091";
function GetQueryValue(queryName) {
var query = decodeURI(window.location.search.substring(1));
var vars = query.split("&");
for (var i = 0; i < vars.length; i++) {
var pair = vars[i].split("=");
if (pair[0] == queryName) { return pair[1]; }
}
return null;
}
$.ajax({
type: "GET",
type: "post",
url: url + "/ssfwpt/declare/index",
dataType: "json", // 请求方式为jsonp
// async: false,
data: {
djxh: GetQueryValue("djxh"),
nsrsbh: GetQueryValue("nsrsbh"),
djxh: jgxxRyxx.qyxxCacheVoList[0].djxh,
nsrsbh: jgxxRyxx.qyxxCacheVoList[0].nsrsbh,
token: '',
sbsq: '',
pzzlDm: ''
......
......@@ -95,6 +95,7 @@
<script src="/web/onlineReport/static/tools/js/encapsulation.js?v=1.3"></script>
<script src="/web/onlineReport/static/tools/js/minScroll.js?v=1.1"></script>
<script src="/web/onlineReport/static/tools/js/My97DatePicker/WdatePicker.js?v=1.1"></script>
<script src="/web/onlineReport/static/biz/getJgxxRyxx.js?v=2.0"></script>
<script src="/web/onlineReport/static/biz/overdue_grid.js?v=1.0"></script>
<script>
// <!-- // 使用 el 表达式,将返回的信息写到此处,然后调用页面绘制方法绘制页面
......@@ -116,24 +117,16 @@
var initpage;
$(function(){
//
getJgxxRyxx();
var url = "http://192.168.105.153:8091";
function GetQueryValue(queryName) {
var query = decodeURI(window.location.search.substring(1));
var vars = query.split("&");
for (var i = 0; i < vars.length; i++) {
var pair = vars[i].split("=");
if (pair[0] == queryName) { return pair[1]; }
}
return null;
}
$.ajax({
type: "GET",
url: url + "/ssfwpt/overdue/index",
dataType: "json", // 请求方式为jsonp
// async: false,
data: {
djxh: GetQueryValue("djxh"),
nsrsbh: GetQueryValue("nsrsbh"),
djxh: jgxxRyxx.qyxxCacheVoList[0].djxh,
nsrsbh: jgxxRyxx.qyxxCacheVoList[0].nsrsbh,
token: '',
sbsq: '',
pzzlDm: ''
......
......@@ -93,17 +93,14 @@ function initPage(companyInfo) {
jsonReady:ddt,
callback: function(data, node) {
console.log("一条数据信息", data)
console.log(data.sourceFlag, data.sourceFlag.indexOf("sbzj") != -1)
if (data && data.sourceFlag.indexOf("sbzj") != -1) {
if (data.sourceFlag=="ssfwpt_sbzj") {
window.mlistener = {
selectRowData: {},
};
// data.fillingFlag = "normal" // 填报标记
data.saveUserId = "201" + "15232119930731392X";// 用户id
data.fillingFlag = "corrections" // 填报标记
data.saveUserId = jgxxRyxx.bdReportResponse.zjlx + jgxxRyxx.bdReportResponse.zjhm;// 用户id
window.mlistener.selectRowData = data;
window.open("http://192.168.105.153:8088/taxservicedesk/#/taxTableList");
// window.open("http://192.168.101.146:81/#/taxTableList");
return
window.open("/web/taxservicedesk/index.html#/taxTableList",'_blank');
}else {
//TODO 跳转页面
data.djxh = companyInfo.djxh;
......@@ -142,13 +139,13 @@ function initPage(companyInfo) {
success: function (data) {
localStorage.setItem("data", requestData);
if (data.url == "../declare/edit.jsp") {
window.open("/jsp/declare/edit.html?falg="+falg);
window.open("/web/onlineReport/jsp/declare/edit.html?falg="+falg);
}else if (data.url == "../declare/yearReport.jsp") {
window.open("/jsp/declare/yearReport.html?falg="+falg);
window.open("/web/onlineReport/jsp/declare/yearReport.html?falg="+falg);
}else if (data.url == "../declare/yearReportGLB.jsp") {
window.open("/jsp/declare/yearReportGLB.html?falg="+falg);
window.open("/web/onlineReport/jsp/declare/yearReportGLB.html?falg="+falg);
}else {
window.open("/jsp/error/index.html?falg="+falg);
window.open("/web/onlineReport/jsp/error/index.html?falg="+falg);
}
},
error: function(xhr){
......
......@@ -126,38 +126,49 @@ function initPage(companyInfo) {
},
jsonReady: ddt,
callback: function(data, node) {
data.djxh = companyInfo.djxh;
data.iszzsybjc = companyInfo.iszzsybjc; // 一表申报代码
data.operateType = companyInfo.operateType; //标志位
data.nsrsbh = companyInfo.nsrsbh; // 那随人识别号
// data.nssbq = nowdate;
data.checkTime = false;
if(data.pzzlDm === '11602') {
var List = companyInfo.taxInfos.filter(function (item) {
return item.pzzlDm == '10101' || item.pzzlDm == '10102'
})
if(List.length === 0) {
data.checkTime = true;
}
for(var i=0;i<List.length;i++){
if(List[i].sssqQ !== data.sssqQ || List[i].sssqZ !== data.sssqZ) {
if (data.sourceFlag=="ssfwpt_sbzj") {
window.mlistener = {
selectRowData: {},
};
data.fillingFlag = "inventory" // 填报标记
data.saveUserId = jgxxRyxx.bdReportResponse.zjlx + jgxxRyxx.bdReportResponse.zjhm;// 用户id
window.mlistener.selectRowData = data;
window.open("/web/taxservicedesk/index.html#/taxTableList",'_blank');
}else{
data.djxh = companyInfo.djxh;
data.iszzsybjc = companyInfo.iszzsybjc; // 一表申报代码
data.operateType = companyInfo.operateType; //标志位
data.nsrsbh = companyInfo.nsrsbh; // 那随人识别号
// data.nssbq = nowdate;
data.checkTime = false;
if(data.pzzlDm === '11602') {
var List = companyInfo.taxInfos.filter(function (item) {
return item.pzzlDm == '10101' || item.pzzlDm == '10102'
})
if(List.length === 0) {
data.checkTime = true;
break;
}
for(var i=0;i<List.length;i++){
if(List[i].sssqQ !== data.sssqQ || List[i].sssqZ !== data.sssqZ) {
data.checkTime = true;
break;
}
}
}
}
var str=location.href;
str = str.split("/")[4];
if(str && "cancellation" == str.substring(0,12)){
console.log("============",str)
localStorage.setItem("cancellation", str.substring(0,12));
var str=location.href;
str = str.split("/")[4];
if(str && "cancellation" == str.substring(0,12)){
console.log("============",str)
localStorage.setItem("cancellation", str.substring(0,12));
}
console.log("■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■");
console.log("data",data);
console.log("■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■");
submitData = data;
declarationMethod("N")
}
console.log("■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■");
console.log("data",data);
console.log("■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■");
submitData = data;
declarationMethod("N")
// if(node.context.innerText=="填写申报表"&&companyInfo.iszzsybjc == "01" &&data.pzzlDm == "10101"){
// // if(node.context.innerText=="填写申报表"){
// $('#myMask #myModal').show();
......@@ -253,16 +264,14 @@ function initPage(companyInfo) {
//申报方式 当iszzsybjc=01同时pzzlDm=010101时,调用改方法
var declarationMethod = function (statu) {
submitData.ybjcState = statu;
if (submitData && submitData.sourceFlag === "ssfwpt_sbzj") {
if (submitData.sourceFlag=="ssfwpt_sbzj") {
window.mlistener = {
selectRowData: {},
};
// submitData.fillingFlag = "normal" // 填报标记
submitData.saveUserId = "201" + "15232119930731392X";// 用户id
submitData.fillingFlag = "inventory" // 填报标记
submitData.saveUserId = jgxxRyxx.bdReportResponse.zjlx + jgxxRyxx.bdReportResponse.zjhm;// 用户id
window.mlistener.selectRowData = submitData;
window.open("http://192.168.105.153:8088/taxservicedesk/#/taxTableList");
// window.open("http://192.168.101.146:81/#/taxTableList");
return
window.open("/web/taxservicedesk/index.html#/taxTableList",'_blank');
}else {
// var form = $("#changeForm");
// form.find("#changeForm_data").val(JSON.stringify(submitData));
......@@ -280,13 +289,13 @@ function initPage(companyInfo) {
localStorage.setItem("data",JSON.stringify(submitData));
console.log("请求成功", data)
if (data.url == "edit.jsp") {
window.open("/jsp/declare/edit.html?falg="+falg);
window.open("/web/onlineReport/jsp/declare/edit.html?falg="+falg);
}else if (data.url == "yearReport.jsp") {
window.open("/jsp/declare/yearReport.html?falg="+falg);
window.open("/web/onlineReport/jsp/declare/yearReport.html?falg="+falg);
}else if (data.url == "yearReportGLB.jsp") {
window.open("/jsp/declare/yearReportGLB.html?falg="+falg);
window.open("/web/onlineReport/jsp/declare/yearReportGLB.html?falg="+falg);
}else {
window.open("/jsp/error/index.html?falg="+falg);
window.open("/web/onlineReport/jsp/error/index.html?falg="+falg);
}
},
error: function(xhr){
......
......@@ -84,38 +84,48 @@ function initPage(companyInfo) {
},
jsonReady: ddt,
callback: function(data, node) {
data.djxh = companyInfo.djxh;
data.iszzsybjc = companyInfo.iszzsybjc; // 一表申报代码
data.nsrsbh = companyInfo.nsrsbh; // 那随人识别号
data.nssbq = nowdate;
data.checkTime = false;
if(data.pzzlDm === '11602') {
var List = companyInfo.taxInfos.filter(function (item) {
return item.pzzlDm == '10101' || item.pzzlDm == '10102'
})
if(List.length === 0) {
data.checkTime = true;
}
for(var i=0;i<List.length;i++){
if(List[i].sssqQ !== data.sssqQ || List[i].sssqZ !== data.sssqZ) {
if (data.sourceFlag=="ssfwpt_sbzj") {
window.mlistener = {
selectRowData: {},
};
data.fillingFlag = "normal" // 填报标记
data.saveUserId = jgxxRyxx.bdReportResponse.zjlx + jgxxRyxx.bdReportResponse.zjhm;// 用户id
window.mlistener.selectRowData = data;
window.open("/web/taxservicedesk/index.html#/taxTableList",'_blank');
}else {
data.djxh = companyInfo.djxh;
data.iszzsybjc = companyInfo.iszzsybjc; // 一表申报代码
data.nsrsbh = companyInfo.nsrsbh; // 那随人识别号
data.nssbq = nowdate;
data.checkTime = false;
if(data.pzzlDm === '11602') {
var List = companyInfo.taxInfos.filter(function (item) {
return item.pzzlDm == '10101' || item.pzzlDm == '10102'
})
if(List.length === 0) {
data.checkTime = true;
break;
}
for(var i=0;i<List.length;i++){
if(List[i].sssqQ !== data.sssqQ || List[i].sssqZ !== data.sssqZ) {
data.checkTime = true;
break;
}
}
}
}
submitData = data;
if(node.context.innerText=="填写申报表"&&companyInfo.iszzsybjc == "01" &&data.pzzlDm == "10101"){
// if(node.context.innerText=="填写申报表"){
console.log(initpage)
initpage.declarationMethod('N')
submitData = data;
if(node.context.innerText=="填写申报表"&&companyInfo.iszzsybjc == "01" &&data.pzzlDm == "10101"){
// if(node.context.innerText=="填写申报表"){
console.log(initpage)
initpage.declarationMethod('N')
// $('#myMask').show();
// $('#myModal').show();
// $('#dName').html(data.pzzlMc);
// $('#dName').attr("title",data.pzzlMc);//修改title值
// $('#ybName').html(data.pzzlMc);
// $('#ybName').attr("title",data.pzzlMc);//修改title值
}else{
declarationMethod("N")
}else{
declarationMethod("N")
}
}
} //点击按钮后的回调函数
};
......@@ -213,16 +223,14 @@ function initPage(companyInfo) {
submitData.ybjcState = statu;
console.log(submitData.sourceFlag, submitData.sourceFlag.indexOf("sbzj") != -1)
//需要判断在线还是税表的开关
if (submitData && submitData.sourceFlag.indexOf("sbzj") != -1) {
if (submitData.sourceFlag=="ssfwpt_sbzj") {
window.mlistener = {
selectRowData: {},
};
// submitData.fillingFlag = "normal" // 填报标记
submitData.saveUserId = "201" + "15232119930731392X";// 用户id
submitData.fillingFlag = "normal" // 填报标记
submitData.saveUserId = jgxxRyxx.bdReportResponse.zjlx + jgxxRyxx.bdReportResponse.zjhm;// 用户id
window.mlistener.selectRowData = submitData;
window.open("http://192.168.105.153:8088/taxservicedesk/#/taxTableList");
// window.open("http://192.168.101.146:81/#/taxTableList");
return
window.open("/web/taxservicedesk/index.html#/taxTableList",'_blank');
}else {
//"ssfwpt_zxtb"
// var form = $("#changeForm");
......@@ -240,14 +248,14 @@ function initPage(companyInfo) {
success: function (data) {
localStorage.setItem("data",JSON.stringify(submitData));
if (data.url == "edit.jsp") {
window.open("/jsp/declare/edit.html?falg="+falg);
window.open("/web/onlineReport/jsp/declare/edit.html?falg="+falg);
}else if (data.url == "yearReport.jsp") {
window.open("/jsp/declare/yearReport.html?falg="+falg);
window.open("/web/onlineReport/jsp/declare/yearReport.html?falg="+falg);
}else if (data.url == "yearReportGLB.jsp") {
window.open("/jsp/declare/yearReportGLB.html?falg="+falg);
window.open("/web/onlineReport/jsp/declare/yearReportGLB.html?falg="+falg);
}else {
//因为后台不知道返回路径是什么样的就直接改成了else data.url == "error.jsp"
window.open("/jsp/error/index.html?falg="+falg);
window.open("/web/onlineReport/jsp/error/index.html?falg="+falg);
}
},
error: function(xhr){
......
......@@ -9,14 +9,14 @@ _self.$store.commit("qyxxData",data.content.qyxxCacheVoList);
_self.$store.commit("loginData",data.content.bdReportResponse);
**/
function getJgxxRyxx() {
var url = ""
var url = "http://192.168.105.153:8091"
$.ajax({
type: "post",
url: url + "/ssfwpt/xxzl/getJgxxRyxx",
dataType: "json", // 请求方式为jsonp
async: false,
data: {
token: getUrlParam(token),
token: getUrlParam("token"),
},
success: function (data) {
jgxxRyxx = data.content;
......@@ -26,7 +26,6 @@ function getJgxxRyxx() {
}
})
}
getJgxxRyxx();
/**
* @Author ygy
* @Description //TODO 获取地址栏参数
......@@ -39,4 +38,4 @@ function getUrlParam (name) {
var r = window.location.search.substr(1).match(reg);
if (r != null) return decodeURIComponent(r[2]);
return null;
}
\ No newline at end of file
}
......@@ -130,6 +130,15 @@ function initPage(companyInfo) {
},
jsonReady: ddt,
callback: function(data, node) {
if (data.sourceFlag=="ssfwpt_sbzj") {
window.mlistener = {
selectRowData: {},
};
data.fillingFlag = "overdue" // 填报标记
data.saveUserId = jgxxRyxx.bdReportResponse.zjlx + jgxxRyxx.bdReportResponse.zjhm;// 用户id
window.mlistener.selectRowData = data;
window.open("/web/taxservicedesk/index.html#/taxTableList",'_blank');
}else{
data.djxh = djxh;
data.operateType = operateType;
data.iszzsybjc = companyInfo.iszzsybjc; // 一表申报代码
......@@ -138,7 +147,7 @@ function initPage(companyInfo) {
data.checkTime = false;
if(data.pzzlDm === '11602') {
var List = companyInfo.taxInfos.filter(function (item) {
return item.pzzlDm == '10101' || item.pzzlDm == '10102'
return item.pzzlDm == '10101' || item.pzzlDm == '10102'
})
if(List.length === 0) {
data.checkTime = true;
......@@ -152,8 +161,8 @@ function initPage(companyInfo) {
}
submitData = data;
if(node.context.innerText=="填写申报表"&&companyInfo.iszzsybjc == "01" &&data.pzzlDm == "10101"){
initpage.declarationMethod('N')
// if(node.context.innerText=="填写申报表"){
initpage.declarationMethod('N')
// if(node.context.innerText=="填写申报表"){
// $('#myMask').show();
// $('#myModal').show();
// $('#dName').html(data.pzzlMc);
......@@ -163,6 +172,8 @@ function initPage(companyInfo) {
}else{
declarationMethod("N")
}
}
} //点击按钮后的回调函数
};
var object = tool.tableCreate(tableObj);
......@@ -224,16 +235,14 @@ function initPage(companyInfo) {
//申报方式 当iszzsybjc=01同时pzzlDm=010101时,调用改方法
var declarationMethod = function (statu) {
submitData.ybjcState = statu;
if (submitData && submitData.sourceFlag === "ssfwpt_sbzj") {
if (submitData.sourceFlag=="ssfwpt_sbzj") {
window.mlistener = {
selectRowData: {},
};
// submitData.fillingFlag = "normal" // 填报标记
submitData.saveUserId = "201" + "15232119930731392X";// 用户id
submitData.fillingFlag = "inventory" // 填报标记
submitData.saveUserId = jgxxRyxx.bdReportResponse.zjlx + jgxxRyxx.bdReportResponse.zjhm;// 用户id
window.mlistener.selectRowData = submitData;
window.open("http://192.168.105.153:8088/taxservicedesk/#/taxTableList");
// window.open("http://192.168.101.146:81/#/taxTableList");
return
window.open("/web/taxservicedesk/index.html#/taxTableList",'_blank');
}else {
// var form = $("#changeForm");
// form.find("#changeForm_data").val(JSON.stringify(submitData));
......
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