safecheck-client 3.0.30-9 → 3.0.30-90

package/src/filiale/fugou/pc/PaperList.vue

@@ -277,6 +277,41 @@
                 <input type="number" class="input_search" v-model="model.f_check_date"
                        style="width: 60%" placeholder="距上次安检天数">
               </div>
+              <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">安检结果</label>
+                <v-select class="select_list select"
+                          placeholder='请选择' style="width: 60%"
+                          :value.sync="model.f_result" v-model="model.f_result"
+                          :options='$parent.$parent.results'
+                          filer-key="name"
+                          close-on-select clear-button
+                          :value-single="true">
+                </v-select>
+              </div>
+              <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">用户标签</label>
+                <v-select class="select_list select"
+                          placeholder='请选择' style="width: 60%"
+                          :value.sync="model.f_user_tags" v-model="model.f_user_tags"
+                          :options='$parent.$parent.userTags'
+                          filer-key="name"
+                          close-on-select clear-button
+                          condition="f_user_tags='{}'"
+                          :value-single="true">
+                </v-select>
+              </div>
+              <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">用气类型</label>
+                <v-select class="select_list select"
+                          placeholder='请选择' style="width: 60%"
+                          :value.sync="model.f_user_gas_type" v-model="model.f_user_gas_type"
+                          :options='$parent.$parent.userGasType'
+                          filer-key="name"
+                          close-on-select clear-button
+                          condition="f_user_gas_type='{}'"
+                          :value-single="true">
+                </v-select>
+              </div>
             </div>
             <modal :show.sync="$parent.$parent.showModal" v-ref:modal backdrop="false">
               <div slot="modal-header" class="modal-header">
@@ -486,6 +521,7 @@ export default {
         f_no_checkplan: '',
         f_filialeid: `('${this.$login.f.orgid}')`
       },
+      results:[{label: '全部', value: ''},{label: '正常', value: '正常'},{label: '有隐患', value: '有隐患'}],
       model: model,
       excelHeaders: {
         //searchData:searchData,
@@ -507,6 +543,8 @@ export default {
       },
       fun: this.$login.f,
       pcds: [],
+      userTags:[{label: '全部', value: ''},...this.$appdata.getParam('用户类型')],
+      userGasType:[{label: '全部', value: ''},...this.$appdata.getParam('用气类型')],
       checkersid: [],
       approveds: this.$appdata.getParam('安检审核状态') ? [{
         label: '全部',
@@ -797,6 +835,14 @@ export default {
           console.error('f_check_date不是一个有效的正整数');
         }
       }
+
+      if (args.model.f_result) {
+        if(args.model.f_result == '正常'){
+          args.condition += `  and f_defect_content like '%正常%' `
+        }else{
+          args.condition += `  and f_defect_content like '%有隐患%' `
+        }
+      }
       this.model.search(args.condition, args.model, args.condValue)
     }
   },