manage-client 3.3.82 → 3.3.83-wn2

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.
Files changed (7) hide show
  1. package/build/dev-server.js +180 -180
  2. package/package.json +111 -111
  3. package/src/filiale/WEINAN/ManageCompanyGasSummary.vue +540 -514
  4. package/src/filiale/WEINAN/ManageSummaryReport.vue +628 -609
  5. package/src/filiale/WEINAN/UserGasAll.vue +43 -25
  6. package/src/filiale/WEINAN/config/exportConfig.js +862 -860
  7. package/src/main.js +72 -70
package/src/filiale/WEINAN/UserGasAll.vue CHANGED
@@ -83,20 +83,6 @@
83
83
  <!-- restype='organization'>-->
84
84
  <!-- </res-select>-->
85
85
  <!-- </div>-->
86
-
87
- <div class="col-sm-2 form-group">
88
- <label class="font_normal_body">客户类型</label>
89
- <v-select :options='$parent.$parent.Gasusertype'
90
- :value.sync="model.f_user_type"
91
- close-on-select
92
- style="width:60%"
93
- condition="f_user_type = '{}'"
94
- id="f_user_type"
95
- placeholder='客户类型'
96
- v-model="model.f_user_type"
97
- value-single="true">
98
- </v-select>
99
- </div>
100
86
  <div class="col-sm-2 form-group">
101
87
  <label class="font_normal_body">用气性质</label>
102
88
  <v-select :options='$parent.$parent.Gasproperties'
@@ -197,6 +183,20 @@
197
183
  condition="f_curbalance <= {} " placeholder="">
198
184
  </div>
199
185
  </div>
186
+ <div class="col-sm-2 form-group">
187
+ <label class="font_normal_body">用户类型</label>
188
+ <v-select :options='$parent.$parent.Gasusertype'
189
+ :value.sync="model.f_user_type"
190
+ close-on-select
191
+ style="width:60%"
192
+ condition="f_user_type = '{}'"
193
+ id="f_user_type"
194
+ placeholder='用户类型'
195
+ @change="$parent.$parent.userTypeChange()"
196
+ v-model="model.f_user_type"
197
+ :value-single="true">
198
+ </v-select>
199
+ </div>
200
200
  <div class="col-sm-2 form-group">
201
201
  <label for="f_user_usetype" class="font_normal_body ">用气类型</label>
202
202
  <v-select :value.sync="model.f_user_usetype" :search="false"
@@ -205,7 +205,7 @@
205
205
  :options='$parent.$parent.userusetypes'
206
206
  condition="f_user_usetype = '{}'"
207
207
  placeholder='用气类型'
208
- value-single="true"
208
+ :value-single="true"
209
209
  close-on-select>
210
210
  </v-select>
211
211
  </div>
@@ -217,7 +217,7 @@
217
217
  :options='$parent.$parent.useinstitutions'
218
218
  condition="f_use_institution = '{}'"
219
219
  placeholder='用气机构'
220
- value-single="true"
220
+ :value-single="true"
221
221
  close-on-select>
222
222
  </v-select>
223
223
  </div>
@@ -228,10 +228,15 @@
228
228
  :options='$parent.$parent.userusenatures'
229
229
  condition="f_user_usenature = '{}'"
230
230
  placeholder='使用性质'
231
- value-single="true"
231
+ :value-single="true"
232
232
  close-on-select>
233
233
  </v-select>
234
234
  </div>
235
+ <div class="col-sm-2 form-group">
236
+ <label class="font_normal_body">单位名称</label>
237
+ <input style="width:60%" class="input_search" condition="f_corporate_name like '%{}%'" placeholder='单位名称' type="text"
238
+ v-el:corporatename v-model="model.f_corporate_name" v-next-el='corporatename'>
239
+ </div>
235
240
  </div>
236
241
  </div>
237
242
  </criteria>
@@ -405,6 +410,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
405
410
  searchshow: true,
406
411
  startDate1:'',
407
412
  endDate1:'',
413
+ userusetypes: [],
408
414
  useinstitutions: [],
409
415
  userusenatures: [],
410
416
  // startDate: '',
@@ -454,26 +460,41 @@ import {HttpResetClass, PagedList} from 'vue-client'
454
460
  this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
455
461
  this.startDate1 = Util.addDate(new Date(),-4).substring(0,10)
456
462
  this.endDate1 = Util.toStandardDateString()
457
- this.$refs.paged.$refs.cri.search()
463
+ // this.$refs.paged.$refs.cri.search()
458
464
  this.getfield = this.config.excelHeaders
459
465
  },
460
466
  methods: {
461
- userUseInstitutionChange () {
467
+ userTypeChange () {
468
+ this.userusetypes = []
462
469
  this.userusenatures = []
470
+ this.useinstitutions = []
471
+ this.$refs.paged.$refs.cri.model.f_user_usetype = ''
472
+ this.$refs.paged.$refs.cri.model.f_use_institution = ''
463
473
  this.$refs.paged.$refs.cri.model.f_user_usenature = ''
464
- if (this.$refs.paged.$refs.cri.model.f_use_institution) {
465
- let str = this.$refs.paged.$refs.cri.model.f_use_institution + '使用性质'
466
- this.userusenatures = this.$appdata.getParam(str)
474
+ if (this.$refs.paged.$refs.cri.model.f_user_type) {
475
+ console.log('this.$refs.paged.$refs.cri.model.f_user_type', this.$refs.paged.$refs.cri.model.f_user_type)
476
+ let str = this.$refs.paged.$refs.cri.model.f_user_type + '用气类型'
477
+ this.userusetypes = this.$appdata.getParam(str)
467
478
  }
468
479
  },
469
480
  userUseTypeChange () {
470
481
  this.useinstitutions = []
482
+ this.userusenatures = []
471
483
  this.$refs.paged.$refs.cri.model.f_use_institution = ''
484
+ this.$refs.paged.$refs.cri.model.f_user_usenature = ''
472
485
  if (this.$refs.paged.$refs.cri.model.f_user_usetype) {
473
486
  let str = this.$refs.paged.$refs.cri.model.f_user_usetype + '机构'
474
487
  this.useinstitutions = this.$appdata.getParam(str)
475
488
  }
476
489
  },
490
+ userUseInstitutionChange () {
491
+ this.userusenatures = []
492
+ this.$refs.paged.$refs.cri.model.f_user_usenature = ''
493
+ if (this.$refs.paged.$refs.cri.model.f_use_institution) {
494
+ let str = this.$refs.paged.$refs.cri.model.f_use_institution + '使用性质'
495
+ this.userusenatures = this.$appdata.getParam(str)
496
+ }
497
+ },
477
498
  // 查询开关
478
499
  hidden() {
479
500
  this.criteriaShow = !this.criteriaShow
@@ -592,9 +613,6 @@ import {HttpResetClass, PagedList} from 'vue-client'
592
613
  }
593
614
  },
594
615
  computed: {
595
- userusetypes () {
596
- return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
597
- },
598
616
  startDate(){
599
617
  return this.startDate1 + ' 00:00:00'
600
618
  },