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
Show 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 @@
...
@@ -141,22 +141,21 @@
}
}
var
companyInfo
=
data
;
var
companyInfo
=
data
;
companyInfo
.
config
=
config
if
(
companyInfo
.
success
)
{
if
(
companyInfo
.
success
)
{
companyInfo
.
bean
.
config
=
config
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
);
initpage
=
initPage
(
companyInfo
.
bean
);
/*$("#getInputValue").on("focus", function() {
WdatePicker({
isShowClear:false,
dateFmt: 'yyyy-MM',
onpicking: function(dp){
initpage.changeDate(this, dp);
}
});
});*/
}
else
{
}
else
{
initpage
=
initPage
(
""
);
hideLoading
();
alertWarning
(
companyInfo
.
returnMessage
);
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
()
{
$
(
"#getInputValue"
).
on
(
"focus"
,
function
()
{
...
...
jsp/overdue/index.html
View file @
5d098453
...
@@ -139,11 +139,19 @@
...
@@ -139,11 +139,19 @@
$
(
"#djxh"
).
attr
(
"value"
,
companyInfo
.
djxh
);
$
(
"#djxh"
).
attr
(
"value"
,
companyInfo
.
djxh
);
if
(
companyInfo
.
success
)
{
if
(
companyInfo
.
success
)
{
companyInfo
.
bean
.
config
=
config
companyInfo
.
bean
.
config
=
config
companyInfo
.
bean
.
return
=
true
;
initpage
=
initPage
(
companyInfo
.
bean
);
initpage
=
initPage
(
companyInfo
.
bean
);
}
else
{
}
else
{
hideLoading
();
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
);
alertWarning
(
companyInfo
.
returnMessage
);
// 弹出错误对话框
// 弹出错误对话框
}
}
...
...
static/biz/declare_grid.js
View file @
5d098453
...
@@ -160,7 +160,6 @@ function initPage(companyInfo) {
...
@@ -160,7 +160,6 @@ function initPage(companyInfo) {
pzzlDm
:
companyInfo
.
pzzlDm
pzzlDm
:
companyInfo
.
pzzlDm
}
}
$
.
ajax
({
$
.
ajax
({
// url: url + "/ssfwpt/declare/getPzzlList",
url
:
url
+
"/ssfwpt/declare/getPzzlList"
,
url
:
url
+
"/ssfwpt/declare/getPzzlList"
,
data
:
param
,
data
:
param
,
type
:
"POST"
,
type
:
"POST"
,
...
@@ -171,12 +170,11 @@ function initPage(companyInfo) {
...
@@ -171,12 +170,11 @@ function initPage(companyInfo) {
if
(
data
.
bean
.
url
==
"error.jsp"
)
{
if
(
data
.
bean
.
url
==
"error.jsp"
)
{
myAlert
(
"提示"
,
data
.
bean
.
errorInfo
,
"确定"
)
myAlert
(
"提示"
,
data
.
bean
.
errorInfo
,
"确定"
)
return
return
// window.location.href = "/jsp/error/index.html?falg="+param;
}
}
drawGrid
(
data
.
bean
);
drawGrid
(
data
.
bean
);
companyInfo
=
data
.
bean
;
companyInfo
=
data
.
bean
;
}
else
{
}
else
{
alertWarning
(
data
.
returnMessage
);
alertWarning
(
data
.
errmsg
);
}
}
}).
always
(
function
(
data
)
{
}).
always
(
function
(
data
)
{
hideLoading
();
hideLoading
();
...
@@ -194,9 +192,9 @@ function initPage(companyInfo) {
...
@@ -194,9 +192,9 @@ function initPage(companyInfo) {
var
drawGrid
=
function
(
bean
)
{
var
drawGrid
=
function
(
bean
)
{
//两个表合成一个表
//两个表合成一个表
$
.
each
(
bean
.
financialInfos
,
function
(
i
,
item
){
$
.
each
(
bean
.
financialInfos
,
function
(
i
,
item
){
bean
.
taxInfos
.
push
(
item
);
bean
.
taxInfos
.
push
(
item
);
});
});
console
.
log
(
bean
)
console
.
log
(
bean
)
if
(
bean
.
taxInfos
.
length
==
0
){
if
(
bean
.
taxInfos
.
length
==
0
){
showTax
(
bean
.
taxInfos
);
showTax
(
bean
.
taxInfos
);
...
...
static/biz/overdue_grid.js
View file @
5d098453
...
@@ -319,7 +319,7 @@ function initPage(companyInfo) {
...
@@ -319,7 +319,7 @@ function initPage(companyInfo) {
//TODO 调用备案接口
//TODO 调用备案接口
});
});
// 格式化后台返回的时间
// 格式化后台返回的时间
if
(
companyInfo
)
{
if
(
companyInfo
.
config
.
return
)
{
$
(
"#getInputValue"
).
val
(
tool
.
formatDate
(
companyInfo
.
sbsq
));
$
(
"#getInputValue"
).
val
(
tool
.
formatDate
(
companyInfo
.
sbsq
));
nowDate
=
tool
.
formatDate
(
companyInfo
.
sbsq
);
nowDate
=
tool
.
formatDate
(
companyInfo
.
sbsq
);
drawGrid
(
companyInfo
);
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