manage-client 3.2.126 → 3.2.128
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/.gradle/4.4/fileContent/fileContent.lock +0 -0
- package/.gradle/4.4/taskHistory/taskHistory.bin +0 -0
- package/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
- package/build/dev-server.js +1 -1
- package/build/libs/ManageClient-3.1.0-17.jar +0 -0
- package/build/tmp/jar/MANIFEST.MF +2 -0
- package/build/webpack.base.conf.js +16 -17
- package/build/webpack.prod.conf.js +106 -23
- package/package.json +9 -4
- package/src/ManageHome.js +269 -269
- package/src/components/SellReport/ManageBusSummary.vue +3 -3
- package/src/components/SellReport/MarketAnjianChuli.vue +228 -0
- package/src/components/SellReport/MarketAnjianSituation.vue +228 -0
- package/src/components/SellReport/MarketMonthMoney.vue +237 -0
- package/src/components/SellReport/MarketanjianStyle.vue +228 -0
- package/src/components/sale/businessquery/BalanceTable.vue +5 -1
- package/src/components/sale/businessquery/CollectManage.vue +1 -3
- package/src/components/sale/businessquery/CommunityPaymen.vue +2 -2
- package/src/components/sale/businessquery/GroupChargeQuery.vue +4 -2
- package/src/components/sale/businessquery/MoveMeterQuery.vue +1 -1
- package/src/components/sale/businessquery/ReceiptQuery.vue +5 -7
- package/src/components/sale/businessquery/overDueQuery.vue +1 -1
- package/src/components/sale/config/exportConfig.js +2 -1
- package/src/components/sale/resourcequery/LoginQuery.vue +2 -1
- package/src/components/valueaddinfo/renewalvalueAddUserQuery.vue +1 -1
- package/src/components/valueaddinfo/valueAddCountQuery.vue +2 -2
- package/src/components/valueaddinfo/valueAddUserQuery.vue +1 -1
- package/src/components/webmeter/WebmeterQuery.vue +3 -3
- package/src/components/webmeter/newwebmeter/NewException/MeterExceptionList.vue +5 -11
- package/src/filiale/liaoyuan/exportConfig.js +2 -1
- package/src/filiale/macheng/MonthGasQuery.vue +2 -2
- package/src/filiale/macheng/RecordInfoQuery.vue +2 -2
- package/src/filiale/macheng/WebmeterSettlementAnalysis.vue +367 -0
- package/src/filiale/macheng/sale.js +2 -1
- package/src/filiale/qianneng/exportConfig.js +1 -1
- package/src/filiale/qingtongxia/RecordInfoQuery.vue +12 -4
- package/src/filiale/wuhai/ChargeQuery.vue +8 -8
- package/src/main.js +66 -66
- package/src/newmanage.js +535 -535
- package/src/reportManage.js +584 -568
- package/src/saleManage.js +595 -595
- package/src/webmeterManage.js +104 -100
- package/.gradle/3.5.1/file-changes/last-build.bin +0 -0
- package/.gradle/3.5.1/taskHistory/taskHistory.lock +0 -0
- package/.gradle/buildOutputCleanup/built.bin +0 -0
- package/.gradle/buildOutputCleanup/cache.properties.lock +0 -1
|
@@ -27,9 +27,9 @@
|
|
|
27
27
|
<tabs header="未用气查询" v-if="permission('未用气查询')">
|
|
28
28
|
<get-no-meteread-query v-if="show.includes('未用气查询')"></get-no-meteread-query>
|
|
29
29
|
</tabs>
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
30
|
+
<tabs header="物联网表结算分析" v-if="permission('物联网表结算分析')">
|
|
31
|
+
<webmeter-settlement-analysis v-if="show.includes('物联网表结算分析')"></webmeter-settlement-analysis>
|
|
32
|
+
</tabs>
|
|
33
33
|
</tab-button>
|
|
34
34
|
|
|
35
35
|
</template>
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
<button class="button_clear button_spacing" @click="$parent.$parent.clearmsg">清空</button>
|
|
48
48
|
<export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
|
|
49
49
|
:field="$parent.$parent.getfield"
|
|
50
|
-
sqlurl="rs/logic/exportfile" sql-name="
|
|
50
|
+
sqlurl="rs/logic/exportfile" sql-name="getExceptionList" template-name='异常查询'
|
|
51
51
|
:choose-col="true"></export-excel>
|
|
52
52
|
<!--<button class="button_export button_spacing" style="width: max-content" @click="$parent.$parent.showTotalForm()">显示汇总</button>-->
|
|
53
53
|
<!-- <button class="button_search button_spacing" @click="$parent.$parent.showEcharts()">显示图表</button>-->
|
|
@@ -355,9 +355,9 @@
|
|
|
355
355
|
{label: '日', value: 'day'}
|
|
356
356
|
],
|
|
357
357
|
getfield:{
|
|
358
|
-
"f_userinfo_code":"客户编号", "f_user_name":"客户名称", "
|
|
359
|
-
"f_meternumber":"表号","f_meter_brand":"气表品牌","f_insert_date":"
|
|
360
|
-
"
|
|
358
|
+
"f_userinfo_code":"客户编号", "f_user_name":"客户名称","f_residential_area":"小区", "address":"客户地址","f_balance_amount":"账户余额","f_user_phone":"联系电话",
|
|
359
|
+
"f_meternumber":"表号","f_meter_brand":"气表品牌","f_hand_date":"抄表日期","f_insert_date":"最后一次通讯时间","f_electricity":"电池电量","f_batterylevel":"电池电压",
|
|
360
|
+
"f_signal":"信号强度","f_magneticInterference":"磁干扰异常","f_valvestate":"阀门状态","f_error_type":"异常类型","f_error_level":"异常级别","f_orgname":"分公司"
|
|
361
361
|
},
|
|
362
362
|
outlets: [],
|
|
363
363
|
operator: [],
|
|
@@ -520,17 +520,11 @@
|
|
|
520
520
|
}
|
|
521
521
|
},
|
|
522
522
|
computed: {
|
|
523
|
-
// usertypes () {
|
|
524
|
-
// return this.$appdate.getParams("客户类型")
|
|
525
|
-
// },
|
|
526
523
|
getCondition() {
|
|
527
524
|
let condition=this.$refs.paged.$refs.cri.condition + this.orgCondtionStr
|
|
528
525
|
return {
|
|
529
|
-
condition: condition
|
|
530
|
-
startDate:`${this.$refs.paged.$refs.cri.model.startDate}`,
|
|
531
|
-
endDate:`${this.$refs.paged.$refs.cri.model.endDate}`
|
|
526
|
+
condition: condition
|
|
532
527
|
}
|
|
533
|
-
|
|
534
528
|
},
|
|
535
529
|
usertypes() {
|
|
536
530
|
return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
|
|
@@ -405,7 +405,8 @@ monthGasConfig: {
|
|
|
405
405
|
expectgasConfig:{
|
|
406
406
|
"f_month":"月份","f_orgname":"公司","f_gy_num":"工业户数","f_my_num":"民用户数","f_jt_num":"集体户数","f_sy_num":"商业户数","f_sum_num":"户数合计",
|
|
407
407
|
"f_gy_gas":"工业抄表量","f_my_gas":"民用抄表量","f_jt_gas":"集体抄表量","f_sy_gas":"商业抄表量","f_sum_gas":"抄表量合计",
|
|
408
|
-
"f_gy_account":"工业抄表金额","f_my_account":"民用抄表金额","f_jt_account":"集体抄表金额","f_sy_account":"商业抄表金额","f_sum_account":"抄表金额合计"
|
|
408
|
+
"f_gy_account":"工业抄表金额","f_my_account":"民用抄表金额","f_jt_account":"集体抄表金额","f_sy_account":"商业抄表金额","f_sum_account":"抄表金额合计",
|
|
409
|
+
"f_old_gas": "冲正气量","f_old_fee": "冲正金额","f_old_num":"冲正户数"
|
|
409
410
|
},
|
|
410
411
|
pregaslistConfig:{
|
|
411
412
|
"f_month":"月份","f_last_balance":"期初余额","f_wechat_pay":"微信","f_money_pay":"现金","f_bank_pay":"银行转账",
|
|
@@ -350,8 +350,8 @@
|
|
|
350
350
|
},
|
|
351
351
|
selfSearch(args) {
|
|
352
352
|
args.condition = `${args.condition} ` + this.orgCondtionStr
|
|
353
|
-
let f_orgstr = this.orgCondtionStr + 'and f_orgid = ' + this.f_orgid
|
|
354
|
-
args.condition = `${args.condition} ` + f_orgstr
|
|
353
|
+
// let f_orgstr = this.orgCondtionStr + 'and f_orgid = ' + this.f_orgid
|
|
354
|
+
// args.condition = `${args.condition} ` + f_orgstr
|
|
355
355
|
this.model.search(args.condition, args.model)
|
|
356
356
|
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
|
|
357
357
|
},
|
|
@@ -344,7 +344,7 @@
|
|
|
344
344
|
<th><nobr>小区名称</nobr></th>
|
|
345
345
|
<th><nobr>客户地址</nobr></th>
|
|
346
346
|
<th><nobr>客户电话</nobr></th>
|
|
347
|
-
<th><nobr
|
|
347
|
+
<th><nobr>片区</nobr></th>
|
|
348
348
|
<!-- 气价类型,单价暂时未处理 -->
|
|
349
349
|
<th><nobr>气价类型</nobr></th>
|
|
350
350
|
<th><nobr>气价名称</nobr></th>
|
|
@@ -453,7 +453,7 @@
|
|
|
453
453
|
<td style="text-align: center;"><nobr>{{row.f_residential_area}}</nobr></td>
|
|
454
454
|
<td style="text-align: center;"><nobr>{{row.f_address}}</nobr></td>
|
|
455
455
|
<td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
|
|
456
|
-
<td style="text-align: center;"><nobr>{{row.
|
|
456
|
+
<td style="text-align: center;"><nobr>{{row.f_zones}}</nobr></td>
|
|
457
457
|
<!-- 气价类型,单价暂时未处理 -->
|
|
458
458
|
<td style="text-align: center;"><nobr>{{row.f_price_type}}</nobr></td>
|
|
459
459
|
<td style="text-align: center;"><nobr>{{row.f_price_name}}</nobr></td>
|
|
@@ -0,0 +1,367 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="flex-row" v-show="!showdetail">
|
|
3
|
+
<div id='app1' class="basic-main">
|
|
4
|
+
<criteria-paged :model="model" :pager='true' v-ref:paged>
|
|
5
|
+
<criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
|
|
6
|
+
<div novalidate class="form-horizontal select-overspread container-fluid auto" novalidate partial>
|
|
7
|
+
<div class="row">
|
|
8
|
+
<div class="col-sm-2 form-group">
|
|
9
|
+
<label class="font_normal_body">客户编号</label>
|
|
10
|
+
<input @keyup.enter="search" style="width:60%" type="text" class="input_search"
|
|
11
|
+
v-model="model.f_userinfo_code" placeholder='客户编号'
|
|
12
|
+
condition="f_userinfo_code like '%{}%'" v-el:xq v-next-el='userinfocode' v-el:username
|
|
13
|
+
>
|
|
14
|
+
</div>
|
|
15
|
+
<div class="col-sm-2 form-group">
|
|
16
|
+
<label class="font_normal_body">客户名称</label>
|
|
17
|
+
<input @keyup.enter="search" style="width:60%" type="text" class="input_search"
|
|
18
|
+
v-model="model.f_user_name" placeholder='客户名称'
|
|
19
|
+
condition="f_user_name like '%{}%'" v-el:xq v-next-el='username' v-el:username
|
|
20
|
+
>
|
|
21
|
+
</div>
|
|
22
|
+
<div class="col-sm-2 form-group">
|
|
23
|
+
<label class="font_normal_body">客户地址</label>
|
|
24
|
+
<input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_area"
|
|
25
|
+
placeholder='地址'
|
|
26
|
+
condition="f_address like '%{}%'" v-el:xq v-next-el='address' v-el:area
|
|
27
|
+
>
|
|
28
|
+
</div>
|
|
29
|
+
<div class="col-sm-2 form-group">
|
|
30
|
+
<label class="font_normal_body"> 表号 </label>
|
|
31
|
+
<input @keyup.enter="search" style="width:60%" type="text" class="input_search"
|
|
32
|
+
v-model="model.f_meternumber" placeholder='表号'
|
|
33
|
+
condition="f_meternumber like '%{}%'" v-next-el='meternumber' v-el:meternumber
|
|
34
|
+
>
|
|
35
|
+
</div>
|
|
36
|
+
<div style="float:right">
|
|
37
|
+
<button class="button_search button_spacing" @click="search()">查询</button>
|
|
38
|
+
<button class="button_clear button_spacing" @click="clear">清空</button>
|
|
39
|
+
<export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
|
|
40
|
+
:field="$parent.$parent.getfield" :sumname="$parent.$parent.sumName"
|
|
41
|
+
sqlurl="rs/logic/exportfile" sql-name="webmeterSettlementAnalysis"
|
|
42
|
+
template-name='物联网表结算分析'
|
|
43
|
+
:choose-col="true"></export-excel>
|
|
44
|
+
|
|
45
|
+
<div style="float: right" class="button_spacing"
|
|
46
|
+
:class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
|
|
47
|
+
@click="$parent.$parent.hidden()"></div>
|
|
48
|
+
</div>
|
|
49
|
+
</div>
|
|
50
|
+
<div class="row" v-show="$parent.$parent.criteriaShow">
|
|
51
|
+
<div class="col-sm-2 form-group">
|
|
52
|
+
<label class="font_normal_body"> 公司 </label>
|
|
53
|
+
<right-tree @re-res="$parent.$parent.getorg" width="60%"
|
|
54
|
+
:initresid='$parent.$parent.org'></right-tree>
|
|
55
|
+
</div>
|
|
56
|
+
<div class="col-sm-2 form-group">
|
|
57
|
+
<label class="font_normal_body">客户类型</label>
|
|
58
|
+
<v-select style="width:60%" id="f_user_type"
|
|
59
|
+
v-model="model.f_user_type"
|
|
60
|
+
placeholder='客户类型'
|
|
61
|
+
:value.sync="model.f_user_type"
|
|
62
|
+
@change="$parent.$parent.userTypeChange()"
|
|
63
|
+
:options='$parent.$parent.usertypes'
|
|
64
|
+
condition="f_user_type = '{}'"
|
|
65
|
+
close-on-select>
|
|
66
|
+
</v-select>
|
|
67
|
+
</div>
|
|
68
|
+
<div class="col-sm-2 form-group">
|
|
69
|
+
<label class="font_normal_body">用气性质</label>
|
|
70
|
+
<v-select style="width:60%" id="f_gasproperties"
|
|
71
|
+
v-model="model.f_gasproperties"
|
|
72
|
+
placeholder='用气性质'
|
|
73
|
+
:value.sync="model.f_gasproperties"
|
|
74
|
+
:options='$parent.$parent.gasproperties'
|
|
75
|
+
condition="f_gasproperties = '{}'"
|
|
76
|
+
close-on-select>
|
|
77
|
+
</v-select>
|
|
78
|
+
</div>
|
|
79
|
+
<div class="col-sm-2 form-group">
|
|
80
|
+
<label class="font_normal_body">气表品牌</label>
|
|
81
|
+
<v-select
|
|
82
|
+
placeholder='气表品牌'
|
|
83
|
+
:value.sync="model.f_meter_brand"
|
|
84
|
+
v-model="model.f_meter_brand"
|
|
85
|
+
:options='$parent.$parent.meterbrands'
|
|
86
|
+
close-on-select
|
|
87
|
+
condition="f_meter_brand='{}'">
|
|
88
|
+
</v-select>
|
|
89
|
+
</div>
|
|
90
|
+
<div class="col-sm-2 form-group">
|
|
91
|
+
<label class="font_normal_body">气表型号</label>
|
|
92
|
+
<v-select
|
|
93
|
+
placeholder='气表型号'
|
|
94
|
+
:value.sync="model.f_meter_style"
|
|
95
|
+
v-model="model.f_meter_style"
|
|
96
|
+
:options='$parent.$parent.meterstyle[model.f_meter_brand]'
|
|
97
|
+
close-on-select
|
|
98
|
+
condition="f_meter_style='{}'">
|
|
99
|
+
</v-select>
|
|
100
|
+
</div>
|
|
101
|
+
<div class="col-sm-2 form-group">
|
|
102
|
+
<label class="font_normal_body">分析状态</label>
|
|
103
|
+
<v-select
|
|
104
|
+
placeholder='状态'
|
|
105
|
+
:value.sync="model.f_state"
|
|
106
|
+
v-model="model.f_state"
|
|
107
|
+
:options='$parent.$parent.states'
|
|
108
|
+
close-on-select
|
|
109
|
+
condition="f_state='{}'">
|
|
110
|
+
</v-select>
|
|
111
|
+
</div>
|
|
112
|
+
</div>
|
|
113
|
+
</div>
|
|
114
|
+
</criteria>
|
|
115
|
+
<data-grid id="lostuserlist" :model="model" partial='list' v-ref:grid class="list_area table_sy">
|
|
116
|
+
<template partial='head'>
|
|
117
|
+
<tr>
|
|
118
|
+
<th style="text-align:center">
|
|
119
|
+
<nobr>客户编号</nobr>
|
|
120
|
+
</th>
|
|
121
|
+
<th style="text-align:center">
|
|
122
|
+
<nobr>客户名称</nobr>
|
|
123
|
+
</th>
|
|
124
|
+
<th style="text-align:center">
|
|
125
|
+
<nobr>客户地址</nobr>
|
|
126
|
+
</th>
|
|
127
|
+
<th style="text-align:center">
|
|
128
|
+
<nobr>客户类型</nobr>
|
|
129
|
+
</th>
|
|
130
|
+
<th style="text-align:center">
|
|
131
|
+
<nobr>用气性质</nobr>
|
|
132
|
+
</th>
|
|
133
|
+
<th style="text-align:center">
|
|
134
|
+
<nobr>表号</nobr>
|
|
135
|
+
</th>
|
|
136
|
+
<th style="text-align:center">
|
|
137
|
+
<nobr>气表品牌</nobr>
|
|
138
|
+
</th>
|
|
139
|
+
<th style="text-align:center">
|
|
140
|
+
<nobr>气表型号</nobr>
|
|
141
|
+
</th>
|
|
142
|
+
<th style="text-align:center">
|
|
143
|
+
<nobr>组织机构</nobr>
|
|
144
|
+
</th>
|
|
145
|
+
<th style="text-align:center">
|
|
146
|
+
<nobr>账户余额</nobr>
|
|
147
|
+
</th>
|
|
148
|
+
<th style="text-align:center">
|
|
149
|
+
<nobr>最后上报金额</nobr>
|
|
150
|
+
</th>
|
|
151
|
+
<th style="text-align:center">
|
|
152
|
+
<nobr>分析状态</nobr>
|
|
153
|
+
</th>
|
|
154
|
+
<th style="text-align:center">
|
|
155
|
+
<nobr>结算异常金额</nobr>
|
|
156
|
+
</th>
|
|
157
|
+
</tr>
|
|
158
|
+
</template>
|
|
159
|
+
<template partial='body'>
|
|
160
|
+
<td style="text-align: center;">
|
|
161
|
+
<nobr>{{ row.f_userinfo_code }}</nobr>
|
|
162
|
+
</td>
|
|
163
|
+
<td style="text-align:center">
|
|
164
|
+
<nobr>{{ row.f_user_name }}</nobr>
|
|
165
|
+
</td>
|
|
166
|
+
<td>
|
|
167
|
+
<nobr>{{ row.f_address }}</nobr>
|
|
168
|
+
</td>
|
|
169
|
+
<td style="text-align:center">{{ row.f_user_type }}</td>
|
|
170
|
+
<td style="text-align:center">{{ row.f_gasproperties }}</td>
|
|
171
|
+
<td style="text-align:center">
|
|
172
|
+
<nobr>{{ row.f_meternumber }}</nobr>
|
|
173
|
+
</td>
|
|
174
|
+
<td style="text-align:center">
|
|
175
|
+
<nobr>{{ row.f_meter_brand }}</nobr>
|
|
176
|
+
</td>
|
|
177
|
+
<td style="text-align:center">
|
|
178
|
+
<nobr>{{ row.f_meter_style }}</nobr>
|
|
179
|
+
</td>
|
|
180
|
+
<td style="text-align:center">
|
|
181
|
+
<nobr>{{ row.f_orgname }}</nobr>
|
|
182
|
+
</td>
|
|
183
|
+
<td style="text-align:center">
|
|
184
|
+
<nobr>{{ row.f_balance_amount }}</nobr>
|
|
185
|
+
</td>
|
|
186
|
+
<td style="text-align:center">
|
|
187
|
+
<nobr>{{ row.f_jval }}</nobr>
|
|
188
|
+
</td>
|
|
189
|
+
<td style="text-align:center">
|
|
190
|
+
<nobr>{{ row.f_state }}</nobr>
|
|
191
|
+
</td>
|
|
192
|
+
<td style="text-align:center">
|
|
193
|
+
<nobr>{{ row.exception_val }}</nobr>
|
|
194
|
+
</td>
|
|
195
|
+
</template>
|
|
196
|
+
</data-grid>
|
|
197
|
+
</criteria-paged>
|
|
198
|
+
<table class="table-hover">
|
|
199
|
+
<tr style="position: relative;bottom:4rem" class="table-bordered">
|
|
200
|
+
<td
|
|
201
|
+
style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
|
|
202
|
+
汇总信息
|
|
203
|
+
</td>
|
|
204
|
+
<td
|
|
205
|
+
style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
206
|
+
异常金额: {{ sumsmodel.exception_val }}
|
|
207
|
+
</td>
|
|
208
|
+
</tr>
|
|
209
|
+
</table>
|
|
210
|
+
</div>
|
|
211
|
+
</div>
|
|
212
|
+
</template>
|
|
213
|
+
|
|
214
|
+
<script>
|
|
215
|
+
import {PagedList} from 'vue-client'
|
|
216
|
+
import plugin from 'system-clients/src/plugins/GetLoginInfoService'
|
|
217
|
+
|
|
218
|
+
let readySomething = async function (self) {
|
|
219
|
+
await self.$MagLoadParams.loadParam()
|
|
220
|
+
self.initParams()
|
|
221
|
+
}
|
|
222
|
+
export default {
|
|
223
|
+
title: '物联网表结算分析',
|
|
224
|
+
props: ['data'],
|
|
225
|
+
data() {
|
|
226
|
+
return {
|
|
227
|
+
model: new PagedList('rs/sql/webmeterSettlementAnalysis', 20, {}, {exception_val: 0}),
|
|
228
|
+
getfield: {
|
|
229
|
+
'f_userinfo_code': '客户编号', 'f_user_name': '客户名称',
|
|
230
|
+
'f_address': '客户地址', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质',
|
|
231
|
+
'f_meternumber': '表号',
|
|
232
|
+
'f_meter_brand': '气表品牌', 'f_meter_style': '气表型号', 'f_orgname': '组织机构',
|
|
233
|
+
'f_balance_amount': '表上余额', 'f_jval': '表上余额',
|
|
234
|
+
'f_state': '状态', 'exception_val': '结算异常金额'
|
|
235
|
+
},
|
|
236
|
+
showdetail: false,
|
|
237
|
+
rowdata: {},
|
|
238
|
+
startDate: '',
|
|
239
|
+
endDate: '',
|
|
240
|
+
criteriaShow: false,
|
|
241
|
+
outlets: [],
|
|
242
|
+
gasproperties: [{label: '全部', value: ''}],
|
|
243
|
+
operator: [],
|
|
244
|
+
sumsmodel: {},
|
|
245
|
+
meterbrands: [],
|
|
246
|
+
states: [],
|
|
247
|
+
meterstyle: {},
|
|
248
|
+
orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
|
|
249
|
+
orgid: [this.$login.f.orgid],
|
|
250
|
+
condition: '1=1',
|
|
251
|
+
org: [this.$login.f.orgid]
|
|
252
|
+
|
|
253
|
+
}
|
|
254
|
+
},
|
|
255
|
+
ready() {
|
|
256
|
+
readySomething(this)
|
|
257
|
+
},
|
|
258
|
+
methods: {
|
|
259
|
+
|
|
260
|
+
userTypeChange() {
|
|
261
|
+
this.gasproperties = [{label: '全部', value: ''}]
|
|
262
|
+
if (this.$refs.paged.$refs.cri.model && this.$refs.paged.$refs.cri.model.f_user_type) {
|
|
263
|
+
this.$refs.paged.$refs.cri.model.f_gasproperties = ''
|
|
264
|
+
console.log(this.$refs.paged.$refs.cri.model.f_user_type[0])
|
|
265
|
+
this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
|
|
266
|
+
} else {
|
|
267
|
+
this.gasproperties = [{label: '全部', value: ''}]
|
|
268
|
+
}
|
|
269
|
+
},
|
|
270
|
+
hidden() {
|
|
271
|
+
this.criteriaShow = !this.criteriaShow
|
|
272
|
+
},
|
|
273
|
+
showmsg(obj) {
|
|
274
|
+
this.rowdata = obj
|
|
275
|
+
this.showdetail = true
|
|
276
|
+
},
|
|
277
|
+
cancel() {
|
|
278
|
+
this.showdetail = false
|
|
279
|
+
},
|
|
280
|
+
initParams() {
|
|
281
|
+
// 初始化气表品牌
|
|
282
|
+
let brandArr = []
|
|
283
|
+
this.$MagGetSaleParam.getGasbrand().forEach((item) => {
|
|
284
|
+
if (item.value.f_meter_type === '物联网表') {
|
|
285
|
+
let temp = {}
|
|
286
|
+
temp.label = item.label
|
|
287
|
+
temp.value = item.value.f_meter_brand
|
|
288
|
+
brandArr.push(temp)
|
|
289
|
+
|
|
290
|
+
let styleArr = [{label: '全部', value: ''}]
|
|
291
|
+
for (let row of item.value.gasmodel) {
|
|
292
|
+
styleArr.push({label: row.label, value: row.value.f_meter_style})
|
|
293
|
+
}
|
|
294
|
+
this.meterstyle[temp.value] = styleArr
|
|
295
|
+
}
|
|
296
|
+
|
|
297
|
+
})
|
|
298
|
+
this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
|
|
299
|
+
this.states = [{label: '全部', value: ''}, {label: '上报大于余额', value: '上报大于余额'}, {
|
|
300
|
+
label: '余额大于上报',
|
|
301
|
+
value: '余额大于上报'
|
|
302
|
+
}, {label: '上报与余额相等', value: '上报与余额相等'}]
|
|
303
|
+
},
|
|
304
|
+
search(args) {
|
|
305
|
+
this.condition = args.condition = this.$refs.paged.$refs.cri.condition + `${this.orgCondtionStr}`
|
|
306
|
+
this.model.search(args.condition, args.model)
|
|
307
|
+
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
|
|
308
|
+
},
|
|
309
|
+
getorg(obj) {
|
|
310
|
+
if (obj.resids.length > 0) {
|
|
311
|
+
this.orgCondtionStr = " and f_orgid in " + plugin.convertToIn(obj.resids)
|
|
312
|
+
} else {
|
|
313
|
+
this.orgCondtionStr = " and f_orgid = " + this.$login.f.orgid
|
|
314
|
+
}
|
|
315
|
+
},
|
|
316
|
+
clearmsg() {
|
|
317
|
+
this.$refs.paged.$refs.cri.model = {}
|
|
318
|
+
}
|
|
319
|
+
},
|
|
320
|
+
watch: {},
|
|
321
|
+
computed: {
|
|
322
|
+
getCondition() {
|
|
323
|
+
let condition = this.$refs.paged.$refs.cri.condition + this.orgCondtionStr
|
|
324
|
+
return {
|
|
325
|
+
condition: condition,
|
|
326
|
+
startDate: `${this.$refs.paged.$refs.cri.model.startDate}`,
|
|
327
|
+
endDate: `${this.$refs.paged.$refs.cri.model.endDate}`
|
|
328
|
+
}
|
|
329
|
+
},
|
|
330
|
+
usertypes() {
|
|
331
|
+
return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
|
|
332
|
+
}
|
|
333
|
+
}
|
|
334
|
+
}
|
|
335
|
+
</script>
|
|
336
|
+
<style>
|
|
337
|
+
.form-input-group label {
|
|
338
|
+
text-align: right;
|
|
339
|
+
width: auto;
|
|
340
|
+
}
|
|
341
|
+
|
|
342
|
+
.mystyle {
|
|
343
|
+
float: right;
|
|
344
|
+
padding-right: 10%;
|
|
345
|
+
}
|
|
346
|
+
|
|
347
|
+
.mystyle1 {
|
|
348
|
+
padding-top: 10px;
|
|
349
|
+
|
|
350
|
+
}
|
|
351
|
+
|
|
352
|
+
.mystyle2 {
|
|
353
|
+
width: 100%;
|
|
354
|
+
height: 35px;
|
|
355
|
+
/*background: #00A3F0;*/
|
|
356
|
+
padding-left: 15px;
|
|
357
|
+
float: left;
|
|
358
|
+
}
|
|
359
|
+
|
|
360
|
+
.datapanel {
|
|
361
|
+
color: #333;
|
|
362
|
+
background-color: white;
|
|
363
|
+
box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
|
|
364
|
+
padding: 10px 30px 10px 30px;
|
|
365
|
+
border-radius: 15px;
|
|
366
|
+
}
|
|
367
|
+
</style>
|
|
@@ -7,6 +7,7 @@ let specialComp = {
|
|
|
7
7
|
'arrears-query': (resolve) => { require(['./ArrearsQuery'], resolve) },
|
|
8
8
|
'meter-query': (resolve) => { require(['./MeterQuery'], resolve) },
|
|
9
9
|
'fmygas-query': (resolve) => { require(['./FMYGasQuery'], resolve) },
|
|
10
|
-
'month-gas-query': (resolve) => { require(['./MonthGasQuery'], resolve) }
|
|
10
|
+
'month-gas-query': (resolve) => { require(['./MonthGasQuery'], resolve) },
|
|
11
|
+
'webmeter-settlement-analysis': (resolve) => { require(['./WebmeterSettlementAnalysis'], resolve) }
|
|
11
12
|
}
|
|
12
13
|
exports.specialComp = specialComp
|
|
@@ -23,7 +23,7 @@ export default{
|
|
|
23
23
|
'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_address': '客户地址', 'f_zones': '片区', 'phone': '客户手机', 'f_meternumber': '表号', 'ym_data': '数据年月',
|
|
24
24
|
'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_oughtamount': '用气量', 'overdue': '滞纳金', 'f_oughtfee': '用气金额', 'f_debt_money': '已交金额',
|
|
25
25
|
'f_actual_arrears': '欠费金额', 'f_balance': '上期余额', 'f_curbalance': '本期余额', 'f_newbalance': '账户支出', 'f_newcurbalance': '账户存入',
|
|
26
|
-
'f_accounts_state': '下账状态', '
|
|
26
|
+
'f_accounts_state': '下账状态', 'f_sellinggas_operate_date': '收费时间', 'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区',
|
|
27
27
|
'f_hand_date': '下发日期', 'f_input_date': '录入日期', 'f_audit_date': '审核日期', 'f_meter_state': '抄表状态', 'f_hand_state': '记录状态', 'f_end_date': '违约金起始时间',
|
|
28
28
|
'f_user_type': '客户类型', 'f_gasproperties': '用气性质',
|
|
29
29
|
'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_surplus_gas': '剩余气量', 'f_haircut_gas': '扣减气量',
|
|
@@ -603,7 +603,7 @@
|
|
|
603
603
|
isSingleUser: null,
|
|
604
604
|
other:[],
|
|
605
605
|
footer:[],
|
|
606
|
-
model: new PagedList('rs/sql/compreQuery', 20),
|
|
606
|
+
model: new PagedList('rs/sql/compreQuery', 20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_residential_area desc,f_building desc,f_unit desc,f_floor desc,f_room desc'`}),
|
|
607
607
|
criteriaShow: false,
|
|
608
608
|
orgCondtionStr:'',
|
|
609
609
|
residentialArea: [],
|
|
@@ -616,6 +616,15 @@
|
|
|
616
616
|
fields: {},
|
|
617
617
|
thead: '',
|
|
618
618
|
tfoot: '',
|
|
619
|
+
defaultfield: [],
|
|
620
|
+
//排序
|
|
621
|
+
orderitem: 'f_residential_area desc,f_building desc,f_unit desc,f_floor desc,f_room desc',
|
|
622
|
+
orderFields: {
|
|
623
|
+
f_operate_date: 'no'
|
|
624
|
+
},
|
|
625
|
+
config: {
|
|
626
|
+
defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_user_phone', 'f_user_state']
|
|
627
|
+
},
|
|
619
628
|
area: [],
|
|
620
629
|
inputtouPerson: [],
|
|
621
630
|
bookinputtorperson:[],
|
|
@@ -745,8 +754,7 @@
|
|
|
745
754
|
//查询多个抄表员时条件
|
|
746
755
|
args.condition += ` and f_inputtor in ( ${str} )`
|
|
747
756
|
}
|
|
748
|
-
//
|
|
749
|
-
debugger
|
|
757
|
+
//debugger
|
|
750
758
|
this.bookinputtorperson = this.$refs.paged.$refs.cri.model.f_book_inputtor;
|
|
751
759
|
if(this.bookinputtorperson.length !== 0){
|
|
752
760
|
let str = JSON.stringify(this.bookinputtorperson)
|
|
@@ -953,7 +961,7 @@
|
|
|
953
961
|
},
|
|
954
962
|
getCondition(){
|
|
955
963
|
|
|
956
|
-
return {condition:this.conditon2}
|
|
964
|
+
return {condition:this.conditon2,orderitem:this.orderitem}
|
|
957
965
|
},
|
|
958
966
|
getfield(){
|
|
959
967
|
let data = {}
|
|
@@ -544,7 +544,7 @@
|
|
|
544
544
|
<nobr>{{row.f_times}}</nobr>
|
|
545
545
|
</td>
|
|
546
546
|
<td style="text-align: center;">
|
|
547
|
-
<nobr>{{row.f_pregas}}</nobr>
|
|
547
|
+
<nobr>{{row.f_pregas.toFixed(2)}}</nobr>
|
|
548
548
|
</td>
|
|
549
549
|
<td style="text-align: center;">
|
|
550
550
|
<nobr>{{row.fee}}</nobr>
|
|
@@ -663,7 +663,7 @@
|
|
|
663
663
|
<nobr>{{row.f_corr_operate_date}}</nobr>
|
|
664
664
|
</td>
|
|
665
665
|
<td style="text-align: center;">
|
|
666
|
-
<nobr>{{row.f_stairamount1}}</nobr>
|
|
666
|
+
<nobr>{{row.f_stairamount1.toFixed(2)}}</nobr>
|
|
667
667
|
</td>
|
|
668
668
|
<td style="text-align: center;">
|
|
669
669
|
<nobr>{{row.f_stair1price}}</nobr>
|
|
@@ -672,7 +672,7 @@
|
|
|
672
672
|
<nobr>{{(row.f_stair1fee - 0).toFixed(2)}}</nobr>
|
|
673
673
|
</td>
|
|
674
674
|
<td style="text-align: center;">
|
|
675
|
-
<nobr>{{row.f_stair2amount}}</nobr>
|
|
675
|
+
<nobr>{{row.f_stair2amount.toFixed(2)}}</nobr>
|
|
676
676
|
</td>
|
|
677
677
|
<td style="text-align: center;">
|
|
678
678
|
<nobr>{{row.f_stair2price}}</nobr>
|
|
@@ -681,7 +681,7 @@
|
|
|
681
681
|
<nobr>{{(row.f_stair2fee - 0).toFixed(2)}}</nobr>
|
|
682
682
|
</td>
|
|
683
683
|
<td style="text-align: center;">
|
|
684
|
-
<nobr>{{row.f_stair3amount}}</nobr>
|
|
684
|
+
<nobr>{{row.f_stair3amount.toFixed(2)}}</nobr>
|
|
685
685
|
</td>
|
|
686
686
|
<td style="text-align: center;">
|
|
687
687
|
<nobr>{{row.f_stair3price}}</nobr>
|
|
@@ -703,7 +703,7 @@
|
|
|
703
703
|
汇总信息
|
|
704
704
|
</td>
|
|
705
705
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
706
|
-
气量合计: {{sumsmodel.f_pregas}}
|
|
706
|
+
气量合计: {{sumsmodel.f_pregas.toFixed(2)}}
|
|
707
707
|
</td>
|
|
708
708
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
709
709
|
应收金额合计: {{sumsmodel.fee}}
|
|
@@ -721,19 +721,19 @@
|
|
|
721
721
|
优惠合计: {{sumsmodel.f_privilege_money}}
|
|
722
722
|
</td>
|
|
723
723
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
724
|
-
一阶气量合计: {{sumsmodel.f_stairamount1}}
|
|
724
|
+
一阶气量合计: {{sumsmodel.f_stairamount1.toFixed(2)}}
|
|
725
725
|
</td>
|
|
726
726
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
727
727
|
一阶气费合计: {{sumsmodel.f_stair1fee}}
|
|
728
728
|
</td>
|
|
729
729
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
730
|
-
二阶气量合计: {{sumsmodel.f_stair2amount}}
|
|
730
|
+
二阶气量合计: {{sumsmodel.f_stair2amount.toFixed(2)}}
|
|
731
731
|
</td>
|
|
732
732
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
733
733
|
二阶气费合计: {{sumsmodel.f_stair2fee}}
|
|
734
734
|
</td>
|
|
735
735
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
736
|
-
三阶气量合计: {{sumsmodel.f_stair3amount}}
|
|
736
|
+
三阶气量合计: {{sumsmodel.f_stair3amount.toFixed(2)}}
|
|
737
737
|
</td>
|
|
738
738
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
739
739
|
三阶气费合计: {{sumsmodel.f_stair3fee}}
|