manage-client 3.3.97 → 3.3.98

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
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.3.97",
3
+ "version": "3.3.98",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -70,7 +70,7 @@
70
70
  close-on-select></v-select>
71
71
  </div>
72
72
  <div class="col-sm-2 form-group">
73
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人数&nbsp;&nbsp;&nbsp;</label>
73
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人数&nbsp;&nbsp;&nbsp;&nbsp;</label>
74
74
  <input type="text" style="width:60%" class="input_search" v-model="model.f_people_num"
75
75
  condition="f_people_num = '{}'" placeholder="人数">
76
76
  </div>
@@ -143,7 +143,7 @@
143
143
  <!-- </div>-->
144
144
 
145
145
  <div class="col-sm-2 form-group">
146
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
146
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;&nbsp;</label>
147
147
  <v-select :value.sync="model.f_residential_area"
148
148
  class="select_list select"
149
149
  enter-push
@@ -156,17 +156,17 @@
156
156
  </v-select>
157
157
  </div>
158
158
  <div class="col-sm-2 form-group">
159
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;楼栋&nbsp;&nbsp;&nbsp;</label>
159
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;楼栋&nbsp;&nbsp;&nbsp;&nbsp;</label>
160
160
  <input type="text" style="width:60%" class="input_search" v-model="model.f_building"
161
161
  condition="f_building like '%{}%'" placeholder="楼栋"/>
162
162
  </div>
163
163
  <div class="col-sm-2 form-group">
164
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;单元&nbsp;&nbsp;&nbsp;</label>
164
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;单元&nbsp;&nbsp;&nbsp;&nbsp;</label>
165
165
  <input type="text" style="width:60%" class="input_search" v-model="model.f_unit"
166
166
  condition="f_unit like '%{}%'" placeholder="单元"/>
167
167
  </div>
168
168
  <div class="col-sm-2 form-group">
169
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;楼层&nbsp;&nbsp;</label>
169
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;楼层&nbsp;&nbsp;&nbsp;&nbsp;</label>
170
170
  <input type="text" style="width:60%" class="input_search" v-model="model.f_floor"
171
171
  condition="f_floor like '%{}%'" placeholder="楼层"/>
172
172
  </div>
@@ -181,12 +181,12 @@
181
181
  condition="f_balance >= '{}'" placeholder="最小值">
182
182
  </div>
183
183
  <div class="col-sm-2 form-group">
184
- <label class="font_normal_body">&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;</label>
184
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
185
185
  <input type="text" style="width:60%" class="input_search" v-model="model.balance2"
186
186
  condition="f_balance <= '{}'" placeholder="最大值">
187
187
  </div>
188
188
  <div class="col-sm-2 form-group">
189
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;抄表员</label>
189
+ <label class="font_normal_body">&nbsp;&nbsp;抄表员&nbsp;</label>
190
190
  <v-select :value.sync="model.f_inputtor"
191
191
  v-model="model.f_inputtor" condition="f_inputtor = '{}'"
192
192
  :options='$parent.$parent.inputtores' placeholder='请选择'
@@ -289,7 +289,7 @@
289
289
  </datepicker>
290
290
  </div>
291
291
  <div class="col-sm-2 form-group">
292
- <label for="endDate" class="font_normal_body" title="开户结束日期">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
292
+ <label for="endDate" class="font_normal_body" title="开户结束日期">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
293
293
  <datepicker id="endDate" placeholder="开户结束日期" style="width:60%"
294
294
  v-model="model.endOpenDate"
295
295
  :value.sync="model.endOpenDate"
@@ -181,6 +181,17 @@
181
181
  condition="SLdays <= {} " placeholder="">
182
182
  </div>
183
183
  </div>
184
+ <div class="col-sm-2 form-group">
185
+ <label class="font_normal_body">是否通气</label>
186
+ <v-select
187
+ placeholder='是否通气'
188
+ style="width:60%"
189
+ :value.sync="model.f_address_state"
190
+ v-model="model.f_address_state"
191
+ :options='$parent.$parent.addressState'
192
+ close-on-select condition="f_address_state = '{}'">
193
+ </v-select>
194
+ </div>
184
195
 
185
196
  <!--<div class="col-sm-2 form-group">-->
186
197
  <!--<label class="font_normal_body">最新失联</label>-->
@@ -383,6 +394,7 @@
383
394
  criteriaShow:false,
384
395
  outlets: [],
385
396
  gasproperties:[{label: '全部', value: ''}],
397
+ addressState:[{label: '全部', value: ''}, {label: '已通气', value: '已通气'}, {label: '已通气', value: '已通气'}],
386
398
  operator: [],
387
399
  WarningType: [
388
400
  {label: '全部', value: ''}
@@ -70,7 +70,7 @@
70
70
  close-on-select></v-select>
71
71
  </div>
72
72
  <div class="col-sm-2 form-group">
73
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人数&nbsp;&nbsp;&nbsp;</label>
73
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人数&nbsp;&nbsp;&nbsp;&nbsp;</label>
74
74
  <input type="text" style="width:60%" class="input_search" v-model="model.f_people_num"
75
75
  condition="f_people_num = '{}'" placeholder="人数">
76
76
  </div>
@@ -143,7 +143,7 @@
143
143
  <!-- </div>-->
144
144
 
145
145
  <div class="col-sm-2 form-group">
146
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
146
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;&nbsp;</label>
147
147
  <v-select :value.sync="model.f_residential_area"
148
148
  class="select_list select"
149
149
  enter-push
@@ -156,17 +156,17 @@
156
156
  </v-select>
157
157
  </div>
158
158
  <div class="col-sm-2 form-group">
159
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;楼栋&nbsp;&nbsp;&nbsp;</label>
159
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;楼栋&nbsp;&nbsp;&nbsp;&nbsp;</label>
160
160
  <input type="text" style="width:60%" class="input_search" v-model="model.f_building"
161
161
  condition="f_building like '%{}%'" placeholder="楼栋"/>
162
162
  </div>
163
163
  <div class="col-sm-2 form-group">
164
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;单元&nbsp;&nbsp;&nbsp;</label>
164
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;单元&nbsp;&nbsp;&nbsp;&nbsp;</label>
165
165
  <input type="text" style="width:60%" class="input_search" v-model="model.f_unit"
166
166
  condition="f_unit like '%{}%'" placeholder="单元"/>
167
167
  </div>
168
168
  <div class="col-sm-2 form-group">
169
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;楼层&nbsp;&nbsp;</label>
169
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;楼层&nbsp;&nbsp;&nbsp;&nbsp;</label>
170
170
  <input type="text" style="width:60%" class="input_search" v-model="model.f_floor"
171
171
  condition="f_floor like '%{}%'" placeholder="楼层"/>
172
172
  </div>
@@ -181,12 +181,12 @@
181
181
  condition="f_balance >= '{}'" placeholder="最小值">
182
182
  </div>
183
183
  <div class="col-sm-2 form-group">
184
- <label class="font_normal_body">&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;</label>
184
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
185
185
  <input type="text" style="width:60%" class="input_search" v-model="model.balance2"
186
186
  condition="f_balance <= '{}'" placeholder="最大值">
187
187
  </div>
188
188
  <div class="col-sm-2 form-group">
189
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;抄表员</label>
189
+ <label class="font_normal_body">&nbsp;&nbsp;抄表员&nbsp;</label>
190
190
  <v-select :value.sync="model.f_inputtor"
191
191
  v-model="model.f_inputtor" condition="f_inputtor = '{}'"
192
192
  :options='$parent.$parent.inputtores' placeholder='请选择'
@@ -289,7 +289,7 @@
289
289
  </datepicker>
290
290
  </div>
291
291
  <div class="col-sm-2 form-group">
292
- <label for="endDate" class="font_normal_body" title="开户结束日期">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
292
+ <label for="endDate" class="font_normal_body" title="开户结束日期">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
293
293
  <datepicker id="endDate" placeholder="开户结束日期" style="width:60%"
294
294
  v-model="model.endOpenDate"
295
295
  :value.sync="model.endOpenDate"
@@ -298,6 +298,19 @@
298
298
  condition="f_open_date <= '{} 23:59:59'">
299
299
  </datepicker>
300
300
  </div>
301
+ <div class="col-sm-2 form-group">
302
+ <label class="font_normal_body">气表品牌</label>
303
+ <v-select :value.sync="model.f_meter_brand"
304
+ v-model="model.f_meter_brand" multiple
305
+ :options='$parent.$parent.meterbrands' placeholder='请选择'
306
+ condition="f_meter_brand in {}"
307
+ ></v-select>
308
+ </div>
309
+ <div class="col-sm-2 form-group">
310
+ <label class="font_normal_body">&nbsp;开&nbsp;户&nbsp;人</label>
311
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_open_person"
312
+ condition="f_open_person like '%{}%'" placeholder="开户人">
313
+ </div>
301
314
  </div>
302
315
  </div>
303
316
  </criteria>
@@ -404,6 +417,12 @@
404
417
  <th>
405
418
  <nobr>发卡状态</nobr>
406
419
  </th>
420
+ <th>
421
+ <nobr>气表品牌</nobr>
422
+ </th>
423
+ <th>
424
+ <nobr>开户人</nobr>
425
+ </th>
407
426
  <th>
408
427
  <nobr>备注</nobr>
409
428
  </th>
@@ -509,6 +528,12 @@
509
528
  <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
510
529
  <nobr>{{row.f_whether_hairpin}}</nobr>
511
530
  </td>
531
+ <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
532
+ <nobr>{{row.f_meter_brand}}</nobr>
533
+ </td>
534
+ <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
535
+ <nobr>{{row.f_open_person}}</nobr>
536
+ </td>
512
537
  <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
513
538
  <nobr>{{row.f_comments}}</nobr>
514
539
  </td>
@@ -581,6 +606,7 @@
581
606
  let readySomething = async function (self) {
582
607
  self.$MagGetSaleParam.initinputtor();
583
608
  self.getinputtores();
609
+ self.initParams()
584
610
  // 获取区县
585
611
  // self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
586
612
  // self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
@@ -634,6 +660,7 @@
634
660
  meterInfo:{},
635
661
  deviceInfo:{},
636
662
  condition2:'',
663
+ meterbrands: [],
637
664
 
638
665
 
639
666
  weixinSign:[{label:"全部",value:""},{label:"已绑定",value:"已绑定"},{label:"未绑定",value:"未绑定"}],
@@ -672,6 +699,17 @@
672
699
  }
673
700
  this.inputtores = [{label: '全部', value: ''}, ...rs]
674
701
  },
702
+ initParams() {
703
+ // 初始化气表品牌
704
+ let brandArr = []
705
+ this.$MagGetSaleParam.getGasbrand().forEach((item) => {
706
+ let temp = {}
707
+ temp.label = item.label
708
+ temp.value = item.value.f_meter_brand
709
+ brandArr.push(temp)
710
+ })
711
+ this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
712
+ },
675
713
  async updateParams() {
676
714
  await this.$MagLoadParams.loadParam(this.f_filialeid)
677
715
  this.inputtores = [];
@@ -28,7 +28,9 @@ export default {
28
28
  'f_inputtor': '抄表员',
29
29
  'f_bank_idnumber': '银行身份证号',
30
30
  'f_bank_pay_number': '缴费编号',
31
- 'f_gas_date': '通气时间'
31
+ 'f_gas_date': '通气时间',
32
+ 'f_meter_brand': '气表品牌',
33
+ 'f_open_person': '开户人'
32
34
  },
33
35
 
34
36
  // 垃圾费查询