ylj/ahyd_DIB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
cclu 2024-07-26 20:06:35 +08:00
parent 3beb65aad0
commit d9619089b5
2 changed files with 183 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

429
pages/settlementApproval/detail.vue
View File

@ -141,136 +141,70 @@
</view>
<!-- 月度的精算数据-->
<view class="tableBox" v-if="detailObj.SETTLEMENT_TYPE!==1 && detailObj.Approvalstate>0">
<view class="compareBox">
<view class="comparedBox">
<view class="comparedBoxTitleBox">
<view class="beforeTitleBox" style="text-align: right">结算数据</view>
<view class="afterTitleBox">精算数据</view>
</view>
<view class="compareBoxItem">
<view class="smallTitle">结算数据</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">期限：</span>
<span class="value">{{`${detailObj.STARTDATE}-${detailObj.ENDDATE}`}}</span>
</view>
</view>
<view class="comparedItem">
<view class="compareLabel" style="width: 15%">期限：</view>
<view class="beforeItem" style="width: 45%">{{`${detailObj.STARTDATE}-${detailObj.ENDDATE}`}}</view>
<view class="afterItem" :style="{color: detailObj.Approvalstate>0?'#faad14':'#1890ff'}">{{detailObj.Approvalstate>0?'已结算':'待结算'}}</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">本月营收：</span>
<span class="value">{{actuaryData.CurMonthRevenue?`${$util.getMoney(actuaryData.CurMonthRevenue)}`:''}}</span>
</view>
</view>
<view class="comparedItem">
<view class="compareLabel">本月营收：</view>
<view class="beforeItem">{{actuaryData.CurMonthRevenue?`${$util.getMoney(actuaryData.CurMonthRevenue)}`:''}}</view>
<view class="afterItem">{{monthNewCalibration.CurMonthRevenueTEXT?monthNewCalibration.CurMonthRevenueTEXT:''}}</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">累计营业额：</span>
<span class="value">{{actuaryData.REVENUEDAILY_AMOUNTTotal?`${$util.getMoney(actuaryData.REVENUEDAILY_AMOUNTTotal)}`:''}}</span>
</view>
</view>
<view class="comparedItem">
<view class="compareLabel">累计营业额：</view>
<view class="beforeItem">{{actuaryData.REVENUEDAILY_AMOUNTTotal?`${$util.getMoney(actuaryData.REVENUEDAILY_AMOUNTTotal)}`:''}}</view>
<view class="afterItem">{{monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT?monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT:''}}</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">移动支付：</span>
<span class="value">{{actuaryData.MOBILEPAY_AMOUNT?`${$util.getMoney(actuaryData.MOBILEPAY_AMOUNT)}`:''}}</span>
</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">移动冲正：</span>
<span class="value">{{actuaryData.MOBILEPAY_CORRECT?`${$util.getMoney(actuaryData.MOBILEPAY_CORRECT)}`:'0'}}</span>
</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">现金交易：</span>
<span class="value">{{actuaryData.CASHPAY_AMOUNT?`${$util.getMoney(actuaryData.CASHPAY_AMOUNT)}`:''}}</span>
</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">现金冲正：</span>
<span class="value">{{actuaryData.CASHPAY_CORRECT?`${$util.getMoney(actuaryData.CASHPAY_CORRECT)}`:'0'}}</span>
</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">提成金额：</span>
<span class="value">{{actuaryData.GUARANTEERATIOAMOUNT?`${$util.getMoney(actuaryData.GUARANTEERATIOAMOUNT)}`:''}}</span>
</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">提成收入：</span>
<span class="value">{{actuaryData.GUARANTEERATIOINCOME?`${$util.getMoney(actuaryData.GUARANTEERATIOINCOME)}`:''}}</span>
</view>
<view class="comparedItem">
<view class="compareLabel">移动支付：</view>
<view class="beforeItem">{{actuaryData.MOBILEPAY_AMOUNT?`${$util.getMoney(actuaryData.MOBILEPAY_AMOUNT)}`:''}}</view>
<view class="afterItem">
{{monthNewCalibration.MOBILEPAY_AMOUNTTEXT || ''}}
<span v-if="monthNewCalibration.MOBILEPAY_CORRECT" style="color: red">({{monthNewCalibration.MOBILEPAY_CORRECT>0?'+':''}}{{monthNewCalibration.MOBILEPAY_CORRECTTEXT || ''}})</span>
</view>
</view>
<view class="comparedItem">
<view class="compareLabel">移动冲正：</view>
<view class="beforeItem">{{actuaryData.MOBILEPAY_CORRECT?`${$util.getMoney(actuaryData.MOBILEPAY_CORRECT)}`:'0'}}</view>
<view class="afterItem">{{monthNewCalibration.MOBILEPAY_CORRECTTEXT || ''}}</view>
</view>
<view class="compareBoxItem">
<view class="smallTitle">精算数据</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">期限：</span>
<span class="value">{{detailObj.STARTDATE}} - {{detailObj.ENDDATE}}</span>
</view>
<view class="comparedItem">
<view class="compareLabel">现金交易：</view>
<view class="beforeItem">{{actuaryData.CASHPAY_AMOUNT?`${$util.getMoney(actuaryData.CASHPAY_AMOUNT)}`:''}}</view>
<view class="afterItem">
{{monthNewCalibration.CASHPAY_AMOUNTTEXT || ''}}
<span v-if="monthNewCalibration.CASHPAY_CORRECT" style="color: red">({{ monthNewCalibration.CASHPAY_CORRECT > 0 ? '+' : '' }}{{ monthNewCalibration.CASHPAY_CORRECTTEXT || '' }})</span>
</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">本月营收：</span>
<span class="value">{{monthNewCalibration.CurMonthRevenueTEXT?monthNewCalibration.CurMonthRevenueTEXT:''}}</span>
</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">累计营业额：</span>
<span class="value">{{monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT?monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT:''}}</span>
</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">移动支付：</span>
<span class="value">{{monthNewCalibration.MOBILEPAY_AMOUNTTEXT || ''}}</span>
</view>
</view>
<view class="comparedItem">
<view class="compareLabel">现金冲正：</view>
<view class="beforeItem">{{actuaryData.CASHPAY_CORRECT?`${$util.getMoney(actuaryData.CASHPAY_CORRECT)}`:'0'}}</view>
<view class="afterItem">{{monthNewCalibration.CASHPAY_CORRECTTEXT || '0'}}</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">移动冲正：</span>
<span class="value">{{monthNewCalibration.MOBILEPAY_CORRECTTEXT || ''}}</span>
</view>
</view>
<view class="comparedItem">
<view class="compareLabel">提成金额：</view>
<view class="beforeItem">{{actuaryData.GUARANTEERATIOAMOUNT?`${$util.getMoney(actuaryData.GUARANTEERATIOAMOUNT)}`:''}}</view>
<view class="afterItem">{{monthNewCalibration.GUARANTEERATIOAMOUNTTEXT || ''}}</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">现金交易：</span>
<span class="value">{{monthNewCalibration.CASHPAY_AMOUNTTEXT || ''}}</span>
</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">现金冲正：</span>
<span class="value">{{monthNewCalibration.CASHPAY_CORRECTTEXT || '0'}}</span>
</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">提成金额：</span>
<span class="value">{{monthNewCalibration.GUARANTEERATIOAMOUNTTEXT || ''}}</span>
</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">提成收入：</span>
<span class="value">{{monthNewCalibration.GUARANTEERATIOINCOMETEXT || ''}}</span>
</view>
</view>
<view class="comparedItem">
<view class="compareLabel">提成收入：</view>
<view class="beforeItem">{{actuaryData.GUARANTEERATIOINCOME?`${$util.getMoney(actuaryData.GUARANTEERATIOINCOME)}`:''}}</view>
<view class="afterItem">{{monthNewCalibration.GUARANTEERATIOINCOMETEXT || ''}}</view>
</view>
</view>
</view>
@ -340,145 +274,100 @@
</view>
</view>
<view v-else>
<view class="compareBox">
<view class="compareBoxItem">
<view class="smallTitle">结算数据</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">期限：</span>
<span class="value">{{item.PeriodDesc ||''}}</span>
</view>
</view>
<view class="comparedBox">
<view class="comparedBoxTitleBox">
<view class="beforeTitleBox" style="text-align: right">结算数据</view>
<view class="afterTitleBox" v-if="yearDataListObj.level">精算数据</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">结算状态：</span>
<span class="value" :style="{color: detailObj.Approvalstate>0?'#faad14':'#1890ff'}">{{detailObj.Approvalstate>0?'已结算':'待结算'}}</span>
</view>
</view>
<view class="comparedItem" >
<view class="compareLabel" style="width: 20%">期限：</view>
<view class="beforeItem" style="width: 40%">{{item.PeriodDesc ||''}}</view>
<view class="afterItem" :style="{color: detailObj.Approvalstate>0?'#faad14':'#1890ff'}">{{detailObj.Approvalstate>0?'已结算':'待结算'}}</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">现金：</span>
<span class="value">{{item.CashAmount?numeral($util.getMoney(item.CashAmount)).format('0,0.00'):''}}</span>
</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">微支付：</span>
<span class="value">{{item.MobilePayAmount?numeral($util.getMoney(item.MobilePayAmount)).format('0,0.00'):''}}</span>
</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">营业额合计：</span>
<span class="value">{{item.RevenueAmount?numeral($util.getMoney(item.RevenueAmount)).format('0,0.00'):''}}</span>
</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">驿达收款：</span>
<span class="value">{{item.RoyaltyAmount?numeral($util.getMoney(item.RoyaltyAmount)).format('0,0.00'):''}}</span>
</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">营收费用合计：</span>
<span class="value">{{item.ReceivableAmount?numeral($util.getMoney(item.ReceivableAmount)).format('0,0.00'):''}}</span>
</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">租金：</span>
<span class="value">{{item.GuaranteeFee?numeral($util.getMoney(item.GuaranteeFee)).format('0,0.00'):''}}</span>
</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">退补款：</span>
<span class="value">{{item.RefundSupplement?numeral($util.getMoney(item.RefundSupplement)).format('0,0.00'):''}}</span>
</view>
<view class="comparedItem">
<view class="compareLabel">营业额合计：</view>
<view class="beforeItem">{{item.RevenueAmount?numeral($util.getMoney(item.RevenueAmount)).format('0,0.00'):''}}</view>
<view class="afterItem">
{{yearDataListObj.RevenueAmount?numeral($util.getMoney(yearDataListObj.RevenueAmount)).format('0,0.00'):''}}
<span style="color: red" v-if="item.RevenueAmount && yearDataListObj.RevenueAmount && item.RevenueAmount!==yearDataListObj.RevenueAmount">({{yearDataListObj.RevenueAmount - item.RevenueAmount>0?'+':''}}{{yearDataListObj.RevenueAmount - item.RevenueAmount}})</span>
</view>
</view>
<view class="comparedItem">
<view class="compareLabel" style="padding-left: 16rpx;box-sizing: border-box">现金：</view>
<view class="beforeItem">{{item.CashAmount?numeral($util.getMoney(item.CashAmount)).format('0,0.00'):''}}</view>
<view class="afterItem">{{yearDataListObj.CashAmount?numeral($util.getMoney(yearDataListObj.CashAmount)).format('0,0.00'):''}}</view>
</view>
<view class="comparedItem">
<view class="compareLabel" style="padding-left: 16rpx;box-sizing: border-box">微支付：</view>
<view class="beforeItem">{{item.MobilePayAmount?numeral($util.getMoney(item.MobilePayAmount)).format('0,0.00'):''}}</view>
<view class="afterItem">{{yearDataListObj.MobilePayAmount?numeral($util.getMoney(yearDataListObj.MobilePayAmount)).format('0,0.00'):''}}</view>
</view>
<view class="compareBoxItem">
<view class="smallTitle">精算数据</view>
<view class="comparedItem">
<view class="compareLabel">驿达收款：</view>
<view class="beforeItem">{{item.RoyaltyAmount?numeral($util.getMoney(item.RoyaltyAmount)).format('0,0.00'):''}}</view>
<view class="afterItem">{{yearDataListObj.RoyaltyAmount?numeral($util.getMoney(yearDataListObj.RoyaltyAmount)).format('0,0.00'):''}}</view>
</view>
<view class="tableRow" v-for="(afterItem,afterIndex) in yearDataListAfter" :key="afterIndex">
<view class="comparedItem">
<view class="compareLabel">营收费用合计：</view>
<view class="beforeItem">{{item.ReceivableAmount?numeral($util.getMoney(item.ReceivableAmount)).format('0,0.00'):''}}</view>
<view class="afterItem">{{yearDataListObj.ReceivableAmount?numeral($util.getMoney(yearDataListObj.ReceivableAmount)).format('0,0.00'):''}}</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">期限：</span>
<span class="value">{{afterItem.PeriodDesc ||''}}</span>
</view>
</view>
<view class="comparedItem">
<view class="compareLabel" style="padding-left: 16rpx;box-sizing: border-box">租金：</view>
<view class="beforeItem">{{item.GuaranteeFee || item.GuaranteeFee===0?numeral($util.getMoney(item.GuaranteeFee)).format('0,0.00'):''}}</view>
<view class="afterItem">{{yearDataListObj.GuaranteeFee?numeral($util.getMoney(yearDataListObj.GuaranteeFee)).format('0,0.00'):''}}</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">结算状态：</span>
<span class="value" :style="{color: detailObj.Approvalstate>0?'#faad14':'#1890ff'}">{{detailObj.Approvalstate>0?'已结算':'待结算'}}</span>
</view>
</view>
<view class="comparedItem">
<view class="compareLabel" style="padding-left: 16rpx;box-sizing: border-box">物业费：</view>
<view class="beforeItem">{{item.PropertyFee || item.PropertyFee===0?numeral($util.getMoney(item.PropertyFee)).format('0,0.00'):''}}</view>
<view class="afterItem">{{yearDataListObj.PropertyFee || yearDataListObj.PropertyFee===0?numeral($util.getMoney(yearDataListObj.PropertyFee)).format('0,0.00'):''}}</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">现金：</span>
<span class="value">{{afterItem.CashAmountTEXT || ''}}</span>
</view>
</view>
<view class="comparedItem">
<view class="compareLabel" style="padding-left: 16rpx;box-sizing: border-box">房租：</view>
<view class="beforeItem">{{item.HouseRent || item.HouseRent===0?numeral($util.getMoney(item.HouseRent)).format('0,0.00'):''}}</view>
<view class="afterItem">{{yearDataListObj.HouseRent || yearDataListObj.HouseRent===0?numeral($util.getMoney(yearDataListObj.HouseRent)).format('0,0.00'):''}}</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">微支付：</span>
<span class="value">{{afterItem.MobilePayAmountTEXT || ''}}</span>
</view>
</view>
<view class="comparedItem">
<view class="compareLabel" style="padding-left: 16rpx;box-sizing: border-box">罚款：</view>
<view class="beforeItem">{{item.BreachPenalty || item.BreachPenalty===0?numeral($util.getMoney(item.BreachPenalty)).format('0,0.00'):''}}</view>
<view class="afterItem">{{yearDataListObj.BreachPenalty || yearDataListObj.BreachPenalty===0?numeral($util.getMoney(yearDataListObj.BreachPenalty)).format('0,0.00'):''}}</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">营业额合计：</span>
<span class="value">{{afterItem.RevenueAmountTEXT || ''}}</span>
</view>
</view>
<view class="comparedItem">
<view class="compareLabel" style="padding-left: 16rpx;box-sizing: border-box">电费：</view>
<view class="beforeItem">{{item.ElectricityCharge || item.ElectricityCharge===0?numeral($util.getMoney(item.ElectricityCharge)).format('0,0.00'):''}}</view>
<view class="afterItem">{{yearDataListObj.ElectricityCharge || yearDataListObj.ElectricityCharge===0?numeral($util.getMoney(yearDataListObj.ElectricityCharge)).format('0,0.00'):''}}</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">驿达收款：</span>
<span class="value">{{afterItem.RoyaltyAmountTEXT || ''}}</span>
</view>
</view>
<view class="comparedItem">
<view class="compareLabel" style="padding-left: 16rpx;box-sizing: border-box">水费：</view>
<view class="beforeItem">{{item.WaterCharge || item.WaterCharge===0?numeral($util.getMoney(item.WaterCharge)).format('0,0.00'):''}}</view>
<view class="afterItem">{{yearDataListObj.WaterCharge || yearDataListObj.WaterCharge===0?numeral($util.getMoney(yearDataListObj.WaterCharge)).format('0,0.00'):''}}</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">营收费用合计：</span>
<span class="value">{{afterItem.ReceivableAmountTEXT || ''}}</span>
</view>
</view>
<view class="comparedItem">
<view class="compareLabel" style="padding-left: 16rpx;box-sizing: border-box">其他：</view>
<view class="beforeItem">{{item.OtherFee || item.OtherFee===0?numeral($util.getMoney(item.OtherFee)).format('0,0.00'):''}}</view>
<view class="afterItem">{{yearDataListObj.OtherFee || yearDataListObj.OtherFee===0?numeral($util.getMoney(yearDataListObj.OtherFee)).format('0,0.00'):''}}</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">租金：</span>
<span class="value">{{afterItem.GuaranteeFeeTEXT || ''}}</span>
</view>
</view>
<view class="rowItemBox">
<view class="allRowItem">
<span class="label">退补款：</span>
<span class="value">{{afterItem.RefundSupplementTEXT || ''}}</span>
</view>
</view>
</view>
<view class="comparedItem">
<view class="compareLabel">退补款：</view>
<view class="beforeItem">{{item.RefundSupplement?numeral($util.getMoney(item.RefundSupplement)).format('0,0.00'):''}}</view>
<view class="afterItem">{{yearDataListObj.RefundSupplement?numeral($util.getMoney(yearDataListObj.RefundSupplement)).format('0,0.00'):''}}</view>
</view>
</view>
<view class="getMoreBox" v-if="item.children && item.children.length>0" @click="handleShowChildren(item)">
<image class="imgIcon" :style="{transform: item.children?'rotate(90deg)':'rotate(-90deg)'}" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg"/>
</view>
@ -733,10 +622,10 @@
</view>
</view>
<view class="detailTopBox" v-if="detailObj.Approvalstate>0 && isShowProgress">
<view class="detailTopBox" v-if="detailObj.Approvalstate>0 && isShowProgress && progressDetail.BUSINESSAPPROVAL_STATE !== 9000">
<view class="leftTop">
<span class="label">待审核人：</span>
<span class="value" style="color: red">{{progressDetail.APPOVED_NAME || ''}}</span>
<span class="label" style="color: red">待审核：</span>
<span class="value">{{progressDetail.APPOVED_NAME || ''}}</span>
</view>
</view>
@ -1019,6 +908,7 @@ export default {
isAllMonthSuccess: true,// 判断是不是全部的月份都已经审结了
allYearMonthDataList:[],//用来处理没完成的结算月度数据
yearDataListAfter:[],// 年度精算数据
yearDataListObj:[],// 年度精算数据 list也就一条
isShowProgress: true,// 是否显示流程进度
isPush: false,// 是否是推送
progressObjDetail:{},// 流程详情
@ -1070,6 +960,7 @@ export default {
this.detailObj = {}
this.topDetail = {}
this.actuaryData = {}
this.yearDataListObj = {}
this.newCalibration = {}
this.progressDetail = {}
this.nextPerson = []
@ -1114,13 +1005,9 @@ export default {
this.monthNewCalibration = bigObj
this.monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT = this.$util.getMoney(this.monthNewCalibration.REVENUEDAILY_AMOUNTTotal)
this.monthNewCalibration.CurMonthRevenueTEXT = this.$util.getMoney(this.monthNewCalibration.CurMonthRevenue)
this.monthNewCalibration.MOBILEPAY_AMOUNTTEXT = this.monthNewCalibration.MOBILEPAY_AMOUNT
? numeral(this.$util.getMoney(this.monthNewCalibration.MOBILEPAY_AMOUNT + (this.monthNewCalibration.MOBILEPAY_CORRECT || 0))).format('0,0.00') + (this.monthNewCalibration.MOBILEPAY_CORRECT ? ('(' + (this.monthNewCalibration.MOBILEPAY_CORRECT > 0 ? '+' : '') + this.monthNewCalibration.MOBILEPAY_CORRECT + ')') : '')
: ''
this.monthNewCalibration.MOBILEPAY_AMOUNTTEXT = numeral(this.$util.getMoney(this.monthNewCalibration.MOBILEPAY_AMOUNT + (this.monthNewCalibration.MOBILEPAY_CORRECT || 0))).format('0,0.00')
this.monthNewCalibration.MOBILEPAY_CORRECTTEXT = this.$util.getMoney(this.monthNewCalibration.MOBILEPAY_CORRECT)
this.monthNewCalibration.CASHPAY_AMOUNTTEXT = this.monthNewCalibration.CASHPAY_AMOUNT
? numeral(this.$util.getMoney(this.monthNewCalibration.CASHPAY_AMOUNT + (this.monthNewCalibration.CASHPAY_CORRECT || 0))).format('0,0.00') + (this.monthNewCalibration.CASHPAY_CORRECT ? ('(' + (this.monthNewCalibration.CASHPAY_CORRECT > 0 ? '+' : '') + this.monthNewCalibration.CASHPAY_CORRECT + ')') : '')
: ''
this.monthNewCalibration.CASHPAY_AMOUNTTEXT = numeral(this.$util.getMoney(this.monthNewCalibration.CASHPAY_AMOUNT + (this.monthNewCalibration.CASHPAY_CORRECT || 0))).format('0,0.00')
this.monthNewCalibration.CASHPAY_CORRECTTEXT = this.$util.getMoney(this.monthNewCalibration.CASHPAY_CORRECT)
this.monthNewCalibration.GUARANTEERATIOAMOUNTTEXT = this.$util.getMoney(this.monthNewCalibration.GUARANTEERATIOAMOUNT)
this.monthNewCalibration.GUARANTEERATIOINCOMETEXT = this.$util.getMoney(this.monthNewCalibration.GUARANTEERATIOINCOME)
@ -1163,6 +1050,9 @@ export default {
item.RefundSupplementTEXT = numeral(this.$util.getMoney(item.RefundSupplement)).format('0,0.00')
item.children = null
})
this.yearDataListObj = result[0]
}else{
this.yearDataListObj = {}
}
this.yearDataListAfter = result
this.yearId = result[0].RevenueConfirmId
@ -1974,6 +1864,49 @@ export default {
}
}
}
.comparedBox{
width: 100%;
.comparedBoxTitleBox{
margin-bottom: 16rpx;
display: flex;
align-items: center;
.beforeTitleBox{
width: 60%;
font-size: 26rpx;
font-weight: 600;
text-align: left;
}
.afterTitleBox{
width: 40%;
font-size: 26rpx;
font-weight: 600;
text-align: right;
}
}
.comparedItem{
width: 100%;
display: flex;
align-items: center;
margin-bottom: 12rpx;
.compareLabel{
width: 30%;
color: #ADB2BF;
font-size: 26rpx;
}
.beforeItem{
width: 30%;
font-size: 26rpx;
text-align: right;
}
.afterItem{
width: 40%;
font-size: 26rpx;
text-align: right;
}
}
}
}
.btnBox{

3
pages/settlementApproval/yearSettlement.vue
View File

@ -863,7 +863,8 @@ export default {
SERVERPARTSHOP_NAME: this.detailObj.SERVERPARTSHOP_NAME,
CORRECT_AMOUNT: this.correctionAmount,
APPOVED_IDS: this.nextPersonValue,
APPOVED_NAME: this.showLabel
APPOVED_NAME: this.showLabel,
BUSINESSAPPROVAL_ID: this.detailObj.BUSINESSAPPROVAL_ID
},
RevenueconfirmModel: allList
}