diff --git a/pages.json b/pages.json
index 1abd2de..9795d6c 100644
--- a/pages.json
+++ b/pages.json
@@ -92,7 +92,6 @@
"path": "index",
"style":
{
- "enablePullDownRefresh": true,
"navigationStyle": "custom"
}
},
@@ -100,6 +99,7 @@
"path": "detail",
"style":
{
+ "navigationStyle": "custom",
"navigationBarTitleText": "结算审批"
}
},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1c04b98..7efa537 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -224,10 +224,10 @@
icon: 'none'
})
}
- },
+ },
toPage(item) {
console.log('item',item)
- let _this = this
+ let _this = this
if (!this.user.Membership_Phone) {
uni.showModal({
diff --git a/pages/settlementApproval/detail.vue b/pages/settlementApproval/detail.vue
index 0a95868..bb91e2d 100644
--- a/pages/settlementApproval/detail.vue
+++ b/pages/settlementApproval/detail.vue
@@ -1,6 +1,323 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.PeriodIndexStr ||''}}
+ {{item.StartDate || ''}} 至 {{item.EndDate || ''}}
+
+
+
+
+ 营业额
+
+
+ {{item.RevenueAmount?numeral(item.RevenueAmount).format('0,0.00'):'-'}}
+ 合计
+
+
+ {{item.CashAmount?numeral(item.CashAmount).format('0,0.00'):'-'}}
+ 现金
+
+
+ {{item.MobilePayAmount?numeral(item.MobilePayAmount).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.StartDate || ''}} 至 {{item.EndDate || ''}}
+
+
+
+
+
+
+ 退补款
+
+ {{item.RefundSupplement?numeral(item.RefundSupplement).format('0,0.00'):'-'}}
+
+ {{yearDataListObj.RefundSupplement?numeral(yearDataListObj.RefundSupplement).format('0,0.00'):''}}
+
+
+
+ 营业额合计
+
+ {{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'):''}}
+
+
+
+
+
+
+
+
+ 审批流程
+
+
+
+ 待审核：
+ {{progressDetail.APPOVED_NAME || ''}}
+
+
+
+
+
+
+
+
+ {{item.STAFF_NAME.slice(1,3)}}
+
+
+
+
+
+
+ {{`【${item.APPLYAPPROVE_NAME}】`}}
+ {{`${item.APPLYAPPROVE_DATE}`}}
+
+
+ {{item.STAFF_NAME}}:{{`${item.APPLYAPPROVE_INFO}`}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 发起审批
+
+
+
+
+
{{
detailObj.SETTLEMENT_TYPE===1?`${detailObj.SERVERPART_NAME}-${topDetail.SERVERPARTSHOP_NAME || ''}年度结算表`:
@@ -76,8 +393,8 @@
-
-
+
+
结算数据
@@ -99,10 +416,10 @@
{{actuaryData.REVENUEDAILY_AMOUNTTotal?`${numeral(actuaryData.REVENUEDAILY_AMOUNTTotal).format('0,0.00')}`:'-'}}
-
-
-
-
+
+
+
+
@@ -139,7 +456,7 @@
-
+
@@ -439,8 +756,8 @@
-
-
+
+
精算数据
@@ -568,21 +885,21 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -607,7 +924,7 @@
-
+
审批流程
@@ -647,7 +964,7 @@
-
+
-
+
-
+
+
+
@@ -917,9 +1236,14 @@ export default {
monthId:'', // 月份审批二次进入发起申请的时候带的唯一id
monthNewCalibration:{},// 月度精算过后 详情进入查看的值
yearId:'',// 年度审批二次进入发起申请的时候带的id
+ menu:{},
+ settlementModes:{},// 结算模式的枚举对象
}
},
async onLoad(query){
+ this.menu = uni.getMenuButtonBoundingClientRect()
+ console.log('this.menu',this.menu)
+ this.handleGetSETTLEMENTMODES()
console.log('query',query)
if (query.id) {
this.isPush = true
@@ -986,6 +1310,24 @@ export default {
methods:{
numeral,
+ // 拿到结算模式的枚举
+ async handleGetSETTLEMENTMODES(){
+ const req = { FieldExplainField: 'SETTLEMENT_MODES' }
+ const result = await request.$webGet('EShangApiMain/FrameWork/GetFieldEnumByField',req)
+ console.log('result',result)
+ let res = result.Result_Data.List
+ let obj = {}
+ if(res && res.length>0){
+ res.forEach(item=>{
+ obj[item.value] = item.label
+ })
+ }
+ this.settlementModes = obj
+ },
+ // 返回按钮
+ handleBack(){
+ this.$util.toNextRoute('navigateBack',{ delta: 1})
+ },
// 跳转月度详情页面
handleToMonth(obj) {
console.log('obj', obj)
@@ -1762,6 +2104,795 @@ export default {