|
|
@@ -28,6 +28,7 @@
|
|
|
v-model="withdrawInfoDTO.record.applicationType">
|
|
|
<el-option label="物业方结算" value="1"></el-option>
|
|
|
<el-option label="市场奖励" value="2"></el-option>
|
|
|
+ <el-option label="公共维护费" value="2.5"></el-option>
|
|
|
<el-option label="利润提现" value="3"></el-option>
|
|
|
<!-- <el-option label="站主提现" value="4"></el-option> -->
|
|
|
</el-select>
|
|
|
@@ -205,6 +206,14 @@
|
|
|
<template slot="append">元</template>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="公共维护费">
|
|
|
+ <el-input type="number" size="mini" style="width:200px;vertical-align:middle;"
|
|
|
+ :disabled="true"
|
|
|
+ :value="publicMaintenanceAmount"
|
|
|
+ >
|
|
|
+ <template slot="append">元</template>
|
|
|
+ </el-input>
|
|
|
+ </el-form-item>
|
|
|
</template>
|
|
|
<template v-if="withdrawInfoDTO.record.applicationType=='2'">
|
|
|
<el-form-item label="市场奖励比例">
|
|
|
@@ -360,7 +369,8 @@ export default {
|
|
|
chargingStationResult: [],
|
|
|
merchantList: [],
|
|
|
pmAmount: 0,
|
|
|
- marketAmount: 0
|
|
|
+ marketAmount: 0,
|
|
|
+ publicMaintenanceAmount: 0
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -478,58 +488,75 @@ export default {
|
|
|
endTimeChange(){
|
|
|
this.queryAmount();
|
|
|
},
|
|
|
- monthChange() {
|
|
|
+ async monthChange() {
|
|
|
var record = this.withdrawInfoDTO.record;
|
|
|
|
|
|
if(record.applicationType!='1'){
|
|
|
- applicationAmountRecordApi.findByApplicationMonthAndStationId({
|
|
|
+ const resp = await applicationAmountRecordApi.findByApplicationMonthAndStationId({
|
|
|
stationId: record.stationId,
|
|
|
applicationMonth: record.applicationMonth,
|
|
|
applicationType: "1"
|
|
|
- }).then(resp=>{
|
|
|
- var jsonData = resp.data;
|
|
|
+ });
|
|
|
|
|
|
- if (jsonData.result) {
|
|
|
- var data = jsonData.data;
|
|
|
+ var jsonData = resp.data;
|
|
|
|
|
|
- record.startTime = data.startTime;
|
|
|
- record.endTime = data.endTime;
|
|
|
- record.estimateElectricQuantity = data.estimateElectricQuantity;
|
|
|
- record.electricQuantity = data.electricQuantity;
|
|
|
- record.electricityPrice = data.electricityPrice;
|
|
|
- record.total = data.total;
|
|
|
- record.bearElecMoney = data.bearElecMoney;
|
|
|
- record.chargingIncome = data.chargingIncome;
|
|
|
- record.chargingProfitAmount = data.chargingProfitAmount;
|
|
|
- record.monthlyCardTotal = data.monthlyCardTotal;
|
|
|
- record.monthlyCardIncome = data.monthlyCardIncome;
|
|
|
+ if (jsonData.result) {
|
|
|
+ var data = jsonData.data;
|
|
|
|
|
|
- this.pmAmount = data.applicationAmount;
|
|
|
+ record.startTime = data.startTime;
|
|
|
+ record.endTime = data.endTime;
|
|
|
+ record.estimateElectricQuantity = data.estimateElectricQuantity;
|
|
|
+ record.electricQuantity = data.electricQuantity;
|
|
|
+ record.electricityPrice = data.electricityPrice;
|
|
|
+ record.electricityCost = data.electricityCost;
|
|
|
+ record.total = data.total;
|
|
|
+ record.bearElecMoney = data.bearElecMoney;
|
|
|
+ record.chargingIncome = data.chargingIncome;
|
|
|
+ record.chargingProfitAmount = data.chargingProfitAmount;
|
|
|
+ record.monthlyCardTotal = data.monthlyCardTotal;
|
|
|
+ record.monthlyCardIncome = data.monthlyCardIncome;
|
|
|
+
|
|
|
+ this.pmAmount = data.applicationAmount;
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ this.pmAmount = 0;
|
|
|
+ }
|
|
|
+
|
|
|
+ if(record.applicationType=='3'){
|
|
|
+ const resp2 = await applicationAmountRecordApi.findByApplicationMonthAndStationId({
|
|
|
+ stationId: record.stationId,
|
|
|
+ applicationMonth: record.applicationMonth,
|
|
|
+ applicationType: "2"
|
|
|
+ });
|
|
|
+
|
|
|
+ var jsonData2 = resp2.data;
|
|
|
+
|
|
|
+ if (jsonData2.result) {
|
|
|
+ var data2 = jsonData2.data;
|
|
|
+ this.marketAmount = data2.applicationAmount;
|
|
|
}
|
|
|
else{
|
|
|
- this.pmAmount = 0;
|
|
|
+ this.marketAmount = 0;
|
|
|
}
|
|
|
|
|
|
- if(record.applicationType=='3'){
|
|
|
- applicationAmountRecordApi.findByApplicationMonthAndStationId({
|
|
|
- stationId: record.stationId,
|
|
|
- applicationMonth: record.applicationMonth,
|
|
|
- applicationType: "2"
|
|
|
- }).then(resp2=>{
|
|
|
- var jsonData2 = resp2.data;
|
|
|
+ const resp3 = await applicationAmountRecordApi.findByApplicationMonthAndStationId({
|
|
|
+ stationId: record.stationId,
|
|
|
+ applicationMonth: record.applicationMonth,
|
|
|
+ applicationType: "2.5"
|
|
|
+ });
|
|
|
|
|
|
- if (jsonData2.result) {
|
|
|
- var data2 = jsonData2.data;
|
|
|
- this.marketAmount = data2.applicationAmount;
|
|
|
- }
|
|
|
- else{
|
|
|
- this.marketAmount = 0;
|
|
|
- }
|
|
|
+ var jsonData3 = resp3.data;
|
|
|
|
|
|
- record.applicationAmount = (this.totalIncome - this.pmAmount - this.marketAmount).toFixed(2);
|
|
|
- })
|
|
|
+ if (jsonData3.result) {
|
|
|
+ var data3 = jsonData3.data;
|
|
|
+ this.publicMaintenanceAmount = data3.applicationAmount;
|
|
|
}
|
|
|
- })
|
|
|
+ else{
|
|
|
+ this.publicMaintenanceAmount = 0;
|
|
|
+ }
|
|
|
+
|
|
|
+ record.applicationAmount = (this.totalIncome - this.pmAmount - this.marketAmount - this.publicMaintenanceAmount).toFixed(2);
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
dealBigMoney(money){
|
