manage-client 3.2.88-2 → 3.2.90
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/SellReport/NonResidentGas.vue +216 -216
- package/src/components/SellReport/ReportComponrnt/TieAnAccount.vue +507 -507
- package/src/components/SellReport/ReportItems.vue +246 -246
- package/src/components/sale/businessquery/ArrearsQuery.vue +934 -934
- package/src/components/sale/businessquery/ChargeQuery.vue +1277 -1277
- package/src/components/sale/businessquery/InspectListGas.vue +552 -552
- package/src/components/sale/businessquery/InspectListUser.vue +449 -449
- package/src/components/sale/businessquery/OtherChargeQuery.vue +1 -1
- package/src/components/sale/config/exportConfig.js +944 -944
- package/src/components/webmeter/gasStatistics/GasStatistics.vue +8 -12
- package/src/components/webmeter/instruction/NewQueryInstruct.vue +446 -446
- package/src/filiale/liaoyuan/MeterQuery.vue +905 -905
- package/src/filiale/liaoyuan/RecordInfoQuery.vue +1163 -1163
- package/src/filiale/liaoyuan/ReportList.vue +421 -421
- package/src/filiale/macheng/FxGasTable.vue +236 -236
- package/src/filiale/macheng/ManageDayGas.vue +248 -248
- package/src/filiale/macheng/ManageHandSellMoney.vue +249 -249
- package/src/filiale/macheng/ManageMonthGas.vue +250 -250
- package/src/filiale/macheng/ManageOtherCharge.vue +251 -251
- package/src/filiale/macheng/ManageSellType.vue +287 -287
- package/src/filiale/macheng/RecordInfoQuery.vue +1023 -1023
- package/src/filiale/macheng/SellingTable.vue +219 -219
- package/src/filiale/macheng/UserBalanceReport.vue +178 -178
- package/src/filiale/macheng/config/exportConfig.js +67 -67
- package/src/filiale/macheng/reportManage.js +19 -19
- package/src/filiale/macheng/sale.js +11 -11
- package/src/filiale/meihekou/HandplanQuery.vue +1234 -1234
- package/src/filiale/qianneng/OtherChargeQuery.vue +646 -646
- package/src/filiale/qianneng/SellDepReport.vue +269 -269
- package/src/filiale/qianneng/reportManage.js +10 -10
- package/src/filiale/qianneng/sale.js +12 -12
- package/src/main.js +66 -65
- package/.gradle/4.4/fileContent/fileContent.lock +0 -0
- package/.gradle/4.4/taskHistory/taskHistory.bin +0 -0
- package/.gradle/4.4/taskHistory/taskHistory.lock +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
|
@@ -353,12 +353,8 @@
|
|
|
353
353
|
|
|
354
354
|
search (args) {
|
|
355
355
|
args.condition = `${args.condition}`+this.orgcondition
|
|
356
|
-
console.log(args.condition+"args.condition")
|
|
357
356
|
this.condition = args.condition
|
|
358
357
|
this.model.search(args.condition, args.model)
|
|
359
|
-
console.log(this.$refs.paged.$refs.grid.model.sums+"--this.$refs.paged.$refs.grid.model.sums")
|
|
360
|
-
console.log(this.f_gas_state)
|
|
361
|
-
|
|
362
358
|
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
|
|
363
359
|
// args.condition = `${args.condition}`
|
|
364
360
|
// if (this.orgcondition)
|
|
@@ -444,17 +440,17 @@
|
|
|
444
440
|
]
|
|
445
441
|
},
|
|
446
442
|
getCondition () {
|
|
447
|
-
var con = ""
|
|
448
|
-
if (this.orgCondtionStr) {
|
|
449
|
-
|
|
450
|
-
}
|
|
451
|
-
else {
|
|
452
|
-
|
|
453
|
-
}
|
|
443
|
+
// var con = ""
|
|
444
|
+
// if (this.orgCondtionStr) {
|
|
445
|
+
// con = `${this.$refs.paged.$refs.criteria.condition} and m.f_orgid in (${this.orgCondtionStr})`
|
|
446
|
+
// }
|
|
447
|
+
// else {
|
|
448
|
+
// con = `${this.$refs.paged.$refs.criteria.condition}and m.f_orgid in ('${this.$login.f.orgid}' )`
|
|
449
|
+
// }
|
|
454
450
|
return {
|
|
455
451
|
startDate: this.$refs.paged.$refs.criteria.model.startDate,
|
|
456
452
|
endDate: this.$refs.paged.$refs.criteria.model.endDate,
|
|
457
|
-
condition:
|
|
453
|
+
condition: this.condition
|
|
458
454
|
}
|
|
459
455
|
}
|
|
460
456
|
}
|