zhengkaixin 2 years ago
parent
commit
c4151dc2ea

+ 2 - 3
.env.dev.js

@@ -10,12 +10,11 @@ const UNI_APP = {
 	//openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",
 	//openId:"oK9Wr5_2USr1yP4MRew9KbJA0-ng",//老板
 	//openId:"oK9Wr56yEh-TbCvUg3s9LYQSL8tM",//提现
-	openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s", //杨所
-	//openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",//zkx
+	//openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s", //杨所
+	openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",//zkx
 	//openId:"oK9Wr5zv8lvirni3txbxRkmpg8d0",
 	//小鹏管家appid
 	//VUE_APP_WXAPPID:"wx7e70eb62a8459869",
 	VUE_APP_WXAPPID:"wx3afdb1b60188c1e5",
 }  
-
 module.exports = UNI_APP;

+ 36 - 1
pages.json

@@ -385,7 +385,42 @@
                 "enablePullDownRefresh": false
             }
             
-        }
+        },
+		
+		{
+			"name": "提现记录",
+			"path": "pagesFinance/user/withdrawal/withdrawRecord",
+			"style": {
+		
+				//"navigationStyle": "custom" // 隐藏系统导航栏
+			}
+		},
+		{
+			"name": "申请结果",
+			"path": "pagesFinance/user/withdrawal/applyResult",
+			"style": {
+		
+				//"navigationStyle": "custom" // 隐藏系统导航栏
+			}
+		}
+		,{
+		    "path" : "pagesFinance/user/withdrawal/applicationForWithdrawal",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		}
+		,{
+		    "path" : "pagesFinance/user/withdrawal/applicationDetails",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		}
     ],
 	"globalStyle": {
 		"navigationStyle": "custom", // 隐藏系统导航栏

+ 1 - 1
pagesFinance/recordOfInvoice/recordOfInvoice.vue

@@ -202,7 +202,7 @@
 		}
 		.text-1{
 			display: inline-block;
-			width: 17vw;
+			width: 25vw;
 			
 		}
 		.text-2{

+ 12 - 3
pagesFinance/user/index.vue

@@ -45,7 +45,7 @@
 			<view class="userInfo-main">
 				<h2>{{showNumJP(home.accountBalance)}}元 
 				
-							<view class="withdraw"   v-if="info.status&&info.accountType!=3"  @click="gotoUrl('pagesFinance/user/withdrawRecord')" >
+							<view class="withdraw"   v-if="info.status&&(info.accountType!=3&&info.accountType!=1)"  @click="gotoUrl('pagesFinance/user/withdrawRecord')" >
 								账户提现
 							</view>
 							
@@ -99,14 +99,23 @@
 					激活充电桩
 				</view>
 			</view>
-			<view class="item"  v-if="isWithdrawal"  @click="gotoUrl('pagesFinance/user/withdrawal/businessList')">
+			<view class="item"  v-if="isWithdrawal&&info.accountType==2"  @click="gotoUrl('pagesFinance/user/withdrawal/businessList')">
 				<view class="item-icon">
 					<img src="../../assets/img/riLine-file-list-3-line.svg" alt="">
 				</view>
 				<view class="item-name">
 					收益核算
 				</view>		
-			</view>
+			</view>
+			<view class="item"  v-if="isWithdrawal" @click="gotoUrl('pagesFinance/user/withdrawal/withdrawRecord')">
+				<view class="item-icon">
+					<i data-v-7e5aa06e="" class="ri-todo-line"></i>
+				</view>
+				<view class="item-name">
+					提现记录(test)
+				</view>		
+			</view>
+			
 			<view class="item"  v-if="info.accountType==3"  @click="gotoUrl('pagesFinance/user/withdrawal/cashoutList')">
 				<view class="item-icon"> <!--个人 -->
 					<i data-v-7e5aa06e="" class="ri-todo-line"></i>

+ 563 - 0
pagesFinance/user/withdrawal/applicationDetails.vue

@@ -0,0 +1,563 @@
+<template>
+	<view>
+		<ujp-navbar title="提现申请详情"></ujp-navbar>
+		<u-tabs name="cate_name" gutter="200" bar-width="100" active-color="#101010" inactive-color="#A1A1A1"
+			:list="tabList" :is-scroll="false" :current="current" @change="change"></u-tabs>
+
+		<template v-if="current==0">
+			<view class="withdraw">
+				<view class="withdraw-head">
+					<b>申请站点</b>
+					<span>
+						<view class="uni-input">{{info.stationName}}</view>
+					</span>
+				</view>
+				<view class="withdraw-head">
+					<b>申请时间</b>
+					<span>
+						<view class="uni-input">{{info.updateTime}}</view>
+					</span>
+				</view>
+				<view class="withdraw-head">
+					<b>申请人身份</b>
+					<span>
+						<view class="uni-input">{{info.shareProfitRoleName}}</view>
+					</span>
+				</view>
+				<view class="withdraw-head">
+					<b>提现事由</b>
+					<span>
+						<view class="uni-input">{{info.applicationTypeText}}</view>
+					</span>
+				</view>
+				<view class="withdraw-head">
+					<b>提现月份</b>
+					<span>
+						<view class="uni-input">{{info.applicationMonth}}</view>
+					</span>
+				</view>
+				<view class="withdraw-head ">
+					<b>充电收入</b><span class="classFFF">{{info.chargingIncome}}元</span>
+				</view>
+				<view class="withdraw-head border-n">
+					<b>分润提现明细表</b><span class="download"  @click="ckdownload" >
+						<u-icon name="download"></u-icon> 下载
+					</span>
+				</view>
+				
+				<view class="withdraw-head">
+					<b>审核进度</b>
+					<span>
+						<view class="uni-input"  :class="{
+								 wsuccess:info.status=='1',
+								  werror:info.status=='2',
+								   werror2:info.status=='0'
+							 }" >{{info.statusText}}</view>
+					</span>
+				</view>
+				<view class="withdraw-head border-n">
+					<b>充电分成</b>
+					<span>
+						<view class="uni-input">{{info.chargingProfitAmount}}元</view>
+					</span>
+				</view>
+			</view>
+
+			<view class="withdraw">
+				<view class="withdraw-head">
+					<b>成本电价</b>
+					<span>
+						<view class="uni-input">{{info.electricityPrice}}元/度</view>
+					</span>
+				</view>
+
+				<view class="withdraw-head ">
+					<b>实际电量</b>
+					<span>
+						<view class="uni-input">{{info.electricQuantity}}度</view>
+					</span>
+				</view>
+				<view class="withdraw-head border-n">
+					<b>电费成本</b>
+					<span>
+						{{info.electricityCost}}元
+
+					</span>
+				</view>
+			</view>
+			<view class="withdraw">
+				<view class="withdraw-head ">
+					<b>充电分成比例</b>
+					<span>
+						<view class="uni-input">{{info.chargingPercent}}%</view>
+					</span>
+				</view>
+				<view class="withdraw-head ">
+					<b>充电分成</b>
+					<span>
+						<view class="uni-input">{{info.chargingProfitAmount}}元</view>
+					</span>
+				</view>
+				<view class="withdraw-head border-n">
+					<b>充电服务收益</b>
+					<span>
+						<view class="uni-input">{{info.chargingServiceProfitAmount}}元</view>
+					</span>
+				</view>
+
+
+			</view>
+			<view class="withdraw">
+
+				<view class="withdraw-head">
+					<b>月卡分润笔数</b>
+					<span>
+					{{info.monthlyCardTotal}}笔
+
+					</span>
+				</view>
+				<view class="withdraw-head border-n">
+					<b>月卡收益</b>
+					<span>
+						{{info.monthlyCardIncome?info.monthlyCardIncome.toFixed(2):0}}元
+						
+					</span>
+				</view>
+
+
+			</view>
+			<view class="withdraw">
+
+				<view class="withdraw-head">
+					<b>合伙人总收入</b>
+					<span>
+						{{info.totalIncome}}元
+
+					</span>
+				</view>
+				<view class="withdraw-head border-n">
+					<b>合伙人总收益</b>
+					<span>
+						{{info.totalProfitAmount}}元
+
+					</span>
+				</view>
+
+			</view>
+
+
+			<view class="withdraw">
+				<view class="withdraw-head ">
+					<b>是否开票</b>
+					<span>
+						<view class="uni-input">{{info.invoiceRequired?'是':'否'}}</view>
+					</span>
+				</view>
+				<view class="withdraw-head ">
+					<b>发票类型</b>
+					<span>
+						<view class="uni-input" v-if="!info.invoiceType">无</view>
+						
+						<view class="uni-input" v-else>{{invoiceTypeName}}</view>
+					</span>
+				</view>
+<view class="withdraw-head border-n ">
+					<b>发票税率</b>
+					<span>
+						<view class="uni-input">{{info.taxRate?info.taxRate+'%':''}}</view>
+					</span>
+				</view>
+
+
+
+
+
+			</view>
+			<view class="withdraw">
+				<view class="withdraw-head ">
+					<b class="asterisk">申请提现金额</b>
+					<span>
+						<view class="uni-input">{{info.applicationAmount}}元</view>
+					</span>
+
+				</view>
+				<view class="withdraw-head border-n">
+					<b>大写金额</b>
+
+					<span>
+						<view class="uni-input">{{applicationAmountDX}}</view>
+					</span>
+
+				</view>
+			</view>
+			<view class="withdraw">
+				<view class="withdraw-head ">
+					<b class="asterisk">提现人收款户名</b>
+					<p class="infos">{{info.accountName}}</p>
+
+				</view>
+				<view class="withdraw-head ">
+					<b class="asterisk">提现人收款银行</b>
+					<p class="infos">{{info.bankName}}</p>
+
+				</view>
+				<view class="withdraw-head border-n">
+					<b class="asterisk">提现人收款账号</b>
+					<p class="infos">{{info.accountNo}}</p>
+				</view>
+
+			</view>
+
+		</template>
+
+
+		<template v-if="current==1">
+			<view class="margin">
+				<view style="text-align: center;margin-top: 100px" v-if="!detailList.length">
+					<img src="@/assets/img/blankpage.png">
+					<view>未填写提现明细</view>
+				</view>
+				
+				<view class="details "  v-for="(item,i) in detailList" :key="i">
+					
+						<p>{{item.itemName}}</p>
+						
+					<view class="withdraw"  >
+						<view class="withdraw-head ">
+							<b class="asterisk">金额</b>
+							<span >
+								<view class="uni-input">{{item.itemAmount}}元</view>
+							</span>
+						
+						</view>
+						<view class="withdraw-head ">
+							<b class="asterisk">备注</b>
+							<span>
+								<view class="uni-input">{{item.itemRemark?item.itemRemark:'无'}}</view>
+							</span>
+						
+						</view>
+						
+					</view>
+				
+				</view>
+			</view>
+			
+			
+			
+		</template>
+
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/finance.js'
+	import {
+	
+		DX
+	} from '@/utils'
+	export default {
+		data() {
+			return {
+				isPt: false,
+			id:'',
+				detailList:[],
+				info: {
+					electricityPrice: '',
+					electricQuantity: '',
+					stationId: "",
+					applicationType: '1'
+				},
+				stationList: [],
+				stationObj: {},
+				current: 0, // tabs组件的current值,表示当前活动的tab选项
+
+				list1: [{
+					name: '普票',
+					value: "1"
+				}, {
+					name: '专票',
+					value: "2"
+				}, {
+					name: '收据',
+					value: "3"
+				}],
+				list2: [{
+					name: '是',
+					value: "1"
+				}, {
+					name: '否  ',
+					value: "0"
+				}],
+				tabList: [{
+					name: '申请单主表'
+				}, {
+					name: '提现明细'
+				}],
+
+
+			}
+		},
+
+		onLoad(op){
+			if(op.id){
+				this.id=op.id
+				this.getInfo()
+			}
+		},computed: {
+			invoiceTypeName(){
+				
+				var info =this.list1.find(item=>{
+					console.log(item.value==this.info.invoiceType)
+					return item.value==this.info.invoiceType
+				})
+				
+				if(info){
+					return info.name
+				}
+				return''
+			},
+			
+			
+			applicationAmountDX() {
+				if (this.info.applicationAmount) {
+					var c = DX(this.info.applicationAmount)
+					return c
+				} else {
+					return ''
+				}
+			},
+		},
+		watch:{
+			
+			detailList(nVal, oVal) {
+				console.log(nVal)
+				var obj=[
+					{
+						name: '申请单主表'
+					}, {
+						name: '提现明细'
+					}
+				]
+			
+				if(nVal&&nVal.length){
+					obj[1].count=nVal.length
+				}
+			 
+				this.tabList=obj
+			
+			}
+			
+		},
+		methods: {
+			ckdownload(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.profitDetailsExcel({
+					stationId:this.info.stationId,
+					yearMonth:this.info.applicationMonth,
+				
+				}).then((resDown) => {
+						uni.hideLoading()
+					if(resDown.data){
+						window.location.href=resDown.data
+						
+					}else{
+						uni.showToast({
+							title:"无文件下载"
+						})
+					}
+				}).catch(error => {
+					
+					uni.showToast({
+						title:error
+					})
+				})
+				
+			},
+			getInfo(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.getWithdrawInfo(this.id).then((res) => {
+					
+					this.info=res.data.record
+					this.detailList=res.data.detailList
+					uni.hideLoading()
+				
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
+				})
+			},
+			change(index) {
+				this.current = index;
+			}
+
+
+
+		}
+	}
+</script>
+<style>
+	page {
+		background-color: #F7F7F7;
+		padding-bottom: 65px;
+	}
+</style>
+<style lang="scss" scoped>
+	// .download {
+	// 	color: #185AC6;
+	// }
+
+	.download {
+		color: #185AC6 !important;
+	}
+	/deep/.u-tab-bar {
+		background-color: #0076FF !important;
+	}
+
+	/deep/.u-tabs-scorll-flex {
+		width: 56%;
+		margin: 0 auto;
+	}
+
+	.withdraw-tips {
+		margin: 24px 16px;
+
+		p {
+			color: #999;
+			margin-top: 4px;
+		}
+	}
+
+	.withdraw {
+		margin-bottom: 8px;
+		background-color: #fff;
+		padding: 0px 16px 0 16px;
+         
+		.withdraw-head {
+			padding: 14px 0;
+			border-bottom: 1px solid #F2F2F2;
+
+			align-items: center;
+			position: relative;
+			
+			.wsuccess{color:#27b148 !important}
+			.werror{color:#FF6200 !important;}
+			.werror2{color:#1ba7f4 !important;}
+			
+			.unit {
+				position: absolute;
+				top: 34rpx;
+				right: 0;
+
+			}
+
+			.whthdraw-price {
+				font-size: 18px;
+				color: #101010;
+				font-weight: 600;
+			}
+
+			b {
+				color: rgba(119, 119, 119, 100);
+				font-size: 16px;
+			}
+
+			span {
+				width: 60%;
+				float: right;
+				text-align: left;
+				font-size: 16px;
+				color: #333333;
+				
+			}
+			  @media screen and (max-width:320px) {
+			            span{
+			               width: 55%;
+			            }
+			        }
+
+			.uni-input {
+				font-size: 16px;
+				color: #333333;
+				line-height: 18px;
+			}
+		}
+
+		.withdraw-main {
+			border-top: 1px solid #f7f7f7;
+			border-bottom: 1px solid #f7f7f7;
+
+			margin: 16px 0;
+			padding: 16px 0;
+
+			.withdraw-input {
+				margin-top: 32px;
+				display: flex;
+				align-items: center;
+				font-size: 28px;
+
+				/deep/.uni-input-input {
+					font-size: 28px;
+				}
+			}
+		}
+
+		.withdraw-foot {
+			display: flex;
+			align-items: center;
+
+			p {
+				color: #999
+			}
+
+			span {
+				color: #2979FF;
+				margin-left: 16px;
+
+			}
+		}
+	}
+
+	.more {
+		float: right;
+		color: #B3B3B3;
+		font-size: 24px
+	}
+
+	.border-n {
+		border: none !important;
+	}
+
+   .infos{
+	   margin-top: 16px;
+	   color: rgba(51, 51, 51, 100);
+	   font-size: 16px;
+   }
+  .margin{
+	  margin-top: 12px !important;
+  }
+	.details {
+		margin: 0 16px;
+		margin-bottom: 8px ;
+		border-radius: 8px;
+		background-color: #fff;
+		padding:0 12px 0px 12px;
+		p{
+			font-size: 16px;
+			color: #333333;
+			line-height: 50px;
+			border-bottom: solid 1px #E5E7EA;
+			padding-left: 16px;
+		}
+		span{
+			width: 75% !important;
+		}
+	}
+</style>

+ 1090 - 0
pagesFinance/user/withdrawal/applicationForWithdrawal.vue

@@ -0,0 +1,1090 @@
+<template>
+	<view>
+		<u-tabs
+		 ref="jputabs"
+		 class="jputabs" name="cate_name" gutter="200" bar-width="100" active-color="#101010"
+			inactive-color="#A1A1A1" :list="tabList" :is-scroll="false" :current="current" @change="change"></u-tabs>
+
+		<ujp-navbar title="提现申请单" style="margin-bottom: 40px;">
+
+		</ujp-navbar>
+
+		<template v-if="current==0">
+			<view class="withdraw">
+				<view class="withdraw-head">
+					<b class="asterisk"><text>*</text>申请站点</b>
+					<span>
+						<picker @change="bindPickerChange1" range-key="name" :range="stationList">
+							<view class="uni-input">
+								<view class="input-text">
+									{{stationObj.name?stationObj.name:'无站点'}}
+								</view>
+								<view class="iconfont more">
+									&#xe600;
+								</view>
+							</view>
+
+						</picker>
+
+					</span>
+				</view>
+				<view class="withdraw-head">
+					<b class="asterisk"><text>*</text>提现事由</b>
+					<span>
+						<picker @change="bindPickerChange2" range-key="name" :range="applicationList">
+							<view class="uni-input">{{info.applicationTypeText}}<text
+									class="iconfont more">
+									&#xe600;
+								</text></view>
+						</picker>
+
+					</span>
+				</view>
+				<view class="withdraw-head">
+					<b class="asterisk"><text>*</text>提现月份</b>
+					<span>
+						<picker @change="bindPickerChange3" mode="date" fields="month" :end="nowTime"
+							:value="queryTime">
+							<view class="uni-input">{{showTime(queryTime)}}<text class="iconfont more">
+									&#xe600;
+								</text></view>
+						</picker>
+
+					</span>
+				</view>
+				<view class="withdraw-head ">
+					<b>充电收入</b><span class="classFFF">{{info.chargingIncome}}元</span>
+				</view>
+				<view class="withdraw-head border-n">
+					<b>分润提现明细表</b><span class="download"  @click="ckdownload" >
+						<u-icon name="download"></u-icon> 下载
+					</span>
+				</view>
+			</view>
+
+			<view class="withdraw">
+				<view class="withdraw-head">
+					<b class="asterisk"><text>*</text>成本电价</b>
+					<text class="unit" style="float: right;font-size: 16px;">元/度</text>
+					<span class="withdraw-input" style="width: 63%;">
+						<u-input height="20px" v-model="info.electricityPrice" 
+						maxlength="10"
+						placeholder="请填写电单价" input-align="left"
+							type="digit">
+
+						</u-input>
+
+
+					</span>
+
+				</view>
+				<view class="withdraw-head">
+					<b class="asterisk">预估电量</b>
+
+					<span class="withdraw-input classFFF" style="width: 63%;">
+
+						{{info.estimateElectricQuantity}}度
+
+					</span>
+
+				</view>
+				<view class="withdraw-head">
+					<b class="asterisk"><text>*</text>实际电量</b>
+					<text class="unit" style="float: right;font-size: 16px;">度</text>
+					<span class="withdraw-input" style="width: 63%;">
+						<u-input height="20px" placeholder="请填写实际电量"
+						 maxlength="10"
+						 v-model="info.electricQuantity" input-align="left"
+							type="digit">
+
+						</u-input>
+
+
+					</span>
+
+				</view>
+				<view class="withdraw-head border-n">
+					<b>电费成本</b>
+					<text class="unit" style="float: right;font-size: 16px;">元</text>
+					<span class="withdraw-input" style="width: 63%;">
+						<view class="classFFF" v-show="electricityPriceX">{{electricityPriceX}}</view>
+						<view class="classFFF" v-show="!electricityPriceX">自动计算出结果</view>
+
+
+
+					</span>
+
+				</view>
+
+			</view>
+			<view class="withdraw">
+
+				<view class="withdraw-head">
+					<b>充电分成比例</b>
+					<span  class="classFFF" >
+						{{info.chargingPercent}}%
+
+					</span>
+				</view>
+				<view class="withdraw-head">
+					<b>充电分成</b>
+					<span  class="classFFF" >
+						{{info.chargingProfitAmount?info.chargingProfitAmount.toFixed(2):0}}元
+
+					</span>
+				</view>
+				<view class="withdraw-head border-n">
+					<b>充电服务收益</b>
+					<span>
+						
+						<view class="classFFF" v-show="electricityPriceX">{{(info.chargingProfitAmount-electricityPriceX).toFixed(2)}}元</view>
+						<view class="classFFF" v-show="!electricityPriceX">自动计算出结果</view>
+						
+					</span>
+				</view>
+
+			</view>
+			<view class="withdraw">
+
+				<view class="withdraw-head">
+					<b>月卡分润笔数</b>
+					<span  class="classFFF"  >
+						{{info.monthlyCardTotal}}笔
+
+					</span>
+				</view>
+				<view class="withdraw-head border-n">
+					<b>月卡收益</b>
+					<span  class="classFFF" >
+						{{info.monthlyCardIncome?info.monthlyCardIncome.toFixed(2):0}}元
+
+					</span>
+				</view>
+
+			</view>
+
+
+
+			<view class="withdraw">
+
+				<view class="withdraw-head">
+					<b>合伙人总收入</b>
+					<span  class="classFFF" >
+						{{info.totalIncome?info.totalIncome.toFixed(2):0}}元
+
+					</span>
+				</view>
+				<view class="withdraw-head border-n">
+					<b>合伙人总收益</b>
+					<span   >
+						<view class="classFFF" v-show="electricityPriceX">{{(info.chargingProfitAmount+info.monthlyCardIncome-electricityPriceX).toFixed(2)}}元</view>
+						<view class="classFFF" v-show="!electricityPriceX">自动计算出结果</view>
+						
+						
+
+					</span>
+				</view>
+
+			</view>
+			<view class="withdraw">
+
+
+				<view class="withdraw-head">
+					<b>是否开票</b><span>
+						<u-radio-group  v-model="info.invoiceRequired">
+
+							<u-radio v-for="(item, index) in list2" style="margin-right: 16px;" :key="index+'a'"
+								:name="item.value"  active-color="blue">
+
+								{{item.name}}
+
+							</u-radio>
+
+						</u-radio-group>
+					</span>
+				</view>
+				<view class="withdraw-head">
+					<b v-if="info.invoiceRequired!='1'">发票类型</b>
+					<b v-else class="asterisk"><text>*</text>发票类型</b>
+					<span>
+						<u-radio-group  v-model="info.invoiceType" >
+
+							<u-radio v-for="(item, index) in list1" :key="index+'a'" :name="item.value"
+								:disabled="item.disabled" active-color="blue">
+
+								{{item.name}}
+
+							</u-radio>
+
+						</u-radio-group>
+					</span>
+				</view>
+				<view class="withdraw-head border-n">
+					<b v-if="info.invoiceRequired!='1'">发票税率</b>
+					<b v-else class="asterisk"><text>*</text>发票税率</b>
+					
+				
+					<text style="float: right;font-size: 16px;">%</text>
+					<span class="withdraw-input" style="width: 58%;">
+						<u-input height="20px"  v-model="info.taxRate"
+						placeholder="请输入开票税率" input-align="left"
+						 maxlength="10"
+						 type="digit">
+						</u-input>
+					</span>
+
+				</view>
+
+			</view>
+			<view class="withdraw">
+				<view class="withdraw-head ">
+					<b class="asterisk"><text>*</text>申请提现金额</b>
+					<text class="unit" style="float: right;font-size: 16px;">元</text>
+					<span class="withdraw-input" style="width: 63%;">
+						<u-input height="20px" v-model="info.applicationAmount" maxlength="10" placeholder="请填写金额" input-align="left"
+							type="digit">
+
+						</u-input>
+
+
+					</span>
+
+				</view>
+				<view class="withdraw-head border-n">
+					<b>大写金额</b>
+
+					<span class="withdraw-input" style="width: 63%;">
+
+						<view  class="classFFF" v-show="applicationAmountDX">{{applicationAmountDX}}</view>
+						<view class="classFFF" v-show="!applicationAmountDX">自动转换</view>
+
+
+
+					</span>
+				</view>
+				
+			
+			</view>
+
+		
+			<view class="withdraw">
+				<view class="withdraw-head ">
+					<b class="asterisk"><text>*</text>提现人收款户名</b>
+					<u-input class="textarea" type="textarea" 
+					v-model="info.accountName"
+					placeholder="请填写收款户名" height="96" cursor-spacing="8" />
+
+				</view>
+				<view class="withdraw-head ">
+					<b class="asterisk"><text>*</text>提现人收款银行</b>
+					<u-input class="textarea" type="textarea"
+					v-model="info.bankName"
+					 placeholder="请填写收款银行全称" height="96" cursor-spacing="8" />
+
+				</view>
+				<view class="withdraw-head border-n">
+					<b class="asterisk"><text>*</text>提现人收款账号</b>
+					<u-input class="textarea" v-model="info.accountNo"
+					type="textarea" placeholder="提现人收款账号" height="96" cursor-spacing="8" />
+
+				</view>
+
+			</view>
+
+		</template>
+
+
+		<template v-if="current==1">
+			<view class="details withdrawHead" v-if="detailList.length&&info.applicationAmount">
+				申请提现金额:{{info.applicationAmount}}元<br/>
+				明细金额合计:<span :class="{
+					red:itemApplicationAmountSum>parseFloat(info.applicationAmount)
+				}">{{itemApplicationAmountSum}}元</span>
+			</view>
+			<view class="details" v-for="(item,i) in detailList" :key="i" >
+				<view class="withdraw">
+					<view class="withdraw-head">
+						<b class="asterisk"><text>*</text>项目</b>
+						<text class="unit" style="float: right;font-size: 16px;z-index: 99;"  @click="delItem(i)">
+							<i class="ri-indeterminate-circle-fill" style="color: red;font-size: 24px;"></i>
+						</text>
+						<span class="withdraw-input" style="width: 80%;">
+							<u-input height="20px" 
+							v-model="item.itemName"
+							placeholder="请填写项目名称" input-align="left" >
+
+							</u-input>
+
+
+						</span>
+
+					</view>
+					<view class="withdraw-head border-n">
+						<b class="asterisk"><text>*</text>金额</b>
+						<text class="unit" style="float: right;font-size: 16px;">元</text>
+						<span class="withdraw-input" style="width: 80%;">
+							<u-input height="20px"
+							 v-model="item.itemAmount"
+							 placeholder="请填写价格"
+							  maxlength="10"
+							  input-align="left" type="digit">
+
+							</u-input>
+
+
+						</span>
+
+					</view>
+					<view class="withdraw-head border-n">
+						<b>备注</b>
+
+						<span class="withdraw-input" style="width: 80%;">
+							<u-input height="20px"
+							 v-model="item.itemRemark"
+							 placeholder="请填写备注信息" input-align="left">
+
+							</u-input>
+
+
+						</span>
+
+					</view>
+				</view>
+
+			</view>
+			<view class="add" @click="addItem" ><i class="ri-add-circle-fill"></i><text>增加项目</text></view>
+		</template>
+		<view class="applyBtn">
+			<u-button class="save" @click="submit(-1)">保存草稿</u-button>
+			<u-button class="submit" @click="submit(0)">提交申请单</u-button>
+		</view>
+	</view>
+</template>
+
+
+<script>
+	import * as API from '@/apis/finance.js'
+	import * as API_common from '@/apis/common.js'
+	
+
+	import {
+		beforeTimeStamp,
+		parseUnixTime,
+		substrMb,
+		DX
+	} from '@/utils'
+	export default {
+		data() {
+			return {
+				id:'',
+				uuid:'',
+				isPt: false,
+				detailList:[],
+				info: {
+					electricityPrice: '',
+					electricQuantity: '',
+					stationId: "",
+					applicationType: '1'
+				},
+				applicationList: [{
+						name: '物业结算',
+						value: "1"
+					}, {
+						name: '市场费用',
+						value: "2"
+					}, {
+						name: '利润提现',
+						value: "3"
+					}
+
+				],
+
+				stationList: [],
+				queryTime: '',
+				nowTime: '',
+				stationObj: {},
+				current: 0, // tabs组件的current值,表示当前活动的tab选项
+				params: {
+					year: true,
+					month: true,
+					day: false,
+					hour: false,
+					minute: false,
+					second: false,
+					timestamp: false,
+				},
+				list1: [{
+					name: '普票',
+					value: "1"
+				}, {
+					name: '专票',
+					value: "2"
+				}, {
+					name: '收据',
+					value: "3"
+				}],
+				list2: [{
+					name: '是',
+					value: "1"
+				}, {
+					name: '否  ',
+					value: "0"
+				}],
+				tabList: [{
+					name: '申请单主表'
+				}, {
+					name: '提现明细'
+				}],
+				startTime:'',
+				endTime:'',
+			}
+		},
+		onLoad(op){
+			if(op.id){
+				this.id=op.id
+			}
+			this.uuid=op.uuid;
+		},
+		onShow() {
+
+
+		},
+		onReady() {
+			var nowTime = parseUnixTime(new Date(), "{y}-{m}-01")
+			this.queryTime = parseUnixTime(beforeTimeStamp(1, new Date(nowTime)), '{y}-{m}')
+			this.nowTime = parseUnixTime(beforeTimeStamp(1, new Date(nowTime)), '{y}-{m}')
+
+			this.getStationList()
+		},
+		computed: {
+			 
+			itemApplicationAmountSum(){
+				if (this.info.applicationAmount&&this.detailList&&this.detailList.length) {
+					var applicationAmount=0;
+					for(var i in this.detailList){
+						var obj=this.detailList[i]
+						var itemAmount=obj.itemAmount?obj.itemAmount:0
+						applicationAmount+=parseFloat(itemAmount)
+					}
+					 
+ 					if(applicationAmount){
+						return parseFloat(applicationAmount).toFixed(2)
+					}else {
+						return '0'
+					}
+					
+					
+				}else{
+					return '0'
+				}
+				
+			},
+			applicationAmountDX() {
+				if (this.info.applicationAmount) {
+					var c = DX(this.info.applicationAmount)
+					return c
+				} else {
+					return ''
+				}
+			},
+			electricityPriceX() {
+				if (this.info.electricityPrice != '' && this.info.electricQuantity != '') {
+					return (this.info.electricityPrice * this.info.electricQuantity).toFixed(2)
+				}
+				return ''
+			}
+		},
+		watch:{
+			
+			detailList(nVal, oVal) {
+				
+				var obj=[
+					{
+						name: '申请单主表'
+					}, {
+						name: '提现明细'
+					}
+				]
+			
+				if(nVal&&nVal.length){
+					obj[1].count=nVal.length
+				}
+			 
+				this.tabList=obj
+			
+			
+			
+			}
+			
+		},
+		methods: {
+			addItem(){
+				this.detailList.push({})
+			},
+			delItem(i){
+				
+				this.detailList.splice(i,1)
+			},
+			submit(status){
+				if(status==0){
+					
+				//this.value=this.info.amount
+				if(!this.stationObj.id){
+						uni.showToast({
+							title: "请选择站点"
+						})
+				
+					return
+				}
+				if(!this.info.electricityPrice){
+						uni.showToast({
+							title: "请输入成本电价"
+						})
+				
+					return
+				}
+					
+					if(!this.info.electricQuantity){
+							uni.showToast({
+								title: "请输入实际电量"
+							})
+					
+						return
+					}
+					
+					if(this.info.invoiceRequired=="1"){
+						if(!this.info.invoiceType){
+								uni.showToast({
+									title: "请选择发票类型"
+								})
+						
+							return
+						}
+						if(!this.info.taxRate){
+								uni.showToast({
+									title: "请选择发票税率"
+								})
+						
+							return
+						}
+					}
+					
+					if(!this.info.applicationAmount){
+							uni.showToast({
+								title: "请输入申请提现金额"
+							})
+						return
+					}
+					
+					if(!this.info.accountName){
+							uni.showToast({
+								title: "请输入提现人收款户名"
+							})
+						return
+					}
+					if(!this.info.bankName){
+							uni.showToast({
+								title: "请输入提现人收款银行"
+							})
+						return
+					}
+					if(!this.info.accountNo){
+							uni.showToast({
+								title: "请输入提现人收款账号"
+							})
+						return
+					}
+					for(var i in this.detailList){
+						var obj=this.detailList[i]
+						
+						if(!obj.itemName){
+							uni.showToast({
+								title: `请填写提现明细中第${parseInt(i)+1}项的项目名称`
+							})
+							return
+						}
+						if(!obj.itemAmount){
+							uni.showToast({
+								title: `请填写提现明细[${obj.itemName}]项目的金额`
+							})
+							return
+						}
+					}
+					if(this.detailList&&this.detailList.length){
+						
+						
+						if(!(this.itemApplicationAmountSum==parseFloat(this.info.applicationAmount))){
+							uni.showToast({
+								title: `[申请提现金额]与[明细金额合计]不相等`
+							})
+							return
+						}
+					}
+					
+			}
+			if(this.info.invoiceRequired!=''){
+				this.info.invoiceRequired=this.info.invoiceRequired=='1'?true:false
+			}
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				if(this.id){
+					this.info.id=this.id;
+				}
+				this.info.status=status;
+				
+				//var str=JSON.stringify();
+				API.applyWithdraw({
+					
+					record:this.info,
+					detailList:this.detailList
+				
+				}).then((res) => {
+					
+					this.carhelp.set("withdrawRecord",{
+						uuid:this.uuid,
+					})
+					this.id=res.data;
+					uni.hideLoading()
+					if(status==-1){
+						uni.showModal({
+							title:"提示",
+							content:"保存成功",
+							showCancel:false
+						})
+					}else{
+						uni.redirectTo({
+							url:"/pagesFinance/user/withdrawal/applyResult?value="+this.info.applicationAmount
+						})
+					}
+						
+					
+				}).catch(error => {
+					uni.hideLoading()
+					uni.showModal({
+						title:"提示",
+						content:error,
+						showCancel:false
+					})
+				})
+			},
+			 
+			ckdownload(){
+				//this.value=this.info.amount
+				if(!this.stationObj.id){
+						uni.showToast({
+							title: "请选择站点"
+						})
+				
+					return
+				}
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				
+				API.profitDetailsExcel({
+					stationId:this.stationObj.id,
+					yearMonth:this.queryTime,
+				
+				}).then((resDown) => {
+						uni.hideLoading()
+					if(resDown.data){
+						window.location.href=resDown.data
+						
+					}else{
+						uni.showToast({
+							title:"无文件下载"
+						})
+					}
+				}).catch(error => {
+					
+					uni.showToast({
+						title:error
+					})
+				})
+				
+			},
+			
+			showTime(name) {
+				if (!name) {
+					return ''
+				}
+				return name.replace('-', '年') + '月';
+			},
+
+			queryWithdrawInfo() {
+				 
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				
+				API.queryWithdrawInfo({
+					stationId: this.stationObj.id,
+					yearMonth: this.queryTime,
+					applicationType: this.info.applicationType
+				}).then((res) => {
+					this.info = res.data.record;
+					var detailList = res.data.detailList;
+					this.detailList=[];
+					
+					if(detailList==null){
+						detailList=[];
+					}
+					for(var i in detailList){
+						if(this.id){
+							this.detailList.push(detailList[i])
+						}else{
+							this.detailList.push({
+								itemName:detailList[i].itemName,
+								itemRemark:detailList[i].itemRemark,
+								itemAmount:'',
+							})
+						}
+					}
+					
+					uni.hideLoading()
+
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
+				})
+			},
+			getInfo(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.getWithdrawInfo(this.id).then((res) => {
+					
+					this.info=res.data.record
+					this.detailList=res.data.detailList
+					uni.hideLoading()
+				
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
+				})
+			},
+			getStationList() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.stationList().then((res) => {
+					this.stationList = res.data.stationList;
+					
+						if (this.stationList.length) {
+							this.stationObj = this.stationList[0];
+							if(this.id){
+									this.getInfo()
+							}else{
+									this.queryWithdrawInfo()
+							}
+						
+						}
+					
+					
+					uni.hideLoading()
+				
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
+				})
+				
+				API_common.findByCatalogName2({
+					catalogName:"提现类型"
+				}).then((res) => {
+					this.applicationList= res.data.dataDictionaryList;
+					// this.applicationList =dataDictionaryList.map((item)=>{
+					// 	return {
+					// 		name:item.name,
+					// 		value:item.value
+					// 	}
+					// })
+					uni.hideLoading()
+
+				}).catch(error => {
+					uni.showToast({
+						title: error
+					})
+				})
+			},
+			bindPickerChange1(e) {
+
+				if (this.stationList[e.detail.value]) {
+					this.stationObj = this.stationList[e.detail.value];
+					this.queryWithdrawInfo()
+				}
+			},
+			bindPickerChange2(e) {
+				this.info.applicationType = this.applicationList[e.detail.value].value;
+				this.queryWithdrawInfo()
+			},
+			bindPickerChange3(e) {
+				this.queryTime = e.detail.value;
+				this.queryWithdrawInfo()
+			},
+			change(index) {
+				this.current = index;
+			}
+
+
+
+		}
+	}
+</script>
+<style>
+	page {
+		background-color: #F7F7F7;
+		padding-bottom: 65px;
+	}
+</style>
+<style lang="scss" scoped>
+	.jputabs {
+		//position: absolute;
+		position: fixed;
+		background-color: #FFF;
+		width: 100%;
+		top: 40px;
+		z-index: 99;
+	}
+
+	.classFFF {
+		color: #607d8b  !important;
+	}
+
+	.download {
+		color: #185AC6 !important;
+	}
+
+	/deep/.u-tab-bar {
+		background-color: #0076FF !important;
+
+	}
+
+	/deep/.u-tabs-scorll-flex {
+		width: 56%;
+		margin: 0 auto;
+	}
+
+	.withdraw-tips {
+		margin: 24px 16px;
+
+		p {
+			color: #999;
+			margin-top: 4px;
+		}
+	}
+
+	.uni-input {
+		font-size: 16px;
+		color: #333333;
+
+
+	}
+	
+	.withdraw {
+		margin-bottom: 8px;
+		background-color: #fff;
+		padding: 0px 16px 0 16px;
+
+		.withdraw-head {
+			padding: 16px 0;
+			border-bottom: 1px solid #E5E7EA;
+
+			align-items: center;
+			position: relative;
+
+			.unit {
+				position: absolute;
+				top: 34rpx;
+				right: 0;
+
+			}
+
+			.whthdraw-price {
+				font-size: 18px;
+				color: #101010;
+				font-weight: 600;
+			}
+
+			b {
+				color: rgba(119, 119, 119, 100);
+				font-size: 16px;
+			}
+
+			span {
+				width: 60%;
+				float: right;
+				text-align: left;
+				font-size: 16px;
+				color: #333333;
+			}
+
+			@media screen and (max-width:320px) {
+				span {
+					width: 55%;
+				}
+			}
+
+		}
+
+		.withdraw-main {
+			border-top: 1px solid #f7f7f7;
+			border-bottom: 1px solid #f7f7f7;
+
+			margin: 16px 0;
+			padding: 16px 0;
+
+			.withdraw-input {
+				margin-top: 32px;
+				display: flex;
+				align-items: center;
+				font-size: 28px;
+
+				/deep/.uni-input-input {
+					font-size: 28rpx;
+				}
+			}
+		}
+
+		.withdraw-foot {
+			display: flex;
+			align-items: center;
+
+			p {
+				color: #999
+			}
+
+			span {
+				color: #2979FF;
+				margin-left: 16px;
+
+			}
+		}
+	}
+
+	.more {
+
+		color: #B3B3B3;
+		font-size: 24px
+	}
+
+	.applyBtn {
+		padding: 0 16px;
+
+		display: flex;
+		background-color: #FFF;
+		font-size: 16px;
+		line-height: 44px;
+		height: 60px;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+
+		.save {
+			width: 33.6%;
+			border-radius: 8px 0px 0px 8px;
+			background-color: rgba(0, 185, 98, 100);
+			color: rgba(255, 255, 255, 100);
+		}
+
+		.submit {
+			width: 66.4%;
+			border-radius: 0px 8px 8px 0px;
+			background-color: rgba(24, 90, 198, 100);
+			color: rgba(255, 255, 255, 100);
+		}
+	}
+
+
+	/deep/.uni-input-input {
+		text-align: start !important;
+	}
+
+	.border-n {
+		border: none !important;
+	}
+
+	.textarea {
+		background-color: rgba(242, 242, 242, 100);
+		margin-top: 12px;
+		line-height: 20px;
+		border-radius: 4px;
+		color: rgba(136, 136, 136, 100);
+
+		.uni-textarea-placeholder {
+			padding: 0 16rpx;
+
+		}
+
+		/deep/.uni-textarea-textarea {
+			width: 90%;
+			padding: 0 16rpx;
+
+		}
+	}
+	.withdrawHead{
+		padding: 15px;
+		font-size: 14px;
+		.red{
+			color: red;
+		}
+	}
+	.details {
+		margin: 16px;
+		border-radius: 8px;
+		background-color: #fff;
+		overflow: hidden;
+	}
+
+	.asterisk {
+		position: relative;
+
+		text {
+			position: absolute;
+			top: 0px;
+			left: -14rpx;
+			color: #EE3138;
+		}
+	}
+
+	.add {
+		text-align: center;
+		font-size: 18px;
+		color: #101010;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		.ri-add-circle-fill {
+			font-size: 24px;
+			color: #44B371;
+			margin: auto 0;
+			margin-right: 4rpx;
+		}
+
+	}
+
+	/deep/.u-input__input {
+		font-size: 16px !important
+	}
+
+	.uni-input {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.input-text {
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+</style>

+ 8 - 6
pagesFinance/user/withdrawal/businessInfo.vue

@@ -5,7 +5,7 @@
 		 class="jputabs" name="cate_name" gutter="200" bar-width="100" active-color="#101010"
 			inactive-color="#A1A1A1" :list="tabList" :is-scroll="false" :current="current" @change="change"></u-tabs>
 
-		<ujp-navbar title="提现申请单" style="margin-bottom: 40px;">
+		<ujp-navbar title="收益核算" style="margin-bottom: 40px;">
 
 		</ujp-navbar>
 
@@ -386,16 +386,18 @@
 					stationId: "",
 					applicationType: '1'
 				},
-				applicationList: [{
+				applicationList: [
+					{
+						name: '利润提现',
+						value: "3"
+					},
+					{
 						name: '物业结算',
 						value: "1"
 					}, {
 						name: '市场费用',
 						value: "2"
-					}, {
-						name: '利润提现',
-						value: "3"
-					}
+					},
 
 				],
 

+ 3 - 3
pagesFinance/user/withdrawal/businessList.vue

@@ -1,10 +1,10 @@
 <template>
 	<view>
-		<ujp-navbar title="提现记录"></ujp-navbar>
+		<ujp-navbar title="核算记录"></ujp-navbar>
 		<view class="detailed">
 			<view style="text-align: center;margin-top: 100px" v-if="!list.length">
 				<img src="@/assets/img/blankpage.png">
-				<view>没有提现记录</view>
+				<view>没有核算记录</view>
 			</view>
 			<view class="detailed-list"  
 			:key="index" 
@@ -39,7 +39,7 @@
 		 
 		</view>
 		
-		<u-button  v-if="info.status" @click="uuid=new Date().getTime(),gotoUrl('pagesFinance/user/applicationForWithdrawal?uuid='+uuid)" >创建提现单</u-button>
+		<u-button  v-if="info.status&&info.accountType==2" @click="uuid=new Date().getTime(),gotoUrl('pagesFinance/user/withdrawal/businessInfo?uuid='+uuid)" >创建核算单</u-button>
 	</view>
 </template>
 

+ 6 - 6
pagesFinance/user/withdrawal/cashoutInfo.vue

@@ -392,19 +392,19 @@
 				 	
 				 	if(!this.info.accountName){
 				 			uni.showToast({
-				 				title: "请输入提现人收款户名"
+				 				title: "请输入收款户名"
 				 			})
 				 		return
 				 	}
 				 	if(!this.info.bankName){
 				 			uni.showToast({
-				 				title: "请输入提现人收款银行"
+				 				title: "请输入收款银行"
 				 			})
 				 		return
 				 	}
 				 	if(!this.info.accountNo){
 				 			uni.showToast({
-				 				title: "请输入提现人收款账号"
+				 				title: "请输入收款账号"
 				 			})
 				 		return
 				 	}
@@ -436,19 +436,19 @@
 					
 					if(!this.info.accountName){
 							uni.showToast({
-								title: "请输入提现人收款户名"
+								title: "请输入收款户名"
 							})
 						return
 					}
 					if(!this.info.bankName){
 							uni.showToast({
-								title: "请输入提现人收款银行"
+								title: "请输入收款银行"
 							})
 						return
 					}
 					if(!this.info.accountNo){
 							uni.showToast({
-								title: "请输入提现人收款账号"
+								title: "请输入收款账号"
 							})
 						return
 					}

+ 1 - 1
pagesFinance/user/withdrawal/signReceipt.vue

@@ -277,7 +277,7 @@
 		@media screen and (min-width: 320px) {
 		  .content{
 		  	
-		  	margin: 0 6rpx;
+		  	margin: 0 12rpx;
 		  	padding: 24rpx 12rpx 24rpx 12rpx;
 		  	font-size: 24rpx;
 		  	border: 1px solid rgba(51, 51, 51, 1);

+ 219 - 0
pagesFinance/user/withdrawal/withdrawRecord.vue

@@ -0,0 +1,219 @@
+<template>
+	<view>
+		<ujp-navbar title="提现记录"></ujp-navbar>
+		<view class="detailed">
+			<view style="text-align: center;margin-top: 100px" v-if="!list.length">
+				<img src="@/assets/img/blankpage.png">
+				<view>没有提现记录</view>
+			</view>
+			<view class="detailed-list"  
+			:key="index" 
+			v-for="(item ,index) in list" >
+				<view class="detailed-time"  v-if="item.show">
+					<p>{{showTime(item.showtime)}}</p>
+					<p>共提现 {{showMap.get(item.showtime).toFixed(2)}}元</p>
+				</view>
+				<view class="detailed-item"  @click="gotoItem(item)" >
+					<view class="detailed-item-name">
+						<view class="u-flex">
+							<h4>{{item.applicationTypeText}}</h4>
+							 <span  :class="{
+								 success:item.status==1,
+								  error:item.status==2,
+								   error2:item.status==0
+							 }">({{item.statusText}})</span>
+							
+						</view>
+						<p>{{item.stationName}}</p>
+					</view>
+					<view class="detailed-item-num">
+						<h2>{{item.applicationAmount?item.applicationAmount.toFixed(2):'0'}}元</h2>
+						
+						<p>{{showTime2(item.createTime)}}</p>
+					</view>
+				</view>
+			
+			</view>
+			<u-divider v-if="list.length&&list.length == recordsTotal" color="#B6BDC3" style="margin-top:20px;" bg-color="#f7f7f7">已经到底了</u-divider>
+			
+		 
+		</view>
+		
+		<u-button  v-if="info.status&&info.accountType!=1" 
+		@click="uuid=new Date().getTime(),gotoUrl('pagesFinance/user/withdrawal/applicationForWithdrawal?uuid='+uuid)" >创建提现单</u-button>
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/finance.js'
+	
+	export default {
+		data() {
+			return {
+				
+				pageIndex: 1,
+				recordsTotal: 0,
+				list: [],
+				info:{},
+				form: {
+					name: '',
+					intro: '',
+				},
+				showMap:null,
+				uuid:""
+			 
+			}
+		},
+		onLoad(){
+			this.info=this.carhelp.getPersonInfo("merchantUser")
+			
+		},
+		onReady() {
+			this.getList()
+		},
+		
+		onReachBottom() {
+			if (this.list.length < this.recordsTotal) {
+				this.myLoadmore();
+			}
+		},
+		onShow(){
+			var obj=this.carhelp.get("withdrawRecord")
+			if(obj&&obj.uuid==this.uuid){
+				
+				this.list=[];
+				this.pageIndex = 1;
+				this.getList()
+			}
+		},
+		methods: {
+			showTime(name){
+				if(!name){
+					return ''
+				}
+				return name.replace('-','年')+'月';
+			},
+			showTime2(name){
+				if(!name){
+					return ''
+				}
+				return name.substring(5);
+			},
+			gotoItem(item){
+				
+				this.uuid=new Date().getTime()
+				if(this.info.status&&item.status=='-1'){
+					this.gotoUrl('pagesFinance/user/withdrawal/applicationForWithdrawal?id='+item.id+"&uuid="+this.uuid)
+				}else{
+					this.gotoUrl('pagesFinance/user/withdrawal/applicationDetails?id='+item.id)
+				}
+			},
+			getList() {
+			
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				
+				
+				API.withdrawRecord({
+					pageIndex:this.pageIndex
+				}).then((res) => {
+					
+					this.list = [
+						...this.list,
+						...res.data.data
+					];
+					
+					var showMap=new Map()
+					this.list.forEach(item=>{
+						var ktime=item.applicationMonth;
+						
+						if(showMap.has(ktime)){
+							item.show=false;
+							// var m=showMap.get(ktime)*100+item.applicationAmount*100;
+							// showMap.set(ktime,m/100)
+						}else{
+							showMap.set(ktime,item.totalApplicationAmount)
+							
+							item.show=true;
+							item.showtime=ktime;
+						}
+					})
+					this.showMap=showMap;
+					this.recordsTotal = res.data.recordsTotal
+					uni.hideLoading()
+					
+				}).catch(error => {
+					uni.showToast({
+					
+						title: error
+					})
+				})
+			},
+		}
+	}
+</script>
+<style>
+	page{
+		background-color: #F7F7F7;
+	}
+</style>
+<style lang="scss" scoped>
+	
+	.detailed-time{
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 10px 20px;
+		p{
+			color:#666;
+		}
+	}
+	.detailed-item{
+		background-color: #fff;
+		display: flex;
+		justify-content: space-between;
+		padding: 10px 20px;
+		border-bottom: 1px solid #ededed;
+		.detailed-item-name{
+			font-size: 14px;
+			h4{
+				
+				font-weight: normal;
+			}
+			p{
+				font-size: 12px;
+				margin-top: 4px;
+				color:#666;
+			}
+			span{
+				margin-left: 10px;
+			}
+			.success{color:#27b148}
+			.error{color:#FF6200;}
+			.error2{color:#1ba7f4;}
+		}
+		.detailed-item-num{
+			text-align: right;
+			align-items: center;
+			h2{
+				
+				
+			}
+		}
+	}
+	
+	.u-btn{
+		margin: 0 16px;
+		position: fixed;
+		bottom: 12px;
+		left: 0;
+		right: 0;
+		height: 44px;
+		line-height: 44px;
+		border-radius: 8px;
+		background-color: rgba(24, 90, 198, 100);
+		color: rgba(255, 255, 255, 100);
+	}
+</style>