manage-client 1.22.54-ca → 1.22.56-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.
Files changed (7) hide show
  1. package/build/dev-server.js +5 -5
  2. package/package.json +1 -1
  3. package/src/components/sale/businessquery/AbndonQuery.vue +2 -2
  4. package/src/components/sale/businessquery/AbndonRecoveryQuery.vue +1 -1
  5. package/src/components/sale/businessquery/BusinessManage.vue +1 -1
  6. package/src/components/sale/config/exportConfig.js +7 -0
  7. package/src/components/sale/filesquery/MeterQuery.vue +52 -52
package/build/dev-server.js CHANGED
@@ -8,11 +8,11 @@ var app = express()
8
8
  var compiler = webpack(config)
9
9
  // var proxy = httpProxy.createProxyServer()
10
10
 
11
- var bendi = 'http://127.0.0.1:9025/', changan = 'http://192.168.2.84:7003/'
11
+ var bendi = 'http://127.0.0.1:8080/', changan = 'http://192.168.2.84:7003/'
12
12
  var proxyTable = {
13
13
  // 查找资源服务数据
14
14
  '/rs/sql/manageSingleTable': {
15
- target:changan
15
+ target: changan
16
16
  },
17
17
  '/rs/sql/getNewUserLoseQuery': {
18
18
  target: bendi
@@ -42,7 +42,7 @@ var proxyTable = {
42
42
  target: bendi
43
43
  },
44
44
  '/rs/sql/AbndonQuery': {
45
- target:'http://127.0.0.1:8081/'
45
+ target: bendi
46
46
  },
47
47
  '/rs/search': {
48
48
  target: changan
@@ -73,11 +73,11 @@ var proxyTable = {
73
73
  target: changan
74
74
  },
75
75
  '/rs/logic/exportfile': {
76
- target: changan
76
+ target: bendi
77
77
  },
78
78
  '/rs': {
79
79
  //target: changan
80
- target: changan
80
+ target: bendi
81
81
  }
82
82
  }
83
83
  var devMiddleware = require('webpack-dev-middleware')(compiler, {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "1.22.54-ca",
3
+ "version": "1.22.56-ca",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/sale/businessquery/AbndonQuery.vue CHANGED
@@ -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="AbndonQuery" template-name='弃用查询导出' :choose-col="true"></export-excel>
52
+ sqlurl="rs/logic/exportfile" sql-name="AbndonQueryExport" 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>
@@ -272,7 +272,7 @@
272
272
  return {condition: `${this.$refs.paged.$refs.cri.condition} `}
273
273
  },
274
274
  getfield(){
275
- return exportConfig.disableConfig
275
+ return exportConfig.abndonConfig
276
276
  }
277
277
  }
278
278
  }
package/src/components/sale/businessquery/AbndonRecoveryQuery.vue CHANGED
@@ -78,7 +78,7 @@
78
78
  <span @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_userinfo_code}}</a></span></nobr></td>
79
79
  <td style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></td>
80
80
  <td style="text-align: center;"><nobr>{{row.f_address}}</nobr></td>
81
- <td style="text-align: center;"><nobr>{{row.f_reason}} {{row.f_othereason}}</nobr></td>
81
+ <td style="text-align: center;"><nobr>{{ f_reason }} {{ f_othereason }}</nobr></td>
82
82
  <td style="text-align: center;word-break: break-word;">
83
83
  <p :id="'f_remark-'+$index" style="display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 1;overflow: hidden;margin: 0"
84
84
  @click="$parent.$parent.$parent.p_click('f_remark-'+$index,'f_remarkinput-'+$index)">
package/src/components/sale/businessquery/BusinessManage.vue CHANGED
@@ -23,7 +23,7 @@
23
23
  <abndon-query @deal-msg="dealMsg"></abndon-query >
24
24
  </tab>
25
25
  <tab header="弃用恢复查询">
26
- <abndon-query @deal-msg="dealMsg"></abndon-query >
26
+ <abndon-recovery-query @deal-msg="dealMsg"></abndon-recovery-query >
27
27
  </tab>
28
28
  <tab header="拆除查询">
29
29
  <treadown-query @deal-msg="dealMsg"></treadown-query>
package/src/components/sale/config/exportConfig.js CHANGED
@@ -168,6 +168,13 @@ export default{
168
168
  'f_userinfo_code': '用户编号','f_user_name':'用户姓名','f_address': '用户地址',
169
169
  'f_disable_reason': '停用原因','f_state': '停用状态','f_operate_date': '停用日期',
170
170
  'f_operator': '操作员','f_outlets': '营业网点','f_filiale': '分公司'
171
+ },
172
+
173
+ abndonConfig: {
174
+ 'f_userinfo_code': '用户编号', 'f_user_name': '用户姓名', 'f_address': '用户地址',
175
+ 'f_state': '弃用状态', 'f_table_state': '弃用前状态', 'f_reason': '弃用原因',
176
+ 'f_othereason': '其他弃用原因', 'f_operate_date': '弃用日期',
177
+ 'f_operator': '操作员', 'f_outlets': '营业网点', 'f_filiale': '分公司'
171
178
  }
172
179
 
173
180
  }
package/src/components/sale/filesquery/MeterQuery.vue CHANGED
@@ -384,7 +384,7 @@ export default {
384
384
  f_buildingorderitem:', f_building no ',
385
385
  f_unitorderitem:', f_unit no ',
386
386
  f_floororderitem:', f_floor no ',
387
- f_roomorderitem:'f_room no ',
387
+ f_roomorderitem:',f_room no ',
388
388
  //合计数据
389
389
  sumsmodel: {}
390
390
  }
@@ -467,7 +467,7 @@ export default {
467
467
  && this.orderFields['f_room'] === 'no'
468
468
  ) {
469
469
  this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
470
- this.f_buildingorderitem = 'f_building ' + this.orderFields['f_building']
470
+ this.f_buildingorderitem = ',f_building ' + this.orderFields['f_building']
471
471
  this.f_unitorderitem = ''
472
472
  this.f_floororderitem = ''
473
473
  this.f_roomorderitem = ''
@@ -479,7 +479,7 @@ export default {
479
479
  ) {
480
480
  this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
481
481
  this.f_buildingorderitem = ''
482
- this.f_unitorderitem = 'f_unit ' + this.orderFields['f_unit']
482
+ this.f_unitorderitem = ',f_unit ' + this.orderFields['f_unit']
483
483
  this.f_floororderitem = ''
484
484
  this.f_roomorderitem = ''
485
485
  } else if (this.orderFields['f_card_id'] !== 'no'
@@ -491,7 +491,7 @@ export default {
491
491
  this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
492
492
  this.f_buildingorderitem = ''
493
493
  this.f_unitorderitem = ''
494
- this.f_floororderitem = 'f_floor ' + this.orderFields['f_floor']
494
+ this.f_floororderitem = ',f_floor ' + this.orderFields['f_floor']
495
495
  this.f_roomorderitem = ''
496
496
  } else if (this.orderFields['f_card_id'] !== 'no'
497
497
  && this.orderFields['f_building'] === 'no'
@@ -503,7 +503,7 @@ export default {
503
503
  this.f_buildingorderitem = ''
504
504
  this.f_unitorderitem = ''
505
505
  this.f_floororderitem = ''
506
- this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
506
+ this.f_roomorderitem = ',f_room ' + this.orderFields['f_room']
507
507
  }else if (this.orderFields['f_card_id'] === 'no'
508
508
  && this.orderFields['f_building'] !== 'no'
509
509
  && this.orderFields['f_unit'] === 'no'
@@ -514,7 +514,7 @@ export default {
514
514
  this.f_buildingorderitem = 'f_building ' + this.orderFields['f_building']
515
515
  this.f_unitorderitem = ''
516
516
  this.f_floororderitem = ''
517
- this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
517
+ this.f_roomorderitem = ',f_room ' + this.orderFields['f_room']
518
518
  }else if (this.orderFields['f_card_id'] === 'no'
519
519
  && this.orderFields['f_building'] === 'no'
520
520
  && this.orderFields['f_unit'] !== 'no'
@@ -525,7 +525,7 @@ export default {
525
525
  this.f_buildingorderitem = ''
526
526
  this.f_unitorderitem = 'f_unit ' + this.orderFields['f_unit']
527
527
  this.f_floororderitem = ''
528
- this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
528
+ this.f_roomorderitem = ',f_room ' + this.orderFields['f_room']
529
529
  }else if (this.orderFields['f_card_id'] === 'no'
530
530
  && this.orderFields['f_building'] === 'no'
531
531
  && this.orderFields['f_unit'] === 'no'
@@ -536,7 +536,7 @@ export default {
536
536
  this.f_buildingorderitem = ''
537
537
  this.f_unitorderitem = ''
538
538
  this.f_floororderitem = 'f_floor ' + this.orderFields['f_floor']
539
- this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
539
+ this.f_roomorderitem = ',f_room ' + this.orderFields['f_room']
540
540
  }else if (this.orderFields['f_card_id'] !== 'no'
541
541
  && this.orderFields['f_building'] === 'no'
542
542
  && this.orderFields['f_unit'] === 'no'
@@ -547,7 +547,7 @@ export default {
547
547
  this.f_buildingorderitem = ''
548
548
  this.f_unitorderitem = ''
549
549
  this.f_floororderitem = ''
550
- this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
550
+ this.f_roomorderitem = ',f_room ' + this.orderFields['f_room']
551
551
  }else if (this.orderFields['f_card_id'] === 'no'
552
552
  && this.orderFields['f_building'] !== 'no'
553
553
  && this.orderFields['f_unit'] === 'no'
@@ -557,7 +557,7 @@ export default {
557
557
  this.f_card_idorderitem = ''
558
558
  this.f_buildingorderitem = 'f_building ' + this.orderFields['f_building']
559
559
  this.f_unitorderitem = ''
560
- this.f_floororderitem = 'f_floor ' + this.orderFields['f_floor']
560
+ this.f_floororderitem = ',f_floor ' + this.orderFields['f_floor']
561
561
  this.f_roomorderitem = ''
562
562
  }else if (this.orderFields['f_card_id'] === 'no'
563
563
  && this.orderFields['f_building'] === 'no'
@@ -568,7 +568,7 @@ export default {
568
568
  this.f_card_idorderitem = ''
569
569
  this.f_buildingorderitem = ''
570
570
  this.f_unitorderitem = 'f_unit ' + this.orderFields['f_unit']
571
- this.f_floororderitem = 'f_floor ' + this.orderFields['f_floor']
571
+ this.f_floororderitem = ',f_floor ' + this.orderFields['f_floor']
572
572
  this.f_roomorderitem = ''
573
573
  }else if (this.orderFields['f_card_id'] === 'no'
574
574
  && this.orderFields['f_building'] !== 'no'
@@ -578,7 +578,7 @@ export default {
578
578
  ) {
579
579
  this.f_card_idorderitem = ''
580
580
  this.f_buildingorderitem = 'f_building ' + this.orderFields['f_building']
581
- this.f_unitorderitem = 'f_unit ' + this.orderFields['f_unit']
581
+ this.f_unitorderitem = ',f_unit ' + this.orderFields['f_unit']
582
582
  this.f_floororderitem = ''
583
583
  this.f_roomorderitem = ''
584
584
  }else if (this.orderFields['f_card_id'] !== 'no'
@@ -588,8 +588,8 @@ export default {
588
588
  && this.orderFields['f_room'] === 'no'
589
589
  ) {
590
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']
591
+ this.f_buildingorderitem = ',f_building ' + this.orderFields['f_building']
592
+ this.f_unitorderitem = ',f_unit ' + this.orderFields['f_unit']
593
593
  this.f_floororderitem = ''
594
594
  this.f_roomorderitem = ''
595
595
  }else if (this.orderFields['f_card_id'] !== 'no'
@@ -599,9 +599,9 @@ export default {
599
599
  && this.orderFields['f_room'] === 'no'
600
600
  ) {
601
601
  this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
602
- this.f_buildingorderitem = 'f_building ' + this.orderFields['f_building']
602
+ this.f_buildingorderitem = ',f_building ' + this.orderFields['f_building']
603
603
  this.f_unitorderitem = ''
604
- this.f_floororderitem = 'f_floor ' + this.orderFields['f_floor']
604
+ this.f_floororderitem = ',f_floor ' + this.orderFields['f_floor']
605
605
  this.f_roomorderitem = ''
606
606
  }else if (this.orderFields['f_card_id'] !== 'no'
607
607
  && this.orderFields['f_building'] !== 'no'
@@ -610,10 +610,10 @@ export default {
610
610
  && this.orderFields['f_room'] !== 'no'
611
611
  ) {
612
612
  this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
613
- this.f_buildingorderitem = 'f_building ' + this.orderFields['f_building']
613
+ this.f_buildingorderitem = ',f_building ' + this.orderFields['f_building']
614
614
  this.f_unitorderitem = ''
615
615
  this.f_floororderitem = ''
616
- this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
616
+ this.f_roomorderitem = ',f_room ' + this.orderFields['f_room']
617
617
  }else if (this.orderFields['f_card_id'] !== 'no'
618
618
  && this.orderFields['f_building'] === 'no'
619
619
  && this.orderFields['f_unit'] !== 'no'
@@ -622,9 +622,9 @@ export default {
622
622
  ) {
623
623
  this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
624
624
  this.f_buildingorderitem = ''
625
- this.f_unitorderitem = 'f_unit ' + this.orderFields['f_unit']
625
+ this.f_unitorderitem = ',f_unit ' + this.orderFields['f_unit']
626
626
  this.f_floororderitem = ''
627
- this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
627
+ this.f_roomorderitem = ',f_room ' + this.orderFields['f_room']
628
628
  }else if (this.orderFields['f_card_id'] !== 'no'
629
629
  && this.orderFields['f_building'] === 'no'
630
630
  && this.orderFields['f_unit'] === 'no'
@@ -634,8 +634,8 @@ export default {
634
634
  this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
635
635
  this.f_buildingorderitem = ''
636
636
  this.f_unitorderitem = ''
637
- this.f_floororderitem = 'f_floor ' + this.orderFields['f_floor']
638
- this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
637
+ this.f_floororderitem = ',f_floor ' + this.orderFields['f_floor']
638
+ this.f_roomorderitem = ',f_room ' + this.orderFields['f_room']
639
639
  }else if (this.orderFields['f_card_id'] !== 'no'
640
640
  && this.orderFields['f_building'] === 'no'
641
641
  && this.orderFields['f_unit'] !== 'no'
@@ -644,8 +644,8 @@ export default {
644
644
  ) {
645
645
  this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
646
646
  this.f_buildingorderitem = ''
647
- this.f_unitorderitem = 'f_unit ' + this.orderFields['f_unit']
648
- this.f_floororderitem = 'f_floor ' + this.orderFields['f_floor']
647
+ this.f_unitorderitem = ',f_unit ' + this.orderFields['f_unit']
648
+ this.f_floororderitem = ',f_floor ' + this.orderFields['f_floor']
649
649
  this.f_roomorderitem = ''
650
650
  }else if (this.orderFields['f_card_id'] === 'no'
651
651
  && this.orderFields['f_building'] !== 'no'
@@ -655,8 +655,8 @@ export default {
655
655
  ) {
656
656
  this.f_card_idorderitem = ''
657
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']
658
+ this.f_unitorderitem = ',f_unit ' + this.orderFields['f_unit']
659
+ this.f_floororderitem = ',f_floor ' + this.orderFields['f_floor']
660
660
  this.f_roomorderitem = ''
661
661
  }else if (this.orderFields['f_card_id'] === 'no'
662
662
  && this.orderFields['f_building'] !== 'no'
@@ -666,9 +666,9 @@ export default {
666
666
  ) {
667
667
  this.f_card_idorderitem = ''
668
668
  this.f_buildingorderitem = 'f_building ' + this.orderFields['f_building']
669
- this.f_unitorderitem = 'f_unit ' + this.orderFields['f_unit']
669
+ this.f_unitorderitem = ',f_unit ' + this.orderFields['f_unit']
670
670
  this.f_floororderitem = ''
671
- this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
671
+ this.f_roomorderitem = ',f_room ' + this.orderFields['f_room']
672
672
  }else if (this.orderFields['f_card_id'] === 'no'
673
673
  && this.orderFields['f_building'] !== 'no'
674
674
  && this.orderFields['f_unit'] === 'no'
@@ -678,8 +678,8 @@ export default {
678
678
  this.f_card_idorderitem = ''
679
679
  this.f_buildingorderitem = 'f_building ' + this.orderFields['f_building']
680
680
  this.f_unitorderitem = ''
681
- this.f_floororderitem = 'f_floor ' + this.orderFields['f_floor']
682
- this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
681
+ this.f_floororderitem = ',f_floor ' + this.orderFields['f_floor']
682
+ this.f_roomorderitem = ',f_room ' + this.orderFields['f_room']
683
683
  }else if (this.orderFields['f_card_id'] === 'no'
684
684
  && this.orderFields['f_building'] === 'no'
685
685
  && this.orderFields['f_unit'] !== 'no'
@@ -689,8 +689,8 @@ export default {
689
689
  this.f_card_idorderitem = ''
690
690
  this.f_buildingorderitem = ''
691
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']
692
+ this.f_floororderitem = ',f_floor ' + this.orderFields['f_floor']
693
+ this.f_roomorderitem = ',f_room ' + this.orderFields['f_room']
694
694
  }else if (this.orderFields['f_card_id'] !== 'no'
695
695
  && this.orderFields['f_building'] === 'no'
696
696
  && this.orderFields['f_unit'] !== 'no'
@@ -699,9 +699,9 @@ export default {
699
699
  ) {
700
700
  this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
701
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']
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
705
  }else if (this.orderFields['f_card_id'] !== 'no'
706
706
  && this.orderFields['f_building'] !== 'no'
707
707
  && this.orderFields['f_unit'] === 'no'
@@ -709,10 +709,10 @@ export default {
709
709
  && this.orderFields['f_room'] !== 'no'
710
710
  ) {
711
711
  this.f_card_idorderitem = 'f_card_id ' + this.orderFields['f_card_id']
712
- this.f_buildingorderitem = 'f_building ' + this.orderFields['f_building']
712
+ this.f_buildingorderitem = ',f_building ' + this.orderFields['f_building']
713
713
  this.f_unitorderitem = ''
714
- this.f_floororderitem = 'f_floor ' + this.orderFields['f_floor']
715
- this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
714
+ this.f_floororderitem = ',f_floor ' + this.orderFields['f_floor']
715
+ this.f_roomorderitem = ',f_room ' + this.orderFields['f_room']
716
716
  }else if (this.orderFields['f_card_id'] !== 'no'
717
717
  && this.orderFields['f_building'] !== 'no'
718
718
  && this.orderFields['f_unit'] !== 'no'
@@ -720,9 +720,9 @@ export default {
720
720
  && this.orderFields['f_room'] === 'no'
721
721
  ) {
722
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']
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
726
  this.f_roomorderitem = ''
727
727
  }else if (this.orderFields['f_card_id'] !== 'no'
728
728
  && this.orderFields['f_building'] !== 'no'
@@ -731,10 +731,10 @@ export default {
731
731
  && this.orderFields['f_room'] !== 'no'
732
732
  ) {
733
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']
734
+ this.f_buildingorderitem = ',f_building ' + this.orderFields['f_building']
735
+ this.f_unitorderitem = ',f_unit ' + this.orderFields['f_unit']
736
736
  this.f_floororderitem = ''
737
- this.f_roomorderitem = 'f_room ' + this.orderFields['f_room']
737
+ this.f_roomorderitem = ',f_room ' + this.orderFields['f_room']
738
738
  }else if (this.orderFields['f_card_id'] === 'no'
739
739
  && this.orderFields['f_building'] !== 'no'
740
740
  && this.orderFields['f_unit'] !== 'no'
@@ -743,9 +743,9 @@ export default {
743
743
  ) {
744
744
  this.f_card_idorderitem = ''
745
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']
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
749
  }else if (this.orderFields['f_card_id'] !== 'no'
750
750
  && this.orderFields['f_building'] !== 'no'
751
751
  && this.orderFields['f_unit'] !== 'no'
@@ -753,10 +753,10 @@ export default {
753
753
  && this.orderFields['f_room'] !== 'no'
754
754
  ) {
755
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']
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
760
  }
761
761
  this.model.paramSource.orderitem = `'${this.f_card_idorderitem}${this.f_buildingorderitem}${this.f_unitorderitem}${this.f_floororderitem}${this.f_roomorderitem}'`
762
762
  console.log(this.model.paramSource.orderitem)
@@ -882,7 +882,7 @@ export default {
882
882
  },
883
883
  computed:{
884
884
  getCondition(){
885
- return {condition: `${this.$refs.paged.$refs.cri.condition}`}
885
+ return {condition: `${this.$refs.paged.$refs.cri.condition}`,orderitem:this.model.paramSource.orderitem}
886
886
  },
887
887
  inputtores () {
888
888
  return this.$appdata.getParam('抄表员')