Skip to content

Z
zxtb_to_ssfwpt
Commit f9d8e369 authored by yangyuxin's avatar yangyuxin
Browse files
Options

合并

parents ca7e91bd 62711dc5
Hide whitespace changes
Inline Side-by-side
Showing with 204 additions and 148 deletions
index.html
View file @ f9d8e369
......@@ -21,6 +21,7 @@
<ul>
<li>
<lable>测试纳税人登记序号：</lable><input type="text" name="djxh" id="form_djxh_amend" /></li>
<li><label>纳税人识别号</label><input type="text" name="pzzlDm" id="form_pzzlDm_amend" /></li>
<li><label>申报期：</label><input type="text" name="sbq" id="form_sbq_amend" /></li>
</ul>
</form>
......@@ -32,6 +33,7 @@
<ul>
<li>
<lable>测试纳税人登记序号：</lable><input type="text" name="djxh" id="form_djxh_overdue" /></li>
<li><label>纳税人识别号</label><input type="text" name="pzzlDm" id="form_pzzlDm_overdue" /></li>
<li><label>申报期：</label><input type="text" name="sbq" id="form_sbq" /></li>
</ul>
</form>
......@@ -42,6 +44,7 @@
<ul>
<li>
<lable>测试纳税人登记序号：</lable><input type="text" name="djxh" id="form_djxh_cancellation" /></li>
<li><label>纳税人识别号</label><input type="text" name="pzzlDm" id="form_pzzlDm_cancellation" /></li>
<li><label>申报期：</label><input type="text" name="sbq" id="form_sbq" /></li>
</ul>
</form>
......@@ -66,58 +69,42 @@
</script>
</body>
<script type="text/javascript" src="/web/onlineReport/static/tools/js/jquery-1.11.3.js?v=1.1"></script>
<script type="text/javascript" src="/web/onlineReport/static/tools/js/encapsulation.js?v=1.3"></script>
<script>
// localStorage.setItem("url", "http://localhost:7070");
// localStorage.setItem("url", "http://sbjs.tjsat.gov.cn:18090");
//涉税
localStorage.setItem("url", "http://192.168.101.146:8091");
// localStorage.setItem("url", "http://192.168.101.201:8091");
localStorage.setItem("url", "http://192.168.106.17:8091");
// localStorage.setItem("url", "http://192.168.106.46:8091");
var url = localStorage.getItem("url");
$(function(){
//按期申报
var btnObj1 = $("#delcareBtn");
var djxhNumber1 = $("#form_djxh")
var sbh = $("#form_pzzlDm");
declareFun(btnObj1, djxhNumber1, sbh, "declare");
var sbh1 = $("#form_pzzlDm");
declareFun(btnObj1, djxhNumber1, sbh1, "declare");
//更正申报
var btnObj2 = $("#amendBtn");
var djxhNumber2 = $("#form_djxh_amend");
declareFun(btnObj2, djxhNumber2, "amend");
var sbh2 = $("#form_pzzlDm_amend");
declareFun(btnObj2, djxhNumber2, sbh2, "amend");
//逾期申报
var btnObj3 = $("#overdueBtn");
var djxhNumber3 = $("#form_djxh_overdue");
declareFun(btnObj3, djxhNumber3, "overdue");
var sbh3 = $("#form_pzzlDm_overdue");
declareFun(btnObj3, djxhNumber3, sbh3, "overdue");
//清册注销
var btnObj4 = $("#cancellationBtn");
var djxhNumber4 = $("#form_djxh_cancellation");
declareFun(btnObj4, djxhNumber4, "cancellation");
// $("#delcareBtn").click(function(){
// $.ajax({
// type: "GET",
// url: url+"/online_report/declare",
// dataType: "json", // 请求方式为jsonp
// data: {
// djxh: $("#form_djxh").val()
// },
// success: function (data) { //客户端jquery预先定义好的callback函数，成功获取跨域服务器上的json数据后，会动态执行这个callback函数
// if (data.success) {
// localStorage.setItem("djxh",$("#form_djxh").val());
// window.location.href = "/jsp/declare/index.html";
// }
// },
// error: function(xhr){
// //jsonp 方式此方法不被触发
// console.log("=======error======================",xhr)
// }
// })
// });
var sbh4 = $("#form_pzzlDm_cancellation");
declareFun(btnObj4, djxhNumber4, sbh4, "cancellation");
//四个按钮请求的公共方法
function declareFun (btnObj, djxhNumber, sbh, param) {
btnObj.click(function(){
$.ajax({
type: "GET",
// url: url+"/online_report/" + param,
url: url+"/ssfwpt/" + param + '/index',
dataType: "json", // 请求方式为jsonp
data: {
......@@ -132,7 +119,8 @@
localStorage.setItem("nsrsbh",sbh.val() ? sbh.val() : '');
if (data.success) {
if (data.bean.url == "error.jsp") {
window.location.href = "/jsp/error/index.html?falg="+param;
myAlert("提示", data.bean.errorInfo, "确定")
// window.location.href = "/jsp/error/index.html?falg="+param;
}else if (param == "declare") {
window.location.href = "/jsp/declare/index.html";
}else if (param == "amend") {
......
jsp/amend/index.html
View file @ f9d8e369
......@@ -97,11 +97,15 @@
var url = localStorage.getItem("url");
$.ajax({
type: "GET",
url: url + "/online_report/amend",
url: url + "/ssfwpt/amend/index",
dataType: "json", // 请求方式为jsonp
// async: false,
data: {
djxh: localStorage.getItem("djxh")
djxh: localStorage.getItem("djxh"),
nsrsbh: localStorage.getItem("nsrsbh"),
token: '',
sbsq: '',
pzzlDm: ''
},
success: function (data) { //客户端jquery预先定义好的callback函数，成功获取跨域服务器上的json数据后，会动态执行这个callback函数
//el表达式变jq
......
jsp/cancellation/index.html
View file @ f9d8e369
......@@ -76,11 +76,15 @@
var url = localStorage.getItem("url");
$.ajax({
type: "GET",
url: url + "/online_report/cancellation",
url: url + "/ssfwpt/cancellation/index",
dataType: "json", // 请求方式为jsonp
// async: false,
data: {
djxh: localStorage.getItem("djxh")
djxh: localStorage.getItem("djxh"),
nsrsbh: localStorage.getItem("nsrsbh"),
token: '',
sbsq: '',
pzzlDm: ''
},
success: function (data) { //客户端jquery预先定义好的callback函数，成功获取跨域服务器上的json数据后，会动态执行这个callback函数
//el表达式变jq
......
jsp/declare/edit.html
View file @ f9d8e369
......@@ -184,6 +184,7 @@
GLOBAL_TABLE_FP = data.bean.zzsData ? JSON.parse(data.bean.zzsData) : {};
gzQtxx = data.bean.gzQtxx ? JSON.parse(data.bean.gzQtxx) : {};
console.log(GLOBAL_JSON)
var oscript1 = document.createElement('script');
var oscript2 = document.createElement('script');
oscript1.src = '/web/onlineReport/static/page_js/'+data.pzzlDm+'/data.js?v=1';
......
jsp/declare/index.html
View file @ f9d8e369
......@@ -114,12 +114,10 @@
var url = localStorage.getItem("url");
$.ajax({
type: "GET",
// url: url + "/online_report/declare",
url: url + "/ssfwpt/declare/index",
dataType: "json", // 请求方式为jsonp
// async: false,
data: {
// djxh: localStorage.getItem("djxh"),
djxh: localStorage.getItem("djxh"),
nsrsbh: localStorage.getItem("nsrsbh"),
token: '',
......@@ -129,6 +127,13 @@
success: function (data) { //客户端jquery预先定义好的callback函数，成功获取跨域服务器上的json数据后，会动态执行这个callback函数
//el表达式变jq
// $("#token").attr("value","");
if (data.success) {
if (data.bean.url == "error.jsp") {
myAlert("提示", data.bean.errorInfo, "确定")
// window.location.href = "/jsp/error/index.html?falg="+param;
return
}
}
var companyInfo = data;
$("#djxh").attr("value", companyInfo.djxh);
if (companyInfo.success) {
......
jsp/overdue/index.html
View file @ f9d8e369
......@@ -119,11 +119,15 @@
var url = localStorage.getItem("url");
$.ajax({
type: "GET",
url: url + "/online_report/overdue",
url: url + "/ssfwpt/overdue/index",
dataType: "json", // 请求方式为jsonp
// async: false,
data: {
djxh: localStorage.getItem("djxh")
djxh: localStorage.getItem("djxh"),
nsrsbh: localStorage.getItem("nsrsbh"),
token: '',
sbsq: '',
pzzlDm: ''
},
success: function (data) { //客户端jquery预先定义好的callback函数，成功获取跨域服务器上的json数据后，会动态执行这个callback函数
//el表达式变jq
......
static/biz/amend_grid.js
View file @ f9d8e369
......@@ -92,57 +92,71 @@ function initPage(companyInfo) {
},
jsonReady:ddt,
callback: function(data, node) {
//TODO 跳转页面
data.djxh = companyInfo.djxh;
data.nssbqq2 = durationOfTaxStart;
data.nssbqz2 = durationOfTaxEnd;
data.gzCacheKey = companyInfo.gzCacheKey;
data.checkTime = false;
if(data.bblxDm === '11602') {
var List = companyInfo.gzTaxInfos.filter(function (item) {
return item.bblxDm == '10101' || item.bblxDm == '10102'
})
if(List.length === 0) {
data.checkTime = true;
}
for(var i=0;i<List.length;i++){
if(List[i].skssqq !== data.skssqq || List[i].skssqz !== data.skssqz) {
console.log("一条数据信息", data)
console.log(data.sourceFlag, data.sourceFlag.indexOf("sbzj") != -1)
if (data && data.sourceFlag.indexOf("sbzj") != -1) {
window.mlistener = {
selectRowData: {},
};
// data.fillingFlag = "normal" // 填报标记
data.saveUserId = "201" + "15232119930731392X";// 用户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
}else {
//TODO 跳转页面
data.djxh = companyInfo.djxh;
data.nssbqq2 = durationOfTaxStart;
data.nssbqz2 = durationOfTaxEnd;
data.gzCacheKey = companyInfo.gzCacheKey;
data.checkTime = false;
if(data.bblxDm === '11602') {
var List = companyInfo.gzTaxInfos.filter(function (item) {
return item.bblxDm == '10101' || item.bblxDm == '10102'
})
if(List.length === 0) {
data.checkTime = true;
break;
}
}
}
// var form = $("#changeForm_amend");
// form.find("#changeForm_data").val(JSON.stringify(data));
// form.submit();
var requestData = JSON.stringify(data);
var falg = "amend";
$.ajax({
type: "POST",
url: url + "/online_report/amend/toGzPzzl",
dataType: "json", // 请求方式为jsonp
data: {
data: requestData
},
success: function (data) {
localStorage.setItem("data", requestData);
if (data.url == "../declare/edit.jsp") {
window.open("/jsp/declare/edit.html?falg="+falg);
}else if (data.url == "../declare/yearReport.jsp") {
window.open("/jsp/declare/yearReport.html?falg="+falg);
}else if (data.url == "../declare/yearReportGLB.jsp") {
window.open("/jsp/declare/yearReportGLB.html?falg="+falg);
}else {
window.open("/jsp/error/index.html?falg="+falg);
for(var i=0;i<List.length;i++){
if(List[i].skssqq !== data.skssqq || List[i].skssqz !== data.skssqz) {
data.checkTime = true;
break;
}
}
},
error: function(xhr){
//jsonp 方式此方法不被触发
console.log("=======error======================")
}
})
// var form = $("#changeForm_amend");
// form.find("#changeForm_data").val(JSON.stringify(data));
// form.submit();
var requestData = JSON.stringify(data);
var falg = "amend";
$.ajax({
type: "POST",
// url: url + "/online_report/amend/toGzPzzl",
url: url + "/ssfwpt/amend/toGzPzzl",
dataType: "json", // 请求方式为jsonp
data: {
data: requestData
},
success: function (data) {
localStorage.setItem("data", requestData);
if (data.url == "../declare/edit.jsp") {
window.open("/jsp/declare/edit.html?falg="+falg);
}else if (data.url == "../declare/yearReport.jsp") {
window.open("/jsp/declare/yearReport.html?falg="+falg);
}else if (data.url == "../declare/yearReportGLB.jsp") {
window.open("/jsp/declare/yearReportGLB.html?falg="+falg);
}else {
window.open("/jsp/error/index.html?falg="+falg);
}
},
error: function(xhr){
//jsonp 方式此方法不被触发
console.log("=======error======================")
}
})
}
} //点击按钮后的回调函数
};
var object = tool.tableCreate(tableObj);
......@@ -223,7 +237,8 @@ function initPage(companyInfo) {
// TODO 开始加载等待动画
showLoading();
$.ajax({
url: url + "/online_report/amend/getPzzlList", // 查询接口
// url: url + "/online_report/amend/getPzzlList", // 查询接口
url: url + "/ssfwpt/amend/getPzzlList",
data: param,
type: "POST",
dataType: "JSON"
......
static/biz/cancellation_grid.js
View file @ f9d8e369
......@@ -188,7 +188,8 @@ function initPage(companyInfo) {
isFresh: type.toUpperCase() == "Y"
}
$.ajax({
url: url + "/online_report/declare/getPzzlList",
// url: url + "/online_report/declare/getPzzlList",
url: url + "/ssfwpt/declare/getPzzlList",
data: param,
type: "POST",
dataType: "JSON"
......@@ -252,36 +253,49 @@ function initPage(companyInfo) {
//申报方式 当iszzsybjc=01同时pzzlDm=010101时，调用改方法
var declarationMethod = function (statu) {
submitData.ybjcState = statu;
// var form = $("#changeForm");
// form.find("#changeForm_data").val(JSON.stringify(submitData));
// form.submit();
var falg = "declare";
$.ajax({
type: "POST",
url: url + "/online_report/declare/toPzzl",
dataType: "json", // 请求方式为jsonp
data: {
data: JSON.stringify(submitData)
},
success: function (data) {
localStorage.setItem("data",JSON.stringify(submitData));
console.log("请求成功", data)
if (data.url == "edit.jsp") {
window.open("/jsp/declare/edit.html?falg="+falg);
}else if (data.url == "yearReport.jsp") {
window.open("/jsp/declare/yearReport.html?falg="+falg);
}else if (data.url == "yearReportGLB.jsp") {
window.open("/jsp/declare/yearReportGLB.html?falg="+falg);
}else {
window.open("/jsp/error/index.html?falg="+falg);
if (submitData && submitData.sourceFlag === "ssfwpt_sbzj") {
window.mlistener = {
selectRowData: {},
};
// submitData.fillingFlag = "normal" // 填报标记
submitData.saveUserId = "201" + "15232119930731392X";// 用户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
}else {
// var form = $("#changeForm");
// form.find("#changeForm_data").val(JSON.stringify(submitData));
// form.submit();
var falg = "declare";
$.ajax({
type: "POST",
// url: url + "/online_report/declare/toPzzl",
url: url + "/ssfwpt/declare/toPzzl",
dataType: "json", // 请求方式为jsonp
data: {
data: JSON.stringify(submitData)
},
success: function (data) {
localStorage.setItem("data",JSON.stringify(submitData));
console.log("请求成功", data)
if (data.url == "edit.jsp") {
window.open("/jsp/declare/edit.html?falg="+falg);
}else if (data.url == "yearReport.jsp") {
window.open("/jsp/declare/yearReport.html?falg="+falg);
}else if (data.url == "yearReportGLB.jsp") {
window.open("/jsp/declare/yearReportGLB.html?falg="+falg);
}else {
window.open("/jsp/error/index.html?falg="+falg);
}
},
error: function(xhr){
//jsonp 方式此方法不被触发
console.log("=======error======================")
}
},
error: function(xhr){
//jsonp 方式此方法不被触发
console.log("=======error======================")
}
})
// closeModal();
})
// closeModal();
}
}
nowdate = companyInfo.sbsq;
......
static/biz/declare_grid.js
View file @ f9d8e369
......@@ -150,6 +150,11 @@ function initPage(companyInfo) {
}).done(function(data) {
console.log(data)
if (data.success) {
if (data.bean.url == "error.jsp") {
myAlert("提示", data.bean.errorInfo, "确定")
return
// window.location.href = "/jsp/error/index.html?falg="+param;
}
drawGrid(data.bean);
companyInfo = data.bean;
} else {
......@@ -206,9 +211,9 @@ function initPage(companyInfo) {
//申报方式 当iszzsybjc=01同时pzzlDm=010101时，调用改方法
var declarationMethod = function (statu) {
submitData.ybjcState = statu;
console.log(submitData.sourceFlag)
console.log(submitData.sourceFlag, submitData.sourceFlag.indexOf("sbzj") != -1)
//需要判断在线还是税表的开关
if (submitData && submitData.sourceFlag === "ssfwpt_sbzj") {
if (submitData && submitData.sourceFlag.indexOf("sbzj") != -1) {
window.mlistener = {
selectRowData: {},
};
......
static/biz/overdue_grid.js
View file @ f9d8e369
......@@ -187,7 +187,8 @@ function initPage(companyInfo) {
operateType:operateType
}
$.ajax({
url: url + "/online_report/declare/getPzzlList",
// url: url + "/online_report/declare/getPzzlList",
url: url + "/ssfwpt/declare/getPzzlList",
data: param,
type: "POST",
dataType: "JSON"
......@@ -223,36 +224,49 @@ function initPage(companyInfo) {
//申报方式 当iszzsybjc=01同时pzzlDm=010101时，调用改方法
var declarationMethod = function (statu) {
submitData.ybjcState = statu;
// var form = $("#changeForm");
// form.find("#changeForm_data").val(JSON.stringify(submitData));
// form.submit();
var falg = "declare";
$.ajax({
type: "POST",
url: url + "/online_report/declare/toPzzl",
dataType: "json", // 请求方式为jsonp
data: {
data: JSON.stringify(submitData)
},
success: function (data) {
localStorage.setItem("data",JSON.stringify(submitData));
console.log("请求成功", data)
if (data.url == "edit.jsp") {
window.open("/jsp/declare/edit.html?falg="+falg);
}else if (data.url == "yearReport.jsp") {
window.open("/jsp/declare/yearReport.html?falg="+falg);
}else if (data.url == "yearReportGLB.jsp") {
window.open("/jsp/declare/yearReportGLB.html?falg="+falg);
}else {
window.open("/jsp/error/index.html?falg="+falg);
if (submitData && submitData.sourceFlag === "ssfwpt_sbzj") {
window.mlistener = {
selectRowData: {},
};
// submitData.fillingFlag = "normal" // 填报标记
submitData.saveUserId = "201" + "15232119930731392X";// 用户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
}else {
// var form = $("#changeForm");
// form.find("#changeForm_data").val(JSON.stringify(submitData));
// form.submit();
var falg = "declare";
$.ajax({
type: "POST",
// url: url + "/online_report/declare/toPzzl",
url: url + "/ssfwpt/declare/toPzzl",
dataType: "json", // 请求方式为jsonp
data: {
data: JSON.stringify(submitData)
},
success: function (data) {
localStorage.setItem("data",JSON.stringify(submitData));
console.log("请求成功", data)
if (data.url == "edit.jsp") {
window.open("/jsp/declare/edit.html?falg="+falg);
}else if (data.url == "yearReport.jsp") {
window.open("/jsp/declare/yearReport.html?falg="+falg);
}else if (data.url == "yearReportGLB.jsp") {
window.open("/jsp/declare/yearReportGLB.html?falg="+falg);
}else {
window.open("/jsp/error/index.html?falg="+falg);
}
},
error: function(xhr){
//jsonp 方式此方法不被触发
console.log("=======error======================")
}
},
error: function(xhr){
//jsonp 方式此方法不被触发
console.log("=======error======================")
}
})
closeModal();
})
closeModal();
}
}
/**
* 隐藏modal
......
static/tools/js/encapsulation.js
View file @ f9d8e369
......@@ -228,7 +228,8 @@ function getIEVersion() {
backgroundColor: '#fff',
borderRadius: '15px 15px 0 0',
// fontWeight: 'bold',
borderBottom: '1px solid #E6E6E6'
borderBottom: '1px solid #E6E6E6',
boxSizing: 'border-box'
});
} else {
$("#mb_tit").css({
......@@ -241,7 +242,8 @@ function getIEVersion() {
backgroundColor: '#fff',
borderRadius: '15px 15px 0 0',
// fontWeight: 'bold',
borderBottom: '1px solid #E6E6E6'
borderBottom: '1px solid #E6E6E6',
boxSizing: 'border-box'
});
}
......
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