Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
account-book
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
刘文虎
account-book
Commits
18ff045d
Commit
18ff045d
authored
Nov 09, 2022
by
Facius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 统计计算说明
parent
389dc018
Pipeline
#3994
canceled with stages
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
13 deletions
+17
-13
detail.vue
pages/maintain-bill/detail.vue
+1
-1
cell-project-bill.vue
...s/workpoint/project-bill/components/cell-project-bill.vue
+3
-3
summary-content.vue
pages/workpoint/project-bill/components/summary-content.vue
+9
-5
summary-count.vue
pages/workpoint/project-bill/components/summary-count.vue
+4
-4
No files found.
pages/maintain-bill/detail.vue
View file @
18ff045d
...
...
@@ -187,7 +187,7 @@ export default {
return
this
.
info
.
sendStatus
.
code
==
'SURE'
||
this
.
info
.
settleState
.
code
==
'YES'
;
},
middleImage
()
{
return
this
.
baseUrl
+
'fengexuxian
@3x-3
.png'
;
return
this
.
baseUrl
+
'fengexuxian
-light@3x
.png'
;
},
// sendStatus WAIT:未发送;WAIT_SURE:未确定;SURE:已确定
// settleState NO:未结清;YES:已结清
...
...
pages/workpoint/project-bill/components/cell-project-bill.vue
View file @
18ff045d
...
...
@@ -46,7 +46,7 @@ export default {
},
computed
:
{
// 项目工资:工时 + 包工 = 总
// 未结: 总 - 已结
// 未结: 总 - 已结
- 借支
values
()
{
let
all
=
Number
(
this
.
member
.
contractorAmount
||
0
)
+
Number
(
this
.
member
.
timeAmount
||
0
)
return
{
...
...
@@ -54,8 +54,8 @@ export default {
memberId
:
this
.
member
.
memberId
,
memberName
:
this
.
member
.
memberName
,
settleAmount
:
formatCount
(
Math
.
abs
(
Number
(
this
.
member
.
settleAmount
||
0
))),
// 已结工资
borrowingAmount
:
formatCount
(
Number
(
this
.
member
.
borrowingAmount
||
0
)),
// 借支金额
unsettleAmount
:
formatCount
(
all
+
Number
(
this
.
member
.
settleAmount
||
0
)),
// 未结工资
borrowingAmount
:
formatCount
(
Math
.
abs
(
Number
(
this
.
member
.
borrowingAmount
||
0
)
)),
// 借支金额
unsettleAmount
:
formatCount
(
all
+
Number
(
this
.
member
.
settleAmount
||
0
)
+
Number
(
this
.
member
.
borrowingAmount
||
0
)
),
// 未结工资
normalWorkTime
:
this
.
member
.
normalWorkTime
,
// 上班工时
overWorkTIme
:
this
.
member
.
overWorkTIme
,
// 加班工量
contractorNum
:
this
.
member
.
contractorNum
,
// 包工笔数
...
...
pages/workpoint/project-bill/components/summary-content.vue
View file @
18ff045d
...
...
@@ -16,7 +16,7 @@
</view>
</view>
<view
:class=
"['bill-count-view',
{ more: showMore }]">
<SummaryCount
:detail=
"statistics"
@
infoShow=
"handleShowInfo"
/>
<SummaryCount
:detail=
"statistics"
@
infoShow=
"handleShowInfo"
/>
</view>
<view
class=
"show-more-view"
@
click=
"$u.throttle(handleClickShowMore, 500)"
hover-class=
"u-hover-class"
>
<u-icon
:name=
"showMore ? 'arrow-up' : 'arrow-down'"
color=
"#02A074"
size=
"32"
></u-icon>
...
...
@@ -43,10 +43,11 @@
@
change=
"handleClickChange"
>
<view
style=
"left:200%"
></view>
</DateRangePicker>
<PopNormal
:visible
.
sync=
"visible"
title=
"加班工量"
confirmText=
"我知道了"
:showCancel=
"false"
>
<PopNormal
:visible
.
sync=
"visible"
title=
"加班工量
统计说明
"
confirmText=
"我知道了"
:showCancel=
"false"
>
<view
class=
"pop-content"
>
如您在记工时填写为
<text
class=
"green-text"
>
[加班小时]
</text>
,将根据加班设置换算工量;如果设置为
<text
class=
"green-text"
>
[按小时算]
</text>
则根据上班设置进行工量换算。
<view>
如果在
<text
class=
"green-text"
>
[记加班]
</text>
时选择[按小时]模式;将根据
<text
class=
"green-text"
>
[加班类型]
</text>
设置自动换算成N小时=1个工量;
</view>
<view>
1)按工天算:以
<text
class=
"green-text"
>
[加班]
</text>
设置换算;
</view>
<view>
2)按小时算:以
<text
class=
"green-text"
>
[上班]
</text>
设置换算。
</view>
</view>
</PopNormal>
</view>
...
...
@@ -202,7 +203,7 @@ export default {
handleClickShowDateRange
()
{
this
.
$refs
[
'date-range-picker'
].
show
();
},
handleShowInfo
(
show
)
{
handleShowInfo
(
show
)
{
this
.
visible
=
show
}
}
...
...
@@ -335,10 +336,13 @@ export default {
left
:
0
;
position
:
fixed
;
}
.pop-content
{
margin-bottom
:
24rpx
;
font-size
:
32rpx
;
color
:
#333333
;
text-align
:
left
;
.green-text
{
color
:
#02A074
;
}
...
...
pages/workpoint/project-bill/components/summary-count.vue
View file @
18ff045d
...
...
@@ -34,14 +34,14 @@ export default {
},
computed
:
{
// 项目工资:工时 + 包工 = 总
// 未结: 总 - 已结
// 未结: 总 - 已结
- 借支
values
()
{
let
all
=
parseFloat
(
this
.
detail
.
contractorAmount
||
0
)
+
parseFloat
(
this
.
detail
.
timeAmount
||
0
)
return
{
all
:
keepWFull
(
all
),
// 项目工资
settleAmount
:
keepWFull
(
Math
.
abs
(
parseFloat
(
this
.
detail
.
settleAmount
||
0
))),
// 已结工资
borrowingAmount
:
keepWFull
(
parseFloat
(
this
.
detail
.
borrowingAmount
||
0
)),
// 借支金额
unsettleAmount
:
keepWFull
(
all
+
parseFloat
(
this
.
detail
.
settleAmount
||
0
)),
// 未结工资
borrowingAmount
:
keepWFull
(
Math
.
abs
(
parseFloat
(
this
.
detail
.
borrowingAmount
||
0
)
)),
// 借支金额
unsettleAmount
:
keepWFull
(
all
+
parseFloat
(
this
.
detail
.
settleAmount
||
0
)
+
parseFloat
(
this
.
detail
.
borrowingAmount
||
0
)
),
// 未结工资
normalWorkTime
:
this
.
detail
.
normalWorkTime
,
// 上班工时
overWorkTIme
:
this
.
detail
.
overWorkTIme
,
// 加班工量
contractorNum
:
this
.
detail
.
contractorNum
,
// 包工笔数
...
...
@@ -68,7 +68,7 @@ export default {
},
{
key
:
'normalWorkTime'
,
name
:
'上班工
时
'
name
:
'上班工
量
'
},
{
key
:
'overWorkTIme'
,
...
...
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