manage-client 1.22.60-ca → 1.22.62-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.60-ca",
3
+ "version": "1.22.62-ca",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -40,22 +40,23 @@
40
40
  placeholder='请选择'
41
41
  close-on-select></v-select>
42
42
  </div>
43
- <div class="col-sm-4">
44
- <div style = "float:right;margin-top:10px">
45
- <button class="btn btn-success" @click="search()">查询</button>
46
- <button class="btn btn-default" @click="$parent.$parent.clear()">清空</button><!--
43
+
44
+ </div>
45
+ <div
46
+ :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
47
+ @click="$parent.$parent.hidden()" class="button_spacing" style="float: right">
48
+ </div>
49
+ <div style = "float:right;margin-left:10px">
50
+ <button class="btn btn-success" @click="search()">查询</button>
51
+ <button class="btn btn-default" @click="$parent.$parent.clear()">清空</button><!--
47
52
  <export-excel :data="$parent.$parent.getCondition"
48
53
  :field="$parent.$parent.getfield"
49
54
  sqlurl="rs/logic/exportfile" sql-name="chargeQuery" template-name='收费查询导出' :choose-col="true"></export-excel>
50
55
  -->
51
- <!-- <print-data :model="$parent.model" :field="$parent.$parent.getfield" :defaultfield="$parent.$parent.defaultfield" print-name="收费查询"-->
52
- <!-- :sumsmodel="$parent.$parent.sumsmodel" ></print-data>-->
53
- <div
54
- :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
55
- @click="$parent.$parent.hidden()" class="button_spacing" style="float: right"></div>
56
- </div>
56
+ <!-- <print-data :model="$parent.model" :field="$parent.$parent.getfield" :defaultfield="$parent.$parent.defaultfield" print-name="收费查询"-->
57
+ <!-- :sumsmodel="$parent.$parent.sumsmodel" ></print-data>-->
58
+
57
59
  </div>
58
- </div>
59
60
  </div>
60
61
  </criteria>
61
62
 
@@ -0,0 +1,600 @@
1
+ <template>
2
+ <div class="flex-row" id="unit" v-show="(!echarts)&&(!isActiveTotalForm)">
3
+ <div class="basic-main" @keyup.enter="search">
4
+ <div class="flex">
5
+ <div class="flex" style="flex:1;">
6
+ <criteria-paged :model="model" :pager='true' @sort="sort" v-ref:paged>
7
+ <criteria @condition-changed='$parent.search' partial='criteria' v-ref:cri>
8
+ <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
9
+ <div class="row" width="100%">
10
+ <div class="col-sm-2 form-group">
11
+ <label class="font_normal_body">客户编号</label>
12
+ <input style="width:60%" class="input_search" condition="f_userinfo_code like '%{}%'" placeholder='客户编号' type="text"
13
+ v-el:meternumber v-model="model.f_userinfo_code" v-next-el='f_userinfo_code'
14
+ >
15
+ </div>
16
+ <div class="col-sm-2 form-group">
17
+ <label class="font_normal_body">客户名称</label>
18
+ <input style="width:60%" class="input_search" condition="f_user_name like '%{}%'" placeholder='客户名称' type="text"
19
+ v-el:username v-model="model.f_username" v-next-el='userid'>
20
+ </div>
21
+ <div class="col-sm-2 form-group">
22
+ <label class="font_normal_body">用气地址</label>
23
+ <input style="width:60%" class="input_search" condition="f_address like '%{}%'" placeholder='用气地址' type="text"
24
+ v-el:area v-el:xq v-model="model.f_address" v-next-el='address'
25
+ >
26
+ </div>
27
+ <div class="col-sm-2 form-group">
28
+ <label class="font_normal_body">小区名称</label>
29
+ <input style="width:60%" class="input_search" condition="f_address like '%{}%'" placeholder='小区名称' type="text"
30
+ v-el:area v-el:xq v-model="model.f_residential_area" v-next-el='address'
31
+ >
32
+ </div>
33
+ <div class="col-sm-4 form-group button-range">
34
+ <button @click="search()" class="button_search button_spacing">查询</button>
35
+ <button @click="$parent.$parent.clearmsg" class="button_clear button_spacing">清空</button>
36
+ <export-excel :data="{condition:$parent.$parent.condition,startDate:model.startDate,endDate:model.endDate,orderitem:$parent.$parent.orderDefault}"
37
+ :field="$parent.$parent.getfield"
38
+ sqlurl="rs/logic/exportfile" sql-name="getNewUserGasAll" template-name='表具查询'
39
+ v-ref:exports
40
+ :choose-col="true"></export-excel>
41
+ <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>
42
+ </div>
43
+ </div>
44
+ <div class="row" v-show="$parent.$parent.criteriaShow">
45
+ <div class="col-sm-2 form-group">
46
+ <label class="font_normal_body">表&emsp;&emsp;号</label>
47
+ <input style="width:60%" class="input_search" condition="f_meternumber = '{}'" placeholder='表号' type="text"
48
+ v-el:meternumber v-model="model.f_meternumber" v-next-el='meternumber'
49
+ >
50
+ </div>
51
+ <div class="col-sm-2 form-group">
52
+ <label class="font_normal_body">行政区域</label>
53
+ <v-select :options='$parent.$parent.f_distinct'
54
+ :value.sync="model.f_distinct"
55
+ close-on-select
56
+ condition="f_distinct = '{}'"
57
+ id="f_distinct"
58
+ placeholder='行政区域'
59
+ style="width:60%"
60
+ v-model="model.f_distinct"
61
+ value-single="true">
62
+ </v-select>
63
+ </div>
64
+ <div class="col-sm-2 form-group">
65
+ <label class="font_normal_body">运营区域</label>
66
+ <v-select :options='$parent.$parent.f_opera_area'
67
+ :value.sync="model.f_opera_area"
68
+ close-on-select
69
+ condition="f_opera_area = '{}'"
70
+ id="f_opera_area"
71
+ placeholder='运营区域'
72
+ style="width:60%"
73
+ v-model="model.f_opera_area"
74
+ value-single="true">
75
+ </v-select>
76
+ </div>
77
+ <div class="col-sm-2 form-group">
78
+ <label class="font_normal_body">用户类型</label>
79
+ <v-select :options='$parent.$parent.Gasusertype'
80
+ :value.sync="model.f_user_type"
81
+ close-on-select
82
+ style="width:60%"
83
+ condition="f_user_type = '{}'"
84
+ id="f_user_type"
85
+ placeholder='用户类型'
86
+ v-model="model.f_user_type"
87
+ >
88
+ </v-select>
89
+ </div>
90
+ <div class="col-sm-2 form-group">
91
+ <label class="font_normal_body">用气性质</label>
92
+ <v-select :options='$parent.$parent.Gasproperties'
93
+ :value.sync="model.f_gasproperties"
94
+ close-on-select
95
+ condition="f_gasproperties = '{}'"
96
+ id="f_gasproperties"
97
+ placeholder='用气性质'
98
+ style="width:60%"
99
+ v-model="model.f_gasproperties"
100
+ >
101
+ </v-select>
102
+ </div>
103
+ <div class="col-sm-2 form-group">
104
+ <label class="font_normal_body">街&emsp;&emsp;道</label>
105
+ <input style="width:60%" class="input_search" condition="f_street like '%{}%'" placeholder='街道' type="text"
106
+ v-el:username v-model="model.f_street" v-next-el='userid'>
107
+ </div>
108
+ <div class="col-sm-2 form-group">
109
+ <label class="font_normal_body">楼&emsp;&emsp;栋</label>
110
+ <input style="width:60%" class="input_search" condition="f_building like '%{}%'" placeholder='楼栋' type="text"
111
+ v-el:username v-model="model.f_building" v-next-el='userid'>
112
+ </div>
113
+ <div class="col-sm-2 form-group">
114
+ <label class="font_normal_body">单&emsp;&emsp;元</label>
115
+ <input style="width:60%" class="input_search" condition="f_unit like '%{}%'" placeholder='单元' type="text"
116
+ v-el:username v-model="model.f_unit" v-next-el='userid'>
117
+ </div>
118
+ <div class="col-sm-2 form-group">
119
+ <label class="font_normal_body">楼&emsp;&emsp;层</label>
120
+ <input style="width:60%" class="input_search" condition="f_floor like '%{}%'" placeholder='楼层' type="text"
121
+ v-el:username v-model="model.f_floor" v-next-el='userid'>
122
+ </div>
123
+ <div class="col-sm-2 form-group">
124
+ <label class="font_normal_body">门&emsp;&emsp;牌</label>
125
+ <input style="width:60%" class="input_search" condition="f_room like '%{}%'" placeholder='门牌' type="text"
126
+ v-el:username v-model="model.f_room" v-next-el='userid'>
127
+ </div>
128
+ <div class="col-sm-2 form-group">
129
+ <label class="font_normal_body">气价类型</label>
130
+ <v-select :options='$parent.$parent.pricetype'
131
+ :value.sync="model.f_price_type"
132
+ close-on-select
133
+ condition="f_price_type = '{}'"
134
+ id="f_price_type"
135
+ placeholder='气价类型'
136
+ style="width:60%"
137
+ v-model="model.f_price_type"
138
+ >
139
+ </v-select>
140
+ </div>
141
+ <div class=" col-sm-2 form-group " >
142
+ <label for="pricename" class="font_normal_body ">气价名称</label>
143
+ <v-select :value.sync="model.f_price_name" v-model="model.f_price_name"
144
+ condition="f_price_id = '{}'"
145
+ placeholder='气价名称' :options="$parent.$parent.getPricenames(model)"
146
+ style="width:60%"
147
+ close-on-select :disabled='model.pricetype.length === 0 ' v-ref:name></v-select>
148
+ </div>
149
+ <div class="col-sm-2 form-group">
150
+ <label class="font_normal_body">时间区间</label>
151
+ <datepicker :disabled-days-of-Week="[]" :format="'yyyy-MM-dd 00:00:00'"
152
+ :show-reset-button="reset"
153
+ :value.sync="model.startDate"
154
+ id="startDate"
155
+ style="width:60%"
156
+ placeholder="开始时间"
157
+ v-model="model.startDate">
158
+ </datepicker>
159
+ </div>
160
+ <div class="col-sm-2 form-group">
161
+ <label class="font_normal_body" style="word-break:keep-all;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;</label>
162
+ <datepicker :disabled-days-of-Week="[]" :format="'yyyy-MM-dd 23:59:59'"
163
+ :show-reset-button="reset"
164
+ :value.sync="model.endDate"
165
+ style="width:60%"
166
+ id="endDate"
167
+ style="width:60%"
168
+ placeholder="结束日期"
169
+ v-model="model.endDate">
170
+ </datepicker>
171
+ </div>
172
+ <div class="col-sm-2 form-group">
173
+ <label class="font_normal_body">卡号大于</label>
174
+ <input style="width:60%" class="input_search" condition="f_card_id >= '{}'" placeholder='卡号大于' type="text"
175
+ v-el:f_card_id1 v-el:xq v-model="model.f_card_id1"
176
+ >
177
+ </div>
178
+ <div class="col-sm-2 form-group">
179
+ <label class="font_normal_body">卡号小于</label>
180
+ <input style="width:60%" class="input_search" condition="f_card_id < '{}'" placeholder='卡号小于' type="text"
181
+ v-el:f_card_id2 v-el:xq v-model="model.f_card_id2"
182
+ >
183
+ </div>
184
+ <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
185
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;用气量&nbsp;</label>
186
+ <div class="row">
187
+ <input type="text" style="width:27%" class="input_search" v-model="model.f_oughtamount1"
188
+ condition="f_oughtamount >= {} " placeholder="">
189
+ <label class="font_normal_body"> ≤ x ≤ </label>
190
+ <input type="text" style="width:27%" class="input_search" v-model="model.f_oughtamount2"
191
+ condition="f_oughtamount <= {} " placeholder="">
192
+ </div>
193
+ </div>
194
+ <div class="col-sm-2 form-group" >
195
+ <label class="font_normal_body">抄&nbsp;表&nbsp;员&nbsp;</label>
196
+ <v-select :value.sync="model.f_inputtor"
197
+ :options='$parent.$parent.inputtors' placeholder='请选择' v-model="model.f_inputtor"
198
+ condition="f_inputtor = '{}'"
199
+ close-on-select></v-select>
200
+ </div>
201
+ </div>
202
+ </div>
203
+ </criteria>
204
+ <data-grid :model="model" id="usergasall" partial='list' class="list_area table_sy" v-ref:grid>
205
+ <template partial='head'>
206
+ <tr>
207
+ <th style="text-align:center">
208
+ <nobr>序号</nobr>
209
+ </th>
210
+ <th style="text-align:center">
211
+ <nobr>客户编号</nobr>
212
+ </th>
213
+ <th style="text-align:center">
214
+ <nobr>客户类型</nobr>
215
+ </th>
216
+ <th style="text-align:center">
217
+ <nobr>用气性质</nobr>
218
+ </th>
219
+ <!--<th style="text-align:center"><nobr>用气属性</nobr></th>-->
220
+ <th style="text-align:center">
221
+ <nobr>客户名称</nobr>
222
+ </th>
223
+ <th style="text-align:center">
224
+ <nobr>用气地址</nobr>
225
+ </th>
226
+ <th >
227
+ <data-order field="f_meternumber" name="表号" :order.sync="$parent.$parent.$parent.orderFields.f_meternumber"></data-order>
228
+ </th>
229
+ <th style="text-align:center">
230
+ <nobr>上期底数</nobr>
231
+ </th>
232
+ <th style="text-align:center">
233
+ <nobr>本期底数</nobr>
234
+ </th>
235
+ <th style="text-align:center">
236
+ <nobr>上期上报时间</nobr>
237
+ </th>
238
+ <th style="text-align:center">
239
+ <nobr>本期上报时间</nobr>
240
+ </th>
241
+ <!-- <th style="text-align:center"><nobr>气价(元/m³)</nobr></th>-->
242
+ <th >
243
+ <data-order field="f_oughtamount" name="用气量" :order.sync="$parent.$parent.$parent.orderFields.f_oughtamount"></data-order>
244
+ </th>
245
+ <th style="text-align:center">
246
+ <nobr>用气天数</nobr>
247
+ </th>
248
+ <th style="text-align:center">
249
+ <nobr>平均用气量(m³)</nobr>
250
+ </th>
251
+ <th style="text-align:center">
252
+ <nobr>用气金额(元)</nobr>
253
+ </th>
254
+ <th style="text-align:center">
255
+ <nobr>期初余额(元)</nobr>
256
+ </th>
257
+ <th style="text-align:center">
258
+ <nobr>期末结余(元)</nobr>
259
+ </th>
260
+ </tr>
261
+ </template>
262
+ <template partial='body'>
263
+ <td>{{$index+1}}</td>
264
+ <td>{{row.f_userinfo_code}}</td>
265
+ <td style="text-align:center">{{row.f_user_type}}</td>
266
+ <td style="text-align:center">{{row.f_gasproperties}}</td>
267
+ <!--<td style="text-align:center">{{row.f_gasproperties2}}</td>-->
268
+ <td style="text-align:center">
269
+ <nobr>{{row.f_user_name}}</nobr>
270
+ </td>
271
+ <td>
272
+ <nobr>{{row.f_address}}</nobr>
273
+ </td>
274
+ <td>{{row.f_meternumber}}</td>
275
+ <td style="text-align:center">{{row.f_last_tablebase}}</td>
276
+ <td style="text-align:center">{{row.f_tablebase}}</td>
277
+ <td style="text-align:center">{{row.f_last_hand_date}}</td>
278
+ <td style="text-align:center">{{row.f_end_hand_date}}</td>
279
+ <!--<td style="text-align:center">{{row.f_avg_price}}</td>-->
280
+ <td style="text-align:center">{{row.f_oughtamount}}</td>
281
+ <td style="text-align:center">{{row.days}}</td>
282
+ <td style="text-align:center">{{row.aveg}}</td>
283
+ <td style="text-align:center">{{row.f_oughtfee}}</td>
284
+ <td style="text-align:center">{{row.f_balance}}</td>
285
+ <!-- <td style="text-align:center">{{row.f_collection}}</td>-->
286
+ <td style="text-align:center">{{row.f_curbalance}}</td>
287
+ </template>
288
+ </data-grid>
289
+ </criteria-paged>
290
+ <table class="table-hover">
291
+ <tr style="position: relative" class="table-bordered">
292
+ <td
293
+ style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
294
+ 汇总信息
295
+ </td>
296
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
297
+ 总用户数:&emsp;{{model.count}}
298
+ </td>
299
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
300
+ 总用气量:&emsp;{{model.sums.f_oughtamount}}
301
+ </td>
302
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
303
+ 平均用气量:&emsp;{{(model.sums.f_oughtamount/model.count).toFixed(2)}}
304
+ </td>
305
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
306
+ 总用气金额:&emsp;{{model.sums.f_oughtfee}}
307
+ </td>
308
+ </tr>
309
+ </table>
310
+ </div>
311
+ </div>
312
+ </div>
313
+ </div>
314
+ </template>
315
+ <script>
316
+ import {PagedList} from 'vue-client'
317
+ import UserGasEcharts from './UserGasEcharts'
318
+ import * as Util from '../../../Util'
319
+ import getLodop from '../../../plugins/LodopFuncs'
320
+ import plugins from '../../../plugins/GetLoginInfoService'
321
+ import plugin from 'system-clients/src/plugins/GetLoginInfoService'
322
+ export default {
323
+ title: '用气分析',
324
+ props: ['data'],
325
+ components: {UserGasEcharts},
326
+ data() {
327
+ return {
328
+ model: new PagedList('/rs/sql/getNewUserGasAll', 20, {
329
+ startDate: 'this.model.startDate',
330
+ endDate: 'this.model.endDate'
331
+ }, {
332
+ f_oughtamount: 0,
333
+ f_oughtfee: 0
334
+ }),
335
+ orderFields: {
336
+ f_meternumber: 'no',
337
+ f_oughtamount: 'no'
338
+ },
339
+ getGroupNameByDate: [
340
+ {label: '年份', value: 'year'},
341
+ {label: '月份', value: 'month'},
342
+ {label: '周', value: 'week'}
343
+ ],
344
+ meterbrands: [],
345
+ criteriaShow: false,
346
+ orderDefault: 'f_meternumber',
347
+ reportStr: null,
348
+ show: false,
349
+ initres: {
350
+ org: [this.$login.f.orgid],
351
+ dep: [],
352
+ user: []
353
+ },
354
+ outlets: [],
355
+ operator: [],
356
+ filename: '',
357
+ searchshow: true,
358
+ startDate: '',
359
+ endDate: '',
360
+ echarts: false,
361
+ isActiveTotalForm: false,
362
+ condition: '1=1',
363
+ getfield: {},
364
+ config: {
365
+ excelHeaders: {
366
+ 'f_userinfo_code': '客户编号',
367
+ 'f_user_type': '客户类型',
368
+ 'f_gasproperties': '用气性质',
369
+ 'f_user_name': '客户名称',
370
+ 'f_address': '用气地址',
371
+ 'f_meternumber': '表号',
372
+ 'f_balance': '期初余额(元)',
373
+ 'f_last_tablebase': '上期底数',
374
+ 'f_tablebase': '本期底数',
375
+ 'f_last_hand_date': '上期上报时间',
376
+ 'f_end_hand_date': '本期上报时间',
377
+ 'f_oughtamount': '用气量(m³)',
378
+ 'days': '用气天数',
379
+ 'aveg': '平均用气量(m³)',
380
+ 'f_oughtfee': '用气金额(元)',
381
+ 'f_curbalance': '期末结余(元)'
382
+ }
383
+ },
384
+ groupname: ['year'],
385
+ getgroupname: [
386
+ {label: '年份', value: 'year'},
387
+ {label: '月份', value: 'month'},
388
+ {label: '周', value: 'week'},
389
+ {label: '日', value: 'day'}
390
+ ],
391
+ // orgCondtionStr: ' and h.f_orgid in (' + this.$login.f.orgid + ')',
392
+ orgCondtionStr: '(' + this.$login.f.orgid + ')',
393
+ orgid: [this.$login.f.orgid]
394
+ }
395
+ },
396
+ ready() {
397
+ this.$refs.paged.$refs.cri.model.startDate = Util.toStartDate() + ' 00:00:00'
398
+ this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
399
+ this.$LoadParams.loadParam()
400
+ // this.$refs.paged.$refs.cri.search()
401
+ this.getfield = this.config.excelHeaders
402
+ },
403
+ methods: {
404
+ sort(field, rule) {
405
+ console.log(rule)
406
+ // 将所有排序方式设为不排序,实现相互排斥
407
+ for (let key in this.orderFields) {
408
+ if (key === field) {
409
+ this.orderFields[key] = rule
410
+ } else {
411
+ this.orderFields[key] = 'no'
412
+ }
413
+ }
414
+ this.startDate = this.$refs.paged.$refs.cri.model.startDate
415
+ this.endDate = this.$refs.paged.$refs.cri.model.endDate
416
+ if (this.endDate == '' || this.startDate == '') {
417
+ return this.$showMessage("时间区间的开始和结束时间不能为空!")
418
+ }
419
+ // 如果新规则不排序,还原为默认排序
420
+ if (rule === 'no') {
421
+ this.model.paramSource.orderitem = `'${this.orderDefault}'`
422
+ } else {
423
+ this.model.paramSource.orderitem = `'${field} ${rule}'`
424
+ }
425
+ this.$refs.paged.$refs.cri.search()
426
+ let condition = this.$refs.paged.$refs.cri.condition
427
+ console.log(this.model.paramSource)
428
+ this.model.search(condition)
429
+ // this.userSearch()
430
+ },
431
+ // 查询开关
432
+ hidden() {
433
+ this.criteriaShow = !this.criteriaShow
434
+ },
435
+ SaveAsFile(str) {
436
+ this.$showMessage('您是否需要导出本页数据?', ['confirm', 'cancel']).then((res) => {
437
+ if (res === 'confirm') {
438
+ let style = '<style>' +
439
+ 'td {border-width: 1px;padding: 2px;border-style: solid; border-color:black; border-collapse:collapse;} .tdright{text-align: right;} .tdcenter{text-align: center;}</style>';
440
+ let strHtml = style + document.getElementById(str).innerHTML;
441
+ console.log(strHtml);
442
+ let LODOP = getLodop();
443
+ LODOP.PRINT_INIT('');
444
+ LODOP.ADD_PRINT_TABLE(5, 5, '99%', '100%', strHtml);
445
+ LODOP.SAVE_TO_FILE('用气分析.xls')
446
+ }
447
+ })
448
+ },
449
+ clearmsg() {
450
+ this.$refs.paged.$refs.cri.model = {}
451
+ },
452
+ initParams() {
453
+ // 初始化气表品牌
454
+ let brandArr = []
455
+ this.$MagGetSaleParam.getGasbrand().forEach((item) => {
456
+ let temp = {}
457
+ temp.label = item.label
458
+ temp.value = item.value.f_meter_brand
459
+ brandArr.push(temp)
460
+ })
461
+ this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
462
+ },
463
+ getPricenames(model) {
464
+ let f_user_type = model.f_user_type
465
+ let f_gasproperties = model.f_gasproperties
466
+ let f_price_type = model.f_price_type
467
+ console.log('气价。,。。', f_user_type, f_gasproperties, f_price_type)
468
+ let rs = []
469
+ if (f_user_type.length === 1 && f_gasproperties.length === 1 && f_price_type.length === 1) {
470
+ let params = {
471
+ f_user_type: f_user_type[0],
472
+ f_gasproperties: f_gasproperties[0],
473
+ f_price_type: f_price_type[0],
474
+ filter: this.$login.f.f_fengongsi
475
+ }
476
+ rs = this.$GetSaleParam.getPrice(params)
477
+ }
478
+ if (rs.length === 0) {
479
+ // this.row.f_price_name = ''
480
+ } else {
481
+ for (let i = 0; i < rs.length; i++) {
482
+ rs[i].lable = rs[i].lable
483
+ rs[i].value = rs[i].value.f_price_id
484
+ }
485
+ }
486
+ return rs
487
+ },
488
+ search(args) {
489
+ this.model.paramSource.orderitem = this.model.paramSource.orderitem ? this.model.paramSource.orderitem : `'${this.orderDefault}'`
490
+ this.startDate = this.$refs.paged.$refs.cri.model.startDate
491
+ this.endDate = this.$refs.paged.$refs.cri.model.endDate
492
+ if (this.endDate == '' || this.startDate == '') {
493
+ return this.$showMessage("时间区间的开始和结束时间不能为空!")
494
+ }
495
+ // this.condition = this.$refs.paged.$refs.cri.condition + ` ${this.orgCondtionStr}`
496
+ if (this.orgCondtionStr)
497
+ this.condition = this.$refs.paged.$refs.cri.condition
498
+ else
499
+ this.condition = this.$refs.paged.$refs.cri.condition
500
+ args.condition = this.condition
501
+ this.model.search(args.condition, args.model)
502
+ },
503
+ // 显示柱状图
504
+ showEcharts() {
505
+ this.echarts = true
506
+ this.isActiveTotalForm = false
507
+ },
508
+ notShowTotalForm() {
509
+ this.echarts = false
510
+ this.isActiveTotalForm = false
511
+ },
512
+ // 不显示柱状图
513
+ notShowEcharts() {
514
+ this.echarts = false
515
+ this.isActiveTotalForm = false
516
+ },
517
+ // 显示汇总数据表格
518
+ showTotalForm() {
519
+ this.echarts = false
520
+ this.isActiveTotalForm = true
521
+ },
522
+ close() {
523
+ this.show = false
524
+ },
525
+ getRes(obj) {
526
+ this.orgCondtionStr = plugins.convertToIn(obj)
527
+ },
528
+ getorg(obj) {
529
+ this.orgCondtionStr = plugin.convertToIn(obj.resids) ? plugin.convertToIn(obj.resids) : '(' + this.$login.f.orgid + ')'
530
+ }
531
+ // getRes(condition,obj) {
532
+ // this.orgCondtionStr = condition
533
+ // this.orgname = obj.orgnames[0]
534
+ // this.depname = obj.depnames[0]
535
+ // }
536
+ },
537
+ watch: {
538
+ 'data'(val) {
539
+ if (val.f_files_path) {
540
+ this.getFileContent(val.f_files_path)
541
+ } else {
542
+ this.reportStr = null
543
+ }
544
+ }
545
+ },
546
+ computed: {
547
+ Gasusertype() {
548
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
549
+ },
550
+ valveStatus() {
551
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]
552
+ },
553
+ pricetype() {
554
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
555
+ },
556
+ Gasproperties() {
557
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
558
+ },
559
+ f_opera_area() {
560
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('运营区域')]
561
+ },
562
+ f_distinct() {
563
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('行政区域')]
564
+ },
565
+ deviceType() {
566
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('设备类型')]
567
+ },
568
+ // 抄表员下拉框数据
569
+ inputtors() {
570
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表员')]
571
+ }
572
+ }
573
+ }
574
+ </script>
575
+ <style>
576
+ .mystyle {
577
+ float: right;
578
+ padding-right: 10%;
579
+ }
580
+
581
+ .mystyle1 {
582
+ padding-top: 10px;
583
+ }
584
+
585
+ .mystyle2 {
586
+ width: 100%;
587
+ height: 35px;
588
+ /*background: #00A3F0;*/
589
+ padding-left: 15px;
590
+ float: left;
591
+ }
592
+
593
+ .datapanel {
594
+ color: #333;
595
+ background-color: white;
596
+ box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
597
+ padding: 10px 10px 10px 10px;
598
+ border-radius: 15px;
599
+ }
600
+ </style>
@@ -24,6 +24,9 @@ export default function () {
24
24
  Vue.component('user-gas-all', (resolve) => {
25
25
  require(['./components/WebReport/UserGasAll'], resolve)
26
26
  })
27
+ Vue.component('new-user-gas-all', (resolve) => {
28
+ require(['./components/webmeter/DrillData/NewUserGasAll'], resolve)
29
+ })
27
30
  // 报表展示组件(异常统计报表)
28
31
  Vue.component('abnormal-info', (resolve) => {
29
32
  require(['./components/WebReport/AbnormalInfo'], resolve)