Skip to content

Z
zxtb_to_ssfwpt
Commit 494405c8 authored by 彭令令's avatar 彭令令
Browse files
Options

合并开发分支

parent b8535600
Show whitespace changes
Inline Side-by-side
Showing with 198 additions and 65 deletions
static/biz/amend_grid.js
View file @ 494405c8
...@@ -105,28 +105,33 @@ function initPage(companyInfo) { ...@@ -105,28 +105,33 @@ function initPage(companyInfo) {
declareDate = declarationDateStart + " " + declarationDateEnd; // 临时存储date 可能用于时间比对，赋值给时间全局变量 declareDate = declarationDateStart + " " + declarationDateEnd; // 临时存储date 可能用于时间比对，赋值给时间全局变量
var id = "#taxAmendGrid"; var id = "#taxAmendGrid";
var buttonHtml = "更正申报"; var buttonHtml = "更正申报";
var order = ["bblxMc", "djxh", "sbrq", "skssqq", "skssqz", "ybtse", "do"]; var order = ["bblxMc", "djxh","zgswskfjMc","sbrq", "skssqq", "skssqz", "ybtse", "do"];
var headerList = [{ var headerList = [{
name: "序号", name: "序号",
width: "5%" width: "3%"
}, { }, {
name: "申报表名称", name: "申报表名称",
width: "30%" width: "22%"
}, { }, {
name: "登记序号", name: "登记序号",
width: "15%" width: "13%"
}, { },
{
name: "主管税务所（科、分局）",
width: "24%"
},
{
name: "原申报日期", name: "原申报日期",
width: "10%" width: "7%"
}, { }, {
name: "税款所属期起", name: "税款所属期起",
width: "10%" width: "7%"
}, { }, {
name: "税款所属期止", name: "税款所属期止",
width: "10%" width: "7%"
}, { }, {
name: "更正前应补退税额", name: "更正前应补退税额",
width: "10%" width: "7%"
}, { }, {
name: "操作", name: "操作",
width: "10%" width: "10%"
......
static/biz/cancellation_grid.js
View file @ 494405c8
...@@ -112,26 +112,32 @@ function initPage(companyInfo) { ...@@ -112,26 +112,32 @@ function initPage(companyInfo) {
}) })
var id = "#taxGrid"; var id = "#taxGrid";
var buttonHtml = "填写申报表"; var buttonHtml = "填写申报表";
var order = ["pzzlMc", "djxh", "sssqQ", "sssqZ", "sbrq", "do"]; var order = ["pzzlMc", "djxh", "zgswskfjMc","sssqQ", "sssqZ", "sbrq", "do"];
var promptStatement = ""; var promptStatement = "";
var headerList = [{ var headerList = [{
name: "序号", name: "序号",
width: "5%" width: "2%"
}, { }, {
name: "申报表", name: "申报表",
width: "40%" width: "30%"
}, { },
{
name: "登记序号", name: "登记序号",
width: "15%" width: "12%"
}, { },
{
name: "主管税务所（科、分局）",
width: "25%"
},
{
name: "税款所属期起", name: "税款所属期起",
width: "10%" width: "7%"
}, { }, {
name: "税款所属期止", name: "税款所属期止",
width: "10%" width: "7%"
}, { }, {
name: "申报日期", name: "申报日期",
width: "10%" width: "7%"
}, { }, {
name: "操作", name: "操作",
width: "10%" width: "10%"
...@@ -157,32 +163,37 @@ function initPage(companyInfo) { ...@@ -157,32 +163,37 @@ function initPage(companyInfo) {
}) })
var id = "#financialGrid"; var id = "#financialGrid";
var buttonHtml = "填写申报表"; var buttonHtml = "填写申报表";
var order = ["kjzd", "pzzlMc", "djxh", "sssqQ", "sssqZ", "sbrq", "do"]; var order = ["kjzd", "pzzlMc", "djxh","zgswskfjMc", "sssqQ", "sssqZ", "sbrq", "do"];
var promptStatement = ""; var promptStatement = "";
if (financialInfo.length < 1 && type == 1) { if (financialInfo.length < 1 && type == 1) {
promptStatement = "您尚未进行财务报表类型备案，请先备案后再进行申报"; promptStatement = "您尚未进行财务报表类型备案，请先备案后再进行申报";
} }
var headerList = [{ var headerList = [{
name: "序号", name: "序号",
width: "5%" width: "2%"
}, { }, {
name: "财务、会计制度", name: "财务、会计制度",
width: "10%" width: "10%"
}, { }, {
name: "财务报表报送小类", name: "财务报表报送小类",
width: "30%" width: "19%"
}, { }, {
name: "登记序号", name: "登记序号",
width: "15%" width: "11%"
}, { },
{
name: "主管税务所（科、分局）",
width: "25%"
},
{
name: "报送所属期起", name: "报送所属期起",
width: "10%" width: "7%"
}, { }, {
name: "报送所属期止", name: "报送所属期止",
width: "10%" width: "7%"
}, { }, {
name: "申报日期", name: "申报日期",
width: "10%" width: "7%"
}, { }, {
name: "操作", name: "操作",
width: "10%" width: "10%"
......
static/biz/declare-overdue_grid.js
View file @ 494405c8
...@@ -121,29 +121,32 @@ function initPage(companyInfo) { ...@@ -121,29 +121,32 @@ function initPage(companyInfo) {
} }
var id = "#taxGrid"; var id = "#taxGrid";
var buttonHtml = "填写申报表"; var buttonHtml = "填写申报表";
var order = ["pzzlMc", "djxh", "sssqQ", "sssqZ", "sbqx", "sbrq", "do"]; var order = ["pzzlMc", "djxh","zgswskfjMc","sssqQ", "sssqZ", "sbqx", "sbrq", "do"];
var promptStatement = ""; var promptStatement = "";
var headerList = [{ var headerList = [{
name: "序号", name: "序号",
width: "5%" width: "2%"
}, { }, {
name: "申报表", name: "申报表",
width: "30%" width: "22%"
}, { }, {
name: "登记序号", name: "登记序号",
width: "15%" width: "12%"
}, {
name: "主管税务所（科、分局）",
width: "25%"
}, { }, {
name: "税款所属期起", name: "税款所属期起",
width: "10%" width: "7%"
}, { }, {
name: "税款所属期止", name: "税款所属期止",
width: "10%" width: "7%"
}, { }, {
name: "申报期限", name: "申报期限",
width: "10%" width: "7%"
}, { }, {
name: "申报日期", name: "申报日期",
width: "10%" width: "7%"
}, { }, {
name: "操作", name: "操作",
width: "10%" width: "10%"
......
static/biz/declare_grid.js
View file @ 494405c8
...@@ -157,26 +157,32 @@ function initPage(companyInfo) { ...@@ -157,26 +157,32 @@ function initPage(companyInfo) {
} }
var id = "#taxGrid"; var id = "#taxGrid";
var buttonHtml = "填写申报表"; var buttonHtml = "填写申报表";
var order = ["pzzlMc", "djxh", "sssqQ", "sssqZ", "sbrq", "do"]; var order = ["pzzlMc", "djxh","zgswskfjMc", "sssqQ", "sssqZ", "sbrq", "do"];
var promptStatement = ""; var promptStatement = "";
var headerList = [{ var headerList = [{
name: "序号", name: "序号",
width: "5%" width: "2%"
}, { }, {
name: "申报表", name: "申报表",
width: "40%" width: "30%"
}, { },
{
name: "登记序号", name: "登记序号",
width: "15%" width: "12%"
}, { },
{
name: "主管税务所（科、分局）",
width: "25%"
},
{
name: "税款所属期起", name: "税款所属期起",
width: "10%" width: "7%"
}, { }, {
name: "税款所属期止", name: "税款所属期止",
width: "10%" width: "7%"
}, { }, {
name: "申报日期", name: "申报日期",
width: "10%" width: "7%"
}, { }, {
name: "操作", name: "操作",
width: "10%" width: "10%"
...@@ -345,10 +351,97 @@ function initPage(companyInfo) { ...@@ -345,10 +351,97 @@ function initPage(companyInfo) {
$.each(bean.financialInfos, function (i, item) { $.each(bean.financialInfos, function (i, item) {
bean.taxInfos.push(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]
}
}
// console.log(clf)
// console.log(clf.sksssjq)
var obj={
bblxDm: "12002",
bblxMc: "《增量房交易税收申报表》",
bczt: "W",
checkTime: false,
djxh: bean.djxh,
flKey: "",
flag: "",
gdsbz: "G",
gzFlag: "0",
gzcs: null,
hyDm: "5172",
id: null,
initTableArrs: "",
initTableData: "",
iszzsybjc: "01",
jkrq: "",
jkzt: "N",
kjzd: "",
label: null,
multiPatch: "Y",
nsqxDm: "11",
nsqxdm: null,
nsrlx: null,
nsrmc: "",
nsrsbh: bean.nsrsbh,
nsrsbq: bean.sbsq.replace(/\-/g,""),
nssbq: bean.sbsq.replace(/\-/g,""),
nssbqq2: null,
nssbqz2: null,
operateType: bean.operateType,
pcDm: 1,
pzxh: "",
pzzlDm: "12002",
pzzlMc: "《增量房交易税收申报表》",
qsbz: "N",
sbbdm: null,
sbbsx: "11",
sbbz: "3",
sbjg: null,
sbqx: null,
sbrq: null,
sbrq1: "",
sbuuid: "",
sbxxId: "",
sbzt: "N",
se: null,
sfyczb: "N",
skssqq: null,
skssqz: null,
sksssjq: clf.sksssjq?clf.sksssjq:"",
sksssjz: clf.sksssjq?clf.sksssjz:"",
sourceFlag: "ssfwpt_sbzj",
ssdabh: "",
sssqQ: clf.sssqQ?clf.sssqQ:'-',
sssqZ: clf.sssqZ?clf.sssqZ:'-',
swjgmc: null,
token: "",
tsxx: null,
type: "taxName",
uuId: "",
ybjcState: "N",
ybtse: "",
yzpzxh: null,
yzpzzlDm: "",
zgswskfjDm: "",
zgswskfjMc: "",
zsDjxh: bean.djxh,
zsxmDm: "",
}
// console.log(obj)
var obj1=[]
for(var i in bean.taxInfos){
obj1.push(bean.taxInfos[i].pzzlDm)
}
if (bean.taxInfos.length == 0) { if (bean.taxInfos.length == 0) {
showTax(bean.taxInfos); showTax(bean.taxInfos);
alertInfo("税费申报暂无数据"); alertInfo("税费申报暂无数据");
} else { } else {
if(obj1.includes('12001')){
bean.taxInfos.push(obj)
}
showTax(bean.taxInfos); showTax(bean.taxInfos);
} }
}; };
......
static/biz/declare_union_grid.js
View file @ 494405c8
...@@ -159,26 +159,32 @@ function initPage(companyInfo) { ...@@ -159,26 +159,32 @@ function initPage(companyInfo) {
} }
var id = "#taxGrid"; var id = "#taxGrid";
var buttonHtml = "填写申报表"; var buttonHtml = "填写申报表";
var order = ["pzzlMc", "djxh", "sssqQ", "sssqZ", "sbrq", "do"]; var order = ["pzzlMc", "djxh","zgswskfjMc", "sssqQ", "sssqZ", "sbrq", "do"];
var promptStatement = ""; var promptStatement = "";
var headerList = [{ var headerList = [{
name: "序号", name: "序号",
width: "5%" width: "2%"
}, { }, {
name: "申报表", name: "申报表",
width: "40%" width: "30%"
}, { },
{
name: "登记序号", name: "登记序号",
width: "15%" width: "12%"
}, { },
{
name: "主管税务所（科、分局）",
width: "25%"
},
{
name: "税款所属期起", name: "税款所属期起",
width: "10%" width: "7%"
}, { }, {
name: "税款所属期止", name: "税款所属期止",
width: "10%" width: "7%"
}, { }, {
name: "申报日期", name: "申报日期",
width: "10%" width: "7%"
}, { }, {
name: "操作", name: "操作",
width: "10%" width: "10%"
......
static/biz/overdue_grid.js
View file @ 494405c8
...@@ -119,29 +119,32 @@ function initPage(companyInfo) { ...@@ -119,29 +119,32 @@ function initPage(companyInfo) {
} }
var id = "#taxGrid"; var id = "#taxGrid";
var buttonHtml = "填写申报表"; var buttonHtml = "填写申报表";
var order = ["pzzlMc", "djxh", "sssqQ", "sssqZ", "sbqx", "sbrq", "do"]; var order = ["pzzlMc", "djxh","zgswskfjMc", "sssqQ", "sssqZ", "sbrq", "do"];
var promptStatement = ""; var promptStatement = "";
var headerList = [{ var headerList = [{
name: "序号", name: "序号",
width: "5%" width: "2%"
}, { }, {
name: "申报表", name: "申报表",
width: "30%" width: "30%"
}, { },
{
name: "登记序号", name: "登记序号",
width: "15%" width: "12%"
}, { },
{
name: "主管税务所（科、分局）",
width: "25%"
},
{
name: "税款所属期起", name: "税款所属期起",
width: "10%" width: "7%"
}, { }, {
name: "税款所属期止", name: "税款所属期止",
width: "10%" width: "7%"
}, {
name: "申报期限",
width: "10%"
}, { }, {
name: "申报日期", name: "申报日期",
width: "10%" width: "7%"
}, { }, {
name: "操作", name: "操作",
width: "10%" width: "10%"
......
static/css/amend/amend.css
View file @ 494405c8
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
.div-float { .div-float {
float: left; float: left;
width: 10%; width: 7%;
height: 100% height: 100%
} }
...@@ -135,6 +135,10 @@ ...@@ -135,6 +135,10 @@
text-align: center; text-align: center;
} }
#taxAmendGrid>.table-responsive .tbody>.table-tr>.row-4{
padding-left: 5px;
text-align: left;
}
#taxAmendGrid, #taxAmendGrid,
#taxRevokeGrid>.table-responsive .tbody>.table-tr>.row-1 { #taxRevokeGrid>.table-responsive .tbody>.table-tr>.row-1 {
padding-left: 5px; padding-left: 5px;
......
static/css/declare/declare.css
View file @ 494405c8
...@@ -47,6 +47,10 @@ ...@@ -47,6 +47,10 @@
padding-left: 5px; padding-left: 5px;
text-align: left; text-align: left;
} }
#taxGrid>.table-responsive .tbody>.table-tr>.row-3 {
padding-left: 5px;
text-align: left;
}
#financialGrid>.table-responsive .tbody>.table-tr>.row-1 { #financialGrid>.table-responsive .tbody>.table-tr>.row-1 {
padding-left: 5px; padding-left: 5px;
...@@ -57,3 +61,7 @@ ...@@ -57,3 +61,7 @@
padding-left: 5px; padding-left: 5px;
text-align: left; text-align: left;
} }
#financialGrid>.table-responsive .tbody>.table-tr>.row-4 {
padding-left: 5px;
text-align: left;
}
\ 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