ylj/wechat_yxcl
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-30 19:03:38 +08:00
parent 8b390bdcf4
commit 83cd1645c4
6 changed files with 168 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
common/utils.js
View File

@ -249,6 +249,48 @@ function getMoney(money){
return num; 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'); const EZUIPlayer = require('./ezuikit.js');
@ -266,6 +308,7 @@ export default {
addUserBehavior, addUserBehavior,
addUserBehaviorNew, addUserBehaviorNew,
getMoney, getMoney,
getMoneyTest,
getFieldEnumByField, // 获取枚举参数 getFieldEnumByField, // 获取枚举参数
// calculateDistance, // calculateDistance,
// bMapToQQMap, // bMapToQQMap,

37
pages.json
View File

@ -28,25 +28,30 @@
{ {
"navigationBarTitleText": "驿行畅旅" "navigationBarTitleText": "驿行畅旅"
} }
},
{
"path": "pages/authorityApproval/index",
"style":
{
"navigationBarTitleText": "权限审批",
"enablePullDownRefresh": true
}
},
{
"path": "pages/authorityApproval/detail",
"style":
{
"navigationBarTitleText": "权限审批",
"enablePullDownRefresh": true
}
} }
], ],
"subPackages": [ //分包加载配置 "subPackages": [ //分包加载配置
{
"root": "pages/authorityApproval",
"pages": [
{
"path": "index",
"style":
{
"navigationBarTitleText": "权限审批",
"enablePullDownRefresh": true
}
},
{
"path": "detail",
"style":
{
"navigationBarTitleText": "权限审批",
"enablePullDownRefresh": true
}
}
]
},
{ {
"root": "pages/auditingPop", "root": "pages/auditingPop",
"pages": [ "pages": [

3
pages/register/register.vue
View File

@ -5,7 +5,8 @@
<view v-if="showBtn"> <view v-if="showBtn">
<view class="desc" v-if="!user.WeChat_UserId"> <view class="desc" v-if="!user.WeChat_UserId">
<!-- <view class="desc">申请获取你的公开信息(昵称、头像)</view> --> <!-- <view class="desc">申请获取你的公开信息(昵称、头像)</view> -->
<button type="primary" class="btn" open-type="getUserInfo" @getuserinfo="bindGetUserInfo">微信授权</button> <!-- <button type="primary" class="btn" open-type="getUserInfo" @getuserinfo="bindGetUserInfo">微信授权</button>-->
<button type="primary" class="btn" open-type="getUserInfo" @getuserinfo="bindGetUserInfo">手机号授权</button>
</view> </view>
<view class="desc" v-else> <view class="desc" v-else>
<button type="primary" class="btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">快速登录账号</button> <button type="primary" class="btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">快速登录账号</button>

196
pages/settlementApproval/detail.vue
View File

@ -92,11 +92,11 @@
<view class="rowItemBox"> <view class="rowItemBox">
<view class="rowItem"> <view class="rowItem">
<span class="label">本月营收：</span> <span class="label">本月营收：</span>
<span class="value">{{actuaryData.CurMonthRevenue?`${$util.getMoney(actuaryData.CurMonthRevenue)}`:'-'}}</span> <span class="value">{{actuaryData.CurMonthRevenue?`${numeral(actuaryData.CurMonthRevenue).format('0,0.00')}`:'-'}}</span>
</view> </view>
<view class="rowItem"> <view class="rowItem">
<span class="label">累计营业额：</span> <span class="label">累计营业额：</span>
<span class="value">{{actuaryData.REVENUEDAILY_AMOUNTTotal?`${$util.getMoney(actuaryData.REVENUEDAILY_AMOUNTTotal)}`:'-'}}</span> <span class="value">{{actuaryData.REVENUEDAILY_AMOUNTTotal?`${numeral(actuaryData.REVENUEDAILY_AMOUNTTotal).format('0,0.00')}`:'-'}}</span>
</view> </view>
<!-- <view class="allRowItem">--> <!-- <view class="allRowItem">-->
@ -108,33 +108,33 @@
<view class="rowItemBox"> <view class="rowItemBox">
<view class="rowItem"> <view class="rowItem">
<span class="label">移动支付：</span> <span class="label">移动支付：</span>
<span class="value">{{actuaryData.MOBILEPAY_AMOUNT?`${$util.getMoney(actuaryData.MOBILEPAY_AMOUNT)}`:'-'}}</span> <span class="value">{{actuaryData.MOBILEPAY_AMOUNT?`${numeral(actuaryData.MOBILEPAY_AMOUNT).format('0,0.00')}`:'-'}}</span>
</view> </view>
<view class="rowItem"> <view class="rowItem">
<span class="label">移动冲正：</span> <span class="label">移动冲正：</span>
<span class="value">{{actuaryData.MOBILEPAY_CORRECT?`${$util.getMoney(actuaryData.MOBILEPAY_CORRECT)}`:'-'}}</span> <span class="value">{{actuaryData.MOBILEPAY_CORRECT?`${numeral(actuaryData.MOBILEPAY_CORRECT).format('0,0.00')}`:'-'}}</span>
</view> </view>
</view> </view>
<view class="rowItemBox"> <view class="rowItemBox">
<view class="rowItem"> <view class="rowItem">
<span class="label">现金交易：</span> <span class="label">现金交易：</span>
<span class="value">{{actuaryData.CASHPAY_AMOUNT?`${$util.getMoney(actuaryData.CASHPAY_AMOUNT)}`:'-'}}</span> <span class="value">{{actuaryData.CASHPAY_AMOUNT?`${numeral(actuaryData.CASHPAY_AMOUNT).format('0,0.00')}`:'-'}}</span>
</view> </view>
<view class="rowItem"> <view class="rowItem">
<span class="label">现金冲正：</span> <span class="label">现金冲正：</span>
<span class="value">{{actuaryData.CASHPAY_CORRECT?`${$util.getMoney(actuaryData.CASHPAY_CORRECT)}`:'-'}}</span> <span class="value">{{actuaryData.CASHPAY_CORRECT?`${numeral(actuaryData.CASHPAY_CORRECT).format('0,0.00')}`:'-'}}</span>
</view> </view>
</view> </view>
<view class="rowItemBox"> <view class="rowItemBox">
<view class="rowItem"> <view class="rowItem">
<span class="label">提成金额：</span> <span class="label">提成金额：</span>
<span class="value">{{actuaryData.GUARANTEERATIOAMOUNT?`${$util.getMoney(actuaryData.GUARANTEERATIOAMOUNT)}`:'-'}}</span> <span class="value">{{actuaryData.GUARANTEERATIOAMOUNT?`${numeral(actuaryData.GUARANTEERATIOAMOUNT).format('0,0.00')}`:'-'}}</span>
</view> </view>
<view class="rowItem"> <view class="rowItem">
<span class="label">提成收入：</span> <span class="label">提成收入：</span>
<span class="value">{{actuaryData.GUARANTEERATIOINCOME?`${$util.getMoney(actuaryData.GUARANTEERATIOINCOME)}`:'-'}}</span> <span class="value">{{actuaryData.GUARANTEERATIOINCOME?`${numeral(actuaryData.GUARANTEERATIOINCOME).format('0,0.00')}`:'-'}}</span>
</view> </view>
</view> </view>
</view> </view>
@ -155,19 +155,19 @@
<view class="comparedItem"> <view class="comparedItem">
<view class="compareLabel">本月营收：</view> <view class="compareLabel">本月营收：</view>
<view class="beforeItem">{{actuaryData.CurMonthRevenue?`${$util.getMoney(actuaryData.CurMonthRevenue)}`:'-'}}</view> <view class="beforeItem">{{actuaryData.CurMonthRevenue?`${numeral(actuaryData.CurMonthRevenue).format('0,0.00')}`:'-'}}</view>
<view class="afterItem">{{monthNewCalibration.CurMonthRevenueTEXT?monthNewCalibration.CurMonthRevenueTEXT:'-'}}</view> <view class="afterItem">{{monthNewCalibration.CurMonthRevenueTEXT?monthNewCalibration.CurMonthRevenueTEXT:'-'}}</view>
</view> </view>
<view class="comparedItem"> <view class="comparedItem">
<view class="compareLabel">累计营业额：</view> <view class="compareLabel">累计营业额：</view>
<view class="beforeItem">{{actuaryData.REVENUEDAILY_AMOUNTTotal?`${$util.getMoney(actuaryData.REVENUEDAILY_AMOUNTTotal)}`:'-'}}</view> <view class="beforeItem">{{actuaryData.REVENUEDAILY_AMOUNTTotal?`${numeral(actuaryData.REVENUEDAILY_AMOUNTTotal).format('0,0.00')}`:'-'}}</view>
<view class="afterItem">{{monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT?monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT:'-'}}</view> <view class="afterItem">{{monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT?monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT:'-'}}</view>
</view> </view>
<view class="comparedItem"> <view class="comparedItem">
<view class="compareLabel">移动支付：</view> <view class="compareLabel">移动支付：</view>
<view class="beforeItem">{{actuaryData.MOBILEPAY_AMOUNT?`${$util.getMoney(actuaryData.MOBILEPAY_AMOUNT)}`:'-'}}</view> <view class="beforeItem">{{actuaryData.MOBILEPAY_AMOUNT?`${numeral(actuaryData.MOBILEPAY_AMOUNT).format('0,0.00')}`:'-'}}</view>
<view class="afterItem"> <view class="afterItem">
{{monthNewCalibration.MOBILEPAY_AMOUNTTEXT || ''}} {{monthNewCalibration.MOBILEPAY_AMOUNTTEXT || ''}}
<span v-if="monthNewCalibration.MOBILEPAY_CORRECT" style="color: red">({{monthNewCalibration.MOBILEPAY_CORRECT>0?'+':''}}{{monthNewCalibration.MOBILEPAY_CORRECTTEXT || ''}})</span> <span v-if="monthNewCalibration.MOBILEPAY_CORRECT" style="color: red">({{monthNewCalibration.MOBILEPAY_CORRECT>0?'+':''}}{{monthNewCalibration.MOBILEPAY_CORRECTTEXT || ''}})</span>
@ -176,13 +176,13 @@
<view class="comparedItem"> <view class="comparedItem">
<view class="compareLabel">移动冲正：</view> <view class="compareLabel">移动冲正：</view>
<view class="beforeItem">{{actuaryData.MOBILEPAY_CORRECT?`${$util.getMoney(actuaryData.MOBILEPAY_CORRECT)}`:'-'}}</view> <view class="beforeItem">{{actuaryData.MOBILEPAY_CORRECT?`${numeral(actuaryData.MOBILEPAY_CORRECT).format('0,0.00')}`:'-'}}</view>
<view class="afterItem">{{monthNewCalibration.MOBILEPAY_CORRECTTEXT || ''}}</view> <view class="afterItem">{{monthNewCalibration.MOBILEPAY_CORRECTTEXT || ''}}</view>
</view> </view>
<view class="comparedItem"> <view class="comparedItem">
<view class="compareLabel">现金交易：</view> <view class="compareLabel">现金交易：</view>
<view class="beforeItem">{{actuaryData.CASHPAY_AMOUNT?`${$util.getMoney(actuaryData.CASHPAY_AMOUNT)}`:'-'}}</view> <view class="beforeItem">{{actuaryData.CASHPAY_AMOUNT?`${numeral(actuaryData.CASHPAY_AMOUNT).format('0,0.00')}`:'-'}}</view>
<view class="afterItem"> <view class="afterItem">
{{monthNewCalibration.CASHPAY_AMOUNTTEXT || ''}} {{monthNewCalibration.CASHPAY_AMOUNTTEXT || ''}}
<span v-if="monthNewCalibration.CASHPAY_CORRECT" style="color: red">({{ monthNewCalibration.CASHPAY_CORRECT > 0 ? '+' : '' }}{{ monthNewCalibration.CASHPAY_CORRECTTEXT || '' }})</span> <span v-if="monthNewCalibration.CASHPAY_CORRECT" style="color: red">({{ monthNewCalibration.CASHPAY_CORRECT > 0 ? '+' : '' }}{{ monthNewCalibration.CASHPAY_CORRECTTEXT || '' }})</span>
@ -191,19 +191,19 @@
<view class="comparedItem"> <view class="comparedItem">
<view class="compareLabel">现金冲正：</view> <view class="compareLabel">现金冲正：</view>
<view class="beforeItem">{{actuaryData.CASHPAY_CORRECT?`${$util.getMoney(actuaryData.CASHPAY_CORRECT)}`:'-'}}</view> <view class="beforeItem">{{actuaryData.CASHPAY_CORRECT?`${numeral(actuaryData.CASHPAY_CORRECT).format('0,0.00')}`:'-'}}</view>
<view class="afterItem">{{monthNewCalibration.CASHPAY_CORRECTTEXT || '0'}}</view> <view class="afterItem">{{monthNewCalibration.CASHPAY_CORRECTTEXT || '0'}}</view>
</view> </view>
<view class="comparedItem"> <view class="comparedItem">
<view class="compareLabel">提成金额：</view> <view class="compareLabel">提成金额：</view>
<view class="beforeItem">{{actuaryData.GUARANTEERATIOAMOUNT?`${$util.getMoney(actuaryData.GUARANTEERATIOAMOUNT)}`:'-'}}</view> <view class="beforeItem">{{actuaryData.GUARANTEERATIOAMOUNT?`${numeral(actuaryData.GUARANTEERATIOAMOUNT).format('0,0.00')}`:'-'}}</view>
<view class="afterItem">{{monthNewCalibration.GUARANTEERATIOAMOUNTTEXT || ''}}</view> <view class="afterItem">{{monthNewCalibration.GUARANTEERATIOAMOUNTTEXT || ''}}</view>
</view> </view>
<view class="comparedItem"> <view class="comparedItem">
<view class="compareLabel">提成收入：</view> <view class="compareLabel">提成收入：</view>
<view class="beforeItem">{{actuaryData.GUARANTEERATIOINCOME?`${$util.getMoney(actuaryData.GUARANTEERATIOINCOME)}`:'-'}}</view> <view class="beforeItem">{{actuaryData.GUARANTEERATIOINCOME?`${numeral(actuaryData.GUARANTEERATIOINCOME).format('0,0.00')}`:'-'}}</view>
<view class="afterItem">{{monthNewCalibration.GUARANTEERATIOINCOMETEXT || ''}}</view> <view class="afterItem">{{monthNewCalibration.GUARANTEERATIOINCOMETEXT || ''}}</view>
</view> </view>
</view> </view>
@ -229,39 +229,39 @@
<view class="rowItemBox"> <view class="rowItemBox">
<view class="rowItem"> <view class="rowItem">
<span class="label">现金：</span> <span class="label">现金：</span>
<span class="value">{{item.CashAmount?numeral($util.getMoney(item.CashAmount)).format('0,0.00'):'-'}}</span> <span class="value">{{item.CashAmount?numeral(item.CashAmount).format('0,0.00'):'-'}}</span>
</view> </view>
<view class="rowItem"> <view class="rowItem">
<span class="label">微支付：</span> <span class="label">微支付：</span>
<span class="value">{{item.MobilePayAmount?numeral($util.getMoney(item.MobilePayAmount)).format('0,0.00'):'-'}}</span> <span class="value">{{item.MobilePayAmount?numeral(item.MobilePayAmount).format('0,0.00'):'-'}}</span>
</view> </view>
</view> </view>
<view class="rowItemBox"> <view class="rowItemBox">
<view class="rowItem"> <view class="rowItem">
<span class="label">营业额合计：</span> <span class="label">营业额合计：</span>
<span class="value">{{item.RevenueAmount?numeral($util.getMoney(item.RevenueAmount)).format('0,0.00'):'-'}}</span> <span class="value">{{item.RevenueAmount?numeral(item.RevenueAmount).format('0,0.00'):'-'}}</span>
</view> </view>
<view class="rowItem"> <view class="rowItem">
<span class="label">驿达收款：</span> <span class="label">驿达收款：</span>
<span class="value">{{item.RoyaltyAmount?numeral($util.getMoney(item.RoyaltyAmount)).format('0,0.00'):'-'}}</span> <span class="value">{{item.RoyaltyAmount?numeral(item.RoyaltyAmount).format('0,0.00'):'-'}}</span>
</view> </view>
</view> </view>
<view class="rowItemBox"> <view class="rowItemBox">
<view class="rowItem"> <view class="rowItem">
<span class="label">营收费用合计：</span> <span class="label">营收费用合计：</span>
<span class="value">{{item.ReceivableAmount?numeral($util.getMoney(item.ReceivableAmount)).format('0,0.00'):'-'}}</span> <span class="value">{{item.ReceivableAmount?numeral(item.ReceivableAmount).format('0,0.00'):'-'}}</span>
</view> </view>
<view class="rowItem"> <view class="rowItem">
<span class="label">租金：</span> <span class="label">租金：</span>
<span class="value">{{item.GuaranteeFee?numeral($util.getMoney(item.GuaranteeFee)).format('0,0.00'):'-'}}</span> <span class="value">{{item.GuaranteeFee?numeral(item.GuaranteeFee).format('0,0.00'):'-'}}</span>
</view> </view>
</view> </view>
<view class="rowItemBox"> <view class="rowItemBox">
<view class="rowItem"> <view class="rowItem">
<span class="label">退补款：</span> <span class="label">退补款：</span>
<span class="value">{{item.RefundSupplement?numeral($util.getMoney(item.RefundSupplement)).format('0,0.00'):'-'}}</span> <span class="value">{{item.RefundSupplement?numeral(item.RefundSupplement).format('0,0.00'):'-'}}</span>
</view> </view>
<view class="rowItem"> <view class="rowItem">
<span class="label"></span> <span class="label"></span>
@ -288,7 +288,7 @@
<view class="comparedItem"> <view class="comparedItem">
<view class="compareLabel">营业额合计：</view> <view class="compareLabel">营业额合计：</view>
<view class="beforeItem">{{item.RevenueAmount?numeral($util.getMoney(item.RevenueAmount)).format('0,0.00'):'-'}}</view> <view class="beforeItem">{{item.RevenueAmount?numeral(item.RevenueAmount).format('0,0.00'):'-'}}</view>
<view class="afterItem"> <view class="afterItem">
{{yearDataListObj.RevenueAmountTEXT?yearDataListObj.RevenueAmountTEXT:''}} {{yearDataListObj.RevenueAmountTEXT?yearDataListObj.RevenueAmountTEXT:''}}
<span style="color: red" v-if="yearDataListObj.CorrectAmount">({{yearDataListObj.CorrectAmount>0?'+':''}}{{yearDataListObj.CorrectAmountTEXT || ''}})</span> <span style="color: red" v-if="yearDataListObj.CorrectAmount">({{yearDataListObj.CorrectAmount>0?'+':''}}{{yearDataListObj.CorrectAmountTEXT || ''}})</span>
@ -297,74 +297,74 @@
<view class="comparedItem"> <view class="comparedItem">
<view class="compareLabel" style="padding-left: 16rpx;box-sizing: border-box">现金：</view> <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="beforeItem">{{item.CashAmount?numeral(item.CashAmount).format('0,0.00'):'-'}}</view>
<view class="afterItem">{{yearDataListObj.CashAmount?numeral($util.getMoney(yearDataListObj.CashAmount)).format('0,0.00'):''}}</view> <view class="afterItem">{{yearDataListObj.CashAmount?numeral(yearDataListObj.CashAmount).format('0,0.00'):''}}</view>
</view> </view>
<view class="comparedItem"> <view class="comparedItem">
<view class="compareLabel" style="padding-left: 16rpx;box-sizing: border-box">微支付：</view> <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="beforeItem">{{item.MobilePayAmount?numeral(item.MobilePayAmount).format('0,0.00'):'-'}}</view>
<view class="afterItem">{{yearDataListObj.MobilePayAmount?numeral($util.getMoney(yearDataListObj.MobilePayAmount)).format('0,0.00'):''}}</view> <view class="afterItem">{{yearDataListObj.MobilePayAmount?numeral(yearDataListObj.MobilePayAmount).format('0,0.00'):''}}</view>
</view> </view>
<view class="comparedItem"> <view class="comparedItem">
<view class="compareLabel">驿达收款：</view> <view class="compareLabel">驿达收款：</view>
<view class="beforeItem">{{item.RoyaltyAmount?numeral($util.getMoney(item.RoyaltyAmount)).format('0,0.00'):'-'}}</view> <view class="beforeItem">{{item.RoyaltyAmount?numeral(item.RoyaltyAmount).format('0,0.00'):'-'}}</view>
<view class="afterItem">{{yearDataListObj.RoyaltyAmount?numeral($util.getMoney(yearDataListObj.RoyaltyAmount)).format('0,0.00'):''}}</view> <view class="afterItem">{{yearDataListObj.RoyaltyAmount?numeral(yearDataListObj.RoyaltyAmount).format('0,0.00'):''}}</view>
</view> </view>
<view class="comparedItem"> <view class="comparedItem">
<view class="compareLabel">营收费用合计：</view> <view class="compareLabel">营收费用合计：</view>
<view class="beforeItem">{{item.ReceivableAmount?numeral($util.getMoney(item.ReceivableAmount)).format('0,0.00'):'-'}}</view> <view class="beforeItem">{{item.ReceivableAmount?numeral(item.ReceivableAmount).format('0,0.00'):'-'}}</view>
<view class="afterItem">{{yearDataListObj.ReceivableAmount?numeral($util.getMoney(yearDataListObj.ReceivableAmount)).format('0,0.00'):''}}</view> <view class="afterItem">{{yearDataListObj.ReceivableAmount?numeral(yearDataListObj.ReceivableAmount).format('0,0.00'):''}}</view>
</view> </view>
<view class="comparedItem"> <view class="comparedItem">
<view class="compareLabel" style="padding-left: 16rpx;box-sizing: border-box">租金：</view> <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="beforeItem">{{item.GuaranteeFee || item.GuaranteeFee===0?numeral(item.GuaranteeFee).format('0,0.00'):'-'}}</view>
<view class="afterItem">{{yearDataListObj.GuaranteeFee?numeral($util.getMoney(yearDataListObj.GuaranteeFee)).format('0,0.00'):''}}</view> <view class="afterItem">{{yearDataListObj.GuaranteeFee?numeral(yearDataListObj.GuaranteeFee).format('0,0.00'):''}}</view>
</view> </view>
<view class="comparedItem"> <view class="comparedItem">
<view class="compareLabel" style="padding-left: 16rpx;box-sizing: border-box">物业费：</view> <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="beforeItem">{{item.PropertyFee || item.PropertyFee===0?numeral(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 class="afterItem">{{yearDataListObj.PropertyFee || yearDataListObj.PropertyFee===0?numeral(yearDataListObj.PropertyFee).format('0,0.00'):''}}</view>
</view> </view>
<view class="comparedItem"> <view class="comparedItem">
<view class="compareLabel" style="padding-left: 16rpx;box-sizing: border-box">房租：</view> <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="beforeItem">{{item.HouseRent || item.HouseRent===0?numeral(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 class="afterItem">{{yearDataListObj.HouseRent || yearDataListObj.HouseRent===0?numeral(yearDataListObj.HouseRent).format('0,0.00'):''}}</view>
</view> </view>
<view class="comparedItem"> <view class="comparedItem">
<view class="compareLabel" style="padding-left: 16rpx;box-sizing: border-box">罚款：</view> <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="beforeItem">{{item.BreachPenalty || item.BreachPenalty===0?numeral(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 class="afterItem">{{yearDataListObj.BreachPenalty || yearDataListObj.BreachPenalty===0?numeral(yearDataListObj.BreachPenalty).format('0,0.00'):''}}</view>
</view> </view>
<view class="comparedItem"> <view class="comparedItem">
<view class="compareLabel" style="padding-left: 16rpx;box-sizing: border-box">电费：</view> <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="beforeItem">{{item.ElectricityCharge || item.ElectricityCharge===0?numeral(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 class="afterItem">{{yearDataListObj.ElectricityCharge || yearDataListObj.ElectricityCharge===0?numeral(yearDataListObj.ElectricityCharge).format('0,0.00'):''}}</view>
</view> </view>
<view class="comparedItem"> <view class="comparedItem">
<view class="compareLabel" style="padding-left: 16rpx;box-sizing: border-box">水费：</view> <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="beforeItem">{{item.WaterCharge || item.WaterCharge===0?numeral(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 class="afterItem">{{yearDataListObj.WaterCharge || yearDataListObj.WaterCharge===0?numeral(yearDataListObj.WaterCharge).format('0,0.00'):''}}</view>
</view> </view>
<view class="comparedItem"> <view class="comparedItem">
<view class="compareLabel" style="padding-left: 16rpx;box-sizing: border-box">其他：</view> <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="beforeItem">{{item.OtherFee || item.OtherFee===0?numeral(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 class="afterItem">{{yearDataListObj.OtherFee || yearDataListObj.OtherFee===0?numeral(yearDataListObj.OtherFee).format('0,0.00'):''}}</view>
</view> </view>
<view class="comparedItem"> <view class="comparedItem">
<view class="compareLabel">退补款：</view> <view class="compareLabel">退补款：</view>
<view class="beforeItem">{{item.RefundSupplement?numeral($util.getMoney(item.RefundSupplement)).format('0,0.00'):'-'}}</view> <view class="beforeItem">{{item.RefundSupplement?numeral(item.RefundSupplement).format('0,0.00'):'-'}}</view>
<view class="afterItem">{{yearDataListObj.RefundSupplement?numeral($util.getMoney(yearDataListObj.RefundSupplement)).format('0,0.00'):''}}</view> <view class="afterItem">{{yearDataListObj.RefundSupplement?numeral(yearDataListObj.RefundSupplement).format('0,0.00'):''}}</view>
</view> </view>
</view> </view>
@ -391,39 +391,39 @@
<view class="rowItemBox"> <view class="rowItemBox">
<view class="rowItem"> <view class="rowItem">
<span class="label">现金：</span> <span class="label">现金：</span>
<span class="value">{{subItem.CashAmount?numeral($util.getMoney(subItem.CashAmount)).format('0,0.00'):''}}</span> <span class="value">{{subItem.CashAmount?numeral(subItem.CashAmount).format('0,0.00'):''}}</span>
</view> </view>
<view class="rowItem"> <view class="rowItem">
<span class="label">微支付：</span> <span class="label">微支付：</span>
<span class="value">{{subItem.MobilePayAmount?numeral($util.getMoney(subItem.MobilePayAmount)).format('0,0.00'):''}}</span> <span class="value">{{subItem.MobilePayAmount?numeral(subItem.MobilePayAmount).format('0,0.00'):''}}</span>
</view> </view>
</view> </view>
<view class="rowItemBox"> <view class="rowItemBox">
<view class="rowItem"> <view class="rowItem">
<span class="label">营业额合计：</span> <span class="label">营业额合计：</span>
<span class="value">{{subItem.RevenueAmount?numeral($util.getMoney(subItem.RevenueAmount)).format('0,0.00'):''}}</span> <span class="value">{{subItem.RevenueAmount?numeral(subItem.RevenueAmount).format('0,0.00'):''}}</span>
</view> </view>
<view class="rowItem"> <view class="rowItem">
<span class="label">驿达收款：</span> <span class="label">驿达收款：</span>
<span class="value">{{subItem.RoyaltyAmount?numeral($util.getMoney(subItem.RoyaltyAmount)).format('0,0.00'):''}}</span> <span class="value">{{subItem.RoyaltyAmount?numeral(subItem.RoyaltyAmount).format('0,0.00'):''}}</span>
</view> </view>
</view> </view>
<view class="rowItemBox"> <view class="rowItemBox">
<view class="rowItem"> <view class="rowItem">
<span class="label">营收费用合计：</span> <span class="label">营收费用合计：</span>
<span class="value">{{subItem.ReceivableAmount?numeral($util.getMoney(subItem.ReceivableAmount)).format('0,0.00'):''}}</span> <span class="value">{{subItem.ReceivableAmount?numeral(subItem.ReceivableAmount).format('0,0.00'):''}}</span>
</view> </view>
<view class="rowItem"> <view class="rowItem">
<span class="label">租金：</span> <span class="label">租金：</span>
<span class="value">{{subItem.GuaranteeFee?numeral($util.getMoney(subItem.GuaranteeFee)).format('0,0.00'):''}}</span> <span class="value">{{subItem.GuaranteeFee?numeral(subItem.GuaranteeFee).format('0,0.00'):''}}</span>
</view> </view>
</view> </view>
<view class="rowItemBox"> <view class="rowItemBox">
<view class="rowItem"> <view class="rowItem">
<span class="label">退补款：</span> <span class="label">退补款：</span>
<span class="value">{{subItem.RefundSupplement?numeral($util.getMoney(subItem.RefundSupplement)).format('0,0.00'):''}}</span> <span class="value">{{subItem.RefundSupplement?numeral(subItem.RefundSupplement).format('0,0.00'):''}}</span>
</view> </view>
<view class="rowItem"> <view class="rowItem">
<span class="label"></span> <span class="label"></span>
@ -519,39 +519,39 @@
<view class="rowItemBox"> <view class="rowItemBox">
<view class="rowItem"> <view class="rowItem">
<span class="label">现金：</span> <span class="label">现金：</span>
<span class="value">{{subItem.CashAmount?numeral($util.getMoney(subItem.CashAmount)).format('0,0.00'):''}}</span> <span class="value">{{subItem.CashAmount?numeral(subItem.CashAmount).format('0,0.00'):''}}</span>
</view> </view>
<view class="rowItem"> <view class="rowItem">
<span class="label">微支付：</span> <span class="label">微支付：</span>
<span class="value">{{subItem.MobilePayAmount?numeral($util.getMoney(subItem.MobilePayAmount)).format('0,0.00'):''}}</span> <span class="value">{{subItem.MobilePayAmount?numeral(subItem.MobilePayAmount).format('0,0.00'):''}}</span>
</view> </view>
</view> </view>
<view class="rowItemBox"> <view class="rowItemBox">
<view class="rowItem"> <view class="rowItem">
<span class="label">营业额合计：</span> <span class="label">营业额合计：</span>
<span class="value">{{subItem.RevenueAmount?numeral($util.getMoney(subItem.RevenueAmount)).format('0,0.00'):''}}</span> <span class="value">{{subItem.RevenueAmount?numeral(subItem.RevenueAmount).format('0,0.00'):''}}</span>
</view> </view>
<view class="rowItem"> <view class="rowItem">
<span class="label">驿达收款：</span> <span class="label">驿达收款：</span>
<span class="value">{{subItem.RoyaltyAmount?numeral($util.getMoney(subItem.RoyaltyAmount)).format('0,0.00'):''}}</span> <span class="value">{{subItem.RoyaltyAmount?numeral(subItem.RoyaltyAmount).format('0,0.00'):''}}</span>
</view> </view>
</view> </view>
<view class="rowItemBox"> <view class="rowItemBox">
<view class="rowItem"> <view class="rowItem">
<span class="label">营收费用合计：</span> <span class="label">营收费用合计：</span>
<span class="value">{{subItem.ReceivableAmount?numeral($util.getMoney(subItem.ReceivableAmount)).format('0,0.00'):''}}</span> <span class="value">{{subItem.ReceivableAmount?numeral(subItem.ReceivableAmount).format('0,0.00'):''}}</span>
</view> </view>
<view class="rowItem"> <view class="rowItem">
<span class="label">租金：</span> <span class="label">租金：</span>
<span class="value">{{subItem.GuaranteeFee?numeral($util.getMoney(subItem.GuaranteeFee)).format('0,0.00'):''}}</span> <span class="value">{{subItem.GuaranteeFee?numeral(subItem.GuaranteeFee).format('0,0.00'):''}}</span>
</view> </view>
</view> </view>
<view class="rowItemBox"> <view class="rowItemBox">
<view class="rowItem"> <view class="rowItem">
<span class="label">退补款：</span> <span class="label">退补款：</span>
<span class="value">{{subItem.RefundSupplement?numeral($util.getMoney(subItem.RefundSupplement)).format('0,0.00'):''}}</span> <span class="value">{{subItem.RefundSupplement?numeral(subItem.RefundSupplement).format('0,0.00'):''}}</span>
</view> </view>
<view class="rowItem"> <view class="rowItem">
<span class="label"></span> <span class="label"></span>
@ -706,40 +706,40 @@
<view class="rowItemBox"> <view class="rowItemBox">
<view class="allRowItem"> <view class="allRowItem">
<span class="label">累计营业额：</span> <span class="label">累计营业额：</span>
<span class="value">{{actuaryData.REVENUEDAILY_AMOUNTTotal?`${$util.getMoney(actuaryData.REVENUEDAILY_AMOUNTTotal)}`:''}}</span> <span class="value">{{actuaryData.REVENUEDAILY_AMOUNTTotal?`${numeral(actuaryData.REVENUEDAILY_AMOUNTTotal).format('0,0.00')}`:''}}</span>
</view> </view>
</view> </view>
<view class="rowItemBox"> <view class="rowItemBox">
<view class="rowItem"> <view class="rowItem">
<span class="label">移动支付：</span> <span class="label">移动支付：</span>
<span class="value">{{actuaryData.MOBILEPAY_AMOUNT?`${$util.getMoney(actuaryData.MOBILEPAY_AMOUNT)}`:''}}</span> <span class="value">{{actuaryData.MOBILEPAY_AMOUNT?`${numeral(actuaryData.MOBILEPAY_AMOUNT).format('0,0.00')}`:''}}</span>
</view> </view>
<view class="rowItem"> <view class="rowItem">
<span class="label">移动冲正：</span> <span class="label">移动冲正：</span>
<span class="value">{{actuaryData.MOBILEPAY_CORRECT?`${$util.getMoney(actuaryData.MOBILEPAY_CORRECT)}`:'0'}}</span> <span class="value">{{actuaryData.MOBILEPAY_CORRECT?`${numeral(actuaryData.MOBILEPAY_CORRECT).format('0,0.00')}`:'0'}}</span>
</view> </view>
</view> </view>
<view class="rowItemBox"> <view class="rowItemBox">
<view class="rowItem"> <view class="rowItem">
<span class="label">现金交易：</span> <span class="label">现金交易：</span>
<span class="value">{{actuaryData.CASHPAY_AMOUNT?`${$util.getMoney(actuaryData.CASHPAY_AMOUNT)}`:''}}</span> <span class="value">{{actuaryData.CASHPAY_AMOUNT?`${numeral(actuaryData.CASHPAY_AMOUNT).format('0,0.00')}`:''}}</span>
</view> </view>
<view class="rowItem"> <view class="rowItem">
<span class="label">现金冲正：</span> <span class="label">现金冲正：</span>
<span class="value">{{actuaryData.CASHPAY_CORRECT?`${$util.getMoney(actuaryData.CASHPAY_CORRECT)}`:'0'}}</span> <span class="value">{{actuaryData.CASHPAY_CORRECT?`${numeral(actuaryData.CASHPAY_CORRECT).format('0,0.00')}`:'0'}}</span>
</view> </view>
</view> </view>
<view class="rowItemBox"> <view class="rowItemBox">
<view class="rowItem"> <view class="rowItem">
<span class="label">提成金额：</span> <span class="label">提成金额：</span>
<span class="value">{{actuaryData.GUARANTEERATIOAMOUNT?`${$util.getMoney(actuaryData.GUARANTEERATIOAMOUNT)}`:''}}</span> <span class="value">{{actuaryData.GUARANTEERATIOAMOUNT?`${numeral(actuaryData.GUARANTEERATIOAMOUNT).format('0,0.00')}`:''}}</span>
</view> </view>
<view class="rowItem"> <view class="rowItem">
<span class="label">提成收入：</span> <span class="label">提成收入：</span>
<span class="value">{{actuaryData.GUARANTEERATIOINCOME?`${$util.getMoney(actuaryData.GUARANTEERATIOINCOME)}`:''}}</span> <span class="value">{{actuaryData.GUARANTEERATIOINCOME?`${numeral(actuaryData.GUARANTEERATIOINCOME).format('0,0.00')}`:''}}</span>
</view> </view>
</view> </view>
</view> </view>
@ -762,7 +762,7 @@
<view class="rowItemBox"> <view class="rowItemBox">
<view class="allRowItem"> <view class="allRowItem">
<span class="label">累计营业额：</span> <span class="label">累计营业额：</span>
<span class="value">{{newCalibration.REVENUEDAILY_AMOUNTTotal?`${$util.getMoney(newCalibration.REVENUEDAILY_AMOUNTTotal)}`:''}}</span> <span class="value">{{newCalibration.REVENUEDAILY_AMOUNTTotal?`${numeral(newCalibration.REVENUEDAILY_AMOUNTTotal).format('0,0.00')}`:''}}</span>
</view> </view>
</view> </view>
@ -770,34 +770,34 @@
<view class="rowItemSpecial"> <view class="rowItemSpecial">
<span class="label">移动支付：</span> <span class="label">移动支付：</span>
<span class="value"> <span class="value">
{{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})`:''}` :''}}
</span> </span>
</view> </view>
<view class="rowItemSpecial"> <view class="rowItemSpecial">
<span class="label">移动冲正：</span> <span class="label">移动冲正：</span>
<span class="value">{{newCalibration.MOBILEPAY_CORRECT?`${$util.getMoney(newCalibration.MOBILEPAY_CORRECT)}`:'0'}}</span> <span class="value">{{newCalibration.MOBILEPAY_CORRECT?`${numeral(newCalibration.MOBILEPAY_CORRECT).format('0,0.00')}`:'0'}}</span>
</view> </view>
</view> </view>
<view class="rowItemBox" style="display: flex;justify-content: space-between;align-items: center"> <view class="rowItemBox" style="display: flex;justify-content: space-between;align-items: center">
<view class="rowItemSpecial"> <view class="rowItemSpecial">
<span class="label">现金交易：</span> <span class="label">现金交易：</span>
<span class="value">{{newCalibration.CASHPAY_AMOUNT?`${$util.getMoney(newCalibration.CASHPAY_AMOUNT + (newCalibration.CASHPAY_CORRECT || 0))}` + `${newCalibration.CASHPAY_CORRECT?`(${newCalibration.CASHPAY_CORRECT>0?'+':''}${newCalibration.CASHPAY_CORRECT})`:'' }` :''}}</span> <span class="value">{{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})`:'' }` :''}}</span>
</view> </view>
<view class="rowItemSpecial"> <view class="rowItemSpecial">
<span class="label">现金冲正：</span> <span class="label">现金冲正：</span>
<span class="value">{{newCalibration.CASHPAY_CORRECT?`${$util.getMoney(newCalibration.CASHPAY_CORRECT)}`:'0'}}</span> <span class="value">{{newCalibration.CASHPAY_CORRECT?`${numeral(newCalibration.CASHPAY_CORRECT).format('0,0.00')}`:'0'}}</span>
</view> </view>
</view> </view>
<view class="rowItemBox"> <view class="rowItemBox">
<view class="rowItem"> <view class="rowItem">
<span class="label">提成金额：</span> <span class="label">提成金额：</span>
<span class="value">{{newCalibration.GUARANTEERATIOAMOUNT?`${$util.getMoney(newCalibration.GUARANTEERATIOAMOUNT)}`:''}}</span> <span class="value">{{newCalibration.GUARANTEERATIOAMOUNT?`${numeral(newCalibration.GUARANTEERATIOAMOUNT).format('0,0.00')}`:''}}</span>
</view> </view>
<view class="rowItem"> <view class="rowItem">
<span class="label">提成收入：</span> <span class="label">提成收入：</span>
<span class="value">{{newCalibration.GUARANTEERATIOINCOME?`${$util.getMoney(newCalibration.GUARANTEERATIOINCOME)}`:''}}</span> <span class="value">{{newCalibration.GUARANTEERATIOINCOME?`${numeral(newCalibration.GUARANTEERATIOINCOME).format('0,0.00')}`:''}}</span>
</view> </view>
</view> </view>
</view> </view>
@ -1024,14 +1024,14 @@ export default {
let bigObj = result.Result_Data.List[0] let bigObj = result.Result_Data.List[0]
this.monthId = bigObj.bizpsplitMonthId this.monthId = bigObj.bizpsplitMonthId
this.monthNewCalibration = bigObj this.monthNewCalibration = bigObj
this.monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT = this.$util.getMoney(this.monthNewCalibration.REVENUEDAILY_AMOUNTTotal) this.monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT = numeral(this.monthNewCalibration.REVENUEDAILY_AMOUNTTotal).format('0,0.00')
this.monthNewCalibration.CurMonthRevenueTEXT = this.$util.getMoney(this.monthNewCalibration.CurMonthRevenue) this.monthNewCalibration.CurMonthRevenueTEXT = numeral(this.monthNewCalibration.CurMonthRevenue).format('0,0.00')
this.monthNewCalibration.MOBILEPAY_AMOUNTTEXT = numeral(this.$util.getMoney(this.monthNewCalibration.MOBILEPAY_AMOUNT + (this.monthNewCalibration.MOBILEPAY_CORRECT || 0))).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 = this.$util.getMoney(this.monthNewCalibration.MOBILEPAY_CORRECT) this.monthNewCalibration.MOBILEPAY_CORRECTTEXT = numeral(this.monthNewCalibration.MOBILEPAY_CORRECT).format('0,0.00')
this.monthNewCalibration.CASHPAY_AMOUNTTEXT = numeral(this.$util.getMoney(this.monthNewCalibration.CASHPAY_AMOUNT + (this.monthNewCalibration.CASHPAY_CORRECT || 0))).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 = this.$util.getMoney(this.monthNewCalibration.CASHPAY_CORRECT) this.monthNewCalibration.CASHPAY_CORRECTTEXT = numeral(this.monthNewCalibration.CASHPAY_CORRECT).format('0,0.00')
this.monthNewCalibration.GUARANTEERATIOAMOUNTTEXT = this.$util.getMoney(this.monthNewCalibration.GUARANTEERATIOAMOUNT) this.monthNewCalibration.GUARANTEERATIOAMOUNTTEXT = numeral(this.monthNewCalibration.GUARANTEERATIOAMOUNT).format('0,0.00')
this.monthNewCalibration.GUARANTEERATIOINCOMETEXT = this.$util.getMoney(this.monthNewCalibration.GUARANTEERATIOINCOME) this.monthNewCalibration.GUARANTEERATIOINCOMETEXT = numeral(this.monthNewCalibration.GUARANTEERATIOINCOME).format('0,0.00')
console.log('this.newCalibration2', this.monthNewCalibration) console.log('this.newCalibration2', this.monthNewCalibration)
uni.hideLoading() uni.hideLoading()
}, },
@ -1060,15 +1060,15 @@ export default {
result.forEach(item => { result.forEach(item => {
item.level = 1 item.level = 1
item.showChildren = false item.showChildren = false
item.CashAmountTEXT = numeral(this.$util.getMoney(item.CashAmount)).format('0,0.00') item.CashAmountTEXT = numeral(item.CashAmount).format('0,0.00')
item.MobilePayAmountTEXT = numeral(this.$util.getMoney(item.MobilePayAmount)).format('0,0.00') item.MobilePayAmountTEXT = numeral(item.MobilePayAmount).format('0,0.00')
item.RevenueAmountTEXT = numeral(this.$util.getMoney(item.RevenueAmount)).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 + ')') : '') // 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.CorrectAmountTEXT = numeral(item.CorrectAmount).format('0,0.00')
item.RoyaltyAmountTEXT = numeral(this.$util.getMoney(item.RoyaltyAmount)).format('0,0.00') item.RoyaltyAmountTEXT = numeral(item.RoyaltyAmount).format('0,0.00')
item.ReceivableAmountTEXT = numeral(this.$util.getMoney(item.ReceivableAmount)).format('0,0.00') item.ReceivableAmountTEXT = numeral(item.ReceivableAmount).format('0,0.00')
item.GuaranteeFeeTEXT = numeral(this.$util.getMoney(item.GuaranteeFee)).format('0,0.00') item.GuaranteeFeeTEXT = numeral(item.GuaranteeFee).format('0,0.00')
item.RefundSupplementTEXT = numeral(this.$util.getMoney(item.RefundSupplement)).format('0,0.00') item.RefundSupplementTEXT = numeral(item.RefundSupplement).format('0,0.00')
item.children = null item.children = null
}) })
this.yearDataListObj = result[0] this.yearDataListObj = result[0]
@ -1193,6 +1193,7 @@ export default {
ShopRoyaltyId: ShopRoyaltyIdStr, ShopRoyaltyId: ShopRoyaltyIdStr,
StartMonth: minStartTime ? this.$moment(minStartTime).format('YYYYMM') : '', StartMonth: minStartTime ? this.$moment(minStartTime).format('YYYYMM') : '',
EndMonth: maxEndTime ? this.$moment(maxEndTime).format('YYYYMM') : '', EndMonth: maxEndTime ? this.$moment(maxEndTime).format('YYYYMM') : '',
userId: this.users.UserId
} }
console.log('monthReq',monthReq) console.log('monthReq',monthReq)
@ -1541,6 +1542,7 @@ export default {
this.nextPersonIndex = '' this.nextPersonIndex = ''
this.nextPersonLabel = '' this.nextPersonLabel = ''
this.nextPersonValue = '' this.nextPersonValue = ''
this.isPending = false
}, },
// 1审核 2驳回 // 1审核 2驳回
handleShowPop(type){ handleShowPop(type){
@ -1729,7 +1731,7 @@ export default {
APPLYAPPROVE_NAME: '服务区经营主管', APPLYAPPROVE_NAME: '服务区经营主管',
APPLYAPPROVE_DATE:res.BUSINESS_STARTDATE, APPLYAPPROVE_DATE:res.BUSINESS_STARTDATE,
STAFF_NAME:res.STAFF_NAME, STAFF_NAME:res.STAFF_NAME,
APPLYAPPROVE_INFO:'', APPLYAPPROVE_INFO: res.BUSINESSAPPROVAL_DESC
}) })
let list = [] let list = []
if(res.UserList && res.UserList.length>0){ if(res.UserList && res.UserList.length>0){
@ -2147,7 +2149,7 @@ export default {
justify-content: center; justify-content: center;
.btnItem{ .btnItem{
display: inline-block; display: inline-block;
padding: 4rpx 8rpx; padding: 6rpx 24rpx;
margin-top: 24rpx; margin-top: 24rpx;
border-radius: 8rpx; border-radius: 8rpx;
background: #1890FF; background: #1890FF;
@ -2159,7 +2161,7 @@ export default {
.uniPopupApplyFor{ .uniPopupApplyFor{
width: calc(100vw - 140rpx); width: calc(100vw - 140rpx);
height: 480px; height: 500px;
box-sizing: border-box; box-sizing: border-box;
padding: 32rpx 0; padding: 32rpx 0;
.uniPopupTop{ .uniPopupTop{
@ -2275,7 +2277,7 @@ export default {
justify-content: center; justify-content: center;
.btnItem{ .btnItem{
display: inline-block; display: inline-block;
padding: 4rpx 8rpx; padding: 6rpx 24rpx;
margin-top: 24rpx; margin-top: 24rpx;
border-radius: 8rpx; border-radius: 8rpx;
background: #1890FF; background: #1890FF;
@ -2339,7 +2341,7 @@ export default {
justify-content: center; justify-content: center;
.btnItem{ .btnItem{
display: inline-block; display: inline-block;
padding: 4rpx 8rpx; padding: 6rpx 24rpx;
margin-top: 24rpx; margin-top: 24rpx;
border-radius: 8rpx; border-radius: 8rpx;
background: #1890FF; background: #1890FF;

5
pages/settlementApproval/yearSettlement.vue
View File

@ -887,7 +887,6 @@ export default {
RevenueconfirmModel: allList RevenueconfirmModel: allList
} }
console.log('req',req) console.log('req',req)
// return
const data = await request.$webPost('EShangApiMain/Finance/ApplyAccountProinst', req) const data = await request.$webPost('EShangApiMain/Finance/ApplyAccountProinst', req)
if (data.Result_Code === 100) { if (data.Result_Code === 100) {
uni.showToast({ uni.showToast({
@ -1035,7 +1034,7 @@ export default {
justify-content: center; justify-content: center;
.btnItem{ .btnItem{
display: inline-block; display: inline-block;
padding: 4rpx 8rpx; padding: 6rpx 24rpx;
margin-top: 24rpx; margin-top: 24rpx;
border-radius: 8rpx; border-radius: 8rpx;
background: #1890FF; background: #1890FF;
@ -1164,7 +1163,7 @@ export default {
justify-content: center; justify-content: center;
.btnItem{ .btnItem{
display: inline-block; display: inline-block;
padding: 4rpx 8rpx; padding: 6rpx 24rpx;
margin-top: 24rpx; margin-top: 24rpx;
border-radius: 8rpx; border-radius: 8rpx;
background: #1890FF; background: #1890FF;