mirror of
http://112.124.100.131/GFRS/ebiz-h5.git
synced 2025-12-24 19:32:53 +08:00
Merge branch 'feature/GFRS-1742【待确定】收入改造' into dev
This commit is contained in:
@@ -183,6 +183,7 @@ export default {
|
||||
}, 1000)
|
||||
},
|
||||
onDateConfirm(val) {
|
||||
this.selectedDate = val
|
||||
// 确认选中的时间
|
||||
this.searchMonth = Formatter.formatDate(val, 'yyyy-MM')
|
||||
const monthDate = Formatter.formatDate(val, 'yyyyMM')
|
||||
@@ -204,7 +205,7 @@ export default {
|
||||
if (data && data.content.wageList) {
|
||||
this.monthShouldPay = data.content.wageList[0].payRollMoney
|
||||
this.monthActualPay = data.content.wageList[1].payRollMoney
|
||||
this.list = data.content.wageList.splice(2)
|
||||
this.list = data.content.wageList.slice(2)
|
||||
}
|
||||
},
|
||||
tabChange(val) {
|
||||
@@ -247,10 +248,16 @@ export default {
|
||||
|
||||
<style lang="scss">
|
||||
.payRoll {
|
||||
padding: 0.25em 0.5em;
|
||||
padding: 0 0.25em;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
border-bottom: 1px solid #d7d7d7;
|
||||
border-bottom: 1px solid #e7e7e7;
|
||||
}
|
||||
|
||||
.payRollName,
|
||||
.payRollMoney {
|
||||
font-size: 14px;
|
||||
flex: 1;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.stickyContent {
|
||||
@@ -272,7 +279,7 @@ export default {
|
||||
.moneyWrapper {
|
||||
width: 40%;
|
||||
padding: 1em;
|
||||
border: 1px solid #d7d7d7;
|
||||
border: 1px solid #e7e7e7;
|
||||
}
|
||||
|
||||
.moneyWrapper:first-child {
|
||||
@@ -301,6 +308,10 @@ export default {
|
||||
border-bottom: 1px solid #ebedf0;
|
||||
}
|
||||
|
||||
.moneyContent {
|
||||
padding-bottom: 70px;
|
||||
}
|
||||
|
||||
.user-income-container {
|
||||
.collapse-item-info,
|
||||
.van-collapse-item__title {
|
||||
|
||||
Reference in New Issue
Block a user