manage-client 3.2.195 → 3.2.197

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.
@@ -168,8 +168,8 @@ export default{
168
168
  'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_book_no': '用户证号', 'f_meter_book_sort': '册内序号', 'f_residential_area': '小区名称', 'f_address': '客户地址',
169
169
  'f_user_phone': '客户电话', 'f_rent_phone': '备用电话', 'f_inputtor': '抄表员', 'f_book_name': '抄表册', 'f_user_type': '客户类型',
170
170
  'f_gasproperties': '用气性质', 'f_comments': '备注', 'c': '欠费期数', 'f_hand_date': '欠费区间', 'f_oughtamount': '用气量',
171
- 'f_oughtfee': '用气金额', 'f_operate_date': '缴费时间', 'f_debt_money': '已交金额', 'f_oughtfee_new': '应交气费',
172
- 'overdue': '违约金', 'f_garbage_fee': '附加费', 'f_last_tablebase': '上期抄表底数', 'f_tablebase': '本期抄表底数', 'f_balance': '上期余额',
171
+ 'f_oughtfee': '用气金额', 'f_debt_money': '已交金额', 'f_oughtfee_new': '应交气费',
172
+ 'overdue': '违约金', 'f_garbage_fee': '附加费', 'f_last_tablebase': '上期抄表底数', 'f_tablebase': '本期抄表底数',
173
173
  'f_oughtfee_all': '合计欠费金额','f_oughtfee_col': '实际欠费金额', 'f_cost_type': '缴费方式', 'f_meter_type': '气表类型'
174
174
  },
175
175
  areaChargeQueryConfig: {
@@ -369,7 +369,7 @@ export default{
369
369
  'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'f_price_name': '价格类型',
370
370
  'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_price': '单价', 'f_gas': '气量', 'f_money': '金额', 'f_type': '收费类型',
371
371
  'f_payment': '收款方式','f_operate_date': '收费日期','f_operator': '操作员','f_depname': '部门','f_orgname': '公司'
372
- },
372
+ },
373
373
  chargeSchedule: {
374
374
  'f_serial_id': '流水号', 'f_userinfo_code': '户号', 'f_user_name': '户主', 'f_address': '地址',
375
375
  'a': '气量', 'b': '金额', 'f_operator': '收费员',
@@ -684,9 +684,9 @@ export default{
684
684
  'f_pre_deduct_money': '抵扣气费', 'f_balance': '期末余额', 'f_meternumber': '表号'
685
685
  },
686
686
  PrivilegeQuery: {
687
- 'f_userinfo_code': '用户编号', 'f_user_name': '用户姓名', 'f_user_type': '用户类型', 'f_address': '用气地址',
688
- 'f_meter_type': '气表类型', 'f_privilege_gas': '赠送方量(方)', 'f_privilege_money': '赠送金额(元)',
689
- 'f_operator': '操作员', 'f_operate_date': '时间', 'f_meternumber': '表号'
687
+ 'f_userinfo_code': '用户编号', 'f_user_name': '用户姓名', 'f_user_type': '用户类型', 'f_address': '用气地址',
688
+ 'f_meter_type': '气表类型', 'f_privilege_gas': '赠送方量(方)', 'f_privilege_money': '赠送金额(元)',
689
+ 'f_operator': '操作员', 'f_operate_date': '时间', 'f_meternumber': '表号'
690
690
  },
691
691
  PrickBillConfig: {
692
692
  'f_report_name': '报表名称', 'f_fee': '扎帐金额', 'f_report_fee': '系统金额',
@@ -22,10 +22,30 @@
22
22
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
23
23
  condition="f_user_phone like '%{}%'" placeholder="客户电话">
24
24
  </div>
25
+ <div class="col-sm-2 form-group">
26
+ <label for="startGasDate" class="font_normal_body">通气时间</label>
27
+ <datepicker id="startGasDate" placeholder="开始日期" style="width:60%"
28
+ v-model="model.startGasDate"
29
+ :value.sync="model.startGasDate"
30
+ :format="'yyyy-MM-dd 00:00:00'"
31
+ :show-reset-button="true"
32
+ condition="f_gas_date >= '{}'">
33
+ </datepicker>
34
+ </div>
35
+ <div class="col-sm-2 form-group">
36
+ <label for="endGasDate" class="font_normal_body">至</label>
37
+ <datepicker id="endGasDate" placeholder="结束日期" style="width:60%"
38
+ v-model="model.endGasDate"
39
+ :value.sync="model.endGasDate"
40
+ :format="'yyyy-MM-dd 23:59:59'"
41
+ :show-reset-button="true"
42
+ condition="f_gas_date <= '{}'">
43
+ </datepicker>
44
+ </div>
25
45
  <div class="span" style="float:right;">
26
46
  <button class="button_search button_spacing" @click="search()">查询</button>
27
47
  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
28
-
48
+ <button class="button_clear button_spacing" style="margin-top: 10px;background-color: #6aa6e2;" @click="$parent.$parent.downloadFiles()">导出</button>
29
49
 
30
50
  <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
31
51
  </div>
@@ -43,6 +63,49 @@
43
63
  condition="f_address like '%{}%'" placeholder='项目地址'>
44
64
  </div>
45
65
  <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"></res-select-group>
66
+ <div class="col-sm-2 form-group">
67
+ <label for="startDate" class="font_normal_body">建档日期</label>
68
+ <datepicker id="startDate" placeholder="开始日期" style="width:60%"
69
+ v-model="model.startDate"
70
+ :value.sync="model.startDate"
71
+ :format="'yyyy-MM-dd 00:00:00'"
72
+ :show-reset-button="true"
73
+ condition="f_createfile_date >= '{}'">
74
+ </datepicker>
75
+ </div>
76
+ <div class="col-sm-2 form-group">
77
+ <label for="endDate" class="font_normal_body">结束日期</label>
78
+ <datepicker id="endDate" placeholder="结束日期" style="width:60%"
79
+ v-model="model.endDate"
80
+ :value.sync="model.endDate"
81
+ :format="'yyyy-MM-dd 23:59:59'"
82
+ :show-reset-button="true"
83
+ condition="f_createfile_date <= '{}'">
84
+ </datepicker>
85
+ </div>
86
+ <div class="col-sm-2 form-group">
87
+ <label class="font_normal_body">通气年限</label>
88
+ <input type="number" style="width:60%" class="input_search" v-model="model.diffAllyear1"
89
+ condition="diffAllyear >= {}" placeholder="最小值">
90
+ </div>
91
+ <div class="col-sm-2 form-group">
92
+ <label class="font_normal_body">&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;</label>
93
+ <input type="number" style="width:60%" class="input_search" v-model="model.diffAllyear2"
94
+ condition="diffAllyear <= {}" placeholder="最大值">
95
+ </div>
96
+ <div class="col-sm-2 form-group">
97
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
98
+ <v-select :value.sync="model.f_residential_area"
99
+ class="select_list select"
100
+ enter-push
101
+ multiple = "true"
102
+ v-model="model.f_residential_area"
103
+ style="width: 60%"
104
+ :options='$parent.$parent.residentialArea' placeholder='选择小区'
105
+ close-on-select>
106
+
107
+ </v-select>
108
+ </div>
46
109
  </div>
47
110
  </div>
48
111
  </criteria>
@@ -56,7 +119,7 @@
56
119
  <th colspan="6"><nobr>燃气连接管</nobr></th>
57
120
  <th colspan="7"><nobr>调压设备</nobr></th>
58
121
  <th colspan="11"><nobr>燃气报警器装置</nobr></th>
59
- <th colspan="5"><nobr>建档信息</nobr></th>
122
+ <th colspan="6"><nobr>建档信息</nobr></th>
60
123
  <th colspan="6"><nobr>安检信息</nobr></th>
61
124
  <th rowspan="2"><nobr>备注</nobr></th>
62
125
  </tr>
@@ -120,6 +183,7 @@
120
183
  <th><nobr>供用气合同编号</nobr></th>
121
184
  <th><nobr>通气日期</nobr></th>
122
185
  <th><nobr>通气人员</nobr></th>
186
+ <th><nobr>通气年限</nobr></th>
123
187
  <th><nobr>变更记录</nobr></th>
124
188
 
125
189
  <th><nobr>安检日期</nobr></th>
@@ -320,6 +384,9 @@
320
384
  <td style="text-align: center;">
321
385
  <nobr>{{row.f_gas_person}}</nobr>
322
386
  </td>
387
+ <td style="text-align: center;" :style="$parent.$parent.$parent.ventilationYear(row.diffallyear)">
388
+ <nobr>{{row.ventilation_years}}</nobr>
389
+ </td>
323
390
  <td style="text-align: center;">
324
391
  <nobr>
325
392
  <span @click="$parent.$parent.$parent.dealmsg(row,'','建档信息')"><a><b>变更记录</b></a></span>
@@ -454,6 +521,7 @@
454
521
  }
455
522
  },
456
523
  ready() {
524
+ this.getaddress()
457
525
  readySomething(this).then(() => {
458
526
  this.$emit('ready')
459
527
  }).catch((error) => {
@@ -495,6 +563,30 @@
495
563
  }
496
564
  this.filechangeHistoryShow =true
497
565
  },
566
+ ventilationYear(diffAllyear){
567
+ console.log("diffAllyear?",diffAllyear)
568
+ if ( 1<= diffAllyear && diffAllyear <= 2 ){
569
+ return {
570
+ color: 'green !important'
571
+ }
572
+ }else if (3<= diffAllyear && diffAllyear <=4){
573
+ return {
574
+ color: 'orange !important'
575
+ }
576
+ }else if (5<= diffAllyear && diffAllyear <=8){
577
+ return {
578
+ color: 'red !important'
579
+ }
580
+ }else if (diffAllyear>8){
581
+ return {
582
+ color: 'crimson !important'
583
+ }
584
+ }else {
585
+ return {
586
+
587
+ }
588
+ }
589
+ },
498
590
  formatTime(expireTime){
499
591
  if (expireTime){
500
592
  let formats = {
@@ -552,7 +644,33 @@
552
644
  }
553
645
  this.residentialArea = house
554
646
  },
555
-
647
+ async downloadFiles() {
648
+ if (this.condition2) {
649
+ let data = {
650
+ sqlName: 'fmyGasDeviceQuery',
651
+ condition: this.condition2,
652
+ fileName: '非民用用气设备查询'
653
+ }
654
+ let HttpReset = new HttpResetClass()
655
+ let res = await HttpReset.load('POST', 'rs/deviceExport/gasDevices', {
656
+ data: data
657
+ }, {resolveMsg: null, rejectMsg: null})
658
+ if (res){
659
+ let downurl = 'rs/deviceExport/download?filename=非民用用气设备查询.xlsx';
660
+ this.$resetget(downurl, {}).then(res => {
661
+ var link = document.createElement('a');
662
+ link.target = "_blank"
663
+ link.href = downurl;
664
+ link.setAttribute("download", "非民用用气设备查询.xlsx"); //指定下载后的文件名,防跳转
665
+ document.body.appendChild(link);
666
+ link.click();
667
+ })
668
+ }
669
+ } else {
670
+ this.$showAlert('查询条件为空,请查询后再导出', 'warning', 3000)
671
+ return
672
+ }
673
+ },
556
674
  //把数据库查询数据转换为下拉数据
557
675
  calculate(rows){
558
676
  let data = []
@@ -573,6 +691,17 @@
573
691
  this.show=true
574
692
  },
575
693
  selfSearch(args) {
694
+ this.area = this.$refs.paged.$refs.cri.model.f_residential_area
695
+ console.log("=====小区model绑定====",this.area)
696
+ if(this.area.length !== 0){
697
+ let str = JSON.stringify(this.area)
698
+ str = str.replace(/"/g,`'`)
699
+ str = str.replace(/\[/g,``)
700
+ str = str.replace(/\]/g,``)
701
+ console.log("=====小区model22222222222绑定====",str)
702
+ //查询多个小区时条件
703
+ args.condition += ` and f_residential_area in ( ${str} )`
704
+ }
576
705
  if (!this.orgCondtionStr) {
577
706
  args.condition = `${args.condition}` + " and f_orgid = " + this.$login.f.orgid
578
707
  } else {
@@ -22,10 +22,30 @@
22
22
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
23
23
  condition="f_user_phone like '%{}%'" placeholder="客户电话">
24
24
  </div>
25
+ <div class="col-sm-2 form-group">
26
+ <label for="startGasDate" class="font_normal_body">通气时间</label>
27
+ <datepicker id="startGasDate" placeholder="开始日期" style="width:60%"
28
+ v-model="model.startGasDate"
29
+ :value.sync="model.startGasDate"
30
+ :format="'yyyy-MM-dd 00:00:00'"
31
+ :show-reset-button="true"
32
+ condition="f_gas_date >= '{}'">
33
+ </datepicker>
34
+ </div>
35
+ <div class="col-sm-2 form-group">
36
+ <label for="endGasDate" class="font_normal_body">至</label>
37
+ <datepicker id="endGasDate" placeholder="结束日期" style="width:60%"
38
+ v-model="model.endGasDate"
39
+ :value.sync="model.endGasDate"
40
+ :format="'yyyy-MM-dd 23:59:59'"
41
+ :show-reset-button="true"
42
+ condition="f_gas_date <= '{}'">
43
+ </datepicker>
44
+ </div>
25
45
  <div class="span" style="float:right;">
26
46
  <button class="button_search button_spacing" @click="search()">查询</button>
27
47
  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
28
-
48
+ <button class="button_clear button_spacing" style="margin-top: 10px;background-color: #6aa6e2;" @click="$parent.$parent.downloadFiles()">导出</button>
29
49
  <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
30
50
  </div>
31
51
  </div>
@@ -47,6 +67,48 @@
47
67
  condition="f_meternumber like '%{}%'" placeholder='燃气表号'>
48
68
  </div>
49
69
  <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"></res-select-group>
70
+ <div class="col-sm-2 form-group">
71
+ <label for="startDate" class="font_normal_body">建档日期</label>
72
+ <datepicker id="startDate" placeholder="开始日期" style="width:60%"
73
+ v-model="model.startDate"
74
+ :value.sync="model.startDate"
75
+ :format="'yyyy-MM-dd 00:00:00'"
76
+ :show-reset-button="true"
77
+ condition="f_createfile_date >= '{}'">
78
+ </datepicker>
79
+ </div>
80
+ <div class="col-sm-2 form-group">
81
+ <label for="endDate" class="font_normal_body">结束日期</label>
82
+ <datepicker id="endDate" placeholder="结束日期" style="width:60%"
83
+ v-model="model.endDate"
84
+ :value.sync="model.endDate"
85
+ :format="'yyyy-MM-dd 23:59:59'"
86
+ :show-reset-button="true"
87
+ condition="f_createfile_date <= '{}'">
88
+ </datepicker>
89
+ </div>
90
+ <div class="col-sm-2 form-group">
91
+ <label class="font_normal_body">通气年限</label>
92
+ <input type="number" style="width:60%" class="input_search" v-model="model.diffAllyear1"
93
+ condition="diffAllyear >= {}" placeholder="最小值">
94
+ </div>
95
+ <div class="col-sm-2 form-group">
96
+ <label class="font_normal_body">&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;</label>
97
+ <input type="number" style="width:60%" class="input_search" v-model="model.diffAllyear2"
98
+ condition="diffAllyear <= {}" placeholder="最大值">
99
+ </div>
100
+ <div class="col-sm-2 form-group">
101
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
102
+ <v-select :value.sync="model.f_residential_area"
103
+ class="select_list select"
104
+ enter-push
105
+ multiple = "true"
106
+ v-model="model.f_residential_area"
107
+ style="width: 60%"
108
+ :options='$parent.$parent.residentialArea' placeholder='选择小区'
109
+ close-on-select>
110
+ </v-select>
111
+ </div>
50
112
  </div>
51
113
  </div>
52
114
  </criteria>
@@ -56,6 +118,7 @@
56
118
  <th rowspan="2"><nobr>序号</nobr></th>
57
119
  <th colspan="5"><nobr>用户信息</nobr></th>
58
120
  <th colspan="8"><nobr>燃气表</nobr></th>
121
+ <th colspan="7"><nobr>建档信息</nobr></th>
59
122
  <th colspan="7"><nobr>燃气报警装置</nobr></th>
60
123
  <th colspan="4"><nobr>燃气灶具</nobr></th>
61
124
  <th colspan="5"><nobr>燃气灶具连接管</nobr></th>
@@ -63,7 +126,6 @@
63
126
  <th colspan="5"><nobr>燃气热水器连接管</nobr></th>
64
127
  <th colspan="5"><nobr>燃气壁挂炉</nobr></th>
65
128
  <th colspan="5"><nobr>燃气壁挂炉连接管</nobr></th>
66
- <th colspan="6"><nobr>建档信息</nobr></th>
67
129
  <th colspan="5"><nobr>燃气保险信息</nobr></th>
68
130
  <th colspan="2"><nobr>初次充值信息</nobr></th>
69
131
  <th colspan="2"><nobr>每年充值</nobr></th>
@@ -72,11 +134,13 @@
72
134
  </tr>
73
135
 
74
136
  <tr>
137
+ <!--用户信息-->
75
138
  <th><nobr>小区名称</nobr></th>
76
139
  <th><nobr>户主姓名</nobr></th>
77
140
  <th><nobr>身份证号</nobr></th>
78
141
  <th><nobr>详细地址</nobr></th>
79
142
  <th><nobr>联系电话</nobr></th>
143
+ <!--燃气表-->
80
144
  <th><nobr>品牌</nobr></th>
81
145
  <th><nobr>表号</nobr></th>
82
146
  <th><nobr>类型</nobr></th>
@@ -85,6 +149,15 @@
85
149
  <th><nobr>生产年月</nobr></th>
86
150
  <th><nobr>超期提醒</nobr></th>
87
151
  <th><nobr>变更记录</nobr></th>
152
+ <!--建档信息-->
153
+ <th><nobr>建档日期</nobr></th>
154
+ <th><nobr>供用气合同编号</nobr></th>
155
+ <th><nobr>通气日期</nobr></th>
156
+ <th><nobr>通气人员</nobr></th>
157
+ <th><nobr>通气年限</nobr></th>
158
+ <th><nobr>防盗卡号</nobr></th>
159
+ <th><nobr>变更记录</nobr></th>
160
+ <!--燃气报警装置-->
88
161
  <th><nobr>独立式可燃气体探测器品牌</nobr></th>
89
162
  <th><nobr>接头型号</nobr></th>
90
163
  <th><nobr>生产日期</nobr></th>
@@ -121,12 +194,7 @@
121
194
  <th><nobr>生产日期</nobr></th>
122
195
  <th><nobr>超期提醒</nobr></th>
123
196
  <th><nobr>变更记录</nobr></th>
124
- <th><nobr>建档日期</nobr></th>
125
- <th><nobr>供用气合同编号</nobr></th>
126
- <th><nobr>通气日期</nobr></th>
127
- <th><nobr>通气人员</nobr></th>
128
- <th><nobr>防盗卡号</nobr></th>
129
- <th><nobr>变更记录</nobr></th>
197
+
130
198
  <th><nobr>类型</nobr></th>
131
199
  <th><nobr>金额(元)</nobr></th>
132
200
  <th><nobr>日期</nobr></th>
@@ -195,6 +263,31 @@
195
263
  </nobr>
196
264
  </td>
197
265
 
266
+ <!--建档信息-->
267
+ <td style="text-align: center;">
268
+ <nobr>{{row.f_createfile_date}}</nobr>
269
+ </td>
270
+ <td style="text-align: center;">
271
+ <nobr>{{row.f_contract_id}}</nobr>
272
+ </td>
273
+ <td style="text-align: center;">
274
+ <nobr>{{row.f_gas_date}}</nobr>
275
+ </td>
276
+ <td style="text-align: center;">
277
+ <nobr>{{row.f_gas_person}}</nobr>
278
+ </td>
279
+ <td style="text-align: center;" :style="$parent.$parent.$parent.ventilationYear(row.diffallyear)">
280
+ <nobr>{{row.ventilation_years}}</nobr>
281
+ </td>
282
+ <td style="text-align: center;">
283
+ <nobr>{{row.f_defendcard }}|{{ row.f_defendcard_two}}</nobr>
284
+ </td>
285
+ <td style="text-align: center;">
286
+ <nobr>
287
+ <span @click="$parent.$parent.$parent.dealmsg(row,'','建档信息')"><a><b>变更记录</b></a></span>
288
+ </nobr>
289
+ </td>
290
+
198
291
  <!--燃气报警装置-->
199
292
  <td style="text-align: center;">
200
293
  <nobr>{{row.f_icgd_brand}}</nobr>
@@ -332,27 +425,6 @@
332
425
  </nobr>
333
426
  </td>
334
427
 
335
- <!--建档信息-->
336
- <td style="text-align: center;">
337
- <nobr>{{row.f_createfile_date}}</nobr>
338
- </td>
339
- <td style="text-align: center;">
340
- <nobr>{{row.f_contract_id}}</nobr>
341
- </td>
342
- <td style="text-align: center;">
343
- <nobr>{{row.f_gas_date}}</nobr>
344
- </td>
345
- <td style="text-align: center;">
346
- <nobr>{{row.f_gas_person}}</nobr>
347
- </td>
348
- <td style="text-align: center;">
349
- <nobr>{{row.f_defendcard }}|{{ row.f_defendcard_two}}</nobr>
350
- </td>
351
- <td style="text-align: center;">
352
- <nobr>
353
- <span @click="$parent.$parent.$parent.dealmsg(row,'','建档信息')"><a><b>变更记录</b></a></span>
354
- </nobr>
355
- </td>
356
428
  <!--燃气保险信息-->
357
429
  <td style="text-align: center;">
358
430
  <nobr>{{row.f_fee_type}}</nobr>
@@ -544,6 +616,7 @@
544
616
  }
545
617
  },
546
618
  ready() {
619
+ this.getaddress()
547
620
  readySomething(this).then(() => {
548
621
  this.$emit('ready')
549
622
  }).catch((error) => {
@@ -597,7 +670,30 @@
597
670
  }
598
671
  this.filechangeHistoryShow =true
599
672
  },
600
- formatTime(expireTime){
673
+ ventilationYear(diffAllyear){
674
+ if ( 1<= diffAllyear && diffAllyear <= 2 ){
675
+ return {
676
+ color: 'green !important'
677
+ }
678
+ }else if (3<= diffAllyear && diffAllyear <=4){
679
+ return {
680
+ color: 'orange !important'
681
+ }
682
+ }else if (5<= diffAllyear && diffAllyear <=8){
683
+ return {
684
+ color: 'red !important'
685
+ }
686
+ }else if (diffAllyear>8){
687
+ return {
688
+ color: 'crimson !important'
689
+ }
690
+ }else {
691
+ return {
692
+
693
+ }
694
+ }
695
+ },
696
+ formatTime(expireTime){
601
697
  if (expireTime){
602
698
  let formats = {
603
699
  'year': '%n%年',
@@ -654,7 +750,33 @@
654
750
  }
655
751
  this.residentialArea = house
656
752
  },
657
-
753
+ async downloadFiles() {
754
+ if (this.condition2) {
755
+ let data = {
756
+ sqlName: 'myGasDeviceQuery',
757
+ condition: this.condition2,
758
+ fileName: '民用用气设备查询'
759
+ }
760
+ let HttpReset = new HttpResetClass()
761
+ let res = await HttpReset.load('POST', 'rs/deviceExport/gasDevices', {
762
+ data: data
763
+ }, {resolveMsg: null, rejectMsg: null})
764
+ if (res){
765
+ let downurl = 'rs/deviceExport/download?filename=民用用气设备查询.xlsx';
766
+ this.$resetget(downurl, {}).then(res => {
767
+ var link = document.createElement('a');
768
+ link.target = "_blank"
769
+ link.href = downurl;
770
+ link.setAttribute("download", "民用用气设备查询.xlsx"); //指定下载后的文件名,防跳转
771
+ document.body.appendChild(link);
772
+ link.click();
773
+ })
774
+ }
775
+ } else {
776
+ this.$showAlert('查询条件为空,请查询后再导出', 'warning', 3000)
777
+ return
778
+ }
779
+ },
658
780
  //把数据库查询数据转换为下拉数据
659
781
  calculate(rows){
660
782
  let data = []
@@ -671,6 +793,17 @@
671
793
  },
672
794
 
673
795
  selfSearch(args) {
796
+ this.area = this.$refs.paged.$refs.cri.model.f_residential_area
797
+ console.log("=====小区model绑定====",this.area)
798
+ if(this.area.length !== 0){
799
+ let str = JSON.stringify(this.area)
800
+ str = str.replace(/"/g,`'`)
801
+ str = str.replace(/\[/g,``)
802
+ str = str.replace(/\]/g,``)
803
+ console.log("=====小区model22222222222绑定====",str)
804
+ //查询多个小区时条件
805
+ args.condition += ` and f_residential_area in ( ${str} )`
806
+ }
674
807
  if (!this.orgCondtionStr) {
675
808
  args.condition = `${args.condition}` + " and f_orgid = " + this.$login.f.orgid
676
809
  } else {
@@ -813,7 +946,16 @@
813
946
  }
814
947
  }
815
948
  .back-red{ /* 红色背景 */
816
- color: #df1335 !important;
949
+ color: red !important;
950
+ }
951
+ .back-green{ /* 红色背景 */
952
+ color: green !important;
953
+ }
954
+ .back-orange{ /* 红色背景 */
955
+ color: orange !important;
956
+ }
957
+ .back-crimson{
958
+ color: crimson !important;
817
959
  }
818
960
  .back-blue{ /* 蓝色背景 */
819
961
 
@@ -12,6 +12,9 @@
12
12
  <tabs header="抄表按用户汇总" >
13
13
  <qn-chaobiaoyhhz v-if="show.includes('抄表按用户汇总')" @deal-msg="dealMsg" :data="data"></qn-chaobiaoyhhz>
14
14
  </tabs>
15
+ <tabs header="调价补差统计表" >
16
+ <qn-tiaojiabuchatjb v-if="show.includes('调价补差统计表')" @deal-msg="dealMsg" :data="data"></qn-tiaojiabuchatjb>
17
+ </tabs>
15
18
  </tab-button>
16
19
 
17
20
  </template>