safecheck-client 3.0.30-80 → 3.0.30-82

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.
@@ -277,6 +277,17 @@
277
277
  <input type="number" class="input_search" v-model="model.f_check_date"
278
278
  style="width: 60%" placeholder="距上次安检天数">
279
279
  </div>
280
+ <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
281
+ <label class="font_normal_body">安检结果</label>
282
+ <v-select class="select_list select"
283
+ placeholder='请选择' style="width: 60%"
284
+ :value.sync="model.f_result" v-model="model.f_result"
285
+ :options='$parent.$parent.results'
286
+ filer-key="name"
287
+ close-on-select clear-button
288
+ :value-single="true">
289
+ </v-select>
290
+ </div>
280
291
  </div>
281
292
  <modal :show.sync="$parent.$parent.showModal" v-ref:modal backdrop="false">
282
293
  <div slot="modal-header" class="modal-header">
@@ -486,6 +497,7 @@ export default {
486
497
  f_no_checkplan: '',
487
498
  f_filialeid: `('${this.$login.f.orgid}')`
488
499
  },
500
+ results:[{label: '全部', value: ''},{label: '正常', value: '正常'},{label: '有隐患', value: '有隐患'}],
489
501
  model: model,
490
502
  excelHeaders: {
491
503
  //searchData:searchData,
@@ -797,6 +809,14 @@ export default {
797
809
  console.error('f_check_date不是一个有效的正整数');
798
810
  }
799
811
  }
812
+
813
+ if (args.model.f_result) {
814
+ if(args.model.f_result == '正常'){
815
+ args.condition += ` and f_defect_content like '%正常%' `
816
+ }else{
817
+ args.condition += ` and f_defect_content like '%有隐患%' `
818
+ }
819
+ }
800
820
  this.model.search(args.condition, args.model, args.condValue)
801
821
  }
802
822
  },