manage-client 1.22.33-ca → 1.22.34-ca

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 (2) hide show
  1. package/package.json +1 -1
  2. package/src/components/sale/filesquery/MeterQuery.vue +17 -16
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "1.22.33-ca",
3
+ "version": "1.22.34-ca",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/sale/filesquery/MeterQuery.vue CHANGED
@@ -207,15 +207,15 @@
207
207
  :options='$parent.$parent.meter_states' placeholder='表具现状'
208
208
  close-on-select></v-select>
209
209
  </div>
210
- <div class="col-sm-2 form-group form-fix-width" >
211
- <label class="font_normal_body _zoom4">是否第二套档案</label>
212
- <v-select :value.sync="model.f_second_state"
213
- v-model="model.f_second_state"
214
- :search="false"
215
- :value-single="true"
216
- :options='$parent.$parent.second_states' placeholder='请选择'
217
- ></v-select>
218
- </div>
210
+ <!-- <div class="col-sm-2 form-group form-fix-width" >-->
211
+ <!-- <label class="font_normal_body _zoom4">是否第二套档案</label>-->
212
+ <!-- <v-select :value.sync="model.f_second_state"-->
213
+ <!-- v-model="model.f_second_state"-->
214
+ <!-- :search="false"-->
215
+ <!-- :value-single="true"-->
216
+ <!-- :options='$parent.$parent.second_states' placeholder='请选择'-->
217
+ <!-- ></v-select>-->
218
+ <!-- </div>-->
219
219
  </div>
220
220
  </div>
221
221
  </criteria>
@@ -359,13 +359,14 @@ export default {
359
359
  args.condition += ` and f_devices_type like '%${item}%' `
360
360
  })
361
361
  }
362
- if(this.$refs.paged.$refs.cri.model.f_second_state){
363
- if(this.$refs.paged.$refs.cri.model.f_second_state==='是'){
364
- args.condition = `${args.condition} and f_second_state is not null`
365
- }else {
366
- args.condition = `${args.condition} and f_second_state is null`
367
- }
368
- }
362
+ // if(this.$refs.paged.$refs.cri.model.f_second_state){
363
+ // if(this.$refs.paged.$refs.cri.model.f_second_state==='是'){
364
+ // args.condition = `${args.condition} and f_second_state is not null`
365
+ // }else {
366
+ // args.condition = `${args.condition} and f_second_state is null`
367
+ // }
368
+ // }
369
+ args.condition = `${args.condition} and f_second_state is null`
369
370
  this.$refs.paged.$refs.cri.condition = args.condition
370
371
  this.model.search(args.condition, args.model)
371
372
  this.sumsmodel = this.$refs.paged.$refs.grid.model.sums