manage-client 3.2.66-aode → 3.2.67-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
|
@@ -90,7 +90,7 @@
|
|
|
90
90
|
id="f_user_type"
|
|
91
91
|
placeholder='客户类型'
|
|
92
92
|
v-model="model.f_user_type"
|
|
93
|
-
value-single="true">
|
|
93
|
+
:value-single="true">
|
|
94
94
|
</v-select>
|
|
95
95
|
</div>
|
|
96
96
|
<div class="col-sm-2 form-group">
|
|
@@ -103,7 +103,7 @@
|
|
|
103
103
|
placeholder='用气性质'
|
|
104
104
|
style="width:60%"
|
|
105
105
|
v-model="model.f_gasproperties"
|
|
106
|
-
value-single="true">
|
|
106
|
+
:value-single="true">
|
|
107
107
|
</v-select>
|
|
108
108
|
</div>
|
|
109
109
|
<div class="col-sm-2 form-group">
|
|
@@ -464,6 +464,8 @@
|
|
|
464
464
|
else
|
|
465
465
|
this.condition = this.$refs.paged.$refs.cri.condition
|
|
466
466
|
this.model.params.f_orgid = this.orgCondtionStr
|
|
467
|
+
this.model.params.f_user_type = this.$refs.paged.$refs.cri.model.f_user_type && this.$refs.paged.$refs.cri.model.f_user_type!==''? ` and f_user_type = '${this.$refs.paged.$refs.cri.model.f_user_type}'` :''
|
|
468
|
+
this.model.params.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}'` :''
|
|
467
469
|
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}'`
|
|
468
470
|
args.condition = this.condition
|
|
469
471
|
this.model.search(args.condition, args.model)
|
|
@@ -515,7 +517,9 @@
|
|
|
515
517
|
computed: {
|
|
516
518
|
getCondition() {
|
|
517
519
|
let f_residential_area = this.$refs.paged.$refs.cri.model.f_residential_area ==null|| this.$refs.paged.$refs.cri.model.f_residential_area==''?'':` and a.f_residential_area = '${this.$refs.paged.$refs.cri.model.f_residential_area}'`
|
|
518
|
-
|
|
520
|
+
let f_user_type = this.$refs.paged.$refs.cri.model.f_user_type && this.$refs.paged.$refs.cri.model.f_user_type!==''? ` and f_user_type = '${this.$refs.paged.$refs.cri.model.f_user_type}'` :''
|
|
521
|
+
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}'` :''
|
|
522
|
+
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}
|
|
519
523
|
},
|
|
520
524
|
getfield() {
|
|
521
525
|
return exportConfig.newwebmeterusergasConfig
|