调整

pagesFinance/detailed/details.vue

@@ -99,7 +99,7 @@
 				<h4>分润明细</h4>
 			</view>
 			<view class="details-row" v-for="(item,i) in sprList" :key="i" v-if="item.disProportion">
-				<p>{{item.merchantAccountName}}({{showNumJP(item.disProportion*100)}}%)</p>
+				<p>{{item.merchantAccountName}}({{(item.disProportion*100).toFixed(2)}}%)</p>
 				<span>{{showNumJP(item.shareProfitAmount)}}元</span>
 			</view>
 		

pagesFinance/share/details.vue

@@ -93,7 +93,7 @@
 				<h4>分润明细</h4>
 			</view>
 			<view class="details-row" v-for="(item,i) in frmxList" :key="i" v-if="item.disProportion" >
-				<p>{{item.merchantAccountName}}({{showNumJP(item.disProportion*100)}}%)</p>
+				<p>{{item.merchantAccountName}}({{(item.disProportion*100).toFixed(2)}}%)</p>
 				<span>{{showNumJP(item.shareProfitAmount)}}元</span>
 			</view>
 		

pagesFinance/user/withdrawal/applicationForWithdrawal.vue

@@ -253,6 +253,7 @@
 				})
 				
 				this.info.status=0;
+				
 				//var str=JSON.stringify();
 				API.applyWithdrawByAccounting({
 					

pagesFinance/user/withdrawal/businessInfo.vue

@@ -6,7 +6,14 @@
 			inactive-color="#A1A1A1" :list="tabList" :is-scroll="false" :current="current" @change="change"></u-tabs>
 
 		<ujp-navbar title="收益核算" style="margin-bottom: 40px;">
-
+			<view slot="right"  v-if="current==1&&info.applicationType==1">
+				
+				<view  @click="copyItem()"
+				 style="margin-right: 10px;" >
+					生成副表<u-icon name="plus"></u-icon>
+				
+				</view>
+			</view>
 		</ujp-navbar>
 
 		<template v-if="current==0">
@@ -71,33 +78,33 @@
 					<view class="withdraw-head"  >
 						<b class="asterisk">抄表开始日期</b>
 						<span>
-							<view class="uni-input uni-time">{{info.startTime}}</view>
+							<view class="uni-input uni-time">{{info.startTime2}}</view>
 						</span>
 					</view>
 					<view class="withdraw-head" v-if="!isSecond" >
 						<b class="asterisk">抄表结束日期</b>
 						<u-picker  
-						:default-time="info.endTime"
+						:default-time="info.endTime2"
 						ref="ucalendar" v-model="showcalendar" 
 						mode="time" :params="params" @confirm="bindPickerChange4"
 						></u-picker>
 						
 						<span v-if="true" >
 							
-								<view class="uni-input uni-time" @click="showcalendar=true">{{info.endTime}}<text class="iconfont more">
+								<view class="uni-input uni-time" @click="showcalendar=true">{{info.endTime2}}<text class="iconfont more">
 										&#xe600;
 									</text>
 							</view>
 							
 						</span>
 						<span v-else>
-							<view class="uni-input ">{{info.endTime}}</view>
+							<view class="uni-input ">{{info.endTime2}}</view>
 						</span>
 					</view>
 					<view class="withdraw-head"  v-else >
 						<b class="asterisk">抄表结束日期</b>
 						<span>
-							<view class="uni-input uni-time">{{info.endTime}}</view>
+							<view class="uni-input uni-time">{{info.endTime2}}</view>
 						</span>
 					</view>
 				</view>
@@ -686,7 +693,50 @@
 			
 		},
 		methods: {
-			
+			copyItem(){
+				if(this.info.applicationType==1){
+					
+					if(this.detailList==null){
+						this.detailList=[];
+					}
+					//var key=-1;
+					var obj={};
+					// for(var i in this.detailList){
+					// 	var obj=this.detailList[i]
+						
+					// 	if(this.info.withdrawalType==0&&obj.itemName=="提成比例(自动生成)"){
+					// 		key=i;
+					// 	}
+					// 	if(this.info.withdrawalType==1&&obj.itemName=="停车费(自动生成)"){
+					// 		key=i;
+					// 	}
+					// }
+					if(this.info.withdrawalType==0){
+						var itemAmount=0;
+						if(this.electricityPriceX&&this.info.rewardProportion){
+							itemAmount=((this.info.chargingProfitAmount+this.info.monthlyCardIncome-this.electricityPriceX)*this.info.rewardProportion/100).toFixed(2);
+						}
+						var itemRemark=""
+						if(this.info.rewardProportion){
+							itemRemark="比例"+this.info.rewardProportion+"%"
+						}
+						obj={
+							itemName:"提成比例",
+							itemRemark:itemRemark,
+							itemAmount:itemAmount,
+						}
+					}else{
+						obj={
+							itemName:"停车费",
+							itemRemark:'',
+							itemAmount:this.info.parkingFee,
+						}
+					}
+					this.detailList.push(obj)
+					
+				
+				}
+			},
 			addItem(){
 				this.detailList.push({})
 			},
@@ -697,8 +747,7 @@
 			submit(status){
 				this.info.isSecond=(this.isSecond?1:0)
 				 this.info.applicationMonth= this.thismonth
-				
-				
+			
 				
 				if(status==5){
 					
@@ -845,52 +894,7 @@
 					}
 					
 			}
-			if(this.info.applicationType==1){
-				
-				if(this.detailList==null){
-					this.detailList=[];
-				}
-				var key=-1;
-				var obj={};
-				for(var i in this.detailList){
-					var obj=this.detailList[i]
-					
-					if(this.info.withdrawalType==0&&obj.itemName=="提成比例(自动生成)"){
-						key=i;
-					}
-					if(this.info.withdrawalType==1&&obj.itemName=="停车费(自动生成)"){
-						key=i;
-					}
-				}
-				if(this.info.withdrawalType==0){
-					var itemAmount=0;
-					if(this.electricityPriceX&&this.info.rewardProportion){
-						itemAmount=((this.info.chargingProfitAmount+this.info.monthlyCardIncome-this.electricityPriceX)*this.info.rewardProportion/100).toFixed(2);
-					}
-					var itemRemark=""
-					if(this.info.rewardProportion){
-						itemRemark="比例"+this.info.rewardProportion+"%"
-					}
-					obj={
-						itemName:"提成比例(自动生成)",
-						itemRemark:itemRemark,
-						itemAmount:itemAmount,
-					}
-				}else{
-					obj={
-						itemName:"停车费(自动生成)",
-						itemRemark:'',
-						itemAmount:this.info.parkingFee,
-					}
-				}
-				if(key==-1){
-					this.detailList.push(obj)
-				}else{
-					this.detailList[key]=(obj)
-				}
-				
-				
-			}
+		
 			if(status==5){
 				for(var i in this.detailList){
 						var obj=this.detailList[i]
@@ -1052,7 +1056,7 @@
 					}
 					this.id=this.info.id
 					if(!this.isSecond){
-						this.info.endTime=this.endTime;
+						this.info.endTime2=this.endTime;
 					}
 					if(this.info.applicationType==3){
 						if(this.info.invoiceRequired==null){
@@ -1230,7 +1234,8 @@
 			bindPickerChange4(e) {
 				
 				var str=e.year+"-"+e.month+"-"+e.day+" "+e.hour+":"+e.minute+":00"
-				var startTime=new Date(this.info.startTime)
+				//var str2=e.year+"-"+e.month+"-"+e.day+" "+e.hour+":"+e.minute+":00"
+				var startTime=new Date(this.info.startTime2)
 				var nowTime=new Date()
 				var result=new Date(str)
 				
@@ -1244,7 +1249,7 @@
 						})
 				}else{
 					this.endTime =str;
-					this.info.endTime= str;
+					this.info.endTime2= str;
 					this.queryWithdrawInfo()
 				}
 					

pagesFinance/user/withdrawal/businessList.vue

@@ -18,7 +18,8 @@
 						<view class="u-flex">
 							<h4>{{item.applicationTypeText}}</h4>
 							 <span  :class="{
-								 success:['5','0'].indexOf(item.status)>-1,
+								 success:['5'].indexOf(item.status)>-1,
+								error:['0'].indexOf(item.status)>-1,
 								
 							 }">({{item.statusText}})</span>
 							
@@ -101,7 +102,7 @@
 				
 				this.uuid=new Date().getTime()
 				if(this.info.status&&item.status=='-2'){
-					this.gotoUrl('pagesFinance/user/withdrawal/businessInfo?id='+item.id+"&uuid="+this.uuid)
+					this.gotoUrl('pagesFinance/user/withdrawal/businessInfo?uuid='+this.uuid)
 				}else{
 					this.gotoUrl('pagesFinance/user/withdrawal/businessView?id='+item.id)
 				}

pagesFinance/user/withdrawal/businessView.vue

@@ -41,13 +41,13 @@
 				<view class="withdraw-head">
 					<b>抄表开始日期</b>
 					<span>
-						<view class="uni-input">{{info.startTime}}</view>
+						<view class="uni-input">{{info.startTime2}}</view>
 					</span>
 				</view>
 				<view class="withdraw-head">
 					<b>抄表结束日期</b>
 					<span>
-						<view class="uni-input">{{info.endTime}}</view>
+						<view class="uni-input">{{info.endTime2}}</view>
 					</span>
 				</view>