update
This commit is contained in:
parent
e222148716
commit
0c0f5bb38f
@ -84,16 +84,17 @@
|
||||
<text>经营报表</text>
|
||||
</view>
|
||||
<view class="modleText" v-if="pageData.msg.SearchResult">
|
||||
<div v-if="BusinessTypeValue!==0 || SettlementModeValue!==0">
|
||||
<div v-if="showModal">
|
||||
<span v-if="copySearchText && BusinessTypeValue || copySearchText && BusinessTypeValue" class="text" style="color: red;display: block">温馨提示：模糊查询不支持选择经营方法/结算方式</span>
|
||||
<span class="text">{{pageData.msg.SearchResult[0]}}</span>
|
||||
<view class="text" v-if="BusinessTypeValue!==0">{{`经营模式: ${BusinessTypeList.filter(item=> item.value===BusinessTypeValue)[0].label}`}}</view>
|
||||
<view class="text" v-if="SettlementModeValue!==0">{{`结算模式: ${SettlementModeList.filter(item=> item.value===SettlementModeValue)[0].label}`}}</view>
|
||||
</div>
|
||||
<div v-else>
|
||||
<span class="text" style="color: red">温馨提示：模糊查询不支持选择经营方法/结算方式</span>
|
||||
<span v-if="copySearchText && BusinessTypeValue || copySearchText && BusinessTypeValue" class="text" style="color: red">温馨提示：模糊查询不支持选择经营方法/结算方式</span>
|
||||
<div v-for="(item,index) in pageData.msg.SearchResult" :key="index">
|
||||
<span class="text" v-for="(subItem,subIndex) in item" :key="subIndex">
|
||||
<span class="text" style="color:red" v-if="item.length>1 && subItem.indexOf('：')===-1">{{searchText}}</span>
|
||||
<span class="text" style="color:red" v-if="item.length>1 && subItem.indexOf('：')===-1">{{copySearchText}}</span>
|
||||
{{subItem}}
|
||||
</span>
|
||||
</div>
|
||||
@ -181,7 +182,7 @@
|
||||
</view>
|
||||
|
||||
|
||||
<uni-popup ref="popup" type="bottom" style="background: #fff" :maskClick="handleChangePopupMask">
|
||||
<uni-popup ref="popup" type="bottom" style="background: #fff" >
|
||||
<div class="popupBox" style="box-sizing:border-box;height: 430px">
|
||||
<!-- <div style="display: flex;align-items: center;justify-content: space-between">-->
|
||||
<!-- <text class="title">查询配置</text>-->
|
||||
@ -221,19 +222,6 @@
|
||||
<view :class="SettlementModeValue===item.value?'timeItem timeSelectItem':'timeItem'" v-for="(item,index) in SettlementModeList" :key="index" @click="handleChangeSettlement(item.value)">{{item.label}}</view>
|
||||
</view>
|
||||
</div>
|
||||
<!-- <div class="checkBox" v-if="isScreen">-->
|
||||
<!-- <checkbox-group @change="handleChangeCheckBox">-->
|
||||
<!-- <label>-->
|
||||
<!-- <checkbox value="MerchantName" :checked="checkBoxValue.filter(item=>item==='MerchantName').length>0"/>商户-->
|
||||
<!-- </label>-->
|
||||
<!-- <label>-->
|
||||
<!-- <checkbox value="Brand" :checked="checkBoxValue.filter(item=>item==='Brand').length>0"/>品牌-->
|
||||
<!-- </label>-->
|
||||
<!-- <label>-->
|
||||
<!-- <checkbox value="Shop" :checked="checkBoxValue.filter(item=>item==='Shop').length>0"/>门店-->
|
||||
<!-- </label>-->
|
||||
<!-- </checkbox-group>-->
|
||||
<!-- </div>-->
|
||||
<div class="btn" @click="handleConfirmCheckChange">确认</div>
|
||||
</div>
|
||||
</uni-popup>
|
||||
@ -285,6 +273,7 @@
|
||||
queryTime:'',// 传入的时间
|
||||
lastDay:'',// 首页的实际时间
|
||||
searchText:'',// 搜索框内容
|
||||
copySearchText:'',// 搜索框内容复制
|
||||
requestText:'',// 已经请求过接口的查询框内容
|
||||
isScreen:false,// 显示popup里面的内容
|
||||
checkBoxValue:['MerchantName','Brand','Shop','Serverpart'],// 查询的字段放接口里的
|
||||
@ -298,7 +287,8 @@
|
||||
selectTimeOther:false,
|
||||
timePopup:false,
|
||||
searchTimePopup: [null,null],
|
||||
showNotice:false
|
||||
showNotice:false,
|
||||
showModal:false,// 显示模式
|
||||
}
|
||||
},
|
||||
computed:{
|
||||
@ -309,20 +299,13 @@
|
||||
handleShowNotice(){
|
||||
this.showNotice = !this.showNotice
|
||||
},
|
||||
// 查询配置框 点击蒙层关闭
|
||||
handleChangePopupMask(e){
|
||||
console.log('e',e)
|
||||
},
|
||||
// 自定义时间选框里面的选择
|
||||
handleChangeTimePopup(e,index){
|
||||
console.log('e',e)
|
||||
console.log('index',index)
|
||||
this.searchTimePopup[index] = e.detail.value
|
||||
this.$forceUpdate()
|
||||
},
|
||||
// 自定义时间选框的确定
|
||||
handleTimePopup(){
|
||||
console.log('this.searchTimePopup',this.searchTimePopup)
|
||||
this.pageData.searchTime = this.searchTimePopup
|
||||
this.$refs.timePopup.close()
|
||||
},
|
||||
@ -382,12 +365,8 @@
|
||||
}
|
||||
const data = await request.$webGet('EShangApiMain/FrameWork/GetFieldEnumTree',req)
|
||||
let list = wrapTreeNode(data.Result_Data.List)
|
||||
console.log('list',list)
|
||||
return list
|
||||
},
|
||||
handleChangeCheckBox(e){
|
||||
this.checkChange = e.detail.value
|
||||
},
|
||||
handleConfirmCheckChange(){
|
||||
this.checkBoxValue = this.checkChange
|
||||
this.$refs.popup.close()
|
||||
@ -434,7 +413,6 @@
|
||||
this.$forceUpdate()
|
||||
},
|
||||
toDetail(item){
|
||||
console.log('item',item)
|
||||
this.$util.toNextRoute('navigateTo', '/pages/operatingStatements/detail?pcode='+item.Province_Code+'&id=' +
|
||||
item.Serverpart_Id + '&st=' + this.pageData.searchTime[0]+ '&et=' + this.pageData.searchTime[1]+
|
||||
'&searchKey='+JSON.parse(JSON.stringify(this.checkBoxValue)) + '&searchValue='+this.requestText+
|
||||
@ -443,6 +421,7 @@
|
||||
this.$forceUpdate()
|
||||
},
|
||||
getList(){
|
||||
this.copySearchText= ''
|
||||
uni.showLoading({
|
||||
title:'正在加载',
|
||||
mask:true
|
||||
@ -450,30 +429,6 @@
|
||||
let _this = this
|
||||
let searchTime = this.pageData.searchTime
|
||||
|
||||
// if(this.selectTime){
|
||||
// console.log('selectTime',this.selectTime)
|
||||
// let startTime;
|
||||
// let endTime;
|
||||
// if (this.selectTime===1){
|
||||
// endTime = moment().subtract(1, 'day').format('YYYY-MM-DD')
|
||||
// startTime = moment().subtract(7, 'day').format('YYYY-MM-DD')
|
||||
// searchTime = [startTime,endTime]
|
||||
// }else if(this.selectTime===2){
|
||||
// endTime = moment().subtract(1, 'day').format('YYYY-MM-DD')
|
||||
// startTime = moment().subtract(30, 'day').format('YYYY-MM-DD')
|
||||
// searchTime = [startTime,endTime]
|
||||
// }else if(this.selectTime===3){
|
||||
// endTime = moment().subtract(1, 'day').format('YYYY-MM-DD')
|
||||
// startTime = moment().subtract(90, 'day').format('YYYY-MM-DD')
|
||||
// searchTime = [startTime,endTime]
|
||||
// }else if(this.selectTime===3){
|
||||
// endTime = moment().subtract(1, 'day').format('YYYY-MM-DD')
|
||||
// startTime = moment().subtract(180, 'day').format('YYYY-MM-DD')
|
||||
// searchTime = [startTime,endTime]
|
||||
// }
|
||||
// }else{
|
||||
// searchTime = this.pageData.searchTime
|
||||
// }
|
||||
let searchName = ''
|
||||
this.checkBoxValue.forEach(item=>{
|
||||
if (searchName){
|
||||
@ -488,14 +443,12 @@
|
||||
endTime: searchTime[1],
|
||||
SearchKeyName:searchName,
|
||||
SearchKeyValue:this.searchText,
|
||||
BusinessType:this.BusinessTypeValue?this.BusinessTypeValue:'',
|
||||
SettlementMode:this.SettlementModeValue?this.SettlementModeValue:'',
|
||||
BusinessType:this.searchText?'':this.BusinessTypeValue?this.BusinessTypeValue:'',
|
||||
SettlementMode:this.searchText?'':this.SettlementModeValue?this.SettlementModeValue:'',
|
||||
// additionalCode: this.ProvinceCode=='330000' ? '451200,630000' :''
|
||||
}
|
||||
console.log('req',req)
|
||||
// _this.$request.$webGet('WeChat/GetRevenueReport',{
|
||||
request.$webGet('CommercialApi/Revenue/GetRevenueReport',req).then(res=>{
|
||||
console.log('res',res)
|
||||
if(res.Result_Code==100) {
|
||||
_this.pageData.msg = res.Result_Data
|
||||
_this.pageData.msg.countave = (Number(_this.pageData.msg.Province_InsideAmount) / Number(_this.pageData.msg.TotalCount)).toFixed(2)
|
||||
@ -510,14 +463,20 @@
|
||||
}
|
||||
|
||||
// _this.pageData.msg.SearchResult
|
||||
if (this.BusinessTypeValue === 0 && this.SettlementModeValue === 0){
|
||||
if (this.searchText){
|
||||
this.showModal = false
|
||||
if (res.Result_Data.SearchResult){
|
||||
let newList = []
|
||||
res.Result_Data.SearchResult.forEach(item=>{
|
||||
newList.push(item.split(this.searchText))
|
||||
_this.pageData.msg.SearchResult = newList
|
||||
_this.copySearchText = JSON.parse(JSON.stringify(this.searchText))
|
||||
})
|
||||
}
|
||||
}else{
|
||||
if (this.BusinessTypeValue || this.SettlementModeValue){
|
||||
this.showModal = true
|
||||
}
|
||||
}
|
||||
_this.ServerpartList = res.Result_Data.revenueRegionModels
|
||||
}else if(res.Result_Code==200 || res.Result_Code==999){
|
||||
@ -534,8 +493,6 @@
|
||||
uni.hideLoading()
|
||||
_this.pageData.isLoading =false
|
||||
_this.$forceUpdate()
|
||||
console.log('this.BusinessTypeValue',this.BusinessTypeValue)
|
||||
console.log('this.SettlementModeValue',this.SettlementModeValue)
|
||||
})
|
||||
}
|
||||
},
|
||||
@ -573,7 +530,6 @@
|
||||
}
|
||||
this.BusinessTypeList = await this.handleEnumeration('BUSINESS_TYPE')
|
||||
this.SettlementModeList = await this.handleEnumeration('SETTLEMENT_MODES')
|
||||
console.log('BusinessTypeList',this.BusinessTypeList)
|
||||
this.getList()
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -65,14 +65,14 @@
|
||||
<span class="noticeLabel">本月预算:</span>
|
||||
<span class="noticeValue">{{subItem.budgetMonth||'-'}}万元</span>
|
||||
</view>
|
||||
<view class="noticeItem">
|
||||
<span class="noticeLabel">年度预算:</span>
|
||||
<span class="noticeValue">{{subItem.budgetYear||'-'}}万元</span>
|
||||
</view>
|
||||
<view class="noticeItem">
|
||||
<span class="noticeLabel">本月执行:</span>
|
||||
<span class="noticeValue">{{subItem.monthExecute||'-'}}万元</span>
|
||||
</view>
|
||||
<view class="noticeItem">
|
||||
<span class="noticeLabel">年度预算:</span>
|
||||
<span class="noticeValue">{{subItem.budgetYear||'-'}}万元</span>
|
||||
</view>
|
||||
<view class="noticeItem">
|
||||
<span class="noticeLabel">累计执行:</span>
|
||||
<span class="noticeValue">{{subItem.accumulateExecute||'-'}}万元</span>
|
||||
@ -105,14 +105,14 @@
|
||||
<span class="noticeLabel">本月预算:</span>
|
||||
<span class="noticeValue">{{thirdItem.budgetMonth||'-'}}万元</span>
|
||||
</view>
|
||||
<view class="noticeItem">
|
||||
<span class="noticeLabel">年度预算:</span>
|
||||
<span class="noticeValue">{{thirdItem.budgetYear||'-'}}万元</span>
|
||||
</view>
|
||||
<view class="noticeItem">
|
||||
<span class="noticeLabel">本月执行:</span>
|
||||
<span class="noticeValue">{{thirdItem.monthExecute||'-'}}万元</span>
|
||||
</view>
|
||||
<view class="noticeItem">
|
||||
<span class="noticeLabel">年度预算:</span>
|
||||
<span class="noticeValue">{{thirdItem.budgetYear||'-'}}万元</span>
|
||||
</view>
|
||||
<view class="noticeItem">
|
||||
<span class="noticeLabel">累计执行:</span>
|
||||
<span class="noticeValue">{{thirdItem.accumulateExecute||'-'}}万元</span>
|
||||
@ -142,14 +142,14 @@
|
||||
<span class="noticeLabel">本月预算:</span>
|
||||
<span class="noticeValue">{{fourthItem.budgetMonth||'-'}}万元</span>
|
||||
</view>
|
||||
<view class="noticeItem">
|
||||
<span class="noticeLabel">年度预算:</span>
|
||||
<span class="noticeValue">{{fourthItem.budgetYear||'-'}}万元</span>
|
||||
</view>
|
||||
<view class="noticeItem">
|
||||
<span class="noticeLabel">本月执行:</span>
|
||||
<span class="noticeValue">{{fourthItem.monthExecute||'-'}}万元</span>
|
||||
</view>
|
||||
<view class="noticeItem">
|
||||
<span class="noticeLabel">年度预算:</span>
|
||||
<span class="noticeValue">{{fourthItem.budgetYear||'-'}}万元</span>
|
||||
</view>
|
||||
<view class="noticeItem">
|
||||
<span class="noticeLabel">累计执行:</span>
|
||||
<span class="noticeValue">{{fourthItem.accumulateExecute||'-'}}万元</span>
|
||||
@ -197,7 +197,7 @@ export default {
|
||||
{label:'按累计完成进度占比数排序',value:1},
|
||||
{label:'按本月完成进度占比数排序',value:2},
|
||||
{label:'按年度计划预算数值排序',value:3}],
|
||||
typeValue: 2,
|
||||
typeValue: 3,
|
||||
pageData: {},// 页面数据
|
||||
pageList: [],// 页面遍历的数据
|
||||
single:'', // 时间选择器选择的时间
|
||||
|
||||
@ -147,8 +147,8 @@
|
||||
|
||||
<view>利润总额完成率=本年累计/年度预算<br/>{{ `(${currentResult.profitThisYearReal||'-'} / ${currentResult.profitBudgetThisYearReal||'-'})` }}</view>
|
||||
<view>净利润完成度=本年净利润/净利润预算<br/>{{ `(${currentResult.thisYearNetProfitReal||'-'} / ${currentResult.thisYearNetProfitBudgetReal||'-'})` }}</view>
|
||||
<view>净利润预算=年度预算-年度预计所得税费用{{`(${currentResult.profitBudgetThisYearReal||'-'} / ${currentResult.profitBudgetThisYearReal - currentResult.thisYearNetProfitBudgetReal})`}}</view>
|
||||
<view>本年净利润=本年累计-本年累计所得税{{`(${currentResult.profitThisYearReal||'-'} / ${currentResult.profitThisYearReal - currentResult.thisYearNetProfitReal})`}}</view>
|
||||
<view>净利润预算=年度预算-年度预计所得税费用{{`(${currentResult.profitBudgetThisYearReal||'-'} - ${(currentResult.profitBudgetThisYearReal - currentResult.thisYearNetProfitBudgetReal).toFixed(2)})`}}</view>
|
||||
<view>本年净利润=本年累计-本年累计所得税{{`(${currentResult.profitThisYearReal||'-'} - ${(currentResult.profitThisYearReal - currentResult.thisYearNetProfitReal).toFixed(2)})`}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -610,8 +610,8 @@
|
||||
<view class="expenditureRateBox">
|
||||
<view class="expenditureRate">
|
||||
<view class="first" :style="{left:0,width: outFirst+'%',background:'#1679FF'}"></view>
|
||||
<view class="second" :style="{left:outFirst+'%',width: outSecond+'%',background:'#E7F1FF'}"></view>
|
||||
<view class="third" :style="{left:(outFirst + outSecond)+'%',width: outThird+'%',background:'#D5E6FD'}"></view>
|
||||
<view class="second" :style="{left:outFirst+'%',width: outSecond+'%',background: 'lightgreen'}"></view>
|
||||
<view class="third" :style="{left:(outFirst + outSecond)+'%',width: outThird+'%',background:'#D6E7FD'}"></view>
|
||||
<view class="fourth" :style="{left:(outFirst + outSecond + outThird)+'%',width: outFourth+'%',background:'grey'}"></view>
|
||||
</view>
|
||||
<view class="rateType">
|
||||
@ -620,11 +620,11 @@
|
||||
<span class="rateText">营业成本</span>
|
||||
</view>
|
||||
<view class="rateItem">
|
||||
<view class="rateColor" style="background: #E7F1FF"></view>
|
||||
<view class="rateColor" style="background: lightgreen"></view>
|
||||
<span class="rateText">销售费用</span>
|
||||
</view>
|
||||
<view class="rateItem">
|
||||
<view class="rateColor" style="background: #D5E6FD"></view>
|
||||
<view class="rateColor" style="background: #D6E7FD"></view>
|
||||
<span class="rateText">管理费用</span>
|
||||
</view>
|
||||
<view class="rateItem">
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user