diff --git a/pages/settlementApproval/detail.vue b/pages/settlementApproval/detail.vue
index d555767..44069f6 100644
--- a/pages/settlementApproval/detail.vue
+++ b/pages/settlementApproval/detail.vue
@@ -5,14 +5,41 @@
{{`${detailObj.SERVERPART_NAME}-${topDetail.SERVERPARTSHOP_NAME || ''}-${$moment(detailObj.ENDDATE).format('YYYYMM')}月度结算表`}}
+
+
+
+ 商家名称：
+ {{topDetail.MERCHANTS_NAME || ''}}
+
+
+
+
+
+ 合同总金额：
+ {{topDetail.RENTFEE ? $util.getMoney(topDetail.RENTFEE / 10000)+'万元':''}}
+
+
+
- 开始时间：
- {{detailObj.STARTDATE || ''}}
+ 税率：
+ {{topDetail.TaxRate ? `${topDetail.TaxRate}%` : '-'}}
- 结束日期：
- {{detailObj.ENDDATE || ''}}
+ 期除税收入：
+ {{topDetail.MINTURNOVER ? `${$util.getMoney(topDetail.MINTURNOVER / 10000)}万元` : ''}}
+
+
+
+
+
+
+ 履约保证金：
+ {{topDetail.SECURITYDEPOSIT ? $util.getMoney(topDetail.SECURITYDEPOSIT / 10000)+'万元':''}}
+
+
+ 提成比例：
+ {{topDetail.GUARANTEERATIO ? `${topDetail.GUARANTEERATIO}%` : '-'}}
@@ -36,36 +63,12 @@
- 履约保证金：
- {{topDetail.SECURITYDEPOSIT ? $util.getMoney(topDetail.SECURITYDEPOSIT / 10000)+'万元':''}}
+ 开始时间：
+ {{detailObj.STARTDATE || ''}}
- 提成比例：
- {{topDetail.GUARANTEERATIO ? `${topDetail.GUARANTEERATIO}%` : '-'}}
-
-
-
-
-
- 税率：
- {{topDetail.TaxRate ? `${topDetail.TaxRate}%` : '-'}}
-
-
- 期除税收入：
- {{topDetail.MINTURNOVER ? `${$util.getMoney(topDetail.MINTURNOVER / 10000)}万元` : ''}}
-
-
-
-
-
- 合同总金额：
- {{topDetail.RENTFEE ? $util.getMoney(topDetail.RENTFEE / 10000)+'万元':''}}
-
-
-
-
- 商家名称：
- {{topDetail.MERCHANTS_NAME || ''}}
+ 结束日期：
+ {{detailObj.ENDDATE || ''}}
@@ -84,10 +87,19 @@
-
+
+ 本月营收：
+ {{actuaryData.CurMonthRevenue?`${$util.getMoney(actuaryData.CurMonthRevenue)}`:''}}
+
+
累计营业额：
{{actuaryData.REVENUEDAILY_AMOUNTTotal?`${$util.getMoney(actuaryData.REVENUEDAILY_AMOUNTTotal)}`:''}}
+
+
+
+
+
@@ -128,15 +140,7 @@
-
-
- 申请人：
- {{progressDetail.STAFF_NAME || ''}}
-
-
- {{progressDetail.BUSINESS_STARTDATE || ''}}
-
-
+
@@ -178,6 +182,15 @@
审批流程
+
+
+ 申请人：
+ {{progressDetail.STAFF_NAME || ''}}
+
+
+ {{progressDetail.BUSINESS_STARTDATE || ''}}
+
+
@@ -410,8 +423,8 @@ export default {
isPending: false,// 接口是否进行中
isShowBtn: false,// 判断是否显示按钮
isShowApplyFor: false,// 发起申请的悬浮框
- MobilePayCorrect: 5,// 移动支付差额
- CashPayCorrect: 6,// 现金支付差额
+ MobilePayCorrect: 0,// 移动支付差额
+ CashPayCorrect: 0,// 现金支付差额
newCalibration: {},// 校准之后的数据
afterCalibration: false,// 是否为校准之后
}
@@ -851,6 +864,23 @@ export default {
transform: translateY(-50%);
}
}
+ .detailTopBox{
+ width: 100%;
+ box-sizing: border-box;
+ //padding: 0 16rpx;
+ display: flex;
+ justify-content: space-between;
+ .leftTop,.rightTop{
+ display: flex;
+ align-items: center;
+ .label{
+ color: #888;
+ }
+ .value{
+ margin-left: 8rpx;
+ }
+ }
+ }
.progressList{
width: 100%;
margin-top: 24rpx;
diff --git a/pages/settlementApproval/index.vue b/pages/settlementApproval/index.vue
index 4214d12..2dfe582 100644
--- a/pages/settlementApproval/index.vue
+++ b/pages/settlementApproval/index.vue
@@ -29,7 +29,7 @@
{{ item.BUSINESSPROJECT_NAME }}
{{ item.SETTLEMENT_STATE===0?'待结算':item.SETTLEMENT_STATE===1?'已结算':item.SETTLEMENT_STATE===2?'审批中':'' }}
-
+
{{ item.SETTLEMENT_TYPE===1?$util.getMoney(item.REVENUE_AMOUNT):item.SETTLEMENT_TYPE===2?$util.getMoney(item.CURREVENUE_AMOUNT):'' }}
{{ item.SETTLEMENT_TYPE===1?'累计营业额':item.SETTLEMENT_TYPE===2?'本月营业额':'' }}