调整

pagesFinance/user/withdrawal/applicationForWithdrawal.vue

@@ -1,5 +1,13 @@
 <template>
 	<view>
+		<view v-if="step==1">
+			
+			<ujp-navbar title="签名" :custom-back="customback" >
+					
+			</ujp-navbar>
+			<signReceipt :obj="0" @signsubmit="submit" ></signReceipt>
+		</view>
+		<view v-show="step==0"> 
 		<ujp-navbar title="申请提现"></ujp-navbar>
 		<businessView :onReadyId="id" @changetabs_app="changetabs" ></businessView>
 		<view v-if="tabindex==0&&(info.status!=5||!userInfo.status)" >
@@ -121,16 +129,20 @@
 				</view>
 			
 			</view>
-			<u-button 
+			<u-button   v-if="info.applicationType==3"
 			 @click="submit()"
 			 type="primary" >申请提现</u-button>
-			
+			<u-button   v-if="info.applicationType!=3"
+			 @click="submit2()"
+			 type="primary" >申请提现</u-button>
+		</view>
 		</view>
 	</view>
 </template>
 
 <script>
 	import businessView from './businessView.vue'
+	import signReceipt from './signReceipt.vue'
 	
 	import * as API from '@/apis/finance.js'
 	import {
@@ -139,11 +151,12 @@
 	} from '@/utils'
 	export default {
 		components: {
-			businessView
+			businessView,signReceipt
 		
 		},
 		data() {
 			return {
+				step:0,
 				id:'',
 				tabindex:0,
 				info:{},
@@ -201,13 +214,69 @@
 			
 		},
 		methods: {
-			submit(){
+			customback(){
+				this.step=0
+				
+			},
+			submit2(){
+				
+					if(this.info.invoiceRequired!=''){
+						this.info.invoiceRequired=this.info.invoiceRequired=='1'?true:false
+					}
+					if(this.info.invoiceRequired=="1"){
+						if(!this.info.invoiceType){
+								uni.showToast({
+									title: "请选择发票类型"
+								})
+						
+							return
+						}
+						if(!this.info.taxRate){
+								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
+					}
+				
+				 this.step=1
+			},
+			submit(status,img){
 				
 				
 				
 				if(this.info.applicationType==3){
 					
 				}else{
+					
+					if(!img){
+							uni.showToast({
+								title: "请输入签字"
+							})
+						return
+					}
+					this.info.signUrl=img
+					
 					if(this.info.invoiceRequired!=''){
 						this.info.invoiceRequired=this.info.invoiceRequired=='1'?true:false
 					}

pagesFinance/user/withdrawal/businessInfo.vue

@@ -236,24 +236,24 @@
 
 			</view>
 
-			<view class="withdraw" v-if="info.applicationType==2">
+			<view class="withdraw"  >
 				
 				<view class="withdraw-head border-n">
-					<b>总收入</b>
+					<b>合伙人总收入</b>
 					<span  class="classFFF" >
-						{{info.chargingProfitAmount+info.monthlyCardIncome}}元
+						{{(info.chargingProfitAmount+info.monthlyCardIncome).toFixed(2)}}元
 				
 					</span>
 				</view>
 				<view class="withdraw-head border-n">
 					<b>合伙人总收益</b>
 					<span  class="classFFF" >
-						{{info.chargingProfitAmount+info.monthlyCardIncome-electricityPriceX}}元
+						{{(info.chargingProfitAmount+info.monthlyCardIncome-electricityPriceX).toFixed(2)}}元
 				
 					</span>
 				</view>
 				
-				<view class="withdraw-head"  >
+				<view class="withdraw-head" v-if="info.applicationType==2" >
 					<b>市场奖励比例</b>
 					<text class="unit" style="float: right;font-size: 16px;">%</text>
 					<span class="withdraw-input" style="width: 63%;">
@@ -833,7 +833,12 @@
 			submit(status){
 				this.info.isSecond=(this.isSecond?1:0)
 				 this.info.applicationMonth= this.thismonth
-				
+				if(this.info.applicationType==2){
+					if(this.info.rewardProportion&&this.electricityPriceX){
+						this.info.applicationAmount=((this.info.chargingProfitAmount+this.info.monthlyCardIncome-this.electricityPriceX)*this.info.rewardProportion/100).toFixed(2);
+						
+					}
+				}
 				if(this.info.applicationType!=3&&!this.selectAccUser.id){
 						uni.showToast({
 							title: "请选择提现账户"
@@ -985,12 +990,7 @@
 					}
 					
 			}
-			if(this.info.applicationType==2){
-				if(this.info.rewardProportion&&this.electricityPriceX){
-					this.info.applicationAmount=((this.info.chargingProfitAmount+this.info.monthlyCardIncome-this.electricityPriceX)*this.info.rewardProportion/100).toFixed(2);
-					
-				}
-			}
+		
 			if(status==5){
 				for(var i in this.detailList){
 						var obj=this.detailList[i]

pagesFinance/user/withdrawal/businessView.vue

@@ -55,7 +55,7 @@
 					<b>合伙人总收益</b>
 					
 					<span class="download" @click="ckdownload">
-						<view class="uni-input">{{info.totalIncome?info.totalIncome.toFixed(2):0}}元<span class="download" style="width: 220rpx;" ><u-icon  name="download"></u-icon> 下载收益明细</span> </view>
+						<view class="uni-input">{{info.totalProfitAmount?info.totalProfitAmount.toFixed(2):0}}元<span class="download" style="width: 220rpx;" ><u-icon  name="download"></u-icon> 下载收益明细</span> </view>
 					</span>
 				</view>
 				<view class="withdraw-head border-n" v-else>
@@ -73,14 +73,22 @@
 					</span>
 				</view>
 				<view class="withdraw-head border-n"   v-if="info.applicationType==2" >
-					<b>市场提成</b>
+					<b>奖励金额</b>
 					<span>
 						<view class="uni-input">
-							{{info.applicationAmount}}元({{applicationAmountDX}})
+							{{info.applicationAmount}}元
 						</view>
 				
 					</span>
 				</view>
+				<view class="withdraw-head border-n"  v-if="info.applicationType==2" >
+					<b>大写金额</b>
+				
+					<span>
+						<view class="uni-input">{{applicationAmountDX}}</view>
+					</span>
+				
+				</view>
 				
 			</view>
 
@@ -467,6 +475,7 @@
 					mask: true,
 				})
 				API.profitDetailsExcelByAccounting({
+					recordId:this.info.id,
 					stationId:this.info.stationId,
 					startDate:this.info.startTime2+":00",
 					endDate:this.info.endTime2+":00",

pagesFinance/user/withdrawal/signReceipt.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class="receipt">
+		<view class="receipt" v-if="obj!=0">
 			<view class="title">
 				充电收入确认单
 			</view>

pagesFinance/user/withdrawal/withdrawRecord.vue

@@ -18,7 +18,8 @@
 						<view class="u-flex">
 							<h4>{{item.applicationTypeText}}</h4>
 							 <span  :class="{
-								 success:item.status==5,
+								 error3:item.status==5,
+								 success:item.status==1,
 								  error:item.status==2,
 								   error2:item.status==0
 							 }">({{item.statusText}})</span>
@@ -192,6 +193,7 @@
 			.success{color:#27b148}
 			.error{color:#FF6200;}
 			.error2{color:#1ba7f4;}
+			.error3{color:red;}
 		}
 		.detailed-item-num{
 			text-align: right;