manage-client 3.3.224 → 3.3.225
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 +1 -1
- package/src/components/sale/businessquery/FMYGasQuery.vue +59 -0
- package/src/components/sale/businessquery/chargeRecordMaintenanceQuery.vue +1 -1
- package/src/components/sale/config/exportConfig.js +1 -0
- package/src/filiale/WEINAN/ManageCompanyGasSummary.vue +1 -1
- package/src/filiale/WEINAN/ManageSummaryReport.vue +2 -2
- package/src/filiale/WEINAN/RecordInfoQuery.vue +2 -2
- package/src/filiale/WEINAN/businessquery/WallHangingFurnaceUserQuery.vue +1 -1
- package/src/filiale/jingwei/RecordInfoQuery.vue +28 -3
- package/src/filiale/jingwei/config/exportConfig.js +1 -1
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +0 -2
- package/.gradle/vcs-1/gc.properties +0 -0
package/package.json
CHANGED
|
@@ -152,6 +152,24 @@
|
|
|
152
152
|
condition="f_gasproperties in {}">
|
|
153
153
|
</v-select>
|
|
154
154
|
</div>
|
|
155
|
+
<div class="col-sm-2 form-group">
|
|
156
|
+
<label class="font_normal_body">气价类型</label>
|
|
157
|
+
<v-select :value.sync="model.pricetype" v-model="model.pricetype"
|
|
158
|
+
@change="$parent.$parent.pricetypechanged"
|
|
159
|
+
placeholder='气价类型' :options="$parent.$parent.pricetypes"
|
|
160
|
+
close-on-select v-ref:type>
|
|
161
|
+
</v-select>
|
|
162
|
+
</div>
|
|
163
|
+
<div class="col-sm-2 form-group">
|
|
164
|
+
<label class="font_normal_body">气价名称</label>
|
|
165
|
+
<v-select :value.sync="model.f_price_name"
|
|
166
|
+
v-model="model.f_price_name"
|
|
167
|
+
multiple
|
|
168
|
+
:options="$parent.$parent.pricenames"
|
|
169
|
+
condition="f_price_name in {}"
|
|
170
|
+
></v-select>
|
|
171
|
+
</div>
|
|
172
|
+
|
|
155
173
|
<!--表册片区-->
|
|
156
174
|
<div class="col-sm-2 form-group">
|
|
157
175
|
<label class="font_normal_body">表册片区</label>
|
|
@@ -261,6 +279,9 @@
|
|
|
261
279
|
<th>
|
|
262
280
|
<nobr>气表类型</nobr>
|
|
263
281
|
</th>
|
|
282
|
+
<th>
|
|
283
|
+
<nobr>气价名称</nobr>
|
|
284
|
+
</th>
|
|
264
285
|
<th>
|
|
265
286
|
<nobr>气价详情</nobr>
|
|
266
287
|
</th>
|
|
@@ -348,6 +369,9 @@
|
|
|
348
369
|
<td style="text-align: center;">
|
|
349
370
|
<nobr>{{row.f_meter_classify}}</nobr>
|
|
350
371
|
</td>
|
|
372
|
+
<td style="text-align: center;">
|
|
373
|
+
<nobr>{{row.f_price_name}}</nobr>
|
|
374
|
+
</td>
|
|
351
375
|
<td style="text-align: center;">
|
|
352
376
|
<nobr>{{row.f_price_value}}</nobr>
|
|
353
377
|
</td>
|
|
@@ -483,6 +507,7 @@ import exportConfig from '../config/exportConfig'
|
|
|
483
507
|
residentialArea: [],
|
|
484
508
|
f_filialeid: this.$login.f.orgid,
|
|
485
509
|
show: false,
|
|
510
|
+
pricenames: [],
|
|
486
511
|
rowdata: {},
|
|
487
512
|
criteriaShow: false,
|
|
488
513
|
orgCondtionStr: '',
|
|
@@ -648,6 +673,37 @@ import exportConfig from '../config/exportConfig'
|
|
|
648
673
|
this.gasproperties = [{label: '全部', value: ''}]
|
|
649
674
|
}
|
|
650
675
|
},
|
|
676
|
+
async pricetypechanged(){
|
|
677
|
+
this.$refs.paged.$refs.cri.model.f_price_name = []
|
|
678
|
+
this.pricenames = []
|
|
679
|
+
if (this.$refs.paged.$refs.cri.model.pricetype) {
|
|
680
|
+
let http = new HttpResetClass()
|
|
681
|
+
let param = {
|
|
682
|
+
items: 'f_price_name',
|
|
683
|
+
tablename: 't_stairprice',
|
|
684
|
+
condition: `f_price_type = '${this.$refs.paged.$refs.cri.model.pricetype[0]}' and f_orgid = '${this.$login.f.orgid}'`,
|
|
685
|
+
orderitem: 'id'
|
|
686
|
+
}
|
|
687
|
+
var res = await http.load('POST', 'api/af-revenue/sql/manage_singleTable', {data: param}, {resolveMsg: null, rejectMsg: '获取设备列表失败!'})
|
|
688
|
+
let uniqueMap = {}
|
|
689
|
+
let arr = []
|
|
690
|
+
for (var i = 0; i < res.data.length; i++) {
|
|
691
|
+
let item = res.data[i];
|
|
692
|
+
if (!uniqueMap[item.f_price_name]) {
|
|
693
|
+
arr.push(item);
|
|
694
|
+
uniqueMap[item.f_price_name] = true;
|
|
695
|
+
}
|
|
696
|
+
}
|
|
697
|
+
console.log('arr',arr)
|
|
698
|
+
if (arr.length > 0) {
|
|
699
|
+
arr.forEach(row => {
|
|
700
|
+
this.pricenames.push({label: row.f_price_name,value: row.f_price_name})
|
|
701
|
+
})
|
|
702
|
+
} else {
|
|
703
|
+
this.pricenames.push({label: '全部', value: ''})
|
|
704
|
+
}
|
|
705
|
+
}
|
|
706
|
+
},
|
|
651
707
|
search () {
|
|
652
708
|
this.$refs.paged.$refs.cri.search()
|
|
653
709
|
},
|
|
@@ -756,6 +812,9 @@ import exportConfig from '../config/exportConfig'
|
|
|
756
812
|
getfield () {
|
|
757
813
|
return exportConfig.fmygasConfig
|
|
758
814
|
},
|
|
815
|
+
pricetypes() {
|
|
816
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
|
|
817
|
+
},
|
|
759
818
|
usertypes () {
|
|
760
819
|
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
|
|
761
820
|
},
|
|
@@ -190,7 +190,7 @@ export default {
|
|
|
190
190
|
condition = ` f_residential_area like '%${searchText}%' `
|
|
191
191
|
}
|
|
192
192
|
let HttpReset = new HttpResetClass()
|
|
193
|
-
HttpReset.load('POST', 'api/af-revenue/sql/
|
|
193
|
+
HttpReset.load('POST', 'api/af-revenue/sql/manageSingleTable?pageNo=1&pageSize=100', {
|
|
194
194
|
data: {
|
|
195
195
|
items: 'f_residential_area, id',
|
|
196
196
|
tablename: 't_area',
|
|
@@ -333,7 +333,7 @@ export default {
|
|
|
333
333
|
// condition = ` f_company_name like '%${searchText}%' `
|
|
334
334
|
// }
|
|
335
335
|
// let HttpReset = new HttpResetClass()
|
|
336
|
-
// HttpReset.load('POST', 'api/af-revenue/sql/
|
|
336
|
+
// HttpReset.load('POST', 'api/af-revenue/sql/manageSingleTable?pageNo=1&pageSize=100', {
|
|
337
337
|
// data: {
|
|
338
338
|
// items: 'f_company_name, id',
|
|
339
339
|
// tablename: 't_company',
|
|
@@ -413,7 +413,7 @@ export default {
|
|
|
413
413
|
condition = ` f_company_name like '%${searchText}%' `
|
|
414
414
|
}
|
|
415
415
|
let HttpReset = new HttpResetClass()
|
|
416
|
-
HttpReset.load('POST', 'api/af-revenue/sql/
|
|
416
|
+
HttpReset.load('POST', 'api/af-revenue/sql/manageSingleTable?pageNo=1&pageSize=100', {
|
|
417
417
|
data: {
|
|
418
418
|
items: 'f_company_name, id',
|
|
419
419
|
tablename: 't_company',
|
|
@@ -437,7 +437,7 @@ export default {
|
|
|
437
437
|
condition = ` f_residential_area like '%${searchText}%' `
|
|
438
438
|
}
|
|
439
439
|
let HttpReset = new HttpResetClass()
|
|
440
|
-
HttpReset.load('POST', 'api/af-revenue/sql/
|
|
440
|
+
HttpReset.load('POST', 'api/af-revenue/sql/manageSingleTable?pageNo=1&pageSize=100', {
|
|
441
441
|
data: {
|
|
442
442
|
items: 'f_residential_area, id',
|
|
443
443
|
tablename: 't_area',
|
|
@@ -823,7 +823,7 @@
|
|
|
823
823
|
condition = ` f_company_name like '%${searchText}%' `
|
|
824
824
|
}
|
|
825
825
|
let HttpReset = new HttpResetClass()
|
|
826
|
-
HttpReset.load('POST', 'api/af-revenue/sql/
|
|
826
|
+
HttpReset.load('POST', 'api/af-revenue/sql/manageSingleTable?pageNo=1&pageSize=100', {
|
|
827
827
|
data: {
|
|
828
828
|
items: 'f_company_name, id',
|
|
829
829
|
tablename: 't_company',
|
|
@@ -923,7 +923,7 @@
|
|
|
923
923
|
condition = ` f_residential_area like '%${searchText}%' `
|
|
924
924
|
}
|
|
925
925
|
let HttpReset = new HttpResetClass()
|
|
926
|
-
HttpReset.load('POST', 'api/af-revenue/sql/
|
|
926
|
+
HttpReset.load('POST', 'api/af-revenue/sql/manageSingleTable?pageNo=1&pageSize=100', {
|
|
927
927
|
data: {
|
|
928
928
|
items: 'f_residential_area, id',
|
|
929
929
|
tablename: 't_area',
|
|
@@ -254,7 +254,7 @@ export default {
|
|
|
254
254
|
condition = ` f_residential_area like '%${searchText}%' `
|
|
255
255
|
}
|
|
256
256
|
let HttpReset = new HttpResetClass()
|
|
257
|
-
HttpReset.load('POST', 'api/af-revenue/sql/
|
|
257
|
+
HttpReset.load('POST', 'api/af-revenue/sql/manageSingleTable?pageNo=1&pageSize=100', {
|
|
258
258
|
data: {
|
|
259
259
|
items: 'f_residential_area, id',
|
|
260
260
|
tablename: 't_area',
|
|
@@ -347,6 +347,26 @@
|
|
|
347
347
|
close-on-select>
|
|
348
348
|
</v-select>
|
|
349
349
|
</div>
|
|
350
|
+
<div class="col-sm-2 form-group" >
|
|
351
|
+
<label for="startDate4" class="font_normal_body" title="最后缴费日期">最后缴费日期</label>
|
|
352
|
+
<datepicker id="startDate4" placeholder="开始日期" style="width:52%"
|
|
353
|
+
v-model="model.startDate4"
|
|
354
|
+
:value.sync="model.startDate4"
|
|
355
|
+
:format="'yyyy-MM-dd'"
|
|
356
|
+
:show-reset-button="true"
|
|
357
|
+
condition="f_last_gas_date >= '{} 00:00:00'">
|
|
358
|
+
</datepicker>
|
|
359
|
+
</div>
|
|
360
|
+
<div class="col-sm-2 form-group" >
|
|
361
|
+
<label for="endDate4" class="font_normal_body" title="最后缴费日期">最后缴费日期</label>
|
|
362
|
+
<datepicker id="endDate4" placeholder="结束日期" style="width:52%"
|
|
363
|
+
v-model="model.endDate4"
|
|
364
|
+
:value.sync="model.endDate4"
|
|
365
|
+
:format="'yyyy-MM-dd'"
|
|
366
|
+
:show-reset-button="true"
|
|
367
|
+
condition="f_last_gas_date <= '{} 23:59:59'">
|
|
368
|
+
</datepicker>
|
|
369
|
+
</div>
|
|
350
370
|
</div>
|
|
351
371
|
|
|
352
372
|
</div>
|
|
@@ -442,7 +462,7 @@
|
|
|
442
462
|
|
|
443
463
|
<th><nobr>抄表册顺序</nobr></th>
|
|
444
464
|
<th><nobr>表剩余金额</nobr></th>
|
|
445
|
-
|
|
465
|
+
<!-- <th><nobr>首次购气日期</nobr></th>-->
|
|
446
466
|
<th><nobr>写卡次数</nobr></th>
|
|
447
467
|
<th><nobr>补卡次数</nobr></th>
|
|
448
468
|
<!-- <th><nobr>购气次数</nobr></th>-->
|
|
@@ -471,6 +491,9 @@
|
|
|
471
491
|
<th>
|
|
472
492
|
<nobr>换表时间</nobr>
|
|
473
493
|
</th>
|
|
494
|
+
<th>
|
|
495
|
+
<nobr>最后缴费日期</nobr>
|
|
496
|
+
</th>
|
|
474
497
|
<th>
|
|
475
498
|
<nobr>灶具信息</nobr>
|
|
476
499
|
</th>
|
|
@@ -508,7 +531,7 @@
|
|
|
508
531
|
<td style="text-align: center;"><nobr>{{row.f_meter_base}}</nobr></td>
|
|
509
532
|
<td style="text-align: center;"><nobr>{{row.f_balance}}</nobr></td>
|
|
510
533
|
<td style="text-align: center;"><nobr>{{row.f_hand_date}}</nobr></td>
|
|
511
|
-
|
|
534
|
+
<!-- <td style="text-align: center;"><nobr>{{row.f_max_operate_date}}</nobr></td>-->
|
|
512
535
|
<td style="text-align: center;"><nobr>{{row.f_valve_state}}</nobr></td>
|
|
513
536
|
|
|
514
537
|
<!-- <td style="text-align: center;"><nobr>{{row.f_olduserinfo_code}}</nobr></td>-->
|
|
@@ -579,6 +602,7 @@
|
|
|
579
602
|
</td>
|
|
580
603
|
<td style="text-align: center;"><nobr>{{row.f_alarm_code}}</nobr></td>
|
|
581
604
|
<td style="text-align: center;"><nobr>{{row.f_maxdate}}</nobr></td>
|
|
605
|
+
<td style="text-align: center;"><nobr>{{row.f_last_gas_date}}</nobr></td>
|
|
582
606
|
<td style="text-align: center;"><nobr>{{row.f_devices_type}}</nobr></td>
|
|
583
607
|
</template>
|
|
584
608
|
<template partial='foot'>
|
|
@@ -703,7 +727,7 @@
|
|
|
703
727
|
//排序
|
|
704
728
|
orderitem: 'f_residential_area desc,f_building desc,f_unit desc,f_floor desc,f_room desc',
|
|
705
729
|
orderFields: {
|
|
706
|
-
f_operate_date: 'no'
|
|
730
|
+
// f_operate_date: 'no'
|
|
707
731
|
},
|
|
708
732
|
config: {
|
|
709
733
|
defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_user_phone', 'f_user_state']
|
|
@@ -819,6 +843,7 @@
|
|
|
819
843
|
},
|
|
820
844
|
search(){
|
|
821
845
|
this.$refs.paged.$refs.cri.search()
|
|
846
|
+
console.debug(this.model)
|
|
822
847
|
},
|
|
823
848
|
cancel() {
|
|
824
849
|
this.show = false
|
|
@@ -217,7 +217,7 @@ export default{
|
|
|
217
217
|
'f_user_phone': '联系电话', 'f_usetype': '使用类型',
|
|
218
218
|
'f_gas_date': '通气日期', 'f_price_name': '气价名称', 'f_position': '安装位置', 'f_meter_type': '类型', 'f_meter_brand': '品牌',
|
|
219
219
|
'f_meternumber': '表号', 'f_metertitles': '表封号', 'f_aroundmeter': '表向', 'f_install_date': '气表安装日期', 'f_meter_base': '气表底数',
|
|
220
|
-
'f_balance': '账户余额', 'f_hand_date': '最后抄表日期', 'f_whether_hairpin': '是否发卡',
|
|
220
|
+
'f_balance': '账户余额', 'f_hand_date': '最后抄表日期','f_last_gas_date': '最后缴费日期', 'f_whether_hairpin': '是否发卡',
|
|
221
221
|
'f_valve_state': '阀门状态', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'value': '气价详情',
|
|
222
222
|
'f_open_date': '开户时间', 'f_credentials': '证件类型', 'f_idnumber': '身份证号', 'f_people_num': '人口数', 'f_ins_stop_date': '保险结束日期',
|
|
223
223
|
'f_createfile_date': '建档日期', 'f_createfile_person': '建档人', 'f_depname': '所属营业厅', 'f_comments': '备注信息',
|
|
Binary file
|
|
File without changes
|