|
@@ -157,7 +157,7 @@
|
|
|
</view>
|
|
|
|
|
|
|
|
|
- <view class="withdraw-head" v-if="info.applicationType!=2&&!isSecond&&!info.haveBill" >
|
|
|
+ <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%;">
|
|
@@ -191,7 +191,7 @@
|
|
|
|
|
|
</view>
|
|
|
|
|
|
- <view class="withdraw-head" v-if="info.applicationType!=2&&!isSecond&&!info.haveBill" >
|
|
|
+ <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%;">
|
|
@@ -214,9 +214,46 @@
|
|
|
{{info.electricQuantity}}度
|
|
|
</span>
|
|
|
|
|
|
- </view>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view class=" " v-if="info.applicationType!=2&&!isSecond" >
|
|
|
+
|
|
|
+ 电费参考值(电量*电价)
|
|
|
+ <span style="margin-left: 20rpx;" >
|
|
|
+
|
|
|
+ <span class="classFFF" v-if="info.electricQuantity&&info.electricityPrice">{{info.electricQuantity*info.electricityPrice}}元</span>
|
|
|
+ <span class="classFFF" v-else>自动计算出结果</span>
|
|
|
+ </span>
|
|
|
+
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <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%;">
|
|
|
+ <u-input height="20px" placeholder="请填写实际电费"
|
|
|
+ maxlength="10"
|
|
|
+
|
|
|
+ v-model="info.electricityCost" input-align="left"
|
|
|
+ type="digit">
|
|
|
+
|
|
|
+ </u-input>
|
|
|
+
|
|
|
+
|
|
|
+ </span>
|
|
|
+
|
|
|
+ </view>
|
|
|
+ <view class="withdraw-head" v-else>
|
|
|
+ <b class="asterisk">电费</b>
|
|
|
+
|
|
|
+ <span class="withdraw-input classFFF" style="width: 63%;">
|
|
|
+ {{info.electricityCost}}元
|
|
|
+ </span>
|
|
|
+
|
|
|
+ </view>
|
|
|
|
|
|
- <view class="withdraw-head border-n">
|
|
|
+
|
|
|
+ <view class="withdraw-head border-n" v-if="false">
|
|
|
<b>电费</b>
|
|
|
<text class="unit" style="float: right;font-size: 16px;"></text>
|
|
|
<span class="withdraw-input" style="width: 63%;">
|
|
@@ -792,10 +829,7 @@
|
|
|
|
|
|
electricityPriceX() {
|
|
|
|
|
|
- if (this.info.electricityPrice&&this.info.electricQuantity&&this.info.electricityPrice != '' && this.info.electricQuantity != '') {
|
|
|
- return (this.info.electricityPrice * this.info.electricQuantity).toFixed(2)
|
|
|
- }
|
|
|
- return 0
|
|
|
+ return this.info.electricityCost
|
|
|
}
|
|
|
},
|
|
|
watch:{
|
|
@@ -989,13 +1023,20 @@
|
|
|
}
|
|
|
|
|
|
|
|
|
- if(!this.info.electricQuantity&&this.info.electricQuantity!=0){
|
|
|
+ if(!this.info.electricQuantity||this.info.electricQuantity==0){
|
|
|
uni.showToast({
|
|
|
title: "请输入实际电量"
|
|
|
})
|
|
|
|
|
|
return
|
|
|
}
|
|
|
+ if(!this.info.electricityCost){
|
|
|
+ uni.showToast({
|
|
|
+ title: "请输入实际电费"
|
|
|
+ })
|
|
|
+
|
|
|
+ return
|
|
|
+ }
|
|
|
|
|
|
if(!this.info.applicationAmount){
|
|
|
uni.showToast({
|