safecheck-client 3.0.35-43 → 3.0.35-46

package/src/filiale/rizhao/pc/NewCheckpaper.vue

@@ -639,10 +639,15 @@ export default {
                   //tag)
                   //tag)
                   //tag)
-                  if (!this.config[this.data[device][item].f_device_type].items[items.f_item_name]) {
+                  if (!this.config[this.data[device][item].f_device_type].items[items.f_item_name]&& (items.isdefect && (items.isdefect == 'true' || items.isdefect == true))) {
                     continue
                   }
-                  let options = this.config[this.data[device][item].f_device_type].items[items.f_item_name].options
+                  if (items.f_is_defect == 'true' || items.f_is_defect == true) {
+                    checkResult = '有隐患'
+                    this.result = '有隐患'
+                    defects = `${defects}:${items.f_item_value}/`
+                  }
+                  /*let options = this.config[this.data[device][item].f_device_type].items[items.f_item_name].options
                   for (let option in options) {
                     if (options[option].data == f_item_value) {
                       if (options[option].isdefect == 'true' || options[option].isdefect == true) {
@@ -652,13 +657,13 @@ export default {
                         // let level = options[option].level
                       }
                     }
-                  }
+                  }*/
                   //tag)
                 }
                 if (defects != '') {
                   deviceInfos.push(`${items.f_item_name}${defects.substring(0, defects.length - 1)}`)
                 }
-              } else if (items.type === 'string') {
+              } else if (items.type === 'string' && items.f_is_defect && items.f_item_value[0]) {
                 checkResult = '有隐患'
                 this.result = '有隐患'
                 deviceInfos.push(`${items.f_item_name}:${items.f_item_value[0]}`)

package/src/filiale/shanxian/pc/SelectCheckPlan.vue

@@ -13,6 +13,19 @@
                 v-model="model.f_checker_id">
               </role-selector-safe>
             </div>
+          <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" >
+            <label class="font_normal_body">安检员状态</label>
+            <v-select
+              :value.sync="model.f_checker_state"
+              :options='$parent.$parent.checkertates'
+              placeholder='安检员状态'
+              close-on-select
+              style="width:60% "
+              class="select select_list"
+              v-model='model.f_checker_state'
+             >
+            </v-select>
+           </div>
             <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
               <label class="font_normal_body">计划起始</label>
               <datepicker
@@ -167,6 +180,7 @@
       }, {plannum: '', ruhu: '', jujian: '', daofang: '',no_plan_num:'',noruhu:'',nodaofang:'',nojujian:'',ruhu_total:'',daofang_total:'',jujian_total:'',total_sum:''})
       model.f_filialeids = '('+this.$login.f.orgid+')'
       return {
+        checkertates: [{label: '在职', value: '在职'}, {label: '离职', value: '离职'}],
         excelHeaders:{
           'f_checker': '安检员',
           'plannum': '计划总数',
@@ -232,6 +246,13 @@
           condition3 += ` AND f_checker = '${this.$refs.paged.$refs.cri.model.f_checker_id}' `
           condition2 += ` AND f_checker_name = '${this.$refs.paged.$refs.cri.model.f_checker_id}' `
         }
+        if (this.$refs.paged.$refs.cri.model.f_checker_state !=''){
+          condition3 += ` AND tu.state= '${this.$refs.paged.$refs.cri.model.f_checker_state}' `
+          condition2 += ` AND tu.state= '${this.$refs.paged.$refs.cri.model.f_checker_state}' `
+        }else{
+          condition3 += ` AND tu.state= '在职' `
+          condition2 += ` AND tu.state= '在职' `
+        }
         this.model.f_start_time=this.f_start_time
         this.model.f_end_time=this.f_end_time
         this.model.condition1=condition1