manage-client 3.2.127 → 3.2.130
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/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 +1 -0
- package/build/dev-server.js +1 -1
- package/build/webpack.base.conf.js +16 -17
- package/build/webpack.prod.conf.js +143 -60
- package/package.json +9 -4
- package/src/ManageHome.js +263 -262
- 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/MarketanjianStyle.vue +228 -0
- package/src/components/SellReport/UserFillmoney.vue +420 -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/gasAnalysis/GasAnalysisManage.vue +303 -303
- 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 +988 -988
- package/src/filiale/wuhai/ChargeQuery.vue +8 -8
- package/src/index.js +11 -11
- package/src/main.js +19 -19
- package/src/newmanage.js +468 -470
- package/src/plugins/GetLoginInfoService.js +505 -505
- package/src/reportManage.js +566 -548
- package/src/saleManage.js +570 -567
- package/src/stores/MagGetSaleParams.js +156 -156
- package/src/stores/MagLoadParams.js +63 -63
- package/src/webmeterManage.js +104 -100
- 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/libs/ManageClient-3.1.0-17.jar +0 -0
- package/build/tmp/jar/MANIFEST.MF +0 -2
|
@@ -0,0 +1,420 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div id="unit" class="flex-row">
|
|
3
|
+
<div class="basic-main" @keyup.enter="search">
|
|
4
|
+
<div class="flex" v-if="!show">
|
|
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 00:00:00'"
|
|
15
|
+
:show-reset-button="true">
|
|
16
|
+
</datepicker>
|
|
17
|
+
</div>
|
|
18
|
+
<div class="col-sm-2 form-group">
|
|
19
|
+
<label for="endDate" class="font_normal_body">结束日期</label>
|
|
20
|
+
<datepicker id="endDate" placeholder="结束日期" style="width:60%"
|
|
21
|
+
v-model="model.endDate"
|
|
22
|
+
:value.sync="model.endDate"
|
|
23
|
+
:format="'yyyy-MM-dd 23:59:59'"
|
|
24
|
+
:show-reset-button="true">
|
|
25
|
+
</datepicker>
|
|
26
|
+
</div>
|
|
27
|
+
<div class="col-sm-2 form-group">
|
|
28
|
+
<label class="font_normal_body"> 公司 </label>
|
|
29
|
+
<right-tree @re-res="$parent.$parent.getRes"></right-tree>
|
|
30
|
+
</div>
|
|
31
|
+
<div class="col-sm-2 form-group">
|
|
32
|
+
<label class="font_normal_body"> 部门 </label>
|
|
33
|
+
<res-select restype='department'
|
|
34
|
+
@res-select="$parent.$parent.getdep"
|
|
35
|
+
:parentresid="$parent.$parent.depresid"
|
|
36
|
+
:initresid='$parent.$parent.depid'>
|
|
37
|
+
</res-select>
|
|
38
|
+
|
|
39
|
+
</div>
|
|
40
|
+
<div class="col-sm-2 form-group">
|
|
41
|
+
<label class="font_normal_body"> 人员 </label>
|
|
42
|
+
<res-select restype='user'
|
|
43
|
+
is-mul="false"
|
|
44
|
+
@res-select="$parent.$parent.getuser"
|
|
45
|
+
:parentresid="$parent.$parent.userresid"
|
|
46
|
+
:initresid='$parent.$parent.operatorid'>
|
|
47
|
+
</res-select>
|
|
48
|
+
</div>
|
|
49
|
+
<div class="span" style="float:right;">
|
|
50
|
+
<button class="button_search button_spacing" @click="search()">查询</button>
|
|
51
|
+
|
|
52
|
+
<export-excel :data="$parent.$parent.getCondition"
|
|
53
|
+
:field="$parent.$parent.getfield"
|
|
54
|
+
:footer="$parent.$parent.footer"
|
|
55
|
+
:header="$parent.$parent.other"
|
|
56
|
+
sqlurl="rs/logic/exportfile"
|
|
57
|
+
sql-name="userGasFillCard"
|
|
58
|
+
template-name='营业厅明细导出'
|
|
59
|
+
:choose-col="true"></export-excel>
|
|
60
|
+
<print-data-self :model="$parent.model" :field="$parent.$parent.getfield"
|
|
61
|
+
:defaultfield="$parent.$parent.defaultfield" printName="营业厅明细"
|
|
62
|
+
:sumsmodel="$parent.$parent.sumsmodel" :sum-field="$parent.$parent.sumField" :page-sum="$parent.$parent.pageSum"
|
|
63
|
+
:start-date="$parent.$parent.startDate" :end-date="$parent.$parent.endDate"
|
|
64
|
+
></print-data-self>
|
|
65
|
+
</div>
|
|
66
|
+
</div>
|
|
67
|
+
</div>
|
|
68
|
+
</criteria>
|
|
69
|
+
<data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid :classname="$parent.classname">
|
|
70
|
+
<template partial='head'>
|
|
71
|
+
<tr>
|
|
72
|
+
<th>
|
|
73
|
+
<nobr>序号</nobr>
|
|
74
|
+
</th>
|
|
75
|
+
<th>
|
|
76
|
+
<nobr>用户编号</nobr>
|
|
77
|
+
</th>
|
|
78
|
+
<th>
|
|
79
|
+
<nobr>用户名称</nobr>
|
|
80
|
+
</th>
|
|
81
|
+
<th>
|
|
82
|
+
<nobr>上期结余</nobr>
|
|
83
|
+
</th>
|
|
84
|
+
<th>
|
|
85
|
+
<nobr>实收金额</nobr>
|
|
86
|
+
</th>
|
|
87
|
+
<th>
|
|
88
|
+
<nobr>购气气量</nobr>
|
|
89
|
+
</th>
|
|
90
|
+
<th>
|
|
91
|
+
<nobr>应收金额</nobr>
|
|
92
|
+
</th>
|
|
93
|
+
<th>
|
|
94
|
+
<nobr>滞纳金</nobr>
|
|
95
|
+
</th>
|
|
96
|
+
<th>
|
|
97
|
+
<nobr>本期结余</nobr>
|
|
98
|
+
</th>
|
|
99
|
+
<th>
|
|
100
|
+
<nobr>差值金额</nobr>
|
|
101
|
+
</th>
|
|
102
|
+
<th>
|
|
103
|
+
<nobr>用户类型</nobr>
|
|
104
|
+
</th>
|
|
105
|
+
<th>
|
|
106
|
+
<nobr>收费类型</nobr>
|
|
107
|
+
</th>
|
|
108
|
+
<th>
|
|
109
|
+
<nobr>日期</nobr>
|
|
110
|
+
</th>
|
|
111
|
+
<th>
|
|
112
|
+
<nobr>操作员</nobr>
|
|
113
|
+
</th>
|
|
114
|
+
|
|
115
|
+
</th>
|
|
116
|
+
</tr>
|
|
117
|
+
</template>
|
|
118
|
+
<template partial='body'>
|
|
119
|
+
<td style="text-align:center">
|
|
120
|
+
<nobr>{{$index+1}}</nobr>
|
|
121
|
+
</td>
|
|
122
|
+
<td style="text-align: center;">
|
|
123
|
+
<nobr>{{row.f_userinfo_code}}</nobr>
|
|
124
|
+
</td>
|
|
125
|
+
<td style="text-align: center;">
|
|
126
|
+
<nobr>{{row.f_user_name}}</nobr>
|
|
127
|
+
</td>
|
|
128
|
+
<td style="text-align: center;">
|
|
129
|
+
<nobr>{{row.f_balance}}</nobr>
|
|
130
|
+
</td>
|
|
131
|
+
<td style="text-align: center;">
|
|
132
|
+
<nobr>{{row.f_collection}}</nobr>
|
|
133
|
+
</td>
|
|
134
|
+
<td style="text-align: center;">
|
|
135
|
+
<nobr>{{row.f_pregas}}</nobr>
|
|
136
|
+
</td>
|
|
137
|
+
<td style="text-align: center;">
|
|
138
|
+
<nobr>{{row.f_preamount}}</nobr>
|
|
139
|
+
</td>
|
|
140
|
+
<td style="text-align: center;">
|
|
141
|
+
<nobr>{{row.f_delaypay}}</nobr>
|
|
142
|
+
</td>
|
|
143
|
+
<td style="text-align: center;">
|
|
144
|
+
<nobr>{{row.f_curbalance}}</nobr>
|
|
145
|
+
</td>
|
|
146
|
+
<td style="text-align: center;">
|
|
147
|
+
<nobr>{{row.f_charmoney}}</nobr>
|
|
148
|
+
</td>
|
|
149
|
+
<td style="text-align: center;">
|
|
150
|
+
<nobr>{{row.f_user_type}}</nobr>
|
|
151
|
+
</td>
|
|
152
|
+
<td style="text-align: center;">
|
|
153
|
+
<nobr>{{row.f_type}}</nobr>
|
|
154
|
+
</td>
|
|
155
|
+
<td style="text-align: center;">
|
|
156
|
+
<nobr>{{row.f_delivery_date}}</nobr>
|
|
157
|
+
</td>
|
|
158
|
+
<td style="text-align: center;">
|
|
159
|
+
<nobr>{{row.f_operator}}</nobr>
|
|
160
|
+
</td>
|
|
161
|
+
|
|
162
|
+
</td>
|
|
163
|
+
</template>
|
|
164
|
+
<template partial='foot'></template>
|
|
165
|
+
</data-grid>
|
|
166
|
+
</criteria-paged>
|
|
167
|
+
<table class="table-hover">
|
|
168
|
+
<tr style="position: relative" class="table-bordered">
|
|
169
|
+
<td
|
|
170
|
+
style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold" >
|
|
171
|
+
报表统计时间
|
|
172
|
+
</td>
|
|
173
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold" v-if="startDate==endDate">
|
|
174
|
+
{{startDate}}
|
|
175
|
+
</td>
|
|
176
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold" v-else>
|
|
177
|
+
{{startDate+" 至 "+endDate}}
|
|
178
|
+
</td>
|
|
179
|
+
</tr>
|
|
180
|
+
<tr style="position: relative" class="table-bordered">
|
|
181
|
+
<td
|
|
182
|
+
style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
|
|
183
|
+
汇总信息
|
|
184
|
+
</td>
|
|
185
|
+
|
|
186
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
187
|
+
差值金额:{{sumsmodel.f_charmoney.toFixed(2)}}
|
|
188
|
+
</td>
|
|
189
|
+
</tr>
|
|
190
|
+
</table>
|
|
191
|
+
</div>
|
|
192
|
+
</div>
|
|
193
|
+
</div>
|
|
194
|
+
</template>
|
|
195
|
+
<script>
|
|
196
|
+
import {PagedList, HttpResetClass} from 'vue-client'
|
|
197
|
+
import defaultPrint from '../sale/config/DefaultPrint'
|
|
198
|
+
import exportConfig from '../sale/config/exportConfig'
|
|
199
|
+
import PrintDataSelf from '../sale/common/PrintDataSelf'
|
|
200
|
+
|
|
201
|
+
let readySomething = async function (self) {
|
|
202
|
+
self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
|
|
203
|
+
self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
|
|
204
|
+
self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
|
|
205
|
+
}
|
|
206
|
+
export default {
|
|
207
|
+
title: '收费记录不匹配查询',
|
|
208
|
+
props: ['data'],
|
|
209
|
+
data() {
|
|
210
|
+
return {
|
|
211
|
+
depresid: [],
|
|
212
|
+
userresid: [],
|
|
213
|
+
f_orgid: this.$login.f.orgid,
|
|
214
|
+
f_depid: this.$login.f.depids,
|
|
215
|
+
f_operatorid: this.$login.f.id,
|
|
216
|
+
operatorid: [],
|
|
217
|
+
depid: [],
|
|
218
|
+
orgname: '',
|
|
219
|
+
depname: [],
|
|
220
|
+
operatorname: '',
|
|
221
|
+
orgCondtionStr: '1=1',
|
|
222
|
+
data: {},
|
|
223
|
+
other:[],
|
|
224
|
+
footer:[],
|
|
225
|
+
model: new PagedList('rs/sql/userGasFillmoney', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate', f_orgid: 'this.model.f_orgid'},{
|
|
226
|
+
|
|
227
|
+
f_charmoney:0,
|
|
228
|
+
|
|
229
|
+
}),
|
|
230
|
+
gasproperties:[],
|
|
231
|
+
show:false,
|
|
232
|
+
rowdata:{},
|
|
233
|
+
residentialArea: [],
|
|
234
|
+
modelval: [],
|
|
235
|
+
startDate:"",
|
|
236
|
+
endDate:"",
|
|
237
|
+
inputtouPerson: [],
|
|
238
|
+
printshow: false,
|
|
239
|
+
all: false,
|
|
240
|
+
fields: {},
|
|
241
|
+
thead: '',
|
|
242
|
+
tfoot: '',
|
|
243
|
+
|
|
244
|
+
// 下拉框
|
|
245
|
+
|
|
246
|
+
//合计数据
|
|
247
|
+
sumsmodel: {},
|
|
248
|
+
sumField: {
|
|
249
|
+
'f_charmoney': '差值金额'
|
|
250
|
+
},
|
|
251
|
+
pageSum: {
|
|
252
|
+
|
|
253
|
+
|
|
254
|
+
'f_charmoney': '0.00'
|
|
255
|
+
},
|
|
256
|
+
defaultfield: [],
|
|
257
|
+
config: {
|
|
258
|
+
defaultPrint: ['f_userinfo_code', 'f_user_name']
|
|
259
|
+
},
|
|
260
|
+
batchmoneyShow:false
|
|
261
|
+
}
|
|
262
|
+
},
|
|
263
|
+
ready() {
|
|
264
|
+
readySomething(this).then(() => {
|
|
265
|
+
this.$emit('ready')
|
|
266
|
+
}).catch((error) => {
|
|
267
|
+
this.$emit('error', error)
|
|
268
|
+
})
|
|
269
|
+
},
|
|
270
|
+
methods: {
|
|
271
|
+
getotherfooter(){
|
|
272
|
+
// this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
|
|
273
|
+
// this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
|
|
274
|
+
this.other=[];
|
|
275
|
+
this.footer=[];
|
|
276
|
+
let exportdata = this.getCondition;
|
|
277
|
+
let otherInData=[];
|
|
278
|
+
otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
|
|
279
|
+
let footerData=[],exportfield=this.getfield;
|
|
280
|
+
footerData.push("合计");
|
|
281
|
+
let self =this;
|
|
282
|
+
for(var field in self.sumsmodel){
|
|
283
|
+
footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
|
|
284
|
+
}
|
|
285
|
+
this.footer.push(footerData);
|
|
286
|
+
this.other.push(otherInData);
|
|
287
|
+
},
|
|
288
|
+
search(){
|
|
289
|
+
this.$refs.paged.$refs.cri.search()
|
|
290
|
+
},
|
|
291
|
+
selfSearch(args) {
|
|
292
|
+
let orgcondition = ' s.f_orgid in (' + this.f_orgid + ')'
|
|
293
|
+
if (this.f_depid[0]) {
|
|
294
|
+
orgcondition += " and s.f_depid in("+this.f_depid.toString()+')'
|
|
295
|
+
}
|
|
296
|
+
if(this.f_operatorid[0]) {
|
|
297
|
+
orgcondition += ' and s.f_operatorid in (' + this.f_operatorid + ')'
|
|
298
|
+
}
|
|
299
|
+
this.startDate=this.$refs.paged.$refs.cri.model.startDate.substring(0,10)
|
|
300
|
+
this.endDate=this.$refs.paged.$refs.cri.model.endDate.substring(0,10)
|
|
301
|
+
this.orgCondtionStr=orgcondition
|
|
302
|
+
this.$refs.paged.$refs.cri.model.f_orgid = orgcondition
|
|
303
|
+
this.model.search(args.f_orgid, args.model)
|
|
304
|
+
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
|
|
305
|
+
},
|
|
306
|
+
getRes (obj) {
|
|
307
|
+
this.orgname = obj.res[0]
|
|
308
|
+
this.depresid = obj.resids
|
|
309
|
+
this.f_orgid = obj.resids
|
|
310
|
+
},
|
|
311
|
+
getdep (obj, val) {
|
|
312
|
+
this.depname = val
|
|
313
|
+
this.userresid = obj
|
|
314
|
+
this.f_depid = obj
|
|
315
|
+
},
|
|
316
|
+
getuser ( obj, val) {
|
|
317
|
+
this.operatorname = val[0]
|
|
318
|
+
this.f_operatorid = obj
|
|
319
|
+
},
|
|
320
|
+
stamp() {
|
|
321
|
+
this.all = false
|
|
322
|
+
//默认选择要打印的列
|
|
323
|
+
this.modelval = defaultPrint.config
|
|
324
|
+
this.fields = this.getfield
|
|
325
|
+
console.log('所有打印字段', this.fields)
|
|
326
|
+
this.printshow = true
|
|
327
|
+
this.put()
|
|
328
|
+
},
|
|
329
|
+
put() {
|
|
330
|
+
// 对Modelval进行排序
|
|
331
|
+
this.sortModelval()
|
|
332
|
+
this.thead = `<tr><th colspan=${this.modelval.length}>收费记录不匹配查询</th></tr><tr>`
|
|
333
|
+
for (let key of this.modelval) {
|
|
334
|
+
this.thead += '<th>' + this.fields[key] + '</th>'
|
|
335
|
+
}
|
|
336
|
+
this.thead += '</tr>'
|
|
337
|
+
},
|
|
338
|
+
print() {
|
|
339
|
+
this.$refs.print.PrintAsFile()
|
|
340
|
+
this.printshow = false
|
|
341
|
+
},
|
|
342
|
+
dealmsg(val) {
|
|
343
|
+
console.log('---------------dealmsg')
|
|
344
|
+
this.rowdata=val
|
|
345
|
+
this.show=true
|
|
346
|
+
val.model = this.model.model
|
|
347
|
+
this.$dispatch('deal-msg', val)
|
|
348
|
+
},
|
|
349
|
+
close() {
|
|
350
|
+
this.printshow = false
|
|
351
|
+
this.all = false
|
|
352
|
+
},
|
|
353
|
+
// 对选择的列进行排序
|
|
354
|
+
sortModelval() {
|
|
355
|
+
let sortModel = []
|
|
356
|
+
Object.keys(this.fields).forEach((key) => {
|
|
357
|
+
if (this.modelval.includes(key)) {
|
|
358
|
+
sortModel.push(key)
|
|
359
|
+
}
|
|
360
|
+
})
|
|
361
|
+
this.modelval = sortModel
|
|
362
|
+
console.log('选择的打印的字段', this.modelval)
|
|
363
|
+
},
|
|
364
|
+
userTypeChange () {
|
|
365
|
+
this.gasproperties=[]
|
|
366
|
+
if(this.$refs.paged.$refs.criteria.model !==null) {
|
|
367
|
+
this.$refs.paged.$refs.criteria.model.f_gasproperties=''
|
|
368
|
+
this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type[0])
|
|
369
|
+
}
|
|
370
|
+
else{
|
|
371
|
+
this.gasproperties =[{label: '全部', value: ''}]
|
|
372
|
+
}
|
|
373
|
+
},
|
|
374
|
+
},
|
|
375
|
+
watch: {
|
|
376
|
+
'all'(val) {
|
|
377
|
+
if (val) {
|
|
378
|
+
this.modelval = this.bodyData
|
|
379
|
+
} else {
|
|
380
|
+
this.modelval = defaultPrint.config
|
|
381
|
+
this.put()
|
|
382
|
+
}
|
|
383
|
+
},
|
|
384
|
+
'modelval.length'() {
|
|
385
|
+
this.put()
|
|
386
|
+
},
|
|
387
|
+
sumsmodel:{
|
|
388
|
+
handler: function(val) {
|
|
389
|
+
this.getotherfooter();
|
|
390
|
+
},
|
|
391
|
+
deep: true
|
|
392
|
+
}
|
|
393
|
+
},
|
|
394
|
+
computed: {
|
|
395
|
+
getCondition() {
|
|
396
|
+
return {
|
|
397
|
+
startDate: this.$refs.paged.$refs.cri.model.startDate,
|
|
398
|
+
endDate: this.$refs.paged.$refs.cri.model.endDate,
|
|
399
|
+
f_orgid: this.orgCondtionStr
|
|
400
|
+
|
|
401
|
+
}
|
|
402
|
+
|
|
403
|
+
},
|
|
404
|
+
getfield() {
|
|
405
|
+
return exportConfig.UserGasFillCardConfig
|
|
406
|
+
},
|
|
407
|
+
whetherpaies () {
|
|
408
|
+
return [
|
|
409
|
+
{label: '全部', value: ''},
|
|
410
|
+
{label: '已缴费', value: '是'},
|
|
411
|
+
{label: '未缴费', value: '否'}
|
|
412
|
+
]
|
|
413
|
+
},
|
|
414
|
+
usertypes() {
|
|
415
|
+
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
|
|
416
|
+
}
|
|
417
|
+
|
|
418
|
+
}
|
|
419
|
+
}
|
|
420
|
+
</script>
|
|
@@ -459,7 +459,11 @@
|
|
|
459
459
|
},
|
|
460
460
|
computed: {
|
|
461
461
|
getCondition() {
|
|
462
|
-
return {
|
|
462
|
+
return {
|
|
463
|
+
condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
|
|
464
|
+
startDate: this.$refs.paged.$refs.cri.model.startDate,
|
|
465
|
+
endDate: this.$refs.paged.$refs.cri.model.endDate
|
|
466
|
+
}
|
|
463
467
|
},
|
|
464
468
|
getfield() {
|
|
465
469
|
return exportConfig.BalanceTableConfig
|
|
@@ -103,8 +103,6 @@
|
|
|
103
103
|
<script>
|
|
104
104
|
import TabButton from '../common/TabButton'
|
|
105
105
|
import Tabs from '../common/Tabs'
|
|
106
|
-
import ArrearsQuery from './ArrearsQuery'
|
|
107
|
-
|
|
108
106
|
|
|
109
107
|
export default {
|
|
110
108
|
title: '汇总查询',
|
|
@@ -122,7 +120,7 @@
|
|
|
122
120
|
show: []
|
|
123
121
|
}
|
|
124
122
|
},
|
|
125
|
-
components: {Tabs, TabButton
|
|
123
|
+
components: {Tabs, TabButton},
|
|
126
124
|
methods: {
|
|
127
125
|
permission (name) {
|
|
128
126
|
if (this.$login.r.find(value => value == '综合查询')) {
|
|
@@ -284,9 +284,9 @@
|
|
|
284
284
|
getCondition() {
|
|
285
285
|
var con = ""
|
|
286
286
|
if (this.orgCondtionStr) {
|
|
287
|
-
con = `${this.$refs.paged.$refs.cri.condition} `
|
|
287
|
+
con = `${this.$refs.paged.$refs.cri.condition} ` + this.orgCondtionStr
|
|
288
288
|
} else {
|
|
289
|
-
con = `${this.$refs.paged.$refs.cri.condition}`
|
|
289
|
+
con = `${this.$refs.paged.$refs.cri.condition} and f_orgid in ('${this.$login.f.orgid}' )`
|
|
290
290
|
}
|
|
291
291
|
return {
|
|
292
292
|
startdate: this.$refs.paged.$refs.cri.model.startDate,
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
<export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
|
|
47
47
|
:field="$parent.$parent.getfield" :header="$parent.$parent.other"
|
|
48
48
|
:defaultselect="$parent.$parent.defaultexport"
|
|
49
|
-
sqlurl="rs/logic/exportfile" sql-name="
|
|
49
|
+
sqlurl="rs/logic/exportfile" sql-name="manage_singleTable" template-name='团缴查询导出'
|
|
50
50
|
:choose-col="true">
|
|
51
51
|
</export-excel>
|
|
52
52
|
|
|
@@ -415,7 +415,9 @@
|
|
|
415
415
|
startDate: this.$refs.paged.$refs.cri.model.startDate,
|
|
416
416
|
endDate: this.$refs.paged.$refs.cri.model.endDate,
|
|
417
417
|
condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
|
|
418
|
-
orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"
|
|
418
|
+
orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc",
|
|
419
|
+
items: "*",
|
|
420
|
+
tablename: "t_sellinggasbatch"
|
|
419
421
|
}
|
|
420
422
|
},
|
|
421
423
|
getfield() {
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
<export-excel :data="$parent.$parent.getCondition"
|
|
47
47
|
:field="$parent.$parent.getfield"
|
|
48
48
|
:header="$parent.$parent.other"
|
|
49
|
-
sqlurl="rs/logic/exportfile" sql-name="
|
|
49
|
+
sqlurl="rs/logic/exportfile" sql-name="movemeterQuery" template-name='迁表查询导出'
|
|
50
50
|
:choose-col="true"></export-excel>
|
|
51
51
|
<print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
|
|
52
52
|
:defaultfield="$parent.$parent.defaultfield"
|
|
@@ -194,15 +194,15 @@
|
|
|
194
194
|
<template partial='head'>
|
|
195
195
|
<tr>
|
|
196
196
|
<th>
|
|
197
|
-
<
|
|
198
|
-
|
|
199
|
-
<!-- :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>-->
|
|
197
|
+
<data-order field="f_userinfo_code" name="客户编号">
|
|
198
|
+
:order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
|
|
200
199
|
</th>
|
|
201
200
|
<th>
|
|
202
201
|
<nobr>客户名称</nobr>
|
|
203
202
|
</th>
|
|
204
203
|
<th>
|
|
205
|
-
<
|
|
204
|
+
<data-order field="f_address" name="客户地址"
|
|
205
|
+
:order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
|
|
206
206
|
</th>
|
|
207
207
|
<th>
|
|
208
208
|
<nobr>表号</nobr>
|
|
@@ -223,7 +223,6 @@
|
|
|
223
223
|
<nobr>收票人</nobr>
|
|
224
224
|
</th>
|
|
225
225
|
<th>
|
|
226
|
-
<!-- <nobr>操作日期</nobr>-->
|
|
227
226
|
<data-order field="f_operate_date" name="操作日期"
|
|
228
227
|
:order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
|
|
229
228
|
</th>
|
|
@@ -234,8 +233,7 @@
|
|
|
234
233
|
<nobr>客户名称</nobr>
|
|
235
234
|
</th>
|
|
236
235
|
<th>
|
|
237
|
-
|
|
238
|
-
<data-order field="f_address" name="客户地址"
|
|
236
|
+
<data-order field="f_buy_address" name="客户地址"
|
|
239
237
|
:order.sync="$parent.$parent.$parent.orderFields.f_buy_address"></data-order>
|
|
240
238
|
</th>
|
|
241
239
|
<th>
|
|
@@ -438,7 +438,7 @@
|
|
|
438
438
|
getCondition () {
|
|
439
439
|
var con = ""
|
|
440
440
|
if (this.orgCondtionStr) {
|
|
441
|
-
con = `${this.$refs.paged.$refs.cri.condition}
|
|
441
|
+
con = `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr
|
|
442
442
|
}
|
|
443
443
|
else {
|
|
444
444
|
con = `${this.$refs.paged.$refs.cri.condition} and f_orgid in ('${this.$login.f.orgid}' )`
|
|
@@ -654,7 +654,8 @@ export default{
|
|
|
654
654
|
expectgasConfig: {
|
|
655
655
|
'f_month': '月份', 'f_orgname': '公司', 'f_gy_num': '工业户数', 'f_my_num': '民用户数', 'f_jt_num': '集体户数', 'f_sy_num': '商业户数', 'f_sum_num': '户数合计',
|
|
656
656
|
'f_gy_gas': '工业抄表量', 'f_my_gas': '民用抄表量', 'f_jt_gas': '集体抄表量', 'f_sy_gas': '商业抄表量', 'f_sum_gas': '抄表量合计',
|
|
657
|
-
'f_gy_account': '工业抄表金额', 'f_my_account': '民用抄表金额', 'f_jt_account': '集体抄表金额', 'f_sy_account': '商业抄表金额', 'f_sum_account': '抄表金额合计'
|
|
657
|
+
'f_gy_account': '工业抄表金额', 'f_my_account': '民用抄表金额', 'f_jt_account': '集体抄表金额', 'f_sy_account': '商业抄表金额', 'f_sum_account': '抄表金额合计',
|
|
658
|
+
'f_old_gas': '冲正气量','f_old_fee': '冲正金额','f_old_num':'冲正户数'
|
|
658
659
|
},
|
|
659
660
|
pregaslistConfig: {
|
|
660
661
|
'f_month': '月份', 'f_last_balance': '期初余额', 'f_wechat_pay': '微信', 'f_money_pay': '现金', 'f_bank_pay': '银行转账',
|
|
@@ -230,7 +230,8 @@
|
|
|
230
230
|
getCondition() {
|
|
231
231
|
return {
|
|
232
232
|
condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
|
|
233
|
-
orderitem: this.orderitem?`${this.orderitem}`: " logindate desc"
|
|
233
|
+
orderitem: this.orderitem?`${this.orderitem}`: " logindate desc",
|
|
234
|
+
tablename: 't_loginrecord'
|
|
234
235
|
}
|
|
235
236
|
},
|
|
236
237
|
getfield() {
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
:defaultselect="$parent.$parent.selectfields"
|
|
50
50
|
:field="$parent.$parent.getfield"
|
|
51
51
|
:exportprogress="true"
|
|
52
|
-
sqlurl="rs/logic/
|
|
52
|
+
sqlurl="rs/logic/exportfile"
|
|
53
53
|
sql-name='getValueaddInfo'
|
|
54
54
|
template-name="续保用户增值业务信息" :choose-col="true"></export-excel-plus>
|
|
55
55
|
<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>
|
|
@@ -172,7 +172,7 @@
|
|
|
172
172
|
}).catch((error) => {
|
|
173
173
|
this.$emit('error', error)
|
|
174
174
|
})
|
|
175
|
-
for(var item in exportConfig.
|
|
175
|
+
for(var item in exportConfig.valuecountConfig){
|
|
176
176
|
this.selectfields.push(item)
|
|
177
177
|
}
|
|
178
178
|
},
|
|
@@ -307,7 +307,7 @@
|
|
|
307
307
|
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气价类型')]
|
|
308
308
|
},
|
|
309
309
|
getfield() {
|
|
310
|
-
return exportConfig.
|
|
310
|
+
return exportConfig.valuecountConfig
|
|
311
311
|
},
|
|
312
312
|
|
|
313
313
|
}
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
:defaultselect="$parent.$parent.selectfields"
|
|
40
40
|
:field="$parent.$parent.getfield"
|
|
41
41
|
:exportprogress="true"
|
|
42
|
-
sqlurl="rs/logic/
|
|
42
|
+
sqlurl="rs/logic/exportfile"
|
|
43
43
|
sql-name='getValueaddInfo'
|
|
44
44
|
template-name="用户增值业务信息" :choose-col="true"></export-excel-plus>
|
|
45
45
|
<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>
|
|
@@ -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>
|