Commit 18ff045d authored by Facius's avatar Facius

fix: 统计计算说明

parent 389dc018
Pipeline #3994 canceled with stages
...@@ -187,7 +187,7 @@ export default { ...@@ -187,7 +187,7 @@ export default {
return this.info.sendStatus.code == 'SURE' || this.info.settleState.code == 'YES'; return this.info.sendStatus.code == 'SURE' || this.info.settleState.code == 'YES';
}, },
middleImage() { middleImage() {
return this.baseUrl + 'fengexuxian@3x-3.png'; return this.baseUrl + 'fengexuxian-light@3x.png';
}, },
// sendStatus WAIT:未发送;WAIT_SURE:未确定;SURE:已确定 // sendStatus WAIT:未发送;WAIT_SURE:未确定;SURE:已确定
// settleState NO:未结清;YES:已结清 // settleState NO:未结清;YES:已结清
......
...@@ -46,7 +46,7 @@ export default { ...@@ -46,7 +46,7 @@ export default {
}, },
computed: { computed: {
// 项目工资:工时 + 包工 = 总 // 项目工资:工时 + 包工 = 总
// 未结: 总 - 已结 // 未结: 总 - 已结 - 借支
values () { values () {
let all = Number(this.member.contractorAmount || 0) + Number(this.member.timeAmount || 0) let all = Number(this.member.contractorAmount || 0) + Number(this.member.timeAmount || 0)
return { return {
...@@ -54,8 +54,8 @@ export default { ...@@ -54,8 +54,8 @@ export default {
memberId: this.member.memberId, memberId: this.member.memberId,
memberName: this.member.memberName, memberName: this.member.memberName,
settleAmount: formatCount(Math.abs(Number(this.member.settleAmount || 0))), // 已结工资 settleAmount: formatCount(Math.abs(Number(this.member.settleAmount || 0))), // 已结工资
borrowingAmount: formatCount(Number(this.member.borrowingAmount || 0)), // 借支金额 borrowingAmount: formatCount(Math.abs(Number(this.member.borrowingAmount || 0))), // 借支金额
unsettleAmount: formatCount(all + Number(this.member.settleAmount || 0)), // 未结工资 unsettleAmount: formatCount(all + Number(this.member.settleAmount || 0) + Number(this.member.borrowingAmount || 0)), // 未结工资
normalWorkTime: this.member.normalWorkTime, // 上班工时 normalWorkTime: this.member.normalWorkTime, // 上班工时
overWorkTIme: this.member.overWorkTIme, // 加班工量 overWorkTIme: this.member.overWorkTIme, // 加班工量
contractorNum: this.member.contractorNum, // 包工笔数 contractorNum: this.member.contractorNum, // 包工笔数
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</view> </view>
</view> </view>
<view :class="['bill-count-view', { more: showMore }]"> <view :class="['bill-count-view', { more: showMore }]">
<SummaryCount :detail="statistics" @infoShow="handleShowInfo"/> <SummaryCount :detail="statistics" @infoShow="handleShowInfo" />
</view> </view>
<view class="show-more-view" @click="$u.throttle(handleClickShowMore, 500)" hover-class="u-hover-class"> <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> <u-icon :name="showMore ? 'arrow-up' : 'arrow-down'" color="#02A074" size="32"></u-icon>
...@@ -43,10 +43,11 @@ ...@@ -43,10 +43,11 @@
@change="handleClickChange"> @change="handleClickChange">
<view style="left:200%"></view> <view style="left:200%"></view>
</DateRangePicker> </DateRangePicker>
<PopNormal :visible.sync="visible" title="加班工量" confirmText="我知道了" :showCancel="false"> <PopNormal :visible.sync="visible" title="加班工量统计说明" confirmText="我知道了" :showCancel="false">
<view class="pop-content"> <view class="pop-content">
如您在记工时填写为<text class="green-text">[加班小时]</text>,将根据加班设置换算工量;如果设置为<text <view>如果在<text class="green-text">[记加班]</text>时选择[按小时]模式;将根据<text class="green-text">[加班类型]</text>设置自动换算成N小时=1个工量;</view>
class="green-text">[按小时算]</text>则根据上班设置进行工量换算。 <view>1)按工天算:以<text class="green-text">[加班]</text>设置换算;</view>
<view>2)按小时算:以<text class="green-text">[上班]</text>设置换算。</view>
</view> </view>
</PopNormal> </PopNormal>
</view> </view>
...@@ -202,7 +203,7 @@ export default { ...@@ -202,7 +203,7 @@ export default {
handleClickShowDateRange () { handleClickShowDateRange () {
this.$refs['date-range-picker'].show(); this.$refs['date-range-picker'].show();
}, },
handleShowInfo(show) { handleShowInfo (show) {
this.visible = show this.visible = show
} }
} }
...@@ -335,10 +336,13 @@ export default { ...@@ -335,10 +336,13 @@ export default {
left: 0; left: 0;
position: fixed; position: fixed;
} }
.pop-content { .pop-content {
margin-bottom: 24rpx; margin-bottom: 24rpx;
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
text-align: left;
.green-text { .green-text {
color: #02A074; color: #02A074;
} }
......
...@@ -34,14 +34,14 @@ export default { ...@@ -34,14 +34,14 @@ export default {
}, },
computed: { computed: {
// 项目工资:工时 + 包工 = 总 // 项目工资:工时 + 包工 = 总
// 未结: 总 - 已结 // 未结: 总 - 已结 - 借支
values () { values () {
let all = parseFloat(this.detail.contractorAmount || 0) + parseFloat(this.detail.timeAmount || 0) let all = parseFloat(this.detail.contractorAmount || 0) + parseFloat(this.detail.timeAmount || 0)
return { return {
all: keepWFull(all), // 项目工资 all: keepWFull(all), // 项目工资
settleAmount: keepWFull(Math.abs(parseFloat(this.detail.settleAmount || 0))), // 已结工资 settleAmount: keepWFull(Math.abs(parseFloat(this.detail.settleAmount || 0))), // 已结工资
borrowingAmount: keepWFull(parseFloat(this.detail.borrowingAmount || 0)), // 借支金额 borrowingAmount: keepWFull(Math.abs(parseFloat(this.detail.borrowingAmount || 0))), // 借支金额
unsettleAmount: keepWFull(all + parseFloat(this.detail.settleAmount || 0)), // 未结工资 unsettleAmount: keepWFull(all + parseFloat(this.detail.settleAmount || 0) + parseFloat(this.detail.borrowingAmount || 0)), // 未结工资
normalWorkTime: this.detail.normalWorkTime, // 上班工时 normalWorkTime: this.detail.normalWorkTime, // 上班工时
overWorkTIme: this.detail.overWorkTIme, // 加班工量 overWorkTIme: this.detail.overWorkTIme, // 加班工量
contractorNum: this.detail.contractorNum, // 包工笔数 contractorNum: this.detail.contractorNum, // 包工笔数
...@@ -68,7 +68,7 @@ export default { ...@@ -68,7 +68,7 @@ export default {
}, },
{ {
key: 'normalWorkTime', key: 'normalWorkTime',
name: '上班工时' name: '上班工量'
}, },
{ {
key: 'overWorkTIme', key: 'overWorkTIme',
......
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