Commit a1d0c5a6 authored by 彭令令's avatar 彭令令

合并开发分支代码

parent 26b581d0
......@@ -29,22 +29,18 @@
</script>
<body>
<div>
<div>
<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;
<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-float" style="padding-bottom: 8px; width: 100%;position :relative">
<span>申报月份:</span>
<input readonly id="getInputValue" name="birth_date" style="width: 10%; display: inline;min-width: 150px"
type="text" class="Wdate checkId-input check-items-birthday form-control">
<input id="reset" class="btn btn-primary tdDong-btn"
style="margin-right: 10%;margin-right: 10px;height: 32px;margin-top: 5px;position:absolute;right: 120px;"
type="button" value="重置申报清册" />
<input readonly id="getInputValue" name="birth_date" style="width: 10%; display: inline;min-width: 150px" type="text" class="Wdate checkId-input check-items-birthday form-control">
<input id="reset" class="btn btn-primary tdDong-btn" style="margin-right: 10%;margin-right: 10px;height: 32px;margin-top: 5px;position:absolute;right: 120px;" type="button" value="重置申报清册" />
</div>
</div>
</br>
......@@ -60,17 +56,14 @@
<div class="reminder"><span class="span-font-size">请点此处&nbsp;&nbsp;<label for="reset" id="reset1"
class="label_declare">重置申报清册</label>&nbsp;&nbsp;对该户清册进行重新生成。</span>
</div>
<div class="reminder"><span
class="span-font-size">2、点击页眉&nbsp;&nbsp;“申报缴税”&nbsp;&nbsp;即会触发下属首个菜单&nbsp;&nbsp;“按期应申报”&nbsp;&nbsp;,无需再点击&nbsp;&nbsp;“按期应申报”&nbsp;&nbsp;</span>
<div class="reminder"><span class="span-font-size">2、点击页眉&nbsp;&nbsp;“申报缴税”&nbsp;&nbsp;即会触发下属首个菜单&nbsp;&nbsp;“按期应申报”&nbsp;&nbsp;,无需再点击&nbsp;&nbsp;“按期应申报”&nbsp;&nbsp;</span>
</div>
<div class="reminder"><span class="span-font-size">如发现清册重复,也请点击前述链接&nbsp;&nbsp;“重置申报清册”&nbsp;&nbsp;</span>
</div>
<div class="reminder"><span class="span-font-size">无上述1、2情况请勿点击重置。</span></div>
<div class="reminder"><span
class="span-font-size">3、仅当操作期间申报状态有变化时点&nbsp;&nbsp;“刷新”&nbsp;&nbsp;,切换月份、刚进入本页面、申报完成后本页面已显示&nbsp;&nbsp;“已申报”&nbsp;&nbsp;等情形无需刷新。</span>
<div class="reminder"><span class="span-font-size">3、仅当操作期间申报状态有变化时点&nbsp;&nbsp;“刷新”&nbsp;&nbsp;,切换月份、刚进入本页面、申报完成后本页面已显示&nbsp;&nbsp;“已申报”&nbsp;&nbsp;等情形无需刷新。</span>
</div>
<div class="reminder"><span
class="span-font-size">4、如发现&nbsp;&nbsp;“刷新”&nbsp;&nbsp;后的申报日期和状态不是最新情况,通常是因为&nbsp;&nbsp;“刷新”&nbsp;&nbsp;按钮所查数据同步延时所致,</span>
<div class="reminder"><span class="span-font-size">4、如发现&nbsp;&nbsp;“刷新”&nbsp;&nbsp;后的申报日期和状态不是最新情况,通常是因为&nbsp;&nbsp;“刷新”&nbsp;&nbsp;按钮所查数据同步延时所致,</span>
</div>
<div class="reminder"><span class="span-font-size">如遇此情况,等几秒钟再&nbsp;&nbsp;“刷新”&nbsp;&nbsp;或退出后稍后重进申报清册查看。</span>
</div>
......@@ -80,7 +73,7 @@
</div>
</div>
</div>
</div>
</div>
<input type='hidden' name='data' value="${token}" id="token">
<input type='hidden' name='data' value="${djxh}" id="djxh">
......@@ -102,10 +95,7 @@
<div class="myModal-body-div" style="clear:both;padding-top: 10px;">
<div style="line-height: 40px;margin: 10px;font-size: 14px;">
<div id="ybName"></div>
<button class="btn btn-primary ybDeclaration1" id="ybDeclaration"
onmouseover="this.className='btn ybDeclaration'"
onmouseout="this.className='btn btn-primary ybDeclaration1'"
onclick="initpage.declarationMethod('Y')">一表集成</button>
<button class="btn btn-primary ybDeclaration1" id="ybDeclaration" onmouseover="this.className='btn ybDeclaration'" onmouseout="this.className='btn btn-primary ybDeclaration1'" onclick="initpage.declarationMethod('Y')">一表集成</button>
</div>
</div>
<img class="img-ybjc-modal" onclick="initpage.closeModal()" src="../../static/tools/images/close.png">
......@@ -121,7 +111,9 @@
<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/declare_grid.js?v=1.0"></script>
<script>
document.write("<script type='text/javascript' src='../../static/biz/declare_grid.js?time=" + Math.random() + "'></" + "script" + ">")
</script>
<script>
// <!-- // 使用 el 表达式,将返回的信息写到此处,然后调用页面绘制方法绘制页面
// var companyInfo = ${json};
......@@ -141,7 +133,6 @@
// alertWarning("请求失败!");
// // 弹出错误对话框
// }
</script>
</html>
\ No newline at end of file
......@@ -4,7 +4,7 @@ var yearBblxDm = ['10414', '10420'];
var ccxwsBblxDm = ['12101']
var prefix = "";
$(function () {
$(function() {
if (config.environmental == 'test') {
prefix = "/web";
} else if (config.environmental == 'production') {
......@@ -26,10 +26,12 @@ function getInitTable() {
sbsq: '',
pzzlDm: getUrlParam("pzzlDm")
},
success: function (data) { //客户端jquery预先定义好的callback函数,成功获取跨域服务器上的json数据后,会动态执行这个callback函数
success: function(data, status, xhr) { //客户端jquery预先定义好的callback函数,成功获取跨域服务器上的json数据后,会动态执行这个callback函数
hideLoading();
//el表达式变jq
// $("#token").attr("value","");
var Authorization = xhr.getResponseHeader("Authorization")
sessionStorage.setItem("Authorization", Authorization);
var companyInfo = data;
$("#djxh").attr("value", companyInfo.djxh);
if (companyInfo.returnCode == "00") {
......@@ -56,17 +58,17 @@ function getInitTable() {
return false;
// 弹出错误对话框
}
$("#getInputValue").on("focus", function () {
$("#getInputValue").on("focus", function() {
WdatePicker({
isShowClear: false,
dateFmt: 'yyyy-MM',
onpicking: function (dp) {
onpicking: function(dp) {
initpage.changeDate(this, dp);
}
});
});
},
error: function (xhr) {
error: function(xhr) {
//jsonp 方式此方法不被触发
console.log("=======error======================")
}
......@@ -94,9 +96,9 @@ function initPage(companyInfo) {
/**
* 展示税种申报信息
*/
var showTax = function (taxInfo) {
var showTax = function(taxInfo) {
//时间格式化
$.each(taxInfo, function (i, item) {
$.each(taxInfo, function(i, item) {
if (item.sssqQ) {
item.sssqQ = tool.formatDate(item.sssqQ);
}
......@@ -106,14 +108,14 @@ function initPage(companyInfo) {
if (item.sbrq) {
item.sbrq = tool.formatDate(item.sbrq);
}
if (item.bblxDm=='30101') {
if (item.bblxDm == '30101') {
item.sssqQ = "-";
item.sssqZ = "-";
}
})
var id = "#taxGrid";
var buttonHtml = "填写申报表";
var order = ["pzzlMc", "djxh", "zgswskfjMc","sssqQ", "sssqZ", "sbrq", "do"];
var order = ["pzzlMc", "djxh", "zgswskfjMc", "sssqQ", "sssqZ", "sbrq", "do"];
var promptStatement = "";
var headerList = [{
name: "序号",
......@@ -142,16 +144,17 @@ function initPage(companyInfo) {
}, {
name: "操作",
width: "10%"
}];
}
];
//渲染表
getTableDeclaration(id, order, headerList, taxInfo, buttonHtml, promptStatement)
};
/**
* 展示财务报表申报信息
*/
var showFinancial = function (financialInfo, type) {
var showFinancial = function(financialInfo, type) {
//时间格式化
$.each(financialInfo, function (i, item) {
$.each(financialInfo, function(i, item) {
if (item.sssqQ) {
item.sssqQ = tool.formatDate(item.sssqQ);
}
......@@ -164,7 +167,7 @@ function initPage(companyInfo) {
})
var id = "#financialGrid";
var buttonHtml = "填写申报表";
var order = ["kjzd", "pzzlMc", "djxh","zgswskfjMc", "sssqQ", "sssqZ", "sbrq", "do"];
var order = ["kjzd", "pzzlMc", "djxh", "zgswskfjMc", "sssqQ", "sssqZ", "sbrq", "do"];
var promptStatement = "";
if (financialInfo.length < 1 && type == 1) {
promptStatement = "您尚未进行财务报表类型备案,请先备案后再进行申报";
......@@ -198,7 +201,8 @@ function initPage(companyInfo) {
}, {
name: "操作",
width: "10%"
}];
}
];
//渲染表
getTableDeclaration(id, order, headerList, financialInfo, buttonHtml, promptStatement)
};
......@@ -212,7 +216,7 @@ function initPage(companyInfo) {
* @param {*} ddt
* @param {*} buttonHtml
*/
var getTableDeclaration = function (id, order, headerList, ddt, buttonHtml, promptStatement) {
var getTableDeclaration = function(id, order, headerList, ddt, buttonHtml, promptStatement) {
var tableObj = {
id: id, //tabel父元素的id
autoHeight: ddt.length > 0 ? 10 : "",
......@@ -230,7 +234,7 @@ function initPage(companyInfo) {
pageSize: ddt.length
},
jsonReady: ddt,
callback: function (data, node) {
callback: function(data, node) {
data.operateType = '6';
data.sbbz = '6';
if (data.sbzt == "Y") {
......@@ -241,7 +245,7 @@ function initPage(companyInfo) {
// 财产行为税
if (ccxwsBblxDm.indexOf(data.bblxDm) != -1) {
// 测试环境start
var openUrl = config.ccxwsTaxTable + '?djxh=' + data.djxh + '&zsDjxh=' + data.zsDjxh + '&nsrsbh=' + data.nsrsbh + '&nsrmc=' + data.nsrmc + '&operateType=cancellation' + '&lybz=online' + '&Authorization='+Authorization //测试环境
var openUrl = config.ccxwsTaxTable + '?djxh=' + data.djxh + '&zsDjxh=' + data.zsDjxh + '&nsrsbh=' + data.nsrsbh + '&nsrmc=' + data.nsrmc + '&operateType=cancellation' + '&lybz=online' + '&Authorization=' + Authorization; //测试环境
// var openUrl = config.ccxwsTaxTable +'?lybz=online' +'&operateType=cancellation'+'&sblx=js' + '&token=' + data.token //正式环境
window.open(openUrl, '_blank');
} else if (data.sourceFlag == "ssfwpt_sbzj") {
......@@ -260,12 +264,38 @@ function initPage(companyInfo) {
window.open(prefix + config.ssfwptPage, '_blank');
}
Object.defineProperty(mlistener, 'returnSelectRowData', {
set: function (val) {
setTimeout(function () {
set: function(val) {
setTimeout(function() {
getInitTable()
}, 1000);
}
})
} else if (submitData.sourceFlag == "ssfwpt_sbzj_version_2") {
window.mlistener = {
selectRowData: {},
urlList: {
getMenu: '/tax_service/getBbLb', //菜单接口
openTable: "/tax_service/open_table", //开表接口
getData: "/tax_service/get_data", //提取数据接口
saveTable: "/tax_service/save_single_sbb_info", //保存
deleteTable: "/tax_service/delete_single_sbb_info", //删除
declareTable: "/tax_service/declare", //申报
downloadFile: "/tax_service/load_declare_file" //下载申报文件接口
}
};
data.fillingFlag = "cancellation" // 填报标记
data.flag = '1' //清算标志 1是清算,空是正常开表
window.mlistener.selectRowData = data;
var openUrl = prefix + config.tableBridge; //测试环境
window.open(openUrl, '_blank');
Object.defineProperty(mlistener, 'returnSelectRowData', {
set: function(val) {
setTimeout(function() {
getTaxDeclaration(sbqDate, "N", '2');
}, 1000);
}
})
} else {
data.djxh = companyInfo.djxh;
data.iszzsybjc = companyInfo.iszzsybjc; // 一表申报代码
......@@ -273,7 +303,7 @@ function initPage(companyInfo) {
// data.nssbq = nowdate;
data.checkTime = false;
if (data.pzzlDm === '11602') {
var List = companyInfo.taxInfos.filter(function (item) {
var List = companyInfo.taxInfos.filter(function(item) {
return item.pzzlDm == '10101' || item.pzzlDm == '10102'
})
if (List.length === 0) {
......@@ -308,7 +338,7 @@ function initPage(companyInfo) {
if (companyInfo) {
url = config.url;
}
var getTaxDeclaration = function (date, type) {
var getTaxDeclaration = function(date, type) {
// TODO 开始加载等待动画
showLoading();
var param = {
......@@ -322,8 +352,9 @@ function initPage(companyInfo) {
url: url + "/online/declare/getPzzlList",
data: param,
type: "POST",
dataType: "JSON"
}).done(function (data) {
dataType: "JSON",
headers: { 'Authorization': sessionStorage.getItem("Authorization") },
}).done(function(data) {
if (data.success) {
companyInfo = data.content;
zjhm = companyInfo.zjhm
......@@ -341,18 +372,18 @@ function initPage(companyInfo) {
alertWarning(data.returnMessage);
}
}
}).always(function (data) {
}).always(function(data) {
hideLoading();
});
};
/**
* 隐藏modal
*/
var closeModal = function () {
var closeModal = function() {
$('#ybName #dName').html("");
$('#myMask #myModal').hide();
}
var drawGrid = function (bean) {
var drawGrid = function(bean) {
if (bean.taxInfos.length == 0) {
alertInfo("税费申报暂无数据");
}
......@@ -376,23 +407,23 @@ function initPage(companyInfo) {
* @param {*} obj
* @param {*} dp
*/
var changeDate = function (obj, dp) {
var changeDate = function(obj, dp) {
date = dp.cal.getNewDateStr();
nowdate = date; // 给缓存时间赋值
// 加了一个延时,时间改变后时间框没有收起隐藏就加载数据,没有找到好的解决办法,暂时用延时处理
setTimeout(function () {
setTimeout(function() {
getTaxDeclaration(date, "N");
}, 50);
};
var refresh = function () {
myConfirm("消息", "您确定需要重置申报清册吗?点击确定继续", "确定", "取消", function () {
var refresh = function() {
myConfirm("消息", "您确定需要重置申报清册吗?点击确定继续", "确定", "取消", function() {
getTaxDeclaration(nowdate, "Y");
});
};
//申报方式 当iszzsybjc=01同时pzzlDm=010101时,调用改方法
var declarationMethod = function (statu) {
var declarationMethod = function(statu) {
submitData.ybjcState = statu;
submitData.value = config.value;
if (submitData.sourceFlag == "ssfwpt_sbzj") {
......@@ -410,12 +441,38 @@ function initPage(companyInfo) {
window.open(prefix + config.yearTaxTable, '_blank');
}
Object.defineProperty(mlistener, 'returnSelectRowData', {
set: function (val) {
setTimeout(function () {
set: function(val) {
setTimeout(function() {
getTaxDeclaration(nowdate, "N");
}, 1000);
}
})
} else if (submitData.sourceFlag == "ssfwpt_sbzj_version_2") {
window.mlistener = {
selectRowData: {},
urlList: {
getMenu: '/tax_service/getBbLb', //菜单接口
openTable: "/tax_service/open_table", //开表接口
getData: "/tax_service/get_data", //提取数据接口
saveTable: "/tax_service/save_single_sbb_info", //保存
deleteTable: "/tax_service/delete_single_sbb_info", //删除
declareTable: "/tax_service/declare", //申报
downloadFile: "/tax_service/load_declare_file" //下载申报文件接口
}
};
data.fillingFlag = "cancellation" // 填报标记
data.flag = '1' //清算标志 1是清算,空是正常开表
window.mlistener.selectRowData = data;
var openUrl = prefix + config.tableBridge; //测试环境
window.open(openUrl, '_blank');
Object.defineProperty(mlistener, 'returnSelectRowData', {
set: function(val) {
setTimeout(function() {
getTaxDeclaration(sbqDate, "N", '2');
}, 1000);
}
})
} else {
var falg = "declare";
localStorage.setItem("data", JSON.stringify(submitData));
......@@ -435,7 +492,7 @@ function initPage(companyInfo) {
drawGrid(companyInfo);
}
//页面出现滚动条,监听滚动条变化将高赋值给模态框
window.onscroll = function () {
window.onscroll = function() {
$("#myModal").css("top", $(document).scrollTop() + 235);
}
return {
......
......@@ -5,7 +5,7 @@ var yearBblxDm = ['10414', '10420'];
var token = "";
var yhsSyxx = {};
var prefix = "";
$(function () {
$(function() {
if (config.environmental == 'test') {
prefix = "/web";
} else if (config.environmental == 'production') {
......@@ -29,7 +29,7 @@ function getInitTable() {
pzzlDm: getUrlParam("pzzlDm"),
value: getUrlParam("value")
},
success: function (data) { //客户端jquery预先定义好的callback函数,成功获取跨域服务器上的json数据后,会动态执行这个callback函数
success: function(data) { //客户端jquery预先定义好的callback函数,成功获取跨域服务器上的json数据后,会动态执行这个callback函数
hideLoading();
var companyInfo = data;
if (companyInfo.returnCode == '00') {
......@@ -59,18 +59,18 @@ function getInitTable() {
initpage = initPage(companyInfo.content);
// 弹出错误对话框
}
$("#getInputValue").on("focus", function () {
$("#getInputValue").on("focus", function() {
WdatePicker({
isShowClear: false,
dateFmt: 'yyyy-MM',
onpicking: function (dp) {
onpicking: function(dp) {
initpage.changeDate(this, dp);
}
});
});
},
error: function (xhr) {
error: function(xhr) {
hideLoading();
//jsonp 方式此方法不被触发
console.log("=======error======================")
......@@ -99,7 +99,7 @@ function initPage(companyInfo) {
/**
* 展示税种申报信息
*/
var showTax = function (taxInfo) {
var showTax = function(taxInfo) {
if (taxInfo.length > 0) {
for (var i = 0; i < taxInfo.length; i++) {
if (taxInfo[i].sbrq) {
......@@ -154,7 +154,7 @@ function initPage(companyInfo) {
* @param {*} ddt
* @param {*} buttonHtml
*/
var getTableDeclaration = function (id, order, headerList, ddt, buttonHtml, promptStatement) {
var getTableDeclaration = function(id, order, headerList, ddt, buttonHtml, promptStatement) {
var tableObj = {
id: id, //tabel父元素的id
autoHeight: ddt.length > 0 ? 10 : "",
......@@ -172,7 +172,7 @@ function initPage(companyInfo) {
pageSize: ddt.length
},
jsonReady: ddt,
callback: function (data, node) {
callback: function(data, node) {
data.operateType = '3';
data.sbbz = '3';
data.value = config.value;
......@@ -205,8 +205,8 @@ function initPage(companyInfo) {
"zsDjxh": data.zsDjxh,
"stateType": "add",
"sycjType": "yhs",
"sourceFlag":"kjsb",
"Authorization":data.value
"sourceFlag": "kjsb",
"Authorization": data.value
}
if (JSON.stringify(yhsSyxx) != '{}') {
openCollectYHS.stateType = "edit";
......@@ -225,14 +225,16 @@ function initPage(companyInfo) {
}
var urlList = {
openTable: "/" + url + "/yhs/openTable",
saveSbbInfo: "/" + url + "/yhs/saveSbbInfo "
saveSbbInfo: "/" + url + "/yhs/saveSbbInfo",
getTxss: "/" + url + "/tsxx/tsxxGet",
saveTxss: "/" + url + "/tsxx/tsxxSave",
}
window.mlistener.selectRowData = openCollectYHS;
window.mlistener.urlList = urlList;
window.open(prefix + config.collectPage, '_blank');
Object.defineProperty(mlistener, 'returnSelectRowData', {
set: function (val) {
setTimeout(function () {
set: function(val) {
setTimeout(function() {
getTaxDeclaration(sbqDate, 'N');
}, 1000);
}
......@@ -244,7 +246,7 @@ function initPage(companyInfo) {
data.nssbq = nowdate;
data.checkTime = false;
if (data.pzzlDm === '11602') {
var List = companyInfo.taxInfos.filter(function (item) {
var List = companyInfo.taxInfos.filter(function(item) {
return item.pzzlDm == '10101' || item.pzzlDm == '10102'
})
if (List.length === 0) {
......@@ -277,7 +279,7 @@ function initPage(companyInfo) {
if (companyInfo) {
url = companyInfo.config.url;
}
var getTaxDeclaration = function (date,type) {
var getTaxDeclaration = function(date, type) {
// TODO 开始加载等待动画
showLoading();
var param = {
......@@ -292,7 +294,7 @@ function initPage(companyInfo) {
data: param,
type: "POST",
dataType: "JSON",
}).done(function (data) {
}).done(function(data) {
hideLoading();
if (data.returnCode) {
if (data.returnCode != '00') {
......@@ -318,11 +320,11 @@ function initPage(companyInfo) {
alertWarning(data.returnMessage);
}
}
}).always(function (data) {
}).always(function(data) {
hideLoading();
});
};
var resetInventory = function (date) {
var resetInventory = function(date) {
// TODO 开始加载等待动画
showLoading();
console.log('companyInfo', companyInfo);
......@@ -339,30 +341,30 @@ function initPage(companyInfo) {
data: param,
type: "POST",
dataType: "JSON",
}).done(function (data) {
}).done(function(data) {
hideLoading();
if (!data.success) {
myAlert("提示", data.returnMessage, "确定")
return
}
getTaxDeclaration(date, 'Y')
}).always(function (data) {
}).always(function(data) {
hideLoading();
});
};
/**
* 隐藏modal
*/
var closeModal = function () {
var closeModal = function() {
$('#ybName').html("");
$('#dName').html("");
$('#myMask').hide();
$('#myModal').hide();
}
var drawGrid = function (bean) {
var drawGrid = function(bean) {
//两个表合成一个表
$.each(bean.financialInfos, function (i, item) {
$.each(bean.financialInfos, function(i, item) {
bean.taxInfos.push(item);
});
if (bean.taxInfos.length == 0) {
......@@ -379,23 +381,23 @@ function initPage(companyInfo) {
* @param {*} obj
* @param {*} dp
*/
var changeDate = function (obj, dp) {
var changeDate = function(obj, dp) {
date = dp.cal.getNewDateStr();
nowdate = date; // 给缓存时间赋值
// 加了一个延时,时间改变后时间框没有收起隐藏就加载数据,没有找到好的解决办法,暂时用延时处理
sbqDate = date
setTimeout(function () {
setTimeout(function() {
getTaxDeclaration(date, 'N');
}, 50);
};
var refresh = function () {
myConfirm("消息", "您确定需要重置申报清册吗?点击确定继续", "确定", "取消", function () {
var refresh = function() {
myConfirm("消息", "您确定需要重置申报清册吗?点击确定继续", "确定", "取消", function() {
resetInventory(nowdate, "Y");
});
};
//申报方式 当iszzsybjc=01同时pzzlDm=010101时,调用改方法
var declarationMethod = function (statu) {
var declarationMethod = function(statu) {
submitData.ybjcState = statu;
submitData.value = config.value;
//需要判断在线还是税表的开关
......@@ -415,8 +417,8 @@ function initPage(companyInfo) {
window.open(prefix + config.yearTaxTable, '_blank');
}
Object.defineProperty(mlistener, 'returnSelectRowData', {
set: function (val) {
setTimeout(function () {
set: function(val) {
setTimeout(function() {
getTaxDeclaration(sbqDate, 'N');
}, 1000);
}
......@@ -440,7 +442,7 @@ function initPage(companyInfo) {
* @param {} params
*/
$("#reset,#reset1").on("click", refresh);
$("#goRecord").click(function () {
$("#goRecord").click(function() {
//TODO 调用备案接口
});
// 格式化后台返回的时间
......@@ -450,7 +452,7 @@ function initPage(companyInfo) {
drawGrid(companyInfo);
}
//页面出现滚动条,监听滚动条变化将高赋值给模态框
window.onscroll = function () {
window.onscroll = function() {
$("#myModal").css("top", $(document).scrollTop() + 235);
}
return {
......
......@@ -4,7 +4,7 @@ var sbqDate = '';
var yearBblxDm = ['10414', '10420'];
var sfyhzctsBz = "";
var prefix = "";
$(function () {
$(function() {
if (config.environmental == 'test') {
prefix = "/web";
} else if (config.environmental == 'production') {
......@@ -26,8 +26,10 @@ function getInitTable() {
sbsq: "",
pzzlDm: getUrlParam("pzzlDm"),
},
success: function (data) { //客户端jquery预先定义好的callback函数,成功获取跨域服务器上的json数据后,会动态执行这个callback函数
success: function(data, status, xhr) { //客户端jquery预先定义好的callback函数,成功获取跨域服务器上的json数据后,会动态执行这个callback函数
hideLoading();
var Authorization = xhr.getResponseHeader("Authorization")
sessionStorage.setItem("Authorization", Authorization);
var companyInfo = data;
if (companyInfo.success) {
zjhm = companyInfo.bean.zjhm
......@@ -48,7 +50,7 @@ function getInitTable() {
}
}
if (skssq == '20210930') {
getJjkjTag(djxhbz,companyInfo.bean.sbsq.replace(/\-/g, ""))
getJjkjTag(djxhbz, companyInfo.bean.sbsq.replace(/\-/g, ""))
}
} else {
......@@ -67,18 +69,18 @@ function getInitTable() {
initpage = initPage(companyInfo.bean);
// 弹出错误对话框
}
$("#getInputValue").on("focus", function () {
$("#getInputValue").on("focus", function() {
WdatePicker({
isShowClear: false,
dateFmt: 'yyyy-MM',
onpicking: function (dp) {
onpicking: function(dp) {
initpage.changeDate(this, dp);
}
});
});
},
error: function (xhr) {
error: function(xhr) {
hideLoading();
//jsonp 方式此方法不被触发
console.log("=======error======================")
......@@ -86,20 +88,21 @@ function getInitTable() {
})
}
// 获取研发费用加计扣减标志
function getJjkjTag(djxh,nsrsbq) {
function getJjkjTag(djxh, nsrsbq) {
$.ajax({
type: "post",
url: config.url + "/online/zxtb/get_yffyjjkcbz",
dataType: "json", // 请求方式为jsonp
headers: { 'Authorization': sessionStorage.getItem("Authorization") },
// async: false
data: {
djxh: djxh,
nsrsbq:nsrsbq
nsrsbq: nsrsbq
},
success: function (data) { //客户端jquery预先定义好的callback函数,成功获取跨域服务器上的json数据后,会动态执行这个callback函数
success: function(data) { //客户端jquery预先定义好的callback函数,成功获取跨域服务器上的json数据后,会动态执行这个callback函数
hideLoading();
var companyInfo = data;
if (companyInfo.returnCode=='00') {
if (companyInfo.returnCode == '00') {
// console.log('9月7号这个接口返回成功啦!!!!')
if (companyInfo.content == 'Y') {
myAlert("提示", "按照最新政策规定,企业(负面清单行业除外)自2021年三季度预缴开始,可就前三季度研发费用申报享受加计扣除。同时,制造业享受研发费用加计扣除比例由75%提高到100%。", "确定");
......@@ -115,7 +118,7 @@ function getJjkjTag(djxh,nsrsbq) {
// 弹出错误对话框
}
},
error: function (xhr) {
error: function(xhr) {
hideLoading();
//jsonp 方式此方法不被触发
console.log("=======error======================")
......@@ -144,13 +147,13 @@ function initPage(companyInfo) {
/**
* 展示税种申报信息
*/
var showTax = function (taxInfo) {
var showTax = function(taxInfo) {
if (taxInfo.length > 0) {
for (var i = 0; i < taxInfo.length; i++) {
if (taxInfo[i].sbrq) {
taxInfo[i].sbrq = tool.formatDate(taxInfo[i].sbrq.split(" ")[0]);
}
if (taxInfo[i].bblxDm=='30101' || taxInfo[i].bblxDm=='30103') {
if (taxInfo[i].bblxDm == '30101' || taxInfo[i].bblxDm == '30103') {
taxInfo[i].sssqQ = "-";
taxInfo[i].sssqZ = "-";
}
......@@ -158,7 +161,7 @@ function initPage(companyInfo) {
}
var id = "#taxGrid";
var buttonHtml = "填写申报表";
var order = ["pzzlMc", "djxh","zgswskfjMc", "sssqQ", "sssqZ", "sbrq", "do"];
var order = ["pzzlMc", "djxh", "zgswskfjMc", "sssqQ", "sssqZ", "sbrq", "do"];
var promptStatement = "";
var headerList = [{
name: "序号",
......@@ -187,7 +190,8 @@ function initPage(companyInfo) {
}, {
name: "操作",
width: "10%"
}];
}
];
//渲染表
getTableDeclaration(id, order, headerList, taxInfo, buttonHtml, promptStatement)
};
......@@ -199,7 +203,7 @@ function initPage(companyInfo) {
* @param {*} ddt
* @param {*} buttonHtml
*/
var getTableDeclaration = function (id, order, headerList, ddt, buttonHtml, promptStatement) {
var getTableDeclaration = function(id, order, headerList, ddt, buttonHtml, promptStatement) {
var tableObj = {
id: id, //tabel父元素的id
autoHeight: ddt.length > 0 ? 10 : "",
......@@ -217,7 +221,7 @@ function initPage(companyInfo) {
pageSize: ddt.length
},
jsonReady: ddt,
callback: function (data, node) {
callback: function(data, node) {
data.operateType = '3';
data.sbbz = '3';
data.value = config.value;
......@@ -229,7 +233,7 @@ function initPage(companyInfo) {
window.mlistener = {
selectRowData: {},
};
data.sfyhzctsBz = sfyhzctsBz//首次进表标志
data.sfyhzctsBz = sfyhzctsBz //首次进表标志
data.fillingFlag = "normal" // 填报标记
data.saveUserId = "zxtb"; // 用户id
data.zjhm = zjhm
......@@ -242,21 +246,47 @@ function initPage(companyInfo) {
window.open(prefix + config.yearTaxTable, '_blank');
}
Object.defineProperty(mlistener, 'returnSelectRowData', {
set: function (val) {
setTimeout(function () {
set: function(val) {
setTimeout(function() {
getTaxDeclaration(sbqDate, "N", '2');
}, 1000);
}
})
} else if (data.sourceFlag == "ssfwpt_sbzj_version_2") { //税表组件2.0
window.mlistener = {
selectRowData: {},
urlList: {
getMenu: '/tax_service/getBbLb', //菜单接口
openTable: "/tax_service/open_table", //开表接口
getData: "/tax_service/get_data", //提取数据接口
saveTable: "/tax_service/save_single_sbb_info", //保存
deleteTable: "/tax_service/delete_single_sbb_info", //删除
declareTable: "/tax_service/declare", //申报
downloadFile: "/tax_service/load_declare_file" //下载申报文件接口
}
};
data.sfyhzctsBz = sfyhzctsBz //首次进表标志
data.fillingFlag = "normal" // 填报标记
data.flag = '' //清算标志 1是清算,空是正常开表
window.mlistener.selectRowData = data;
var openUrl = prefix + config.tableBridge; //测试环境
window.open(openUrl, '_blank');
Object.defineProperty(mlistener, 'returnSelectRowData', {
set: function(val) {
setTimeout(function() {
getTaxDeclaration(sbqDate, "N", '2');
}, 1000);
}
})
} else {
data.sfyhzctsBz = sfyhzctsBz//首次进表标志
data.sfyhzctsBz = sfyhzctsBz //首次进表标志
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) {
var List = companyInfo.taxInfos.filter(function(item) {
return item.pzzlDm == '10101' || item.pzzlDm == '10102'
})
if (List.length === 0) {
......@@ -289,7 +319,7 @@ function initPage(companyInfo) {
if (companyInfo) {
url = companyInfo.config.url;
}
var getTaxDeclaration = function (date, type, refreshSbzt) {
var getTaxDeclaration = function(date, type, refreshSbzt) {
// TODO 开始加载等待动画
showLoading();
var param = {
......@@ -305,7 +335,8 @@ function initPage(companyInfo) {
data: param,
type: "POST",
dataType: "JSON",
}).done(function (data) {
headers: { 'Authorization': sessionStorage.getItem("Authorization") },
}).done(function(data) {
if (data.success) {
if (data.bean.url == "error.jsp") {
myAlert("提示", data.bean.errorInfo, "确定")
......@@ -326,7 +357,7 @@ function initPage(companyInfo) {
}
}
if (skssq == '20210930') {
getJjkjTag(djxhbz,sbqDate.replace(/\-/g, ""))
getJjkjTag(djxhbz, sbqDate.replace(/\-/g, ""))
}
} else {
if (data.errmsg != undefined) {
......@@ -335,35 +366,35 @@ function initPage(companyInfo) {
alertWarning(data.returnMessage);
}
}
}).always(function (data) {
}).always(function(data) {
hideLoading();
});
};
/**
* 隐藏modal
*/
var closeModal = function () {
var closeModal = function() {
$('#ybName').html("");
$('#dName').html("");
$('#myMask').hide();
$('#myModal').hide();
}
var drawGrid = function (bean) {
var drawGrid = function(bean) {
//两个表合成一个表
$.each(bean.financialInfos, function (i, item) {
$.each(bean.financialInfos, function(i, item) {
bean.taxInfos.push(item);
});
/*wds add 增量房*/
var clf={}
for(var i in bean.taxInfos){
if(bean.taxInfos[i].pzzlDm=='12001'){
clf=bean.taxInfos[i]
var clf = {}
for (var i in bean.taxInfos) {
if (bean.taxInfos[i].pzzlDm == '12001') {
clf = bean.taxInfos[i]
}
}
// console.log(clf)
// console.log(clf.sksssjq)
var obj={
var obj = {
bblxDm: "12002",
bblxMc: "《增量房交易税收申报表》",
bczt: "W",
......@@ -389,8 +420,8 @@ function initPage(companyInfo) {
nsrlx: null,
nsrmc: "",
nsrsbh: bean.nsrsbh,
nsrsbq: bean.sbsq.replace(/\-/g,""),
nssbq: bean.sbsq.replace(/\-/g,""),
nsrsbq: bean.sbsq.replace(/\-/g, ""),
nssbq: bean.sbsq.replace(/\-/g, ""),
nssbqq2: null,
nssbqz2: null,
operateType: bean.operateType,
......@@ -413,12 +444,12 @@ function initPage(companyInfo) {
sfyczb: "N",
skssqq: null,
skssqz: null,
sksssjq: clf.sksssjq?clf.sksssjq:"",
sksssjz: clf.sksssjq?clf.sksssjz:"",
sksssjq: clf.sksssjq ? clf.sksssjq : "",
sksssjz: clf.sksssjq ? clf.sksssjz : "",
sourceFlag: "ssfwpt_sbzj",
ssdabh: "",
sssqQ: clf.sssqQ?clf.sssqQ:'-',
sssqZ: clf.sssqZ?clf.sssqZ:'-',
sssqQ: clf.sssqQ ? clf.sssqQ : '-',
sssqZ: clf.sssqZ ? clf.sssqZ : '-',
swjgmc: null,
token: "",
tsxx: null,
......@@ -434,15 +465,15 @@ function initPage(companyInfo) {
zsxmDm: "",
}
// console.log(obj)
var obj1=[]
for(var i in bean.taxInfos){
var obj1 = []
for (var i in bean.taxInfos) {
obj1.push(bean.taxInfos[i].pzzlDm)
}
if (bean.taxInfos.length == 0) {
showTax(bean.taxInfos);
alertInfo("税费申报暂无数据");
} else {
if(obj1.includes('12001')){
if (obj1.indexOf('12001') > -1) {
bean.taxInfos.push(obj)
}
showTax(bean.taxInfos);
......@@ -455,23 +486,23 @@ function initPage(companyInfo) {
* @param {*} obj
* @param {*} dp
*/
var changeDate = function (obj, dp) {
var changeDate = function(obj, dp) {
date = dp.cal.getNewDateStr();
nowdate = date; // 给缓存时间赋值
// 加了一个延时,时间改变后时间框没有收起隐藏就加载数据,没有找到好的解决办法,暂时用延时处理
sbqDate = date
setTimeout(function () {
setTimeout(function() {
getTaxDeclaration(date, "N", '1');
}, 50);
};
var refresh = function () {
myConfirm("消息", "您确定需要重置申报清册吗?点击确定继续", "确定", "取消", function () {
var refresh = function() {
myConfirm("消息", "您确定需要重置申报清册吗?点击确定继续", "确定", "取消", function() {
getTaxDeclaration(nowdate, "Y", '1');
});
};
//申报方式 当iszzsybjc=01同时pzzlDm=010101时,调用改方法
var declarationMethod = function (statu) {
var declarationMethod = function(statu) {
submitData.ybjcState = statu;
submitData.value = config.value;
//需要判断在线还是税表的开关
......@@ -483,16 +514,42 @@ function initPage(companyInfo) {
submitData.saveUserId = "zxtb"; // 用户id
submitData.zjhm = zjhm
window.mlistener.selectRowData = submitData;
if (yearBblxDm.indexOf(data.bblxDm) == -1) {
if (yearBblxDm.indexOf(submitData.bblxDm) == -1) {
window.open(prefix + config.ssfwptPage, '_blank');
} else {
data.saveUserId = "zxtb_singleReport"; // 用户id
data.userId = "zxtb"; // userId
submitData.saveUserId = "zxtb_singleReport"; // 用户id
submitData.userId = "zxtb"; // userId
window.open(prefix + config.yearTaxTable, '_blank');
}
Object.defineProperty(mlistener, 'returnSelectRowData', {
set: function (val) {
setTimeout(function () {
set: function(val) {
setTimeout(function() {
getTaxDeclaration(sbqDate, "N", '2');
}, 1000);
}
})
} else if (submitData.sourceFlag == "ssfwpt_sbzj_version_2") {
window.mlistener = {
selectRowData: {},
urlList: {
getMenu: '/tax_service/getBbLb', //菜单接口
openTable: "/tax_service/open_table", //开表接口
getData: "/tax_service/get_data", //提取数据接口
saveTable: "/tax_service/save_single_sbb_info", //保存
deleteTable: "/tax_service/delete_single_sbb_info", //删除
declareTable: "/tax_service/declare", //申报
downloadFile: "/tax_service/load_declare_file" //下载申报文件接口
}
};
submitData.fillingFlag = "normal" // 填报标记
submitData.flag = '' //清算标志 1是清算,空是正常开表
window.mlistener.selectRowData = submitData;
var openUrl = prefix + config.tableBridge; //测试环境
window.open(openUrl, '_blank');
Object.defineProperty(mlistener, 'returnSelectRowData', {
set: function(val) {
setTimeout(function() {
getTaxDeclaration(sbqDate, "N", '2');
}, 1000);
}
......@@ -516,7 +573,7 @@ function initPage(companyInfo) {
* @param {} params
*/
$("#reset,#reset1").on("click", refresh);
$("#goRecord").click(function () {
$("#goRecord").click(function() {
//TODO 调用备案接口
});
// 格式化后台返回的时间
......@@ -526,7 +583,7 @@ function initPage(companyInfo) {
drawGrid(companyInfo);
}
//页面出现滚动条,监听滚动条变化将高赋值给模态框
window.onscroll = function () {
window.onscroll = function() {
$("#myModal").css("top", $(document).scrollTop() + 235);
}
return {
......
......@@ -11,7 +11,7 @@ var yearBblxDm = ['10414', '10420'];
var ccxwsBblxDm = ['12101']
var prefix = "";
var Authorization = ""
$(function () {
$(function() {
if (config.environmental == 'test') {
prefix = "/web";
} else if (config.environmental == 'production') {
......@@ -33,14 +33,16 @@ function getInitTable() {
sbsq: '',
pzzlDm: getUrlParam("pzzlDm")
},
success: function (data) { //客户端jquery预先定义好的callback函数,成功获取跨域服务器上的json数据后,会动态执行这个callback函数
success: function(data, status, xhr) { //客户端jquery预先定义好的callback函数,成功获取跨域服务器上的json数据后,会动态执行这个callback函数
hideLoading();
//el表达式变jq
// $("#token").attr("value","");
var Authorization = xhr.getResponseHeader("Authorization")
sessionStorage.setItem("Authorization", Authorization);
var companyInfo = data;
$("#djxh").attr("value", companyInfo.djxh);
config.value = companyInfo.bean.value
if (companyInfo.success) {
config.value = companyInfo.bean.value
if (companyInfo.bean.sfyhzctsBz == 'Y') {
myAlert("提示", "尊敬的纳税人、缴费人,为进一步巩固拓展减税降费成效,助力市场主体纾困解难,对部分2020年底到期税费优惠政策(不包括社会保险费),您可暂按原政策文件规定申报享受优惠(原减免性质代码可继续使用)。详细情况可咨询主管税务分局、税务所或12366纳税服务热线。感谢您的理解与支持!!", "确定");
}
......@@ -68,17 +70,17 @@ function getInitTable() {
// initpage = initPage(companyInfo.bean);
// 弹出错误对话框
}
$("#getInputValue").on("focus", function () {
$("#getInputValue").on("focus", function() {
WdatePicker({
isShowClear: false,
dateFmt: 'yyyy-MM',
onpicking: function (dp) {
onpicking: function(dp) {
initpage.changeDate(this, dp);
}
});
});
},
error: function (xhr) {
error: function(xhr) {
//jsonp 方式此方法不被触发
console.log("=======error======================")
}
......@@ -104,7 +106,7 @@ function initPage(companyInfo) {
/**
* 展示税种申报信息
*/
var showTax = function (taxInfo) {
var showTax = function(taxInfo) {
if (taxInfo.length > 0) {
for (var i = 0; i < taxInfo.length; i++) {
if (taxInfo[i].sbrq) {
......@@ -113,7 +115,7 @@ function initPage(companyInfo) {
if (taxInfo[i].sbqx) {
taxInfo[i].sbqx = tool.formatDate(taxInfo[i].sbqx);
}
if (taxInfo[i].bblxDm=='30101') {
if (taxInfo[i].bblxDm == '30101') {
taxInfo[i].sssqQ = "-";
taxInfo[i].sssqZ = "-";
}
......@@ -121,7 +123,7 @@ function initPage(companyInfo) {
}
var id = "#taxGrid";
var buttonHtml = "填写申报表";
var order = ["pzzlMc", "djxh","zgswskfjMc", "sssqQ", "sssqZ", "sbrq", "do"];
var order = ["pzzlMc", "djxh", "zgswskfjMc", "sssqQ", "sssqZ", "sbrq", "do"];
var promptStatement = "";
var headerList = [{
name: "序号",
......@@ -150,7 +152,8 @@ function initPage(companyInfo) {
}, {
name: "操作",
width: "10%"
}];
}
];
//渲染表
getTableOverdue(id, order, headerList, taxInfo, buttonHtml)
};
......@@ -207,7 +210,7 @@ function initPage(companyInfo) {
* @param {*} ddt
* @param {*} buttonHtml
*/
var getTableOverdue = function (id, order, headerList, ddt, buttonHtml, promptStatement) {
var getTableOverdue = function(id, order, headerList, ddt, buttonHtml, promptStatement) {
var tableObj = {
id: id, //tabel父元素的id
autoHeight: ddt.length > 0 ? 10 : "",
......@@ -225,7 +228,7 @@ function initPage(companyInfo) {
pageSize: ddt.length
},
jsonReady: ddt,
callback: function (data, node) {
callback: function(data, node) {
data.operateType = '5';
data.sbbz = '5';
if (data.sbzt == "Y") {
......@@ -236,7 +239,7 @@ function initPage(companyInfo) {
// 财产行为税
if (ccxwsBblxDm.indexOf(data.bblxDm) != -1) {
// 测试环境start
var openUrl = config.ccxwsTaxTable + '?djxh=' + data.djxh + '&zsDjxh=' + data.zsDjxh + '&nsrsbh=' + data.nsrsbh + '&nsrmc=' + data.nsrmc + '&operateType=overdue' + '&lybz=online' + '&Authorization='+Authorization //测试环境
var openUrl = config.ccxwsTaxTable + '?djxh=' + data.djxh + '&zsDjxh=' + data.zsDjxh + '&nsrsbh=' + data.nsrsbh + '&nsrmc=' + data.nsrmc + '&operateType=overdue' + '&lybz=online' + '&Authorization=' + Authorization; //测试环境
// var openUrl = config.ccxwsTaxTable +'?lybz=online' +'&operateType=overdue' + '&sblx=yq' + '&token=' + data.token //正式环境
window.open(openUrl, '_blank');
} else if (data.sourceFlag == "ssfwpt_sbzj") {
......@@ -254,12 +257,38 @@ function initPage(companyInfo) {
window.open(prefix + config.ssfwptPage, '_blank');
}
Object.defineProperty(mlistener, 'returnSelectRowData', {
set: function (val) {
setTimeout(function () {
set: function(val) {
setTimeout(function() {
getTaxOverdue(nowDate, "N", '2');
}, 1000);
}
})
} else if (submitData.sourceFlag == "ssfwpt_sbzj_version_2") {
window.mlistener = {
selectRowData: {},
urlList: {
getMenu: '/tax_service/getBbLb', //菜单接口
openTable: "/tax_service/open_table", //开表接口
getData: "/tax_service/get_data", //提取数据接口
saveTable: "/tax_service/save_single_sbb_info", //保存
deleteTable: "/tax_service/delete_single_sbb_info", //删除
declareTable: "/tax_service/declare", //申报
downloadFile: "/tax_service/load_declare_file" //下载申报文件接口
}
};
data.fillingFlag = "overdue" // 填报标记
data.flag = '' //清算标志 1是清算,空是正常开表
window.mlistener.selectRowData = data;
var openUrl = prefix + config.tableBridge; //测试环境
window.open(openUrl, '_blank');
Object.defineProperty(mlistener, 'returnSelectRowData', {
set: function(val) {
setTimeout(function() {
getTaxDeclaration(sbqDate, "N", '2');
}, 1000);
}
})
} else {
data.djxh = djxh;
data.iszzsybjc = companyInfo.iszzsybjc; // 一表申报代码
......@@ -267,7 +296,7 @@ function initPage(companyInfo) {
data.nssbq = nowDate; // 将选择的日期放入json中
data.checkTime = false;
if (data.pzzlDm === '11602') {
var List = companyInfo.taxInfos.filter(function (item) {
var List = companyInfo.taxInfos.filter(function(item) {
return item.pzzlDm == '10101' || item.pzzlDm == '10102'
})
if (List.length === 0) {
......@@ -312,7 +341,7 @@ function initPage(companyInfo) {
if (companyInfo) {
url = config.url
}
var getTaxOverdue = function (date, type, refreshSbzt) {
var getTaxOverdue = function(date, type, refreshSbzt) {
// TODO 开始加载等待动画
showLoading();
var param = {
......@@ -327,8 +356,9 @@ function initPage(companyInfo) {
url: url + "/online/declare/getPzzlList",
data: param,
type: "POST",
dataType: "JSON"
}).done(function (data) {
dataType: "JSON",
headers: { 'Authorization': sessionStorage.getItem("Authorization") },
}).done(function(data) {
if (data.success) {
drawGrid(data.bean);
companyInfo = data.bean;
......@@ -344,12 +374,12 @@ function initPage(companyInfo) {
alertWarning(data.returnMessage);
}
}
}).always(function (data) {
}).always(function(data) {
hideLoading();
});
};
var drawGrid = function (bean) {
var drawGrid = function(bean) {
if (bean.taxInfos.length == 0) {
showTax([]);
alertInfo("税费申报暂无数据");
......@@ -369,7 +399,7 @@ function initPage(companyInfo) {
}*/
};
//申报方式 当iszzsybjc=01同时pzzlDm=010101时,调用改方法
var declarationMethod = function (statu) {
var declarationMethod = function(statu) {
submitData.ybjcState = statu;
submitData.value = config.value;
if (submitData.sourceFlag == "ssfwpt_sbzj") {
......@@ -387,12 +417,38 @@ function initPage(companyInfo) {
window.open(prefix + config.yearTaxTable, '_blank');
}
Object.defineProperty(mlistener, 'returnSelectRowData', {
set: function (val) {
setTimeout(function () {
set: function(val) {
setTimeout(function() {
getTaxOverdue(nowDate, "N", '2');
}, 1000);
}
})
} else if (submitData.sourceFlag == "ssfwpt_sbzj_version_2") {
window.mlistener = {
selectRowData: {},
urlList: {
getMenu: '/tax_service/getBbLb', //菜单接口
openTable: "/tax_service/open_table", //开表接口
getData: "/tax_service/get_data", //提取数据接口
saveTable: "/tax_service/save_single_sbb_info", //保存
deleteTable: "/tax_service/delete_single_sbb_info", //删除
declareTable: "/tax_service/declare", //申报
downloadFile: "/tax_service/load_declare_file" //下载申报文件接口
}
};
data.fillingFlag = "overdue" // 填报标记
data.flag = '' //清算标志 1是清算,空是正常开表
window.mlistener.selectRowData = data;
var openUrl = prefix + config.tableBridge; //测试环境
window.open(openUrl, '_blank');
Object.defineProperty(mlistener, 'returnSelectRowData', {
set: function(val) {
setTimeout(function() {
getTaxDeclaration(sbqDate, "N", '2');
}, 1000);
}
})
} else {
// var form = $("#changeForm");
// form.find("#changeForm_data").val(JSON.stringify(submitData));
......@@ -457,7 +513,7 @@ function initPage(companyInfo) {
/**
* 隐藏modal
*/
var closeModal = function () {
var closeModal = function() {
$('#ybName').html("");
$('#dName').html("");
$('#myMask').hide();
......@@ -469,14 +525,14 @@ function initPage(companyInfo) {
* @param {*} obj
* @param {*} dp
*/
var changeDate = function (obj, dp) {
var changeDate = function(obj, dp) {
date = dp.cal.getNewDateStr();
nowDate = date;
getTaxOverdue(date, "N");
};
var refresh = function () {
myConfirm("消息", "您确定需要重置申报清册吗?点击确定继续", "确定", "取消", function () {
var refresh = function() {
myConfirm("消息", "您确定需要重置申报清册吗?点击确定继续", "确定", "取消", function() {
getTaxOverdue(nowDate, "Y");
});
};
......@@ -485,7 +541,7 @@ function initPage(companyInfo) {
* @param {} params
*/
$("#reset,#reset1").on("click", refresh);
$("#goRecord").click(function () {
$("#goRecord").click(function() {
//TODO 调用备案接口
});
// 格式化后台返回的时间
......
/*
* @Author: your name
* @Date: 2021-12-20 15:36:50
* @LastEditTime: 2021-12-20 15:38:55
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \onlineReport\static\config.js
*/
/**
* @Author ygy
* @Description //TODO 获取地址栏参数
......@@ -12,4 +20,25 @@ function getUrlParam(name) {
return null;
}
// 公共配置
eval(unescape("var%20config%20%3D%20%7B%0A%20%20%20%20environmental%3A%22production%22%2C//production%20%u751F%u4EA7%20%20test%20%u6D4B%u8BD5%0A%20%20%20%20webUrl%3A%22/web/onlineReport/jsp/%22%2C%20//%20%u9884%u751F%u4EA7%u73AF%u5883%u89E3%u5F00%0A%20%20%20%20url%3A%22%22%2C//%20%u5F00%u53D1%u73AF%u5883%u914D%u7F6E%u8DE8%u57DF%u8BBE%u7F6E%20%20//%20%u5F00%u53D1%u73AF%u5883%0A%20%20%20%20value%3A%27%27%2C//%u52A0%u5BC6token%0A%09%20%20nsrsbq%3A%27%27%2C%0A%20%20%20%20spreadUrl%3A%22http%3A//sbjs.tjsat.gov.cn%22%2C//%20%u5C40%u7AEF%u751F%u4EA7%20%u503C%u4E3A%u7A7A%20%20%u5176%u4F59%u5168%u90E8%u6307%u5411%u5728%u7EBF%u7684%u57DF%u540D%0A%20%20%20%20ssfwptPage%3A%22/taxservicedesk/index.html%23/taxTableList%22%2C//%20%u6D89%u7A0E%u670D%u52A1%u5E73%u53F0%u586B%u62A5%u9875%u9762%u5730%u5740%20%u6708%u5B63%u62A5%0A%20%20%20%20yearTaxTable%3A%22/taxservicedesk/index.html%23/yearTaxTable%22%2C//%20%u6D89%u7A0E%u670D%u52A1%u5E73%u53F0%u586B%u62A5%u9875%u9762%u5730%u5740%20%u5E74%u62A5%0A%20%20%20%20zhsbPage%3A%22/taxservicedesk/index.html%23/syntheticalReport%22%2C//%20%u6D89%u7A0E%20%u7EFC%u5408%u7533%u62A5%u9875%u9762%0A%20%20%20%20taxFormComponent%3A%22/web/taxFormComponent/index.html%3Fparam%3D%22%2C//%20%u6D89%u7A0E%u670D%u52A1%u5E73%u53F0%u586B%u62A5%u9875%u9762%u5730%u5740%0A%20%20%20%20ccxwsTaxTable%3A%22/web/tax-plugin/index.html%22%2C//%u8D22%u4EA7%u884C%u4E3A%u7A0E%20%u7533%u62A5%20%u8DF3%u8F6C%u9875%u9762%0A%20%20%20%20collectPage%3A%22/propertybehaviortax/index.html%23/buttonFrame%22%2C//%u8D22%u4EA7%u884C%u4E3A%u7A0E%20%u91C7%u96C6%20%u8DF3%u8F6C%u586B%u62A5%u9875%u9762%0A%7D"))
var config = {
environmental: "test", //production生产,test测试,dev开发 注:environmental为dev时,ssfwptPage/yearTaxTable/zhsbPage使用配置文件地址
webUrl: "/web/onlineReport/jsp/", // 预生产环境解开
url: "", // 开发环境配置跨域设置 // 开发环境
value: '', //加密token
nsrsbq: '',
spreadUrl: "http://sbjs.tjsat.gov.cn", // 局端生产 值为空 其余全部指向在线的域名
ssfwptPage: "/taxservicedesk/index.html#/taxTableList", // 涉税服务平台填报页面地址 月季报
yearTaxTable: "/taxservicedesk/index.html#/yearTaxTable", // 涉税服务平台填报页面地址 年报
zhsbPage: "/taxservicedesk/index.html#/syntheticalReport", // 涉税 综合申报页面
taxFormComponent: "/web/taxFormComponent/index.html?param=", // 涉税服务平台填报页面地址
ccxwsTaxTable: "/web/tax-plugin/index.html", //财产行为税 申报 跳转页面
collectPage: "/propertybehaviortax/index.html#/buttonFrame", //财产行为税 采集 跳转填报页面
tableBridge: "/tableDisplayBusiness/index.html#/taxRelated", //税表2.0 税种开表展示页面
}
if (config.environmental == 'test') {
prefix = "/web";
config.ccxwsTaxTable = "http://dev-web.htyfw.com.cn/page/property_tax_plugin_web/index.html";
} else if (config.environmental == 'production') {
prefix = "/web/online";
config.ccxwsTaxTable = "/web/tax-plugin/index.html";
}
......@@ -25,6 +25,7 @@ var config = {
taxFormComponent:"/web/taxFormComponent/index.html?param=",// 涉税服务平台填报页面地址
ccxwsTaxTable:"/web/tax-plugin/index.html",//财产行为税 申报 跳转页面
collectPage:"/propertybehaviortax/index.html#/buttonFrame",//财产行为税 采集 跳转填报页面
tableBridge: "/tableDisplayBusiness/index.html#/taxRelated", //税表2.0 税种开表展示页面
}
if (config.environmental == 'test') {
prefix = "/web";
......
......@@ -12,7 +12,7 @@ function getUrlParam(name) {
return null;
}
// 公共配置
eval(unescape("var%20config%20%3D%20%7B%0A%20%20%20%20environmental%3A%22production%22%2C//production%20%u751F%u4EA7%20%20test%20%u6D4B%u8BD5%0A%20%20%20%20webUrl%3A%22/web/onlineReport/jsp/%22%2C%20//%20%u9884%u751F%u4EA7%u73AF%u5883%u89E3%u5F00%0A%20%20%20%20url%3A%22%22%2C//%20%u5F00%u53D1%u73AF%u5883%u914D%u7F6E%u8DE8%u57DF%u8BBE%u7F6E%20%20//%20%u5F00%u53D1%u73AF%u5883%0A%20%20%20%20value%3A%27%27%2C//%u52A0%u5BC6token%0A%09%20%20nsrsbq%3A%27%27%2C%0A%20%20%20%20spreadUrl%3A%22http%3A//sbjs.tjsat.gov.cn%22%2C//%20%u5C40%u7AEF%u751F%u4EA7%20%u503C%u4E3A%u7A7A%20%20%u5176%u4F59%u5168%u90E8%u6307%u5411%u5728%u7EBF%u7684%u57DF%u540D%0A%20%20%20%20ssfwptPage%3A%22/taxservicedesk/index.html%23/taxTableList%22%2C//%20%u6D89%u7A0E%u670D%u52A1%u5E73%u53F0%u586B%u62A5%u9875%u9762%u5730%u5740%20%u6708%u5B63%u62A5%0A%20%20%20%20yearTaxTable%3A%22/taxservicedesk/index.html%23/yearTaxTable%22%2C//%20%u6D89%u7A0E%u670D%u52A1%u5E73%u53F0%u586B%u62A5%u9875%u9762%u5730%u5740%20%u5E74%u62A5%0A%20%20%20%20zhsbPage%3A%22/taxservicedesk/index.html%23/syntheticalReport%22%2C//%20%u6D89%u7A0E%20%u7EFC%u5408%u7533%u62A5%u9875%u9762%0A%20%20%20%20taxFormComponent%3A%22/web/taxFormComponent/index.html%3Fparam%3D%22%2C//%20%u6D89%u7A0E%u670D%u52A1%u5E73%u53F0%u586B%u62A5%u9875%u9762%u5730%u5740%0A%20%20%20%20ccxwsTaxTable%3A%22/web/tax-plugin/index.html%22%2C//%u8D22%u4EA7%u884C%u4E3A%u7A0E%20%u7533%u62A5%20%u8DF3%u8F6C%u9875%u9762%0A%20%20%20%20collectPage%3A%22/propertybehaviortax/index.html%23/buttonFrame%22%2C//%u8D22%u4EA7%u884C%u4E3A%u7A0E%20%u91C7%u96C6%20%u8DF3%u8F6C%u586B%u62A5%u9875%u9762%0A%7D"))
eval(unescape("var%20config%20%3D%20%7B%0A%20%20%20%20environmental%3A%22production%22%2C//production%20%u751F%u4EA7%20%20test%20%u6D4B%u8BD5%0A%20%20%20%20webUrl%3A%22/web/onlineReport/jsp/%22%2C%20//%20%u9884%u751F%u4EA7%u73AF%u5883%u89E3%u5F00%0A%20%20%20%20url%3A%22%22%2C//%20%u5F00%u53D1%u73AF%u5883%u914D%u7F6E%u8DE8%u57DF%u8BBE%u7F6E%20%20//%20%u5F00%u53D1%u73AF%u5883%0A%20%20%20%20value%3A%27%27%2C//%u52A0%u5BC6token%0A%09%20%20nsrsbq%3A%27%27%2C%0A%20%20%20%20spreadUrl%3A%22http%3A//sbjs.tjsat.gov.cn%22%2C//%20%u5C40%u7AEF%u751F%u4EA7%20%u503C%u4E3A%u7A7A%20%20%u5176%u4F59%u5168%u90E8%u6307%u5411%u5728%u7EBF%u7684%u57DF%u540D%0A%20%20%20%20ssfwptPage%3A%22/taxservicedesk/index.html%23/taxTableList%22%2C//%20%u6D89%u7A0E%u670D%u52A1%u5E73%u53F0%u586B%u62A5%u9875%u9762%u5730%u5740%20%u6708%u5B63%u62A5%0A%20%20%20%20yearTaxTable%3A%22/taxservicedesk/index.html%23/yearTaxTable%22%2C//%20%u6D89%u7A0E%u670D%u52A1%u5E73%u53F0%u586B%u62A5%u9875%u9762%u5730%u5740%20%u5E74%u62A5%0A%20%20%20%20zhsbPage%3A%22/taxservicedesk/index.html%23/syntheticalReport%22%2C//%20%u6D89%u7A0E%20%u7EFC%u5408%u7533%u62A5%u9875%u9762%0A%20%20%20%20taxFormComponent%3A%22/web/taxFormComponent/index.html%3Fparam%3D%22%2C//%20%u6D89%u7A0E%u670D%u52A1%u5E73%u53F0%u586B%u62A5%u9875%u9762%u5730%u5740%0A%20%20%20%20ccxwsTaxTable%3A%22/web/tax-plugin/index.html%22%2C//%u8D22%u4EA7%u884C%u4E3A%u7A0E%20%u7533%u62A5%20%u8DF3%u8F6C%u9875%u9762%0A%20%20%20%20collectPage%3A%22/propertybehaviortax/index.html%23/buttonFrame%22%2C//%u8D22%u4EA7%u884C%u4E3A%u7A0E%20%u91C7%u96C6%20%u8DF3%u8F6C%u586B%u62A5%u9875%u9762%0A%20%20%20%20tableBridge%3A%20%22/tableDisplayBusiness/index.html%23/taxRelated%22%2C%20//%u7A0E%u88682.0%20%u7A0E%u79CD%u5F00%u8868%u5C55%u793A%u9875%u9762%20%0A%7D"))
if (config.environmental == 'test') {
prefix = "/web";
config.ccxwsTaxTable = "http://dev-web.htyfw.com.cn/page/property_tax_plugin_web/index.html";
......
/*
* @Author: your name
* @Date: 2021-12-20 15:36:50
* @LastEditTime: 2022-01-24 10:28:40
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \onlineReport\static\config_test.js
*/
/**
* @Author ygy
* @Description //TODO 获取地址栏参数
......@@ -12,7 +20,7 @@ function getUrlParam(name) {
return null;
}
// 公共配置
eval(unescape("var%20config%20%3D%20%7B%0A%20%20%20%20environmental%3A%22test%22%2C//production%20%u751F%u4EA7%20%20test%20%u6D4B%u8BD5%0A%20%20%20%20webUrl%3A%22/web/onlineReport/jsp/%22%2C%20//%20%u9884%u751F%u4EA7%u73AF%u5883%u89E3%u5F00%0A%20%20%20%20url%3A%22%22%2C//%20%u5F00%u53D1%u73AF%u5883%u914D%u7F6E%u8DE8%u57DF%u8BBE%u7F6E%20%20//%20%u5F00%u53D1%u73AF%u5883%0A%20%20%20%20value%3A%27%27%2C//%u52A0%u5BC6token%0A%09%20%20nsrsbq%3A%27%27%2C%0A%20%20%20%20spreadUrl%3A%22http%3A//sbjs.tjsat.gov.cn%22%2C//%20%u5C40%u7AEF%u751F%u4EA7%20%u503C%u4E3A%u7A7A%20%20%u5176%u4F59%u5168%u90E8%u6307%u5411%u5728%u7EBF%u7684%u57DF%u540D%0A%20%20%20%20ssfwptPage%3A%22/taxservicedesk/index.html%23/taxTableList%22%2C//%20%u6D89%u7A0E%u670D%u52A1%u5E73%u53F0%u586B%u62A5%u9875%u9762%u5730%u5740%20%u6708%u5B63%u62A5%0A%20%20%20%20yearTaxTable%3A%22/taxservicedesk/index.html%23/yearTaxTable%22%2C//%20%u6D89%u7A0E%u670D%u52A1%u5E73%u53F0%u586B%u62A5%u9875%u9762%u5730%u5740%20%u5E74%u62A5%0A%20%20%20%20zhsbPage%3A%22/taxservicedesk/index.html%23/syntheticalReport%22%2C//%20%u6D89%u7A0E%20%u7EFC%u5408%u7533%u62A5%u9875%u9762%0A%20%20%20%20taxFormComponent%3A%22/web/taxFormComponent/index.html%3Fparam%3D%22%2C//%20%u6D89%u7A0E%u670D%u52A1%u5E73%u53F0%u586B%u62A5%u9875%u9762%u5730%u5740%0A%20%20%20%20ccxwsTaxTable%3A%22/web/tax-plugin/index.html%22%2C//%u8D22%u4EA7%u884C%u4E3A%u7A0E%20%u7533%u62A5%20%u8DF3%u8F6C%u9875%u9762%0A%20%20%20%20collectPage%3A%22/propertybehaviortax/index.html%23/buttonFrame%22%2C//%u8D22%u4EA7%u884C%u4E3A%u7A0E%20%u91C7%u96C6%20%u8DF3%u8F6C%u586B%u62A5%u9875%u9762%0A%7D"))
eval(unescape("var%20config%20%3D%20%7B%0A%20%20%20%20environmental%3A%20%22test%22%2C%20//production%u751F%u4EA7%uFF0Ctest%u6D4B%u8BD5%uFF0Cdev%u5F00%u53D1%20%u6CE8%uFF1Aenvironmental%u4E3Adev%u65F6%uFF0CssfwptPage/yearTaxTable/zhsbPage%u4F7F%u7528%u914D%u7F6E%u6587%u4EF6%u5730%u5740%0A%20%20%20%20webUrl%3A%20%22/web/onlineReport/jsp/%22%2C%20//%20%u9884%u751F%u4EA7%u73AF%u5883%u89E3%u5F00%0A%20%20%20%20url%3A%20%22%22%2C%20//%20%u5F00%u53D1%u73AF%u5883%u914D%u7F6E%u8DE8%u57DF%u8BBE%u7F6E%20%20//%20%u5F00%u53D1%u73AF%u5883%0A%20%20%20%20value%3A%20%27%27%2C%20//%u52A0%u5BC6token%0A%20%20%20%20nsrsbq%3A%20%27%27%2C%0A%20%20%20%20spreadUrl%3A%20%22http%3A//sbjs.tjsat.gov.cn%22%2C%20//%20%u5C40%u7AEF%u751F%u4EA7%20%u503C%u4E3A%u7A7A%20%20%u5176%u4F59%u5168%u90E8%u6307%u5411%u5728%u7EBF%u7684%u57DF%u540D%0A%20%20%20%20ssfwptPage%3A%20%22/taxservicedesk/index.html%23/taxTableList%22%2C%20//%20%u6D89%u7A0E%u670D%u52A1%u5E73%u53F0%u586B%u62A5%u9875%u9762%u5730%u5740%20%u6708%u5B63%u62A5%0A%20%20%20%20yearTaxTable%3A%20%22/taxservicedesk/index.html%23/yearTaxTable%22%2C%20//%20%u6D89%u7A0E%u670D%u52A1%u5E73%u53F0%u586B%u62A5%u9875%u9762%u5730%u5740%20%u5E74%u62A5%0A%20%20%20%20zhsbPage%3A%20%22/taxservicedesk/index.html%23/syntheticalReport%22%2C%20//%20%u6D89%u7A0E%20%u7EFC%u5408%u7533%u62A5%u9875%u9762%0A%20%20%20%20taxFormComponent%3A%20%22/web/taxFormComponent/index.html%3Fparam%3D%22%2C%20//%20%u6D89%u7A0E%u670D%u52A1%u5E73%u53F0%u586B%u62A5%u9875%u9762%u5730%u5740%0A%20%20%20%20ccxwsTaxTable%3A%20%22/web/tax-plugin/index.html%22%2C%20//%u8D22%u4EA7%u884C%u4E3A%u7A0E%20%u7533%u62A5%20%u8DF3%u8F6C%u9875%u9762%0A%20%20%20%20collectPage%3A%20%22/propertybehaviortax/index.html%23/buttonFrame%22%2C%20//%u8D22%u4EA7%u884C%u4E3A%u7A0E%20%u91C7%u96C6%20%u8DF3%u8F6C%u586B%u62A5%u9875%u9762%0A%20%20%20%20tableBridge%3A%20%22/tableDisplayBusiness/index.html%23/taxRelated%22%2C%20//%u7A0E%u88682.0%20%u7A0E%u79CD%u5F00%u8868%u5C55%u793A%u9875%u9762%20%0A%7D"))
if (config.environmental == 'test') {
prefix = "/web";
config.ccxwsTaxTable = "http://dev-web.htyfw.com.cn/page/property_tax_plugin_web/index.html";
......
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