manage-client 3.2.138 → 3.2.142

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 (31) hide show
  1. package/.gradle/4.4/fileContent/fileContent.lock +0 -0
  2. package/.gradle/4.4/taskHistory/taskHistory.bin +0 -0
  3. package/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
  4. package/build/dev-server.js +1 -1
  5. package/build/libs/ManageClient-3.1.0-17.jar +0 -0
  6. package/build/tmp/jar/MANIFEST.MF +2 -0
  7. package/package.json +1 -1
  8. package/src/components/SellReport/Cardapplysgas.vue +274 -0
  9. package/src/components/SellReport/GasPropertiesManager.vue +151 -0
  10. package/src/components/SellReport/LeftChart.vue +132 -0
  11. package/src/components/SellReport/MarketMonthChart.vue +162 -0
  12. package/src/components/SellReport/MarketMonthgas.vue +244 -0
  13. package/src/components/WebReport/EchartsBox.vue +54 -34
  14. package/src/components/daping/DataManagement.vue +4 -4
  15. package/src/components/daping/json/dataManage.json +11 -7
  16. package/src/components/qinhua/Pie.vue +18 -8
  17. package/src/components/sale/businessquery/AccountQuery/keyUserGasRanking.vue +165 -0
  18. package/src/components/sale/businessquery/ArrearsQuery.vue +13 -11
  19. package/src/components/sale/businessquery/ChargeQuery.vue +4 -4
  20. package/src/components/sale/businessquery/CollectManage.vue +6 -0
  21. package/src/components/sale/businessquery/CommunityPaymen.vue +1 -1
  22. package/src/components/sale/businessquery/HandGasPropertiesQuery.vue +5 -2
  23. package/src/components/sale/businessquery/NoBusinessQuery.vue +37 -38
  24. package/src/components/sale/businessquery/ResidentialCardQuery.vue +373 -0
  25. package/src/components/sale/config/exportConfig.js +2 -2
  26. package/src/components/sale/filesquery/MeterQuery.vue +21 -1
  27. package/src/components/sale/filesquery/RecordInfoQuery.vue +16 -0
  28. package/src/filiale/qianneng/MeterQuery.vue +21 -1
  29. package/src/filiale/rongcheng/RecordInfoQuery.vue +1 -1
  30. package/src/reportManage.js +18 -0
  31. package/src/saleManage.js +6 -0
@@ -0,0 +1,373 @@
1
+ <template>
2
+ <div id="unit" class="flex-row">
3
+ <div class="basic-main">
4
+ <div class="flex">
5
+ <criteria-paged :model="model" v-ref:paged>
6
+ <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
7
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
8
+ <div class="row">
9
+ <div class="col-sm-2 form-group">
10
+ <label for="startDate" class="font_normal_body">开始日期</label>
11
+ <datepicker id="startDate" placeholder="开始日期" style="width:60%"
12
+ v-model="model.startDate"
13
+ :value.sync="model.startDate"
14
+ :format="'yyyy-MM-dd HH:mm:ss'"
15
+ :show-reset-button="true"
16
+ >
17
+ </datepicker>
18
+ </div>
19
+ <div class="col-sm-2 form-group">
20
+ <label for="endDate" class="font_normal_body">结束日期</label>
21
+ <datepicker id="endDate" placeholder="结束日期" style="width:60%"
22
+ v-model="model.endDate"
23
+ :value.sync="model.endDate"
24
+ :format="'yyyy-MM-dd HH:mm:ss'"
25
+ :show-reset-button="true"
26
+ >
27
+ </datepicker>
28
+ </div>
29
+ <div class="form-group col-sm-2">
30
+ <label class="font_normal_body">选择小区</label>
31
+ <v-select :value.sync="model.f_residential_area" :value-single="true"
32
+ class="select_list select"
33
+ style="width: 60%"
34
+ v-model="model.f_residential_area"
35
+ :options='$parent.$parent.residentialArea' placeholder='选择小区'
36
+ condition="ud.f_residential_area = '{}'"
37
+ close-on-select search="true">
38
+ </v-select>
39
+ </div>
40
+ <div class="span" style="float:right;">
41
+ <button class="button_search button_spacing" @click="search">查询</button>
42
+ <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
43
+
44
+ <export-excel :data="$parent.$parent.getCondition"
45
+ :field="$parent.$parent.getfield"
46
+ :footer="$parent.$parent.footer"
47
+ :header="$parent.$parent.other"
48
+ sqlurl="rs/logic/exportfile"
49
+ sql-name="residentialCardQuery"
50
+ template-name='小区综合查询(卡表)导出'
51
+ :choose-col="true"></export-excel>
52
+ <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
53
+ :defaultfield="$parent.$parent.defaultfield"
54
+ titletable="小区综合查询(卡表)导出"
55
+ :sumsmodel="$parent.$parent.sumsmodel"></print-data>
56
+ <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>
57
+
58
+ </div>
59
+ </div>
60
+ <div class="row" v-show="$parent.$parent.criteriaShow">
61
+ <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
62
+ <div class="col-sm-2 form-group">
63
+ <label class="font_normal_body" >抄&nbsp;&nbsp;表&nbsp;员</label>
64
+ <v-select :value.sync="model.f_inputtor"
65
+ v-model="model.f_inputtor"
66
+ :options='$parent.$parent.inputtores' placeholder='请选择'
67
+ condition="f_inputtor = '{}'"
68
+ close-on-select :search="false">
69
+ </v-select>
70
+ </div>
71
+ <div class="col-sm-2 form-group">
72
+ <label class="font_normal_body">抄&ensp;表&ensp;册</label>
73
+ <v-select :value.sync="model.f_meter_book" v-model="model.f_meter_book"
74
+ :options='$parent.$parent.meterbooks' placeholder='抄表册'
75
+ style="width:60%"
76
+ close-on-select
77
+ condition="f_meter_book_num = '{}'"></v-select>
78
+ </div>
79
+ <div class="col-sm-2 form-group">
80
+ <label class="font_normal_body">气表品牌</label>
81
+ <v-select :value.sync="model.f_meter_brand" multiple
82
+ v-model="model.f_meter_brand"
83
+ :options='$parent.$parent.meterbrands' placeholder='请选择'
84
+ condition="f_meter_brand in {}"
85
+ close-on-select></v-select>
86
+ </div>
87
+ <!--<div class="col-sm-2 form-group" v-for="con in $parent.$parent.config.conditions">-->
88
+ <!--<label class="font_normal_body">{{con.label}}</label>-->
89
+ <!--<input type="text" style="width:60%" class="input_search" v-model="model[con.value]"-->
90
+ <!--condition= " '{}' = {{con.value}}" placeholder="{{con.label}}">-->
91
+ <!--</div>-->
92
+ </div>
93
+ </div>
94
+ </criteria>
95
+ <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid >
96
+ <template partial='head'>
97
+ <tr>
98
+ <th v-for="(key,value ) in $parent.$parent.$parent.config.pageFilds" ><nobr>{{value}}</nobr></th>
99
+ </tr>
100
+ </template>
101
+ <template partial='body'>
102
+ <td style="text-align: center;" v-for="(key,value ) in $parent.$parent.$parent.config.pageFilds"><nobr>{{row[key]}}</nobr></td>
103
+ </template>
104
+ <template partial='foot'></template>
105
+ </data-grid>
106
+ </criteria-paged>
107
+ <table class="table-hover">
108
+ <tr style="position: relative" class="table-bordered">
109
+ <td
110
+ style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
111
+ 汇总信息
112
+ </td>
113
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
114
+ 户数合计:&emsp;{{sumsmodel.hushu}}
115
+ </td>
116
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
117
+ 新建户数合计:&emsp;{{sumsmodel.xinhushu}}
118
+ </td>
119
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
120
+ 用气金额合计:&emsp;{{sumsmodel.f_pregas}}
121
+ </td>
122
+ </tr>
123
+ </table>
124
+ </div>
125
+ </div>
126
+ </div>
127
+ </template>
128
+
129
+ <script>
130
+ import {PagedList, HttpResetClass} from 'vue-client'
131
+ import defaultPrint from '../config/DefaultPrint'
132
+ import exportConfig from "../config/exportConfig";
133
+ import plugins from "../../../plugins/GetLoginInfoService";
134
+
135
+ let readySomething = async function (self) {
136
+ self.initParams()
137
+ self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
138
+ //加载抄表册
139
+ self.$MagGetSaleParam.initinputtor();
140
+ self.getinputtores();
141
+ self.initmeterbook();
142
+
143
+
144
+
145
+ self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
146
+ self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
147
+ // await self.$refs.paged.$refs.cri.search()
148
+ await self.$MagLoadParams.loadParam()
149
+ await self.$getConfig(self, 'ResidentialCardQuery')
150
+
151
+ self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
152
+ }
153
+
154
+ export default {
155
+ title: '小区汇总',
156
+ data() {
157
+ let model = new PagedList('rs/sql/residentialCardQuery', 20, {
158
+ startdate: 'this.model.startDate',
159
+ enddate: 'this.model.endDate'
160
+ },{
161
+ hushu:0,
162
+ xinhushu:0,
163
+ f_pregas:0
164
+ })
165
+ model.f_filialeid = this.$login.f.orgid
166
+ return {
167
+ //默认打印列
168
+ defaultfield: [],
169
+ config: {
170
+ pageFilds:{
171
+ 'f_residential_area': '小区', 'hushu': '户数', 'xinhushu': '新建户数', 'f_pregas': '购气量'
172
+ },
173
+ defaultPrint: ['xinhushu', 'hushu', 'f_pregas']
174
+ },
175
+ data: {},
176
+ other: [],
177
+ footer: [],
178
+ meterbrands: [],
179
+ initres: {
180
+ org:[this.$login.f.orgid],
181
+ dep:[],
182
+ user:[]
183
+ },
184
+ model: model,
185
+ criteriaShow: false,
186
+ f_filialeid: this.$login.f.orgid,
187
+ orgid: [this.$login.f.orgid],
188
+ //小区
189
+ residentialArea: [],
190
+ orgCondtionStr: '',
191
+ //合计数据
192
+ sumsmodel:{},
193
+ meterbooks:[{label: '全部',value: ''}], //抄表册
194
+ inputtores:[{label: '全部',value: ''}],
195
+ allorgid:[],
196
+ tempfalg :false,
197
+ lastorgstr:'',
198
+ }
199
+ },
200
+ ready() {
201
+ this.getaddress()
202
+ readySomething(this).then(() => {
203
+ this.$emit('ready')
204
+ }).catch((error) => {
205
+ this.$emit('error', error)
206
+ })
207
+ },
208
+ methods: {
209
+ async initParams() {
210
+ // 初始化气表品牌
211
+ let brandArr = []
212
+ this.$MagGetSaleParam.getGasbrand().forEach((item) => {
213
+ let temp = {}
214
+ temp.label = item.label
215
+ temp.value = item.value.f_meter_brand
216
+ brandArr.push(temp)
217
+ })
218
+ this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
219
+ },
220
+ async initmeterbook(orgstr){
221
+ if(orgstr == null ){
222
+ orgstr = this.f_filialeid;
223
+ }
224
+ //获取新的抄表册,先去清理所有的抄表册
225
+ this.$MagGetSaleParam.meterbooks = [];
226
+ //开始加载新的抄表册
227
+ await this.$MagGetSaleParam.loadMeterBook(orgstr)
228
+ this.meterbooks = [{label: '全部', value: ''}, ...this.$MagGetSaleParam.getMeterBooks()]
229
+ },
230
+ async updateParams() {
231
+ await this.$MagLoadParams.loadParam(this.f_filialeid)
232
+ this.inputtores = [];
233
+ this.inputtores.push({label: "全部", value: ""})
234
+ if(this.allorgid!=null){
235
+ this.allorgid.forEach((res)=>{
236
+ this.inputtores = this.inputtores.concat(this.$MagGetSaleParam.getresinputtor(res));
237
+ })
238
+ }
239
+ },
240
+ getinputtores() {
241
+ // 获取抄表员
242
+ let rs = []
243
+ if (this.$login.f.f_gasman.length > 0) {
244
+ for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
245
+ let temp = {
246
+ label: this.$login.f.f_gasman[i].name,
247
+ value: this.$login.f.f_gasman[i].name
248
+ }
249
+ rs.push(temp)
250
+ }
251
+ }
252
+
253
+ return [{label: '全部', value: ''}, ...rs]
254
+ },
255
+ //加载抄表册
256
+ loadMeterBooks(){
257
+ this.meterbooks = [{label: '全部', value: ''}, ...this.$MagGetSaleParam.getMeterBooks()]
258
+ },
259
+ getotherfooter() {
260
+ // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
261
+ // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
262
+ this.other = [];
263
+ this.footer = [];
264
+ let exportdata = this.getCondition;
265
+ let otherInData = [];
266
+ otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
267
+ let footerData = [], exportfield = this.getfield;
268
+ footerData.push("合计");
269
+ let self = this;
270
+ for (var field in self.sumsmodel) {
271
+ footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
272
+ }
273
+ this.footer.push(footerData);
274
+ this.other.push(otherInData);
275
+ },
276
+ async getaddress() {
277
+ console.log('开始获取小区')
278
+ let HttpReset = new HttpResetClass()
279
+ var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
280
+ data: {
281
+ condition: `1=1 and s.f_filialeid = '${this.$login.f.orgid}'`
282
+ }
283
+ }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
284
+ console.log('小区', data)
285
+ let house = [{label: '全部', value: ''}]
286
+ for (let row of data.data) {
287
+ console.log('开始保存小区')
288
+ house.push({label: row.f_residential_area, value: row.f_residential_area})
289
+ }
290
+ this.residentialArea = house
291
+ },
292
+ selfSearch(args) {
293
+ // if (this.orgCondtionStr)
294
+ // args.condition = `${args.condition}` + 'and f_filialeid in ' + this.orgCondtionStr
295
+ // else
296
+ // args.condition = `${args.condition}` + 'and f_filialeid in ' + '(' + this.$login.f.orgid + ')'
297
+ debugger
298
+ args.condition = `${args.condition}` + this.orgCondtionStr
299
+ this.model.search(args.condition, args.model)
300
+ this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
301
+ },
302
+ async getRes(condition,obj) {
303
+ console.log(condition,"========")
304
+ this.orgCondtionStr = condition
305
+
306
+ },
307
+ clear() {
308
+ Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
309
+ this.$refs.paged.$refs.cri.model[key] = []
310
+ })
311
+ },
312
+ hidden() {
313
+ this.criteriaShow = !this.criteriaShow
314
+ }
315
+ },
316
+ watch: {
317
+ sumsmodel: {
318
+ handler: function (val) {
319
+ this.getotherfooter();
320
+ },
321
+ deep: true
322
+ },
323
+ async 'orgCondtionStr'(val) {
324
+ this.$refs.paged.$refs.cri.model.f_inputtor = []
325
+ this.$refs.paged.$refs.cri.model.f_meter_book = []
326
+ this.meterbooks = [{label: '全部',value: ''}];
327
+ if(this.lastorgstr != val){
328
+ this.tempfalg = true;
329
+ this.lastorgstr = val;
330
+ }
331
+ if(this.tempfalg && val != null && val!='' && val.indexOf("(")>-1){
332
+ this.tempfalg = false;
333
+ let a = val.substring(val.indexOf("(")+2)
334
+ await this.initmeterbook(a.substring(0,a.indexOf(")")-1));
335
+ }
336
+ let res = val.match(/'(.*?)'/)
337
+ if (res) {
338
+ this.f_filialeid = res[1]
339
+ if(res.input !=null){
340
+ let resorgid = res.input.substring(res.input.indexOf("'"));
341
+ if(resorgid!= null && resorgid!=''){
342
+ resorgid = resorgid.substring(0,resorgid.lastIndexOf("'")+1);
343
+ // resorgid = resorgid.replaceAll("'","");
344
+ resorgid = resorgid.replace(/'/g,"");
345
+ this.allorgid = resorgid.split(",")
346
+ }
347
+ }
348
+ this.updateParams()
349
+ }
350
+ }
351
+ },
352
+ computed: {
353
+
354
+ getCondition() {
355
+ var con = ""
356
+ if (this.orgCondtionStr) {
357
+ con = `${this.$refs.paged.$refs.cri.condition} ` + this.orgCondtionStr
358
+ } else {
359
+ con = `${this.$refs.paged.$refs.cri.condition}`
360
+ }
361
+ return {
362
+ startdate: this.$refs.paged.$refs.cri.model.startDate,
363
+ enddate: this.$refs.paged.$refs.cri.model.endDate,
364
+ condition: con
365
+ }
366
+ },
367
+ getfield() {
368
+ return exportConfig.ResidentialQuery
369
+ }
370
+ }
371
+
372
+ }
373
+ </script>
@@ -51,7 +51,7 @@ export default{
51
51
  'f_balance_amount': '表上余额', 'f_user_type': '客户类型', 'f_usetype': '使用类型', 'f_gasproperties': '用气性质',
52
52
  'f_meternumber': '表号', 'f_card_id': '卡号', 'f_price_name': '气价名称', 'value': '气价详情', 'f_meter_brand': '气表品牌',
53
53
  'f_meter_style': '气表型号', 'f_inputtor': '户管员', 'f_gas_person': '通气人', 'f_gas_date': '通气时间',
54
- 'f_input_date': '建表时间', 'f_table_state': '气表状态', 'isbgl': '是否壁挂炉'
54
+ 'f_input_date': '建表时间', 'f_table_state': '气表状态', 'isbgl': '是否壁挂炉', 'f_networkvalve': '自动阀控'
55
55
  },
56
56
  ResidentialQuery: {
57
57
  'f_residential_area': '小区', 'hushu': '户数', 'xinhushu': '新建户数', 'f_oughtfee': '用气金额', 'f_oughtamount': '用气量',
@@ -224,7 +224,7 @@ export default{
224
224
  'f_balance_amount': '表剩余金额', 'f_times': '写卡次数',
225
225
  'f_fillcard_times': '补卡次数', 'f_sendsuccess': '表同步状态', 'f_isband': '微信绑定', 'f_cost_type': '缴费类型'
226
226
  , 'f_bank_accopen': '银行户名', 'f_bank_name': '银行名称', 'f_bank_account': '银行账号',
227
- 'f_bank_idnumber': '银行身份证号', 'f_bank_pay_number': '缴费编号', 'f_maxdate': '换表时间', 'f_devices_type': '灶具信息'
227
+ 'f_bank_idnumber': '银行身份证号', 'f_bank_pay_number': '缴费编号', 'f_maxdate': '换表时间', 'f_devices_type': '灶具信息', 'f_network_valve': '自动阀控'
228
228
  },
229
229
 
230
230
  compreConfigGY: {
@@ -244,6 +244,19 @@
244
244
  close-on-select
245
245
  condition="f_meter_book_num = '{}'"></v-select>
246
246
  </div>
247
+ <div class="col-sm-2 form-group">
248
+ <label class="font_normal_body">自动阀控</label>
249
+ <v-select
250
+ placeholder='自动阀控'
251
+
252
+ :value.sync="model.f_network_valve"
253
+ style="width:60%"
254
+ v-model="model.f_network_valve"
255
+ :options='$parent.$parent.networkvalves'
256
+ close-on-select
257
+ condition="f_networkvalve='{}'">
258
+ </v-select>
259
+ </div>
247
260
 
248
261
  </div>
249
262
  </div>
@@ -330,6 +343,9 @@
330
343
  <th>
331
344
  <nobr>是否壁挂炉</nobr>
332
345
  </th>
346
+ <th>
347
+ <nobr>自动阀控</nobr>
348
+ </th>
333
349
  </tr>
334
350
  </template>
335
351
  <template partial='body'>
@@ -407,6 +423,9 @@
407
423
  <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
408
424
  <nobr>{{row.isbgl}}</nobr>
409
425
  </td>
426
+ <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
427
+ <nobr>{{row.f_networkvalve}}</nobr>
428
+ </td>
410
429
  </template>
411
430
  <template partial='foot'>
412
431
  </template>
@@ -556,7 +575,8 @@
556
575
  tempfalg :false,
557
576
  lastorgstr:'',
558
577
  issecond: [{label:'是',value:" = '二次挂表'"},{label:'否',value:" <> '二次挂表'"}],
559
- usetype:this.$appdata.getParam('使用类型')
578
+ usetype:this.$appdata.getParam('使用类型'),
579
+ networkvalves: this.$appdata.getParam('自动阀控') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('自动阀控')] : []
560
580
  }
561
581
  },
562
582
  ready() {
@@ -441,6 +441,19 @@
441
441
  condition="f_install_person in {}"
442
442
  v-el:cc></v-select>
443
443
  </div>
444
+ <div class="col-sm-2 form-group">
445
+ <label class="font_normal_body">自动阀控</label>
446
+ <v-select
447
+ placeholder='自动阀控'
448
+
449
+ :value.sync="model.f_network_valve"
450
+ style="width:60%"
451
+ v-model="model.f_network_valve"
452
+ :options='$parent.$parent.networkvalves'
453
+ close-on-select
454
+ condition="f_network_valve='{}'">
455
+ </v-select>
456
+ </div>
444
457
  </div>
445
458
  </div>
446
459
  </criteria>
@@ -496,6 +509,7 @@
496
509
  </th>
497
510
  <!--<th><nobr>最后购气日期</nobr></th>-->
498
511
 
512
+ <th><nobr>自动阀控</nobr></th>
499
513
  <th><nobr>阀门状态</nobr></th>
500
514
 
501
515
  <!-- <th><nobr>旧客户编号</nobr></th> -->
@@ -627,6 +641,7 @@
627
641
  <td style="text-align: center;"><nobr>{{row.f_balance}}</nobr></td>
628
642
  <td style="text-align: center;"><nobr>{{row.f_hand_date}}</nobr></td>
629
643
  <!-- <td style="text-align: center;"><nobr>{{row.f_max_operate_date}}</nobr></td>-->
644
+ <td style="text-align: center;"><nobr>{{row.f_network_valve}}</nobr></td>
630
645
  <td style="text-align: center;"><nobr>{{row.f_valve_state}}</nobr></td>
631
646
 
632
647
  <!-- <td style="text-align: center;"><nobr>{{row.f_olduserinfo_code}}</nobr></td>-->
@@ -837,6 +852,7 @@
837
852
  bookSlice:[{label: '全部',value: ''}],
838
853
  pricenames:[],
839
854
  dypayment:[{label:"全部",value:""},{label:"银行代扣",value:"银行代扣",},{label:"现金缴费",value:"现金缴费",}],
855
+ networkvalves: this.$appdata.getParam('自动阀控') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('自动阀控')] : [],
840
856
  }
841
857
  },
842
858
  ready(){
@@ -198,6 +198,19 @@
198
198
  condition="isbgl = '{}'"
199
199
  close-on-select></v-select>
200
200
  </div>
201
+ <div class="col-sm-2 form-group">
202
+ <label class="font_normal_body">自动阀控</label>
203
+ <v-select
204
+ placeholder='自动阀控'
205
+
206
+ :value.sync="model.f_network_valve"
207
+ style="width:60%"
208
+ v-model="model.f_network_valve"
209
+ :options='$parent.$parent.networkvalves'
210
+ close-on-select
211
+ condition="f_networkvalve='{}'">
212
+ </v-select>
213
+ </div>
201
214
  <!--<div class="col-sm-2 form-group">-->
202
215
  <!--<label class="font_normal_body" title="旧客户编号">档案编号</label>-->
203
216
  <!--<input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"-->
@@ -379,6 +392,9 @@
379
392
  <th>
380
393
  <nobr>防盗卡号2</nobr>
381
394
  </th>
395
+ <th>
396
+ <nobr>自动阀控</nobr>
397
+ </th>
382
398
  </tr>
383
399
  </template>
384
400
  <template partial='body'>
@@ -475,6 +491,9 @@
475
491
  <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
476
492
  <nobr>{{row.f_defendcard_two}}</nobr>
477
493
  </td>
494
+ <td :class="row.f_table_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
495
+ <nobr>{{row.f_networkvalve}}</nobr>
496
+ </td>
478
497
  </template>
479
498
  <template partial='foot'>
480
499
  </template>
@@ -624,7 +643,8 @@
624
643
  tempfalg :false,
625
644
  lastorgstr:'',
626
645
  issecond: [{label:'是',value:" = '二次挂表'"},{label:'否',value:" <> '二次挂表'"}],
627
- usetype:this.$appdata.getParam('使用类型')
646
+ usetype:this.$appdata.getParam('使用类型'),
647
+ networkvalves: this.$appdata.getParam('自动阀控') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('自动阀控')] : []
628
648
  }
629
649
  },
630
650
  ready() {
@@ -516,7 +516,7 @@
516
516
  <script>
517
517
  import {HttpResetClass, PagedList} from 'vue-client'
518
518
  import defaultPrint from './../../components/sale/config/DefaultPrint'
519
- import exportConfig from './../../components/sale/config/exportConfig'
519
+ import exportConfig from './exportConfig'
520
520
 
521
521
  let readySomething = async function (self) {
522
522
  self.initParams()
@@ -85,6 +85,10 @@ export default function (filiale) {
85
85
  Vue.component('site-manager', (resolve) => {
86
86
  require(['./components/SellReport/SiteManager'], resolve)
87
87
  })
88
+ // 用气性质散列图
89
+ Vue.component('gas-properties-manager', (resolve) => {
90
+ require(['./components/SellReport/GasPropertiesManager'], resolve)
91
+ })
88
92
 
89
93
  /** **************************营收模块(SellReport)******************************/
90
94
  // 报表相关,所属为抄表员汇总表(实际为报表汇总表,功能名称后期改变),调整找那个,尚未归类
@@ -591,6 +595,20 @@ export default function (filiale) {
591
595
  Vue.component('applys-gas-fill-money', (resolve) => {
592
596
  require(['./components/SellReport/applysFillmoney'], resolve)
593
597
  })
598
+ // 月度用气性质使用占比报表
599
+ Vue.component('market-month-gas', (resolve) => {
600
+ require(['./components/SellReport/MarketMonthgas'], resolve)
601
+ })
602
+ Vue.component('left-chart', (resolve) => {
603
+ require(['./components/SellReport/LeftChart'], resolve)
604
+ })
605
+ Vue.component('market-month-chart', (resolve) => {
606
+ require(['./components/SellReport/MarketMonthChart'], resolve)
607
+ })
608
+ // 卡表抄表气价报表
609
+ Vue.component('card-applys-gas', (resolve) => {
610
+ require(['./components/SellReport/Cardapplysgas'], resolve)
611
+ })
594
612
  if (filiale) {
595
613
  let filialeComp = require(`./filiale/${filiale}/reportManage`).specialComp
596
614
  Vue.filialeInfo = Vue.prototype.$filialeInfo = filiale
package/src/saleManage.js CHANGED
@@ -174,6 +174,10 @@ export default function (filiale) {
174
174
  Vue.component('residential-query', (resolve) => {
175
175
  require(['./components/sale/businessquery/ResidentialQuery'], resolve)
176
176
  })
177
+ // 小区汇总(卡表)
178
+ Vue.component('residential-card-query', (resolve) => {
179
+ require(['./components/sale/businessquery/ResidentialCardQuery'], resolve)
180
+ })
177
181
  // 小区欠费汇总(机表)
178
182
  Vue.component('residential-arrears-query', (resolve) => {
179
183
  require(['./components/sale/businessquery/ResidentialArrearsQuery'], resolve)
@@ -582,6 +586,8 @@ export default function (filiale) {
582
586
  Vue.component('report-detail', (resolve) => { require(['./components/sale/businessquery/reportDetail'], resolve) })
583
587
  // 分公司选择新组件,默认全选
584
588
  Vue.component('res-select-new', (resolve) => { require(['./filiale/tongchuan/ResSelectNew'], resolve) })
589
+ // 重点用户用气排行查询
590
+ Vue.component('key-user-gas-ranking', (resolve) => { require(['./components/sale/businessquery/AccountQuery/keyUserGasRanking'], resolve) })
585
591
  // 分公司特殊页面注册替换
586
592
  if (filiale) {
587
593
  let filialeComp = require(`./filiale/${filiale}/sale`).specialComp