From ad7e905587e1fb98bc95b7fb16ff589c21301f83 Mon Sep 17 00:00:00 2001
From: cclu <1106109051@qq.com>
Date: Mon, 28 Aug 2023 17:37:43 +0800
Subject: [PATCH] update

---
 pages/authorityApproval/index.vue             | 34 +++++------
 pages/expenseApproval/expenseApproval.vue     | 60 +++++++++----------
 pages/projectWarning/detail.vue               |  3 +
 pages/projectWarning/index.vue                | 16 ++---
 .../serviceAreaReimbursement.vue              | 54 ++++++++---------
 5 files changed, 85 insertions(+), 82 deletions(-)

diff --git a/pages/authorityApproval/index.vue b/pages/authorityApproval/index.vue
index 46b251e..7143cab 100644
--- a/pages/authorityApproval/index.vue
+++ b/pages/authorityApproval/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="uni-flex ai-center jc-around menu-list">
-			<MenuItem 
+			<MenuItem
 				v-for="(item,index) in menuList"
 				:key="index"
 				:item="item"
@@ -31,7 +31,7 @@
 				</view> -->
 				<view class="moduleTitle">业务类型</view>
 				<view class="uni-flex ai-center menu-list">
-					<MenuItem 
+					<MenuItem
 						v-for="(item,index) in selectList"
 						:key="index"
 						:item="item"
@@ -49,7 +49,7 @@
 </template>
 
 <script>
-	import ListUnit from './components/businessUnit.vue' 
+	import ListUnit from './components/businessUnit.vue'
 	import MenuItem from '@/components/menu/menuItem.vue'
 	import UniPop from '@/components/uni-popup.vue'
 	export default {
@@ -68,25 +68,25 @@
 				menuList: [
 					{
 						name: '待审批',
-						src: '../../../../../static/images/expense/type/shenp.png',
-						active: '../../../../../static/images/expense/type/shenpz.png',
+						src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/shenp.png',
+						active: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/shenpz.png',
 						id: 2000
 					},{
 						name: '已处理',
-						src: '../../../../../static/images/expense/type/yichl.png',
-						active: '../../../../../static/images/expense/type/yichlz.png',
+						src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/yichl.png',
+						active: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/yichlz.png',
 						id: '3000,9000'
 					},
 					// {
 					// 	name: '已发起',
-					// 	src: '@/static/images/expense/type/yifq.png',
-					// 	active: '@/static/images/expense/type/yifqz.png',
+					// 	src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/yifq.png',
+					// 	active: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/yifqz.png',
 					// 	id: 2
 					// },
 					{
 						name: '更多筛选',
-						src: '../../../../../static/images/expense/type/shaix.png',
-						active: '../../../../../static/images/expense/type/shaixz.png',
+						src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/shaix.png',
+						active: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/shaixz.png',
 						id: 4
 					},
 				],
@@ -111,7 +111,7 @@
 						src: '../../../../../static/images/expense/type/fksp.png',
 						typeId: 8
 					}
-					
+
 				],
 			}
 		},
@@ -125,7 +125,7 @@
 				this.showPop= false
 			},
 			handleClick(item){
-				if(item.id==4){ 
+				if(item.id==4){
 					this.showPop = true
 				}else{
 					this.activeType = item.id
@@ -158,7 +158,7 @@
 						BusinessProcessState: _this.activeType,
 						// SortStr: 'BusinessProcess_State,BusinessProcess_StartDate desc'
 				}).then(res => {
-					
+
 					uni.hideLoading()
 					if (res.Result_Code !== 100) {
 						_this.pageData.loading=false
@@ -174,11 +174,11 @@
 							state: n.BusinessProcess_State,
 							title: n.BusinessProcess_Desc,
 							type: n.Operation_Type
-							
+
 						}
 					})
 					this.pageData.list = _this.pageData.pageIndex===1 ? list : this.pageData.list.concat(list)
-					
+
 					if(list.length<_this.pageData.pageSize){
 						_this.pageData.isEnd = true
 					}
@@ -210,7 +210,7 @@
 		onLoad() {
 			uni.showLoading()
 			this.pageData.isLoading = true
-			
+
 		},
 		onShow() {
 			this.getData()
diff --git a/pages/expenseApproval/expenseApproval.vue b/pages/expenseApproval/expenseApproval.vue
index 1275819..49f1b35 100644
--- a/pages/expenseApproval/expenseApproval.vue
+++ b/pages/expenseApproval/expenseApproval.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="content" :style="showPop? 'overflow:hidden;height:100%;': ''">
-		
+
 		<view class="uni-flex ai-center jc-around menu-list">
-			<MenuItem 
+			<MenuItem
 				v-for="(item,index) in menuList"
 				:key="index"
 				:item="item"
@@ -18,7 +18,7 @@
 
 		<view v-if="pageList.length>0">
 			<list-unit v-for="(item,index) in pageList" :key="index" :item="item" :i="index" @goDetail="goDetail"></list-unit>
-			
+
 		</view>
 		<view v-else-if="!pageData.isLoading" style="height: 100%;">
 			<noFound :nodata="pageList.length>0 ? false : true"/>
@@ -26,7 +26,7 @@
 		<view class="load-more" v-if="pageList.length>0">
 			<text>{{!pageData.isEnd ? '正在加载,请稍后...':'——— 我是有底线的 ———'}}</text>
 		</view>
-		
+
 		<UniPop :show="showPop" @hidePopup="closePop" type="bottom" @touchmove.prevent round="true">
 			<view class="pb24">
 				<view class="moduleTitle">日期</view>
@@ -35,7 +35,7 @@
 				</view>
 				<view class="moduleTitle">财务流程</view>
 				<view class="uni-flex ai-center menu-list">
-					<MenuItem 
+					<MenuItem
 						v-for="(item,index) in selectList"
 						:key="index"
 						:item="item"
@@ -95,23 +95,23 @@
 				menuList: [
 					{
 						name: '待审批',
-						src: '../../../../../static/images/expense/type/shenp.png',
-						active: '../../../../../static/images/expense/type/shenpz.png',
+						src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/shenp.png',
+						active: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/shenpz.png',
 						id: 0
 					},{
 						name: '已处理',
-						src: '../../../../../static/images/expense/type/yichl.png',
-						active: '../../../../../static/images/expense/type/yichlz.png',
+						src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/yichl.png',
+						active: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/yichlz.png',
 						id: 1
 					},{
 						name: '已发起',
-						src: '../../../../../static/images/expense/type/yifq.png',
-						active: '../../../../../static/images/expense/type/yifqz.png',
+						src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/yifq.png',
+						active: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/yifqz.png',
 						id: 2
 					},{
 						name: '更多筛选',
-						src: '../../../../../static/images/expense/type/shaix.png',
-						active: '../../../../../static/images/expense/type/shaixz.png',
+						src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/shaix.png',
+						active: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/shaixz.png',
 						id: 4
 					},
 				],
@@ -178,7 +178,7 @@
 							src: '../../../../../static/images/expense/type/xzzcsp.png',
 						}
 						,{
-							name: '公务交通', 
+							name: '公务交通',
 							src: '../../../../../static/images/expense/type/gwjt.png',
 							typeId: "401207"
 						}
@@ -223,20 +223,20 @@
 							src: '../../../../../static/images/expense/type/zply.png',
 						}
 						,{
-							name:'领付款申请', 
+							name:'领付款申请',
 							typeId:"401304",
 							src: '../../../../../static/images/expense/type/jkdsp.png',
 						},
-						
+
 					]
 				}
 				}),
-			
+
 		},
 		methods: {
 			...mapMutations(['shouldReLoadingList']),
 			handleClick(item){
-				if(item.id==4){ 
+				if(item.id==4){
 					this.showPop = true
 				}else{
 					this.activeType = item.id
@@ -263,7 +263,7 @@
 			},
 			closePop (){
 				let popOldValue = this.popOldValue
-				
+
 				this.selectTypeIndex = popOldValue[1]
 				this.dateIndex = popOldValue[0]
 				this.showPop = false
@@ -278,24 +278,24 @@
 					DealState: DealState,
 					QueryDate: _this.dateList[_this.dateIndex].value
 				}).then(res => {
-				
+
 					if(!res.ResultCode ||res.ResultCode!='100'){
-						
+
 						_this.pageList = []
 					}else{
 						let list = res.Data.List
-						
+
 						_this.pageList = this.pageData.pageIndex==1 ? list : [..._this.pageList,...list]
-						
+
 						if (list.length < _this.pageData.pageSize) { // 返回条数小于每页条数
 							_this.pageData.isEnd = true
 						}
 						_this.$forceUpdate()
-					
+
 					}
 					uni.hideLoading()
 					setTimeout(function(){
-						
+
 						_this.pageData.isLoading = false
 					},500)
 				})
@@ -308,7 +308,7 @@
 			},
 			goDetail(item) {
 				this.$util.toNextRoute('navigateTo', "/pages/expenseApproval/expenseDetail?type="+item.ACCEPT_TYPE+"&id=" + item.FINANCEPROINST_ID)
-				
+
 			},
 		},
 		onPullDownRefresh() {
@@ -331,10 +331,10 @@
 				title:'正在加载'
 			})
 			this.getList()
-			
+
 		},
 		onUnload() {
-			
+
 			this.$util.addUserBehavior()
 		},
 		onShow() {
@@ -376,7 +376,7 @@
 		width: 100%;
 		background-color: #fff;
 		flex-wrap: wrap;
-		
+
 	}
 	.moduleTitle {
 		text-align: left;
@@ -389,7 +389,7 @@
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
-		
+
 	}
 	.pb24 {
 		padding-bottom: 24rpx;
diff --git a/pages/projectWarning/detail.vue b/pages/projectWarning/detail.vue
index b306ceb..02bf575 100644
--- a/pages/projectWarning/detail.vue
+++ b/pages/projectWarning/detail.vue
@@ -54,6 +54,9 @@
           <view>
             <view class="text">
               本项目驿达累计分润已达<span class="strong"><span clsas="strong" style="font-size: 14px">￥</span>{{ dataDetail.ROYALTY_PRICE|| '-' }}</span>,<br/>
+              <span v-if="dataDetail.EXPENSE_AMOUNT">其中已扣减水电物业费
+                <span class="strong"><span clsas="strong" style="font-size: 14px">￥</span>{{$util.fmoney(dataDetail.EXPENSE_AMOUNT)}}</span>
+              </span>,<br/>
               <span v-if="dataDetail.EXPIREDAYS!==0">预计<span class="strong">{{ dataDetail.EXPIREDAYS|| '-' }}</span>后完成</span>
               <span v-if="dataDetail.EXPIREDAYS===0" class="strong">已完成</span>保底！
             </view>
diff --git a/pages/projectWarning/index.vue b/pages/projectWarning/index.vue
index 4afddef..a793102 100644
--- a/pages/projectWarning/index.vue
+++ b/pages/projectWarning/index.vue
@@ -64,23 +64,23 @@ export default {
             menuList: [
             { //列表头部菜单选项标签
                 name: '全部',
-                src: '/static/images/expense/type/yifq.png',
-                active: '/static/images/expense/type/yifqz.png',
+                src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/yifq.png',
+                active: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/yifqz.png',
                 id: 0
             }, {
                 name: '待切换',
-                src: '/static/images/expense/type/shenp.png',
-                active: '/static/images/expense/type/shenpz.png',
+                src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/shenp.png',
+                active: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/shenpz.png',
                 id: 1
             }, {
                 name: '已切换',
-                src: '/static/images/expense/type/yichl.png',
-                active: '/static/images/expense/type/yichlz.png',
+                src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/yichl.png',
+                active: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/yichlz.png',
                 id: 2
             }, {
                 name: '更多筛选',
-                src: '/static/images/expense/type/shaix.png',
-                active: '/static/images/expense/type/shaixz.png',
+                src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/shaix.png',
+                active: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/shaixz.png',
                 id: 99
             } ],
             activeType: 0, // 选中的延期类型
diff --git a/pages/serviceAreaReimbursement/serviceAreaReimbursement.vue b/pages/serviceAreaReimbursement/serviceAreaReimbursement.vue
index ed33de8..9bae39e 100644
--- a/pages/serviceAreaReimbursement/serviceAreaReimbursement.vue
+++ b/pages/serviceAreaReimbursement/serviceAreaReimbursement.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="uni-flex ai-center jc-around menu-list">
-			<MenuItem 
+			<MenuItem
 				v-for="(item,index) in menuList"
 				:key="index"
 				:item="item"
@@ -17,7 +17,7 @@
 
 		<view v-if="pageList.length>0">
 			<list-unit v-for="(item,index) in pageList" :key="index" :item="item" :i="index" @goDetail="goDetail"></list-unit>
-			
+
 		</view>
 		<view v-else-if="!pageData.isLoading" style="height: 100%;">
 			<noFound :nodata="pageList.length>0 ? false : true"/>
@@ -25,7 +25,7 @@
 		<view class="load-more" v-if="pageList.length>0">
 			<text>{{!pageData.isEnd ? '正在加载,请稍后...':'——— 我是有底线的 ———'}}</text>
 		</view>
-		
+
 		<UniPop :show="showPop" @hidePopup="closePop" type="bottom" @touchmove.prevent round="true">
 			<view class="pb24">
 				<view class="moduleTitle">日期</view>
@@ -34,7 +34,7 @@
 				</view>
 				<view class="moduleTitle">财务流程</view>
 				<view class="uni-flex ai-center menu-list">
-					<MenuItem 
+					<MenuItem
 						v-for="(item,index) in selectList"
 						:key="index"
 						:item="item"
@@ -120,27 +120,27 @@
 				menuList: [
 					{
 						name: '待审批',
-						src: '../../../../../static/images/expense/type/shenp.png',
-						active: '../../../../../static/images/expense/type/shenpz.png',
+						src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/shenp.png',
+						active: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/shenpz.png',
 						id: 0
 					},{
 						name: '已处理',
-						src: '../../../../../static/images/expense/type/yichl.png',
-						active: '../../../../../static/images/expense/type/yichlz.png',
+						src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/yichl.png',
+						active: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/yichlz.png',
 						id: 1
 					},{
 						name: '已发起',
-						src: '../../../../../static/images/expense/type/yifq.png',
-						active: '../../../../../static/images/expense/type/yifqz.png',
+						src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/yifq.png',
+						active: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/yifqz.png',
 						id: 2
 					},{
 						name: '更多筛选',
-						src: '../../../../../static/images/expense/type/shaix.png',
-						active: '../../../../../static/images/expense/type/shaixz.png',
+						src: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/shaix.png',
+						active: 'https://eshangtech.com/ShopICO/ahyd-BID/expense/type/shaixz.png',
 						id: 4
 					},
 				],
-			
+
 			}
 		},
 		components:{
@@ -154,7 +154,7 @@
 		methods:{
 			...mapMutations(['shouldReLoadingList']),
 			handleClick(item){
-				if(item.id==4){ 
+				if(item.id==4){
 					this.showPop = true
 				}else{
 					this.activeType = item.id
@@ -181,7 +181,7 @@
 			},
 			closePop (){
 				let popOldValue = this.popOldValue
-				
+
 				this.selectTypeIndex = popOldValue[1]
 				this.dateIndex = popOldValue[0]
 				this.showPop = false
@@ -196,19 +196,19 @@
 					DealState: DealState,
 					QueryDate: _this.dateList[_this.dateIndex].value
 				}).then(res => {
-				
+
 					if(!res.ResultCode ||res.ResultCode!='100'){
-						
+
 						_this.pageList = []
 					}else{
 						let list = res.Data.List
 						_this.pageList = this.pageData.pageIndex==1 ? list : [..._this.pageList,...list,]
-						
+
 						if (list.length < _this.pageData.pageSize) { // 返回条数小于每页条数
 							_this.pageData.isEnd = true
 						}
 						_this.$forceUpdate()
-					
+
 					}
 					uni.hideLoading()
 					setTimeout(function(){
@@ -224,7 +224,7 @@
 			},
 			goDetail(item) {
 				let url = "/pages/serviceAreaReimbursement/detail?type="+item.EXPENSEBILL_TYPE+"&id=" + item.HIGHWAYPROINST_ID
-				
+
 				this.$util.toNextRoute('navigateTo', url)
 			},
 		},
@@ -243,9 +243,9 @@
 			this.loadMore()
 		},
 		onShow() {
-			
+
 			if(this.isReloading) {
-				
+
 				uni.showLoading({
 					title:'正在加载'
 				})
@@ -254,7 +254,7 @@
 				this.getList()
 				this.shouldReLoadingList(false)
 			}
-			
+
 		},
 		onLoad() {
 			this.pageData.isLoading= true
@@ -266,7 +266,7 @@
 		onUnload() {
 			this.$util.addUserBehavior()
 		}
-		
+
 	}
 </script>
 
@@ -275,7 +275,7 @@
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
-	
+
 		/* padding-top: 90rpx; */
 		/* height: 100%; */
 	}
@@ -300,7 +300,7 @@
 		width: 100%;
 		background-color: #fff;
 		flex-wrap: wrap;
-		
+
 	}
 	.moduleTitle {
 		text-align: left;
@@ -309,7 +309,7 @@
 		font-size: 30rpx;
 		padding: 24rpx 0 12rpx 0;
 	}
-	
+
 	.pb24 {
 		padding-bottom: 24rpx;
 	}