Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
Z
zxtb_to_ssfwpt
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Bugzilla
Bugzilla
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
卢世豪
zxtb_to_ssfwpt
Commits
5d098453
Commit
5d098453
authored
Jul 08, 2020
by
于广洋
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
后台返回错误信息的时候,申报月份依然可以切换
parent
2d99544a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
39 additions
and
34 deletions
+39
-34
index.html
jsp/declare/index.html
+11
-12
index.html
jsp/overdue/index.html
+9
-1
declare_grid.js
static/biz/declare_grid.js
+18
-20
overdue_grid.js
static/biz/overdue_grid.js
+1
-1
No files found.
jsp/declare/index.html
View file @
5d098453
...
...
@@ -141,22 +141,21 @@
}
var
companyInfo
=
data
;
companyInfo
.
config
=
config
if
(
companyInfo
.
success
)
{
companyInfo
.
bean
.
config
=
config
companyInfo
.
bean
.
return
=
true
;
/* @Author ygy @Date 10:12 2020/7/8 @Description 前端判断接口成功返回数据标记用于区分是否执行初始化table方法*/
config
.
return
=
true
;
initpage
=
initPage
(
companyInfo
.
bean
);
/*$("#getInputValue").on("focus", function() {
WdatePicker({
isShowClear:false,
dateFmt: 'yyyy-MM',
onpicking: function(dp){
initpage.changeDate(this, dp);
}
});
});*/
}
else
{
initpage
=
initPage
(
""
);
alertWarning
(
companyInfo
.
returnMessage
);
hideLoading
();
if
(
!
companyInfo
.
bean
){
companyInfo
.
bean
=
{};
companyInfo
.
bean
.
djxh
=
getUrlParam
(
"djxh"
);
companyInfo
.
bean
.
return
=
false
;
}
alertWarning
(
companyInfo
.
errmsg
);
companyInfo
.
bean
.
config
=
config
initpage
=
initPage
(
companyInfo
.
bean
);
// 弹出错误对话框
}
$
(
"#getInputValue"
).
on
(
"focus"
,
function
()
{
...
...
jsp/overdue/index.html
View file @
5d098453
...
...
@@ -139,11 +139,19 @@
$
(
"#djxh"
).
attr
(
"value"
,
companyInfo
.
djxh
);
if
(
companyInfo
.
success
)
{
companyInfo
.
bean
.
config
=
config
companyInfo
.
bean
.
return
=
true
;
initpage
=
initPage
(
companyInfo
.
bean
);
}
else
{
hideLoading
();
initpage
=
initPage
(
""
);
if
(
!
companyInfo
.
bean
){
companyInfo
.
bean
=
{};
companyInfo
.
bean
.
djxh
=
getUrlParam
(
"djxh"
);
companyInfo
.
bean
.
return
=
false
;
}
alertWarning
(
companyInfo
.
errmsg
);
companyInfo
.
bean
.
config
=
config
initpage
=
initPage
(
companyInfo
.
bean
);
alertWarning
(
companyInfo
.
returnMessage
);
// 弹出错误对话框
}
...
...
static/biz/declare_grid.js
View file @
5d098453
/**
* 按期申报填报列表页控制脚本
*
*
* @author 于广洋
* @modify 王雷
*/
// -------------------------------
/**
* 绘制税种填报页面
*
* @param {*} companyInfo
*
* @param {*} companyInfo
*/
function
initPage
(
companyInfo
)
{
getIEVersion
();
...
...
@@ -59,11 +59,11 @@ function initPage(companyInfo) {
};
/**
* 税务申报table渲染
* @param {*} id
* @param {*} order
* @param {*} headerList
* @param {*} ddt
* @param {*} buttonHtml
* @param {*} id
* @param {*} order
* @param {*} headerList
* @param {*} ddt
* @param {*} buttonHtml
*/
var
getTableDeclaration
=
function
(
id
,
order
,
headerList
,
ddt
,
buttonHtml
,
promptStatement
)
{
var
tableObj
=
{
...
...
@@ -132,7 +132,7 @@ function initPage(companyInfo) {
declarationMethod
(
"N"
)
}
}
}
//点击按钮后的回调函数
}
//点击按钮后的回调函数
};
var
object
=
tool
.
tableCreate
(
tableObj
);
// object.jsonReadyTo(ddt, { page: "1", pageSize: ddt.length });
...
...
@@ -142,9 +142,9 @@ function initPage(companyInfo) {
* 税务申报 初始化数据获取
* @param {*} mydate
*/
//地址
//http://sbjs.tjsat.gov.cn:18090
//http://localhost:7070
//地址
//http://sbjs.tjsat.gov.cn:18090
//http://localhost:7070
var
url
;
if
(
companyInfo
){
url
=
companyInfo
.
config
.
url
;
...
...
@@ -160,7 +160,6 @@ function initPage(companyInfo) {
pzzlDm
:
companyInfo
.
pzzlDm
}
$
.
ajax
({
// url: url + "/ssfwpt/declare/getPzzlList",
url
:
url
+
"/ssfwpt/declare/getPzzlList"
,
data
:
param
,
type
:
"POST"
,
...
...
@@ -171,12 +170,11 @@ function initPage(companyInfo) {
if
(
data
.
bean
.
url
==
"error.jsp"
)
{
myAlert
(
"提示"
,
data
.
bean
.
errorInfo
,
"确定"
)
return
// window.location.href = "/jsp/error/index.html?falg="+param;
}
drawGrid
(
data
.
bean
);
companyInfo
=
data
.
bean
;
}
else
{
alertWarning
(
data
.
returnMessage
);
alertWarning
(
data
.
errmsg
);
}
}).
always
(
function
(
data
)
{
hideLoading
();
...
...
@@ -194,9 +192,9 @@ function initPage(companyInfo) {
var
drawGrid
=
function
(
bean
)
{
//两个表合成一个表
$
.
each
(
bean
.
financialInfos
,
function
(
i
,
item
){
bean
.
taxInfos
.
push
(
item
);
});
$
.
each
(
bean
.
financialInfos
,
function
(
i
,
item
){
bean
.
taxInfos
.
push
(
item
);
});
console
.
log
(
bean
)
if
(
bean
.
taxInfos
.
length
==
0
){
showTax
(
bean
.
taxInfos
);
...
...
@@ -266,7 +264,7 @@ function initPage(companyInfo) {
}
else
if
(
data
.
url
==
"yearReportGLB.jsp"
)
{
window
.
open
(
config
.
webUrl
+
"declare/yearReportGLB.html?falg="
+
falg
+
'¶ms='
+
encodeURI
(
JSON
.
stringify
(
submitData
)));
}
else
{
//因为后台不知道返回路径是什么样的就直接改成了else data.url == "error.jsp"
//因为后台不知道返回路径是什么样的就直接改成了else data.url == "error.jsp"
window
.
open
(
config
.
webUrl
+
"error/index.html?falg="
+
falg
+
'¶ms='
+
encodeURI
(
JSON
.
stringify
(
submitData
)));
}
},
...
...
@@ -283,7 +281,7 @@ function initPage(companyInfo) {
}
/**
* 重置调用方法
* @param {} params
* @param {} params
*/
$
(
"#reset,#reset1"
).
on
(
"click"
,
refresh
);
$
(
"#goRecord"
).
click
(
function
()
{
...
...
static/biz/overdue_grid.js
View file @
5d098453
...
...
@@ -319,7 +319,7 @@ function initPage(companyInfo) {
//TODO 调用备案接口
});
// 格式化后台返回的时间
if
(
companyInfo
)
{
if
(
companyInfo
.
config
.
return
)
{
$
(
"#getInputValue"
).
val
(
tool
.
formatDate
(
companyInfo
.
sbsq
));
nowDate
=
tool
.
formatDate
(
companyInfo
.
sbsq
);
drawGrid
(
companyInfo
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment