manage-client 1.22.52-ca → 1.22.54-ca

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
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "1.22.52-ca",
3
+ "version": "1.22.54-ca",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -49,7 +49,7 @@
49
49
 
50
50
  <export-excel :data="$parent.$parent.getCondition"
51
51
  :field="$parent.$parent.getfield"
52
- sqlurl="rs/logic/exportfile" sql-name="disableQuery" template-name='弃用查询导出' :choose-col="true"></export-excel>
52
+ sqlurl="rs/logic/exportfile" sql-name="AbndonQuery" template-name='弃用查询导出' :choose-col="true"></export-excel>
53
53
  <div
54
54
  :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
55
55
  @click="$parent.$parent.hidden()" class="button_spacing" style="float: right"></div>
@@ -3,7 +3,7 @@
3
3
  <button class="btn btn-xs" v-show="!this.criteriaShow" @click="this.show()">
4
4
  <span class="glyphicon glyphicon-chevron-down" style="color: #000;"></span>
5
5
  </button>
6
- <criteria-paged :model="model" v-ref:paged>
6
+ <criteria-paged :model="model" @sort="sort" v-ref:paged>
7
7
  <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri v-show="$parent.criteriaShow">
8
8
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
9
9
  <div class="row">
@@ -113,8 +113,8 @@
113
113
  <v-select :value.sync="model.f_table_state"
114
114
  v-model="model.f_table_state"
115
115
  :options='$parent.$parent.tablestate' placeholder='请选择'
116
- condition="f_table_state = '{}'"
117
- close-on-select></v-select>
116
+ condition="f_table_state in {}"
117
+ multiple></v-select>
118
118
  </div>
119
119
  <div class="col-sm-2 form-group form-fix-width" >
120
120
  <label class="font_normal_body _zoom4">片区</label>
@@ -232,6 +232,26 @@
232
232
  :options='$parent.$parent.userstate' placeholder='请选择'
233
233
  ></v-select>
234
234
  </div>
235
+ <div class="col-sm-2 form-group form-fix-width" >
236
+ <label class=" font_normal_body _zoom4">开户状态</label>
237
+ <v-select :value.sync="model.archives_state" v-model="model.archives_state"
238
+ :options='$parent.$parent.archives_states' placeholder='开户状态'
239
+ condition="archives_state = '{}'"
240
+ close-on-select></v-select>
241
+ </div>
242
+ <div class="col-sm-2 form-group form-fix-width">
243
+ <label class="font_normal_body">运营区域</label>
244
+ <v-select :options='$parent.$parent.f_opera_area'
245
+ :value.sync="model.f_opera_area"
246
+ close-on-select
247
+ condition="f_opera_area = '{}'"
248
+ id="f_opera_area"
249
+ placeholder='运营区域'
250
+ style="width:60%"
251
+ v-model="model.f_opera_area"
252
+ value-single="true">
253
+ </v-select>
254
+ </div>
235
255
  </div>
236
256
  </div>
237
257
  </criteria>
@@ -239,8 +259,28 @@
239
259
  <data-grid :model="model" partial='list' v-ref:grid :classname="$parent.classname">
240
260
  <template partial='head'>
241
261
  <tr>
242
- <th><nobr>卡号</nobr></th>
262
+ <th>
263
+ <data-order field="f_card_id" name="卡号"
264
+ :order.sync="$parent.$parent.$parent.orderFields.f_card_id"></data-order>
265
+ </th>
243
266
  <th><nobr>小区id</nobr></th>
267
+ <th><nobr>小区名称</nobr></th>
268
+ <th>
269
+ <data-order field="f_building" name="楼号"
270
+ :order.sync="$parent.$parent.$parent.orderFields.f_building"></data-order>
271
+ </th>
272
+ <th>
273
+ <data-order field="f_unit" name="单元"
274
+ :order.sync="$parent.$parent.$parent.orderFields.f_unit"></data-order>
275
+ </th>
276
+ <th>
277
+ <data-order field="f_floor" name="楼层"
278
+ :order.sync="$parent.$parent.$parent.orderFields.f_floor"></data-order>
279
+ </th>
280
+ <th>
281
+ <data-order field="f_room" name="房号"
282
+ :order.sync="$parent.$parent.$parent.orderFields.f_room"></data-order>
283
+ </th>
244
284
  <th><nobr>用户姓名</nobr></th>
245
285
  <th><nobr>用户地址</nobr></th>
246
286
  <th><nobr>行政区域</nobr></th>
@@ -267,6 +307,11 @@
267
307
  <span @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_card_id}}</a></span></nobr>
268
308
  </td>
269
309
  <td style="text-align: center;"><nobr>{{row.f_residential_area_id}}</nobr></td>
310
+ <td style="text-align: center;"><nobr>{{row.f_residential_area}}</nobr></td>
311
+ <td style="text-align: center;"><nobr>{{row.f_building}}{{row.f_building_suffix}}</nobr></td>
312
+ <td style="text-align: center;"><nobr>{{row.f_unit}}{{row.f_unit_suffix}}</nobr></td>
313
+ <td style="text-align: center;"><nobr>{{row.f_floor}}{{row.f_floor_suffix}}</nobr></td>
314
+ <td style="text-align: center;"><nobr>{{row.f_room}}{{row.f_room_suffix}}</nobr></td>
270
315
  <td style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></td>
271
316
  <td style="text-align: center;"><nobr>{{row.f_address}}</nobr></td>
272
317
  <td style="text-align: center;"><nobr>{{row.f_distinct}}</nobr></td>
@@ -307,7 +352,8 @@ let readySomething = async function(self){
307
352
  export default {
308
353
  data() {
309
354
  return {
310
- model: new PagedList('rs/sql/meterQuery', 20,{},{f_balance_amount: 0,f_balance_gas: 0}),
355
+ archives_states: [{label: '开户', value: '开户'}],
356
+ model: new PagedList('rs/sql/meterQuery', 20,{orderitem:`' f_card_id asc '`},{f_balance_amount: 0,f_balance_gas: 0}),
311
357
  criteriaShow: true,
312
358
  second_states: [{label: '全部', value: ''},{label: '否', value: '否'}, {label: '是', value: '是'}],
313
359
  filialeNameStr: null,
@@ -327,7 +373,18 @@ export default {
327
373
  meterbrands: [],
328
374
  // 气价下拉值
329
375
  pricenames: [],
330
-
376
+ orderFields: {
377
+ f_card_id:'asc',
378
+ f_building:'no',
379
+ f_unit:'no',
380
+ f_floor:'no',
381
+ f_room:'no',
382
+ },
383
+ f_card_idorderitem:' f_card_id asc ',
384
+ f_buildingorderitem:', f_building no ',
385
+ f_unitorderitem:', f_unit no ',
386
+ f_floororderitem:', f_floor no ',
387
+ f_roomorderitem:'f_room no ',
331
388
  //合计数据
332
389
  sumsmodel: {}
333
390
  }
@@ -340,11 +397,379 @@ export default {
340
397
  })
341
398
  },
342
399
  methods: {
400
+ sort (field, rule) {
401
+ // 将所有排序方式设为不排序,实现相互排斥
402
+ for (let key in this.orderFields) {
403
+ if (key === field) {
404
+ this.orderFields[key] = rule
405
+ }
406
+ }
407
+ console.log(JSON.stringify(this.orderFields))
408
+ if (this.orderFields['f_card_id'] !== 'no'
409
+ && this.orderFields['f_building'] === 'no'
410
+ && this.orderFields['f_unit'] === 'no'
411
+ && this.orderFields['f_floor'] === 'no'
412
+ && this.orderFields['f_room'] === 'no'
413
+ ) {
414
+ this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
415
+ this.f_buildingorderitem = ''
416
+ this.f_unitorderitem = ''
417
+ this.f_floororderitem = ''
418
+ this.f_roomorderitem = ''
419
+ } else if (this.orderFields['f_card_id'] === 'no'
420
+ && this.orderFields['f_building'] !== 'no'
421
+ && this.orderFields['f_unit'] === 'no'
422
+ && this.orderFields['f_floor'] === 'no'
423
+ && this.orderFields['f_room'] === 'no'
424
+ ) {
425
+ this.f_card_idorderitem = ''
426
+ this.f_buildingorderitem = 'f_building ' + this.orderFields['f_building']
427
+ this.f_unitorderitem = ''
428
+ this.f_floororderitem = ''
429
+ this.f_roomorderitem = ''
430
+ } else if (this.orderFields['f_card_id'] === 'no'
431
+ && this.orderFields['f_building'] === 'no'
432
+ && this.orderFields['f_unit'] !== 'no'
433
+ && this.orderFields['f_floor'] === 'no'
434
+ && this.orderFields['f_room'] === 'no'
435
+ ) {
436
+ this.f_card_idorderitem = ''
437
+ this.f_buildingorderitem = ''
438
+ this.f_unitorderitem = 'f_unit ' + this.orderFields['f_unit']
439
+ this.f_floororderitem = ''
440
+ this.f_roomorderitem = ''
441
+ } else if (this.orderFields['f_card_id'] === 'no'
442
+ && this.orderFields['f_building'] === 'no'
443
+ && this.orderFields['f_unit'] === 'no'
444
+ && this.orderFields['f_floor'] !== 'no'
445
+ && this.orderFields['f_room'] === 'no'
446
+ ) {
447
+ this.f_card_idorderitem = ''
448
+ this.f_buildingorderitem = ''
449
+ this.f_unitorderitem = ''
450
+ this.f_floororderitem = 'f_floor ' + this.orderFields['f_floor']
451
+ this.f_roomorderitem = ''
452
+ } else if (this.orderFields['f_card_id'] === 'no'
453
+ && this.orderFields['f_building'] === 'no'
454
+ && this.orderFields['f_unit'] === 'no'
455
+ && this.orderFields['f_floor'] === 'no'
456
+ && this.orderFields['f_room'] !== 'no'
457
+ ) {
458
+ this.f_card_idorderitem = ''
459
+ this.f_buildingorderitem = ''
460
+ this.f_unitorderitem = ''
461
+ this.f_floororderitem = ''
462
+ this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
463
+ } else if (this.orderFields['f_card_id'] !== 'no'
464
+ && this.orderFields['f_building'] !== 'no'
465
+ && this.orderFields['f_unit'] === 'no'
466
+ && this.orderFields['f_floor'] === 'no'
467
+ && this.orderFields['f_room'] === 'no'
468
+ ) {
469
+ this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
470
+ this.f_buildingorderitem = 'f_building ' + this.orderFields['f_building']
471
+ this.f_unitorderitem = ''
472
+ this.f_floororderitem = ''
473
+ this.f_roomorderitem = ''
474
+ } else if (this.orderFields['f_card_id'] !== 'no'
475
+ && this.orderFields['f_building'] === 'no'
476
+ && this.orderFields['f_unit'] !== 'no'
477
+ && this.orderFields['f_floor'] === 'no'
478
+ && this.orderFields['f_room'] === 'no'
479
+ ) {
480
+ this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
481
+ this.f_buildingorderitem = ''
482
+ this.f_unitorderitem = 'f_unit ' + this.orderFields['f_unit']
483
+ this.f_floororderitem = ''
484
+ this.f_roomorderitem = ''
485
+ } else if (this.orderFields['f_card_id'] !== 'no'
486
+ && this.orderFields['f_building'] === 'no'
487
+ && this.orderFields['f_unit'] === 'no'
488
+ && this.orderFields['f_floor'] !== 'no'
489
+ && this.orderFields['f_room'] === 'no'
490
+ ) {
491
+ this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
492
+ this.f_buildingorderitem = ''
493
+ this.f_unitorderitem = ''
494
+ this.f_floororderitem = 'f_floor ' + this.orderFields['f_floor']
495
+ this.f_roomorderitem = ''
496
+ } else if (this.orderFields['f_card_id'] !== 'no'
497
+ && this.orderFields['f_building'] === 'no'
498
+ && this.orderFields['f_unit'] === 'no'
499
+ && this.orderFields['f_floor'] === 'no'
500
+ && this.orderFields['f_room'] !== 'no'
501
+ ) {
502
+ this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
503
+ this.f_buildingorderitem = ''
504
+ this.f_unitorderitem = ''
505
+ this.f_floororderitem = ''
506
+ this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
507
+ }else if (this.orderFields['f_card_id'] === 'no'
508
+ && this.orderFields['f_building'] !== 'no'
509
+ && this.orderFields['f_unit'] === 'no'
510
+ && this.orderFields['f_floor'] === 'no'
511
+ && this.orderFields['f_room'] !== 'no'
512
+ ) {
513
+ this.f_card_idorderitem = ''
514
+ this.f_buildingorderitem = 'f_building ' + this.orderFields['f_building']
515
+ this.f_unitorderitem = ''
516
+ this.f_floororderitem = ''
517
+ this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
518
+ }else if (this.orderFields['f_card_id'] === 'no'
519
+ && this.orderFields['f_building'] === 'no'
520
+ && this.orderFields['f_unit'] !== 'no'
521
+ && this.orderFields['f_floor'] === 'no'
522
+ && this.orderFields['f_room'] !== 'no'
523
+ ) {
524
+ this.f_card_idorderitem = ''
525
+ this.f_buildingorderitem = ''
526
+ this.f_unitorderitem = 'f_unit ' + this.orderFields['f_unit']
527
+ this.f_floororderitem = ''
528
+ this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
529
+ }else if (this.orderFields['f_card_id'] === 'no'
530
+ && this.orderFields['f_building'] === 'no'
531
+ && this.orderFields['f_unit'] === 'no'
532
+ && this.orderFields['f_floor'] !== 'no'
533
+ && this.orderFields['f_room'] !== 'no'
534
+ ) {
535
+ this.f_card_idorderitem = ''
536
+ this.f_buildingorderitem = ''
537
+ this.f_unitorderitem = ''
538
+ this.f_floororderitem = 'f_floor ' + this.orderFields['f_floor']
539
+ this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
540
+ }else if (this.orderFields['f_card_id'] !== 'no'
541
+ && this.orderFields['f_building'] === 'no'
542
+ && this.orderFields['f_unit'] === 'no'
543
+ && this.orderFields['f_floor'] === 'no'
544
+ && this.orderFields['f_room'] !== 'no'
545
+ ) {
546
+ this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
547
+ this.f_buildingorderitem = ''
548
+ this.f_unitorderitem = ''
549
+ this.f_floororderitem = ''
550
+ this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
551
+ }else if (this.orderFields['f_card_id'] === 'no'
552
+ && this.orderFields['f_building'] !== 'no'
553
+ && this.orderFields['f_unit'] === 'no'
554
+ && this.orderFields['f_floor'] !== 'no'
555
+ && this.orderFields['f_room'] === 'no'
556
+ ) {
557
+ this.f_card_idorderitem = ''
558
+ this.f_buildingorderitem = 'f_building ' + this.orderFields['f_building']
559
+ this.f_unitorderitem = ''
560
+ this.f_floororderitem = 'f_floor ' + this.orderFields['f_floor']
561
+ this.f_roomorderitem = ''
562
+ }else if (this.orderFields['f_card_id'] === 'no'
563
+ && this.orderFields['f_building'] === 'no'
564
+ && this.orderFields['f_unit'] !== 'no'
565
+ && this.orderFields['f_floor'] !== 'no'
566
+ && this.orderFields['f_room'] === 'no'
567
+ ) {
568
+ this.f_card_idorderitem = ''
569
+ this.f_buildingorderitem = ''
570
+ this.f_unitorderitem = 'f_unit ' + this.orderFields['f_unit']
571
+ this.f_floororderitem = 'f_floor ' + this.orderFields['f_floor']
572
+ this.f_roomorderitem = ''
573
+ }else if (this.orderFields['f_card_id'] === 'no'
574
+ && this.orderFields['f_building'] !== 'no'
575
+ && this.orderFields['f_unit'] !== 'no'
576
+ && this.orderFields['f_floor'] === 'no'
577
+ && this.orderFields['f_room'] === 'no'
578
+ ) {
579
+ this.f_card_idorderitem = ''
580
+ this.f_buildingorderitem = 'f_building ' + this.orderFields['f_building']
581
+ this.f_unitorderitem = 'f_unit ' + this.orderFields['f_unit']
582
+ this.f_floororderitem = ''
583
+ this.f_roomorderitem = ''
584
+ }else if (this.orderFields['f_card_id'] !== 'no'
585
+ && this.orderFields['f_building'] !== 'no'
586
+ && this.orderFields['f_unit'] !== 'no'
587
+ && this.orderFields['f_floor'] === 'no'
588
+ && this.orderFields['f_room'] === 'no'
589
+ ) {
590
+ this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
591
+ this.f_buildingorderitem = 'f_building ' + this.orderFields['f_building']
592
+ this.f_unitorderitem = 'f_unit ' + this.orderFields['f_unit']
593
+ this.f_floororderitem = ''
594
+ this.f_roomorderitem = ''
595
+ }else if (this.orderFields['f_card_id'] !== 'no'
596
+ && this.orderFields['f_building'] !== 'no'
597
+ && this.orderFields['f_unit'] === 'no'
598
+ && this.orderFields['f_floor'] !== 'no'
599
+ && this.orderFields['f_room'] === 'no'
600
+ ) {
601
+ this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
602
+ this.f_buildingorderitem = 'f_building ' + this.orderFields['f_building']
603
+ this.f_unitorderitem = ''
604
+ this.f_floororderitem = 'f_floor ' + this.orderFields['f_floor']
605
+ this.f_roomorderitem = ''
606
+ }else if (this.orderFields['f_card_id'] !== 'no'
607
+ && this.orderFields['f_building'] !== 'no'
608
+ && this.orderFields['f_unit'] === 'no'
609
+ && this.orderFields['f_floor'] === 'no'
610
+ && this.orderFields['f_room'] !== 'no'
611
+ ) {
612
+ this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
613
+ this.f_buildingorderitem = 'f_building ' + this.orderFields['f_building']
614
+ this.f_unitorderitem = ''
615
+ this.f_floororderitem = ''
616
+ this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
617
+ }else if (this.orderFields['f_card_id'] !== 'no'
618
+ && this.orderFields['f_building'] === 'no'
619
+ && this.orderFields['f_unit'] !== 'no'
620
+ && this.orderFields['f_floor'] === 'no'
621
+ && this.orderFields['f_room'] !== 'no'
622
+ ) {
623
+ this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
624
+ this.f_buildingorderitem = ''
625
+ this.f_unitorderitem = 'f_unit ' + this.orderFields['f_unit']
626
+ this.f_floororderitem = ''
627
+ this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
628
+ }else if (this.orderFields['f_card_id'] !== 'no'
629
+ && this.orderFields['f_building'] === 'no'
630
+ && this.orderFields['f_unit'] === 'no'
631
+ && this.orderFields['f_floor'] !== 'no'
632
+ && this.orderFields['f_room'] !== 'no'
633
+ ) {
634
+ this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
635
+ this.f_buildingorderitem = ''
636
+ this.f_unitorderitem = ''
637
+ this.f_floororderitem = 'f_floor ' + this.orderFields['f_floor']
638
+ this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
639
+ }else if (this.orderFields['f_card_id'] !== 'no'
640
+ && this.orderFields['f_building'] === 'no'
641
+ && this.orderFields['f_unit'] !== 'no'
642
+ && this.orderFields['f_floor'] !== 'no'
643
+ && this.orderFields['f_room'] === 'no'
644
+ ) {
645
+ this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
646
+ this.f_buildingorderitem = ''
647
+ this.f_unitorderitem = 'f_unit ' + this.orderFields['f_unit']
648
+ this.f_floororderitem = 'f_floor ' + this.orderFields['f_floor']
649
+ this.f_roomorderitem = ''
650
+ }else if (this.orderFields['f_card_id'] === 'no'
651
+ && this.orderFields['f_building'] !== 'no'
652
+ && this.orderFields['f_unit'] !== 'no'
653
+ && this.orderFields['f_floor'] !== 'no'
654
+ && this.orderFields['f_room'] === 'no'
655
+ ) {
656
+ this.f_card_idorderitem = ''
657
+ this.f_buildingorderitem = 'f_building ' + this.orderFields['f_building']
658
+ this.f_unitorderitem = 'f_unit ' + this.orderFields['f_unit']
659
+ this.f_floororderitem = 'f_floor ' + this.orderFields['f_floor']
660
+ this.f_roomorderitem = ''
661
+ }else if (this.orderFields['f_card_id'] === 'no'
662
+ && this.orderFields['f_building'] !== 'no'
663
+ && this.orderFields['f_unit'] !== 'no'
664
+ && this.orderFields['f_floor'] === 'no'
665
+ && this.orderFields['f_room'] !== 'no'
666
+ ) {
667
+ this.f_card_idorderitem = ''
668
+ this.f_buildingorderitem = 'f_building ' + this.orderFields['f_building']
669
+ this.f_unitorderitem = 'f_unit ' + this.orderFields['f_unit']
670
+ this.f_floororderitem = ''
671
+ this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
672
+ }else if (this.orderFields['f_card_id'] === 'no'
673
+ && this.orderFields['f_building'] !== 'no'
674
+ && this.orderFields['f_unit'] === 'no'
675
+ && this.orderFields['f_floor'] !== 'no'
676
+ && this.orderFields['f_room'] !== 'no'
677
+ ) {
678
+ this.f_card_idorderitem = ''
679
+ this.f_buildingorderitem = 'f_building ' + this.orderFields['f_building']
680
+ this.f_unitorderitem = ''
681
+ this.f_floororderitem = 'f_floor ' + this.orderFields['f_floor']
682
+ this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
683
+ }else if (this.orderFields['f_card_id'] === 'no'
684
+ && this.orderFields['f_building'] === 'no'
685
+ && this.orderFields['f_unit'] !== 'no'
686
+ && this.orderFields['f_floor'] !== 'no'
687
+ && this.orderFields['f_room'] !== 'no'
688
+ ) {
689
+ this.f_card_idorderitem = ''
690
+ this.f_buildingorderitem = ''
691
+ this.f_unitorderitem = 'f_unit ' + this.orderFields['f_unit']
692
+ this.f_floororderitem = 'f_floor ' + this.orderFields['f_floor']
693
+ this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
694
+ }else if (this.orderFields['f_card_id'] !== 'no'
695
+ && this.orderFields['f_building'] === 'no'
696
+ && this.orderFields['f_unit'] !== 'no'
697
+ && this.orderFields['f_floor'] !== 'no'
698
+ && this.orderFields['f_room'] !== 'no'
699
+ ) {
700
+ this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
701
+ this.f_buildingorderitem = ''
702
+ this.f_unitorderitem = 'f_unit ' + this.orderFields['f_unit']
703
+ this.f_floororderitem = 'f_floor ' + this.orderFields['f_floor']
704
+ this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
705
+ }else if (this.orderFields['f_card_id'] !== 'no'
706
+ && this.orderFields['f_building'] !== 'no'
707
+ && this.orderFields['f_unit'] === 'no'
708
+ && this.orderFields['f_floor'] !== 'no'
709
+ && this.orderFields['f_room'] !== 'no'
710
+ ) {
711
+ this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
712
+ this.f_buildingorderitem = 'f_building ' + this.orderFields['f_building']
713
+ this.f_unitorderitem = ''
714
+ this.f_floororderitem = 'f_floor ' + this.orderFields['f_floor']
715
+ this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
716
+ }else if (this.orderFields['f_card_id'] !== 'no'
717
+ && this.orderFields['f_building'] !== 'no'
718
+ && this.orderFields['f_unit'] !== 'no'
719
+ && this.orderFields['f_floor'] !== 'no'
720
+ && this.orderFields['f_room'] === 'no'
721
+ ) {
722
+ this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
723
+ this.f_buildingorderitem = 'f_building ' + this.orderFields['f_building']
724
+ this.f_unitorderitem = 'f_unit ' + this.orderFields['f_unit']
725
+ this.f_floororderitem = 'f_floor ' + this.orderFields['f_floor']
726
+ this.f_roomorderitem = ''
727
+ }else if (this.orderFields['f_card_id'] !== 'no'
728
+ && this.orderFields['f_building'] !== 'no'
729
+ && this.orderFields['f_unit'] !== 'no'
730
+ && this.orderFields['f_floor'] === 'no'
731
+ && this.orderFields['f_room'] !== 'no'
732
+ ) {
733
+ this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
734
+ this.f_buildingorderitem = 'f_building ' + this.orderFields['f_building']
735
+ this.f_unitorderitem = 'f_unit ' + this.orderFields['f_unit']
736
+ this.f_floororderitem = ''
737
+ this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
738
+ }else if (this.orderFields['f_card_id'] === 'no'
739
+ && this.orderFields['f_building'] !== 'no'
740
+ && this.orderFields['f_unit'] !== 'no'
741
+ && this.orderFields['f_floor'] !== 'no'
742
+ && this.orderFields['f_room'] !== 'no'
743
+ ) {
744
+ this.f_card_idorderitem = ''
745
+ this.f_buildingorderitem = 'f_building ' + this.orderFields['f_building']
746
+ this.f_unitorderitem = 'f_unit ' + this.orderFields['f_unit']
747
+ this.f_floororderitem = 'f_floor ' + this.orderFields['f_floor']
748
+ this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
749
+ }else if (this.orderFields['f_card_id'] !== 'no'
750
+ && this.orderFields['f_building'] !== 'no'
751
+ && this.orderFields['f_unit'] !== 'no'
752
+ && this.orderFields['f_floor'] !== 'no'
753
+ && this.orderFields['f_room'] !== 'no'
754
+ ) {
755
+ this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
756
+ this.f_buildingorderitem = 'f_building ' + this.orderFields['f_building']
757
+ this.f_unitorderitem = 'f_unit ' + this.orderFields['f_unit']
758
+ this.f_floororderitem = 'f_floor ' + this.orderFields['f_floor']
759
+ this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
760
+ }
761
+ this.model.paramSource.orderitem = `'${this.f_card_idorderitem}${this.f_buildingorderitem}${this.f_unitorderitem}${this.f_floororderitem}${this.f_roomorderitem}'`
762
+ console.log(this.model.paramSource.orderitem)
763
+ this.search()
764
+ },
343
765
  dealmsg (val) {
344
766
  console.log('---------------dealmsg')
345
767
  val.model = this.model.model
346
768
  this.$dispatch('deal-msg',val)
347
769
  },
770
+ search () {
771
+ this.$refs.paged.$refs.cri.search()
772
+ },
348
773
  initParams () {
349
774
 
350
775
  // 初始化气表品牌
@@ -519,6 +944,9 @@ export default {
519
944
  metertypes () {
520
945
  return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]
521
946
  },
947
+ f_opera_area() {
948
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('运营区域')]
949
+ },
522
950
  // meterbrands () {
523
951
  // let arr = []
524
952
  // this.$GetSaleParam.getGasbrand().forEach((item) => {