|
@@ -100,7 +100,7 @@
|
|
|
</span>
|
|
|
</view>
|
|
|
<view class="withdraw-head" v-if="!isSecond" >
|
|
|
- <b class="asterisk">抄表结束日期</b>
|
|
|
+ <b class="asterisk">抄表截止日期</b>
|
|
|
<u-picker
|
|
|
:default-time="info.endTime2"
|
|
|
ref="ucalendar" v-model="showcalendar"
|
|
@@ -118,7 +118,7 @@
|
|
|
|
|
|
</view>
|
|
|
<view class="withdraw-head" v-else >
|
|
|
- <b class="asterisk">抄表结束日期</b>
|
|
|
+ <b class="asterisk">抄表截止日期</b>
|
|
|
<span>
|
|
|
<view class="uni-input uni-time">{{showTime2(info.endTime2)}}</view>
|
|
|
</span>
|
|
@@ -136,7 +136,7 @@
|
|
|
</view>
|
|
|
|
|
|
<view class="withdraw">
|
|
|
- <view class="withdraw-head" v-if="info.applicationType==1&&!isSecond" >
|
|
|
+ <view class="withdraw-head" v-if="info.applicationType!=2&&!isSecond" >
|
|
|
<b class="asterisk"><text>*</text>电单价</b>
|
|
|
<text class="unit" style="float: right;font-size: 16px;">元/度</text>
|
|
|
<span class="withdraw-input" style="width: 63%;">
|
|
@@ -170,7 +170,7 @@
|
|
|
</span>
|
|
|
|
|
|
</view>
|
|
|
- <view class="withdraw-head" v-if="info.applicationType==1&&!isSecond" >
|
|
|
+ <view class="withdraw-head" v-if="info.applicationType!=2&&!isSecond" >
|
|
|
<b class="asterisk"><text>*</text>实际电量</b>
|
|
|
<text class="unit" style="float: right;font-size: 16px;">度</text>
|
|
|
<span class="withdraw-input" style="width: 63%;">
|
|
@@ -517,7 +517,7 @@
|
|
|
<view class="withdraw-head">
|
|
|
|
|
|
<b>是否为你自动申请提现</b>
|
|
|
- <span style="width: 30%;">
|
|
|
+ <span style="min-width: 30%;">
|
|
|
<u-checkbox-group >
|
|
|
|
|
|
<u-checkbox
|
|
@@ -1212,19 +1212,20 @@
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if(this.info.applicationType==1){
|
|
|
- if(this.info.withdrawalType==0||this.info.withdrawalType==1){
|
|
|
-
|
|
|
- }else{
|
|
|
- this.info.withdrawalType=0
|
|
|
+ if(this.info.applicationType==2){
|
|
|
+ if(!this.info.electricityPrice){
|
|
|
+ this.isReady=false;
|
|
|
+ uni.showToast({
|
|
|
+ title: "请先核算[物业结算]电单价、实际电量"
|
|
|
+ })
|
|
|
}
|
|
|
- }else{
|
|
|
- if(!this.info.electricityPrice){
|
|
|
- this.isReady=false;
|
|
|
- uni.showToast({
|
|
|
- title: "请先核算[物业结算]电单价、实际电量"
|
|
|
- })
|
|
|
+ }else{
|
|
|
+ if(this.info.withdrawalType==0||this.info.withdrawalType==1){
|
|
|
+
|
|
|
+ }else{
|
|
|
+ this.info.withdrawalType=0
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
var detailList = res.data.detailList;
|
|
|
this.detailList=[];
|