Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
ydLife
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Sweet Zhang
ydLife
Commits
73b0487c
Commit
73b0487c
authored
Jun 21, 2021
by
sunchao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
上一期下一期月份转化成数字
parent
eb831649
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
src/app/my/salary-detail/salary-detail.component.ts
+2
-3
src/environments/environment.ts
+3
-3
No files found.
src/app/my/salary-detail/salary-detail.component.ts
View file @
73b0487c
...
@@ -87,7 +87,7 @@ export class SalaryDetailComponent implements OnInit {
...
@@ -87,7 +87,7 @@ export class SalaryDetailComponent implements OnInit {
querySalaryDetail
(
type
){
querySalaryDetail
(
type
){
if
(
type
!=
null
){
if
(
type
!=
null
){
for
(
let
i
=
0
;
i
<
this
.
payScaleInfos
.
length
;
i
++
){
for
(
let
i
=
0
;
i
<
this
.
payScaleInfos
.
length
;
i
++
){
if
(
this
.
payScaleInfos
[
i
][
'years'
]
==
this
.
years
&&
this
.
payScaleInfos
[
i
][
'month'
]
==
this
.
month
){
if
(
(
this
.
payScaleInfos
[
i
][
'years'
]
==
this
.
years
)
&&
(
Number
(
this
.
payScaleInfos
[
i
][
'month'
])
==
this
.
month
)
){
//上一期
//上一期
if
(
type
==
'pre'
){
if
(
type
==
'pre'
){
// if(i==this.payScaleInfos.length-1){
// if(i==this.payScaleInfos.length-1){
...
@@ -117,7 +117,6 @@ export class SalaryDetailComponent implements OnInit {
...
@@ -117,7 +117,6 @@ export class SalaryDetailComponent implements OnInit {
}
}
//下一期
//下一期
if
(
type
==
'next'
){
if
(
type
==
'next'
){
debugger
;
if
(
i
==
0
){
if
(
i
==
0
){
const
toast
=
ToastService
.
show
(
'已到最后一期薪资!'
,
0
);
const
toast
=
ToastService
.
show
(
'已到最后一期薪资!'
,
0
);
setTimeout
(()
=>
{
setTimeout
(()
=>
{
...
@@ -213,7 +212,7 @@ export class SalaryDetailComponent implements OnInit {
...
@@ -213,7 +212,7 @@ export class SalaryDetailComponent implements OnInit {
//薪资单列表-》用来判断上一期下一期的加减
//薪资单列表-》用来判断上一期下一期的加减
payScaleListQuery
()
{
payScaleListQuery
()
{
this
.
myService
.
payScaleListQuery
({
practitionerIdEG
:
this
.
practitionerIdEG
,
practitionerId
:
this
.
practitionerId
,
isHistory
:
2
}).
subscribe
((
res
)
=>
{
this
.
myService
.
payScaleListQuery
({
practitionerId
:
this
.
practitionerId
,
isHistory
:
2
}).
subscribe
((
res
)
=>
{
if
(
res
[
'success'
])
{
if
(
res
[
'success'
])
{
this
.
payScaleInfos
=
res
[
'data'
][
'payScaleInfos'
];
this
.
payScaleInfos
=
res
[
'data'
][
'payScaleInfos'
];
}
}
...
...
src/environments/environment.ts
View file @
73b0487c
...
@@ -5,8 +5,8 @@
...
@@ -5,8 +5,8 @@
export
const
environment
=
{
export
const
environment
=
{
production
:
false
,
production
:
false
,
BACKEND_URL_CONFIG_VALUE
:
'https://m.zuihuibi.cn/api'
,
BACKEND_URL_CONFIG_VALUE
:
'https://m
dev
.zuihuibi.cn/api'
,
ORIGINNAME
:
'https://m.zuihuibi.cn/ydapi'
,
ORIGINNAME
:
'https://m
dev
.zuihuibi.cn/ydapi'
,
DOMAINNAME
:
'https://m.zuihuibi.cn/'
,
DOMAINNAME
:
'https://m
dev
.zuihuibi.cn/'
,
BAIDU_TONGJI_CODE
:
'e8fa107d82e0471d097d545225aeed64'
BAIDU_TONGJI_CODE
:
'e8fa107d82e0471d097d545225aeed64'
};
};
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