manage-client 3.0.55-wsd → 3.0.57-wsd
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/sale/businessquery/ChargeQuery.vue +1 -0
- package/src/components/webmeter/DrillData/UserGasAll.vue +1 -3
- package/src/filiale/jinbin/exportConfig.js +1110 -0
- package/src/filiale/jinbin/sale/businessquery/ChargeQuery.vue +1372 -0
- package/src/filiale/jinbin/sale.js +7 -0
package/package.json
CHANGED
|
@@ -329,6 +329,7 @@
|
|
|
329
329
|
self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
|
|
330
330
|
self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
|
|
331
331
|
self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
|
|
332
|
+
self.$refs.paged.$refs.cri.model.f_charge_state = ['有效']
|
|
332
333
|
await self.$MagLoadParams.loadParam()
|
|
333
334
|
self.initParams()
|
|
334
335
|
await self.$refs.paged.$refs.cri.search()
|
|
@@ -217,7 +217,7 @@
|
|
|
217
217
|
let readySomething = async function (self) {
|
|
218
218
|
self.$refs.paged.$refs.cri.model.startDate = Util.toStandardDateString() + ' 00:00:00'
|
|
219
219
|
self.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
|
|
220
|
-
|
|
220
|
+
self.condition = this.$refs.paged.$refs.cri.condition + `and uf.f_orgid in ${this.orgCondtionStr}`
|
|
221
221
|
self.startDate = self.$refs.paged.$refs.cri.model.startDate
|
|
222
222
|
self.endDate = self.$refs.paged.$refs.cri.model.endDate
|
|
223
223
|
await self.$MagLoadParams.loadParam(self.$login.f)
|
|
@@ -319,8 +319,6 @@
|
|
|
319
319
|
search(args) {
|
|
320
320
|
this.startDate = this.$refs.paged.$refs.cri.model.startDate
|
|
321
321
|
this.endDate = this.$refs.paged.$refs.cri.model.endDate
|
|
322
|
-
console.log("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~")
|
|
323
|
-
console.log(this.orgCondtionStr)
|
|
324
322
|
if(this.orgCondtionStr===undefined||this.orgCondtionStr===''){
|
|
325
323
|
this.condition = this.$refs.paged.$refs.cri.condition
|
|
326
324
|
}else{
|