manage-client 3.2.267 → 3.2.269
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
CHANGED
|
@@ -19,9 +19,9 @@ var qtx= 'http://36.103.222.144:6300/'
|
|
|
19
19
|
// var bendi = 'http://203.57.101.233:8400/'
|
|
20
20
|
// var bendi = 'http://121.36.106.17:8400/'
|
|
21
21
|
// var fuwu = 'http://203.57.101.233:9001'
|
|
22
|
-
var bendi = 'http://
|
|
22
|
+
var bendi = 'http://192.168.50.4:8400'
|
|
23
23
|
// var bendi = 'http://119.187.112.234:8400/'
|
|
24
|
-
var wode = 'http://
|
|
24
|
+
var wode = 'http://127.0.0.1:8084'
|
|
25
25
|
// 192.168.
|
|
26
26
|
// var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
|
|
27
27
|
// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
|
package/package.json
CHANGED
|
@@ -727,7 +727,7 @@
|
|
|
727
727
|
<nobr>{{row.f_stairamount1}}</nobr>
|
|
728
728
|
</td>
|
|
729
729
|
<td style="text-align: center;">
|
|
730
|
-
<nobr>{{row.
|
|
730
|
+
<nobr>{{row.f_stair1price}}</nobr>
|
|
731
731
|
</td>
|
|
732
732
|
<td style="text-align: center;">
|
|
733
733
|
<nobr>{{(row.f_stair1fee - 0).toFixed(2)}}</nobr>
|
|
@@ -736,7 +736,7 @@
|
|
|
736
736
|
<nobr>{{row.f_stair2amount}}</nobr>
|
|
737
737
|
</td>
|
|
738
738
|
<td style="text-align: center;">
|
|
739
|
-
<nobr>{{row.
|
|
739
|
+
<nobr>{{row.f_stair2price}}</nobr>
|
|
740
740
|
</td>
|
|
741
741
|
<td style="text-align: center;">
|
|
742
742
|
<nobr>{{(row.f_stair2fee - 0).toFixed(2)}}</nobr>
|
|
@@ -745,7 +745,7 @@
|
|
|
745
745
|
<nobr>{{row.f_stair3amount}}</nobr>
|
|
746
746
|
</td>
|
|
747
747
|
<td style="text-align: center;">
|
|
748
|
-
<nobr>{{row.
|
|
748
|
+
<nobr>{{row.f_stair3price}}</nobr>
|
|
749
749
|
</td>
|
|
750
750
|
<td style="text-align: center;">
|
|
751
751
|
<nobr>{{(row.f_stair3fee - 0).toFixed(2)}}</nobr>
|
|
@@ -221,6 +221,27 @@
|
|
|
221
221
|
condition="f_networkvalve='{}'">
|
|
222
222
|
</v-select>
|
|
223
223
|
</div>
|
|
224
|
+
<div class="col-sm-2 form-group">
|
|
225
|
+
<label class="font_normal_body">流量计品牌</label>
|
|
226
|
+
<v-select placeholder='流量计品牌' :value.sync="model.f_llj_brand" style="width:60%"
|
|
227
|
+
v-model="model.f_llj_brand" :options='$parent.$parent.lljbrand' close-on-select
|
|
228
|
+
condition="f_llj_brand='{}'">
|
|
229
|
+
</v-select>
|
|
230
|
+
</div>
|
|
231
|
+
<div class="col-sm-2 form-group">
|
|
232
|
+
<label class="font_normal_body">流量计类型</label>
|
|
233
|
+
<v-select placeholder='流量计类型' :value.sync="model.f_llj_type" style="width:60%"
|
|
234
|
+
v-model="model.f_llj_type" :options='$parent.$parent.lljtype' close-on-select
|
|
235
|
+
condition="f_llj_type='{}'">
|
|
236
|
+
</v-select>
|
|
237
|
+
</div>
|
|
238
|
+
<div class="col-sm-2 form-group">
|
|
239
|
+
<label class="font_normal_body">气表流量</label>
|
|
240
|
+
<v-select placeholder='气表流量' :value.sync="model.f_meter_flow" style="width:60%"
|
|
241
|
+
v-model="model.f_meter_flow" :options='$parent.$parent.meterflow' close-on-select
|
|
242
|
+
condition="f_meter_flow='{}'">
|
|
243
|
+
</v-select>
|
|
244
|
+
</div>
|
|
224
245
|
</div>
|
|
225
246
|
</div>
|
|
226
247
|
</criteria>
|
|
@@ -292,6 +313,15 @@
|
|
|
292
313
|
<th>
|
|
293
314
|
<nobr>气表型号</nobr>
|
|
294
315
|
</th>
|
|
316
|
+
<th>
|
|
317
|
+
<nobr>流量计品牌</nobr>
|
|
318
|
+
</th>
|
|
319
|
+
<th>
|
|
320
|
+
<nobr>流量计类型</nobr>
|
|
321
|
+
</th>
|
|
322
|
+
<th>
|
|
323
|
+
<nobr>气表流量</nobr>
|
|
324
|
+
</th>
|
|
295
325
|
<th>
|
|
296
326
|
<nobr>用气类型</nobr>
|
|
297
327
|
</th>
|
|
@@ -386,6 +416,15 @@
|
|
|
386
416
|
<td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
|
|
387
417
|
<nobr>{{ row.f_meter_style }}</nobr>
|
|
388
418
|
</td>
|
|
419
|
+
<td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
|
|
420
|
+
<nobr>{{ row.f_llj_brand }}</nobr>
|
|
421
|
+
</td>
|
|
422
|
+
<td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
|
|
423
|
+
<nobr>{{ row.f_llj_type }}</nobr>
|
|
424
|
+
</td>
|
|
425
|
+
<td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
|
|
426
|
+
<nobr>{{ row.f_meter_flow }}</nobr>
|
|
427
|
+
</td>
|
|
389
428
|
<td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
|
|
390
429
|
<nobr>{{ row.f_gongye_type }}</nobr>
|
|
391
430
|
</td>
|
|
@@ -567,6 +606,9 @@ export default {
|
|
|
567
606
|
label: '全部',
|
|
568
607
|
value: ''
|
|
569
608
|
}, ...this.$appdata.getParam('自动阀控')] : [],
|
|
609
|
+
lljbrand: this.$appdata.getParam('流量计品牌'),
|
|
610
|
+
lljtype: this.$appdata.getParam('流量计类型'),
|
|
611
|
+
meterflow: this.$appdata.getParam('气表流量')
|
|
570
612
|
}
|
|
571
613
|
},
|
|
572
614
|
ready() {
|
|
@@ -60,6 +60,14 @@
|
|
|
60
60
|
close-on-select>
|
|
61
61
|
</v-select>
|
|
62
62
|
</div>
|
|
63
|
+
<div class="col-sm-2 form-group">
|
|
64
|
+
<label class="font_normal_body">客户类型</label>
|
|
65
|
+
<v-select :value.sync="model.f_user_type"
|
|
66
|
+
:options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
|
|
67
|
+
condition="f_user_type = '{}'"
|
|
68
|
+
close-on-select></v-select>
|
|
69
|
+
</div>
|
|
70
|
+
|
|
63
71
|
<div class="col-sm-2 form-group">
|
|
64
72
|
<label class="font_normal_body">气价名称</label>
|
|
65
73
|
<v-select :value.sync="model.f_price_name"
|
|
@@ -196,8 +204,8 @@
|
|
|
196
204
|
<th style="text-align:center"><nobr>{{row.f_total_gas}}</nobr></th>
|
|
197
205
|
<th style="text-align:center"><nobr>{{row.f_curbalance}}</nobr></th>
|
|
198
206
|
<th style="text-align:center"><nobr>{{row.f_jval}}</nobr></th>
|
|
199
|
-
<th style="text-align:center"><nobr>{{row.
|
|
200
|
-
<th style="text-align:center"><nobr>{{row.
|
|
207
|
+
<th style="text-align:center"><nobr>{{row.cyclegas}}</nobr></th>
|
|
208
|
+
<th style="text-align:center"><nobr>{{row.cyclefee}}</nobr></th>
|
|
201
209
|
<th style="text-align:center"><nobr>{{row.f_oughtamount}}</nobr></th>
|
|
202
210
|
<th style="text-align:center"><nobr>{{row.f_oughtfee}}</nobr></th>
|
|
203
211
|
|
|
@@ -834,8 +834,8 @@ monthGasConfig: {
|
|
|
834
834
|
'f_total_fee': '累计购气金额',
|
|
835
835
|
'f_total_gas': '累计使用量',
|
|
836
836
|
'f_balance_amount': '系统余额',
|
|
837
|
-
'
|
|
838
|
-
'
|
|
837
|
+
'cyclegas': '当前周期已用气量',
|
|
838
|
+
'cyclefee': '当前周期消费金额',
|
|
839
839
|
'f_stair1price': '一阶气价',
|
|
840
840
|
'f_stairamount1': '一阶气量',
|
|
841
841
|
'f_stair1fee': '一阶金额',
|