manage-client 3.3.32 → 3.3.33
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -6,6 +6,26 @@
|
|
|
6
6
|
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
|
|
7
7
|
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
8
8
|
<div class="row">
|
|
9
|
+
<div class="col-sm-2 form-group">
|
|
10
|
+
<label class="font_normal_body">按单位查询</label>
|
|
11
|
+
<v-select :value.sync="$parent.$parent.f_is_company"
|
|
12
|
+
:options='$parent.$parent.isCompany'
|
|
13
|
+
placeholder='请选择' v-model="$parent.$parent.f_is_company"
|
|
14
|
+
@change="$parent.$parent.isCompanyChange()"
|
|
15
|
+
value-single="true"
|
|
16
|
+
:disabled="$parent.$parent.isCompanyShow"
|
|
17
|
+
close-on-select></v-select>
|
|
18
|
+
</div>
|
|
19
|
+
<div class="col-sm-2 form-group">
|
|
20
|
+
<label class="font_normal_body">按小区查询</label>
|
|
21
|
+
<v-select :value.sync="$parent.$parent.f_is_area"
|
|
22
|
+
:options='$parent.$parent.isArea'
|
|
23
|
+
placeholder='请选择' v-model="$parent.$parent.f_is_area"
|
|
24
|
+
@change="$parent.$parent.isAreaChange()"
|
|
25
|
+
value-single="true"
|
|
26
|
+
:disabled="$parent.$parent.isAreaShow"
|
|
27
|
+
close-on-select></v-select>
|
|
28
|
+
</div>
|
|
9
29
|
<div class="col-sm-2 form-group">
|
|
10
30
|
<label for="startDate" class="font_normal_body">开始日期</label>
|
|
11
31
|
<datepicker id="startDate" placeholder="开始日期" style="width:60%"
|
|
@@ -24,28 +44,6 @@
|
|
|
24
44
|
:show-reset-button="true">
|
|
25
45
|
</datepicker>
|
|
26
46
|
</div>
|
|
27
|
-
<res-select-group
|
|
28
|
-
:show-component="['company','slicearea']"
|
|
29
|
-
:initres="$parent.$parent.initres"
|
|
30
|
-
@re-res="$parent.$parent.getRes"
|
|
31
|
-
v-ref:sel
|
|
32
|
-
></res-select-group>
|
|
33
|
-
<div class="col-sm-2 form-group">
|
|
34
|
-
<label class="font_normal_body">用户类型</label>
|
|
35
|
-
<v-select :value.sync="model.f_user_type"
|
|
36
|
-
:options='$parent.$parent.usertypes'
|
|
37
|
-
placeholder='请选择' v-model="model.f_user_type"
|
|
38
|
-
condition="f_user_type = '{}'"
|
|
39
|
-
close-on-select></v-select>
|
|
40
|
-
</div>
|
|
41
|
-
<div class="col-sm-2 form-group">
|
|
42
|
-
<label class="font_normal_body">使用类型</label>
|
|
43
|
-
<v-select :value.sync="model.f_usetype" v-model="model.f_usetype"
|
|
44
|
-
:options='$parent.$parent.useTypes' placeholder='请选择'
|
|
45
|
-
style="width:60%"
|
|
46
|
-
close-on-select
|
|
47
|
-
condition="f_usetype = '{}'"></v-select>
|
|
48
|
-
</div>
|
|
49
47
|
<div class="span" style="float:right;">
|
|
50
48
|
<button class="button_search button_spacing" @click="search()">查询</button>
|
|
51
49
|
|
|
@@ -62,6 +60,81 @@
|
|
|
62
60
|
titletable="用户查询" :starthead="$parent.$parent.startDate"
|
|
63
61
|
:defaultfield="$parent.$parent.defaultfield"
|
|
64
62
|
:sumsmodel="$parent.$parent.sumsmodel"></print-data>
|
|
63
|
+
<div
|
|
64
|
+
:class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
|
|
65
|
+
@click="$parent.$parent.hidden()"
|
|
66
|
+
class="button_spacing"
|
|
67
|
+
style="float: right"></div>
|
|
68
|
+
</div>
|
|
69
|
+
</div>
|
|
70
|
+
<div class="row" v-if="$parent.$parent.criteriaShow">
|
|
71
|
+
<res-select-group
|
|
72
|
+
:show-component="['company','slicearea']"
|
|
73
|
+
:initres="$parent.$parent.initres"
|
|
74
|
+
@re-res="$parent.$parent.getRes"
|
|
75
|
+
v-ref:sel
|
|
76
|
+
></res-select-group>
|
|
77
|
+
<div class="col-sm-2 form-group">
|
|
78
|
+
<label class="font_normal_body">用户类型</label>
|
|
79
|
+
<v-select :value.sync="model.f_user_type"
|
|
80
|
+
:options='$parent.$parent.usertypes'
|
|
81
|
+
@change="$parent.$parent.userTypeChange()"
|
|
82
|
+
placeholder='请选择' v-model="model.f_user_type"
|
|
83
|
+
condition="f_user_type = '{}'"
|
|
84
|
+
close-on-select></v-select>
|
|
85
|
+
</div>
|
|
86
|
+
<div class="col-sm-2 form-group">
|
|
87
|
+
<label for="f_user_usetype" class="font_normal_body ">用气类型</label>
|
|
88
|
+
<v-select :value.sync="model.f_user_usetype" :search="false"
|
|
89
|
+
@change="$parent.$parent.userUseTypeChange()"
|
|
90
|
+
v-model="model.f_user_usetype"
|
|
91
|
+
:options='$parent.$parent.userusetypes'
|
|
92
|
+
condition="f_user_usetype = '{}'"
|
|
93
|
+
placeholder='用气类型'
|
|
94
|
+
close-on-select>
|
|
95
|
+
</v-select>
|
|
96
|
+
</div>
|
|
97
|
+
<div class="col-sm-2 form-group">
|
|
98
|
+
<label for="f_use_institution" class="font_normal_body">用气机构</label>
|
|
99
|
+
<v-select :value.sync="model.f_use_institution" :search="false"
|
|
100
|
+
@change="$parent.$parent.userUseInstitutionChange()"
|
|
101
|
+
v-model="model.f_use_institution"
|
|
102
|
+
:options='$parent.$parent.useinstitutions'
|
|
103
|
+
condition="f_use_institution = '{}'"
|
|
104
|
+
placeholder='用气机构'
|
|
105
|
+
close-on-select>
|
|
106
|
+
</v-select>
|
|
107
|
+
</div>
|
|
108
|
+
<div class="col-sm-2 form-group">
|
|
109
|
+
<label for="f_user_usenature" class="font_normal_body ">使用性质</label>
|
|
110
|
+
<v-select :value.sync="model.f_user_usenature" :search="false"
|
|
111
|
+
v-model="model.f_user_usenature"
|
|
112
|
+
:options='$parent.$parent.userusenatures'
|
|
113
|
+
condition="f_user_usenature = '{}'"
|
|
114
|
+
placeholder='使用性质'
|
|
115
|
+
close-on-select>
|
|
116
|
+
</v-select>
|
|
117
|
+
</div>
|
|
118
|
+
<div class="col-sm-2 form-group">
|
|
119
|
+
<label for="endDate" class="font_normal_body">单位名称</label>
|
|
120
|
+
<v-select :value.sync="model.f_company_id"
|
|
121
|
+
class="select_list select"
|
|
122
|
+
enter-push :disabled="$parent.$parent.isCompanyShow"
|
|
123
|
+
v-model="model.f_company_id" multiple="true"
|
|
124
|
+
:options='$parent.$parent.corporatename' placeholder='单位名称'
|
|
125
|
+
condition="f_company_id in {}">
|
|
126
|
+
</v-select>
|
|
127
|
+
</div>
|
|
128
|
+
<div class="col-sm-2 form-group">
|
|
129
|
+
<label for="endDate" class="font_normal_body">小区名称</label>
|
|
130
|
+
<v-select :value.sync="model.f_residential_area_id"
|
|
131
|
+
class="select_list select"
|
|
132
|
+
enter-push :disabled="$parent.$parent.isAreaShow"
|
|
133
|
+
v-model="model.f_residential_area_id" multiple="true"
|
|
134
|
+
@select-search="$parent.$parent.getAreaList"
|
|
135
|
+
:options='$parent.$parent.areaList' placeholder='小区名称'
|
|
136
|
+
condition="f_residential_area_id in {}">
|
|
137
|
+
</v-select>
|
|
65
138
|
</div>
|
|
66
139
|
</div>
|
|
67
140
|
</div>
|
|
@@ -72,13 +145,19 @@
|
|
|
72
145
|
<th>
|
|
73
146
|
<nobr>序号</nobr>
|
|
74
147
|
</th>
|
|
75
|
-
<th>
|
|
148
|
+
<th v-show="!$parent.$parent.$parent.isAreaShow && !$parent.$parent.$parent.isCompanyShow">
|
|
76
149
|
<nobr>用户编号</nobr>
|
|
77
150
|
</th>
|
|
78
|
-
<th>
|
|
151
|
+
<th v-show="!$parent.$parent.$parent.isAreaShow && !$parent.$parent.$parent.isCompanyShow">
|
|
79
152
|
<nobr>用户名称</nobr>
|
|
80
153
|
</th>
|
|
81
|
-
<th>
|
|
154
|
+
<th v-show="$parent.$parent.$parent.isAreaShow">
|
|
155
|
+
<nobr>单位名称</nobr>
|
|
156
|
+
</th>
|
|
157
|
+
<th v-show="$parent.$parent.$parent.isCompanyShow">
|
|
158
|
+
<nobr>小区名称</nobr>
|
|
159
|
+
</th>
|
|
160
|
+
<th v-show="!$parent.$parent.$parent.isAreaShow && !$parent.$parent.$parent.isCompanyShow">
|
|
82
161
|
<nobr>购气（充值）时间</nobr>
|
|
83
162
|
</th>
|
|
84
163
|
<th>
|
|
@@ -87,34 +166,40 @@
|
|
|
87
166
|
<th>
|
|
88
167
|
<nobr>一阶气量</nobr>
|
|
89
168
|
</th>
|
|
90
|
-
<th>
|
|
169
|
+
<th v-show="!$parent.$parent.$parent.isAreaShow || $parent.$parent.$parent.isCompanyShow">
|
|
91
170
|
<nobr>二阶气量</nobr>
|
|
92
171
|
</th>
|
|
93
|
-
<th>
|
|
172
|
+
<th v-show="!$parent.$parent.$parent.isAreaShow || $parent.$parent.$parent.isCompanyShow">
|
|
94
173
|
<nobr>三阶气量</nobr>
|
|
95
174
|
</th>
|
|
96
175
|
<th>
|
|
97
176
|
<nobr>实收款</nobr>
|
|
98
177
|
</th>
|
|
99
|
-
<th>
|
|
178
|
+
<th v-show="!$parent.$parent.$parent.isAreaShow && !$parent.$parent.$parent.isCompanyShow">
|
|
100
179
|
<nobr>购气网点</nobr>
|
|
101
180
|
</th>
|
|
102
|
-
<th>
|
|
181
|
+
<th v-show="!$parent.$parent.$parent.isAreaShow && !$parent.$parent.$parent.isCompanyShow">
|
|
103
182
|
<nobr>操作员</nobr>
|
|
104
183
|
</th>
|
|
105
184
|
</tr>
|
|
106
185
|
</template>
|
|
107
186
|
<template partial='body'>
|
|
108
187
|
<td style="text-align:center">
|
|
109
|
-
<nobr>{{ $index+1 }}</nobr>
|
|
188
|
+
<nobr>{{ $index + 1 }}</nobr>
|
|
110
189
|
</td>
|
|
111
|
-
<td style="text-align: center;">
|
|
190
|
+
<td style="text-align: center;" v-show="!$parent.$parent.$parent.isAreaShow && !$parent.$parent.$parent.isCompanyShow">
|
|
112
191
|
<nobr>{{ row.f_userinfo_code }}</nobr>
|
|
113
192
|
</td>
|
|
114
|
-
<td style="text-align: center;">
|
|
193
|
+
<td style="text-align: center;" v-show="$parent.$parent.$parent.isAreaShow">
|
|
194
|
+
<nobr>{{ row.f_company_name }}</nobr>
|
|
195
|
+
</td>
|
|
196
|
+
<td style="text-align: center;" v-show="$parent.$parent.$parent.isCompanyShow">
|
|
197
|
+
<nobr>{{ row.f_residential_area}}</nobr>
|
|
198
|
+
</td>
|
|
199
|
+
<td style="text-align: center;" v-show="!$parent.$parent.$parent.isAreaShow && !$parent.$parent.$parent.isCompanyShow">
|
|
115
200
|
<nobr>{{ row.f_user_name }}</nobr>
|
|
116
201
|
</td>
|
|
117
|
-
<td style="text-align: center;">
|
|
202
|
+
<td style="text-align: center;" v-show="!$parent.$parent.$parent.isAreaShow && !$parent.$parent.$parent.isCompanyShow">
|
|
118
203
|
<nobr>{{ row.f_operate_date }}</nobr>
|
|
119
204
|
</td>
|
|
120
205
|
<td style="text-align: center;">
|
|
@@ -123,19 +208,19 @@
|
|
|
123
208
|
<td style="text-align: center;">
|
|
124
209
|
<nobr>{{ row.f_stairamount1 }}</nobr>
|
|
125
210
|
</td>
|
|
126
|
-
<td style="text-align: center;">
|
|
211
|
+
<td style="text-align: center;" v-show="!$parent.$parent.$parent.isAreaShow || $parent.$parent.$parent.isCompanyShow">
|
|
127
212
|
<nobr>{{ row.f_stairamount2 }}</nobr>
|
|
128
213
|
</td>
|
|
129
|
-
<td style="text-align: center;">
|
|
214
|
+
<td style="text-align: center;" v-show="!$parent.$parent.$parent.isAreaShow || $parent.$parent.$parent.isCompanyShow">
|
|
130
215
|
<nobr>{{ row.f_stairamount3 }}</nobr>
|
|
131
216
|
</td>
|
|
132
217
|
<td style="text-align: center;">
|
|
133
218
|
<nobr>{{ row.f_collection }}</nobr>
|
|
134
219
|
</td>
|
|
135
|
-
<td style="text-align: center;">
|
|
220
|
+
<td style="text-align: center;" v-show="!$parent.$parent.$parent.isAreaShow && !$parent.$parent.$parent.isCompanyShow">
|
|
136
221
|
<nobr>{{ row.f_depname }}</nobr>
|
|
137
222
|
</td>
|
|
138
|
-
<td style="text-align: center;">
|
|
223
|
+
<td style="text-align: center;" v-show="!$parent.$parent.$parent.isAreaShow && !$parent.$parent.$parent.isCompanyShow">
|
|
139
224
|
<nobr>{{ row.f_operator }}</nobr>
|
|
140
225
|
</td>
|
|
141
226
|
</template>
|
|
@@ -179,6 +264,8 @@ import PrintDataSelf from '../../components/sale/common/PrintDataSelf'
|
|
|
179
264
|
let readySomething = async function (self) {
|
|
180
265
|
self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
|
|
181
266
|
self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
|
|
267
|
+
self.getCompanyList()
|
|
268
|
+
self.getAreaList()
|
|
182
269
|
}
|
|
183
270
|
export default {
|
|
184
271
|
title: '用户查询',
|
|
@@ -195,11 +282,14 @@ export default {
|
|
|
195
282
|
depname: [],
|
|
196
283
|
operatorname: '',
|
|
197
284
|
condition: '',
|
|
198
|
-
|
|
285
|
+
orgConditionStr: '',
|
|
199
286
|
data: {},
|
|
200
287
|
other: [],
|
|
201
288
|
footer: [],
|
|
202
|
-
model: new PagedList('rs/sql/manage_chargeSummary', 20, {
|
|
289
|
+
model: new PagedList('rs/sql/manage_chargeSummary', 20, {
|
|
290
|
+
startDate: 'this.model.startDate',
|
|
291
|
+
endDate: 'this.model.endDate'
|
|
292
|
+
}, {
|
|
203
293
|
f_collection: 0,
|
|
204
294
|
f_gas: 0,
|
|
205
295
|
f_money: 0
|
|
@@ -207,7 +297,7 @@ export default {
|
|
|
207
297
|
gasproperties: [],
|
|
208
298
|
show: false,
|
|
209
299
|
rowdata: {},
|
|
210
|
-
|
|
300
|
+
areaList: [],
|
|
211
301
|
modelval: [],
|
|
212
302
|
startDate: '',
|
|
213
303
|
endDate: '',
|
|
@@ -220,10 +310,21 @@ export default {
|
|
|
220
310
|
defaultfield: [],
|
|
221
311
|
sumsmodel: {},
|
|
222
312
|
initres: {
|
|
223
|
-
org:[this.$login.f.orgid],
|
|
313
|
+
org: [this.$login.f.orgid],
|
|
224
314
|
slice_area: [],
|
|
225
315
|
},
|
|
226
|
-
|
|
316
|
+
criteriaShow: false,
|
|
317
|
+
userusetypes: [],
|
|
318
|
+
useinstitutions: [],
|
|
319
|
+
userusenatures: [],
|
|
320
|
+
sumExport: {'f_gas': '卡表购气', 'f_collection': '实收款', 'f_money': '物联表充值'},
|
|
321
|
+
isCompany: [{label: '是', value: '是'}, {label: '否', value: '否'}],
|
|
322
|
+
isArea: [{label: '是', value: '是'}, {label: '否', value: '否'}],
|
|
323
|
+
f_is_company: '否',
|
|
324
|
+
f_is_area: '否',
|
|
325
|
+
isCompanyShow: false,
|
|
326
|
+
isAreaShow: false,
|
|
327
|
+
corporatename: []
|
|
227
328
|
}
|
|
228
329
|
},
|
|
229
330
|
ready () {
|
|
@@ -234,6 +335,114 @@ export default {
|
|
|
234
335
|
})
|
|
235
336
|
},
|
|
236
337
|
methods: {
|
|
338
|
+
async getCompanyList(searchText){
|
|
339
|
+
let condition = ' 1 = 1 '
|
|
340
|
+
if (searchText) {
|
|
341
|
+
condition = ` f_company_name like '%${searchText}%' `
|
|
342
|
+
}
|
|
343
|
+
let HttpReset = new HttpResetClass()
|
|
344
|
+
HttpReset.load('POST', 'rs/sql/saleSingleTable?pageNo=1&pageSize=100', {
|
|
345
|
+
data: {
|
|
346
|
+
items: 'f_company_name, id',
|
|
347
|
+
tablename: 't_company',
|
|
348
|
+
orderitem: 'id desc',
|
|
349
|
+
condition: condition
|
|
350
|
+
}
|
|
351
|
+
}, {resolveMsg: null, rejectMsg: '获取单位信息失败!'}).then((req) => {
|
|
352
|
+
let redata = []
|
|
353
|
+
req.data.forEach((row, n) => {
|
|
354
|
+
redata[n] = {
|
|
355
|
+
label: row.f_company_name,
|
|
356
|
+
value: row.id
|
|
357
|
+
}
|
|
358
|
+
})
|
|
359
|
+
this.corporatename = [{label: '全部', value: ''}, ...redata]
|
|
360
|
+
})
|
|
361
|
+
},
|
|
362
|
+
getAreaList (searchText) {
|
|
363
|
+
let condition = ' 1 = 1 '
|
|
364
|
+
if (searchText) {
|
|
365
|
+
condition = ` f_residential_area like '%${searchText}%' `
|
|
366
|
+
}
|
|
367
|
+
let HttpReset = new HttpResetClass()
|
|
368
|
+
HttpReset.load('POST', 'rs/sql/saleSingleTable?pageNo=1&pageSize=100', {
|
|
369
|
+
data: {
|
|
370
|
+
items: 'f_residential_area, id',
|
|
371
|
+
tablename: 't_area',
|
|
372
|
+
orderitem: 'id desc',
|
|
373
|
+
condition: condition
|
|
374
|
+
}
|
|
375
|
+
}, {resolveMsg: null, rejectMsg: '获取小区信息失败!'}).then((req) => {
|
|
376
|
+
let redata = []
|
|
377
|
+
req.data.forEach((row, n) => {
|
|
378
|
+
redata[n] = {
|
|
379
|
+
label: row.f_residential_area,
|
|
380
|
+
value: row.id
|
|
381
|
+
}
|
|
382
|
+
})
|
|
383
|
+
this.areaList = [{label: '全部', value: ''}, ...redata]
|
|
384
|
+
})
|
|
385
|
+
},
|
|
386
|
+
isAreaChange () {
|
|
387
|
+
if(this.f_is_area){
|
|
388
|
+
if (this.f_is_area == '是') {
|
|
389
|
+
this.isCompanyShow = true
|
|
390
|
+
this.model = new PagedList('rs/sql/manage_chargeSummaryByArea', 20, {
|
|
391
|
+
startDate: 'this.model.startDate',
|
|
392
|
+
endDate: 'this.model.endDate',
|
|
393
|
+
condition2: 'this.model.condition2'
|
|
394
|
+
}, {f_collection: 0, f_gas: 0, f_money: 0})
|
|
395
|
+
} else {
|
|
396
|
+
this.isCompanyShow = false
|
|
397
|
+
this.model = new PagedList('rs/sql/manage_chargeSummary', 20, {
|
|
398
|
+
startDate: 'this.model.startDate',
|
|
399
|
+
endDate: 'this.model.endDate'
|
|
400
|
+
}, {f_collection: 0, f_gas: 0, f_money: 0})
|
|
401
|
+
}
|
|
402
|
+
}
|
|
403
|
+
},
|
|
404
|
+
isCompanyChange () {
|
|
405
|
+
if (this.f_is_company) {
|
|
406
|
+
if (this.f_is_company == '是') {
|
|
407
|
+
this.isAreaShow = true
|
|
408
|
+
this.model = new PagedList('rs/sql/manage_chargeSummaryByCompany', 20, {
|
|
409
|
+
startDate: 'this.model.startDate',
|
|
410
|
+
endDate: 'this.model.endDate',
|
|
411
|
+
condition2: 'this.model.condition2'
|
|
412
|
+
}, {f_collection: 0, f_gas: 0, f_money: 0})
|
|
413
|
+
} else {
|
|
414
|
+
this.isAreaShow = false
|
|
415
|
+
this.model = new PagedList('rs/sql/manage_chargeSummary', 20, {
|
|
416
|
+
startDate: 'this.model.startDate',
|
|
417
|
+
endDate: 'this.model.endDate'
|
|
418
|
+
}, {f_collection: 0, f_gas: 0, f_money: 0})
|
|
419
|
+
}
|
|
420
|
+
}
|
|
421
|
+
},
|
|
422
|
+
userTypeChange () {
|
|
423
|
+
this.userusetypes = []
|
|
424
|
+
if (this.$refs.paged.$refs.cri.model.f_user_type.length === 1) {
|
|
425
|
+
let str = this.$refs.paged.$refs.cri.model.f_user_type[0] + '用气类型'
|
|
426
|
+
this.userusetypes = this.$appdata.getParam(str)
|
|
427
|
+
}
|
|
428
|
+
},
|
|
429
|
+
userUseInstitutionChange () {
|
|
430
|
+
this.userusenatures = []
|
|
431
|
+
if (this.$refs.paged.$refs.cri.model.f_use_institution.length === 1) {
|
|
432
|
+
let str = this.$refs.paged.$refs.cri.model.f_use_institution[0] + '使用性质'
|
|
433
|
+
this.userusenatures = this.$appdata.getParam(str)
|
|
434
|
+
}
|
|
435
|
+
},
|
|
436
|
+
userUseTypeChange () {
|
|
437
|
+
this.useinstitutions = []
|
|
438
|
+
if (this.$refs.paged.$refs.cri.model.f_user_usetype.length === 1) {
|
|
439
|
+
let str = this.$refs.paged.$refs.cri.model.f_user_usetype[0] + '机构'
|
|
440
|
+
this.useinstitutions = this.$appdata.getParam(str)
|
|
441
|
+
}
|
|
442
|
+
},
|
|
443
|
+
hidden () {
|
|
444
|
+
this.criteriaShow = !this.criteriaShow
|
|
445
|
+
},
|
|
237
446
|
getotherfooter () {
|
|
238
447
|
this.other = []
|
|
239
448
|
this.footer = []
|
|
@@ -252,22 +461,48 @@ export default {
|
|
|
252
461
|
search () {
|
|
253
462
|
this.$refs.paged.$refs.cri.search()
|
|
254
463
|
},
|
|
464
|
+
appendCondition (data) {
|
|
465
|
+
console.log('data=====>',data)
|
|
466
|
+
let stringValue = ''
|
|
467
|
+
for (var i = 0; i < data.length; i++) {
|
|
468
|
+
if (data[i]) {
|
|
469
|
+
if (i === data.length - 1) {
|
|
470
|
+
stringValue = stringValue + "'" + data[i] + "'"
|
|
471
|
+
} else {
|
|
472
|
+
stringValue = stringValue + "'" + data[i] + "',"
|
|
473
|
+
}
|
|
474
|
+
}
|
|
475
|
+
}
|
|
476
|
+
return stringValue
|
|
477
|
+
},
|
|
255
478
|
async selfSearch (args) {
|
|
256
|
-
|
|
257
|
-
|
|
479
|
+
let companyCondition2 = '1=1'
|
|
480
|
+
if (!this.orgConditionStr) {
|
|
481
|
+
args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
|
|
482
|
+
companyCondition2 = companyCondition2 + ' and f_orgid = ' + this.$login.f.orgid
|
|
258
483
|
} else {
|
|
259
|
-
args.condition = `${args.condition}` + this.
|
|
484
|
+
args.condition = `${args.condition}` + this.orgConditionStr
|
|
485
|
+
companyCondition2 = companyCondition2 + this.orgConditionStr
|
|
260
486
|
}
|
|
487
|
+
if (this.isAreaShow || this.isCompanyShow) {
|
|
488
|
+
if (args.model.f_company_id.length > 0) {
|
|
489
|
+
companyCondition2 = companyCondition2 + ' and id in (' + await this.appendCondition(args.model.f_company_id) + ')'
|
|
490
|
+
}
|
|
491
|
+
if (args.model.f_residential_area_id.length > 0) {
|
|
492
|
+
companyCondition2 = companyCondition2 + ' and id in (' + await this.appendCondition(args.model.f_residential_area_id) + ')'
|
|
493
|
+
}
|
|
494
|
+
}
|
|
495
|
+
args.model.condition2 = companyCondition2
|
|
261
496
|
this.condition = args.condition
|
|
262
497
|
console.log("查看条件",this.condition)
|
|
263
498
|
await this.model.search(args.condition, args.model)
|
|
264
|
-
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
|
|
265
|
-
this.card=''
|
|
266
|
-
this.IdCardInfo=''
|
|
267
|
-
console.log('合计字段',this.sumsmodel)
|
|
499
|
+
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
|
|
500
|
+
this.card = ''
|
|
501
|
+
this.IdCardInfo = ''
|
|
502
|
+
console.log('合计字段', this.sumsmodel)
|
|
268
503
|
},
|
|
269
|
-
getRes(obj) {
|
|
270
|
-
this.
|
|
504
|
+
getRes (obj) {
|
|
505
|
+
this.orgConditionStr = obj
|
|
271
506
|
},
|
|
272
507
|
stamp () {
|
|
273
508
|
this.all = false
|
|
@@ -338,13 +573,22 @@ export default {
|
|
|
338
573
|
return {
|
|
339
574
|
condition: this.condition,
|
|
340
575
|
startDate: this.$refs.paged.$refs.cri.model.startDate,
|
|
341
|
-
endDate: this.$refs.paged.$refs.cri.model.endDate
|
|
576
|
+
endDate: this.$refs.paged.$refs.cri.model.endDate,
|
|
577
|
+
condition2: this.$refs.paged.$refs.cri.model.condition2
|
|
342
578
|
}
|
|
343
579
|
},
|
|
344
580
|
getfield () {
|
|
345
|
-
|
|
581
|
+
let field
|
|
582
|
+
if (this.isAreaShow) {
|
|
583
|
+
field = exportConfig.manageChargeSummaryByCompanyConfig
|
|
584
|
+
} else if (this.isCompanyShow) {
|
|
585
|
+
field = exportConfig.manageChargeSummaryByAreaConfig
|
|
586
|
+
} else {
|
|
587
|
+
field = exportConfig.manageChargeSummaryConfig
|
|
588
|
+
}
|
|
589
|
+
return field
|
|
346
590
|
},
|
|
347
|
-
useTypes() {
|
|
591
|
+
useTypes () {
|
|
348
592
|
return [{label: '全部', value: ''}, ...this.$appdata.getParam('使用类型')]
|
|
349
593
|
},
|
|
350
594
|
usertypes () {
|
|
@@ -831,6 +831,20 @@ monthGasConfig: {
|
|
|
831
831
|
'f_collection': '实收款',
|
|
832
832
|
'f_depname': '购气网点',
|
|
833
833
|
'f_operator': '操作员'
|
|
834
|
+
},
|
|
835
|
+
manageChargeSummaryByCompanyConfig: {
|
|
836
|
+
'f_company_name': '单位名称',
|
|
837
|
+
'f_pregas': '购气（充值）数量',
|
|
838
|
+
'f_stairamount1': '一阶气量',
|
|
839
|
+
'f_collection': '实收款',
|
|
840
|
+
},
|
|
841
|
+
manageChargeSummaryByAreaConfig: {
|
|
842
|
+
'f_residential_area': '小区名称',
|
|
843
|
+
'f_pregas': '购气（充值）数量',
|
|
844
|
+
'f_stairamount1': '一阶气量',
|
|
845
|
+
'f_stairamount2': '二阶气量',
|
|
846
|
+
'f_stairamount3': '三阶气量',
|
|
847
|
+
'f_collection': '实收款'
|
|
834
848
|
}
|
|
835
849
|
}
|
|
836
850
|
|
|
@@ -686,42 +686,42 @@
|
|
|
686
686
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
687
687
|
气量合计: {{sumsmodel.f_pregas}}
|
|
688
688
|
</td>
|
|
689
|
-
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold"
|
|
690
|
-
应交金额合计: {{sumsmodel.fee}}
|
|
691
|
-
</td
|
|
692
|
-
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold"
|
|
693
|
-
违约金合计: {{sumsmodel.f_delaypay}}
|
|
694
|
-
</td
|
|
689
|
+
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
690
|
+
<!-- 应交金额合计: {{sumsmodel.fee}}-->
|
|
691
|
+
<!-- </td>-->
|
|
692
|
+
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
693
|
+
<!-- 违约金合计: {{sumsmodel.f_delaypay}}-->
|
|
694
|
+
<!-- </td>-->
|
|
695
695
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
696
696
|
燃气费合计: {{sumsmodel.f_preamount}}
|
|
697
697
|
</td>
|
|
698
|
-
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold"
|
|
699
|
-
预存金额合计: {{sumsmodel.f_yucun}}
|
|
700
|
-
</td
|
|
698
|
+
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
699
|
+
<!-- 预存金额合计: {{sumsmodel.f_yucun}}-->
|
|
700
|
+
<!-- </td>-->
|
|
701
701
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
702
702
|
收款合计: {{sumsmodel.f_collection}}
|
|
703
703
|
</td>
|
|
704
|
-
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold"
|
|
705
|
-
优惠合计: {{sumsmodel.f_privilege_money}}
|
|
706
|
-
</td
|
|
707
|
-
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold"
|
|
708
|
-
一阶气量合计: {{sumsmodel.f_stairamount1}}
|
|
709
|
-
</td
|
|
710
|
-
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold"
|
|
711
|
-
一阶气费合计: {{sumsmodel.f_stair1fee}}
|
|
712
|
-
</td
|
|
713
|
-
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold"
|
|
714
|
-
二阶气量合计: {{sumsmodel.f_stair2amount}}
|
|
715
|
-
</td
|
|
716
|
-
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold"
|
|
717
|
-
二阶气费合计: {{sumsmodel.f_stair2fee}}
|
|
718
|
-
</td
|
|
719
|
-
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold"
|
|
720
|
-
三阶气量合计: {{sumsmodel.f_stair3amount}}
|
|
721
|
-
</td
|
|
722
|
-
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold"
|
|
723
|
-
三阶气费合计: {{sumsmodel.f_stair3fee}}
|
|
724
|
-
</td
|
|
704
|
+
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
705
|
+
<!-- 优惠合计: {{sumsmodel.f_privilege_money}}-->
|
|
706
|
+
<!-- </td>-->
|
|
707
|
+
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
708
|
+
<!-- 一阶气量合计: {{sumsmodel.f_stairamount1}}-->
|
|
709
|
+
<!-- </td>-->
|
|
710
|
+
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
711
|
+
<!-- 一阶气费合计: {{sumsmodel.f_stair1fee}}-->
|
|
712
|
+
<!-- </td>-->
|
|
713
|
+
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
714
|
+
<!-- 二阶气量合计: {{sumsmodel.f_stair2amount}}-->
|
|
715
|
+
<!-- </td>-->
|
|
716
|
+
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
717
|
+
<!-- 二阶气费合计: {{sumsmodel.f_stair2fee}}-->
|
|
718
|
+
<!-- </td>-->
|
|
719
|
+
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
720
|
+
<!-- 三阶气量合计: {{sumsmodel.f_stair3amount}}-->
|
|
721
|
+
<!-- </td>-->
|
|
722
|
+
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
|
|
723
|
+
<!-- 三阶气费合计: {{sumsmodel.f_stair3fee}}-->
|
|
724
|
+
<!-- </td>-->
|
|
725
725
|
</tr>
|
|
726
726
|
</table>
|
|
727
727
|
</div>
|