manage-client 3.2.63-aode → 3.2.64-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.
@@ -46,6 +46,14 @@
46
46
  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
47
47
  condition="f_meternumber like '%{}%'" placeholder="表号">
48
48
  </div>
49
+ <div class="col-sm-2">
50
+ <label class="font_normal_body">气表品牌</label>
51
+ <v-select :value.sync="model.f_meter_brand"
52
+ v-model="model.f_meter_brand"
53
+ :options='$parent.$parent.meterbrands' placeholder='请选择'
54
+ condition="f_meter_brand = '{}'"
55
+ close-on-select></v-select>
56
+ </div>
49
57
  <div class="span" style="float:right;">
50
58
  <button class="button_search button_spacing" @click="search()">查询</button>
51
59
  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
@@ -73,6 +81,15 @@
73
81
  <th>
74
82
  <nobr>本次抄表底数</nobr>
75
83
  </th>
84
+ <th>
85
+ <nobr>气表品牌</nobr>
86
+ </th>
87
+ <th>
88
+ <nobr>压力</nobr>
89
+ </th>
90
+ <th>
91
+ <nobr>温度</nobr>
92
+ </th>
76
93
  <th>
77
94
  <nobr>上次抄表底数</nobr>
78
95
  </th>
@@ -111,6 +128,15 @@
111
128
  <td style="text-align: center;">
112
129
  <nobr>{{row.f_tablebase}}</nobr>
113
130
  </td>
131
+ <td style="text-align: center;">
132
+ <nobr>{{row.f_meter_brand}}</nobr>
133
+ </td>
134
+ <td style="text-align: center;">
135
+ <nobr>{{row.flowmeterPressure}}</nobr>
136
+ </td>
137
+ <td style="text-align: center;">
138
+ <nobr>{{row.flowmeterTemperature}}</nobr>
139
+ </td>
114
140
  <td style="text-align: center;">
115
141
  <nobr>{{row.f_last_tablebase}}</nobr>
116
142
  </td>
@@ -163,6 +189,7 @@
163
189
  // self.$refs.paged.$refs.cri.search()
164
190
  self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
165
191
  await self.$MagLoadParams.loadParam()
192
+ self.initParams()
166
193
  self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
167
194
  }
168
195
  export default {
@@ -215,6 +242,17 @@
215
242
  }
216
243
  },
217
244
  methods: {
245
+ initParams() {
246
+ // 初始化气表品牌
247
+ let brandArr = []
248
+ this.$MagGetSaleParam.getGasbrand().forEach((item) => {
249
+ let temp = {}
250
+ temp.label = item.label
251
+ temp.value = item.value.f_meter_brand
252
+ brandArr.push(temp)
253
+ })
254
+ this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
255
+ },
218
256
  getorg (obj) {
219
257
  if(obj.resids.length>0){
220
258
  this.selectorgid = obj.resids