Commit dcde7a92 authored by 刘明珠's avatar 刘明珠

逾期、清算添加申报日期列;代码格式化

parent 0c648e04
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
...@@ -10,7 +9,7 @@ ...@@ -10,7 +9,7 @@
<!-- 让IE浏览器用最高级内核渲染页面 还有用 Chrome 框架的页面用webkit 内核 --> <!-- 让IE浏览器用最高级内核渲染页面 还有用 Chrome 框架的页面用webkit 内核 -->
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<!-- IOS6全屏 Chrome高版本全屏 --> <!-- IOS6全屏 Chrome高版本全屏 -->
<meta http-equiv="X-UA-Compatible" content="edge" > <meta http-equiv="X-UA-Compatible" content="edge">
<link href="/web/onlineReport/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="/web/onlineReport/static/tools/css/paging-table.css" /> <link rel="stylesheet" href="/web/onlineReport/static/tools/css/paging-table.css" />
...@@ -27,8 +26,9 @@ ...@@ -27,8 +26,9 @@
<title>申报更正</title> <title>申报更正</title>
</head> </head>
<script> <script>
document.write("<script type='text/javascript' src='/web/onlineReport/static/config.js?time="+Math.random()+"'></"+"script"+">") document.write("<script type='text/javascript' src='/web/onlineReport/static/config.js?time=" + Math.random() + "'></" + "script" + ">")
</script> </script>
<body> <body>
<div class="div-border father-div"> <div class="div-border father-div">
<div class="div-border first-child-div"> <div class="div-border first-child-div">
...@@ -52,10 +52,17 @@ ...@@ -52,10 +52,17 @@
<span>&nbsp;&nbsp;-&nbsp;&nbsp;</span> <span>&nbsp;&nbsp;-&nbsp;&nbsp;</span>
<input readonly id="declarationDateEnd" name="declarationDateEnd" style="width: 10%; display: inline;" type="text" value="" class="Wdate checkId-input check-items-birthday form-control" onfocus="WdatePicker({isShowClear:false,dateFmt:'yyyy-MM-dd'})"> --> <input readonly id="declarationDateEnd" name="declarationDateEnd" style="width: 10%; display: inline;" type="text" value="" class="Wdate checkId-input check-items-birthday form-control" onfocus="WdatePicker({isShowClear:false,dateFmt:'yyyy-MM-dd'})"> -->
<span>&nbsp;&nbsp;税款所属期起止:</span> <span>&nbsp;&nbsp;税款所属期起止:</span>
<input readonly id="durationOfTaxStart" name="durationOfTaxStart" style="width: 10%; display: inline;min-width: 150px" type="text" class="Wdate checkId-input check-items-birthday form-control" onfocus="WdatePicker({isShowClear:false,dateFmt:'yyyy-MM-dd'})"> <input readonly id="durationOfTaxStart" name="durationOfTaxStart"
style="width: 10%; display: inline;min-width: 150px" type="text"
class="Wdate checkId-input check-items-birthday form-control"
onfocus="WdatePicker({isShowClear:false,dateFmt:'yyyy-MM-dd'})">
<span>&nbsp;&nbsp;-&nbsp;&nbsp;</span> <span>&nbsp;&nbsp;-&nbsp;&nbsp;</span>
<input readonly id="durationOfTaxEnd" name="durationOfTaxEnd" style="width: 10%; display: inline;min-width: 150px" type="text" class="Wdate checkId-input check-items-birthday form-control" onfocus="WdatePicker({isShowClear:false,dateFmt:'yyyy-MM-dd'})"> <input readonly id="durationOfTaxEnd" name="durationOfTaxEnd"
<input class="btn btn-primary btn-search margin-left" style="margin-top: -5px;" type="button" id="getAmendData" value="查询" /> style="width: 10%; display: inline;min-width: 150px" type="text"
class="Wdate checkId-input check-items-birthday form-control"
onfocus="WdatePicker({isShowClear:false,dateFmt:'yyyy-MM-dd'})">
<input class="btn btn-primary btn-search margin-left" style="margin-top: -5px;" type="button"
id="getAmendData" value="查询" />
</div> </div>
<div style="height:16px;"></div> <div style="height:16px;"></div>
<div id="taxAmendGrid"></div> <div id="taxAmendGrid"></div>
...@@ -95,7 +102,7 @@ ...@@ -95,7 +102,7 @@
// } // }
// --> // -->
var initpage; var initpage;
$(function(){ $(function () {
showLoading(); showLoading();
$.ajax({ $.ajax({
type: "post", type: "post",
...@@ -131,7 +138,7 @@ ...@@ -131,7 +138,7 @@
// 弹出错误对话框 // 弹出错误对话框
} }
}, },
error: function(xhr){ error: function (xhr) {
//jsonp 方式此方法不被触发 //jsonp 方式此方法不被触发
console.log("=======error======================") console.log("=======error======================")
} }
......
<!doctype html> <!doctype html>
<html> <html>
...@@ -10,7 +9,7 @@ ...@@ -10,7 +9,7 @@
<!-- 让IE浏览器用最高级内核渲染页面 还有用 Chrome 框架的页面用webkit 内核 --> <!-- 让IE浏览器用最高级内核渲染页面 还有用 Chrome 框架的页面用webkit 内核 -->
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<!-- IOS6全屏 Chrome高版本全屏 --> <!-- IOS6全屏 Chrome高版本全屏 -->
<meta http-equiv="X-UA-Compatible" content="edge" > <meta http-equiv="X-UA-Compatible" content="edge">
<link href="/web/onlineReport/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="/web/onlineReport/static/tools/css/scroll.css" /> <link rel="stylesheet" href="/web/onlineReport/static/tools/css/scroll.css" />
...@@ -26,14 +25,16 @@ ...@@ -26,14 +25,16 @@
<title>清税注销清册</title> <title>清税注销清册</title>
</head> </head>
<script> <script>
document.write("<script type='text/javascript' src='/web/onlineReport/static/config.js?time="+Math.random()+"'></"+"script"+">") document.write("<script type='text/javascript' src='/web/onlineReport/static/config.js?time=" + Math.random() + "'></" + "script" + ">")
</script> </script>
<body> <body>
<div style="background-color:#FFFFFF;"> <div style="background-color:#FFFFFF;">
<div style="padding: 25px;"> <div style="padding: 25px;">
<div class="div-border" style="padding-bottom: 20px;height: 60px;"> <div class="div-border" style="padding-bottom: 20px;height: 60px;">
<img style="float:left;display:block" src="/web/onlineReport/static/tools/images/cancellation.png">&nbsp;&nbsp; <img style="float:left;display:block" src="/web/onlineReport/static/tools/images/cancellation.png">&nbsp;&nbsp;
<span style="float:left;display:block;margin-left: 10px;margin-top: 9px;top: 10px;" class="span-title">清税注销清册</span> <span style="float:left;display:block;margin-left: 10px;margin-top: 9px;top: 10px;"
class="span-title">清税注销清册</span>
</div> </div>
<div class="div-clear-folat" style="padding-top: 10px;"> <div class="div-clear-folat" style="padding-top: 10px;">
<strong>税费申报</strong> <strong>税费申报</strong>
...@@ -81,11 +82,11 @@ ...@@ -81,11 +82,11 @@
// // 弹出错误对话框 // // 弹出错误对话框
// } // }
var initpage; var initpage;
$(function(){ $(function () {
showLoading(); showLoading();
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: config.url+"/ssfwpt/liquidation/tax_info", url: config.url + "/ssfwpt/liquidation/tax_info",
dataType: "json", // 请求方式为jsonp dataType: "json", // 请求方式为jsonp
// async: false, // async: false,
data: { data: {
...@@ -109,20 +110,27 @@ ...@@ -109,20 +110,27 @@
hideLoading(); hideLoading();
// initpage = initPage(""); // initpage = initPage("");
alertWarning(companyInfo.returnMessage); alertWarning(companyInfo.returnMessage);
if (!companyInfo.bean) {
companyInfo.bean = {};
companyInfo.bean.djxh = getUrlParam("djxh");
companyInfo.bean.return = false;
}
companyInfo.bean.config = config
initpage = initPage(companyInfo.bean);
return false; return false;
// 弹出错误对话框 // 弹出错误对话框
} }
$("#getInputValue").on("focus", function() { $("#getInputValue").on("focus", function () {
WdatePicker({ WdatePicker({
isShowClear:false, isShowClear: false,
dateFmt: 'yyyy-MM', dateFmt: 'yyyy-MM',
onpicking: function(dp){ onpicking: function (dp) {
initpage.changeDate(this, dp); initpage.changeDate(this, dp);
} }
}); });
}); });
}, },
error: function(xhr){ error: function (xhr) {
//jsonp 方式此方法不被触发 //jsonp 方式此方法不被触发
console.log("=======error======================") console.log("=======error======================")
} }
......
...@@ -173,11 +173,18 @@ ...@@ -173,11 +173,18 @@
} else { } else {
hideLoading(); hideLoading();
if(companyInfo.errmsg!=undefined){ if (companyInfo.errmsg != undefined) {
alertWarning(companyInfo.errmsg); alertWarning(companyInfo.errmsg);
}else{ } else {
alertWarning(companyInfo.returnMessage); alertWarning(companyInfo.returnMessage);
} }
if (!companyInfo.bean) {
companyInfo.bean = {};
companyInfo.bean.djxh = getUrlParam("djxh");
companyInfo.bean.return = false;
}
companyInfo.bean.config = config
initpage = initPage(companyInfo.bean);
// alertWarning(companyInfo.errmsg); // alertWarning(companyInfo.errmsg);
// companyInfo.bean.config = config // companyInfo.bean.config = config
// initpage = initPage(companyInfo.bean); // initpage = initPage(companyInfo.bean);
......
This diff is collapsed.
This diff is collapsed.
...@@ -171,7 +171,7 @@ function initPage(companyInfo) { ...@@ -171,7 +171,7 @@ function initPage(companyInfo) {
Object.defineProperty(mlistener, 'returnSelectRowData', { Object.defineProperty(mlistener, 'returnSelectRowData', {
set: function (val) { set: function (val) {
setTimeout(function () { setTimeout(function () {
getTaxDeclaration(sbqDate, "N",'2'); getTaxDeclaration(sbqDate, "N", '2');
}, 1000); }, 1000);
} }
}) })
...@@ -298,13 +298,13 @@ function initPage(companyInfo) { ...@@ -298,13 +298,13 @@ function initPage(companyInfo) {
// 加了一个延时,时间改变后时间框没有收起隐藏就加载数据,没有找到好的解决办法,暂时用延时处理 // 加了一个延时,时间改变后时间框没有收起隐藏就加载数据,没有找到好的解决办法,暂时用延时处理
sbqDate = date sbqDate = date
setTimeout(function () { setTimeout(function () {
getTaxDeclaration(date, "N",'1'); getTaxDeclaration(date, "N", '1');
}, 50); }, 50);
}; };
var refresh = function () { var refresh = function () {
myConfirm("消息", "您确定需要重置申报清册吗?点击确定继续", "确定", "取消", function () { myConfirm("消息", "您确定需要重置申报清册吗?点击确定继续", "确定", "取消", function () {
getTaxDeclaration(nowdate, "Y",'1'); getTaxDeclaration(nowdate, "Y", '1');
}); });
}; };
//申报方式 当iszzsybjc=01同时pzzlDm=010101时,调用改方法 //申报方式 当iszzsybjc=01同时pzzlDm=010101时,调用改方法
...@@ -324,7 +324,7 @@ function initPage(companyInfo) { ...@@ -324,7 +324,7 @@ function initPage(companyInfo) {
Object.defineProperty(mlistener, 'returnSelectRowData', { Object.defineProperty(mlistener, 'returnSelectRowData', {
set: function (val) { set: function (val) {
setTimeout(function () { setTimeout(function () {
getTaxDeclaration(sbqDate, "N",'2'); getTaxDeclaration(sbqDate, "N", '2');
}, 1000); }, 1000);
} }
}) })
...@@ -345,7 +345,7 @@ function initPage(companyInfo) { ...@@ -345,7 +345,7 @@ function initPage(companyInfo) {
}, },
success: function (data) { success: function (data) {
hideLoading() hideLoading()
if(data.code == 99 || data.code == "99"){ if (data.code == 99 || data.code == "99") {
alertWarning(data.errmsg); alertWarning(data.errmsg);
return false return false
} }
...@@ -354,15 +354,16 @@ function initPage(companyInfo) { ...@@ -354,15 +354,16 @@ function initPage(companyInfo) {
if (data.url == "edit.jsp") { if (data.url == "edit.jsp") {
submitData.flag = true; submitData.flag = true;
submitData.encryptKey = config.value; submitData.encryptKey = config.value;
var url = config.spreadUrl+"/online_report/declare/toPzzl?falg=" + falg var url = config.spreadUrl + "/online_report/declare/toPzzl?falg=" + falg
var form = $("#changeForm"); var form = $("#changeForm");
form.attr('action',url); //通过jquery为action属性赋值 form.attr('action', url); //通过jquery为action属性赋值
form.find("#changeForm_data").val(JSON.stringify(submitData)); form.find("#changeForm_data").val(JSON.stringify(submitData));
form.submit(); form.submit();
// window.open(config.spreadUrl+"/online_report/declare/toPzzl?falg=" + falg + '&data=' + JSON.stringify(submitData)); // 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))); // 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(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(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)));
......
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