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

合并分支

parent 43c06a01
......@@ -4,6 +4,7 @@
* @author ygy
* @date 2018/12/16 20:08
*/
var zjhm = '';
var initpage;
var nbbd10414 = "";
var nbbd10420 = "";
......@@ -31,6 +32,7 @@ function getInitTable() {
var companyInfo = data;
$("#djxh").attr("value", companyInfo.djxh);
if (companyInfo.success) {
zjhm = companyInfo.bean.zjhm
if (companyInfo.bean.sfyhzctsBz == 'Y') {
myAlert("提示", "尊敬的纳税人、缴费人,为进一步巩固拓展减税降费成效,助力市场主体纾困解难,对部分2020年底到期税费优惠政策(不包括社会保险费),您可暂按原政策文件规定申报享受优惠(原减免性质代码可继续使用)。详细情况可咨询主管税务分局、税务所或12366纳税服务热线。感谢您的理解与支持!!", "确定");
}
......@@ -148,6 +150,7 @@ function initPage(companyInfo) {
page: "1",
pageSize: "20"
},
jsonReady: ddt,
callback: function (data, node) {
data.operateType = '4';
......@@ -159,6 +162,7 @@ function initPage(companyInfo) {
};
data.fillingFlag = "corrections" // 填报标记
data.saveUserId = "zxtb"; // 用户id
data.zjhm = zjhm//证件号码
window.mlistener.selectRowData = data;
if (yearBblxDm.indexOf(data.bblxDm) == -1) {
window.open(config.ssfwptPage, '_blank');
......@@ -181,6 +185,7 @@ function initPage(companyInfo) {
sbrqq: durationOfTaxStart, // 申报日期起
sbrqz: durationOfTaxEnd, // 申报日期止
gzCacheKey: companyInfo.gzCacheKey, //登记序号
zjhm:zjhm//证件号码
}
getTaxAmendData(param);
}, 1000);
......@@ -345,6 +350,7 @@ function initPage(companyInfo) {
dataType: "JSON"
}).done(function (data) {
if (data.success) {
zjhm = data.bean.zjhm
sourceData = data.bean.gzTaxInfos;
nbbd10414 = data.bean.nbbd10414;
nbbd10420 = data.bean.nbbd10420;
......
var zjhm = '';
var initpage;
var yearBblxDm = ['10414', '10420'];
......@@ -26,6 +27,7 @@ function getInitTable() {
var companyInfo = data;
$("#djxh").attr("value", companyInfo.djxh);
if (companyInfo.returnCode == "00") {
zjhm = companyInfo.content.zjhm
if (companyInfo.content.sfyhzctsBz == 'Y') {
myAlert("提示", "尊敬的纳税人、缴费人,为进一步巩固拓展减税降费成效,助力市场主体纾困解难,对部分2020年底到期税费优惠政策(不包括社会保险费),您可暂按原政策文件规定申报享受优惠(原减免性质代码可继续使用)。详细情况可咨询主管税务分局、税务所或12366纳税服务热线。感谢您的理解与支持!!", "确定");
}
......@@ -214,6 +216,7 @@ function initPage(companyInfo) {
};
data.fillingFlag = "cancellation" // 填报标记
data.saveUserId = "zxtb"; // 用户id
data.zjhm = zjhm
window.mlistener.selectRowData = data;
if (yearBblxDm.indexOf(data.bblxDm) == -1) {
window.open(config.ssfwptPage, '_blank');
......@@ -300,7 +303,8 @@ function initPage(companyInfo) {
dataType: "JSON"
}).done(function (data) {
if (data.success) {
companyInfo = data.bean;
companyInfo = data.content;
zjhm = companyInfo.zjhm
config.value = companyInfo.value;
if (data.bean) {
drawGrid(data.bean);
......
var zjhm = '';
var initpage;
var sbqDate = '';
var yearBblxDm = ['10414', '10420'];
......@@ -35,6 +36,7 @@ function getInitTable() {
// }
var companyInfo = data;
if (companyInfo.success) {
zjhm = companyInfo.bean.zjhm
if (companyInfo.bean.sfyhzctsBz == 'Y') {
myAlert("提示", "尊敬的纳税人、缴费人,为进一步巩固拓展减税降费成效,助力市场主体纾困解难,对部分2020年底到期税费优惠政策(不包括社会保险费),您可暂按原政策文件规定申报享受优惠(原减免性质代码可继续使用)。详细情况可咨询主管税务分局、税务所或12366纳税服务热线。感谢您的理解与支持!!", "确定");
}
......@@ -173,6 +175,7 @@ function initPage(companyInfo) {
};
data.fillingFlag = "normal" // 填报标记
data.saveUserId = "zxtb"; // 用户id
data.zjhm = zjhm
window.mlistener.selectRowData = data;
if (yearBblxDm.indexOf(data.bblxDm) == -1) {
window.open(config.ssfwptPage, '_blank');
......@@ -266,6 +269,7 @@ function initPage(companyInfo) {
}
drawGrid(data.bean);
companyInfo = data.bean;
zjhm = companyInfo.zjhm
config.value = companyInfo.value;
if (type == 'Y') {
myAlert("提示", "重置清册成功", "确定")
......@@ -336,6 +340,7 @@ function initPage(companyInfo) {
};
submitData.fillingFlag = "normal" // 填报标记
submitData.saveUserId = "zxtb"; // 用户id
submitData.zjhm = zjhm
window.mlistener.selectRowData = submitData;
if (yearBblxDm.indexOf(data.bblxDm) == -1) {
window.open(config.ssfwptPage, '_blank');
......
......@@ -100,7 +100,7 @@ function initPage(companyInfo) {
if (taxInfo.length > 0) {
for (var i = 0; i < taxInfo.length; i++) {
if (taxInfo[i].sbrq) {
taxInfo[i].sbrq = tool.formatDate(taxInfo[i].sbrq);
taxInfo[i].sbrq = tool.formatDate(taxInfo[i].sbrq).substring(0, 10);
}
if (taxInfo[i].sbqx) {
taxInfo[i].sbqx = tool.formatDate(taxInfo[i].sbqx);
......@@ -308,6 +308,7 @@ function initPage(companyInfo) {
if (data.success) {
drawGrid(data.bean);
companyInfo = data.bean;
zjhm = companyInfo.zjhm
config.value = companyInfo.value;
if (type == 'Y') {
myAlert("提示", "重置清册成功", "确定")
......
......@@ -152,6 +152,7 @@ function initPage(companyInfo) {
dataType: "JSON"
}).done(function(data) {
if (data.success) {
zjhm = data.bean.zjhm
// TODO 基本信息
taxAmendGrid(); // 在这里要把返回数据传递给table
} else {
......
......@@ -157,6 +157,7 @@ function initPage(companyInfo) {
dataType: "JSON"
}).done(function(data) {
if (data.success) {
zjhm = data.bean.zjhm
// TODO 基本信息
taxAmendGrid(); // 在这里要把返回数据传递给table
} else {
......
......@@ -38,6 +38,7 @@ function getInitTable() {
if (data.bean.sfyhzctsBz == 'Y') {
myAlert("提示", "尊敬的纳税人、缴费人,为进一步巩固拓展减税降费成效,助力市场主体纾困解难,对部分2020年底到期税费优惠政策(不包括社会保险费),您可暂按原政策文件规定申报享受优惠(原减免性质代码可继续使用)。详细情况可咨询主管税务分局、税务所或12366纳税服务热线。感谢您的理解与支持!!", "确定");
}
zjhm = data.bean.zjhm
djxh = data.bean.djxh;
sbqDate = data.bean.sbqDate;
taxInfos = data.bean.taxInfos;
......@@ -178,6 +179,7 @@ function initPage(companyInfo) {
sbsq: sbqDate,
taxInfos: taxInfos,
value: config.value,
zjhm:zjhm
},
};
window.open(config.zhsbPage, '_blank');
......@@ -226,6 +228,7 @@ function initPage(companyInfo) {
// },
}).done(function (data) {
if (data.success) {
zjhm = data.bean.zjhm
if (data.bean.url == "error.jsp") {
myAlert("提示", data.bean.errorInfo, "确定")
return
......@@ -327,8 +330,10 @@ function initPage(companyInfo) {
window.mlistener = {
selectRowData: {},
};
submitData.fillingFlag = "normal" // 填报标记
submitData.saveUserId = "zxtb"; // 用户id
submitData.zjhm = zjhm
window.mlistener.selectRowData = submitData;
window.open(config.ssfwptPage, '_blank');
Object.defineProperty(mlistener, 'returnSelectRowData', {
......
......@@ -276,6 +276,7 @@ function initPage(companyInfo) {
// },
}).done(function (data) {
if (data.success) {
zjhm = data.bean.zjhm
if (data.bean.url == "error.jsp") {
myAlert("提示", data.bean.errorInfo, "确定")
return
......
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