sale-client 3.5.196 → 3.5.198
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/build/dev-server.js +48 -13
- package/package.json +1 -1
- package/src/components/charge/business/CardMeterCenter.vue +5 -0
- package/src/components/charge/business/ShowCardSellGas.vue +6 -1
- package/src/filiale/xiangyun/GasPrice.vue +8 -1
- package/src/filiale/xiangyun/StairPrice.vue +84 -0
- package/src/filiale/xiangyun/sale.js +2 -0
package/build/dev-server.js
CHANGED
|
@@ -10,25 +10,60 @@ const [local, server] = ['http://127.0.0.1:8080', 'http://192.168.50.4:8400']
|
|
|
10
10
|
const port = 8089
|
|
11
11
|
|
|
12
12
|
const proxyTable = {
|
|
13
|
-
'/
|
|
14
|
-
target:
|
|
15
|
-
// changeOrigin: true //https请求需要加
|
|
13
|
+
'/rs/file': {
|
|
14
|
+
target: server
|
|
16
15
|
},
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
16
|
+
// 查找资源服务数据
|
|
17
|
+
'/rs/search': {
|
|
18
|
+
target: server
|
|
19
|
+
},
|
|
20
|
+
// 查找资源服务数据
|
|
21
|
+
'/rs/logic/getLogin': {
|
|
22
|
+
target: server
|
|
23
|
+
},
|
|
24
|
+
// 查找资源服务数据
|
|
25
|
+
'/rs/logic/getInitData': {
|
|
26
|
+
target: server
|
|
27
|
+
},
|
|
28
|
+
'/rs/logic/getSaleInitData': {
|
|
29
|
+
target: server
|
|
30
|
+
},
|
|
31
|
+
// 用户登录服务地址
|
|
32
|
+
'/rs/user': {
|
|
33
|
+
target: server
|
|
34
|
+
},
|
|
35
|
+
'/rs/path': {
|
|
36
|
+
target: server
|
|
37
|
+
},
|
|
38
|
+
'/rs/data': {
|
|
39
|
+
target: server
|
|
40
|
+
},
|
|
41
|
+
'/rs/license': {
|
|
42
|
+
target: server
|
|
43
|
+
},
|
|
44
|
+
'/rs/db': {
|
|
45
|
+
target: server
|
|
20
46
|
},
|
|
21
47
|
'/excel': {
|
|
22
|
-
target: server
|
|
23
|
-
// changeOrigin: true
|
|
48
|
+
target: server
|
|
24
49
|
},
|
|
25
|
-
'/
|
|
26
|
-
target: server
|
|
27
|
-
|
|
50
|
+
'/rs/config': {
|
|
51
|
+
target: server
|
|
52
|
+
},
|
|
53
|
+
'/rs/report': {
|
|
54
|
+
target: server
|
|
55
|
+
},
|
|
56
|
+
'/rs/vue': {
|
|
57
|
+
target: server
|
|
28
58
|
},
|
|
29
59
|
'/rs/logic': {
|
|
30
|
-
target:
|
|
31
|
-
|
|
60
|
+
target: local
|
|
61
|
+
},
|
|
62
|
+
'/rs/sql': {
|
|
63
|
+
target: local
|
|
64
|
+
},
|
|
65
|
+
'/webmeter': {
|
|
66
|
+
target: server
|
|
32
67
|
},
|
|
33
68
|
'/rs': {
|
|
34
69
|
target: server,
|
package/package.json
CHANGED
|
@@ -100,8 +100,13 @@
|
|
|
100
100
|
<label for="f_collection" class=" font_normal_body">*收  款</label>
|
|
101
101
|
<input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
|
|
102
102
|
v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0), ">=" ] }'
|
|
103
|
+
v-if="config.calculatePreByCollection"
|
|
103
104
|
@blur="config.calculatePreByCollection && calculatePreByCollection()"
|
|
104
105
|
v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_totalcost, 4]" :disabled="$refs.givechange.promptText != ''">
|
|
106
|
+
<input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
|
|
107
|
+
v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0), ">=" ] }'
|
|
108
|
+
v-if="!config.calculatePreByCollection"
|
|
109
|
+
v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_totalcost, 4]" :disabled="$refs.givechange.promptText != ''">
|
|
105
110
|
</div>
|
|
106
111
|
<div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment=='赠气' && row.f_meter_type.includes('卡表')"
|
|
107
112
|
:class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error' : 'has-success']">
|
|
@@ -88,7 +88,12 @@
|
|
|
88
88
|
:class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error' : 'has-success']">
|
|
89
89
|
<label for="f_collection" class=" font_normal_body">*收  款</label>
|
|
90
90
|
<input class="input_search" style="width:60%" type="number" v-model="model.f_collection"
|
|
91
|
-
@blur="
|
|
91
|
+
@blur="calculatePreByCollection()"
|
|
92
|
+
v-if="config.calculatePreByCollection"
|
|
93
|
+
v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0) + (openFee - 0), ">=" ] }'
|
|
94
|
+
v-el:sk v-scale="[model.f_collection, 4]" :disabled="$refs.givechange.promptText != ''">
|
|
95
|
+
<input class="input_search" style="width:60%" type="number" v-model="model.f_collection"
|
|
96
|
+
v-if="!config.calculatePreByCollection"
|
|
92
97
|
v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0) + (openFee - 0), ">=" ] }'
|
|
93
98
|
v-el:sk v-scale="[model.f_collection, 4]" :disabled="$refs.givechange.promptText != ''">
|
|
94
99
|
</div>
|
|
@@ -175,6 +175,13 @@
|
|
|
175
175
|
v-model="model.f_add_price" />
|
|
176
176
|
</div>
|
|
177
177
|
</div>
|
|
178
|
+
<div class="row" v-if="model.f_price_type === '固定气价'">
|
|
179
|
+
<div class="col-sm-6 form-group" >
|
|
180
|
+
<label class="font_normal_body">政府定价</label>
|
|
181
|
+
<input class="input_search" style="width:60%"
|
|
182
|
+
:value.sync="(model.detailprice[0].f_price-model.f_add_price).toFixed(2)" readonly="true" />
|
|
183
|
+
</div>
|
|
184
|
+
</div>
|
|
178
185
|
<div class="row">
|
|
179
186
|
<div class="col-sm-12 form-group" style="height: auto !important;">
|
|
180
187
|
<label class="font_normal_body ">备  注</label>
|
|
@@ -188,7 +195,7 @@
|
|
|
188
195
|
<div class='auto' style="margin-top: 10px;">
|
|
189
196
|
|
|
190
197
|
<mix-price :is-disable.sync='isEdit' :mixmodel.sync='model.detailprice' v-if="mixshow"></mix-price>
|
|
191
|
-
<stair-price :is-disable.sync='isEdit' :isheat.sync="model.f_isheat" :stairmodel.sync='model.detailprice' style="height: 40%;"
|
|
198
|
+
<stair-price :is-disable.sync='isEdit' :isheat.sync="model.f_isheat" :f_add_price="model.f_add_price" :stairmodel.sync='model.detailprice' style="height: 40%;"
|
|
192
199
|
v-if="stairshow"></stair-price>
|
|
193
200
|
</div>
|
|
194
201
|
|
|
@@ -0,0 +1,84 @@
|
|
|
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"><nobr>人口增量</nobr></th>
|
|
12
|
+
<th style="text-align:center" v-if="isheat == '1'"><nobr>采暖增量</nobr></th>
|
|
13
|
+
</tr>
|
|
14
|
+
</thead>
|
|
15
|
+
<tbody>
|
|
16
|
+
<tr v-for="row in stairmodel">
|
|
17
|
+
<td><nobr>
|
|
18
|
+
<button class="glyphicon glyphicon-minus btn-danger" @click.stop="delGas($index)"></button>
|
|
19
|
+
<button class="glyphicon glyphicon-plus btn-success" @click.stop="addGas()"></button>
|
|
20
|
+
</nobr></td>
|
|
21
|
+
<td v-if='!row.f_price_name'>{{$index+1}}</td>
|
|
22
|
+
<td v-if='row.f_price_name'>{{row.f_price_name}}</td>
|
|
23
|
+
<td style="text-align:center">
|
|
24
|
+
<input class="input_search" style="width: 100px" type="number" v-model="row.f_gas" :disabled="isDisable"
|
|
25
|
+
placeholder="气量">
|
|
26
|
+
</td>
|
|
27
|
+
<td style="text-align:center">
|
|
28
|
+
<input class="input_search" style="width: 100px" :value.sync="(row.f_price-this.f_add_price).toFixed(2)" readonly="true"
|
|
29
|
+
placeholder="政府定价">
|
|
30
|
+
</td>
|
|
31
|
+
<td style="text-align:center">
|
|
32
|
+
<input class="input_search" style="width: 100px" type="number" v-model="row.f_price" :disabled="isDisable"
|
|
33
|
+
placeholder="单价">
|
|
34
|
+
</td>
|
|
35
|
+
<td style="text-align:center">
|
|
36
|
+
<input class="input_search" style="width: 100px" type="number" v-model="row.f_add_gas" :disabled="isDisable"
|
|
37
|
+
placeholder="人口增量">
|
|
38
|
+
</td>
|
|
39
|
+
<td style="text-align:center" v-if="isheat == '1'">
|
|
40
|
+
<input class="input_search" style="width: 100px" type="number" v-model="row.f_add_gas_heat" :disabled="isDisable"
|
|
41
|
+
placeholder="采暖增量">
|
|
42
|
+
</td>
|
|
43
|
+
</tr>
|
|
44
|
+
</tbody>
|
|
45
|
+
</table>
|
|
46
|
+
</div>
|
|
47
|
+
|
|
48
|
+
</template>
|
|
49
|
+
<script>
|
|
50
|
+
/**
|
|
51
|
+
*阶梯气价管理组件
|
|
52
|
+
*/
|
|
53
|
+
export default {
|
|
54
|
+
data () {
|
|
55
|
+
return {
|
|
56
|
+
}
|
|
57
|
+
},
|
|
58
|
+
props: ['stairmodel', 'isDisable', 'isheat','f_add_price'],
|
|
59
|
+
watch: {
|
|
60
|
+
'stairmodel' (val) {
|
|
61
|
+
console.log('val----->',val)
|
|
62
|
+
},
|
|
63
|
+
},
|
|
64
|
+
ready:{
|
|
65
|
+
|
|
66
|
+
},
|
|
67
|
+
methods: {
|
|
68
|
+
addGas () {
|
|
69
|
+
this.stairmodel.push({
|
|
70
|
+
f_add_gas: 0,
|
|
71
|
+
f_add_gas_heat: 0
|
|
72
|
+
})
|
|
73
|
+
},
|
|
74
|
+
delGas (index) {
|
|
75
|
+
if (this.stairmodel.length > 1) {
|
|
76
|
+
this.stairmodel.splice(index, 1)
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
</script>
|
|
82
|
+
<style>
|
|
83
|
+
input { outline:none; }
|
|
84
|
+
</style>
|