From f37cb8aca6ae341351f2d698018cfe556400c2d3 Mon Sep 17 00:00:00 2001
From: cclu <1106109051@qq.com>
Date: Fri, 10 Nov 2023 11:50:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=88=E4=BC=A0=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/uni-popup.vue                |   2 +-
 pages/nationalPage/moreList.vue         |   2 +-
 pages/operatingStatements/detail.vue    |   5 +-
 pages/operatingStatements/index.vue     | 254 +++++++--
 pages/revenue/component/otherCharts.vue |   5 +-
 pages/revenue/index.vue                 | 678 ++++++------------------
 static/images/recons/delete.svg         |  14 +
 static/images/recons/search_icon.svg    |  12 +
 static/images/recons/select_icon.svg    |  11 +
 9 files changed, 418 insertions(+), 565 deletions(-)
 create mode 100644 static/images/recons/delete.svg
 create mode 100644 static/images/recons/search_icon.svg
 create mode 100644 static/images/recons/select_icon.svg

diff --git a/components/uni-popup.vue b/components/uni-popup.vue
index 3789166..77a3ebd 100644
--- a/components/uni-popup.vue
+++ b/components/uni-popup.vue
@@ -1,5 +1,5 @@
 <template>
-	<view @touchmove.prevent  >
+	<view @touchmove.prevent style="padding-bottom: 0" >
 		<view class="uni-mask" v-show="show" :style="{top:offsetTop + 'px',zIndex:998+showIndex}" @click="hide" @touchmove.prevent ></view>
 		<view :class="['uni-popup','uni-popup-'+type,round?'round':'' ]" :style="{zIndex:999+showIndex}" v-show="show">
 			<view class="header-top" v-if="msg!=''">{{msg}}</view>
diff --git a/pages/nationalPage/moreList.vue b/pages/nationalPage/moreList.vue
index c2b50b1..4cc4758 100644
--- a/pages/nationalPage/moreList.vue
+++ b/pages/nationalPage/moreList.vue
@@ -6,7 +6,7 @@
         <image :style="{bottom: ((statusBarHeight-24)/4)+'px' }" class="backArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/leftArrowWhite.svg" @click="handleBack"/>
       </div>
       <div class="topContent" :style="{top:200+'rpx'}">
-        <p class="pageTitle" >欢度国庆</p>
+        <p class="pageTitle" >节日特刊</p>
       </div>
     </div>
     <div class="pageContent">
diff --git a/pages/operatingStatements/detail.vue b/pages/operatingStatements/detail.vue
index c3099b6..99fcd16 100644
--- a/pages/operatingStatements/detail.vue
+++ b/pages/operatingStatements/detail.vue
@@ -125,7 +125,9 @@ import request from '@/util/index.js'
           startTime: obj.st,
           endTime: obj.et,
           serverpartId: obj.id,
-          provinceCode: obj.pcode
+          provinceCode: obj.pcode,
+          SearchKeyName:_this.pageOption.searchKey,
+          SearchKeyValue:_this.pageOption.searchValue
 				}).then(res=>{
           console.log('res',res)
 					if(res.Result_Code==100) {
@@ -143,6 +145,7 @@ import request from '@/util/index.js'
 
 		},
 		onLoad(op) {
+      console.log('op',op)
 			this.pageOption = op
       if (this.pageOption.st){
         this.pageData.searchTime[0] = this.pageOption.st
diff --git a/pages/operatingStatements/index.vue b/pages/operatingStatements/index.vue
index 9bda3bc..806423c 100644
--- a/pages/operatingStatements/index.vue
+++ b/pages/operatingStatements/index.vue
@@ -1,16 +1,32 @@
  <template>
 	<view class="page-body">
 		<!-- 日期筛选 -->
-		<div class="uni-flex ai-center screen-box">
-			<picker mode="date" @change="bindDateChange($event,0)" :value="pageData.searchTime[0]" :end="pageData.endDate" start="2018-12-01" class="screen-unit">
-				<text>{{pageData.searchTime[0]}}</text>
-				<text class="uni-icon uni-icon-arrowdown"></text>
-			</picker>
-			<text class="mr20">至</text>
-			<picker mode="date" @change="bindDateChange($event,1)" :value="pageData.searchTime[1]" :end="pageData.endDate" start="2018-12-01" class="screen-unit">
-				<text>{{pageData.searchTime[1]}}</text>
-				<text class="uni-icon uni-icon-arrowdown"></text>
-			</picker>
+		<div class="ai-center screen-box" style="padding-bottom: 8rpx">
+      <!--	搜索框内容 -->
+      <div style="display: flex;align-items: center;justify-content: space-between;padding: 10rpx 0">
+        <div class="search_box">
+          <img src="/static/images/recons/search_icon.svg" alt="" class="search_icon">
+          <input v-model="searchText" confirm-type="search" @confirm="getList" placeholder="请输入关键字"  class="select_input" clear/>
+          <img src="/static/images/recons/delete.svg" alt="" class="delete" @click="handleDelete">
+        </div>
+        <div class="select_btn" @click="handleSelect" v-if="false">
+          <img src="/static/images/recons/select_icon.svg" alt="" class="select_icon">
+          筛选
+        </div>
+      </div>
+    <!-- 查询时间 -->
+      <div  style="display: flex">
+        <picker mode="date" @change="bindDateChange($event,0)" :value="pageData.searchTime[0]" :end="pageData.endDate" start="2018-12-01" class="screen-unit">
+          <text>{{pageData.searchTime[0]}}</text>
+          <text class="uni-icon uni-icon-arrowdown"></text>
+        </picker>
+        <text class="mr20">至</text>
+        <picker mode="date" @change="bindDateChange($event,1)" :value="pageData.searchTime[1]" :end="pageData.endDate" start="2018-12-01" class="screen-unit">
+          <text>{{pageData.searchTime[1]}}</text>
+          <text class="uni-icon uni-icon-arrowdown"></text>
+        </picker>
+      </div>
+
 		</div>
 		<template v-if="!pageData.isLoading && pageData.msg && pageData.msg.Total_Revenue">
 			<view class="uni-flex ai-center head-card" >
@@ -46,32 +62,22 @@
           </view>
 
         </view>
-
-<!--				<view class="" v-if="pageData.msg && pageData.msg.Province_ExternalAmount">-->
-<!--					<div class="all-diff" @tap="regionType=!regionType">-->
-<!--						<image src="../../static/images/revenue/next.png"></image>-->
-<!--						切换-->
-<!--					  </div>-->
-<!--					<view>{{!regionType ?"省内" :"省外"}}实收</view>-->
-<!--					<view class="price-num">¥{{!regionType ? $util.fmoney(pageData.msg.Province_InsideAmount,2) : $util.fmoney(pageData.msg.Province_ExternalAmount,2)}}</view>-->
-<!--				</view>-->
-<!--				<view class="" v-else>-->
-<!--					<div class="all-diff" @tap="regionType=!regionType">-->
-<!--						<image src="../../static/images/revenue/next.png"></image>-->
-<!--						切换方向-->
-<!--					  </div>-->
-<!--					<view>{{!regionType ?"东 (南)" :"西 (北)"}}区实收</view>-->
-<!--					<view class="price-num">¥{{!regionType ? $util.fmoney(pageData.msg.Revenue_AmountS,2) : $util.fmoney(pageData.msg.Revenue_AmountN,2)}}</view>-->
-<!--				</view>-->
 			</view>
 			<view class="modle-title">
 				<image src="https://eshangtech.com/ShopICO/ahyd-BID/revenue/yestoday-region.png" mode="aspectFit"></image>
 				<text>经营报表</text>
 			</view>
+      <view class="modleText" v-if="pageData.msg.SearchResult">
+        <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>
+            {{subItem}}
+          </span>
+        </div>
+      </view>
 			<view class="bg-white" v-if="ServerpartList.length>0">
 				<view class="region-area-title uni-flex ai-center jc-between" v-show="pageData.msg.Province_ExternalAmount" :class="{'active':pageData.insideShow}" @tap="pageData.insideShow=!pageData.insideShow">
 					<text>省内区域</text>
-
 				</view>
 				<view v-show="pageData.insideShow">
 					<view v-for="(item,i) in ServerpartList" :key="i">
@@ -116,9 +122,7 @@
 									<text class="">{{item.Region_Name}}</text>
 									<div class="ct01">
 										<text class="strong-text">¥{{$util.fmoney(item.Total_Revenue,2)}}</text>
-
 									</div>
-
 								</div>
 								<div class="region-cell-unit">
 									<text>营收占比</text>
@@ -149,6 +153,30 @@
 			<noFound nodata=" true" :text="noDataText"/>
 		</view>
 
+
+    <uni-popup ref="popup"  type="bottom" style="background: #fff" :maskClick="false">
+      <div class="popupBox" style="box-sizing:border-box;height: 170px">
+        <div style="display: flex;align-items: center;justify-content: space-between">
+          <text class="title">请选择查询项</text>
+          <img src="/static/images/recons/delete.svg" alt="" class="delete" @click="handleClosePopup">
+        </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>
+
 	</view>
 
 </template>
@@ -178,12 +206,40 @@
 				insideRegionList: [], // 省外
         queryTime:'',// 传入的时间
         lastDay:'',// 首页的实际时间
+        searchText:'',// 搜索框内容
+        requestText:'',// 已经请求过接口的查询框内容
+        isScreen:false,// 显示popup里面的内容
+        checkBoxValue:['MerchantName','Brand','Shop'],// 查询的字段放接口里的
+        checkChange:['MerchantName','Brand','Shop'],// checkBox里面选择了 但是没点确定的
 			}
 		},
 		computed:{
 			...mapState({'ProvinceCode':(state)=>{return state.userData.ProvinceCode}}),
 		},
 		methods: {
+      handleChangeCheckBox(e){
+        this.checkChange = e.detail.value
+      },
+      handleConfirmCheckChange(){
+        this.checkBoxValue = this.checkChange
+        console.log('checkBoxValue',this.checkBoxValue)
+        this.$refs.popup.close()
+        this.isScreen= false
+        this.getList()
+      },
+      handleClosePopup(){
+        this.checkChange = this.checkBoxValue
+        this.$refs.popup.close()
+        this.isScreen= false
+      },
+      handleDelete(){
+        this.searchText = ''
+      },
+      handleSelect(){
+        this.$refs.popup.open()
+        this.isScreen= true
+        console.log('111')
+      },
 			toTrend(){
 				this.$util.toNextRoute('navigateTo','/pages/operatingStatements/operatingTrend?time='+this.pageData.searchTime[1])
 
@@ -197,10 +253,10 @@
 				}
 			},
 			searchList(){
-				uni.showLoading({
-					title:'正在加载',
-					mask:true
-				})
+				// uni.showLoading({
+				// 	title:'正在加载',
+				// 	mask:true
+				// })
 				this.getList()
 			},
 			toggleRegion(item) {
@@ -209,18 +265,31 @@
 			},
 			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])
+				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)
 				item.visited = true
 				this.$forceUpdate()
 			},
 			getList(){
+        uni.showLoading({
+          title:'正在加载',
+          mask:true
+        })
 				let _this = this
 				let searchTime = this.pageData.searchTime
-        console.log('searchTime',searchTime)
+        let searchName = ''
+        this.checkBoxValue.forEach(item=>{
+          if (searchName){
+            searchName+=`,${item}`
+          }else{
+            searchName = item
+          }
+        })
 				// _this.$request.$webGet('WeChat/GetRevenueReport',{
         request.$webGet('CommercialApi/Revenue/GetRevenueReport',{
 					startTime: searchTime[0],
 					endTime: searchTime[1],
+          SearchKeyName:searchName,
+          SearchKeyValue:this.searchText
 					// additionalCode: this.ProvinceCode=='330000' ? '451200,630000' :''
 				}).then(res=>{
           console.log('res',res)
@@ -237,13 +306,28 @@
 							_this.insideRegionList = res.Result_Data.revenueInsideRegionModels
 						}
 
+            // _this.pageData.msg.SearchResult
+            if (res.Result_Data.SearchResult){
+              let newList = []
+              res.Result_Data.SearchResult.forEach(item=>{
+                console.log('item.split(this.searchText)',item.split(this.searchText))
+                newList.push(item.split(this.searchText))
+                _this.pageData.msg.SearchResult = newList
+              })
+            }
+
 						_this.ServerpartList = res.Result_Data.revenueRegionModels
 					}else if(res.Result_Code==200 || res.Result_Code==999){
             _this.noDataText = '暂无数据'
+            _this.insideRegionList=[]
+            _this.pageData.msg = null
           }else{
 						_this.pageData.msg = null
 						_this.noDataText = res.Result_Desc
+            _this.insideRegionList=[]
 					}
+          _this.requestText = _this.searchText
+
 					uni.hideLoading()
 					_this.pageData.isLoading =false
 					_this.$forceUpdate()
@@ -251,11 +335,10 @@
 			}
 		},
 		onLoad(query) {
-			uni.showLoading({
-				title:'正在加载...',
-				mask:true
-			})
-      console.log('query',query)
+			// uni.showLoading({
+			// 	title:'正在加载...',
+			// 	mask:true
+			// })
       this.lastDay = uni.getStorageSync('lastDay')
       if (query.time){
         this.queryTime = query.time
@@ -288,10 +371,85 @@
 	}
 </script>
 
-<style>
+<style lang="scss" >
 	.page-body {
 		padding-bottom: 80rpx;
 	}
+
+  .search_box {
+    position: relative;
+    width: 558rpx;
+    height: 72rpx;
+    background: #F2F4F5;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    border-radius: 36rpx;
+    img {
+      width: 35rpx;
+      height: 35rpx;
+      margin: auto 16rpx auto 24rpx;
+    }
+    .select_input {
+      width: 420rpx;
+      border: none;
+      height: 40rpx;
+      font-size: 28rpx;
+    }
+    .delete{
+      width: 20px;
+      height: 20px;
+      position: absolute;
+      right: 0%;
+      z-index: 99;
+    }
+  }
+
+  .select_btn {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    font-size: 28rpx;
+    color: #6C737A;
+    img {
+      width: 35rpx;
+      height: 35rpx;
+      margin-right:12rpx;
+    }
+  }
+
+  .popupBox{
+    width: 100%;
+    background: #fff;
+    box-sizing: border-box;
+    padding: 24rpx;
+    .title{
+      font-size: 32rpx;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-weight: 400;
+      line-height: 40rpx;
+    }
+    .delete{
+      width: 20px;
+      height: 20px;
+    }
+    .checkBox{
+      padding: 30rpx 0;
+    }
+    .btn{
+      width: calc(100% - 48px);
+      margin-left: 24px;
+      padding: 15rpx 0;
+      text-align: center;
+      border-radius: 16rpx;
+      color:#fff;
+      background: #0A98D5;
+    }
+  }
+  ::v-deep.vue-ref{
+    padding-bottom: 0px!important;
+  }
+
 	.screen-box {
 		background-color: #fff;
 		padding: 0 20rpx;
@@ -423,11 +581,21 @@
 		padding-left: 24rpx;
 		font-size: 30rpx;
 		padding-top: 32rpx;
-		padding-bottom: 20rpx;
+		//padding-bottom: 20rpx;
 		font-weight: bolder;
 		display: flex;
 		align-items: center;
 	}
+  .modleText{
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0 24rpx 18rpx 74rpx;
+    .text{
+      font-size: 26rpx;
+      color: #929292;
+      white-space: pre-wrap;
+    }
+  }
 	.modle-title image {
 		max-width: 36rpx;
 		max-height: 36rpx;
diff --git a/pages/revenue/component/otherCharts.vue b/pages/revenue/component/otherCharts.vue
index b0a4686..a59ccac 100644
--- a/pages/revenue/component/otherCharts.vue
+++ b/pages/revenue/component/otherCharts.vue
@@ -37,9 +37,10 @@ export default {
             data:[{name:'已完成',value:success},{name:'未完成',value:error}]
           }]
         }
-
+        console.log('res',res)
         this.drawCharts('month',res)
-      }
+      },
+      immediate:true
     }
   },
   methods:{
diff --git a/pages/revenue/index.vue b/pages/revenue/index.vue
index c7362d9..9b6a6cf 100644
--- a/pages/revenue/index.vue
+++ b/pages/revenue/index.vue
@@ -17,14 +17,19 @@
       </view>
       <view :style="{width: '100%',height:(menu.top + menu.height) + 'px'}"></view>
 <!--      :style="{top: (menu.bottom+18) +'px'}"-->
-      <view class="pageTitle">财务营收报表</view>
+      <view style="display: flex;justify-content: space-between;align-items: center">
+        <view class="pageTitle">财务营收报表</view>
+        <picker style="margin-right: 34rpx;margin-top: 24rpx" mode="date" fields="month" :value="single" :start="startDate" :end="endData" @change="bindDateChange" >
+          <text class="timeText">{{single}}</text>
+        </picker>
+      </view>
 
       <view class="headerDetail" :style="{top: (menu.bottom+68) +'px'}">
         <view class="detailBox">
           <image class="monthSumBg" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/monthSum.png"/>
 
           <view class="detailPage">
-            <text class="detailPageTitle">7月累计收支比例</text>
+            <text class="detailPageTitle">{{ `${thisMonth}月累计收支比例` }}</text>
             <view class="notice"  @click="handleShowNotice('showCost')">?
               <view  class="noticeBox" :style="{left:'10%'}" v-if="showCost" @click.stop="handleShowNotice('showCost')">
                 <view>成本比：本月成本 / 本月收入</view>
@@ -39,34 +44,24 @@
             <view class="moneyItem">
               <view class="itemTop">
                 <view class="itemChart">
-                  <YearCharts :success="firstBox1st"/>
+                  <YearCharts :success="pageDetail.monthAmount.CostRate"/>
                 </view>
                 <view class="itemMessage">
-                  <text class="itemRate">39.39%</text>
-                  <view class="itemLabel">
-                    成本比
-<!--                    <view class="notice"  @click="handleShowNotice('showCost')">?-->
-<!--                      <view  class="noticeBox" :style="{left:0,zIndex:9}" v-if="showCost" @click.stop="handleShowNotice('showCost')">-->
-<!--                        <text>成本比：本月成本 / 本月收入</text>-->
-<!--                      </view>-->
-<!--                    </view>-->
-                  </view>
+                  <text class="itemRate">{{ `${pageDetail.monthAmount.CostRate||''}%`  }}</text>
+                  <view class="itemLabel">成本比</view>
                 </view>
               </view>
               <view class="successBox">
                 <view class="successBoxItem">
-                  <text class="successNumber">7,099.41</text>
+                  <text class="successNumber">{{ pageDetail.monthAmount.ThisMonthIn?$util.fmoney(pageDetail.monthAmount.ThisMonthIn / 10000,2):'' }}</text>
                   <view class="successTime">本月收入
                     <text class="successUnit">/万元</text>
-<!--                    <view class="notice" @click="handleShowNotice('showMonthRevenue')">?-->
-<!--                      <view class="noticeBox"  v-if="showMonthRevenue" @click.stop="handleShowNotice('showMonthRevenue')">-->
-<!--                        <text>本月收入：营业收入 + 营业外收入</text>-->
-<!--                      </view>-->
-<!--                    </view>-->
                   </view>
                 </view>
                 <view  class="successBoxItem" style="margin-top: 12rpx">
-                  <text class="successNumber"  style="color: #E83944">+50.59%</text>
+                  <text class="successNumber"  style="color: #E83944">{{
+                      `${pageDetail.monthAmount.IncomeChangeRate>0?'+':pageDetail.monthAmount.IncomeChangeRate<0?'-':''}${pageDetail.monthAmount.IncomeChangeRate||''}%`
+                    }}</text>
                   <text class="successTime">同比</text>
                 </view>
 
@@ -76,37 +71,26 @@
             <view class="moneyItem">
               <view class="itemTop">
                 <view class="itemChart">
-                  <YearCharts :success="firstBox2st"/>
+                  <YearCharts :success="pageDetail.monthAmount.InOutRate"/>
                 </view>
                 <view class="itemMessage">
-                  <text class="itemRate">167.27%</text>
-                  <view class="itemLabel">
-                    收支比
-<!--                      <view class="notice"  @click="handleShowNotice('showPay')">?-->
-<!--                        <view  class="noticeBox" :style="{right: 0}" v-if="showPay" @click.stop="handleShowNotice('showPay')">-->
-<!--                          <text>收支比：本月成本 / 本月支出</text>-->
-<!--                        </view>-->
-<!--                      </view>-->
-                  </view>
+                  <text class="itemRate">{{`${pageDetail.monthAmount.InOutRate||''}%`}}</text>
+                  <view class="itemLabel">收支比</view>
                 </view>
               </view>
               <view class="successBox">
                 <view class="successBoxItem">
-                  <text class="successNumber">4,244.22</text>
+                  <text class="successNumber">{{ $util.fmoney(pageDetail.monthAmount.ThisMonthOut/10000,2) }}</text>
                   <view class="successTime">
                     本月支出
                     <text class="successUnit">/万元</text>
-<!--                    <view class="notice" @click="handleShowNotice('showMonthExpenditure')">?-->
-<!--                      <view class="noticeBox" v-if="showMonthExpenditure"-->
-<!--                        @click.stop="handleShowNotice('showMonthExpenditure')">-->
-<!--                        <text>本月支出=管理费用 + 销售费用 + 财务费用 + 营业外支出</text>-->
-<!--                      </view>-->
-<!--                    </view>-->
                   </view>
 
                 </view>
                 <view class="successBoxItem" style="margin-top: 12rpx">
-                  <text class="successNumber" style="color: #E83944">+9.12%</text>
+                  <text class="successNumber" style="color: #E83944">{{
+                      `${pageDetail.monthAmount.PayoutChangeRate>0?'+':pageDetail.monthAmount.PayoutChangeRate<0?'-':''}${pageDetail.monthAmount.PayoutChangeRate||''}%`
+                    }}</text>
                   <text class="successTime">同比</text>
                 </view>
               </view>
@@ -120,14 +104,11 @@
       <view class="profitYear">
         <view class="itemBox">
           <view style="display: flex;align-items: center">
-            <view class="itemBoxTitle">2023年度累计利润</view>
+            <view class="itemBoxTitle">{{ `${thisYear}年度累计利润` }}</view>
             <view class="notice" @click="handleShowNotice('successRate')">?
               <view class="noticeBox" :style="{left:'10%',top:'15px'}" v-if="successRate" @click.stop="handleShowNotice('successRate')">
-                <view>利润总额完成率=本年累计/年度预算<br/>(389.00/275.00)</view>
-<!--                <view>本年累计：本年度利润总额的累计数</view>-->
-<!--                <view>年度预算：本年度利润总额的预算数</view>-->
-<!--                <view>净利润预算：本年度净利润的预算数</view>-->
-                <view>净利润完成度=本年净利润/净利润预算<br/>(292.00/156.00)</view>
+                <view>利润总额完成率=本年累计/年度预算<br/>{{ `(${$util.fmoney(pageDetail.yearProfit.ThisYearTotal/10000,2)} / ${$util.fmoney(pageDetail.yearProfit.ThisYearBudget/10000,2)})` }}</view>
+                <view>净利润完成度=本年净利润/净利润预算<br/>{{ `(${$util.fmoney(pageDetail.yearProfit.ThisYearTotalC/10000,2)} / ${$util.fmoney(pageDetail.yearProfit.ThisYearBudgetC/10000,2)})` }}</view>
               </view>
             </view>
           </view>
@@ -135,81 +116,49 @@
           <view class="itemDetailBox">
             <view class="detailBoxTop">
               <view class="successLabel">
-                <text class="successLabelText"></text>完成率
-<!--                <view class="notice" @click="handleShowNotice('successRate')">?-->
-<!--                  <view class="noticeBox" v-if="successRate" @click.stop="handleShowNotice('successRate')">-->
-<!--                    <text>完成率=本年累计/年度预算<br/>(389.00/275.00)</text>-->
-<!--                  </view>-->
-<!--                </view>-->
+                <text class="successLabelText">完成率</text>
               </view>
-              <text class="successValue">{{secondBoxProgress + '%'}}</text>
+              <text class="successValue">{{`${pageDetail.yearProfit.CompleteRate||''}%`}}</text>
             </view>
 
             <view class="progress">
-              <view class="have" :style="{width:secondBoxProgress>100?'100%':secondBoxProgress + '%'}"></view>
+              <view class="have" :style="{width:secondBoxProgress>100?'100%':pageDetail.yearProfit.CompleteRate}"></view>
             </view>
 
             <view class="yearDetail">
               <view class="yearItem">
-                <view class="itemValue">
-                  389.00
-<!--                  <view class="notice"  @click="handleShowNotice('thisYearSum')">?-->
-<!--                    <view class="noticeBox" style="top: 40px;left: 0" v-if="thisYearSum" @click.stop="handleShowNotice('thisYearSum')">-->
-<!--                      <text>本年度利润总额的累计数</text>-->
-<!--                    </view>-->
-<!--                  </view>-->
-                </view>
+                <view class="itemValue">{{$util.fmoney(pageDetail.yearProfit.ThisYearTotal/10000,2)}}</view>
                 <text class="itemLabel">本年累计<text class="itemUnit">/万元</text></text>
               </view>
 
               <view class="yearItem">
-                <view class="itemValue">
-                  275.00
-<!--                  <view class="notice" @click="handleShowNotice('budget')">?-->
-<!--                    <view class="noticeBox" :style="{ left: 'calc(33.3% + 30px)', top: '40px' }" v-if="budget"-->
-<!--                      @click.stop="handleShowNotice('budget')">-->
-<!--                      <text>本年度利润总额的预算数</text>-->
-<!--                    </view>-->
-<!--                  </view>-->
-                </view>
+                <view class="itemValue">{{$util.fmoney(pageDetail.yearProfit.ThisYearBudget/10000,2)}}</view>
                 <text class="itemLabel">年度预算<text class="itemUnit">/万元</text></text>
               </view>
 
               <view class="yearItem" style="width: 80px">
-                <view class="itemValue" style="color: #E83944">+105.59%</view>
+                <view class="itemValue" style="color: #E83944">{{
+                    `${pageDetail.yearProfit.TRate>0?'+':pageDetail.yearProfit.TRate<0?'-':''}${pageDetail.yearProfit.TRate||''}%`
+                  }}</view>
                 <text class="itemLabel">同比</text>
               </view>
             </view>
             <view class="yearDetail">
               <view class="yearItem">
-                <view class="itemValue">292.00</view>
+                <view class="itemValue">{{$util.fmoney(pageDetail.yearProfit.ThisYearTotalC/10000,2)}}</view>
                 <text class="itemLabel">本年净利润<text class="itemUnit">/万元</text></text>
               </view>
 
               <view class="yearItem">
-                <view class="itemValue">
-                  156.00
-<!--                  <view class="notice" @click="handleShowNotice('showNetProfit')">?-->
-<!--                    <view class="noticeBox" :style="{ left: 'calc(33.3% + 30px)', top: '115px' }" v-if="showNetProfit"-->
-<!--                      @click.stop="handleShowNotice('showNetProfit')">-->
-<!--                      <text>本年度净利润的预算数</text>-->
-<!--                    </view>-->
-<!--                  </view>-->
-                </view>
+                <view class="itemValue">{{$util.fmoney(pageDetail.yearProfit.ThisYearBudgetC/10000,2)}}</view>
                 <text class="itemLabel">净利润预算<text class="itemUnit">/万元</text></text>
               </view>
 
               <view class="yearItem" style="width: 80px">
-                <view class="itemValue" style="color: #E83944">187.18%</view>
-                <view class="itemLabel" style="display: flex;align-items: center">
-                  完成度
-<!--                  <view class="notice" @click="handleShowNotice('showYearNetProfit')">?-->
-<!--                    <view class="noticeBox" :style="{ right: '0', top: '115px' }" v-if="showYearNetProfit"-->
-<!--                      @click.stop="handleShowNotice('showYearNetProfit')">-->
-<!--                      <view>完成度=本年净利润/净利润预算<br/>(292.00/156.00)</view>-->
-<!--                    </view>-->
-<!--                  </view>-->
-                </view>
+                <view class="itemValue" style="color: #E83944">{{
+                    `${pageDetail.yearProfit.CompleteRateC||''}%`
+                  }}</view>
+                <view class="itemLabel" style="display: flex;align-items: center">完成度</view>
               </view>
             </view>
           </view>
@@ -288,13 +237,13 @@
       <view class="incomeAll">
         <view class="itemBox">
           <view style="width:100%;display: flex;align-items: center">
-            <view class="itemBoxTitle" style="color: #EC6C00">2023年收入合计</view>
+            <view class="itemBoxTitle" style="color: #EC6C00">{{ `${thisYear}年收入合计` }}</view>
             <view class="notice" @click="handleShowNotice('nowYearSum')">?
               <view class="noticeBox" :style="{ left: '10%', top: '20px' }" v-if="nowYearSum"
                     @click.stop="handleShowNotice('nowYearSum')">
 <!--                <view>包含营业外收入</view>-->
-                <view>完成率=本年累计 / 年度预算<br/>(473,766,021.71/726,870,000.00)</view>
-                <view>成本比=本年累计成本/本年累计收入<br/>(180,563,832.50/473,766,021.71)</view>
+                <view>完成率=本年累计 / 年度预算<br/>{{ `(${$util.fmoney(pageDetail.Income.ThisYearTotal,2)} / ${$util.fmoney(pageDetail.Income.ThisYearBudget,2)})` }}</view>
+                <view>成本比=本年累计成本/本年累计收入<br/>{{ `(${$util.fmoney(pageDetail.Income.ThisYearCost,2)} / ${$util.fmoney(pageDetail.Income.ThisYearTotal,2)})` }}</view>
                 <view>年度预算：年度预算包含营业外</view>
                 <view>年度预算同比： 本年累计收入的同比值</view>
               </view>
@@ -302,21 +251,14 @@
           </view>
           <image class="monthSumBg" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/allInCome.png" />
           <view class="itemDetailBox">
-<!--            @click="handleShowNotice('incomeSuccess')"-->
             <view class="leftCharts" >
-              <OtherCharts :success="firthBox1stRate" :colorList="['#FC7909', '#FEE4CE']" />
-              <text class="numberValue" style="color: #FE7500">65.18%</text>
-<!--              <view class="notices">-->
-<!--                <view class="noticeBox" :style="{ left: '0px', top: '50%' }" v-if="incomeSuccess"-->
-<!--                  @click.stop="handleShowNotice('incomeSuccess')">-->
-<!--                  <text>完成率=本年累计 / 年度预算(473,766,021.71/726,870,000.00)</text>-->
-<!--                </view>-->
-<!--              </view>-->
+              <OtherCharts :success="pageDetail.Income.CompleteRate" :colorList="['#FC7909', '#FEE4CE']" />
+              <text class="numberValue" style="color: #FE7500">{{`${pageDetail.Income.CompleteRate||''}%`}}</text>
             </view>
             <view class="rightBox">
               <view class="rightBoxTop">
                 <view class="itemTop">
-                  <text class="itemTopValue">47,376.60</text>
+                  <text class="itemTopValue">{{ $util.fmoney(pageDetail.Income.ThisYearTotal/10000,2) }}</text>
                   <view class="itemTopTitle" style="display: flex;align-items: center">
                     本年累计
                     <text class="itemTopUnit">/万元</text>
@@ -324,50 +266,28 @@
                   </view>
                 </view>
                 <view class="itemRateBox">
-                  <view class="addRate">38.11%</view>
-                  <view class="rateText" style="display: flex;align-items: center">
-                    成本比
-<!--                    <view class="notice" @click="handleShowNotice('nowYearRevenueCost')">?-->
-<!--                      <view class="noticeBox" :style="{ right: '0', top: '20px' }" v-if="nowYearRevenueCost"-->
-<!--                        @click.stop="handleShowNotice('nowYearRevenueCost')">-->
-<!--                        <text>成本比=本年累计成本/本年累计收入(180,563,832.50/473,766,021.71)</text>-->
-<!--                      </view>-->
-<!--                    </view>-->
-                  </view>
+                  <view class="addRate">{{`${pageDetail.Income.CostRate||''}%`}}</view>
+                  <view class="rateText" style="display: flex;align-items: center">成本比</view>
                 </view>
               </view>
               <view class="rightBoxTop" style="margin-top: 32rpx">
                 <view class="itemTop">
-                  <text class="itemTopValue">72,687.00</text>
+                  <text class="itemTopValue">{{$util.fmoney(pageDetail.Income.ThisYearBudget/10000,2)}}</text>
                   <view class="itemTopTitle" style="display: flex;align-items: center">
                     年度预算
                     <text class="itemTopUnit">/万元</text>
-<!--                    <view class="notice" @click="handleShowNotice('nowYearBudget')">?-->
-<!--                      <view class="noticeBox" :style="{ left: '33%', top: '80%' }" v-if="nowYearBudget"-->
-<!--                        @click.stop="handleShowNotice('nowYearBudget')">-->
-<!--                        <text>年度预算包含营业外</text>-->
-<!--                      </view>-->
-<!--                    </view>-->
                   </view>
                 </view>
                 <view class="itemRateBox">
-                  <view class="addRate">+48.54%</view>
-                  <view class="rateText" style="display: flex;align-items: center">
-                    同比
-<!--                    <view class="notice" @click="handleShowNotice('nowYearSumRate')">?-->
-<!--                      <view class="noticeBox" :style="{ right: '0%', top: '80%' }" v-if="nowYearSumRate"-->
-<!--                        @click.stop="handleShowNotice('nowYearSumRate')">-->
-<!--                        <text>本年累计收入的同比值</text>-->
-<!--                      </view>-->
-<!--                    </view>-->
-                  </view>
+                  <view class="addRate">{{`${pageDetail.Income.IncomeChangeRate>0?'+':pageDetail.Income.IncomeChangeRate<0?'-':''}${pageDetail.Income.IncomeChangeRate||''}%`}}</view>
+                  <view class="rateText" style="display: flex;align-items: center">同比</view>
                 </view>
               </view>
             </view>
           </view>
         </view>
         <view class="itemDetailSubtotal">
-          <view class="itemSmallBox">
+          <view class="itemSmallBox" v-for="(item,index) in pageDetail.Income.Items" :key="index">
             <view class="xian"></view>
             <view class="itemSmallTop">
               <view class="leftBox">
@@ -375,17 +295,26 @@
                   <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/selfOperat.svg" />
                 </view>
                 <view style="display: flex;align-items: center">
-                  <view class="smallTitle">自营收入小计</view>
-                  <view class="notice" @click="handleShowNotice('userRevenueSmallSum')">?
-                    <view class="noticeBox" :style="{ left: '10%', top: '20px' }" v-if="userRevenueSmallSum"
-                      @click.stop="handleShowNotice('userRevenueSmallSum')">
-                      <view>便利店、餐饮及客房的累计数</view>
-                      <view>完成率=本年累计自营收入 / 自营收入的年度预算<br/>(339,787,552.17/473,920,000.00)</view>
-                      <view>本月占比=7月自营收入 / 本年累计自营收入(50,708,267.25/339,787,552.17)</view>
-                      <view>服务区自营小计：完成率=服务区自营收入 / 自营收入的年度预算<br/>(304,283,297.04/473,920,000.00)</view>
-                      <view>服务区自营小计：城市店、批发团购及通道费的累计数</view>
-                      <view>分公司收入小计：完成率=分公司收入 / 自营收入的年度预算<br/>(35,504,255.13/473,920,000.00)</view>
+                  <view class="smallTitle">{{ `${item.Name}` }}</view>
+                  <view class="notice" @click="incomeChildrenShow(item)">?
+                    <view class="noticeBox" :style="{left: '10%',top:'20px'}" v-if="childrenShow">
+                      <view v-if="userRevenueSmallSum && index===0" @click.stop="handleShowNotice('userRevenueSmallSum')">
+                        <view>便利店、餐饮及客房的累计数</view>
+                        <view>完成率 = 本年累计自营收入 / 自营收入的年度预算<br/>{{ `(${$util.fmoney(item.ThisYearTotal,2)} / ${$util.fmoney(item.ThisYearBudget,2)})` }}</view>
+                        <view>{{ `本月占比 = ${thisMonth}月自营收入 / 本年累计自营收入(${$util.fmoney(item.ThisMonthIncome,2)} / ${$util.fmoney(item.ThisYearTotal,2)}) `}}</view>
+                        <view>服务区自营小计：完成率=服务区自营收入 / 自营收入的年度预算<br/>{{ `${$util.fmoney(item.ServerpartIncome,2)} / ${$util.fmoney(item.ThisYearBudget,2)}` }}</view>
+                        <view>服务区自营小计：城市店、批发团购及通道费的累计数</view>
+                        <view>分公司收入小计：完成率=分公司收入 / 自营收入的年度预算<br/>{{ `${$util.fmoney(item.FilialeIncome,2)} / ${$util.fmoney(item.ThisYearBudget,2)}` }}</view>
+                      </view>
+                      <view v-if="otherSmallSum && index===1" @click.stop="handleShowNotice('otherSmallSum')">
+                        <view>场地租赁、物业及受托代管、公共服务补贴、营业外收入的累计数</view>
+                        <view>完成率=7月其他收入 / 其他收入的年度预算{{ `(${$util.fmoney(item.ThisYearTotal,2)}/ ${$util.fmoney(item.ThisYearBudget ,2)})` }}</view>
+                        <view>本月占比=7月其他收入 / 本年累计其他收入{{ `(${$util.fmoney(item.ThisMonthIncome ,2)}/ ${$util.fmoney(item.ThisYearTotal  ,2)})` }}</view>
+                        <view>服务区租赁小计：商铺、充电桩、汽修、加油站的租赁累计收入</view>
+                        <view>服务区租赁小计完成率=服务区租赁累计收入 / 本年累计其他收入<br/>{{ `(${$util.fmoney(item.ServerpartIncome  ,2)}/ ${$util.fmoney(item.ThisYearBudget,2)})` }}</view>
+                      </view>
                     </view>
+
                   </view>
                 </view>
               </view>
@@ -397,54 +326,33 @@
 
             <view class="itemSmallDetail">
               <view class="itemSmallLeftBox" >
-<!--                @click="handleShowNotice('compareYesSuccessRate')"-->
-                <OtherCharts :success="firthBox2stRate" :colorList="['#FC7909', '#F9DCC2']" />
-                <text class="leftValue">71.70%</text>
-<!--                <view class="notices">-->
-<!--                  <view class="noticeBox" :style="{ left: '30%', top: '100px' }" v-if="compareYesSuccessRate"-->
-<!--                    @click.stop="handleShowNotice('compareYesSuccessRate')">-->
-<!--                    <text>完成率=本年累计自营收入 / 自营收入的年度预算(339,787,552.17/473,920,000.00)</text>-->
-<!--                  </view>-->
-<!--                </view>-->
+                <OtherCharts :success="item.CompleteRate" :colorList="['#FC7909', '#F9DCC2']" />
+                <text class="leftValue">{{ `${item.CompleteRate || ''}%` }}</text>
               </view>
               <view class="itemSmallRightBox">
                 <view class="rightTopItem">
                   <view class="itemDetail">
-                    <view class="detailValue" style="font-size: 26rpx">33,978.75</view>
+                    <view class="detailValue" style="font-size: 26rpx">{{$util.fmoney(item.ThisYearTotal/10000,2)}}</view>
                     <view class="detailTitle">本年累计<text class="detailTitleUnit">/万元</text></view>
                   </view>
                   <view class="itemDetail">
                     <view class="detailValue" style="font-size: 26rpx;display: flex;align-items: center">
-                      5,070.82
-                      <!-- <view class="notice" @click="handleShowNotice('thisMonthSum')">?
-                        <view class="noticeBox" :style="{ right: '0px', top: '85px' }" v-if="thisMonthSum"
-                          @click.stop="handleShowNotice('thisMonthSum')">
-                          <text>7月</text>
-                        </view>
-                      </view> -->
+                      {{$util.fmoney(item.ThisMonthIncome/10000,2)}}
                     </view>
                     <view class="detailTitle">
-                      7月累计
+                      {{ `${thisMonth}月累计` }}
                       <text class="detailTitleUnit">/万元</text>
                     </view>
                   </view>
                 </view>
                 <view class="rightTopItem" style="margin-top: 32rpx">
                   <view class="itemDetail">
-                    <view class="detailValue">47,392</view>
+                    <view class="detailValue">{{$util.fmoney(item.ThisYearBudget/10000,2)}}</view>
                     <view class="detailTitle">年度预算<text class="detailTitleUnit">/万元</text></view>
                   </view>
                   <view class="itemRight">
-                    <view class="rightValue">14.92%</view>
-                    <view class="rightLabel" style="display: flex;align-items: center">
-                      本月占比
-<!--                      <view class="notice" @click="handleShowNotice('thisMonthRevenueRate')">?-->
-<!--                        <view class="noticeBox" :style="{ right: '0px', top: '120px' }" v-if="thisMonthRevenueRate"-->
-<!--                          @click.stop="handleShowNotice('thisMonthRevenueRate')">-->
-<!--                          <text>本月占比=7月自营收入 / 本年累计自营收入(50,708,267.25/339,787,552.17)</text>-->
-<!--                        </view>-->
-<!--                      </view>-->
-                    </view>
+                    <view class="rightValue">{{ `${item.ThisMonthIncomeRate||''}%` }}</view>
+                    <view class="rightLabel" style="display: flex;align-items: center">本月占比</view>
                   </view>
                 </view>
               </view>
@@ -459,135 +367,19 @@
 
                 <view class="smallSumRight" style="display: flex;align-items: center">
                   <text class="successText" style="margin-left: 4rpx">完成率</text>
-                  <text class="successValue">64.21%</text>
-<!--                  <view class="notice" @click="handleShowNotice('thisMonthSmallSumSuccess1st')">?-->
-<!--                    <view class="noticeBox" :style="{ right: '0px', top: '190px' }" v-if="thisMonthSmallSumSuccess1st"-->
-<!--                      @click.stop="handleShowNotice('thisMonthSmallSumSuccess1st')">-->
-<!--                      <view>完成率=服务区自营收入 / 自营收入的年度预算<br/>(304,283,297.04/473,920,000.00)</view>-->
-<!--                    </view>-->
-<!--                  </view>-->
+                  <text class="successValue">{{ `${item.ServerpartCompleteRate||''}%`}}</text>
                 </view>
               </view>
 
-              <view class="smallSumItem">
+              <view class="smallSumItem" v-if="index===0">
                 <view class="smallSumLeft" style="display: flex;align-items: center">
                   <view class="smallSumItemBox"></view>
                   <text class="smallTitle">分公司收入小计</text>
-<!--                  <view class="notice" @click="handleShowNotice('thisMonthSmallSumSuccess2stTitle')">?-->
-<!--                    <view class="noticeBox" :style="{ left: '0px', top: '210px' }"-->
-<!--                      v-if="thisMonthSmallSumSuccess2stTitle"-->
-<!--                      @click.stop="handleShowNotice('thisMonthSmallSumSuccess2stTitle')">-->
-<!--                      <text>城市店、批发团购及通道费的累计数</text>-->
-<!--                    </view>-->
-<!--                  </view>-->
                 </view>
 
                 <view class="smallSumRight" style="display: flex;align-items: center">
                   <text class="successText" style="margin-left: 4rpx">完成率</text>
-                  <text class="successValue">7.49%</text>
-<!--                  <view class="notice" @click="handleShowNotice('thisMonthSmallSumSuccess2st')">?-->
-<!--                    <view class="noticeBox" :style="{ right: '0px', top: '210px' }" v-if="thisMonthSmallSumSuccess2st"-->
-<!--                      @click.stop="handleShowNotice('thisMonthSmallSumSuccess2st')">-->
-<!--                      <view>完成率=分公司收入 / 自营收入的年度预算<br/>(35,504,255.13/473,920,000.00)</view>-->
-<!--                    </view>-->
-<!--                  </view>-->
-                </view>
-              </view>
-            </view>
-          </view>
-
-          <view class="itemSmallBox">
-            <view class="itemSmallTop">
-              <view class="leftBox" style="display: flex;align-items: center">
-                <view class="smallIcon">
-                  <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/otherSum.svg" />
-                </view>
-                <view class="smallTitle">其他收入小计</view>
-                <view class="notice" @click="handleShowNotice('otherSmallSum')">?
-                  <view class="noticeBox" :style="{ left: '10%', top: '20px' }" v-if="otherSmallSum"
-                    @click.stop="handleShowNotice('otherSmallSum')">
-                    <view>场地租赁、物业及受托代管、公共服务补贴、营业外收入的累计数</view>
-                    <view>完成率=7月其他收入 / 其他收入的年度预算(133,978,469.54/252,950,000.00)</view>
-                    <view>本月占比=7月其他收入 / 本年累计其他收入(20,285,867.69/133,978,469.54)</view>
-                    <view>服务区租赁小计：商铺、充电桩、汽修、加油站的租赁累计收入</view>
-                    <view>服务区租赁小计完成率=服务区租赁累计收入 / 本年累计其他收入<br/>(91,051,247.82/252,950,000.00)</view>
-                  </view>
-                </view>
-              </view>
-              <view class="leftRight" @click="handleGoInComeDetail">
-                <text class="more">查看更多</text>
-                <image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/moreIcon.svg" />
-              </view>
-            </view>
-
-            <view class="itemSmallDetail">
-<!--              @click="handleShowNotice2('otherLeftChar')"-->
-              <view class="itemSmallLeftBox" >
-                <OtherCharts :success="firthBox3stRate" :colorList="['#FC7909', '#F9DCC2']" />
-                <text class="leftValue">52.97%</text>
-<!--                <view class="notices">-->
-<!--                  <view class="noticeBox" :style="{ left: '30%', top: '100px' }" v-if="otherLeftChar"-->
-<!--                    @click.stop="handleShowNotice2('otherLeftChar')">-->
-<!--                    <text>完成率=7月其他收入 / 其他收入的年度预算(133,978,469.54/252,950,000.00)</text>-->
-<!--                  </view>-->
-<!--                </view>-->
-              </view>
-              <view class="itemSmallRightBox">
-                <view class="rightTopItem">
-                  <view class="itemDetail">
-                    <view class="detailValue">13,397.84</view>
-                    <view class="detailTitle">本年累计<text class="detailTitleUnit">/万元</text></view>
-                  </view>
-                  <view class="itemDetail">
-                    <view class="detailValue" style="display: flex;align-items: center">
-                      2,028.58
-                    </view>
-                    <view class="detailTitle">7月累计<text class="detailTitleUnit">/万元</text></view>
-                  </view>
-                </view>
-                <view class="rightTopItem" style="margin-top: 32rpx">
-                  <view class="itemDetail">
-                    <view class="detailValue">25,295.00</view>
-                    <view class="detailTitle">年度预算<text class="detailTitleUnit">/万元</text></view>
-                  </view>
-                  <view class="itemRight">
-                    <view class="rightValue">15.14%</view>
-                    <view class="rightLabel" style="display: flex;align-items: center">
-                      本月占比
-<!--                      <view class="notice" @click="handleShowNotice2('otherThisMonthRate')">?-->
-<!--                        <view class="noticeBox" :style="{ right: '0px', top: '120px' }" v-if="otherThisMonthRate"-->
-<!--                          @click.stop="handleShowNotice2('otherThisMonthRate')">-->
-<!--                          <text>本月占比=7月其他收入 / 本年累计其他收入(20,285,867.69/133,978,469.54)</text>-->
-<!--                        </view>-->
-<!--                      </view>-->
-                    </view>
-                  </view>
-                </view>
-              </view>
-            </view>
-
-            <view class="smallSum">
-              <view class="smallSumItem">
-                <view class="smallSumLeft">
-                  <view class="smallSumItemBox"></view>
-                  <text class="smallTitle">服务区租赁小计</text>
-<!--                  <view class="notice" @click="handleShowNotice2('serviceSmallSum')">?-->
-<!--                    <view class="noticeBox" :style="{ right: '0px', top: '180px' }" v-if="serviceSmallSum"-->
-<!--                      @click.stop="handleShowNotice2('serviceSmallSum')">-->
-<!--                      <text>商铺、充电桩、汽修、加油站的租赁累计收入</text>-->
-<!--                    </view>-->
-<!--                  </view>-->
-                </view>
-
-                <view class="smallSumRight" style="display: flex;align-items: center">
-                  <text class="successText" style="margin-left: 4rpx">完成率</text>
-                  <text class="successValue">35.99%</text>
-<!--                  <view class="notice" @click="handleShowNotice2('otherThisMonthSuccess')">?-->
-<!--                    <view class="noticeBox" :style="{ right: '0px', top: '180px' }" v-if="otherThisMonthSuccess"-->
-<!--                      @click.stop="handleShowNotice2('otherThisMonthSuccess')">-->
-<!--                      <view>完成率=服务区租赁累计收入 / 本年累计其他收入<br/>(91,051,247.82/252,950,000.00)</view>-->
-<!--                    </view>-->
-<!--                  </view>-->
+                  <text class="successValue">{{ `${item.FilialeCompleteRate ||''}%`}}</text>
                 </view>
               </view>
             </view>
@@ -601,27 +393,27 @@
           <image class="monthSumBg" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/expenditure.png" />
           <view class="itemDetailBox">
             <view class="leftCharts">
-              <OtherCharts :success="number" :colorList="['#1679FF', '#E7F1FF']" />
-              <text class="numberValue" style="color: #1679FF">39.67%</text>
+              <OtherCharts :success="pageDetail.Const.CompleteRate" :colorList="['#1679FF', '#E7F1FF']" />
+              <text class="numberValue" style="color: #1679FF">{{`${pageDetail.Const.CompleteRate}%`}}</text>
             </view>
             <view class="rightBox">
               <view class="rightBoxTop">
                 <view class="itemTop">
-                  <text class="itemTopValue">35.00</text>
+                  <text class="itemTopValue">{{$util.fmoney(pageDetail.Const.ThisYearTotal/10000,2)}}</text>
                   <text class="itemTopTitle">2023年完成<text class="itemTopUnit">/万元</text></text>
                 </view>
                 <view class="itemRateBox">
-                  <view class="addRate">32.54%</view>
+                  <view class="addRate">{{`${pageDetail.Const.CostRate||''}%` }}</view>
                   <view class="rateText">成本比</view>
                 </view>
               </view>
               <view class="rightBoxTop">
                 <view class="itemTop">
-                  <text class="itemTopValue">300.00</text>
+                  <text class="itemTopValue">{{$util.fmoney(pageDetail.Const.ThisYearBudget/10000,2) }}</text>
                   <text class="itemTopTitle">2023年预计<text class="itemTopUnit">/万元</text></text>
                 </view>
                 <view class="itemRateBox">
-                  <view class="addRate">12.84%</view>
+                  <view class="addRate">{{ `${pageDetail.Const.PlanRate||''}%`  }}</view>
                   <view class="rateText">计划比</view>
                 </view>
               </view>
@@ -629,13 +421,13 @@
           </view>
         </view>
         <view class="itemDetailSubtotal">
-          <view class="itemSmallBox">
+          <view class="itemSmallBox" v-for="(item,index) in pageDetail.Const.Items" :key="index">
             <view class="itemSmallTop">
               <view class="leftBox">
                 <view class="smallIcon">
                   <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/operateSum.svg" />
                 </view>
-                <view class="smallTitle">运营成本小计</view>
+                <view class="smallTitle">{{ `${item.Name}小计` }}</view>
               </view>
               <view class="leftRight" @click="handleGoExpenditure">
                 <text class="more">查看更多</text>
@@ -645,27 +437,27 @@
 
             <view class="itemSmallDetail">
               <view class="itemSmallLeftBox">
-                <OtherCharts :success="number" :colorList="['#1679FF', '#E7F1FF']" />
-                <text class="leftValue">39.67%</text>
+                <OtherCharts :success="item.CompleteRate" :colorList="['#1679FF', '#E7F1FF']" />
+                <text class="leftValue">{{`${item.CompleteRate||''}%`}}</text>
               </view>
               <view class="itemSmallRightBox">
                 <view class="rightTopItem">
                   <view class="itemDetail">
-                    <view class="detailValue">35.00</view>
+                    <view class="detailValue">{{$util.fmoney(pageDetail.Const.ThisYearTotal/10000,2) }}</view>
                     <view class="detailTitle">2023年完成<text class="detailTitleUnit">/万元</text></view>
                   </view>
                   <view class="itemRight">
-                    <view class="rightValue">32.54%</view>
+                    <view class="rightValue">{{`${item.CostRate ||''}%`}}</view>
                     <view class="rightLabel">成本比</view>
                   </view>
                 </view>
                 <view class="rightTopItem" style="margin-top: 32rpx">
                   <view class="itemDetail">
-                    <view class="detailValue">35.00</view>
+                    <view class="detailValue">{{$util.fmoney(pageDetail.Const.ThisYearBudget/10000,2) }}</view>
                     <view class="detailTitle">2023年预计<text class="detailTitleUnit">/万元</text></view>
                   </view>
                   <view class="itemRight">
-                    <view class="rightValue">32.54%</view>
+                    <view class="rightValue">{{`${item.PlanRate  ||''}%`}}</view>
                     <view class="rightLabel">计划比</view>
                   </view>
                 </view>
@@ -681,7 +473,7 @@
 
                 <view class="smallSumRight">
                   <text class="successText">完成率</text>
-                  <text class="successValue">12.84%</text>
+                  <text class="successValue">{{`${item.ServerpartCompleteRate   ||''}%`}}</text>
                 </view>
               </view>
 
@@ -693,217 +485,7 @@
 
                 <view class="smallSumRight">
                   <text class="successText">完成率</text>
-                  <text class="successValue">15.87%</text>
-                </view>
-              </view>
-            </view>
-          </view>
-
-          <view class="itemSmallBox">
-            <view class="itemSmallTop">
-              <view class="leftBox">
-                <view class="smallIcon">
-                  <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/operateManager.svg" />
-                </view>
-                <view class="smallTitle">管理费用小计</view>
-              </view>
-              <view class="leftRight" @click="handleGoExpenditure">
-                <text class="more">查看更多</text>
-                <image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/moreIcon.svg" />
-              </view>
-            </view>
-
-            <view class="itemSmallDetail">
-              <view class="itemSmallLeftBox">
-                <OtherCharts :success="number" :colorList="['#1679FF', '#E7F1FF']" />
-                <text class="leftValue">39.67%</text>
-              </view>
-              <view class="itemSmallRightBox">
-                <view class="rightTopItem">
-                  <view class="itemDetail">
-                    <view class="detailValue">35.00</view>
-                    <view class="detailTitle">2023年完成<text class="detailTitleUnit">/万元</text></view>
-                  </view>
-                  <view class="itemRight">
-                    <view class="rightValue">32.54%</view>
-                    <view class="rightLabel">成本比</view>
-                  </view>
-                </view>
-                <view class="rightTopItem" style="margin-top: 32rpx">
-                  <view class="itemDetail">
-                    <view class="detailValue">35.00</view>
-                    <view class="detailTitle">2023年预计<text class="detailTitleUnit">/万元</text></view>
-                  </view>
-                  <view class="itemRight">
-                    <view class="rightValue">32.54%</view>
-                    <view class="rightLabel">计划比</view>
-                  </view>
-                </view>
-              </view>
-            </view>
-
-            <view class="smallSum">
-              <view class="smallSumItem">
-                <view class="smallSumLeft">
-                  <view class="smallSumItemBox"></view>
-                  <text class="smallTitle">运营成本小计</text>
-                </view>
-
-                <view class="smallSumRight">
-                  <text class="successText">完成率</text>
-                  <text class="successValue">12.84%</text>
-                </view>
-              </view>
-
-              <view class="smallSumItem">
-                <view class="smallSumLeft">
-                  <view class="smallSumItemBox"></view>
-                  <text class="smallTitle">分公司收入小计</text>
-                </view>
-
-                <view class="smallSumRight">
-                  <text class="successText">完成率</text>
-                  <text class="successValue">15.87%</text>
-                </view>
-              </view>
-            </view>
-          </view>
-
-          <view class="itemSmallBox">
-            <view class="itemSmallTop">
-              <view class="leftBox">
-                <view class="smallIcon">
-                  <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/buySum.svg" />
-                </view>
-                <view class="smallTitle">销售费用小计</view>
-              </view>
-              <view class="leftRight" @click="handleGoExpenditure">
-                <text class="more">查看更多</text>
-                <image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/moreIcon.svg" />
-              </view>
-            </view>
-
-            <view class="itemSmallDetail">
-              <view class="itemSmallLeftBox">
-                <OtherCharts :success="number" :colorList="['#1679FF', '#E7F1FF']" />
-                <text class="leftValue">39.67%</text>
-              </view>
-              <view class="itemSmallRightBox">
-                <view class="rightTopItem">
-                  <view class="itemDetail">
-                    <view class="detailValue">35.00</view>
-                    <view class="detailTitle">2023年完成<text class="detailTitleUnit">/万元</text></view>
-                  </view>
-                  <view class="itemRight">
-                    <view class="rightValue">32.54%</view>
-                    <view class="rightLabel">成本比</view>
-                  </view>
-                </view>
-                <view class="rightTopItem" style="margin-top: 32rpx">
-                  <view class="itemDetail">
-                    <view class="detailValue">35.00</view>
-                    <view class="detailTitle">2023年预计<text class="detailTitleUnit">/万元</text></view>
-                  </view>
-                  <view class="itemRight">
-                    <view class="rightValue">32.54%</view>
-                    <view class="rightLabel">计划比</view>
-                  </view>
-                </view>
-              </view>
-            </view>
-
-            <view class="smallSum">
-              <view class="smallSumItem">
-                <view class="smallSumLeft">
-                  <view class="smallSumItemBox"></view>
-                  <text class="smallTitle">运营成本小计</text>
-                </view>
-
-                <view class="smallSumRight">
-                  <text class="successText">完成率</text>
-                  <text class="successValue">12.84%</text>
-                </view>
-              </view>
-
-              <view class="smallSumItem">
-                <view class="smallSumLeft">
-                  <view class="smallSumItemBox"></view>
-                  <text class="smallTitle">分公司收入小计</text>
-                </view>
-
-                <view class="smallSumRight">
-                  <text class="successText">完成率</text>
-                  <text class="successValue">15.87%</text>
-                </view>
-              </view>
-            </view>
-          </view>
-
-          <view class="itemSmallBox">
-            <view class="itemSmallTop">
-              <view class="leftBox">
-                <view class="smallIcon">
-                  <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/otherBuy.svg" />
-                </view>
-                <view class="smallTitle">其他费用小计</view>
-              </view>
-              <view class="leftRight" @click="handleGoExpenditure">
-                <text class="more">查看更多</text>
-                <image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/moreIcon.svg" />
-              </view>
-            </view>
-
-            <view class="itemSmallDetail">
-              <view class="itemSmallLeftBox">
-                <OtherCharts :success="number" :colorList="['#1679FF', '#E7F1FF']" />
-                <text class="leftValue">39.67%</text>
-              </view>
-              <view class="itemSmallRightBox">
-                <view class="rightTopItem">
-                  <view class="itemDetail">
-                    <view class="detailValue">35.00</view>
-                    <view class="detailTitle">2023年完成<text class="detailTitleUnit">/万元</text></view>
-                  </view>
-                  <view class="itemRight">
-                    <view class="rightValue">32.54%</view>
-                    <view class="rightLabel">成本比</view>
-                  </view>
-                </view>
-                <view class="rightTopItem" style="margin-top: 32rpx">
-                  <view class="itemDetail">
-                    <view class="detailValue">35.00</view>
-                    <view class="detailTitle">2023年预计<text class="detailTitleUnit">/万元</text></view>
-                  </view>
-                  <view class="itemRight">
-                    <view class="rightValue">32.54%</view>
-                    <view class="rightLabel">计划比</view>
-                  </view>
-                </view>
-              </view>
-            </view>
-
-            <view class="smallSum">
-              <view class="smallSumItem">
-                <view class="smallSumLeft">
-                  <view class="smallSumItemBox"></view>
-                  <text class="smallTitle">运营成本小计</text>
-                </view>
-
-                <view class="smallSumRight">
-                  <text class="successText">完成率</text>
-                  <text class="successValue">12.84%</text>
-                </view>
-              </view>
-
-              <view class="smallSumItem">
-                <view class="smallSumLeft">
-                  <view class="smallSumItemBox"></view>
-                  <text class="smallTitle">分公司收入小计</text>
-                </view>
-
-                <view class="smallSumRight">
-                  <text class="successText">完成率</text>
-                  <text class="successValue">15.87%</text>
+                  <text class="successValue">{{`${item.FilialeCompleteRate ||''}%`}}</text>
                 </view>
               </view>
             </view>
@@ -917,6 +499,7 @@
 <script>
 import YearCharts from "./component/yearCharts.vue";
 import OtherCharts from './component/otherCharts.vue'
+import request from '@/util/index.js'
 export default {
   components:{YearCharts,OtherCharts},
   data(){
@@ -964,17 +547,21 @@ export default {
       otherThisMonthSuccess:false,//其它收入的完成率
       serviceSmallSum:false,// 服务区租赁小计
       pageWidth:0,// 手机的宽度
+      single:'', // 时间选择器选择的时间
+      startDate:'',// 开始时间
+      endData:'', // 结束时间
+      thisYear:'',// 当前年份
+      thisMonth:'',// 当前月份
+      pageDetail:'',// 接口返回的数据
+      childrenShow:false,// 收入合计的显示框
     }
   },
   onLoad(){
     //  获取手机参数对页面进行适配
     let systemInfo = uni.getSystemInfoSync()
-    console.log('systemInfo',systemInfo)
     this.pageWidth = systemInfo.windowWidth
-    console.log('this.pageWidth',this.pageWidth)
     this.statusBarHeight = Number(systemInfo.statusBarHeight)
     this.menu = uni.getMenuButtonBoundingClientRect()
-    console.log('this.menu',this.menu)
     let _this = this
     // 延迟时间 相当于接口 把数据给图表组件
     setTimeout(()=>{
@@ -986,6 +573,18 @@ export default {
       _this.firthBox2stRate = 71.70
       _this.firthBox3stRate = 52.97
     },1000)
+
+    // 设置查询条件的开始时间和结束时间
+    const date = new Date()
+    let y = date.getFullYear()
+    let m = date.getMonth()+1
+    this.thisYear = y
+    this.startDate = `${y}-07`
+    this.endData = `${y}-09`
+    this.single =  `${y}-07`
+    this.thisMonth = '07'
+    // 请求的方法
+    this.handleGetData()
   },
   methods:{
     // 点击出现备注
@@ -1141,6 +740,42 @@ export default {
       uni.navigateTo({
         url: '/pages/revenue/expenditureDetail'
       });
+    },
+    // 请求数据的方法
+    async handleGetData(){
+      uni.showLoading({
+        title: '正在加载...'
+      })
+      const req = {
+        serverpartId:0,
+        year:this.thisYear,
+        month:this.thisMonth
+      }
+      const data = await request.$webGet('/CommercialApi/Budget/GetBudgetMainShow',req)
+      console.log('data',data)
+      this.pageDetail = data.Result_Data
+      uni.hideLoading()
+    },
+    // 修改时间的事件
+    bindDateChange(e){
+      console.log('e',e)
+      this.single = e.detail.value
+      this.thisYear = e.detail.value.split('-')[0]
+      this.thisMonth = e.detail.value.split('-')[1]
+      console.log('this.thisMonth',this.thisMonth)
+      this.handleGetData()
+    },
+    // 收入合计点击子项出现的悬浮框
+    incomeChildrenShow(item){
+      console.log('item',item)
+      this.childrenShow = true
+      if (item.Name==='自营收入小计'){
+        this.handleShowNotice('userRevenueSmallSum')
+      }else{
+        this.handleShowNotice('otherSmallSum')
+      }
+      console.log('userRevenueSmallSum',this.userRevenueSmallSum)
+      console.log('otherSmallSum',this.otherSmallSum)
     }
   }
 }
@@ -1220,6 +855,15 @@ export default {
       margin-top: 24rpx;
       margin-left: 32rpx;
     }
+    .timeText{
+      font-size: 30rpx;
+      font-family: Alimama ShuHeiTi;
+      font-weight: bold;
+      color: #FFFFFF;
+      line-height: 68rpx;
+      margin-top: 24rpx;
+      margin-left: 32rpx;
+    }
 
     .headerDetail{
       //position: absolute;
diff --git a/static/images/recons/delete.svg b/static/images/recons/delete.svg
new file mode 100644
index 0000000..dddd596
--- /dev/null
+++ b/static/images/recons/delete.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>表情/不满意备份_8@2x</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="小程序规范汇总" transform="translate(-344.000000, -3104.000000)">
+            <g id="关闭" transform="translate(344.000000, 3104.000000)">
+                <circle id="椭圆形" fill="#FEFFFE" cx="8" cy="8" r="8"></circle>
+                <g id="common_icons_miniprogram" fill="#9FA3A8">
+                    <path d="M8,0 C12.418278,0 16,3.581722 16,8 C16,12.418278 12.418278,16 8,16 C3.581722,16 0,12.418278 0,8 C0,3.581722 3.581722,0 8,0 Z M10.4041631,4.74730881 L8,7.152 L5.59583694,4.74730881 L4.74730881,5.59583694 L7.152,8 L4.74730881,10.4041631 L5.59583694,11.2526912 L8,8.848 L10.4041631,11.2526912 L11.2526912,10.4041631 L8.848,8 L11.2526912,5.59583694 L10.4041631,4.74730881 Z" id="图标颜色"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/static/images/recons/search_icon.svg b/static/images/recons/search_icon.svg
new file mode 100644
index 0000000..79a2226
--- /dev/null
+++ b/static/images/recons/search_icon.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>表情/不满意备份_13@2x</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="小程序规范汇总" transform="translate(-248.000000, -3104.000000)">
+            <g id="01-通用组件/2.Icon图标/1.Outlined线性/通用类-Search" transform="translate(248.000000, 3104.000000)">
+                <rect id="矩形" fill="#000000" fill-rule="nonzero" opacity="0" x="0" y="0" width="16" height="16"></rect>
+                <path d="M14.2125,13.3515625 L10.1546875,9.29375 C10.784375,8.4796875 11.125,7.484375 11.125,6.4375 C11.125,5.184375 10.6359375,4.009375 9.7515625,3.1234375 C8.8671875,2.2375 7.6890625,1.75 6.4375,1.75 C5.1859375,1.75 4.0078125,2.2390625 3.1234375,3.1234375 C2.2375,4.0078125 1.75,5.184375 1.75,6.4375 C1.75,7.6890625 2.2390625,8.8671875 3.1234375,9.7515625 C4.0078125,10.6375 5.184375,11.125 6.4375,11.125 C7.484375,11.125 8.478125,10.784375 9.2921875,10.15625 L13.35,14.2125 C13.4,14.2625 13.48125,14.2625 13.53125,14.2125 L14.2125,13.5328125 C14.2625,13.4828125 14.2625,13.4015625 14.2125,13.3515625 Z M8.9125,8.9125 C8.25,9.5734375 7.371875,9.9375 6.4375,9.9375 C5.503125,9.9375 4.625,9.5734375 3.9625,8.9125 C3.3015625,8.25 2.9375,7.371875 2.9375,6.4375 C2.9375,5.503125 3.3015625,4.6234375 3.9625,3.9625 C4.625,3.3015625 5.503125,2.9375 6.4375,2.9375 C7.371875,2.9375 8.2515625,3.3 8.9125,3.9625 C9.5734375,4.625 9.9375,5.503125 9.9375,6.4375 C9.9375,7.371875 9.5734375,8.2515625 8.9125,8.9125 Z" id="形状" fill="#9FA3A8"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/static/images/recons/select_icon.svg b/static/images/recons/select_icon.svg
new file mode 100644
index 0000000..8980fe4
--- /dev/null
+++ b/static/images/recons/select_icon.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>表情/不满意备份_11@2x</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="小程序规范汇总" transform="translate(-184.000000, -3104.000000)" fill="#9FA3A8">
+            <g id="矩形备份" transform="translate(184.000000, 3104.000000)">
+                <path d="M13.2919667,2 C13.7337945,2 14.0919667,2.3581722 14.0919667,2.8 C14.0919667,2.9871492 14.0263537,3.16837552 13.9065437,3.31214752 L10.185423,7.77749243 C10.065613,7.92126443 10,8.10249074 10,8.28963995 L10,13.2055728 C10,13.6474006 9.6418278,14.0055728 9.2,14.0055728 C9.07580392,14.0055728 8.95331347,13.9766567 8.84222912,13.9211146 L6.44222912,12.7211146 C6.1712019,12.585601 6,12.3085905 6,12.0055728 L6,8.28963995 C6,8.10249074 5.93438702,7.92126443 5.81457702,7.77749243 L2.09345627,3.31214752 C1.810605,2.972726 1.85646425,2.46827424 2.19588577,2.18542298 C2.33965777,2.06561298 2.52088409,2 2.70803329,2 L13.2919667,2 Z M12.608,3.12 L3.391,3.12 L6.67498486,7.0604859 C6.92658586,7.3624071 7.07859983,7.73315061 7.11267205,8.12201979 L7.12,8.28963995 L7.12,11.808 L8.879,12.687 L8.88,8.28963995 C8.88,7.89662662 9.00056384,7.5144966 9.22333682,7.19394651 L9.32501514,7.0604859 L12.608,3.12 Z"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file