Commit 1e323dff authored by 刘明珠's avatar 刘明珠

operateType,开表标记补充

parent 84853bf1
...@@ -17,7 +17,6 @@ function initPage(companyInfo) { ...@@ -17,7 +17,6 @@ function initPage(companyInfo) {
getIEVersion(); getIEVersion();
localStorage.setItem("cancellation", null); localStorage.setItem("cancellation", null);
var companyInfo = companyInfo; var companyInfo = companyInfo;
console.log(companyInfo);
// 以下是初始化数据,用来缓存 // 以下是初始化数据,用来缓存
var initPagingNum = 20; var initPagingNum = 20;
var pagingData = []; //存放分页数据 var pagingData = []; //存放分页数据
...@@ -92,7 +91,9 @@ function initPage(companyInfo) { ...@@ -92,7 +91,9 @@ function initPage(companyInfo) {
}, },
jsonReady: ddt, jsonReady: ddt,
callback: function (data, node) { callback: function (data, node) {
console.log("一条数据信息", data) if(companyInfo.operateType!=undefined&&companyInfo.operateType!=null&&companyInfo.operateType!='undefined'&&companyInfo.operateType!='null'){
data.operateType = companyInfo.operateType;
}
data.value = config.value; data.value = config.value;
if (data.sourceFlag == "ssfwpt_sbzj") { if (data.sourceFlag == "ssfwpt_sbzj") {
window.mlistener = { window.mlistener = {
......
...@@ -71,7 +71,6 @@ function getInitTable(){ ...@@ -71,7 +71,6 @@ function getInitTable(){
*/ */
function initPage(companyInfo) { function initPage(companyInfo) {
getIEVersion(); getIEVersion();
console.log(companyInfo);
var companyInfo = companyInfo; var companyInfo = companyInfo;
var djxh = companyInfo.djxh; var djxh = companyInfo.djxh;
var nowdate = ""; // 存储当前选择的时间框; var nowdate = ""; // 存储当前选择的时间框;
...@@ -195,6 +194,9 @@ function initPage(companyInfo) { ...@@ -195,6 +194,9 @@ function initPage(companyInfo) {
}, },
jsonReady: ddt, jsonReady: ddt,
callback: function (data, node) { callback: function (data, node) {
if(companyInfo.operateType!=undefined&&companyInfo.operateType!=null&&companyInfo.operateType!='undefined'&&companyInfo.operateType!='null'){
data.operateType = companyInfo.operateType;
}
if (data.sbzt == "Y") { if (data.sbzt == "Y") {
myAlert("提示", "当前申报表已经申报", "确定") myAlert("提示", "当前申报表已经申报", "确定")
return false; return false;
...@@ -218,7 +220,6 @@ function initPage(companyInfo) { ...@@ -218,7 +220,6 @@ function initPage(companyInfo) {
} else { } else {
data.djxh = companyInfo.djxh; data.djxh = companyInfo.djxh;
data.iszzsybjc = companyInfo.iszzsybjc; // 一表申报代码 data.iszzsybjc = companyInfo.iszzsybjc; // 一表申报代码
data.operateType = companyInfo.operateType; //标志位
data.nsrsbh = companyInfo.nsrsbh; // 那随人识别号 data.nsrsbh = companyInfo.nsrsbh; // 那随人识别号
// data.nssbq = nowdate; // data.nssbq = nowdate;
data.checkTime = false; data.checkTime = false;
...@@ -240,12 +241,8 @@ function initPage(companyInfo) { ...@@ -240,12 +241,8 @@ function initPage(companyInfo) {
var str = location.href; var str = location.href;
str = str.split("/")[4]; str = str.split("/")[4];
if (str && "cancellation" == str.substring(0, 12)) { if (str && "cancellation" == str.substring(0, 12)) {
console.log("============", str)
localStorage.setItem("cancellation", str.substring(0, 12)); localStorage.setItem("cancellation", str.substring(0, 12));
} }
console.log("■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■");
console.log("data", data);
console.log("■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■");
submitData = data; submitData = data;
declarationMethod("N") declarationMethod("N")
} }
...@@ -398,7 +395,6 @@ function initPage(companyInfo) { ...@@ -398,7 +395,6 @@ function initPage(companyInfo) {
} }
hideLoading() hideLoading()
localStorage.setItem("data", JSON.stringify(submitData)); localStorage.setItem("data", JSON.stringify(submitData));
console.log("请求成功", data)
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
......
...@@ -96,7 +96,6 @@ function initPage(companyInfo) { ...@@ -96,7 +96,6 @@ function initPage(companyInfo) {
* 展示税种申报信息 * 展示税种申报信息
*/ */
var showTax = function (taxInfo) { var showTax = function (taxInfo) {
// console.log(taxInfo,companyInfo);
if (taxInfo.length > 0) { if (taxInfo.length > 0) {
for (var i = 0; i < taxInfo.length; i++) { for (var i = 0; i < taxInfo.length; i++) {
if (taxInfo[i].sbrq) { if (taxInfo[i].sbrq) {
...@@ -127,7 +126,6 @@ function initPage(companyInfo) { ...@@ -127,7 +126,6 @@ function initPage(companyInfo) {
name: "操作", name: "操作",
width: "10%" width: "10%"
}]; }];
console.log(taxInfo);
//渲染表 //渲染表
getTableDeclaration(id, order, headerList, taxInfo, buttonHtml, promptStatement) getTableDeclaration(id, order, headerList, taxInfo, buttonHtml, promptStatement)
}; };
...@@ -158,7 +156,9 @@ function initPage(companyInfo) { ...@@ -158,7 +156,9 @@ function initPage(companyInfo) {
}, },
jsonReady: ddt, jsonReady: ddt,
callback: function (data, node) { callback: function (data, node) {
console.log(data); if(companyInfo.operateType!=undefined&&companyInfo.operateType!=null&&companyInfo.operateType!='undefined'&&companyInfo.operateType!='null'){
data.operateType = companyInfo.operateType;
}
data.value = config.value; data.value = config.value;
if (data.sbzt == "Y") { if (data.sbzt == "Y") {
myAlert("提示", "当前申报表已经申报", "确定") myAlert("提示", "当前申报表已经申报", "确定")
...@@ -202,7 +202,6 @@ function initPage(companyInfo) { ...@@ -202,7 +202,6 @@ function initPage(companyInfo) {
submitData = data; submitData = data;
if (node.context.innerText == "填写申报表" && companyInfo.iszzsybjc == "01" && data.pzzlDm == "10101") { if (node.context.innerText == "填写申报表" && companyInfo.iszzsybjc == "01" && data.pzzlDm == "10101") {
// if(node.context.innerText=="填写申报表"){ // if(node.context.innerText=="填写申报表"){
console.log(initpage)
initpage.declarationMethod('N') initpage.declarationMethod('N')
// $('#myMask').show(); // $('#myMask').show();
// $('#myModal').show(); // $('#myModal').show();
...@@ -251,7 +250,6 @@ function initPage(companyInfo) { ...@@ -251,7 +250,6 @@ function initPage(companyInfo) {
// myAlert("提示", "正在获取初始化信息", "确定") // myAlert("提示", "正在获取初始化信息", "确定")
// }, // },
}).done(function (data) { }).done(function (data) {
console.log(data)
if (data.success) { if (data.success) {
if (data.bean.url == "error.jsp") { if (data.bean.url == "error.jsp") {
myAlert("提示", data.bean.errorInfo, "确定") myAlert("提示", data.bean.errorInfo, "确定")
...@@ -286,7 +284,6 @@ function initPage(companyInfo) { ...@@ -286,7 +284,6 @@ function initPage(companyInfo) {
$.each(bean.financialInfos, function (i, item) { $.each(bean.financialInfos, function (i, item) {
bean.taxInfos.push(item); bean.taxInfos.push(item);
}); });
console.log(bean)
if (bean.taxInfos.length == 0) { if (bean.taxInfos.length == 0) {
showTax(bean.taxInfos); showTax(bean.taxInfos);
alertInfo("税费申报暂无数据"); alertInfo("税费申报暂无数据");
...@@ -320,7 +317,6 @@ function initPage(companyInfo) { ...@@ -320,7 +317,6 @@ function initPage(companyInfo) {
var declarationMethod = function (statu) { var declarationMethod = function (statu) {
submitData.ybjcState = statu; submitData.ybjcState = statu;
submitData.value = config.value; submitData.value = config.value;
console.log(submitData.sourceFlag, submitData.sourceFlag.indexOf("sbzj") != -1)
//需要判断在线还是税表的开关 //需要判断在线还是税表的开关
if (submitData.sourceFlag == "ssfwpt_sbzj") { if (submitData.sourceFlag == "ssfwpt_sbzj") {
window.mlistener = { window.mlistener = {
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
function initPage(companyInfo) { function initPage(companyInfo) {
getIEVersion(); getIEVersion();
localStorage.setItem("cancellation", null); localStorage.setItem("cancellation", null);
console.log(companyInfo);
var companyInfo = companyInfo; var companyInfo = companyInfo;
var djxh = companyInfo.djxh; var djxh = companyInfo.djxh;
...@@ -134,6 +133,9 @@ function initPage(companyInfo) { ...@@ -134,6 +133,9 @@ function initPage(companyInfo) {
}, },
jsonReady: ddt, jsonReady: ddt,
callback: function (data, node) { callback: function (data, node) {
if(companyInfo.operateType!=undefined&&companyInfo.operateType!=null&&companyInfo.operateType!='undefined'&&companyInfo.operateType!='null'){
data.operateType = companyInfo.operateType;
}
if (data.sbzt == "Y") { if (data.sbzt == "Y") {
myAlert("提示", "当前申报表已经申报", "确定") myAlert("提示", "当前申报表已经申报", "确定")
return false; return false;
...@@ -156,7 +158,6 @@ function initPage(companyInfo) { ...@@ -156,7 +158,6 @@ function initPage(companyInfo) {
}) })
} else { } else {
data.djxh = djxh; data.djxh = djxh;
data.operateType = operateType;
data.iszzsybjc = companyInfo.iszzsybjc; // 一表申报代码 data.iszzsybjc = companyInfo.iszzsybjc; // 一表申报代码
data.nsrsbh = companyInfo.nsrsbh; // 那随人识别号 data.nsrsbh = companyInfo.nsrsbh; // 那随人识别号
data.nssbq = nowDate; // 将选择的日期放入json中 data.nssbq = nowDate; // 将选择的日期放入json中
...@@ -304,7 +305,6 @@ function initPage(companyInfo) { ...@@ -304,7 +305,6 @@ function initPage(companyInfo) {
return false return false
} }
localStorage.setItem("data", JSON.stringify(submitData)); localStorage.setItem("data", JSON.stringify(submitData));
console.log("请求成功", data)
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
......
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