sale-client 4.2.104 → 4.2.105
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -194,9 +194,24 @@ let CardService = {
|
|
|
194
194
|
f_zones: Vue.$login.f.zones,
|
|
195
195
|
f_comments: model.f_comments
|
|
196
196
|
}
|
|
197
|
+
if (row.f_alias == 'LaiDeUDP') {
|
|
198
|
+
param.f_total_gas = (row.f_total_gas - 0) + (model.f_pregas - 0)
|
|
199
|
+
param.f_total_fee = (row.f_total_fee - 0) + (model.f_preamount - 0)
|
|
200
|
+
} else {
|
|
201
|
+
if (row.f_remanent_type === 1) {
|
|
202
|
+
param.f_total_gas = (row.f_total_gas - 0) + (model.f_pregas - 0)
|
|
203
|
+
param.f_total_fee = (row.f_total_fee - 0) + (model.f_preamount - 0)
|
|
204
|
+
} else {
|
|
205
|
+
if ((model.f_pregas - 0) > (model.f_fill_gas - 0)) {
|
|
206
|
+
param.f_total_gas = (row.f_total_gas - 0) + ((model.f_pregas - 0) - (model.f_fill_gas - 0))
|
|
207
|
+
param.f_total_fee = (row.f_total_fee - 0) + (model.f_preamount - 0)
|
|
208
|
+
} else {
|
|
209
|
+
param.f_total_gas = (row.f_total_gas - 0)
|
|
210
|
+
param.f_total_fee = (row.f_total_fee - 0)
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
}
|
|
197
214
|
|
|
198
|
-
param.f_total_gas = (row.f_total_gas - 0) + (model.f_pregas - 0)
|
|
199
|
-
param.f_total_fee = (row.f_total_fee - 0) + (model.f_preamount - 0)
|
|
200
215
|
// console.log(row, model)
|
|
201
216
|
param.f_write_totalgas = (row.f_write_totalgas - 0) + (model.f_pregas - 0)
|
|
202
217
|
param.f_write_totalfee = (row.f_write_totalfee - 0) + (model.f_preamount - 0)
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="auto">
|
|
3
|
+
<table class="table table-condensed" style="margin-top:15px; margin-left:5%; width:90%;text-algin:center;">
|
|
4
|
+
<thead>
|
|
5
|
+
<tr>
|
|
6
|
+
<th style="text-align:center"><nobr>操作</nobr></th>
|
|
7
|
+
<th style="text-align:center"><nobr>阶梯数</nobr></th>
|
|
8
|
+
<th style="text-align:center"><nobr>气量上限</nobr></th>
|
|
9
|
+
<th style="text-align:center"><nobr>单价</nobr></th>
|
|
10
|
+
<th style="text-align:center"><nobr>人口增量</nobr></th>
|
|
11
|
+
<th style="text-align:center" v-if="isheat == '1'"><nobr>采暖增量</nobr></th>
|
|
12
|
+
</tr>
|
|
13
|
+
</thead>
|
|
14
|
+
<tbody>
|
|
15
|
+
<tr v-for="row in stairmodel">
|
|
16
|
+
<td><nobr>
|
|
17
|
+
<button class="glyphicon glyphicon-minus btn-danger" @click.stop="delGas($index)"></button>
|
|
18
|
+
<button class="glyphicon glyphicon-plus btn-success" @click.stop="addGas()"></button>
|
|
19
|
+
</nobr></td>
|
|
20
|
+
<td v-if='!row.f_price_name' style="text-align:center">{{$index+1}}</td>
|
|
21
|
+
<td v-if='row.f_price_name' style="text-align:center">{{row.f_price_name}}</td>
|
|
22
|
+
<td style="text-align:center">
|
|
23
|
+
<input class="input_search" style="width: 100px" type="number" v-model="row.f_gas" :disabled="isDisable"
|
|
24
|
+
placeholder="气量">
|
|
25
|
+
</td>
|
|
26
|
+
<td style="text-align:center">
|
|
27
|
+
<input class="input_search" style="width: 100px" type="number" v-model="row.f_price" :disabled="isDisable"
|
|
28
|
+
placeholder="单价">
|
|
29
|
+
</td>
|
|
30
|
+
<td style="text-align:center">
|
|
31
|
+
<input class="input_search" style="width: 100px" type="number" v-model="row.f_add_gas" :disabled="isDisable"
|
|
32
|
+
placeholder="人口增量">
|
|
33
|
+
</td>
|
|
34
|
+
<td style="text-align:center" v-if="isheat == '1'">
|
|
35
|
+
<input class="input_search" style="width: 100px" type="number" v-model="row.f_add_gas_heat" :disabled="isDisable"
|
|
36
|
+
placeholder="采暖增量">
|
|
37
|
+
</td>
|
|
38
|
+
</tr>
|
|
39
|
+
</tbody>
|
|
40
|
+
</table>
|
|
41
|
+
</div>
|
|
42
|
+
|
|
43
|
+
</template>
|
|
44
|
+
<script>
|
|
45
|
+
/**
|
|
46
|
+
*阶梯气价管理组件
|
|
47
|
+
*/
|
|
48
|
+
export default {
|
|
49
|
+
data () {
|
|
50
|
+
return {
|
|
51
|
+
}
|
|
52
|
+
},
|
|
53
|
+
props: ['stairmodel', 'isDisable', 'isheat'],
|
|
54
|
+
watch: {
|
|
55
|
+
'stairmodel' (val) {
|
|
56
|
+
// val.push({})
|
|
57
|
+
}
|
|
58
|
+
},
|
|
59
|
+
methods: {
|
|
60
|
+
addGas () {
|
|
61
|
+
this.stairmodel.push({
|
|
62
|
+
f_add_gas: 0,
|
|
63
|
+
f_add_gas_heat: 0
|
|
64
|
+
})
|
|
65
|
+
},
|
|
66
|
+
delGas (index) {
|
|
67
|
+
if (this.stairmodel.length > 1) {
|
|
68
|
+
this.stairmodel.splice(index, 1)
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
</script>
|
|
74
|
+
<style>
|
|
75
|
+
input { outline:none; }
|
|
76
|
+
</style>
|
|
@@ -108,4 +108,6 @@ export default function () {
|
|
|
108
108
|
// 表具查看
|
|
109
109
|
Vue.component('new-meter-list', (resolve) => { require(['./NewMeterList'], resolve) })
|
|
110
110
|
Vue.component('user-base-info-new', (resolve) => { require(['./UserBaseInfoNew'], resolve) })
|
|
111
|
+
// 阶梯气价
|
|
112
|
+
Vue.component('stair-price', (resolve) => { require(['./StairPrice'], resolve) })
|
|
111
113
|
}
|