From 83cd1645c4d0addd149755a20bc041dd5aa74fb7 Mon Sep 17 00:00:00 2001 From: cclu <1106109051@qq.com> Date: Tue, 30 Jul 2024 19:03:38 +0800 Subject: [PATCH] update --- common/utils.js | 43 +++++ pages.json | 37 ++-- pages/index/index.vue | 2 +- pages/register/register.vue | 3 +- pages/settlementApproval/detail.vue | 196 ++++++++++---------- pages/settlementApproval/yearSettlement.vue | 5 +- 6 files changed, 168 insertions(+), 118 deletions(-) diff --git a/common/utils.js b/common/utils.js index eea7465..feaec32 100644 --- a/common/utils.js +++ b/common/utils.js @@ -249,6 +249,48 @@ function getMoney(money){ return num; } +function getMoneyTest(money){ + console.log('money',money) + if (!money || isNaN(money)) return "0.00"; + let realMoney = 0 + if(money.toString().indexOf('.')>0){ + let num_per = money.toString().substring(0, money.toString().indexOf('.')) + let num_next = money.toString().substring(money.toString().indexOf('.') + 1).padEnd(2, '0') + console.log('num_per',num_per) + console.log('num_next',num_next) + realMoney = Number(num_per + '.' + num_next).toFixed(2) + }else{ + realMoney = money + } + + console.log('realMoney',realMoney) + let num = realMoney + // let num = parseFloat(realMoney + '') + ''; + // num = (parseInt(realMoney * 100 + '') / 100).toFixed(2) + '' + console.log('num',num) + let reg = /(-?\d+)(\d{3})/; + while (reg.test(num)) { + num = num.replace(reg, "$1,$2"); + } + + let idx = num.indexOf('.') + console.log('idx',idx) + if (idx === -1) { + num = num + '.00' + } + + if (idx > 0) { + let num_per = num.substring(0, idx) + '.' + let num_next = num.substring(idx + 1).padEnd(2, '0') + + console.log('num_per',num_per) + console.log('num_next',num_next) + + num = num_per + num_next + } + + return num; +} // 视频播放 const EZUIPlayer = require('./ezuikit.js'); @@ -266,6 +308,7 @@ export default { addUserBehavior, addUserBehaviorNew, getMoney, + getMoneyTest, getFieldEnumByField, // 获取枚举参数 // calculateDistance, // bMapToQQMap, diff --git a/pages.json b/pages.json index c83c15d..17cc2dd 100644 --- a/pages.json +++ b/pages.json @@ -28,25 +28,30 @@ { "navigationBarTitleText": "驿行畅旅" } - }, - { - "path": "pages/authorityApproval/index", - "style": - { - "navigationBarTitleText": "权限审批", - "enablePullDownRefresh": true - } - }, - { - "path": "pages/authorityApproval/detail", - "style": - { - "navigationBarTitleText": "权限审批", - "enablePullDownRefresh": true - } } ], "subPackages": [ //分包加载配置 + { + "root": "pages/authorityApproval", + "pages": [ + { + "path": "index", + "style": + { + "navigationBarTitleText": "权限审批", + "enablePullDownRefresh": true + } + }, + { + "path": "detail", + "style": + { + "navigationBarTitleText": "权限审批", + "enablePullDownRefresh": true + } + } + ] + }, { "root": "pages/auditingPop", "pages": [ diff --git a/pages/index/index.vue b/pages/index/index.vue index 494b0b8..1c04b98 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -225,7 +225,7 @@ }) } }, - toPage(item) { + toPage(item) { console.log('item',item) let _this = this diff --git a/pages/register/register.vue b/pages/register/register.vue index 5fb1565..947d80d 100644 --- a/pages/register/register.vue +++ b/pages/register/register.vue @@ -5,7 +5,8 @@ - + + diff --git a/pages/settlementApproval/detail.vue b/pages/settlementApproval/detail.vue index 5d97caa..0a95868 100644 --- a/pages/settlementApproval/detail.vue +++ b/pages/settlementApproval/detail.vue @@ -92,11 +92,11 @@ 本月营收： - {{actuaryData.CurMonthRevenue?`${$util.getMoney(actuaryData.CurMonthRevenue)}`:'-'}} + {{actuaryData.CurMonthRevenue?`${numeral(actuaryData.CurMonthRevenue).format('0,0.00')}`:'-'}} 累计营业额： - {{actuaryData.REVENUEDAILY_AMOUNTTotal?`${$util.getMoney(actuaryData.REVENUEDAILY_AMOUNTTotal)}`:'-'}} + {{actuaryData.REVENUEDAILY_AMOUNTTotal?`${numeral(actuaryData.REVENUEDAILY_AMOUNTTotal).format('0,0.00')}`:'-'}} @@ -108,33 +108,33 @@ 移动支付： - {{actuaryData.MOBILEPAY_AMOUNT?`${$util.getMoney(actuaryData.MOBILEPAY_AMOUNT)}`:'-'}} + {{actuaryData.MOBILEPAY_AMOUNT?`${numeral(actuaryData.MOBILEPAY_AMOUNT).format('0,0.00')}`:'-'}} 移动冲正： - {{actuaryData.MOBILEPAY_CORRECT?`${$util.getMoney(actuaryData.MOBILEPAY_CORRECT)}`:'-'}} + {{actuaryData.MOBILEPAY_CORRECT?`${numeral(actuaryData.MOBILEPAY_CORRECT).format('0,0.00')}`:'-'}} 现金交易： - {{actuaryData.CASHPAY_AMOUNT?`${$util.getMoney(actuaryData.CASHPAY_AMOUNT)}`:'-'}} + {{actuaryData.CASHPAY_AMOUNT?`${numeral(actuaryData.CASHPAY_AMOUNT).format('0,0.00')}`:'-'}} 现金冲正： - {{actuaryData.CASHPAY_CORRECT?`${$util.getMoney(actuaryData.CASHPAY_CORRECT)}`:'-'}} + {{actuaryData.CASHPAY_CORRECT?`${numeral(actuaryData.CASHPAY_CORRECT).format('0,0.00')}`:'-'}} 提成金额： - {{actuaryData.GUARANTEERATIOAMOUNT?`${$util.getMoney(actuaryData.GUARANTEERATIOAMOUNT)}`:'-'}} + {{actuaryData.GUARANTEERATIOAMOUNT?`${numeral(actuaryData.GUARANTEERATIOAMOUNT).format('0,0.00')}`:'-'}} 提成收入： - {{actuaryData.GUARANTEERATIOINCOME?`${$util.getMoney(actuaryData.GUARANTEERATIOINCOME)}`:'-'}} + {{actuaryData.GUARANTEERATIOINCOME?`${numeral(actuaryData.GUARANTEERATIOINCOME).format('0,0.00')}`:'-'}} @@ -155,19 +155,19 @@ 本月营收： - {{actuaryData.CurMonthRevenue?`${$util.getMoney(actuaryData.CurMonthRevenue)}`:'-'}} + {{actuaryData.CurMonthRevenue?`${numeral(actuaryData.CurMonthRevenue).format('0,0.00')}`:'-'}} {{monthNewCalibration.CurMonthRevenueTEXT?monthNewCalibration.CurMonthRevenueTEXT:'-'}} 累计营业额： - {{actuaryData.REVENUEDAILY_AMOUNTTotal?`${$util.getMoney(actuaryData.REVENUEDAILY_AMOUNTTotal)}`:'-'}} + {{actuaryData.REVENUEDAILY_AMOUNTTotal?`${numeral(actuaryData.REVENUEDAILY_AMOUNTTotal).format('0,0.00')}`:'-'}} {{monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT?monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT:'-'}} 移动支付： - {{actuaryData.MOBILEPAY_AMOUNT?`${$util.getMoney(actuaryData.MOBILEPAY_AMOUNT)}`:'-'}} + {{actuaryData.MOBILEPAY_AMOUNT?`${numeral(actuaryData.MOBILEPAY_AMOUNT).format('0,0.00')}`:'-'}} {{monthNewCalibration.MOBILEPAY_AMOUNTTEXT || ''}} ({{monthNewCalibration.MOBILEPAY_CORRECT>0?'+':''}}{{monthNewCalibration.MOBILEPAY_CORRECTTEXT || ''}}) @@ -176,13 +176,13 @@ 移动冲正： - {{actuaryData.MOBILEPAY_CORRECT?`${$util.getMoney(actuaryData.MOBILEPAY_CORRECT)}`:'-'}} + {{actuaryData.MOBILEPAY_CORRECT?`${numeral(actuaryData.MOBILEPAY_CORRECT).format('0,0.00')}`:'-'}} {{monthNewCalibration.MOBILEPAY_CORRECTTEXT || ''}} 现金交易： - {{actuaryData.CASHPAY_AMOUNT?`${$util.getMoney(actuaryData.CASHPAY_AMOUNT)}`:'-'}} + {{actuaryData.CASHPAY_AMOUNT?`${numeral(actuaryData.CASHPAY_AMOUNT).format('0,0.00')}`:'-'}} {{monthNewCalibration.CASHPAY_AMOUNTTEXT || ''}} ({{ monthNewCalibration.CASHPAY_CORRECT > 0 ? '+' : '' }}{{ monthNewCalibration.CASHPAY_CORRECTTEXT || '' }}) @@ -191,19 +191,19 @@ 现金冲正： - {{actuaryData.CASHPAY_CORRECT?`${$util.getMoney(actuaryData.CASHPAY_CORRECT)}`:'-'}} + {{actuaryData.CASHPAY_CORRECT?`${numeral(actuaryData.CASHPAY_CORRECT).format('0,0.00')}`:'-'}} {{monthNewCalibration.CASHPAY_CORRECTTEXT || '0'}} 提成金额： - {{actuaryData.GUARANTEERATIOAMOUNT?`${$util.getMoney(actuaryData.GUARANTEERATIOAMOUNT)}`:'-'}} + {{actuaryData.GUARANTEERATIOAMOUNT?`${numeral(actuaryData.GUARANTEERATIOAMOUNT).format('0,0.00')}`:'-'}} {{monthNewCalibration.GUARANTEERATIOAMOUNTTEXT || ''}} 提成收入： - {{actuaryData.GUARANTEERATIOINCOME?`${$util.getMoney(actuaryData.GUARANTEERATIOINCOME)}`:'-'}} + {{actuaryData.GUARANTEERATIOINCOME?`${numeral(actuaryData.GUARANTEERATIOINCOME).format('0,0.00')}`:'-'}} {{monthNewCalibration.GUARANTEERATIOINCOMETEXT || ''}} @@ -229,39 +229,39 @@ 现金： - {{item.CashAmount?numeral($util.getMoney(item.CashAmount)).format('0,0.00'):'-'}} + {{item.CashAmount?numeral(item.CashAmount).format('0,0.00'):'-'}} 微支付： - {{item.MobilePayAmount?numeral($util.getMoney(item.MobilePayAmount)).format('0,0.00'):'-'}} + {{item.MobilePayAmount?numeral(item.MobilePayAmount).format('0,0.00'):'-'}} 营业额合计： - {{item.RevenueAmount?numeral($util.getMoney(item.RevenueAmount)).format('0,0.00'):'-'}} + {{item.RevenueAmount?numeral(item.RevenueAmount).format('0,0.00'):'-'}} 驿达收款： - {{item.RoyaltyAmount?numeral($util.getMoney(item.RoyaltyAmount)).format('0,0.00'):'-'}} + {{item.RoyaltyAmount?numeral(item.RoyaltyAmount).format('0,0.00'):'-'}} 营收费用合计： - {{item.ReceivableAmount?numeral($util.getMoney(item.ReceivableAmount)).format('0,0.00'):'-'}} + {{item.ReceivableAmount?numeral(item.ReceivableAmount).format('0,0.00'):'-'}} 租金： - {{item.GuaranteeFee?numeral($util.getMoney(item.GuaranteeFee)).format('0,0.00'):'-'}} + {{item.GuaranteeFee?numeral(item.GuaranteeFee).format('0,0.00'):'-'}} 退补款： - {{item.RefundSupplement?numeral($util.getMoney(item.RefundSupplement)).format('0,0.00'):'-'}} + {{item.RefundSupplement?numeral(item.RefundSupplement).format('0,0.00'):'-'}} @@ -288,7 +288,7 @@ 营业额合计： - {{item.RevenueAmount?numeral($util.getMoney(item.RevenueAmount)).format('0,0.00'):'-'}} + {{item.RevenueAmount?numeral(item.RevenueAmount).format('0,0.00'):'-'}} {{yearDataListObj.RevenueAmountTEXT?yearDataListObj.RevenueAmountTEXT:''}} ({{yearDataListObj.CorrectAmount>0?'+':''}}{{yearDataListObj.CorrectAmountTEXT || ''}}) @@ -297,74 +297,74 @@ 现金： - {{item.CashAmount?numeral($util.getMoney(item.CashAmount)).format('0,0.00'):'-'}} - {{yearDataListObj.CashAmount?numeral($util.getMoney(yearDataListObj.CashAmount)).format('0,0.00'):''}} + {{item.CashAmount?numeral(item.CashAmount).format('0,0.00'):'-'}} + {{yearDataListObj.CashAmount?numeral(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.MobilePayAmount?numeral(item.MobilePayAmount).format('0,0.00'):'-'}} + {{yearDataListObj.MobilePayAmount?numeral(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.RoyaltyAmount?numeral(item.RoyaltyAmount).format('0,0.00'):'-'}} + {{yearDataListObj.RoyaltyAmount?numeral(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'):''}} + {{item.ReceivableAmount?numeral(item.ReceivableAmount).format('0,0.00'):'-'}} + {{yearDataListObj.ReceivableAmount?numeral(yearDataListObj.ReceivableAmount).format('0,0.00'):''}} 租金： - {{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'):''}} + {{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($util.getMoney(item.PropertyFee)).format('0,0.00'):'-'}} - {{yearDataListObj.PropertyFee || yearDataListObj.PropertyFee===0?numeral($util.getMoney(yearDataListObj.PropertyFee)).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($util.getMoney(item.HouseRent)).format('0,0.00'):'-'}} - {{yearDataListObj.HouseRent || yearDataListObj.HouseRent===0?numeral($util.getMoney(yearDataListObj.HouseRent)).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($util.getMoney(item.BreachPenalty)).format('0,0.00'):'-'}} - {{yearDataListObj.BreachPenalty || yearDataListObj.BreachPenalty===0?numeral($util.getMoney(yearDataListObj.BreachPenalty)).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($util.getMoney(item.ElectricityCharge)).format('0,0.00'):'-'}} - {{yearDataListObj.ElectricityCharge || yearDataListObj.ElectricityCharge===0?numeral($util.getMoney(yearDataListObj.ElectricityCharge)).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($util.getMoney(item.WaterCharge)).format('0,0.00'):'-'}} - {{yearDataListObj.WaterCharge || yearDataListObj.WaterCharge===0?numeral($util.getMoney(yearDataListObj.WaterCharge)).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($util.getMoney(item.OtherFee)).format('0,0.00'):'-'}} - {{yearDataListObj.OtherFee || yearDataListObj.OtherFee===0?numeral($util.getMoney(yearDataListObj.OtherFee)).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($util.getMoney(item.RefundSupplement)).format('0,0.00'):'-'}} - {{yearDataListObj.RefundSupplement?numeral($util.getMoney(yearDataListObj.RefundSupplement)).format('0,0.00'):''}} + {{item.RefundSupplement?numeral(item.RefundSupplement).format('0,0.00'):'-'}} + {{yearDataListObj.RefundSupplement?numeral(yearDataListObj.RefundSupplement).format('0,0.00'):''}} @@ -391,39 +391,39 @@ 现金： - {{subItem.CashAmount?numeral($util.getMoney(subItem.CashAmount)).format('0,0.00'):''}} + {{subItem.CashAmount?numeral(subItem.CashAmount).format('0,0.00'):''}} 微支付： - {{subItem.MobilePayAmount?numeral($util.getMoney(subItem.MobilePayAmount)).format('0,0.00'):''}} + {{subItem.MobilePayAmount?numeral(subItem.MobilePayAmount).format('0,0.00'):''}} 营业额合计： - {{subItem.RevenueAmount?numeral($util.getMoney(subItem.RevenueAmount)).format('0,0.00'):''}} + {{subItem.RevenueAmount?numeral(subItem.RevenueAmount).format('0,0.00'):''}} 驿达收款： - {{subItem.RoyaltyAmount?numeral($util.getMoney(subItem.RoyaltyAmount)).format('0,0.00'):''}} + {{subItem.RoyaltyAmount?numeral(subItem.RoyaltyAmount).format('0,0.00'):''}} 营收费用合计： - {{subItem.ReceivableAmount?numeral($util.getMoney(subItem.ReceivableAmount)).format('0,0.00'):''}} + {{subItem.ReceivableAmount?numeral(subItem.ReceivableAmount).format('0,0.00'):''}} 租金： - {{subItem.GuaranteeFee?numeral($util.getMoney(subItem.GuaranteeFee)).format('0,0.00'):''}} + {{subItem.GuaranteeFee?numeral(subItem.GuaranteeFee).format('0,0.00'):''}} 退补款： - {{subItem.RefundSupplement?numeral($util.getMoney(subItem.RefundSupplement)).format('0,0.00'):''}} + {{subItem.RefundSupplement?numeral(subItem.RefundSupplement).format('0,0.00'):''}} @@ -519,39 +519,39 @@ 现金： - {{subItem.CashAmount?numeral($util.getMoney(subItem.CashAmount)).format('0,0.00'):''}} + {{subItem.CashAmount?numeral(subItem.CashAmount).format('0,0.00'):''}} 微支付： - {{subItem.MobilePayAmount?numeral($util.getMoney(subItem.MobilePayAmount)).format('0,0.00'):''}} + {{subItem.MobilePayAmount?numeral(subItem.MobilePayAmount).format('0,0.00'):''}} 营业额合计： - {{subItem.RevenueAmount?numeral($util.getMoney(subItem.RevenueAmount)).format('0,0.00'):''}} + {{subItem.RevenueAmount?numeral(subItem.RevenueAmount).format('0,0.00'):''}} 驿达收款： - {{subItem.RoyaltyAmount?numeral($util.getMoney(subItem.RoyaltyAmount)).format('0,0.00'):''}} + {{subItem.RoyaltyAmount?numeral(subItem.RoyaltyAmount).format('0,0.00'):''}} 营收费用合计： - {{subItem.ReceivableAmount?numeral($util.getMoney(subItem.ReceivableAmount)).format('0,0.00'):''}} + {{subItem.ReceivableAmount?numeral(subItem.ReceivableAmount).format('0,0.00'):''}} 租金： - {{subItem.GuaranteeFee?numeral($util.getMoney(subItem.GuaranteeFee)).format('0,0.00'):''}} + {{subItem.GuaranteeFee?numeral(subItem.GuaranteeFee).format('0,0.00'):''}} 退补款： - {{subItem.RefundSupplement?numeral($util.getMoney(subItem.RefundSupplement)).format('0,0.00'):''}} + {{subItem.RefundSupplement?numeral(subItem.RefundSupplement).format('0,0.00'):''}} @@ -706,40 +706,40 @@ 累计营业额： - {{actuaryData.REVENUEDAILY_AMOUNTTotal?`${$util.getMoney(actuaryData.REVENUEDAILY_AMOUNTTotal)}`:''}} + {{actuaryData.REVENUEDAILY_AMOUNTTotal?`${numeral(actuaryData.REVENUEDAILY_AMOUNTTotal).format('0,0.00')}`:''}} 移动支付： - {{actuaryData.MOBILEPAY_AMOUNT?`${$util.getMoney(actuaryData.MOBILEPAY_AMOUNT)}`:''}} + {{actuaryData.MOBILEPAY_AMOUNT?`${numeral(actuaryData.MOBILEPAY_AMOUNT).format('0,0.00')}`:''}} 移动冲正： - {{actuaryData.MOBILEPAY_CORRECT?`${$util.getMoney(actuaryData.MOBILEPAY_CORRECT)}`:'0'}} + {{actuaryData.MOBILEPAY_CORRECT?`${numeral(actuaryData.MOBILEPAY_CORRECT).format('0,0.00')}`:'0'}} 现金交易： - {{actuaryData.CASHPAY_AMOUNT?`${$util.getMoney(actuaryData.CASHPAY_AMOUNT)}`:''}} + {{actuaryData.CASHPAY_AMOUNT?`${numeral(actuaryData.CASHPAY_AMOUNT).format('0,0.00')}`:''}} 现金冲正： - {{actuaryData.CASHPAY_CORRECT?`${$util.getMoney(actuaryData.CASHPAY_CORRECT)}`:'0'}} + {{actuaryData.CASHPAY_CORRECT?`${numeral(actuaryData.CASHPAY_CORRECT).format('0,0.00')}`:'0'}} 提成金额： - {{actuaryData.GUARANTEERATIOAMOUNT?`${$util.getMoney(actuaryData.GUARANTEERATIOAMOUNT)}`:''}} + {{actuaryData.GUARANTEERATIOAMOUNT?`${numeral(actuaryData.GUARANTEERATIOAMOUNT).format('0,0.00')}`:''}} 提成收入： - {{actuaryData.GUARANTEERATIOINCOME?`${$util.getMoney(actuaryData.GUARANTEERATIOINCOME)}`:''}} + {{actuaryData.GUARANTEERATIOINCOME?`${numeral(actuaryData.GUARANTEERATIOINCOME).format('0,0.00')}`:''}} @@ -762,7 +762,7 @@ 累计营业额： - {{newCalibration.REVENUEDAILY_AMOUNTTotal?`${$util.getMoney(newCalibration.REVENUEDAILY_AMOUNTTotal)}`:''}} + {{newCalibration.REVENUEDAILY_AMOUNTTotal?`${numeral(newCalibration.REVENUEDAILY_AMOUNTTotal).format('0,0.00')}`:''}} @@ -770,34 +770,34 @@ 移动支付： - {{newCalibration.MOBILEPAY_AMOUNT?`${$util.getMoney(newCalibration.MOBILEPAY_AMOUNT + (newCalibration.MOBILEPAY_CORRECT || 0))}` + `${newCalibration.MOBILEPAY_CORRECT?`(${newCalibration.MOBILEPAY_CORRECT>0?'+':''}${newCalibration.MOBILEPAY_CORRECT})`:''}` :''}} + {{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?`${$util.getMoney(newCalibration.MOBILEPAY_CORRECT)}`:'0'}} + {{newCalibration.MOBILEPAY_CORRECT?`${numeral(newCalibration.MOBILEPAY_CORRECT).format('0,0.00')}`:'0'}} 现金交易： - {{newCalibration.CASHPAY_AMOUNT?`${$util.getMoney(newCalibration.CASHPAY_AMOUNT + (newCalibration.CASHPAY_CORRECT || 0))}` + `${newCalibration.CASHPAY_CORRECT?`(${newCalibration.CASHPAY_CORRECT>0?'+':''}${newCalibration.CASHPAY_CORRECT})`:'' }` :''}} + {{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?`${$util.getMoney(newCalibration.CASHPAY_CORRECT)}`:'0'}} + {{newCalibration.CASHPAY_CORRECT?`${numeral(newCalibration.CASHPAY_CORRECT).format('0,0.00')}`:'0'}} 提成金额： - {{newCalibration.GUARANTEERATIOAMOUNT?`${$util.getMoney(newCalibration.GUARANTEERATIOAMOUNT)}`:''}} + {{newCalibration.GUARANTEERATIOAMOUNT?`${numeral(newCalibration.GUARANTEERATIOAMOUNT).format('0,0.00')}`:''}} 提成收入： - {{newCalibration.GUARANTEERATIOINCOME?`${$util.getMoney(newCalibration.GUARANTEERATIOINCOME)}`:''}} + {{newCalibration.GUARANTEERATIOINCOME?`${numeral(newCalibration.GUARANTEERATIOINCOME).format('0,0.00')}`:''}} @@ -1024,14 +1024,14 @@ export default { let bigObj = result.Result_Data.List[0] this.monthId = bigObj.bizpsplitMonthId 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 = 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 = 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) + this.monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT = numeral(this.monthNewCalibration.REVENUEDAILY_AMOUNTTotal).format('0,0.00') + this.monthNewCalibration.CurMonthRevenueTEXT = numeral(this.monthNewCalibration.CurMonthRevenue).format('0,0.00') + this.monthNewCalibration.MOBILEPAY_AMOUNTTEXT = numeral(this.monthNewCalibration.MOBILEPAY_AMOUNT + (this.monthNewCalibration.MOBILEPAY_CORRECT || 0)).format('0,0.00') + this.monthNewCalibration.MOBILEPAY_CORRECTTEXT = numeral(this.monthNewCalibration.MOBILEPAY_CORRECT).format('0,0.00') + this.monthNewCalibration.CASHPAY_AMOUNTTEXT = numeral(this.monthNewCalibration.CASHPAY_AMOUNT + (this.monthNewCalibration.CASHPAY_CORRECT || 0)).format('0,0.00') + this.monthNewCalibration.CASHPAY_CORRECTTEXT = numeral(this.monthNewCalibration.CASHPAY_CORRECT).format('0,0.00') + this.monthNewCalibration.GUARANTEERATIOAMOUNTTEXT = numeral(this.monthNewCalibration.GUARANTEERATIOAMOUNT).format('0,0.00') + this.monthNewCalibration.GUARANTEERATIOINCOMETEXT = numeral(this.monthNewCalibration.GUARANTEERATIOINCOME).format('0,0.00') console.log('this.newCalibration2', this.monthNewCalibration) uni.hideLoading() }, @@ -1060,15 +1060,15 @@ export default { result.forEach(item => { item.level = 1 item.showChildren = false - item.CashAmountTEXT = numeral(this.$util.getMoney(item.CashAmount)).format('0,0.00') - item.MobilePayAmountTEXT = numeral(this.$util.getMoney(item.MobilePayAmount)).format('0,0.00') - item.RevenueAmountTEXT = numeral(this.$util.getMoney(item.RevenueAmount)).format('0,0.00') + item.CashAmountTEXT = numeral(item.CashAmount).format('0,0.00') + item.MobilePayAmountTEXT = numeral(item.MobilePayAmount).format('0,0.00') + item.RevenueAmountTEXT = numeral(item.RevenueAmount).format('0,0.00') // numeral(this.$util.getMoney(item.RevenueAmount)).format('0,0.00') + (item.CorrectAmount ? ('(' + (item.CorrectAmount > 0 ? '+' : '') + item.CorrectAmount + ')') : '') - item.CorrectAmountTEXT = numeral(this.$util.getMoney(item.CorrectAmount)).format('0,0.00') - item.RoyaltyAmountTEXT = numeral(this.$util.getMoney(item.RoyaltyAmount)).format('0,0.00') - item.ReceivableAmountTEXT = numeral(this.$util.getMoney(item.ReceivableAmount)).format('0,0.00') - item.GuaranteeFeeTEXT = numeral(this.$util.getMoney(item.GuaranteeFee)).format('0,0.00') - item.RefundSupplementTEXT = numeral(this.$util.getMoney(item.RefundSupplement)).format('0,0.00') + item.CorrectAmountTEXT = numeral(item.CorrectAmount).format('0,0.00') + item.RoyaltyAmountTEXT = numeral(item.RoyaltyAmount).format('0,0.00') + item.ReceivableAmountTEXT = numeral(item.ReceivableAmount).format('0,0.00') + item.GuaranteeFeeTEXT = numeral(item.GuaranteeFee).format('0,0.00') + item.RefundSupplementTEXT = numeral(item.RefundSupplement).format('0,0.00') item.children = null }) this.yearDataListObj = result[0] @@ -1193,6 +1193,7 @@ export default { ShopRoyaltyId: ShopRoyaltyIdStr, StartMonth: minStartTime ? this.$moment(minStartTime).format('YYYYMM') : '', EndMonth: maxEndTime ? this.$moment(maxEndTime).format('YYYYMM') : '', + userId: this.users.UserId } console.log('monthReq',monthReq) @@ -1541,6 +1542,7 @@ export default { this.nextPersonIndex = '' this.nextPersonLabel = '' this.nextPersonValue = '' + this.isPending = false }, // 1审核 2驳回 handleShowPop(type){ @@ -1729,7 +1731,7 @@ export default { APPLYAPPROVE_NAME: '服务区经营主管', APPLYAPPROVE_DATE:res.BUSINESS_STARTDATE, STAFF_NAME:res.STAFF_NAME, - APPLYAPPROVE_INFO:'', + APPLYAPPROVE_INFO: res.BUSINESSAPPROVAL_DESC }) let list = [] if(res.UserList && res.UserList.length>0){ @@ -2147,7 +2149,7 @@ export default { justify-content: center; .btnItem{ display: inline-block; - padding: 4rpx 8rpx; + padding: 6rpx 24rpx; margin-top: 24rpx; border-radius: 8rpx; background: #1890FF; @@ -2159,7 +2161,7 @@ export default { .uniPopupApplyFor{ width: calc(100vw - 140rpx); - height: 480px; + height: 500px; box-sizing: border-box; padding: 32rpx 0; .uniPopupTop{ @@ -2275,7 +2277,7 @@ export default { justify-content: center; .btnItem{ display: inline-block; - padding: 4rpx 8rpx; + padding: 6rpx 24rpx; margin-top: 24rpx; border-radius: 8rpx; background: #1890FF; @@ -2339,7 +2341,7 @@ export default { justify-content: center; .btnItem{ display: inline-block; - padding: 4rpx 8rpx; + padding: 6rpx 24rpx; margin-top: 24rpx; border-radius: 8rpx; background: #1890FF; diff --git a/pages/settlementApproval/yearSettlement.vue b/pages/settlementApproval/yearSettlement.vue index c49df8d..1cf9014 100644 --- a/pages/settlementApproval/yearSettlement.vue +++ b/pages/settlementApproval/yearSettlement.vue @@ -887,7 +887,6 @@ export default { RevenueconfirmModel: allList } console.log('req',req) - // return const data = await request.$webPost('EShangApiMain/Finance/ApplyAccountProinst', req) if (data.Result_Code === 100) { uni.showToast({ @@ -1035,7 +1034,7 @@ export default { justify-content: center; .btnItem{ display: inline-block; - padding: 4rpx 8rpx; + padding: 6rpx 24rpx; margin-top: 24rpx; border-radius: 8rpx; background: #1890FF; @@ -1164,7 +1163,7 @@ export default { justify-content: center; .btnItem{ display: inline-block; - padding: 4rpx 8rpx; + padding: 6rpx 24rpx; margin-top: 24rpx; border-radius: 8rpx; background: #1890FF;