diff --git a/pages/settlementApproval/detail.vue b/pages/settlementApproval/detail.vue index 637b536..4f7ff25 100644 --- a/pages/settlementApproval/detail.vue +++ b/pages/settlementApproval/detail.vue @@ -141,136 +141,70 @@ - + + + 结算数据 + 精算数据 + - - 结算数据 - - - 期限： - {{`${detailObj.STARTDATE}-${detailObj.ENDDATE}`}} - - + + 期限： + {{`${detailObj.STARTDATE}-${detailObj.ENDDATE}`}} + {{detailObj.Approvalstate>0?'已结算':'待结算'}} + - - - 本月营收： - {{actuaryData.CurMonthRevenue?`${$util.getMoney(actuaryData.CurMonthRevenue)}`:''}} - - + + 本月营收： + {{actuaryData.CurMonthRevenue?`${$util.getMoney(actuaryData.CurMonthRevenue)}`:''}} + {{monthNewCalibration.CurMonthRevenueTEXT?monthNewCalibration.CurMonthRevenueTEXT:''}} + - - - 累计营业额： - {{actuaryData.REVENUEDAILY_AMOUNTTotal?`${$util.getMoney(actuaryData.REVENUEDAILY_AMOUNTTotal)}`:''}} - - + + 累计营业额： + {{actuaryData.REVENUEDAILY_AMOUNTTotal?`${$util.getMoney(actuaryData.REVENUEDAILY_AMOUNTTotal)}`:''}} + {{monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT?monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT:''}} + - - - 移动支付： - {{actuaryData.MOBILEPAY_AMOUNT?`${$util.getMoney(actuaryData.MOBILEPAY_AMOUNT)}`:''}} - - - - - - 移动冲正： - {{actuaryData.MOBILEPAY_CORRECT?`${$util.getMoney(actuaryData.MOBILEPAY_CORRECT)}`:'0'}} - - - - - - 现金交易： - {{actuaryData.CASHPAY_AMOUNT?`${$util.getMoney(actuaryData.CASHPAY_AMOUNT)}`:''}} - - - - - - 现金冲正： - {{actuaryData.CASHPAY_CORRECT?`${$util.getMoney(actuaryData.CASHPAY_CORRECT)}`:'0'}} - - - - - - 提成金额： - {{actuaryData.GUARANTEERATIOAMOUNT?`${$util.getMoney(actuaryData.GUARANTEERATIOAMOUNT)}`:''}} - - - - - 提成收入： - {{actuaryData.GUARANTEERATIOINCOME?`${$util.getMoney(actuaryData.GUARANTEERATIOINCOME)}`:''}} - + + 移动支付： + {{actuaryData.MOBILEPAY_AMOUNT?`${$util.getMoney(actuaryData.MOBILEPAY_AMOUNT)}`:''}} + + {{monthNewCalibration.MOBILEPAY_AMOUNTTEXT || ''}} + ({{monthNewCalibration.MOBILEPAY_CORRECT>0?'+':''}}{{monthNewCalibration.MOBILEPAY_CORRECTTEXT || ''}}) + + 移动冲正： + {{actuaryData.MOBILEPAY_CORRECT?`${$util.getMoney(actuaryData.MOBILEPAY_CORRECT)}`:'0'}} + {{monthNewCalibration.MOBILEPAY_CORRECTTEXT || ''}} + - - 精算数据 - - - 期限： - {{detailObj.STARTDATE}} - {{detailObj.ENDDATE}} - + + 现金交易： + {{actuaryData.CASHPAY_AMOUNT?`${$util.getMoney(actuaryData.CASHPAY_AMOUNT)}`:''}} + + {{monthNewCalibration.CASHPAY_AMOUNTTEXT || ''}} + ({{ monthNewCalibration.CASHPAY_CORRECT > 0 ? '+' : '' }}{{ monthNewCalibration.CASHPAY_CORRECTTEXT || '' }}) + - - - 本月营收： - {{monthNewCalibration.CurMonthRevenueTEXT?monthNewCalibration.CurMonthRevenueTEXT:''}} - - - - - 累计营业额： - {{monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT?monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT:''}} - - - - - 移动支付： - {{monthNewCalibration.MOBILEPAY_AMOUNTTEXT || ''}} - - + + 现金冲正： + {{actuaryData.CASHPAY_CORRECT?`${$util.getMoney(actuaryData.CASHPAY_CORRECT)}`:'0'}} + {{monthNewCalibration.CASHPAY_CORRECTTEXT || '0'}} + - - - 移动冲正： - {{monthNewCalibration.MOBILEPAY_CORRECTTEXT || ''}} - - + + 提成金额： + {{actuaryData.GUARANTEERATIOAMOUNT?`${$util.getMoney(actuaryData.GUARANTEERATIOAMOUNT)}`:''}} + {{monthNewCalibration.GUARANTEERATIOAMOUNTTEXT || ''}} + - - - 现金交易： - {{monthNewCalibration.CASHPAY_AMOUNTTEXT || ''}} - - - - - - 现金冲正： - {{monthNewCalibration.CASHPAY_CORRECTTEXT || '0'}} - - - - - - 提成金额： - {{monthNewCalibration.GUARANTEERATIOAMOUNTTEXT || ''}} - - - - - - 提成收入： - {{monthNewCalibration.GUARANTEERATIOINCOMETEXT || ''}} - - + + 提成收入： + {{actuaryData.GUARANTEERATIOINCOME?`${$util.getMoney(actuaryData.GUARANTEERATIOINCOME)}`:''}} + {{monthNewCalibration.GUARANTEERATIOINCOMETEXT || ''}} @@ -340,145 +274,100 @@ - - - 结算数据 - - - 期限： - {{item.PeriodDesc ||''}} - - + + + 结算数据 + 精算数据 + - - - 结算状态： - {{detailObj.Approvalstate>0?'已结算':'待结算'}} - - + + 期限： + {{item.PeriodDesc ||''}} + {{detailObj.Approvalstate>0?'已结算':'待结算'}} + - - - 现金： - {{item.CashAmount?numeral($util.getMoney(item.CashAmount)).format('0,0.00'):''}} - - - - - - 微支付： - {{item.MobilePayAmount?numeral($util.getMoney(item.MobilePayAmount)).format('0,0.00'):''}} - - - - - - 营业额合计： - {{item.RevenueAmount?numeral($util.getMoney(item.RevenueAmount)).format('0,0.00'):''}} - - - - - - 驿达收款： - {{item.RoyaltyAmount?numeral($util.getMoney(item.RoyaltyAmount)).format('0,0.00'):''}} - - - - - - 营收费用合计： - {{item.ReceivableAmount?numeral($util.getMoney(item.ReceivableAmount)).format('0,0.00'):''}} - - - - - - 租金： - {{item.GuaranteeFee?numeral($util.getMoney(item.GuaranteeFee)).format('0,0.00'):''}} - - - - - - 退补款： - {{item.RefundSupplement?numeral($util.getMoney(item.RefundSupplement)).format('0,0.00'):''}} - + + 营业额合计： + {{item.RevenueAmount?numeral($util.getMoney(item.RevenueAmount)).format('0,0.00'):''}} + + {{yearDataListObj.RevenueAmount?numeral($util.getMoney(yearDataListObj.RevenueAmount)).format('0,0.00'):''}} + ({{yearDataListObj.RevenueAmount - item.RevenueAmount>0?'+':''}}{{yearDataListObj.RevenueAmount - item.RevenueAmount}}) + + 现金： + {{item.CashAmount?numeral($util.getMoney(item.CashAmount)).format('0,0.00'):''}} + {{yearDataListObj.CashAmount?numeral($util.getMoney(yearDataListObj.CashAmount)).format('0,0.00'):''}} + + + 微支付： + {{item.MobilePayAmount?numeral($util.getMoney(item.MobilePayAmount)).format('0,0.00'):''}} + {{yearDataListObj.MobilePayAmount?numeral($util.getMoney(yearDataListObj.MobilePayAmount)).format('0,0.00'):''}} + - - 精算数据 + + 驿达收款： + {{item.RoyaltyAmount?numeral($util.getMoney(item.RoyaltyAmount)).format('0,0.00'):''}} + {{yearDataListObj.RoyaltyAmount?numeral($util.getMoney(yearDataListObj.RoyaltyAmount)).format('0,0.00'):''}} + - + + 营收费用合计： + {{item.ReceivableAmount?numeral($util.getMoney(item.ReceivableAmount)).format('0,0.00'):''}} + {{yearDataListObj.ReceivableAmount?numeral($util.getMoney(yearDataListObj.ReceivableAmount)).format('0,0.00'):''}} + - - - 期限： - {{afterItem.PeriodDesc ||''}} - - + + 租金： + {{item.GuaranteeFee || item.GuaranteeFee===0?numeral($util.getMoney(item.GuaranteeFee)).format('0,0.00'):''}} + {{yearDataListObj.GuaranteeFee?numeral($util.getMoney(yearDataListObj.GuaranteeFee)).format('0,0.00'):''}} + - - - 结算状态： - {{detailObj.Approvalstate>0?'已结算':'待结算'}} - - + + 物业费： + {{item.PropertyFee || item.PropertyFee===0?numeral($util.getMoney(item.PropertyFee)).format('0,0.00'):''}} + {{yearDataListObj.PropertyFee || yearDataListObj.PropertyFee===0?numeral($util.getMoney(yearDataListObj.PropertyFee)).format('0,0.00'):''}} + - - - 现金： - {{afterItem.CashAmountTEXT || ''}} - - + + 房租： + {{item.HouseRent || item.HouseRent===0?numeral($util.getMoney(item.HouseRent)).format('0,0.00'):''}} + {{yearDataListObj.HouseRent || yearDataListObj.HouseRent===0?numeral($util.getMoney(yearDataListObj.HouseRent)).format('0,0.00'):''}} + - - - 微支付： - {{afterItem.MobilePayAmountTEXT || ''}} - - + + 罚款： + {{item.BreachPenalty || item.BreachPenalty===0?numeral($util.getMoney(item.BreachPenalty)).format('0,0.00'):''}} + {{yearDataListObj.BreachPenalty || yearDataListObj.BreachPenalty===0?numeral($util.getMoney(yearDataListObj.BreachPenalty)).format('0,0.00'):''}} + - - - 营业额合计： - {{afterItem.RevenueAmountTEXT || ''}} - - + + 电费： + {{item.ElectricityCharge || item.ElectricityCharge===0?numeral($util.getMoney(item.ElectricityCharge)).format('0,0.00'):''}} + {{yearDataListObj.ElectricityCharge || yearDataListObj.ElectricityCharge===0?numeral($util.getMoney(yearDataListObj.ElectricityCharge)).format('0,0.00'):''}} + - - - 驿达收款： - {{afterItem.RoyaltyAmountTEXT || ''}} - - + + 水费： + {{item.WaterCharge || item.WaterCharge===0?numeral($util.getMoney(item.WaterCharge)).format('0,0.00'):''}} + {{yearDataListObj.WaterCharge || yearDataListObj.WaterCharge===0?numeral($util.getMoney(yearDataListObj.WaterCharge)).format('0,0.00'):''}} + - - - 营收费用合计： - {{afterItem.ReceivableAmountTEXT || ''}} - - + + 其他： + {{item.OtherFee || item.OtherFee===0?numeral($util.getMoney(item.OtherFee)).format('0,0.00'):''}} + {{yearDataListObj.OtherFee || yearDataListObj.OtherFee===0?numeral($util.getMoney(yearDataListObj.OtherFee)).format('0,0.00'):''}} + - - - 租金： - {{afterItem.GuaranteeFeeTEXT || ''}} - - - - - - 退补款： - {{afterItem.RefundSupplementTEXT || ''}} - - - + + 退补款： + {{item.RefundSupplement?numeral($util.getMoney(item.RefundSupplement)).format('0,0.00'):''}} + {{yearDataListObj.RefundSupplement?numeral($util.getMoney(yearDataListObj.RefundSupplement)).format('0,0.00'):''}} + @@ -733,10 +622,10 @@ - + - 待审核人： - {{progressDetail.APPOVED_NAME || ''}} + 待审核： + {{progressDetail.APPOVED_NAME || ''}} @@ -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{ diff --git a/pages/settlementApproval/yearSettlement.vue b/pages/settlementApproval/yearSettlement.vue index ae773a6..64a8954 100644 --- a/pages/settlementApproval/yearSettlement.vue +++ b/pages/settlementApproval/yearSettlement.vue @@ -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 }