manage-client 3.2.26 → 3.2.27
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/build/dev-server.js +174 -174
- package/gradle/wrapper/gradle-wrapper.properties +5 -5
- package/package.json +1 -1
- package/src/components/SellReport/ChargePrick.vue +43 -122
- package/src/components/sale/businessquery/ChangeMeterQuery.vue +8 -3
- package/src/components/sale/businessquery/FillCardQuery.vue +7 -3
- package/src/components/sale/businessquery/FillGasQuery.vue +19 -4
- package/src/components/sale/businessquery/InspectListUser.vue +433 -433
- package/src/components/sale/businessquery/OtherChargeQuery.vue +10 -5
- package/src/components/sale/businessquery/TransferQuery.vue +6 -2
- package/src/filiale/liaoyuan/ReportList.vue +421 -421
- package/src/filiale/macheng/RecordInfoQuery.vue +1023 -1023
- package/src/filiale/tongchuan/ChargeQuery.vue +19 -1
- package/src/filiale/tongchuan/FillGasQuery.vue +19 -4
- package/src/filiale/tongchuan/config/exportConfig.js +1 -1
- package/src/main.js +66 -67
|
@@ -339,6 +339,9 @@
|
|
|
339
339
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
340
340
|
收款合计: {{sumsmodel.f_money}}
|
|
341
341
|
</td>
|
|
342
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
343
|
+
户数合计: {{sumsmodel.hushu}}
|
|
344
|
+
</td>
|
|
342
345
|
</tr>
|
|
343
346
|
</table>
|
|
344
347
|
|
|
@@ -395,7 +398,7 @@
|
|
|
395
398
|
data: {},
|
|
396
399
|
other:[],
|
|
397
400
|
footer:[],
|
|
398
|
-
model: new PagedList('rs/sql/otherChargeQuery', 20, {}, {f_money: 0}),
|
|
401
|
+
model: new PagedList('rs/sql/otherChargeQuery', 20, {}, {f_money: 0,hushu:0}),
|
|
399
402
|
criteriaShow: false,
|
|
400
403
|
orgCondtionStr: '',
|
|
401
404
|
modelval: [],
|
|
@@ -474,15 +477,17 @@
|
|
|
474
477
|
search(){
|
|
475
478
|
this.$refs.paged.$refs.cri.search()
|
|
476
479
|
},
|
|
477
|
-
|
|
480
|
+
async selfSearch(args) {
|
|
478
481
|
if (this.data) {
|
|
479
482
|
this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
|
|
480
483
|
this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
|
|
481
484
|
}
|
|
482
485
|
args.condition = `${args.condition}` + this.orgCondtionStr
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
+
await this.model.search(args.condition, args.model)
|
|
487
|
+
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
|
|
488
|
+
this.sumsmodel.hushu=[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length
|
|
489
|
+
|
|
490
|
+
},
|
|
486
491
|
clear() {
|
|
487
492
|
//清空部门和人员
|
|
488
493
|
this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
|
|
@@ -184,6 +184,9 @@
|
|
|
184
184
|
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
185
185
|
过户费合计: {{sumsmodel.f_transfer_fees}}
|
|
186
186
|
</td>
|
|
187
|
+
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
188
|
+
户数合计: {{sumsmodel.hushu}}
|
|
189
|
+
</td>
|
|
187
190
|
</tr>
|
|
188
191
|
</table>
|
|
189
192
|
</div>
|
|
@@ -225,7 +228,7 @@
|
|
|
225
228
|
footer:[],
|
|
226
229
|
show:false,
|
|
227
230
|
rowdata:{},
|
|
228
|
-
model: new PagedList('rs/sql/transferQuery', 20, {}, {f_transfer_fees: 0}),
|
|
231
|
+
model: new PagedList('rs/sql/transferQuery', 20, {}, {f_transfer_fees: 0,hushu:0}),
|
|
229
232
|
criteriaShow: false,
|
|
230
233
|
initres: {
|
|
231
234
|
org:[this.$login.f.orgid],
|
|
@@ -302,8 +305,9 @@
|
|
|
302
305
|
args.condition = `${args.condition}` + this.orgCondtionStr
|
|
303
306
|
console.log('我的阐述', JSON.stringify(args.condition))
|
|
304
307
|
await this.model.search(args.condition, args.model)
|
|
305
|
-
|
|
306
308
|
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
|
|
309
|
+
this.sumsmodel.hushu=[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length
|
|
310
|
+
|
|
307
311
|
console.log('合计字段', this.sumsmodel)
|
|
308
312
|
},
|
|
309
313
|
dealmsg(val) {
|