This commit is contained in:
cclu 2024-08-07 18:46:25 +08:00
parent c14e7137f7
commit 0a79e916a9
10 changed files with 1010 additions and 252 deletions

View File

@ -114,6 +114,7 @@
"path": "yearSettlement",
"style":
{
"navigationStyle": "custom",
"navigationBarTitleText": "年度结算"
}
},
@ -124,6 +125,13 @@
"navigationStyle": "custom",
"navigationBarTitleText": "月度详情"
}
},
{
"path": "dailyList",
"style":
{
"navigationBarTitleText": "日结冲正明细"
}
}
]
},

View File

@ -0,0 +1,151 @@
<template>
<view class="main">
<view class="listBox">
<view class="listItem" v-for="(item,index) in dataList" :key="index">
<view class="itemLeft">
<view class="leftTop">
<view class="icon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/personIcon.png"></view>
</view>
<view class="line" v-if="index!==dataList.length - 1"></view>
</view>
<view class="itemRight">
<view class="itemTop">
<span class="itemTime">{{item.StatisticsDate || ''}}</span>
<span class="value">{{item.CorrectAmount || ''}}</span>
</view>
<view class="personBox">
<image class="personIcon"/>
<span class="personText">{{item.CorrectStaff || ''}}</span>
</view>
<view class="descBox">{{item.CorrectDesc || ''}}</view>
</view>
</view>
</view>
</view>
</template>
<script>
export default {
name: "dailyList",
data() {
return {
dataList:[]
}
},
onLoad(query){
if(query.res){
this.dataList = JSON.parse(query.res)
}
console.log('this.dataList',this.dataList)
}
}
</script>
<style scoped lang="scss">
.main{
width: 100%;
min-height: 100vh;
background-color: #F3F3F3;
box-sizing: border-box;
padding: 24rpx 32rpx;
.listBox{
width: 100%;
box-sizing: border-box;
background: #FFFFFF;
border-radius: 16rpx;
background: linear-gradient( 180deg, #FFF7F2 0%, #FFFFFF 10%);
padding: 40rpx 0;
.listItem{
width: 100%;
box-sizing: border-box;
padding: 0 24rpx;
display: flex;
align-items: flex-start;
.itemLeft{
margin-right: 16rpx;
height: 100%;
line-height: 0;
.leftTop{
width: 16rpx;
height: 20px;
line-height: 40rpx;
.icon{
display: inline-block;
width: 16rpx;
height: 16rpx;
border-radius: 50%;
background: #CC9E8C;
margin-right: 16rpx;
}
}
.line{
width: 4rpx;
min-height: 224rpx;
background: #F3EAE7;
margin: 4rpx 0;
margin-left: 6rpx;
}
}
.itemRight{
flex: 1;
margin-bottom: 40rpx;
.itemTop{
display: flex;
align-items: center;
justify-content: space-between;
.itemTime{
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 28rpx;
color: #160002;
line-height: 40rpx;
text-align: left;
font-style: normal;
}
.value{
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 28rpx;
color: #9A3D1A;
line-height: 40rpx;
text-align: center;
font-style: normal;
}
}
.personBox{
display: flex;
align-items: center;
.personIcon{
width: 32rpx;
height: 32rpx;
}
.personText{
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 28rpx;
color: #786B6C;
line-height: 40rpx;
text-align: left;
font-style: normal;
}
}
.descBox{
background: #F7F8FA;
border-radius: 8rpx;
display: inline-block;
box-sizing: border-box;
width: 100%;
padding: 16rpx 24rpx;
margin-top: 16rpx;
}
}
}
}
}
</style>

View File

@ -6,7 +6,7 @@
<image @click="handleBack" class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/navigation-left.svg"/>
<view class="selectServiceBox">
<image class="serviceIcon" src="/static/images/settlementApproval/serviceIcon.png"/>
<image class="serviceIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/serviceIcon.png"/>
<view class="nameBox">
<span class="service">{{ detailObj.SERVERPART_NAME}}</span>
<image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"/>
@ -64,11 +64,11 @@
</view>
</view>
<view class="stateBox" v-if="detailObj.Approvalstate!==9" :style="{top: menu.bottom + 18 + 'px'}">
<image class="stateIcon" :src="detailObj.Approvalstate===0?'/static/images/settlementApproval/stateIcon.png':detailObj.Approvalstate===1?'/static/images/settlementApproval/pendIcon.png':''"/>
<image class="stateIcon" :src="detailObj.Approvalstate===0?'https://eshangtech.com/ShopICO/yxcl/settlementApproval/stateIcon.png':detailObj.Approvalstate===1?'https://eshangtech.com/ShopICO/yxcl/settlementApproval/pendIcon.png':''"/>
<span class="stateText">{{detailObj.Approvalstate===0?'待结算':detailObj.Approvalstate===1?'审核中':''}}</span>
</view>
<view class="overBox" :style="{top: menu.bottom + 33 + 'px'}" v-else>
<image class="overIcon" src="/static/images/settlementApproval/isPassIcon.png"/>
<image class="overIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/isPassIcon.png"/>
</view>
</view>
</view>
@ -80,7 +80,7 @@
<view class="renovationContent">
<view class="renovationTop">
<view class="topLeft">
<image class="renovationIcon" src="/static/images/settlementApproval/renovationIcon.png"/>
<image class="renovationIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/renovationIcon.png"/>
</view>
<view class="topRight">
<view class="contentTitle">{{item.PeriodIndexStr ||''}}</view>
@ -136,12 +136,12 @@
</view>
</view>
<view class="stateBox" v-if="detailObj.Approvalstate!==9">
<image class="stateIcon" :src="detailObj.Approvalstate===0?'/static/images/settlementApproval/stateIcon.png':detailObj.Approvalstate===1?'/static/images/settlementApproval/pendIcon.png':''"/>
<view class="stateBox" v-if="detailObj.Approvalstate!==9 && (index ===yearDataList.length-1)">
<image class="stateIcon" :src="detailObj.Approvalstate===0 ?'https://eshangtech.com/ShopICO/yxcl/settlementApproval/stateIcon.png':detailObj.Approvalstate===1?'https://eshangtech.com/ShopICO/yxcl/settlementApproval/pendIcon.png':''"/>
<span class="stateText">{{detailObj.Approvalstate===0?'待结算':detailObj.Approvalstate===1?'审核中':''}}</span>
</view>
<view class="overBox" v-else>
<image class="overIcon" src="/static/images/settlementApproval/isPassIcon.png"/>
<view class="overBox" v-if="detailObj.Approvalstate ===9 && (index ===yearDataList.length-1)">
<image class="overIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/isPassIcon.png"/>
</view>
</view>
@ -156,7 +156,7 @@
</view>
</view>
<view class="detailBoxTime">
<image class="timeIcon" src="/static/images/settlementApproval/timeIcon.png"/>
<image class="timeIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/timeIcon.png"/>
<view class="endTime">结算时间{{item.StartDate || ''}} {{item.EndDate || ''}}</view>
</view>
@ -165,12 +165,12 @@
<view class="firstTableTitle">数据类型</view>
<view class="borderRight"></view>
<view class="otherTableTitle">
<image class="dataIcon" src="/static/images/settlementApproval/settlementIcon.png"/>
<!-- <image class="dataIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/settlementIcon.png"/>-->
结算数据
</view>
<view class="borderRight"></view>
<view class="otherTableTitle">
<image class="dataIcon" src="/static/images/settlementApproval/successData.png"/>
<!-- <image class="dataIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/successData.png"/>-->
精算数据
</view>
</view>
@ -298,7 +298,7 @@
</view>
<view class="detailBoxTime">
<image class="timeIcon" src="/static/images/settlementApproval/timeIcon.png"/>
<image class="timeIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/timeIcon.png"/>
<view class="endTime">结算时间{{detailObj.SETTLEMENT_DATE || ''}}</view>
</view>
@ -307,12 +307,12 @@
<view class="firstTableTitle">数据类型</view>
<view class="borderRight"></view>
<view class="otherTableTitle">
<image class="dataIcon" src="/static/images/settlementApproval/settlementIcon.png"/>
<!-- <image class="dataIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/settlementIcon.png"/>-->
结算数据
</view>
<view class="borderRight"></view>
<view class="otherTableTitle">
<image class="dataIcon" src="/static/images/settlementApproval/successData.png"/>
<!-- <image class="dataIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/successData.png"/>-->
精算数据
</view>
</view>
@ -340,7 +340,7 @@
<view class="valueRow">{{actuaryData.MOBILEPAY_AMOUNT?`${$util.getMoney(actuaryData.MOBILEPAY_AMOUNT)}`:'-'}}</view>
<view class="borderRight"></view>
<view class="valueRow">{{monthNewCalibration.MOBILEPAY_AMOUNTTEXT || ''}}
<span v-if="monthNewCalibration.MOBILEPAY_CORRECT" style="color: red">({{monthNewCalibration.MOBILEPAY_CORRECT>0?'+':''}}{{monthNewCalibration.MOBILEPAY_CORRECTTEXT || ''}})</span></view>
<view v-if="monthNewCalibration.MOBILEPAY_CORRECT" style="color: red">({{monthNewCalibration.MOBILEPAY_CORRECT>0?'+':''}}{{monthNewCalibration.MOBILEPAY_CORRECTTEXT || ''}})</view></view>
</view>
<view class="tableRow">
@ -358,7 +358,7 @@
<view class="borderRight"></view>
<view class="valueRow">
{{monthNewCalibration.CASHPAY_AMOUNTTEXT || ''}}
<span v-if="monthNewCalibration.CASHPAY_CORRECT" style="color: red">({{ monthNewCalibration.CASHPAY_CORRECT > 0 ? '+' : '' }}{{ monthNewCalibration.CASHPAY_CORRECTTEXT || '' }})</span>
<view v-if="monthNewCalibration.CASHPAY_CORRECT" style="color: red">({{ monthNewCalibration.CASHPAY_CORRECT > 0 ? '+' : '' }}{{ monthNewCalibration.CASHPAY_CORRECTTEXT || '' }})</view>
</view>
</view>
@ -393,7 +393,7 @@
<!-- 经营商户应交费用明细表-->
<view class="payableFeesBoxTitle">经营商户应交费用明细表</view>
<view class="detailBoxTime">
<image class="timeIcon" src="/static/images/settlementApproval/timeIcon.png"/>
<image class="timeIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/timeIcon.png"/>
<view class="endTime">结算时间{{detailObj.SETTLEMENT_DATE || ''}}</view>
</view>
<view class="table">
@ -401,12 +401,12 @@
<view class="firstTableTitle">数据类型</view>
<view class="borderRight"></view>
<view class="otherTableTitle">
<image class="dataIcon" src="/static/images/settlementApproval/settlementIcon.png"/>
<!-- <image class="dataIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/settlementIcon.png"/>-->
应缴费用
</view>
<view class="borderRight"></view>
<view class="otherTableTitle">
<image class="dataIcon" src="/static/images/settlementApproval/successData.png"/>
<!-- <image class="dataIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/successData.png"/>-->
已缴费用
</view>
</view>
@ -480,8 +480,8 @@
<view class="itemLeft">
<view class="nameIcon">
<span class="name" v-if="item.STAFF_NAME.length===3">{{item.STAFF_NAME.slice(1,3)}}</span>
<image v-else class="defaultPerson" src="/static/images/settlementApproval/defaultPersonIcon.png"/>
<image class="successIcon" :src="item.APPLYAPPROVE_TYPE===3000?'/static/images/settlementApproval/errorIcon.png':'/static/images/settlementApproval/passIcon.png'"/>
<image v-else class="defaultPerson" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/defaultPersonIcon.png"/>
<image class="successIcon" :src="item.APPLYAPPROVE_TYPE===3000?'https://eshangtech.com/ShopICO/yxcl/settlementApproval/errorIcon.png':'https://eshangtech.com/ShopICO/yxcl/settlementApproval/passIcon.png'"/>
</view>
</view>
<view class="itemRight">
@ -509,7 +509,7 @@
<view class="createBtn" v-if="detailObj.Approvalstate===0 || (detailObj.Approvalstate>0 && progressDetail.BUSINESSAPPROVAL_STATE===1000)" @click="handleShowApplyForPop">发起审批</view>
<view class="threeBtnBox">
<!-- <view class="goRight" v-if="progressDetail.BUSINESSAPPROVAL_STATE!==1000">-->
<!-- <image class="goRightIcon" src="/static/images/settlementApproval/goRightIcon.png"/>-->
<!-- <image class="goRightIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/goRightIcon.png"/>-->
<!-- <span class="goRightText">冲正</span>-->
<!-- </view>-->
<view class="rejectBtn" v-if="detailObj.Approvalstate>0 && progressDetail.BUSINESSAPPROVAL_STATE!==9000 && isShowBtn && !detailObj.APPLY_PROCCESS" @click="handleShowPop(2)">驳回</view>
@ -561,7 +561,7 @@
</view>
<view class="detailBoxTime">
<image class="timeIcon" src="/static/images/settlementApproval/timeIcon.png"/>
<image class="timeIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/timeIcon.png"/>
<view class="endTime">结算时间{{detailObj.STARTDATE || ''}} {{detailObj.ENDDATE || ''}}</view>
</view>
@ -570,12 +570,12 @@
<view class="firstTableTitle">数据类型</view>
<view class="borderRight"></view>
<view class="otherTableTitle">
<!-- <image class="dataIcon" src="/static/images/settlementApproval/settlementIcon.png"/>-->
<!-- <image class="dataIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/settlementIcon.png"/>-->
结算数据
</view>
<view class="borderRight"></view>
<view class="otherTableTitle">
<!-- <image class="dataIcon" src="/static/images/settlementApproval/successData.png"/>-->
<!-- <image class="dataIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/successData.png"/>-->
精算数据
</view>
</view>
@ -749,6 +749,7 @@ export default {
afterCalibration: false,//
lastMonthIsOver: false,//
LastSettlementMonth: '',//
LastSettlementMonthText: '',//
isShowSelect: false,//
yearDataList:[],//
isAllMonthSuccess: true,//
@ -806,8 +807,11 @@ export default {
//
await this.handleGetProgress()
//
await this.handleGetProjectExpenseList()
if(this.detailObj.SETTLEMENT_TYPE!==1){
//
await this.handleGetProjectExpenseList()
}
},
onUnload(){
@ -818,6 +822,7 @@ export default {
this.topDetail = {}
this.actuaryData = {}
this.yearDataListObj = {}
this.ExpenseObj = {}
this.newCalibration = {}
this.progressDetail = {}
this.nextPerson = []
@ -829,6 +834,7 @@ export default {
this.progressList = []
this.afterCalibration = false
this.monthId = ''
this.isAllMonthSuccess = true
this.closePop()
this.closeApplyFor()
@ -842,16 +848,22 @@ export default {
numeral,
//
async handleGetProjectExpenseList(){
console.log('this.detailObj.SETTLEMENT_DATE',this.detailObj.SETTLEMENT_DATE)
uni.showLoading({
title: '请求应交费用数据...'
})
if(this.detailObj.Approvalstate===9){
let req = {
BusinessProjectId: this.detailObj.BUSINESSPROJECT_ID,
ShopRoyaltyId: this.detailObj.SHOPROYALTY_ID,SETTLEMENT_DATE,
StartMonth: this.detailObj.SETTLEMENT_DATE ? this.$moment(this.detailObj.SETTLEMENT_DATE).format('YYYYMM') : '',
EndMonth: this.detailObj.SETTLEMENT_DATE ? this.$moment(this.detailObj.SETTLEMENT_DATE).format('YYYYMM') : '',
ShopRoyaltyId: this.detailObj.SHOPROYALTY_ID,
StartMonth: this.detailObj.SETTLEMENT_DATE ? this.$moment(this.detailObj.SETTLEMENT_DATE + (this.detailObj.SETTLEMENT_TYPE===1?'':'/01')).format('YYYYMM') : '',
EndMonth: this.detailObj.SETTLEMENT_DATE ? this.$moment(this.detailObj.SETTLEMENT_DATE + (this.detailObj.SETTLEMENT_TYPE===1?'':'/01')).format('YYYYMM') : '',
}
const data = await request.$webGet('EShangApiMain/Finance/GetProjectExpenseList',req)
console.log('handleGetProjectExpenseList',data)
uni.hideLoading()
this.ExpenseObj = data.Result_Data.List[0]
console.log('this.ExpenseObj',this.ExpenseObj)
}else{
@ -866,12 +878,14 @@ export default {
}
let req = {
serverpartshop_id: min===999999999?'':min,
statistics_month_start: this.detailObj.SETTLEMENT_DATE ? this.$moment(this.detailObj.SETTLEMENT_DATE).startOf('months').format('YYYY/MM/DD') :'',
statistics_month_end: this.detailObj.SETTLEMENT_DATE ? this.$moment(this.detailObj.SETTLEMENT_DATE).endOf('months').format('YYYY/MM/DD') :'',
statistics_month_start: this.detailObj.SETTLEMENT_DATE ? this.$moment(this.detailObj.SETTLEMENT_DATE + (this.detailObj.SETTLEMENT_TYPE===1?'':'/01')).startOf('months').format('YYYY/MM/DD') :'',
statistics_month_end: this.detailObj.SETTLEMENT_DATE ? this.$moment(this.detailObj.SETTLEMENT_DATE + (this.detailObj.SETTLEMENT_TYPE===1?'':'/01')).endOf('months').format('YYYY/MM/DD') :'',
}
console.log('this.detailObj.SETTLEMENT_DATE + this.detailObj.SETTLEMENT_TYPE===1?\'\':\'/01\'',this.detailObj.SETTLEMENT_DATE + this.detailObj.SETTLEMENT_TYPE===1?'':'/01')
console.log('redsadasdasdq', req)
const data = await request.$webGet('EShangApiMain/BusinessProject/GetShopExpenseSummary',req)
console.log('handleGetProjectExpenseList',data)
uni.hideLoading()
this.ExpenseObj = data.Result_Data.List[0]
console.log('this.ExpenseObj',this.ExpenseObj)
}
@ -1418,7 +1432,8 @@ export default {
this.lastMonthIsOver = true
}else if(res.AllowSettlement===2){
this.lastMonthIsOver = false
this.LastSettlementMonth = `${res.LastSettlementMonth}审结中月度结算正在审批中,请审结后再发起${req.StatisticsMonth}月度结算`
this.LastSettlementMonth = res.LastSettlementMonth
this.LastSettlementMonthText = `${res.LastSettlementMonth}审结中月度结算正在审批中,请审结后再发起${req.StatisticsMonth}月度结算`
}else{
this.lastMonthIsOver = false
if(res.LastSettlementState===0){
@ -1815,7 +1830,7 @@ export default {
.moneyItem{
width: 50%;
.redMoney{
font-family: DINAlternate, DINAlternate;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: bold;
font-size: 40rpx;
color: #9A3D1A;
@ -1824,7 +1839,7 @@ export default {
font-style: normal;
}
.moneyValue{
font-family: DINAlternate, DINAlternate;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: bold;
font-size: 34rpx;
color: #160002;
@ -1866,7 +1881,7 @@ export default {
width: calc(100% / 3);
box-sizing: border-box;
.value{
font-family: DINAlternate, DINAlternate;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: bold;
font-size: 28rpx;
color: #160002;
@ -1972,9 +1987,9 @@ export default {
font-style: normal;
}
.timeBox{
font-family: PingFangSC, PingFang SC;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: 400;
font-size: 28rpx;
font-size: 24rpx;
color: #786B6C;
line-height: 40rpx;
text-align: left;
@ -2013,7 +2028,7 @@ export default {
.revenueValue{
font-family: DINAlternate, DINAlternate;
font-weight: bold;
font-size: 36rpx;
font-size: 28rpx;
color: #160002;
line-height: 44rpx;
text-align: left;
@ -2083,9 +2098,9 @@ export default {
margin-right: 8rpx;
}
.endTime{
font-family: PingFangSC, PingFang SC;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: 400;
font-size: 28rpx;
font-size: 24rpx;
color: #786B6C;
line-height: 40rpx;
text-align: left;
@ -2100,12 +2115,13 @@ export default {
display: flex;
align-items: center;
width: 100%;
height: 156rpx;
height: 80rpx;
background-color: #F7F8FA;
.firstTableTitle{
width: 30%;
box-sizing: border-box;
padding-left: 24rpx;
font-size: 24rpx;
}
.borderRight{
width: 2rpx;
@ -2117,6 +2133,7 @@ export default {
display: flex;
flex-direction: column;
align-items: center;
font-size: 24rpx;
.dataIcon{
width: 60rpx;
height: 60rpx;
@ -2134,6 +2151,7 @@ export default {
width: 30%;
box-sizing: border-box;
padding: 22rpx 0 22rpx 22rpx;
font-size: 24rpx;
}
.refundPay{
font-family: PingFangSC, PingFang SC;
@ -2154,6 +2172,8 @@ export default {
box-sizing: border-box;
padding: 22rpx 24rpx 22rpx 0;
text-align: right;
font-size: 26rpx;
font-family: DINAlternate-Bold, DINAlternate;
}
}
.tableRowGray{
@ -2326,9 +2346,9 @@ export default {
margin-right: 8rpx;
}
.endTime{
font-family: PingFangSC, PingFang SC;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: 400;
font-size: 28rpx;
font-size: 24rpx;
color: #786B6C;
line-height: 40rpx;
text-align: left;
@ -2343,12 +2363,13 @@ export default {
display: flex;
align-items: center;
width: 100%;
height: 156rpx;
height: 80rpx;
background-color: #F7F8FA;
.firstTableTitle{
width: 30%;
box-sizing: border-box;
padding-left: 24rpx;
font-size: 24rpx;
}
.borderRight{
width: 2rpx;
@ -2360,6 +2381,7 @@ export default {
display: flex;
flex-direction: column;
align-items: center;
font-size: 24rpx;
.dataIcon{
width: 60rpx;
height: 60rpx;
@ -2372,11 +2394,11 @@ export default {
width: 100%;
height: 100%;
display: flex;
align-items: center;
.labelRow{
width: 30%;
box-sizing: border-box;
padding: 22rpx 0 22rpx 22rpx;
font-size: 24rpx;
}
.refundPay{
font-family: PingFangSC, PingFang SC;
@ -2397,6 +2419,8 @@ export default {
box-sizing: border-box;
padding: 22rpx 24rpx 22rpx 0;
text-align: right;
font-size: 26rpx;
font-family: DINAlternate-Bold, DINAlternate;
}
}
.tableRowGray{
@ -2409,7 +2433,7 @@ export default {
.payableFeesBox{
width: 100%;
box-sizing: border-box;
padding: 32rpx 32rpx 0;
padding: 32rpx 32rpx 24rpx;
background-color: #fff;
.payableFeesBoxTitle{
font-family: PingFangSC, PingFang SC;
@ -2431,9 +2455,9 @@ export default {
margin-right: 8rpx;
}
.endTime{
font-family: PingFangSC, PingFang SC;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: 400;
font-size: 28rpx;
font-size: 24rpx;
color: #786B6C;
line-height: 40rpx;
text-align: left;
@ -2448,12 +2472,13 @@ export default {
display: flex;
align-items: center;
width: 100%;
height: 156rpx;
height: 80rpx;
background-color: #F7F8FA;
.firstTableTitle{
width: 30%;
box-sizing: border-box;
padding-left: 24rpx;
font-size: 24rpx;
}
.borderRight{
width: 2rpx;
@ -2465,6 +2490,7 @@ export default {
display: flex;
flex-direction: column;
align-items: center;
font-size: 24rpx;
.dataIcon{
width: 60rpx;
height: 60rpx;
@ -2482,6 +2508,7 @@ export default {
width: 30%;
box-sizing: border-box;
padding: 22rpx 0 22rpx 22rpx;
font-size: 24rpx;
}
.refundPay{
font-family: PingFangSC, PingFang SC;
@ -2502,6 +2529,8 @@ export default {
box-sizing: border-box;
padding: 22rpx 24rpx 22rpx 0;
text-align: right;
font-size: 26rpx;
font-family: DINAlternate-Bold, DINAlternate;
}
}
.tableRowGray{
@ -2557,9 +2586,9 @@ export default {
margin-right: 8rpx;
}
.endTime{
font-family: PingFangSC, PingFang SC;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: 400;
font-size: 28rpx;
font-size: 24rpx;
color: #786B6C;
line-height: 40rpx;
text-align: left;
@ -2574,12 +2603,13 @@ export default {
display: flex;
align-items: center;
width: 100%;
height: 156rpx;
height: 80rpx;
background-color: #F7F8FA;
.firstTableTitle{
width: 30%;
box-sizing: border-box;
padding-left: 24rpx;
font-size: 24rpx;
}
.borderRight{
width: 2rpx;
@ -2591,6 +2621,7 @@ export default {
display: flex;
flex-direction: column;
align-items: center;
font-size: 24rpx;
.dataIcon{
width: 60rpx;
height: 60rpx;
@ -2608,6 +2639,7 @@ export default {
width: 30%;
box-sizing: border-box;
padding: 22rpx 0 22rpx 22rpx;
font-size: 24rpx;
}
.refundPay{
font-family: PingFangSC, PingFang SC;
@ -2629,6 +2661,7 @@ export default {
padding: 22rpx 24rpx 22rpx 0;
text-align: right;
font-size: 26rpx;
font-family: DINAlternate-Bold, DINAlternate;
}
}
.tableRowGray{
@ -3287,9 +3320,9 @@ export default {
margin-right: 8rpx;
}
.endTime{
font-family: PingFangSC, PingFang SC;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: 400;
font-size: 28rpx;
font-size: 24rpx;
color: #786B6C;
line-height: 40rpx;
text-align: left;
@ -3304,12 +3337,13 @@ export default {
display: flex;
align-items: center;
width: 100%;
height: 56rpx;
height: 80rpx;
background-color: #d0d1d2;
.firstTableTitle{
width: 30%;
box-sizing: border-box;
padding-left: 24rpx;
font-size: 24rpx;
}
.borderRight{
width: 2rpx;
@ -3321,6 +3355,7 @@ export default {
display: flex;
flex-direction: column;
align-items: center;
font-size: 24rpx;
.dataIcon{
width: 60rpx;
height: 60rpx;
@ -3338,6 +3373,7 @@ export default {
width: 30%;
box-sizing: border-box;
padding: 16rpx 0 16rpx 16rpx;
font-size: 24rpx;
}
.refundPay{
font-family: PingFangSC, PingFang SC;
@ -3358,6 +3394,8 @@ export default {
box-sizing: border-box;
padding: 16rpx 16rpx 16rpx 0;
text-align: right;
font-size: 26rpx;
font-family: DINAlternate-Bold, DINAlternate;
}
}
.tableRowGray{

View File

@ -79,7 +79,7 @@
<view class="leftName">{{item.CURRENT_PERIOD || ''}}</view>
<!-- <view class="rightName">{{ $util.getMoney(item.REVENUE_AMOUNT) }}</view>-->
<view class="rightName">{{item.SETTLEMENT_TYPE===1?'年度结算':item.SETTLEMENT_TYPE===2?'月度结算':''}}{{item.SETTLEMENT_DATE || ''}} </view>
<view class="rightName">{{item.SETTLEMENT_TYPE===1?'年度结算':item.SETTLEMENT_TYPE===2?'月度结算':''}}<span class="month">{{item.SETTLEMENT_DATE || ''}}</span> </view>
</view>
<view class="line"></view>
@ -281,6 +281,7 @@ import moment from "moment";
},
//
async handleGetNewMonth(obj,time){
console.log('time',time)
uni.showLoading({
title: '正在加载...'
})
@ -479,7 +480,7 @@ import moment from "moment";
}
}
.timeBox{
height: 32px;
height: 28px;
margin-top: 12px;
display: flex;
align-items: center;
@ -487,7 +488,8 @@ import moment from "moment";
display: flex;
align-items: center;
.monthNumber{
font-size: 56rpx;
font-family: DINAlternate-Bold, DINAlternate;
font-size: 42rpx;
font-weight: bold;
}
.monthUnit{
@ -498,7 +500,7 @@ import moment from "moment";
color: #242729;
}
.year{
font-family: PingFangSC, PingFang SC;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: 400;
font-size: 28rpx;
color: #786B6C;
@ -666,6 +668,9 @@ import moment from "moment";
border-radius: 14rpx;
margin: 0 8px 0 5px;
}
.month{
font-family: DINAlternate-Bold, DINAlternate;
}
}
}
.itemCenterRow{
@ -674,6 +679,7 @@ import moment from "moment";
flex-direction: column;
align-items: center;
.value{
font-family: DINAlternate-Bold, DINAlternate;
font-size: 16px;
font-weight: 600;
color: #FF814FFF;

View File

@ -6,7 +6,7 @@
<image @click="handleBack" class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/navigation-left.svg"/>
<view class="selectServiceBox">
<image class="serviceIcon" src="/static/images/settlementApproval/serviceIcon.png"/>
<image class="serviceIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/serviceIcon.png"/>
<view class="nameBox">
<span class="service">{{ detailObj.SERVERPART_NAME}}</span>
<image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"/>
@ -64,23 +64,22 @@
</view>
</view>
<view class="stateBox" v-if="detailObj.Approvalstate!==9" :style="{top: menu.bottom + 18 + 'px'}">
<image class="stateIcon" :src="detailObj.Approvalstate===0?'/static/images/settlementApproval/stateIcon.png':detailObj.Approvalstate===1?'/static/images/settlementApproval/pendIcon.png':''"/>
<image class="stateIcon" :src="detailObj.Approvalstate===0?'https://eshangtech.com/ShopICO/yxcl/settlementApproval/stateIcon.png':detailObj.Approvalstate===1?'https://eshangtech.com/ShopICO/yxcl/settlementApproval/pendIcon.png':''"/>
<span class="stateText">{{detailObj.Approvalstate===0?'待结算':detailObj.Approvalstate===1?'审核中':''}}</span>
</view>
<view class="overBox" v-else :style="{top: menu.bottom + 33 + 'px'}" >
<image class="overIcon" src="/static/images/settlementApproval/isPassIcon.png"/>
<image class="overIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/isPassIcon.png"/>
</view>
</view>
</view>
<view class="monthDetailBox">
<view class="detailBoxTop">
<span class="detailBoxTitle">月度结算详情</span>
</view>
<view class="detailBoxTime">
<image class="timeIcon" src="/static/images/settlementApproval/timeIcon.png"/>
<view class="endTime">结算时间{{detailObj.STARTDATE || ''}} {{detailObj.ENDDATE || ''}}</view>
<image class="timeIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/timeIcon.png"/>
<view class="endTime">结算时间{{detailObj.thisMonth || ''}}</view>
</view>
<view class="table">
@ -88,18 +87,18 @@
<view class="firstTableTitle">数据类型</view>
<view class="borderRight"></view>
<view class="otherTableTitle">
<image class="dataIcon" src="/static/images/settlementApproval/settlementIcon.png"/>
<!-- <image class="dataIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/settlementIcon.png"/>-->
结算数据
</view>
<view class="borderRight"></view>
<view class="otherTableTitle">
<image class="dataIcon" src="/static/images/settlementApproval/successData.png"/>
<!-- <image class="dataIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/successData.png"/>-->
精算数据
</view>
</view>
<view class="tableBody">
<view class="tableRow tableRowGray">
<view class="tableRow ">
<view class="labelRow">本月营收</view>
<view class="borderRight"></view>
<view class="valueRow">{{actuaryData.CurMonthRevenue?`${$util.getMoney(actuaryData.CurMonthRevenue)}`:'-'}}</view>
@ -107,7 +106,7 @@
<view class="valueRow">{{monthNewCalibration.CurMonthRevenueTEXT?monthNewCalibration.CurMonthRevenueTEXT:'-'}}</view>
</view>
<view class="tableRow">
<view class="tableRow tableRowGray">
<view class="labelRow">累计营业额</view>
<view class="borderRight"></view>
<view class="valueRow">{{actuaryData.REVENUEDAILY_AMOUNTTotal?`${$util.getMoney(actuaryData.REVENUEDAILY_AMOUNTTotal)}`:'-'}}</view>
@ -115,7 +114,7 @@
<view class="valueRow">{{monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT?monthNewCalibration.REVENUEDAILY_AMOUNTTotalTEXT:'-'}}</view>
</view>
<view class="tableRow tableRowGray">
<view class="tableRow ">
<view class="labelRow">移动支付</view>
<view class="borderRight"></view>
<view class="valueRow">{{actuaryData.MOBILEPAY_AMOUNT?`${$util.getMoney(actuaryData.MOBILEPAY_AMOUNT)}`:'-'}}</view>
@ -124,7 +123,7 @@
<span v-if="monthNewCalibration.MOBILEPAY_CORRECT" style="color: red">({{monthNewCalibration.MOBILEPAY_CORRECT>0?'+':''}}{{monthNewCalibration.MOBILEPAY_CORRECTTEXT || ''}})</span></view>
</view>
<view class="tableRow">
<view class="tableRow tableRowGray">
<view class="labelRow">移动冲正</view>
<view class="borderRight"></view>
<view class="valueRow">{{actuaryData.MOBILEPAY_CORRECT?`${$util.getMoney(actuaryData.MOBILEPAY_CORRECT)}`:'-'}}</view>
@ -132,7 +131,7 @@
<view class="valueRow">{{monthNewCalibration.MOBILEPAY_CORRECTTEXT || ''}}</view>
</view>
<view class="tableRow tableRowGray">
<view class="tableRow ">
<view class="labelRow">现金交易</view>
<view class="borderRight"></view>
<view class="valueRow">{{actuaryData.CASHPAY_AMOUNT?`${$util.getMoney(actuaryData.CASHPAY_AMOUNT)}`:'-'}}</view>
@ -143,7 +142,7 @@
</view>
</view>
<view class="tableRow">
<view class="tableRow tableRowGray">
<view class="labelRow">现金冲正</view>
<view class="borderRight"></view>
<view class="valueRow">{{actuaryData.CASHPAY_CORRECT?`${$util.getMoney(actuaryData.CASHPAY_CORRECT)}`:'-'}}</view>
@ -151,7 +150,7 @@
<view class="valueRow">{{monthNewCalibration.CASHPAY_CORRECTTEXT || '0'}}</view>
</view>
<view class="tableRow tableRowGray">
<view class="tableRow ">
<view class="labelRow">提成金额</view>
<view class="borderRight"></view>
<view class="valueRow">{{actuaryData.GUARANTEERATIOAMOUNT?`${$util.getMoney(actuaryData.GUARANTEERATIOAMOUNT)}`:'-'}}</view>
@ -159,7 +158,7 @@
<view class="valueRow">{{monthNewCalibration.GUARANTEERATIOAMOUNTTEXT || ''}}</view>
</view>
<view class="tableRow">
<view class="tableRow tableRowGray">
<view class="labelRow">提成收入</view>
<view class="borderRight"></view>
<view class="valueRow">{{actuaryData.GUARANTEERATIOINCOME?`${$util.getMoney(actuaryData.GUARANTEERATIOINCOME)}`:'-'}}</view>
@ -170,6 +169,80 @@
</view>
</view>
<view class="payableFeesBox">
<!-- 经营商户应交费用明细表-->
<view class="payableFeesBoxTitle">经营商户应交费用明细表</view>
<view class="detailBoxTime">
<image class="timeIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/timeIcon.png"/>
<view class="endTime">结算时间{{detailObj.thisMonth || ''}}</view>
</view>
<view class="table">
<view class="tableHeader">
<view class="firstTableTitle">数据类型</view>
<view class="borderRight"></view>
<view class="otherTableTitle">
<!-- <image class="dataIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/settlementIcon.png"/>-->
应缴费用
</view>
<view class="borderRight"></view>
<view class="otherTableTitle">
<!-- <image class="dataIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/successData.png"/>-->
已缴费用
</view>
</view>
<view class="tableBody">
<view class="tableRow ">
<view class="labelRow">合计</view>
<view class="borderRight"></view>
<view class="valueRow">{{ExpenseObj.SHOPEXPENSE_AMOUNT ||'-'}}</view>
<view class="borderRight"></view>
<view class="valueRow">{{ExpenseObj.PAID_AMOUNT ||'-'}}</view>
</view>
<view class="tableRow tableRowGray" >
<view class="labelRow" style="padding-left: 24rpx">水费</view>
<view class="borderRight"></view>
<view class="valueRow">{{ExpenseObj.SHOPEXPENSE_AMOUNT_1000 ||'-'}}</view>
<view class="borderRight"></view>
<view class="valueRow">{{ExpenseObj.PAID_AMOUNT_9010 ||'-'}}</view>
</view>
<view class="tableRow">
<view class="labelRow" style="padding-left: 24rpx">电费</view>
<view class="borderRight"></view>
<view class="valueRow">{{ExpenseObj.SHOPEXPENSE_AMOUNT_2000 ||'-'}}</view>
<view class="borderRight"></view>
<view class="valueRow">{{ExpenseObj.PAID_AMOUNT_9020 ||'-'}}</view>
</view>
<view class="tableRow tableRowGray">
<view class="labelRow" style="padding-left: 24rpx">物业费</view>
<view class="borderRight"></view>
<view class="valueRow">{{ExpenseObj.SHOPEXPENSE_AMOUNT_5000 ||'-'}}</view>
<view class="borderRight"></view>
<view class="valueRow">{{ExpenseObj.PAID_AMOUNT_9050 ||'-'}}</view>
</view>
<view class="tableRow">
<view class="labelRow" style="padding-left: 24rpx">就餐费</view>
<view class="borderRight"></view>
<view class="valueRow">{{ExpenseObj.SHOPEXPENSE_AMOUNT_4000 ||'-'}}</view>
<view class="borderRight"></view>
<view class="valueRow">{{'-'}}</view>
</view>
<view class="tableRow tableRowGray">
<view class="labelRow" style="padding-left: 24rpx">住宿费</view>
<view class="borderRight"></view>
<view class="valueRow">{{ExpenseObj.SHOPEXPENSE_AMOUNT_3000 ||'-'}}</view>
<view class="borderRight"></view>
<view class="valueRow">{{ExpenseObj.PAID_AMOUNT_9030 ||'-'}}</view>
</view>
</view>
</view>
</view>
<view class="progressList" v-if="detailObj.Approvalstate>0">
<view class="progressTitle">审批流程</view>
@ -186,8 +259,8 @@
<view class="itemLeft">
<view class="nameIcon">
<span class="name" v-if="item.STAFF_NAME.length===3">{{item.STAFF_NAME.slice(1,3)}}</span>
<image v-else class="defaultPerson" src="/static/images/settlementApproval/defaultPersonIcon.png"/>
<image class="successIcon" src="/static/images/settlementApproval/passIcon.png"/>
<image v-else class="defaultPerson" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/defaultPersonIcon.png"/>
<image class="successIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/passIcon.png"/>
</view>
</view>
<view class="itemRight">
@ -272,6 +345,7 @@ export default {
menu:{},
settlementModes:{},//
projectObj:{},//
ExpenseObj:{},//
}
},
async onLoad(query){
@ -300,7 +374,8 @@ export default {
}
//
await this.handleGetProgress()
//
await this.handleGetProjectExpenseList()
},
onUnload(){
@ -316,6 +391,7 @@ export default {
this.staticMonth = ''
this.nextPersonIndex = ''
this.nextPersonLabel = ''
this.ExpenseObj = {}
this.showLabel = ''
this.approveDesc = ''
this.progressList = []
@ -326,6 +402,42 @@ export default {
this.closeShowSelect()
},
methods:{
//
async handleGetProjectExpenseList(){
if(this.detailObj.Approvalstate===9){
let req = {
BusinessProjectId: this.detailObj.BUSINESSPROJECT_ID,
ShopRoyaltyId: this.detailObj.ShopRoyalty_Id,
StartMonth: this.detailObj.thisMonth ? this.$moment(this.detailObj.thisMonth+ '/01').format('YYYYMM') : '',
EndMonth: this.detailObj.thisMonth ? this.$moment(this.detailObj.thisMonth+ '/01').format('YYYYMM') : '',
}
const data = await request.$webGet('EShangApiMain/Finance/GetProjectExpenseList',req)
console.log('handleGetProjectExpenseList',data)
this.ExpenseObj = data.Result_Data.List[0]
console.log('this.ExpenseObj',this.ExpenseObj)
}else{
let min = 999999999
if (this.detailObj.SERVERPARTSHOP_ID) {
let shopList = this.detailObj.SERVERPARTSHOP_ID.split(',')
shopList.forEach((item) => {
if (Number(item) < min) {
min = Number(item)
}
})
}
let req = {
serverpartshop_id: min===999999999?'':min,
statistics_month_start: this.detailObj.thisMonth ? this.$moment(this.detailObj.thisMonth+ '/01').startOf('months').format('YYYY/MM/DD') :'',
statistics_month_end: this.detailObj.thisMonth ? this.$moment(this.detailObj.thisMonth+ '/01').endOf('months').format('YYYY/MM/DD') :'',
}
console.log('redsadasdasdq', req)
const data = await request.$webGet('EShangApiMain/BusinessProject/GetShopExpenseSummary',req)
console.log('handleGetProjectExpenseList',data)
this.ExpenseObj = data.Result_Data.List[0]
console.log('this.ExpenseObj',this.ExpenseObj)
}
},
//
async handleGetSETTLEMENTMODES(){
const req = { FieldExplainField: 'SETTLEMENT_MODES' }
@ -693,7 +805,7 @@ export default {
.moneyItem{
width: 50%;
.redMoney{
font-family: DINAlternate, DINAlternate;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: bold;
font-size: 40rpx;
color: #9A3D1A;
@ -702,7 +814,7 @@ export default {
font-style: normal;
}
.moneyValue{
font-family: DINAlternate, DINAlternate;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: bold;
font-size: 34rpx;
color: #160002;
@ -744,7 +856,7 @@ export default {
width: calc(100% / 3);
box-sizing: border-box;
.value{
font-family: DINAlternate, DINAlternate;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: bold;
font-size: 28rpx;
color: #160002;
@ -853,9 +965,9 @@ export default {
margin-right: 8rpx;
}
.endTime{
font-family: PingFangSC, PingFang SC;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: 400;
font-size: 28rpx;
font-size: 24rpx;
color: #786B6C;
line-height: 40rpx;
text-align: left;
@ -870,12 +982,13 @@ export default {
display: flex;
align-items: center;
width: 100%;
height: 156rpx;
height: 80rpx;
background-color: #F7F8FA;
.firstTableTitle{
width: 30%;
box-sizing: border-box;
padding-left: 24rpx;
font-size: 24rpx;
}
.borderRight{
width: 2rpx;
@ -887,6 +1000,7 @@ export default {
display: flex;
flex-direction: column;
align-items: center;
font-size: 24rpx;
.dataIcon{
width: 60rpx;
height: 60rpx;
@ -904,7 +1018,7 @@ export default {
width: 30%;
box-sizing: border-box;
padding: 22rpx 0 22rpx 22rpx;
font-size: 28rpx;
font-size: 24rpx;
}
.refundPay{
font-family: PingFangSC, PingFang SC;
@ -925,7 +1039,118 @@ export default {
box-sizing: border-box;
padding: 22rpx 24rpx 22rpx 0;
text-align: right;
font-size: 28rpx;
font-size: 26rpx;
font-family: DINAlternate-Bold, DINAlternate;
}
}
.tableRowGray{
background-color: #F9F9FA!important;
}
}
}
}
.payableFeesBox{
width: 100%;
box-sizing: border-box;
padding: 32rpx 32rpx 32rpx;
background-color: #fff;
.payableFeesBoxTitle{
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 32rpx;
color: #212226;
line-height: 44rpx;
text-align: left;
font-style: normal;
}
.detailBoxTime{
display: flex;
align-items: center;
margin-bottom: 20rpx;
margin-top: 8rpx;
.timeIcon{
width: 28rpx;
height: 28rpx;
margin-right: 8rpx;
}
.endTime{
font-family: DINAlternate-Bold, DINAlternate;
font-weight: 400;
font-size: 24rpx;
color: #786B6C;
line-height: 40rpx;
text-align: left;
font-style: normal;
}
}
.table{
width: calc(100% - 4rpx);
border-radius: 12rpx;
border: 2rpx solid #EEEEF0;
.tableHeader{
display: flex;
align-items: center;
width: 100%;
height: 80rpx;
background-color: #F7F8FA;
.firstTableTitle{
width: 30%;
box-sizing: border-box;
padding-left: 24rpx;
font-size: 24rpx;
}
.borderRight{
width: 2rpx;
height: 100%;
background-color: #F1F1F1;
}
.otherTableTitle{
width: 35%;
display: flex;
flex-direction: column;
align-items: center;
font-size: 24rpx;
.dataIcon{
width: 60rpx;
height: 60rpx;
margin-bottom: 8rpx;
}
}
}
.tableBody{
.tableRow{
width: 100%;
height: 100%;
display: flex;
align-items: center;
.labelRow{
width: 30%;
box-sizing: border-box;
padding: 22rpx 0 22rpx 22rpx;
font-size: 24rpx;
}
.refundPay{
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 24rpx;
color: #9A3D1A;
line-height: 36rpx;
text-align: left;
font-style: normal;
}
.borderRight{
width: 2rpx;
min-height: 80rpx;
background-color: #F1F1F1;
}
.valueRow{
width: 35%;
box-sizing: border-box;
padding: 22rpx 24rpx 22rpx 0;
text-align: right;
font-size: 26rpx;
font-family: DINAlternate-Bold, DINAlternate;
}
}
.tableRowGray{
@ -1010,6 +1235,7 @@ export default {
}
}
.itemRight{
flex: 1;
margin-left: 12rpx;
.nameBox{
display: flex;

View File

@ -4,7 +4,7 @@
<view class="listItem" v-for="(item,index) in dataList" :key="index" @click="handleGoMonthDetail(item)">
<view class="itemTop">
<view class="topLeft">
<image class="leftIcon" src="/static/images/settlementApproval/monthIcon.png"/>
<image class="leftIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/monthIcon.png"/>
<span class="leftTime">{{ item.StartDate || '' }} {{item.EndDate || ''}} </span>
</view>
<view class="topRight">
@ -86,8 +86,9 @@ export default {
SERVERPARTSHOP_ID: this.detailObj.SERVERPARTSHOP_ID || '',
SERVERPART_ID: this.detailObj.SERVERPART_ID || '',
SERVERPART_NAME: this.detailObj.SERVERPART_NAME || '',
Approvalstate: this.detailObj.Approvalstate
Approvalstate: obj.IsApplySuccess?9:this.detailObj.Approvalstate
}
res.thisMonth = this.$moment(res.ENDDATE).format('YYYY/MM')
let staticMonth = this.$moment(res.ENDDATE).endOf('months').format('YYYYMM')
this.$util.toNextRoute('navigateTo', `/pages/settlementApproval/monthDetail?obj=${JSON.stringify(res)}&staticMonth=${staticMonth}&id=${id}`)
}
@ -130,7 +131,7 @@ export default {
margin-right: 12rpx;
}
.leftTime{
font-family: PingFangSC, PingFang SC;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: 400;
font-size: 28rpx;
color: #242729;
@ -163,9 +164,9 @@ export default {
align-items: center;
justify-content: center;
.bigMoney{
font-family: DINAlternate, DINAlternate;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: bold;
font-size: 32rpx;
font-size: 28rpx;
color: #9A3D1A;
line-height: 40rpx;
text-align: left;
@ -204,9 +205,9 @@ export default {
flex-direction: column;
margin-bottom: 24rpx;
.value{
font-family: DINAlternate, DINAlternate;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: bold;
font-size: 26rpx;
font-size: 24rpx;
color: #483E3A;
line-height: 32rpx;
text-align: right;

View File

@ -1,51 +1,79 @@
<template>
<view class="main">
<!-- 顶部-->
<view style="background: #fff">
<view class="pageTitle">{{detailObj.BUSINESSPROJECT_NAME || ''}}</view>
<!-- 顶部详情-->
<view class="detailBox">
<view class="detailRow">
<view class="detailItem">
<span class="label">开始日期</span>
<span class="value">{{detailObj.STARTDATE || ''}}</span>
</view>
<view class="detailItem">
<span class="label">截止日期</span>
<span class="value">{{detailObj.ENDDATE || ''}}</span>
<!-- 新頂部-->
<view class="header">
<view class="headerBox" :style="{height: menu.bottom + 18 + 'px'}">
<view class="arrowBox" :style="{paddingTop: menu.top + 'px',height: menu.height + 'px'}">
<image @click="handleBack" class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/navigation-left.svg"/>
<view class="selectServiceBox">
<image class="serviceIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/serviceIcon.png"/>
<view class="nameBox">
<span class="service">{{ detailObj.SERVERPART_NAME}}</span>
<image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"/>
</view>
</view>
</view>
</view>
<view class="headerDetail" :style="{paddingTop: menu.bottom + 18 + 'px'}">
<view class="detailContent">
<view class="projectName" style="margin-bottom: 16rpx">{{detailObj.BUSINESSPROJECT_NAME || ''}}</view>
<view class="projectItem">
<view class="itemLabel">项目时间</view>
<view class="itemValue">{{detailObj.STARTDATE || ''}}-{{detailObj.ENDDATE || ''}}</view>
</view>
<view class="projectItem">
<view class="itemLabel">经营商户</view>
<view class="itemValue">{{detailObj.MERCHANTS_NAME || ''}}</view>
</view>
<view style="display: flex;align-items: center;">
<view class="projectItem" style="width: 50%">
<view class="itemLabel">经营模式</view>
<view class="itemValue">{{detailObj.BUSINESS_TYPE?contractType[detailObj.BUSINESS_TYPE] : ''}}</view>
</view>
<view class="projectItem" style="width: 50%">
<view class="itemLabel">结算模式</view>
<view class="itemValue">{{detailObj.SETTLEMENT_MODES?SETTLEMENT_MODESObj[detailObj.SETTLEMENT_MODES] : ''}}</view>
</view>
</view>
<view class="detailRow">
<view class="detailAllItem">
<span class="label">经营商户</span>
<span class="value">{{detailObj.MERCHANTS_NAME || ''}}</span>
<view class="projectItem">
<view class="itemLabel">经营门店</view>
<view class="itemValue">{{detailObj.SERVERPARTSHOP_NAME || ''}}</view>
</view>
</view>
<view class="detailRow">
<view class="detailItem">
<span class="label">经营模式</span>
<span class="value">{{detailObj.BUSINESS_TYPE?contractType[detailObj.BUSINESS_TYPE] : ''}}</span>
</view>
<view class="detailItem">
<span class="label">结算模式</span>
<span class="value">{{detailObj.SETTLEMENT_MODES?SETTLEMENT_MODESObj[detailObj.SETTLEMENT_MODES] : ''}}</span>
</view>
</view>
<view class="detailRow">
<view class="detailAllItem">
<span class="label">经营门店</span>
<span class="value">{{detailObj.SERVERPARTSHOP_NAME || ''}}</span>
</view>
</view>
</view>
</view>
<!-- 日结冲正信息表-->
<view class="tableBox">
<view class="dailySettleBox" v-if="dailySettlementList && dailySettlementList.length>0">
<view class="boxTop">
<span class="topTitle">日结冲正信息</span>
<view class="goDetail" @click="handleGoDailyDetail">
查看明细
<image class="rightArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png"/>
</view>
</view>
<view class="detailBox">
<view class="leftIcon">
<image class="detailIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/dailyIcon.png"/>
</view>
<view class="rightBox">
<view class="rightTop">
<view class="detailTitle">冲正合计</view>
<view class="detailValue">{{dailySettlementObj.CorrectAmount || ''}}</view>
</view>
<view class="rightBottom"></view>
</view>
</view>
</view>
<view class="tableBox" v-if="false">
<view class="smallTitle">日结冲正信息表</view>
<view class="tableRow" v-for="(item,index) in dailySettlementList" :key="index">
@ -146,7 +174,7 @@
<view class="renovationContent">
<view class="renovationTop">
<view class="topLeft">
<image class="renovationIcon" src="/static/images/settlementApproval/renovationIcon.png"/>
<image class="renovationIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/renovationIcon.png"/>
</view>
<view class="topRight">
<view class="contentTitle">{{item.PeriodIndexStr ||''}}</view>
@ -203,11 +231,11 @@
</view>
<view class="stateBox" v-if="detailObj.Approvalstate!==9">
<image class="stateIcon" :src="detailObj.Approvalstate===0?'/static/images/settlementApproval/stateIcon.png':detailObj.Approvalstate===1?'/static/images/settlementApproval/pendIcon.png':''"/>
<image class="stateIcon" :src="detailObj.Approvalstate===0?'https://eshangtech.com/ShopICO/yxcl/settlementApproval/stateIcon.png':detailObj.Approvalstate===1?'https://eshangtech.com/ShopICO/yxcl/settlementApproval/pendIcon.png':''"/>
<span class="stateText">{{detailObj.Approvalstate===0?'待结算':detailObj.Approvalstate===1?'审核中':''}}</span>
</view>
<view class="overBox" v-else>
<image class="overIcon" src="/static/images/settlementApproval/isPassIcon.png"/>
<image class="overIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/isPassIcon.png"/>
</view>
</view>
@ -222,7 +250,7 @@
</view>
</view>
<view class="detailBoxTime">
<image class="timeIcon" src="/static/images/settlementApproval/timeIcon.png"/>
<image class="timeIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/timeIcon.png"/>
<view class="endTime">结算时间{{item.StartDate || ''}} {{item.EndDate || ''}}</view>
</view>
@ -231,12 +259,12 @@
<view class="firstTableTitle">数据类型</view>
<view class="borderRight"></view>
<view class="otherTableTitle">
<image class="dataIcon" src="/static/images/settlementApproval/settlementIcon.png"/>
<!-- <image class="dataIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/settlementIcon.png"/>-->
结算数据
</view>
<view class="borderRight"></view>
<view class="otherTableTitle">
<image class="dataIcon" src="/static/images/settlementApproval/successData.png"/>
<!-- <image class="dataIcon" src="https://eshangtech.com/ShopICO/yxcl/settlementApproval/successData.png"/>-->
精算数据
</view>
</view>
@ -579,7 +607,49 @@
</view>
</view>
<!-- 顶部-->
<view style="background: #fff" v-if="false">
<view class="pageTitle">{{detailObj.BUSINESSPROJECT_NAME || ''}}</view>
<!-- 顶部详情-->
<view class="detailBox">
<view class="detailRow">
<view class="detailItem">
<span class="label">开始日期</span>
<span class="value">{{detailObj.STARTDATE || ''}}</span>
</view>
<view class="detailItem">
<span class="label">截止日期</span>
<span class="value">{{detailObj.ENDDATE || ''}}</span>
</view>
</view>
<view class="detailRow">
<view class="detailAllItem">
<span class="label">经营商户</span>
<span class="value">{{detailObj.MERCHANTS_NAME || ''}}</span>
</view>
</view>
<view class="detailRow">
<view class="detailItem">
<span class="label">经营模式</span>
<span class="value">{{detailObj.BUSINESS_TYPE?contractType[detailObj.BUSINESS_TYPE] : ''}}</span>
</view>
<view class="detailItem">
<span class="label">结算模式</span>
<span class="value">{{detailObj.SETTLEMENT_MODES?SETTLEMENT_MODESObj[detailObj.SETTLEMENT_MODES] : ''}}</span>
</view>
</view>
<view class="detailRow">
<view class="detailAllItem">
<span class="label">经营门店</span>
<span class="value">{{detailObj.SERVERPARTSHOP_NAME || ''}}</span>
</view>
</view>
</view>
</view>
<!--发起结算的按钮-->
<!-- <view class="btnBox" v-if="isSuccessRecalibrate">-->
<!-- <view class="btnList">-->
@ -656,6 +726,7 @@ export default {
yearDataListAfter:[],//
otherDataObj: {},
dailySettlementList:[],//
dailySettlementObj:{},//
correctionAmount:'0',//
isSuccessRecalibrate: false,//
isShowYearApplyFor: false,//
@ -692,6 +763,16 @@ export default {
},
methods:{
numeral,
//
handleGoDailyDetail(){
let obj = this.dailySettlementList[0]
console.log('obj',obj)
let res = ''
if (obj.children && obj.children.length>0){
res = JSON.stringify(obj.children)
}
this.$util.toNextRoute('navigateTo', `/pages/settlementApproval/dailyList?res=${res}`)
},
//
handleGoMonthList(obj){
console.log('obj',obj)
@ -834,6 +915,7 @@ export default {
}
console.log('res222',res)
this.dailySettlementList = res
this.dailySettlementObj = res[0]
if(res && res.length>0){
this.correctionAmount = res[0].CorrectAmount
}
@ -1158,7 +1240,7 @@ export default {
uni.showToast({
icon:'success',
duration: 2000,
title: data.Result_Desc,
title: data.Result_Desc || '发起申请成功',
});
setTimeout(()=>{
uni.redirectTo({
@ -1183,130 +1265,232 @@ export default {
.main{
width: 100%;
height: 100vh;
.pageTitle{
.header{
width: 100%;
box-sizing: border-box;
padding: 16rpx 16rpx 0;
font-size: 32rpx;
background-image: url("https://eshangtech.com/ShopICO/yxcl/settlementApproval/pageBg.png");
background-repeat: no-repeat;
background-size: contain;
margin-bottom: 24rpx;
.headerBox{
width: 100%;
box-sizing: border-box;
padding: 0 32rpx;
position: fixed;
top: 0;left: 0;
z-index: 9;
background-image: url("https://eshangtech.com/ShopICO/yxcl/settlementApproval/pageBg.png");
background-repeat: no-repeat;
background-size: cover;
.arrowBox{
width: 100%;
display: flex;
align-items: center;
.img{
width: 48rpx;
height: 48rpx;
}
.selectServiceBox{
margin-left: 16rpx;
display: flex;
align-items: center;
.serviceIcon{
width: 80rpx;
height: 80rpx;
position: relative;
z-index: 2;
}
.nameBox{
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 28rpx;
color: #160002;
line-height: 40rpx;
text-align: left;
font-style: normal;
padding: 12rpx 34rpx 12rpx 48rpx;
display: inline-block;
border-top-right-radius: 200rpx;
border-bottom-right-radius: 200rpx;
background: #fff;
transform: translateX(-20px);
.moreIcon{
width: 24rpx;
height: 24rpx;
margin-left: 14rpx;
}
}
}
}
}
.headerDetail{
width: calc(100% - 48rpx);
margin-left: 24rpx;
background: #FFFFFF;
border-radius: 16rpx;
box-sizing: border-box;
padding: 1px;
position: relative;
.detailContent{
width: 100%;
background: linear-gradient( 180deg, #FFEBE0 0%, #FFFFFF 30%);
border-radius: 14rpx 14rpx 0rpx 0rpx;
box-sizing: border-box;
padding: 24rpx;
.projectName{
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 32rpx;
color: #160002;
line-height: 44rpx;
text-align: left;
font-style: normal;
}
.projectItem{
display: flex;
align-items: center;
.itemLabel{
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 24rpx;
color: #786B6C;
line-height: 36rpx;
text-align: left;
font-style: normal;
margin-right: 8rpx;
}
.itemValue{
font-family: DINAlternate, DINAlternate;
font-size: 26rpx;
color: #160002;
line-height: 40rpx;
text-align: left;
font-style: normal;
}
}
}
.stateBox{
position: absolute;
right: 0;top: 0;
display: flex;
align-items: center;
padding: 10rpx 16rpx;
background: linear-gradient( 48deg, #FF9762 0%, #FF8C8C 100%);
border-radius: 0rpx 16rpx 0rpx 38rpx;
.stateIcon{
width: 28rpx;
height: 28rpx;
margin-right: 6rpx;
}
.stateText{
font-family: PingFangSC, PingFang SC;
font-weight: 500;
font-size: 24rpx;
color: #FFFFFF;
line-height: 36rpx;
text-align: left;
font-style: normal;
}
}
.overBox{
position: absolute;
right: 30rpx;top: 30rpx;
.overIcon{
width: 134rpx;
height: 134rpx;
}
}
}
}
.detailBox{
width: 100%;
.dailySettleBox{
margin-top: 24rpx;
background-color: #fff;
box-sizing: border-box;
padding: 0 16rpx 16rpx;
margin-top: 16rpx;
background: #fff;
.detailRow{
padding: 32rpx;
.boxTop{
display: flex;
align-items: center;
justify-content: space-between;
.detailItem{
width: 50%;
display: flex;
justify-content: flex-start;
.label{
color: #ADB2BF;
font-size: 26rpx;
}
.value{
font-size: 26rpx;
}
}
.detailAllItem{
width: 100%;
.label{
color: #ADB2BF;
font-size: 26rpx;
}
}
}
}
.tableBox{
margin-top: 24rpx;
background: #fff;
box-sizing: border-box;
width: 100%;
padding: 16rpx;
.smallTitle{
font-size: 26rpx;
font-weight: 600;
margin-bottom: 16rpx;
}
.line{
height: 2rpx;
width: 100%;
background-color: #eee;
margin-bottom: 18rpx;
margin-top: 16rpx;
}
.rowItemBox{
display: flex;
.allRowItem{
width: 100%;
.label{
color: #ADB2BF;
font-size: 26rpx;
}
.value{
font-size: 26rpx;
}
margin-bottom: 24rpx;
.topTitle{
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 32rpx;
color: #212226;
line-height: 44rpx;
text-align: left;
font-style: normal;
}
.rowItem{
width: 50%;
display: flex;
justify-content: flex-start;
.label{
color: #ADB2BF;
font-size: 26rpx;
}
.value{
font-size: 26rpx;
.goDetail{
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 28rpx;
color: #FA8B39;
line-height: 40rpx;
text-align: left;
font-style: normal;
.rightArrow{
width: 24rpx;
height: 24rpx;
}
}
}
.getMoreBox{
.detailBox{
width: 100%;
background: #F7F8FA;
border-radius: 8rpx;
border: 2rpx solid #EEEEF0;
box-sizing: border-box;
padding: 32rpx 24rpx;
display: flex;
align-items: center;
justify-content: center;
.imgIcon{
width: 50rpx;
height: 32rpx;
border-radius: 50%;
transform: rotate(90deg);
}
}
.amountBox{
width: 100%;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.commodityContent {
box-sizing: border-box;
display: flex;
align-items: center;
width: 180rpx;
justify-content: center;
/* padding-top: 6rpx; */
box-shadow: 0px 1rpx 8rpx 0.4rpx #ccc;
flex-direction: column;
border-radius: 4rpx;
.color1{
.leftIcon{
width: 80rpx;
height: 80rpx;
background: #FFEFE7;
border-radius: 8rpx;
margin-right: 16rpx;
.detailIcon{
width: 80rpx;
height: 80rpx;
}
}
.btn{
width: 100%;
display: flex;
align-items: center;
justify-content: center;
.btnItem{
display: inline-block;
padding: 6rpx 24rpx;
margin-top: 24rpx;
border-radius: 8rpx;
background: #FA8B39;
color: #fff;
.rightBox{
flex: 1;
.rightTop{
display: flex;
align-items: center;
justify-content: space-between;
width: 100%;
.detailTitle{
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 28rpx;
color: #160002;
line-height: 40rpx;
text-align: left;
font-style: normal;
}
.detailValue{
font-family: DINAlternate, DINAlternate;
font-weight: bold;
font-size: 36rpx;
color: #160002;
line-height: 44rpx;
text-align: left;
font-style: normal;
}
}
.rightBottom{
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 28rpx;
color: #786B6C;
line-height: 40rpx;
text-align: left;
font-style: normal;
}
}
}
@ -1464,9 +1648,9 @@ export default {
margin-right: 8rpx;
}
.endTime{
font-family: PingFangSC, PingFang SC;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: 400;
font-size: 28rpx;
font-size: 24rpx;
color: #786B6C;
line-height: 40rpx;
text-align: left;
@ -1481,12 +1665,13 @@ export default {
display: flex;
align-items: center;
width: 100%;
height: 156rpx;
height: 80rpx;
background-color: #F7F8FA;
.firstTableTitle{
width: 30%;
box-sizing: border-box;
padding-left: 24rpx;
font-size: 24rpx;
}
.borderRight{
width: 2rpx;
@ -1498,6 +1683,7 @@ export default {
display: flex;
flex-direction: column;
align-items: center;
font-size: 24rpx;
.dataIcon{
width: 60rpx;
height: 60rpx;
@ -1515,6 +1701,7 @@ export default {
width: 30%;
box-sizing: border-box;
padding: 22rpx 0 22rpx 22rpx;
font-size: 24rpx;
}
.refundPay{
font-family: PingFangSC, PingFang SC;
@ -1535,6 +1722,7 @@ export default {
box-sizing: border-box;
padding: 22rpx 24rpx 22rpx 0;
text-align: right;
font-size: 24rpx;
}
}
.tableRowGray{
@ -1704,9 +1892,9 @@ export default {
margin-right: 8rpx;
}
.endTime{
font-family: PingFangSC, PingFang SC;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: 400;
font-size: 28rpx;
font-size: 24rpx;
color: #786B6C;
line-height: 40rpx;
text-align: left;
@ -1721,12 +1909,13 @@ export default {
display: flex;
align-items: center;
width: 100%;
height: 156rpx;
height: 80rpx;
background-color: #F7F8FA;
.firstTableTitle{
width: 30%;
box-sizing: border-box;
padding-left: 24rpx;
font-size: 24rpx;
}
.borderRight{
width: 2rpx;
@ -1738,6 +1927,7 @@ export default {
display: flex;
flex-direction: column;
align-items: center;
font-size: 24rpx;
.dataIcon{
width: 60rpx;
height: 60rpx;
@ -1754,6 +1944,7 @@ export default {
width: 30%;
box-sizing: border-box;
padding: 22rpx 0 22rpx 22rpx;
font-size: 24rpx;
}
.refundPay{
font-family: PingFangSC, PingFang SC;
@ -1774,6 +1965,7 @@ export default {
box-sizing: border-box;
padding: 22rpx 24rpx 22rpx 0;
text-align: right;
font-size: 24rpx;
}
}
.tableRowGray{
@ -1910,6 +2102,142 @@ export default {
.pageTitle{
width: 100%;
box-sizing: border-box;
padding: 16rpx 16rpx 0;
font-size: 32rpx;
}
.detailBox{
width: 100%;
box-sizing: border-box;
padding: 0 16rpx 16rpx;
margin-top: 16rpx;
background: #fff;
.detailRow{
display: flex;
align-items: center;
justify-content: space-between;
.detailItem{
width: 50%;
display: flex;
justify-content: flex-start;
.label{
color: #ADB2BF;
font-size: 26rpx;
}
.value{
font-size: 26rpx;
}
}
.detailAllItem{
width: 100%;
.label{
color: #ADB2BF;
font-size: 26rpx;
}
}
}
}
.tableBox{
margin-top: 24rpx;
background: #fff;
box-sizing: border-box;
width: 100%;
padding: 16rpx;
.smallTitle{
font-size: 26rpx;
font-weight: 600;
margin-bottom: 16rpx;
}
.line{
height: 2rpx;
width: 100%;
background-color: #eee;
margin-bottom: 18rpx;
margin-top: 16rpx;
}
.rowItemBox{
display: flex;
.allRowItem{
width: 100%;
.label{
color: #ADB2BF;
font-size: 26rpx;
}
.value{
font-size: 26rpx;
}
}
.rowItem{
width: 50%;
display: flex;
justify-content: flex-start;
.label{
color: #ADB2BF;
font-size: 26rpx;
}
.value{
font-size: 26rpx;
}
}
}
.getMoreBox{
width: 100%;
display: flex;
align-items: center;
justify-content: center;
.imgIcon{
width: 50rpx;
height: 32rpx;
border-radius: 50%;
transform: rotate(90deg);
}
}
.amountBox{
width: 100%;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.commodityContent {
box-sizing: border-box;
display: flex;
align-items: center;
width: 180rpx;
justify-content: center;
/* padding-top: 6rpx; */
box-shadow: 0px 1rpx 8rpx 0.4rpx #ccc;
flex-direction: column;
border-radius: 4rpx;
.color1{
}
}
.btn{
width: 100%;
display: flex;
align-items: center;
justify-content: center;
.btnItem{
display: inline-block;
padding: 6rpx 24rpx;
margin-top: 24rpx;
border-radius: 8rpx;
background: #FA8B39;
color: #fff;
}
}
}
}
.line{
height: 2rpx;
width: 100%;

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB