Skip to content

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

解决切月，读取征管数据多次调用问题

parent 4f26eeaf
Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 239 deletions
jsp/aKeyTax/index.html
View file @ e6305b4f
......@@ -10,29 +10,29 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<!-- IOS6全屏 Chrome高版本全屏 -->
<meta http-equiv="X-UA-Compatible" content="edge">
<link href="../../static/tools/css/bootstrap.css?v=1.1" rel="stylesheet">
<link href="/web/onlineReport/static/tools/css/bootstrap.css?v=1.1" rel="stylesheet">
<!--滚动条-->
<link rel="stylesheet" href="../../static/tools/css/scroll.css" />
<link rel="stylesheet" href="/web/onlineReport/static/tools/css/scroll.css" />
<!--table样式-->
<link rel="stylesheet" href="../../static/tools/css/table.css" />
<link rel="stylesheet" href="/web/onlineReport/static/tools/css/table.css" />
<!--样式-->
<link rel="stylesheet" href="../../static/tools/css/encapsulation.css" />
<link rel="stylesheet" href="/web/onlineReport/static/tools/css/encapsulation.css" />
<!--时间插件-->
<link rel="stylesheet" href="../../static/tools/js/My97DatePicker/skin/WdatePicker.css" />
<link rel="stylesheet" href="/web/onlineReport/static/tools/js/My97DatePicker/skin/WdatePicker.css" />
<!--declare-->
<link rel="stylesheet" href="../../static/css/declare/declare.css" />
<link rel="stylesheet" href="/web/onlineReport/static/css/declare/declare.css" />
<!-- 页面自定义样式 -->
<title>在线填报</title>
</head>
<script>
document.write("<script type='text/javascript' src='../../static/config.js?time=" + Math.random() + "'></" + "script" + ">")
document.write("<script type='text/javascript' src='/web/onlineReport/static/config.js?time=" + Math.random() + "'></" + "script" + ">")
</script>
<body>
<div style="background-color:#FFFFFF;">
<div style="padding: 25px;">
<div class="div-border" style="padding-bottom: 20px;height: 60px;">
<img style="float:left;display:block" src="../../static/tools/images/zxtb.png">&nbsp;&nbsp;
<img style="float:left;display:block" src="/web/onlineReport/static/tools/images/zxtb.png">&nbsp;&nbsp;
<span style="float:left;display:block;margin-left: 10px;margin-top: 9px;top: 10px;"
class="span-title">重点税源</span>
</div>
......@@ -47,7 +47,7 @@
<input id="toExamine" class="btn btn-primary tdDong-btn"
style="margin-right: 10px;height: 32px;margin-top: 5px;float: right;"
type="button" value="审核" />
<input id="reset" class="btn btn-primary tdDong-btn"
<input id="readData" class="btn btn-primary tdDong-btn"
style="margin-right: 10px;height: 32px;margin-top: 5px;float: right;"
type="button" value="读取征管数据" />
</div>
......@@ -65,7 +65,7 @@
<div class="font-clo" style="padding-top: 20px;">
<div style="font-size:12px">温馨提示：</div>
<div class="reminder"><span class="span-font-size">1、如近期有税费种认定、纳税人资格、备案等发生变动，页面展现清册与实际所需不符的，</span></div>
<div class="reminder"><span class="span-font-size">请点此处&nbsp;&nbsp;“<label for="reset" id="reset1"
<div class="reminder"><span class="span-font-size">请点此处&nbsp;&nbsp;“<label for="readData" id="reset1"
class="label_declare">重置申报清册</label>”&nbsp;&nbsp;对该户清册进行重新生成。</span>
</div>
<div class="reminder"><span
......@@ -95,35 +95,12 @@
</body>
<script src="../../static/tools/js/jquery-1.11.3.js?v=1.1"></script>
<script src="../../static/js/tax/tool.js"></script>
<script src="../../static/tools/js/jquery.nicescroll.js?v=1.1"></script>
<script src="../../static/tools/js/bootstrap.js?v=1.1"></script>
<script src="../../static/tools/js/encapsulation.js?v=1.3"></script>
<script src="../../static/tools/js/minScroll.js?v=1.1"></script>
<script src="../../static/tools/js/My97DatePicker/WdatePicker.js?v=1.1"></script>
<script src="../../static/biz/aKeyTaxList.js?v=1.0"></script>
<script>
// <!-- // 使用 el 表达式，将返回的信息写到此处，然后调用页面绘制方法绘制页面
// var companyInfo = ${json};
// if (companyInfo.success) {
// var initpage = initPage(companyInfo.bean);
// $("#getInputValue").on("focus", function() {
// WdatePicker({
// isShowClear:false,
// dateFmt: 'yyyy-MM',
// onpicking: function(dp){
// initpage.changeDate(this, dp);
// }
// });
// });
// } else {
// alertWarning("请求失败！");
// // 弹出错误对话框
// }
</script>
<script src="/web/onlineReport/static/tools/js/jquery-1.11.3.js?v=1.1"></script>
<script src="/web/onlineReport/static/tools/js/jquery.nicescroll.js?v=1.1"></script>
<script src="/web/onlineReport/static/js/tax/tool.js"></script>
<script src="/web/onlineReport/static/tools/js/bootstrap.js?v=1.1"></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/tools/js/encapsulation.js?v=1.3"></script>
<script src="/web/onlineReport/static/biz/aKeyTaxList.js?v=1.0"></script>
</html>
\ No newline at end of file
static/biz/aKeyTaxList.js
View file @ e6305b4f
var initpage;
var sbqDate = '';
$(function () {
showLoading();
getZg();
// getInitTable();
})
// 获取重点税源资格
function getZg() {
$.ajax({
type: "post",
......@@ -19,14 +17,16 @@ function getZg() {
},
success: function (data) {
if (data.returnCode != '00') {
hideLoading();
myAlert("提示", data.returnMessage, "确定");
return flase
}
var flag = data.content.flag;
if (flag == 'Y') {
getInitTable()
getInitTable("")
} else {
myAlert("提示", "暂无可申报重点税源！", "确定")
alertWarning(data.content.message);
hideLoading();
}
},
error: function (xhr) {
......@@ -36,8 +36,8 @@ function getZg() {
}
})
}
function getInitTable() {
// 获取列表数据
function getInitTable(date) {
$.ajax({
type: "POST",
url: config.url + "/ssfwpt/zdsy/zdsyLb",
......@@ -45,19 +45,13 @@ function getInitTable() {
// async: false,
data: {
djxh: getUrlParam("djxh"),
nsrsbq: "",
nsrsbq: date,
},
success: function (data) { //客户端jquery预先定义好的callback函数，成功获取跨域服务器上的json数据后，会动态执行这个callback函数
hideLoading();
if (data.content == undefined) {
if (data.bean.url == "error.jsp") {
myAlert("提示", data.bean.errorInfo, "确定")
return
}
}
var companyInfo = data;
var companyInfo = data;
if (companyInfo.returnCode == "00") {
config.nsrsbq = companyInfo.content.nsrsbq
config.nsrsbq = companyInfo.content.nsrsbq
config.value = companyInfo.content.value
companyInfo.content.config = config
companyInfo.content.return = true; /* @Author ygy @Date 10:12 2020/7/8 @Description 前端判断接口成功返回数据标记用于区分是否执行初始化table方法*/
......@@ -102,52 +96,61 @@ function getInitTable() {
}
})
}
/**
* 按期申报填报列表页控制脚本
*
* @author 于广洋
* @modify 王雷
*/
// -------------------------------
/**
* 绘制税种填报页面
*
* @param {*} companyInfo
*/
function initPage(companyInfo) {
var shBz = true; //重点税源审核标志
$("#toExamine").on("click", toExamine);
function toExamine() {
console.log('toExamine')
}
$("#declareTable").on("click", declareTable);
function declareTable() {
console.log('declareTable')
}
getIEVersion();
localStorage.setItem("cancellation", null);
function initPage(companyInfo) {
var companyInfo = companyInfo;
var djxh = companyInfo.djxh;
var nowdate = ""; // 存储当前选择的时间框;
var submitData
var submitData;
var getSzLB = function (date) {
showLoading();
$.ajax({
url: config.url + "/ssfwpt/zdsy/zdsyLb",
data: {
djxh: djxh,
nsrsbq: date,
},
type: "POST",
dataType: "JSON",
}).done(function (data) {
companyInfo = data;
if (data.returnCode == "00") {
config.nsrsbq = data.content.nsrsbq
config.value = data.content.value
companyInfo.content.config = config
companyInfo.content.return = true; /* @Author ygy @Date 10:12 2020/7/8 @Description 前端判断接口成功返回数据标记用于区分是否执行初始化table方法*/
config.return = true;
drawGrid(companyInfo.content);
} else {
if (data.errmsg != undefined) {
alertWarning(data.errmsg);
} else {
alertWarning(data.returnMessage);
}
}
hideLoading();
}).always(function (data) {
hideLoading();
});
}
/**
* 展示税种申报信息
*/
var showTax = function (taxInfo) {
if (taxInfo.length > 0) {
var shNum = 0;
for (var i = 0; i < taxInfo.length; i++) {
if (taxInfo[i].state == 'Y') {
shNum += 1
}
if (taxInfo[i].sksssjq) {
taxInfo[i].sssqQ = tool.formatDate(taxInfo[i].sksssjq.split(" ")[0]);
}
if (taxInfo[i].sksssjz) {
taxInfo[i].sssqZ = tool.formatDate(taxInfo[i].sksssjz.split(" ")[0]);
}
// if (taxInfo[i].state) {
// taxInfo[i].txzt = tool.formatDate(taxInfo[i].sksssjz.split(" ")[0]);
// }
switch (taxInfo[i].state) {
case 'N':
taxInfo[i].txzt = "未填写";
......@@ -160,6 +163,11 @@ function initPage(companyInfo) {
break;
}
}
if (taxInfo.length == shNum) {
shBz = true;
} else {
shBz = false;
}
}
var id = "#taxGrid";
var buttonHtml = "填写报表";
......@@ -215,7 +223,7 @@ function initPage(companyInfo) {
jsonReady: ddt,
callback: function (data, node) {
var bbDmVersion = data.bbDm + '_' + data.versionNumber;
data.nsrsbq = config.nsrsbq;
data.nsrsbq = config.nsrsbq;
var sbzjKbData = { // 税表组件 开表参数
bbDmVersion: bbDmVersion,
valueTakingMethod: "ajax", // 提取数据方式控制 ajax 请求后台 cache 取浏览器缓存 ""不许要请求后台 key值为allParam
......@@ -248,7 +256,7 @@ function initPage(companyInfo) {
disReplace: false
},
openMode: {
flag: '2'
flag: '3'
}
};
data.sourceFlag = "zdsy"
......@@ -263,22 +271,51 @@ function initPage(companyInfo) {
// object.jsonReadyTo(ddt, { page: "1", pageSize: ddt.length });
};
var drawGrid = function (bean) {
if (bean.szlb.length == 0) {
alertInfo("税费申报暂无数据");
}
showTax(bean.szlb);
};
// 格式化后台返回的时间
if (companyInfo.config.return) {
var year = companyInfo.nsrsbq.substring(0, 4);
var month = companyInfo.nsrsbq.substring(4, 6);
var sbq = year + '-' + month
$("#getInputValue").val(sbq);
nowdate = companyInfo.nsrsbq;
drawGrid(companyInfo);
}
/**
* 税务申报 初始化数据获取
* @param {*} mydate
* 日期改变时触发
* N 非强制刷新
* @param {*} obj
* @param {*} dp
*/
//地址
//http://sbjs.tjsat.gov.cn:18090
//http://localhost:7070
var url;
if (companyInfo) {
url = companyInfo.config.url;
}
var getTaxDeclaration = function (date, type, refreshSbzt) {
var changeDate = function (obj, dp) {
date = dp.cal.getNewDateStr();
if(date!=""&&date!=undefined){
nowdate = date.split('-')[0]+date.split('-')[1]; // 给缓存时间赋值
// 加了一个延时，时间改变后时间框没有收起隐藏就加载数据，没有找到好的解决办法，暂时用延时处理
setTimeout(function () {
getSzLB(nowdate);
}, 50);
}
};
// 读取征管数据 点击事件
var readDataF = function () {
myConfirm("消息", "您确定需要读取征管数据吗？点击确定继续", "确定", "取消", function () {
getTaxDeclaration(nowdate);
});
};
$("#readData").on("click", readDataF);
// 读取征管数据 接口调用
var getTaxDeclaration = function (date) {
// TODO 开始加载等待动画
showLoading();
$.ajax({
url: url + "/ssfwpt/zdsy/readData",
url: config.url + "/ssfwpt/zdsy/readData",
data: {
djxh: djxh,
nsrsbq: date,
......@@ -286,10 +323,8 @@ function initPage(companyInfo) {
type: "POST",
dataType: "JSON",
}).done(function (data) {
if (data.content != undefined) {
// if(data.returnCode=="00"){
alertWarning(data.returnMessage);
// }
if (data.returnCode == "00") {
alertSuccess(data.returnMessage);
} else {
if (data.errmsg != undefined) {
alertWarning(data.errmsg);
......@@ -301,144 +336,29 @@ function initPage(companyInfo) {
hideLoading();
});
};
/**
* 隐藏modal
*/
var closeModal = function () {
$('#ybName').html("");
$('#dName').html("");
$('#myMask').hide();
$('#myModal').hide();
// 申报
function declareTable() {
console.log('declareTable')
}
$("#declareTable").on("click", declareTable);
var drawGrid = function (bean) {
if (bean.szlb.length == 0) {
alertInfo("税费申报暂无数据");
}
showTax(bean.szlb);
};
/**
* 日期改变时触发
* N 非强制刷新
* @param {*} obj
* @param {*} dp
*/
var changeDate = function (obj, dp) {
date = dp.cal.getNewDateStr();
nowdate = date; // 给缓存时间赋值
// 加了一个延时，时间改变后时间框没有收起隐藏就加载数据，没有找到好的解决办法，暂时用延时处理
sbqDate = date
setTimeout(function () {
getTaxDeclaration(date, "N", '1');
}, 50);
};
var refresh = function () {
myConfirm("消息", "您确定需要读取征管数据吗？点击确定继续", "确定", "取消", function () {
getTaxDeclaration(nowdate, "Y", '1');
});
};
//申报方式 当iszzsybjc=01同时pzzlDm=010101时，调用改方法
var declarationMethod = function (statu) {
submitData.ybjcState = statu;
submitData.value = config.value;
//需要判断在线还是税表的开关
if (submitData.sourceFlag == "ssfwpt_sbzj") {
window.mlistener = {
selectRowData: {},
};
submitData.fillingFlag = "normal" // 填报标记
submitData.saveUserId = "zxtb"; // 用户id
window.mlistener.selectRowData = submitData;
window.open(config.ssfwptPage, '_blank');
Object.defineProperty(mlistener, 'returnSelectRowData', {
set: function (val) {
setTimeout(function () {
getTaxDeclaration(sbqDate, "N", '2');
}, 1000);
}
})
} else {
//"ssfwpt_zxtb"
// var form = $("#changeForm");
// form.find("#changeForm_data").val(JSON.stringify(submitData));
// form.submit();
showLoading()
var falg = "declare";
$.ajax({
type: "POST",
// url: url + "/ssfwpt/declare/toPzzl",
url: url + "/ssfwpt/declare/toPzzl",
dataType: "json", // 请求方式为jsonp
data: {
data: JSON.stringify(submitData)
},
success: function (data) {
hideLoading()
if (data.code == 99 || data.code == "99") {
if (data.errmsg != undefined) {
alertWarning(data.errmsg);
} else {
alertWarning(data.returnMessage);
}
return false
}
window.taxInfo = JSON.stringify(submitData);
localStorage.setItem("data", JSON.stringify(submitData));
if (data.url == "edit.jsp") {
submitData.flag = true;
submitData.encryptKey = config.value;
var url = config.spreadUrl + "/online_report/declare/toPzzl?falg=" + falg
var form = $("#changeForm");
form.attr('action', url); //通过jquery为action属性赋值
form.find("#changeForm_data").val(JSON.stringify(submitData));
form.submit();
// window.open(config.spreadUrl+"/online_report/declare/toPzzl?falg=" + falg + '&data=' + JSON.stringify(submitData));
// window.open(config.webUrl + "declare/edit.html?falg=" + falg + '&params=' + encodeURI(JSON.stringify(submitData)));
}
},
error: function (xhr) {
//jsonp 方式此方法不被触发
if (data.returnMessage == undefined) {
if (data.returnMessage == undefined) {
alertWarning(data.errmsg);
} else {
alertWarning("程序错误，请联系管理员！");
}
} else {
alertWarning(data.returnMessage);
}
hideLoading()
console.log("=======error======================")
}
})
closeModal();
}
}
/**
* 重置调用方法
* @param {} params
*/
$("#reset").on("click", refresh);
$("#goRecord").click(function () {
//TODO 调用备案接口
});
// 格式化后台返回的时间
if (companyInfo.config.return) {
$("#getInputValue").val(tool.formatDate(companyInfo.nsrsbq));
nowdate = companyInfo.nsrsbq;
drawGrid(companyInfo);
}
//页面出现滚动条，监听滚动条变化将高赋值给模态框
window.onscroll = function () {
$("#myModal").css("top", $(document).scrollTop() + 235);
}
return {
changeDate: changeDate,
reset: reset,
declarationMethod: declarationMethod,
closeModal: closeModal
readDataF: readDataF,
}
}
// 审核
function toExamineFun() {
var html = "<div id='checkBJ'>表间校验</div>"
// myAlert("提示", "允许审核", "确定");
myCheck("审核校验", html, "确定", "取消", function () {
// getTaxDeclaration(nowdate);
});
};
$("#toExamine").on("click", function () {
if (shBz) {
toExamineFun()
} else {
myAlert("提示", "报表填写状态存在“未填写”或“填写错误”，请核对！", "确定");
}
});
\ No newline at end of file
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