manage-client 3.2.214 → 3.2.216
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
|
@@ -177,9 +177,7 @@
|
|
|
177
177
|
<td style="text-align: center;">
|
|
178
178
|
<nobr>{{row.f_orgname}}</nobr>
|
|
179
179
|
</td>
|
|
180
|
-
<td style="text-align: center;" v-if="row.f_state === '销户'&& row.num== 1">
|
|
181
180
|
<nobr><a href="#" @click="$parent.$parent.$parent.enable(row)">启用</a> | <a href="#" @click="$parent.$parent.$parent.modifyAddress(row)">修改地址</a></nobr>
|
|
182
|
-
</td>
|
|
183
181
|
<td style="text-align: center;" v-else>
|
|
184
182
|
</td>
|
|
185
183
|
<td style="text-align: center;"><nobr>
|
|
@@ -92,6 +92,7 @@
|
|
|
92
92
|
<v-select :value.sync="model.f_meter_brand"
|
|
93
93
|
v-model="model.f_meter_brand"
|
|
94
94
|
:options="$parent.$parent.meterbrands"
|
|
95
|
+
@change="$parent.$parent.meterBrandChange"
|
|
95
96
|
condition="br.f_meter_brand = '{}'"
|
|
96
97
|
close-on-select></v-select>
|
|
97
98
|
</div>
|
|
@@ -143,6 +144,12 @@
|
|
|
143
144
|
<th><nobr>表内剩余金额</nobr></th>
|
|
144
145
|
<th><nobr>表内单价</nobr></th>
|
|
145
146
|
<th><nobr>本次抄表底数</nobr></th>
|
|
147
|
+
<th v-show="$parent.$parent.$parent.isShow"><nobr>流量计标况累计量</nobr></th>
|
|
148
|
+
<th v-show="$parent.$parent.$parent.isShow"><nobr>流量计工况累计量</nobr></th>
|
|
149
|
+
<th v-show="$parent.$parent.$parent.isShow"><nobr>流量计瞬时用气量(标况)</nobr></th>
|
|
150
|
+
<th v-show="$parent.$parent.$parent.isShow"><nobr>流量计瞬时用气量(工况)</nobr></th>
|
|
151
|
+
<th v-show="$parent.$parent.$parent.isShow"><nobr>流量计温度</nobr></th>
|
|
152
|
+
<th v-show="$parent.$parent.$parent.isShow"><nobr>流量计压力</nobr></th>
|
|
146
153
|
<th><nobr>阀门状态</nobr></th>
|
|
147
154
|
|
|
148
155
|
<th><nobr>上报类型</nobr></th>
|
|
@@ -169,6 +176,12 @@
|
|
|
169
176
|
<th style="text-align:center"><nobr>{{row.f_jval}}</nobr></th>
|
|
170
177
|
<th style="text-align:center"><nobr>{{row.f_price}}</nobr></th>
|
|
171
178
|
<th style="text-align:center"><nobr>{{row.f_tablebase}}</nobr></th>
|
|
179
|
+
<th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.standardConditionTotal}}</nobr></th>
|
|
180
|
+
<th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.operatingModeTotalForDay}}</nobr></th>
|
|
181
|
+
<th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.standardConditionFlow}}</nobr></th>
|
|
182
|
+
<th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.operatingModeFlow}}</nobr></th>
|
|
183
|
+
<th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.flowmeterTemperatureState}}</nobr></th>
|
|
184
|
+
<th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.flowmeterPressureState}}</nobr></th>
|
|
172
185
|
<th style="text-align:center"><nobr>{{row.f_valvestate}}</nobr></th>
|
|
173
186
|
|
|
174
187
|
|
|
@@ -273,7 +286,8 @@
|
|
|
273
286
|
criteriaShow:false,
|
|
274
287
|
orgCondtionStr: '',
|
|
275
288
|
model: new PagedList('rs/sql/manage_getReportList', 50,{},{f_meterbalanceamt: 0,f_tablebase: 0,f_meterdebitamt: 0,f_total_fee}),
|
|
276
|
-
areaList:[]
|
|
289
|
+
areaList:[],
|
|
290
|
+
isShow:false,
|
|
277
291
|
}
|
|
278
292
|
},
|
|
279
293
|
ready () {
|
|
@@ -289,6 +303,16 @@
|
|
|
289
303
|
this.$refs.paged.$refs.criteria.search()
|
|
290
304
|
},
|
|
291
305
|
methods: {
|
|
306
|
+
meterBrandChange(val){
|
|
307
|
+
console.log("气表品牌改变。。。。。" + val)
|
|
308
|
+
if(val !== undefined){
|
|
309
|
+
if(val == '真兰表端物联网表' || val == '真兰系统物联网表'){
|
|
310
|
+
this.isShow = true
|
|
311
|
+
} else {
|
|
312
|
+
this.isShow = false
|
|
313
|
+
}
|
|
314
|
+
}
|
|
315
|
+
},
|
|
292
316
|
async initQueryParam () {
|
|
293
317
|
let brr = []
|
|
294
318
|
let http = new HttpResetClass()
|
|
@@ -147,12 +147,11 @@
|
|
|
147
147
|
</div>
|
|
148
148
|
<div class="col-sm-2 form-group">
|
|
149
149
|
<label class="font_normal_body">气价名称</label>
|
|
150
|
-
<v-select :value.sync="
|
|
151
|
-
v-model="
|
|
150
|
+
<v-select :value.sync="$parent.$parent.f_price_name"
|
|
151
|
+
v-model="$parent.$parent.f_price_name"
|
|
152
152
|
multiple
|
|
153
|
-
:options="$parent.$parent.getPricenames"
|
|
154
|
-
|
|
155
|
-
></v-select>
|
|
153
|
+
:options="$parent.$parent.getPricenames">
|
|
154
|
+
</v-select>
|
|
156
155
|
</div>
|
|
157
156
|
<div class="col-sm-2 form-group">
|
|
158
157
|
<label class="font_normal_body"> 表编号</label>
|
|
@@ -789,6 +788,7 @@
|
|
|
789
788
|
data() {
|
|
790
789
|
return {
|
|
791
790
|
IdCardInfo:'',
|
|
791
|
+
f_price_name:[],
|
|
792
792
|
card:'',
|
|
793
793
|
isSingleUser: null,
|
|
794
794
|
startDate1:'',
|
|
@@ -1034,6 +1034,25 @@
|
|
|
1034
1034
|
if(this.IdCardInfo!=''){
|
|
1035
1035
|
args.condition +=` and f_idnumber='${this.IdCardInfo}'`
|
|
1036
1036
|
}
|
|
1037
|
+
let stringValue = ''
|
|
1038
|
+
if(this.f_price_name.length > 0){
|
|
1039
|
+
if (this.f_price_name.includes('非居民2.54')) {
|
|
1040
|
+
for (var i = 0; i < this.f_price_name.length; i++) {
|
|
1041
|
+
stringValue = stringValue + "'" + this.f_price_name[i] + "',"
|
|
1042
|
+
}
|
|
1043
|
+
stringValue = stringValue + "'非居民2.4'"
|
|
1044
|
+
args.condition += 'and f_price_name in ('+stringValue+')'
|
|
1045
|
+
}else {
|
|
1046
|
+
for (var i = 0; i < this.f_price_name.length; i++) {
|
|
1047
|
+
if (i === this.f_price_name.length - 1) {
|
|
1048
|
+
stringValue = stringValue + "'" + this.f_price_name[i] + "'"
|
|
1049
|
+
} else {
|
|
1050
|
+
stringValue = stringValue + "'" + this.f_price_name[i] + "',"
|
|
1051
|
+
}
|
|
1052
|
+
}
|
|
1053
|
+
args.condition += 'and f_price_name in ('+stringValue+')'
|
|
1054
|
+
}
|
|
1055
|
+
}
|
|
1037
1056
|
this.model.search(args.condition, args.model)
|
|
1038
1057
|
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
|
|
1039
1058
|
this.card=''
|