From c14e7137f7e8e03234d591589ef90412a2ca168c Mon Sep 17 00:00:00 2001 From: cclu <1106109051@qq.com> Date: Tue, 6 Aug 2024 19:30:19 +0800 Subject: [PATCH] update --- pages.json | 8 + pages/settlementApproval/detail.vue | 1841 +++++++++-------- pages/settlementApproval/index.vue | 32 +- pages/settlementApproval/monthDetail.vue | 918 ++++++-- pages/settlementApproval/monthList.vue | 232 +++ pages/settlementApproval/yearSettlement.vue | 897 +++++++- .../images/settlementApproval/errorIcon.png | Bin 0 -> 894 bytes .../images/settlementApproval/goRightIcon.png | Bin 0 -> 1486 bytes .../images/settlementApproval/isPassIcon.png | Bin 0 -> 12455 bytes .../images/settlementApproval/monthIcon.png | Bin 0 -> 2455 bytes static/images/settlementApproval/pageBg.png | Bin 120913 -> 119865 bytes static/images/settlementApproval/pendIcon.png | Bin 0 -> 675 bytes .../images/settlementApproval/stateIcon.png | Bin 0 -> 522 bytes 13 files changed, 2798 insertions(+), 1130 deletions(-) create mode 100644 pages/settlementApproval/monthList.vue create mode 100644 static/images/settlementApproval/errorIcon.png create mode 100644 static/images/settlementApproval/goRightIcon.png create mode 100644 static/images/settlementApproval/isPassIcon.png create mode 100644 static/images/settlementApproval/monthIcon.png create mode 100644 static/images/settlementApproval/pendIcon.png create mode 100644 static/images/settlementApproval/stateIcon.png diff --git a/pages.json b/pages.json index 9795d6c..f5745d8 100644 --- a/pages.json +++ b/pages.json @@ -103,6 +103,13 @@ "navigationBarTitleText": "结算审批" } }, + { + "path": "monthList", + "style": + { + "navigationBarTitleText": "月度结算列表" + } + }, { "path": "yearSettlement", "style": @@ -114,6 +121,7 @@ "path": "monthDetail", "style": { + "navigationStyle": "custom", "navigationBarTitleText": "月度详情" } } diff --git a/pages/settlementApproval/detail.vue b/pages/settlementApproval/detail.vue index bb91e2d..5307f94 100644 --- a/pages/settlementApproval/detail.vue +++ b/pages/settlementApproval/detail.vue @@ -14,11 +14,11 @@ - + - + {{topDetail.Name || ''}} @@ -57,20 +57,26 @@ 提成比例 - {{topDetail.SECURITYDEPOSIT ? $util.getMoney(topDetail.SECURITYDEPOSIT / 10000):''}} + {{topDetail.SECURITYDEPOSIT ? $util.getMoney(topDetail.SECURITYDEPOSIT / 10000):'-'}} 履约保证金/万元 + + + {{detailObj.Approvalstate===0?'待结算':detailObj.Approvalstate===1?'审核中':''}} + + + + - - - + + - + @@ -78,7 +84,13 @@ {{item.PeriodIndexStr ||''}} - {{item.StartDate || ''}} 至 {{item.EndDate || ''}} + + {{item.StartDate || ''}} 至 {{item.EndDate || ''}} + + 查看月度结算 + + + @@ -123,13 +135,22 @@ + + + + {{detailObj.Approvalstate===0?'待结算':detailObj.Approvalstate===1?'审核中':''}} + + + + + 年度结算详情 - + 查看月度结算 @@ -264,681 +285,187 @@ - - - - 审批流程 - - - - 待审核： - {{progressDetail.APPOVED_NAME || ''}} - - - - - - - - - {{item.STAFF_NAME.slice(1,3)}} - - - - - - - {{`【${item.APPLYAPPROVE_NAME}】`}} - {{`${item.APPLYAPPROVE_DATE}`}} - - - {{item.STAFF_NAME}}:{{`${item.APPLYAPPROVE_INFO}`}} - - - - - - - - - - - + + + + 月度结算详情 + - - 发起审批 + + + 结算时间：{{detailObj.SETTLEMENT_DATE || ''}} + + + + + 数据类型 + + + + 结算数据 + + + + + 精算数据 + + + + + + 本月营收 + + {{actuaryData.CurMonthRevenue?`${$util.getMoney(actuaryData.CurMonthRevenue)}`:'-'}} + + {{monthNewCalibration.CurMonthRevenueTEXT?monthNewCalibration.CurMonthRevenueTEXT:'-'}} + + + + 累计营业额 + + {{actuaryData.REVENUEDAILY_AMOUNTTotal?`${$util.getMoney(actuaryData.REVENUEDAILY_AMOUNTTotal)}`:'-'}} + + {{monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT?monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT:'-'}} + + + + 移动支付 + + {{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)}`:'-'}} + + {{monthNewCalibration.MOBILEPAY_CORRECTTEXT || ''}} + + + + 现金交易 + + {{actuaryData.CASHPAY_AMOUNT?`${$util.getMoney(actuaryData.CASHPAY_AMOUNT)}`:'-'}} + + + {{monthNewCalibration.CASHPAY_AMOUNTTEXT || ''}} + ({{ monthNewCalibration.CASHPAY_CORRECT > 0 ? '+' : '' }}{{ monthNewCalibration.CASHPAY_CORRECTTEXT || '' }}) + + + + + 现金冲正 + + {{actuaryData.CASHPAY_CORRECT?`${$util.getMoney(actuaryData.CASHPAY_CORRECT)}`:'-'}} + + {{monthNewCalibration.CASHPAY_CORRECTTEXT || '0'}} + + + + 提成金额 + + {{actuaryData.GUARANTEERATIOAMOUNT?`${$util.getMoney(actuaryData.GUARANTEERATIOAMOUNT)}`:'-'}} + + {{monthNewCalibration.GUARANTEERATIOAMOUNTTEXT || ''}} + + + + 提成收入 + + {{actuaryData.GUARANTEERATIOINCOME?`${$util.getMoney(actuaryData.GUARANTEERATIOINCOME)}`:'-'}} + + {{monthNewCalibration.GUARANTEERATIOINCOMETEXT || ''}} + + + - - - - - {{ - detailObj.SETTLEMENT_TYPE===1?`${detailObj.SERVERPART_NAME}-${topDetail.SERVERPARTSHOP_NAME || ''}年度结算表`: - `${detailObj.SERVERPART_NAME}-${topDetail.SERVERPARTSHOP_NAME || ''}-${$moment(detailObj.ENDDATE).format('YYYYMM')}月度结算表` - }} - - - - - - 商家名称： - {{topDetail.MERCHANTS_NAME || ''}} - - - - - - 合同总金额： - {{topDetail.RENTFEE ? $util.getMoney(topDetail.RENTFEE / 10000)+'万元':''}} - - - - - - 税率： - {{topDetail.TaxRate ? `${topDetail.TaxRate}%` : '-'}} - - - 期除税收入： - {{topDetail.MINTURNOVER ? `${$util.getMoney(topDetail.MINTURNOVER / 10000)}万元` : ''}} - - - - - - - 履约保证金： - {{topDetail.SECURITYDEPOSIT ? $util.getMoney(topDetail.SECURITYDEPOSIT / 10000)+'万元':''}} - - - 提成比例： - {{topDetail.GUARANTEERATIO ? `${topDetail.GUARANTEERATIO}%` : '-'}} - - - - - - 结算模式： - {{detailObj.SETTLEMENT_MODES?SETTLEMENT_MODESObj[detailObj.SETTLEMENT_MODES] : ''}} - - - 项目期数： - {{detailObj.CURRENT_PERIOD || ''}} - - - - - - 装修期： - {{topDetail.DecorateDesc || ''}} - - - - - - 开始时间： - {{detailObj.STARTDATE || ''}} - - - 结束日期： - {{detailObj.ENDDATE || ''}} - - + + + 经营商户应交费用明细表 + + + 结算时间：{{detailObj.SETTLEMENT_DATE || ''}} - - - - - 结算数据 + + + 数据类型 + + + + 应缴费用 + + + + + 已缴费用 + + + + + 合计 + + {{ExpenseObj.SHOPEXPENSE_AMOUNT ||'-'}} + + {{ExpenseObj.PAID_AMOUNT ||'-'}} + - - - - 期限： - {{`${detailObj.STARTDATE}-${detailObj.ENDDATE}`}} + + 水费 + + {{ExpenseObj.SHOPEXPENSE_AMOUNT_1000 ||'-'}} + + {{ExpenseObj.PAID_AMOUNT_9010 ||'-'}} + + + + 电费 + + {{ExpenseObj.SHOPEXPENSE_AMOUNT_2000 ||'-'}} + + {{ExpenseObj.PAID_AMOUNT_9020 ||'-'}} + + + + 物业费 + + {{ExpenseObj.SHOPEXPENSE_AMOUNT_5000 ||'-'}} + + {{ExpenseObj.PAID_AMOUNT_9050 ||'-'}} + + + + 就餐费 + + {{ExpenseObj.SHOPEXPENSE_AMOUNT_4000 ||'-'}} + + {{'-'}} + + + + 住宿费 + + {{ExpenseObj.SHOPEXPENSE_AMOUNT_3000 ||'-'}} + + {{ExpenseObj.PAID_AMOUNT_9030 ||'-'}} - - - 本月营收： - {{actuaryData.CurMonthRevenue?`${numeral(actuaryData.CurMonthRevenue).format('0,0.00')}`:'-'}} - - - 累计营业额： - {{actuaryData.REVENUEDAILY_AMOUNTTotal?`${numeral(actuaryData.REVENUEDAILY_AMOUNTTotal).format('0,0.00')}`:'-'}} - - - - - - - - - - - 移动支付： - {{actuaryData.MOBILEPAY_AMOUNT?`${numeral(actuaryData.MOBILEPAY_AMOUNT).format('0,0.00')}`:'-'}} - - - 移动冲正： - {{actuaryData.MOBILEPAY_CORRECT?`${numeral(actuaryData.MOBILEPAY_CORRECT).format('0,0.00')}`:'-'}} - - - - - - 现金交易： - {{actuaryData.CASHPAY_AMOUNT?`${numeral(actuaryData.CASHPAY_AMOUNT).format('0,0.00')}`:'-'}} - - - 现金冲正： - {{actuaryData.CASHPAY_CORRECT?`${numeral(actuaryData.CASHPAY_CORRECT).format('0,0.00')}`:'-'}} - - - - - - 提成金额： - {{actuaryData.GUARANTEERATIOAMOUNT?`${numeral(actuaryData.GUARANTEERATIOAMOUNT).format('0,0.00')}`:'-'}} - - - 提成收入： - {{actuaryData.GUARANTEERATIOINCOME?`${numeral(actuaryData.GUARANTEERATIOINCOME).format('0,0.00')}`:'-'}} - - - - - - - - - 结算数据 - 精算数据 - - - - 期限： - {{`${detailObj.STARTDATE}-${detailObj.ENDDATE}`}} - {{detailObj.Approvalstate>0?'已结算':'待结算'}} - - - - 本月营收： - {{actuaryData.CurMonthRevenue?`${numeral(actuaryData.CurMonthRevenue).format('0,0.00')}`:'-'}} - {{monthNewCalibration.CurMonthRevenueTEXT?monthNewCalibration.CurMonthRevenueTEXT:'-'}} - - - - 累计营业额： - {{actuaryData.REVENUEDAILY_AMOUNTTotal?`${numeral(actuaryData.REVENUEDAILY_AMOUNTTotal).format('0,0.00')}`:'-'}} - {{monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT?monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT:'-'}} - - - - 移动支付： - {{actuaryData.MOBILEPAY_AMOUNT?`${numeral(actuaryData.MOBILEPAY_AMOUNT).format('0,0.00')}`:'-'}} - - {{monthNewCalibration.MOBILEPAY_AMOUNTTEXT || ''}} - ({{monthNewCalibration.MOBILEPAY_CORRECT>0?'+':''}}{{monthNewCalibration.MOBILEPAY_CORRECTTEXT || ''}}) - - - - - 移动冲正： - {{actuaryData.MOBILEPAY_CORRECT?`${numeral(actuaryData.MOBILEPAY_CORRECT).format('0,0.00')}`:'-'}} - {{monthNewCalibration.MOBILEPAY_CORRECTTEXT || ''}} - - - - 现金交易： - {{actuaryData.CASHPAY_AMOUNT?`${numeral(actuaryData.CASHPAY_AMOUNT).format('0,0.00')}`:'-'}} - - {{monthNewCalibration.CASHPAY_AMOUNTTEXT || ''}} - ({{ monthNewCalibration.CASHPAY_CORRECT > 0 ? '+' : '' }}{{ monthNewCalibration.CASHPAY_CORRECTTEXT || '' }}) - - - - - 现金冲正： - {{actuaryData.CASHPAY_CORRECT?`${numeral(actuaryData.CASHPAY_CORRECT).format('0,0.00')}`:'-'}} - {{monthNewCalibration.CASHPAY_CORRECTTEXT || '0'}} - - - - 提成金额： - {{actuaryData.GUARANTEERATIOAMOUNT?`${numeral(actuaryData.GUARANTEERATIOAMOUNT).format('0,0.00')}`:'-'}} - {{monthNewCalibration.GUARANTEERATIOAMOUNTTEXT || ''}} - - - - 提成收入： - {{actuaryData.GUARANTEERATIOINCOME?`${numeral(actuaryData.GUARANTEERATIOINCOME).format('0,0.00')}`:'-'}} - {{monthNewCalibration.GUARANTEERATIOINCOMETEXT || ''}} - - - - - - - 结算数据 - - - - - - 期限： - {{item.PeriodDesc ||''}} - - - 结算状态： - {{detailObj.Approvalstate>0?'已结算':'待结算'}} - - - - - - 现金： - {{item.CashAmount?numeral(item.CashAmount).format('0,0.00'):'-'}} - - - 微支付： - {{item.MobilePayAmount?numeral(item.MobilePayAmount).format('0,0.00'):'-'}} - - - - - - 营业额合计： - {{item.RevenueAmount?numeral(item.RevenueAmount).format('0,0.00'):'-'}} - - - 驿达收款： - {{item.RoyaltyAmount?numeral(item.RoyaltyAmount).format('0,0.00'):'-'}} - - - - - - 营收费用合计： - {{item.ReceivableAmount?numeral(item.ReceivableAmount).format('0,0.00'):'-'}} - - - 租金： - {{item.GuaranteeFee?numeral(item.GuaranteeFee).format('0,0.00'):'-'}} - - - - - 退补款： - {{item.RefundSupplement?numeral(item.RefundSupplement).format('0,0.00'):'-'}} - - - - - - - - - - - - - - - 结算数据 - 精算数据 - - - - 期限： - {{item.PeriodDesc ||''}} - {{detailObj.Approvalstate>0?'已结算':'待结算'}} - - - - 营业额合计： - {{item.RevenueAmount?numeral(item.RevenueAmount).format('0,0.00'):'-'}} - - {{yearDataListObj.RevenueAmountTEXT?yearDataListObj.RevenueAmountTEXT:''}} - ({{yearDataListObj.CorrectAmount>0?'+':''}}{{yearDataListObj.CorrectAmountTEXT || ''}}) - - - - - 现金： - {{item.CashAmount?numeral(item.CashAmount).format('0,0.00'):'-'}} - {{yearDataListObj.CashAmount?numeral(yearDataListObj.CashAmount).format('0,0.00'):''}} - - - - 微支付： - {{item.MobilePayAmount?numeral(item.MobilePayAmount).format('0,0.00'):'-'}} - {{yearDataListObj.MobilePayAmount?numeral(yearDataListObj.MobilePayAmount).format('0,0.00'):''}} - - - - 驿达收款： - {{item.RoyaltyAmount?numeral(item.RoyaltyAmount).format('0,0.00'):'-'}} - {{yearDataListObj.RoyaltyAmount?numeral(yearDataListObj.RoyaltyAmount).format('0,0.00'):''}} - - - - 营收费用合计： - {{item.ReceivableAmount?numeral(item.ReceivableAmount).format('0,0.00'):'-'}} - {{yearDataListObj.ReceivableAmount?numeral(yearDataListObj.ReceivableAmount).format('0,0.00'):''}} - - - - 租金： - {{item.GuaranteeFee || item.GuaranteeFee===0?numeral(item.GuaranteeFee).format('0,0.00'):'-'}} - {{yearDataListObj.GuaranteeFee?numeral(yearDataListObj.GuaranteeFee).format('0,0.00'):''}} - - - - 物业费： - {{item.PropertyFee || item.PropertyFee===0?numeral(item.PropertyFee).format('0,0.00'):'-'}} - {{yearDataListObj.PropertyFee || yearDataListObj.PropertyFee===0?numeral(yearDataListObj.PropertyFee).format('0,0.00'):''}} - - - - 房租： - {{item.HouseRent || item.HouseRent===0?numeral(item.HouseRent).format('0,0.00'):'-'}} - {{yearDataListObj.HouseRent || yearDataListObj.HouseRent===0?numeral(yearDataListObj.HouseRent).format('0,0.00'):''}} - - - - 罚款： - {{item.BreachPenalty || item.BreachPenalty===0?numeral(item.BreachPenalty).format('0,0.00'):'-'}} - {{yearDataListObj.BreachPenalty || yearDataListObj.BreachPenalty===0?numeral(yearDataListObj.BreachPenalty).format('0,0.00'):''}} - - - - 电费： - {{item.ElectricityCharge || item.ElectricityCharge===0?numeral(item.ElectricityCharge).format('0,0.00'):'-'}} - {{yearDataListObj.ElectricityCharge || yearDataListObj.ElectricityCharge===0?numeral(yearDataListObj.ElectricityCharge).format('0,0.00'):''}} - - - - 水费： - {{item.WaterCharge || item.WaterCharge===0?numeral(item.WaterCharge).format('0,0.00'):'-'}} - {{yearDataListObj.WaterCharge || yearDataListObj.WaterCharge===0?numeral(yearDataListObj.WaterCharge).format('0,0.00'):''}} - - - - 其他： - {{item.OtherFee || item.OtherFee===0?numeral(item.OtherFee).format('0,0.00'):'-'}} - {{yearDataListObj.OtherFee || yearDataListObj.OtherFee===0?numeral(yearDataListObj.OtherFee).format('0,0.00'):''}} - - - - 退补款： - {{item.RefundSupplement?numeral(item.RefundSupplement).format('0,0.00'):'-'}} - {{yearDataListObj.RefundSupplement?numeral(yearDataListObj.RefundSupplement).format('0,0.00'):''}} - - - - - - - - - - - - - - 期限： - {{subItem.PeriodDesc ||''}} - - - 结算状态： - {{subItem.IsApplySuccess?'已结算':'待结算'}} - - - - - - - 现金： - {{subItem.CashAmount?numeral(subItem.CashAmount).format('0,0.00'):''}} - - - 微支付： - {{subItem.MobilePayAmount?numeral(subItem.MobilePayAmount).format('0,0.00'):''}} - - - - - - 营业额合计： - {{subItem.RevenueAmount?numeral(subItem.RevenueAmount).format('0,0.00'):''}} - - - 驿达收款： - {{subItem.RoyaltyAmount?numeral(subItem.RoyaltyAmount).format('0,0.00'):''}} - - - - - - 营收费用合计： - {{subItem.ReceivableAmount?numeral(subItem.ReceivableAmount).format('0,0.00'):''}} - - - 租金： - {{subItem.GuaranteeFee?numeral(subItem.GuaranteeFee).format('0,0.00'):''}} - - - - - 退补款： - {{subItem.RefundSupplement?numeral(subItem.RefundSupplement).format('0,0.00'):''}} - - - - - - - - - - - - - - - - - - - 精算数据 - - - - - 期限： - {{item.PeriodDesc ||''}} - - - 结算状态： - {{detailObj.Approvalstate>0?'已结算':'待结算'}} - - - - - - 现金： - {{item.CashAmountTEXT || ''}} - - - 微支付： - {{item.MobilePayAmountTEXT || ''}} - - - - - - 营业额合计： - {{item.RevenueAmountTEXT || ''}} - - - 驿达收款： - {{item.RoyaltyAmountTEXT || ''}} - - - - - - 营收费用合计： - {{item.ReceivableAmountTEXT || ''}} - - - 租金： - {{item.GuaranteeFeeTEXT || ''}} - - - - - 退补款： - {{item.RefundSupplementTEXT || ''}} - - - - - - - - - - - - - - - - 期限： - {{subItem.PeriodDesc ||''}} - - - 结算状态： - {{subItem.IsApplySuccess?'已结算':'待结算'}} - - - - - - 现金： - {{subItem.CashAmount?numeral(subItem.CashAmount).format('0,0.00'):''}} - - - 微支付： - {{subItem.MobilePayAmount?numeral(subItem.MobilePayAmount).format('0,0.00'):''}} - - - - - - 营业额合计： - {{subItem.RevenueAmount?numeral(subItem.RevenueAmount).format('0,0.00'):''}} - - - 驿达收款： - {{subItem.RoyaltyAmount?numeral(subItem.RoyaltyAmount).format('0,0.00'):''}} - - - - - - 营收费用合计： - {{subItem.ReceivableAmount?numeral(subItem.ReceivableAmount).format('0,0.00'):''}} - - - 租金： - {{subItem.GuaranteeFee?numeral(subItem.GuaranteeFee).format('0,0.00'):''}} - - - - - 退补款： - {{subItem.RefundSupplement?numeral(subItem.RefundSupplement).format('0,0.00'):''}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 发起申请 - - - - - - - 审核 - - - - - - - 驳回 - - - - - - - - 审批流程 - - - - - 申请人： - {{progressDetail.STAFF_NAME || ''}} - - - {{progressDetail.BUSINESS_STARTDATE || ''}} - - + + 审批流程 @@ -947,23 +474,49 @@ - - - - - - {{`【${item.APPLYAPPROVE_NAME}】`}} + + + + + + {{item.STAFF_NAME.slice(1,3)}} + + + + + + + {{`【${item.APPLYAPPROVE_NAME}】`}} + {{`${item.APPLYAPPROVE_DATE}`}} + + + {{item.STAFF_NAME}}:{{`${item.APPLYAPPROVE_INFO}`}} + - {{`${item.APPLYAPPROVE_DATE}`}} - - {{item.STAFF_NAME}}: - {{`${item.APPLYAPPROVE_INFO}`}} + + + + + + + + 发起审批 + + + + + + 驳回 + 同意 + + + @@ -999,7 +552,6 @@ - @@ -1008,119 +560,95 @@ + + + 结算时间：{{detailObj.STARTDATE || ''}} 至 {{detailObj.ENDDATE || ''}} + - - 结算数据 + + + 数据类型 + + + + 结算数据 + + + + + 精算数据 + + + - - - - 期限： - {{`${detailObj.STARTDATE}-${detailObj.ENDDATE}`}} + + + + + + + + + + 累计营业额 + + {{actuaryData.REVENUEDAILY_AMOUNTTotal?`${numeral(actuaryData.REVENUEDAILY_AMOUNTTotal).format('0,0.00')}`:''}} + + {{newCalibration.REVENUEDAILY_AMOUNTTotal?`${numeral(newCalibration.REVENUEDAILY_AMOUNTTotal).format('0,0.00')}`:''}} + + + + 移动支付 + + {{actuaryData.MOBILEPAY_AMOUNT?`${numeral(actuaryData.MOBILEPAY_AMOUNT).format('0,0.00')}`:''}} + + {{newCalibration.MOBILEPAY_AMOUNT?`${numeral(newCalibration.MOBILEPAY_AMOUNT + (newCalibration.MOBILEPAY_CORRECT || 0)).format('0,0.00')}` + `${newCalibration.MOBILEPAY_CORRECT?`(${newCalibration.MOBILEPAY_CORRECT>0?'+':''}${newCalibration.MOBILEPAY_CORRECT})`:''}` :''}} - - - 累计营业额： - {{actuaryData.REVENUEDAILY_AMOUNTTotal?`${numeral(actuaryData.REVENUEDAILY_AMOUNTTotal).format('0,0.00')}`:''}} + + 移动冲正 + + {{actuaryData.MOBILEPAY_CORRECT?`${numeral(actuaryData.MOBILEPAY_CORRECT).format('0,0.00')}`:'0'}} + + {{newCalibration.MOBILEPAY_CORRECT?`${numeral(newCalibration.MOBILEPAY_CORRECT).format('0,0.00')}`:'0'}} + + + + 现金交易 + + {{actuaryData.CASHPAY_AMOUNT?`${numeral(actuaryData.CASHPAY_AMOUNT).format('0,0.00')}`:''}} + + {{newCalibration.CASHPAY_AMOUNT?`${numeral(newCalibration.CASHPAY_AMOUNT + (newCalibration.CASHPAY_CORRECT || 0)).format('0,0.00')}` + `${newCalibration.CASHPAY_CORRECT?`(${newCalibration.CASHPAY_CORRECT>0?'+':''}${newCalibration.CASHPAY_CORRECT})`:'' }` :''}} - - - 移动支付： - {{actuaryData.MOBILEPAY_AMOUNT?`${numeral(actuaryData.MOBILEPAY_AMOUNT).format('0,0.00')}`:''}} - - - 移动冲正： - {{actuaryData.MOBILEPAY_CORRECT?`${numeral(actuaryData.MOBILEPAY_CORRECT).format('0,0.00')}`:'0'}} - + + 现金冲正 + + {{actuaryData.CASHPAY_CORRECT?`${numeral(actuaryData.CASHPAY_CORRECT).format('0,0.00')}`:'0'}} + + {{newCalibration.CASHPAY_CORRECT?`${numeral(newCalibration.CASHPAY_CORRECT).format('0,0.00')}`:'0'}} - - - 现金交易： - {{actuaryData.CASHPAY_AMOUNT?`${numeral(actuaryData.CASHPAY_AMOUNT).format('0,0.00')}`:''}} - - - 现金冲正： - {{actuaryData.CASHPAY_CORRECT?`${numeral(actuaryData.CASHPAY_CORRECT).format('0,0.00')}`:'0'}} - + + 提成金额 + + {{actuaryData.GUARANTEERATIOAMOUNT?`${numeral(actuaryData.GUARANTEERATIOAMOUNT).format('0,0.00')}`:''}} + + {{newCalibration.GUARANTEERATIOAMOUNT?`${numeral(newCalibration.GUARANTEERATIOAMOUNT).format('0,0.00')}`:''}} - - - 提成金额： - {{actuaryData.GUARANTEERATIOAMOUNT?`${numeral(actuaryData.GUARANTEERATIOAMOUNT).format('0,0.00')}`:''}} - - - 提成收入： - {{actuaryData.GUARANTEERATIOINCOME?`${numeral(actuaryData.GUARANTEERATIOINCOME).format('0,0.00')}`:''}} - + + 提成收入 + + {{actuaryData.GUARANTEERATIOINCOME?`${numeral(actuaryData.GUARANTEERATIOINCOME).format('0,0.00')}`:''}} + + {{newCalibration.GUARANTEERATIOINCOME?`${numeral(newCalibration.GUARANTEERATIOINCOME).format('0,0.00')}`:''}} - - - - - 精算数据 - - - - - 期限： - {{`${detailObj.STARTDATE}-${detailObj.ENDDATE}`}} - - - - - - 累计营业额： - {{newCalibration.REVENUEDAILY_AMOUNTTotal?`${numeral(newCalibration.REVENUEDAILY_AMOUNTTotal).format('0,0.00')}`:''}} - - - - - - 移动支付： - - {{newCalibration.MOBILEPAY_AMOUNT?`${numeral(newCalibration.MOBILEPAY_AMOUNT + (newCalibration.MOBILEPAY_CORRECT || 0)).format('0,0.00')}` + `${newCalibration.MOBILEPAY_CORRECT?`(${newCalibration.MOBILEPAY_CORRECT>0?'+':''}${newCalibration.MOBILEPAY_CORRECT})`:''}` :''}} - - - - 移动冲正： - {{newCalibration.MOBILEPAY_CORRECT?`${numeral(newCalibration.MOBILEPAY_CORRECT).format('0,0.00')}`:'0'}} - - - - - - 现金交易： - {{newCalibration.CASHPAY_AMOUNT?`${numeral(newCalibration.CASHPAY_AMOUNT + (newCalibration.CASHPAY_CORRECT || 0)).format('0,0.00')}` + `${newCalibration.CASHPAY_CORRECT?`(${newCalibration.CASHPAY_CORRECT>0?'+':''}${newCalibration.CASHPAY_CORRECT})`:'' }` :''}} - - - 现金冲正： - {{newCalibration.CASHPAY_CORRECT?`${numeral(newCalibration.CASHPAY_CORRECT).format('0,0.00')}`:'0'}} - - - - - - 提成金额： - {{newCalibration.GUARANTEERATIOAMOUNT?`${numeral(newCalibration.GUARANTEERATIOAMOUNT).format('0,0.00')}`:''}} - - - 提成收入： - {{newCalibration.GUARANTEERATIOINCOME?`${numeral(newCalibration.GUARANTEERATIOINCOME).format('0,0.00')}`:''}} - - - - - -
@@ -1135,6 +663,7 @@
+ 重新校准 发起申请 @@ -1142,7 +671,6 @@ - @@ -1173,9 +701,6 @@ - - - + + diff --git a/pages/settlementApproval/yearSettlement.vue b/pages/settlementApproval/yearSettlement.vue index 1cf9014..901c284 100644 --- a/pages/settlementApproval/yearSettlement.vue +++ b/pages/settlementApproval/yearSettlement.vue @@ -1,6 +1,6 @@