From 123acdb8c93278385637e2a7e6f5aec32ae16cc9 Mon Sep 17 00:00:00 2001 From: cclu <1106109051@qq.com> Date: Tue, 23 Jul 2024 20:14:38 +0800 Subject: [PATCH] update --- pages/settlementApproval/detail.vue | 341 ++++++++++++++++++++++++++-- pages/settlementApproval/index.vue | 56 ++++- 2 files changed, 380 insertions(+), 17 deletions(-) diff --git a/pages/settlementApproval/detail.vue b/pages/settlementApproval/detail.vue index 44069f6..69fe378 100644 --- a/pages/settlementApproval/detail.vue +++ b/pages/settlementApproval/detail.vue @@ -2,7 +2,10 @@ - {{`${detailObj.SERVERPART_NAME}-${topDetail.SERVERPARTSHOP_NAME || ''}-${$moment(detailObj.ENDDATE).format('YYYYMM')}月度结算表`}} + {{ + detailObj.SETTLEMENT_TYPE===1?`${detailObj.SERVERPART_NAME}-${topDetail.SERVERPARTSHOP_NAME || ''}年度结算表`: + `${detailObj.SERVERPART_NAME}-${topDetail.SERVERPARTSHOP_NAME || ''}-${$moment(detailObj.ENDDATE).format('YYYYMM')}月度结算表` + }} @@ -328,25 +331,27 @@ - - + + 移动支付: - {{newCalibration.MOBILEPAY_AMOUNT?`${$util.getMoney(newCalibration.MOBILEPAY_AMOUNT + (newCalibration.MOBILEPAY_CORRECT || 0))}`:''}} + + {{newCalibration.MOBILEPAY_AMOUNT?`${$util.getMoney(newCalibration.MOBILEPAY_AMOUNT + (newCalibration.MOBILEPAY_CORRECT || 0))}` + `${newCalibration.MOBILEPAY_CORRECT?`(${newCalibration.MOBILEPAY_CORRECT>0?'+':''}${newCalibration.MOBILEPAY_CORRECT})`:''}` :''}} + - + 移动冲正: - {{newCalibration.MobilePayCorrect?`${$util.getMoney(newCalibration.MobilePayCorrect)}`:'0'}} + {{newCalibration.MOBILEPAY_CORRECT?`${$util.getMoney(newCalibration.MOBILEPAY_CORRECT)}`:'0'}} - - + + 现金交易: - {{newCalibration.CASHPAY_AMOUNT?`${$util.getMoney(newCalibration.CASHPAY_AMOUNT + (newCalibration.CASHPAY_CORRECT || 0))}`:''}} + {{newCalibration.CASHPAY_AMOUNT?`${$util.getMoney(newCalibration.CASHPAY_AMOUNT + (newCalibration.CASHPAY_CORRECT || 0))}` + `${newCalibration.CASHPAY_CORRECT?`(${newCalibration.CASHPAY_CORRECT>0?'+':''}${newCalibration.CASHPAY_CORRECT})`:'' }` :''}} - + 现金冲正: - {{newCalibration.CashPayCorrect?`${$util.getMoney(newCalibration.CashPayCorrect)}`:'0'}} + {{newCalibration.CASHPAY_CORRECT?`${$util.getMoney(newCalibration.CASHPAY_CORRECT)}`:'0'}} @@ -380,17 +385,48 @@ 重新校准 - 发起申请 + 发起申请 + + + + + + + + + + + + 请选择下一阶段审批人 + + {{nextPersonValue? showLabel:'--请选择--'}} + + + + + 审核意见 + +