manage-client 3.2.78-aode → 3.2.79-aode
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
|
@@ -172,6 +172,18 @@
|
|
|
172
172
|
v-model="model.f_end_datadiff" placeholder='小于等于'
|
|
173
173
|
>
|
|
174
174
|
</div>
|
|
175
|
+
<div class="col-sm-2 form-group">
|
|
176
|
+
<label class="font_normal_body">用气量</label>
|
|
177
|
+
<input type="text" style="width:60%" class="input_search"
|
|
178
|
+
v-model="model.f_oughtamount" placeholder='大于等于'
|
|
179
|
+
>
|
|
180
|
+
</div>
|
|
181
|
+
<div class="col-sm-2 form-group">
|
|
182
|
+
<label class="font_normal_body"> 至 </label>
|
|
183
|
+
<input type="text" style="width:60%" class="input_search"
|
|
184
|
+
v-model="model.f_end_oughtamount" placeholder='小于等于'
|
|
185
|
+
>
|
|
186
|
+
</div>
|
|
175
187
|
</div>
|
|
176
188
|
</div>
|
|
177
189
|
</criteria>
|
|
@@ -469,6 +481,8 @@
|
|
|
469
481
|
this.model.params.f_residential_area = this.$refs.paged.$refs.cri.model.f_residential_area ==null|| this.$refs.paged.$refs.cri.model.f_residential_area==''?'':` and f_residential_area = '${this.$refs.paged.$refs.cri.model.f_residential_area}'`
|
|
470
482
|
this.model.params.f_start_datadiff= this.$refs.paged.$refs.cri.model.f_start_datadiff && this.$refs.paged.$refs.cri.model.f_start_datadiff!==''? ` and datadiff >= ${this.$refs.paged.$refs.cri.model.f_start_datadiff}` :''
|
|
471
483
|
this.model.params.f_end_datadiff= this.$refs.paged.$refs.cri.model.f_end_datadiff && this.$refs.paged.$refs.cri.model.f_end_datadiff!==''? ` and datadiff <= ${this.$refs.paged.$refs.cri.model.f_end_datadiff}` :''
|
|
484
|
+
this.model.params.f_oughtamount= this.$refs.paged.$refs.cri.model.f_oughtamount && this.$refs.paged.$refs.cri.model.f_oughtamount!==''? ` and f_oughtamount >= ${this.$refs.paged.$refs.cri.model.f_oughtamount}` :''
|
|
485
|
+
this.model.params.f_end_oughtamount= this.$refs.paged.$refs.cri.model.f_end_oughtamount && this.$refs.paged.$refs.cri.model.f_end_oughtamount!==''? ` and f_oughtamount <= ${this.$refs.paged.$refs.cri.model.f_end_oughtamount}` :''
|
|
472
486
|
args.condition = this.condition
|
|
473
487
|
this.model.search(args.condition, args.model)
|
|
474
488
|
},
|
|
@@ -523,7 +537,9 @@
|
|
|
523
537
|
let f_gasproperties = this.$refs.paged.$refs.cri.model.f_gasproperties && this.$refs.paged.$refs.cri.model.f_gasproperties!==''? ` and f_gasproperties = '${this.$refs.paged.$refs.cri.model.f_gasproperties}'` :''
|
|
524
538
|
let f_start_datadiff= this.$refs.paged.$refs.cri.model.f_start_datadiff && this.$refs.paged.$refs.cri.model.f_start_datadiff!==''? ` and datadiff >= ${this.$refs.paged.$refs.cri.model.f_start_datadiff}` :''
|
|
525
539
|
let f_end_datadiff= this.$refs.paged.$refs.cri.model.f_end_datadiff && this.$refs.paged.$refs.cri.model.f_end_datadiff!==''? ` and datadiff <= ${this.$refs.paged.$refs.cri.model.f_end_datadiff}` :''
|
|
526
|
-
|
|
540
|
+
let f_oughtamount= this.$refs.paged.$refs.cri.model.f_oughtamount && this.$refs.paged.$refs.cri.model.f_oughtamount!==''? ` and f_oughtamount >= ${this.$refs.paged.$refs.cri.model.f_oughtamount}` :''
|
|
541
|
+
let f_end_oughtamount= this.$refs.paged.$refs.cri.model.f_end_oughtamount && this.$refs.paged.$refs.cri.model.f_end_oughtamount!==''? ` and f_oughtamount <= ${this.$refs.paged.$refs.cri.model.f_end_oughtamount}` :''
|
|
542
|
+
return {condition: `${this.$refs.paged.$refs.cri.condition} and f_orgid in ` + this.orgCondtionStr, f_residential_area:f_residential_area,startDate: this.$refs.paged.$refs.cri.model.inputStartDate,endDate:this.$refs.paged.$refs.cri.model.inputEndDate,f_orgid:this.orgCondtionStr,f_user_type:f_user_type,f_gasproperties:f_gasproperties,f_start_datadiff:f_start_datadiff,f_end_datadiff:f_end_datadiff,f_oughtamount:f_oughtamount,f_end_oughtamount:f_end_oughtamount}
|
|
527
543
|
},
|
|
528
544
|
getfield() {
|
|
529
545
|
return exportConfig.newwebmeterusergasConfig
|