safecheck-client 3.0.34-5 → 3.0.34-51

package/src/filiale/tongchuan/android/Select.vue

@@ -0,0 +1,421 @@
+<template>
+  <div v-el:group class="btn-group" v-bind:class="{open: show, dropup: direction === 'up'}" :style="{width:width, fontSize: fontSize}">
+    <button v-el:btn type="button" class="btn btn-default dropdown-toggle select-style" :style="{minWidth: '100%', fontSize: fontSize}"
+            :id="'vc-select-button-'+attach"
+            @click="toggleDropdown"
+            @blur="show = (search ? show : false)"
+            v-bind="{disabled: disabled}"
+    >
+      <span class="btn-placeholder" v-show="showPlaceholder">{{placeholder}}</span>
+      <span class="btn-content" :style="{textOverflow:'ellipsis',overflow: 'hidden'}">{{ selectedItems }}</span>
+      <span class="caret"></span>
+    </button>
+    <ul  class="dropdown-menu" v-bind:class="{'menu-align-right': align=== 'right'}" :style="{overflow:'scroll',maxHeight: maxHeight + 'px',width: menuWidth,minWidth:minWidth,left:left+'px', fontSize: fontSize }" v-el:dropdown>
+      <template v-if="options.length">
+        <li v-if="search" class="bs-searchbox" style="white-space: nowrap">
+          <input type="text" placeholder="Search"
+                 style="width: 80%;display: inline"
+                 v-model="searchText"
+                 class="form-control" autocomplete="off"
+                 @keyup.enter="putOptions(searchText)">
+
+          <span  style="width: 20%;display: inline"
+                 v-if="search&&multiple&&show&&!isSelectAll"
+                 @mousedown.prevent="selectAll(options)">全选</span>
+          <span style="width: 20%;display: inline"
+                v-if="search&&multiple&&show&&isSelectAll"
+                @mousedown.prevent="selectAll(options)">取消</span>
+        </li>
+        <li v-for="option in options | findBy searchText " style="position:relative">
+          <a @mousedown.prevent="select(option.value,null)" style="cursor:pointer" :id="'vc-select-a-'+attach+'-'+$index">
+            {{ option.label }}
+            <span class="glyphicon glyphicon-ok check-mark" v-show="isSelected(option.value)"></span>
+          </a>
+        </li>
+      </template>
+      <slot v-else></slot>
+      <div class="notify" v-show="showNotify" transition="fadein">Limit reached ({{limit}} items max).
+      </div>
+    </ul>
+  </div>
+</template>
+
+<script>
+  import EventListener from '../utils/EventListener'
+  import coerceBoolean from '../utils/coerceBoolean.js'
+
+  export default {
+    props: {
+      options: {
+        type: Array,
+        default() { return [] },
+      },
+      value: {
+        twoWay: true
+      },
+      placeholder: {
+        type: String,
+        default: '请选择'
+      },
+      multiple: {
+        type: Boolean,
+        coerce: coerceBoolean,
+        default: false
+      },
+      search: { // Allow searching (only works when options are provided)
+        type: Boolean,
+        coerce: coerceBoolean,
+        default: true
+      },
+      limit: {
+        type: Number,
+        default: 1024
+      },
+      closeOnSelect: { // only works when multiple==false
+        type: Boolean,
+        coerce: coerceBoolean,
+        default: false
+      },
+      disabled: {
+        type: Boolean,
+        coerce: coerceBoolean,
+        default: false
+      },
+      attach: {
+        type: String,
+        default: 'vuestrap'
+      },
+      enterPush: {
+        type: Boolean,
+        dafault: false
+      },
+      maxHeight: {
+        type: [Number,String],
+        default: 300
+      },
+      minWidth:{
+        type:[Number,String],
+        default:'100%'
+      },
+      valueSingle: {
+        type: Boolean,
+        default: false
+      },
+      //全选标志位
+      isSelectAll: {
+        type: Boolean,
+        default: false
+      },
+      filerKey: {
+        default: 'id'
+      },
+      direction: { // 展开方向，默认为向下，可以向上up
+        type: String,
+        default: 'down'
+      },
+      align: {
+        type: String,
+        default: 'left' // 内内容框对齐方式，默认是左对齐，也可以right，右对齐
+      },
+      width:{
+        type:String,
+        default:'60%'
+      },
+      timeout: {
+        type: Number,
+        default: 300
+      },
+      fontSize: {
+        type: String,
+        default: '16px'
+      },
+      menuMode: {
+        type: String
+      }
+    },
+    ready() {
+      if(this.search&&this.multiple){
+        this.minWidth='190px'
+      }
+      // 如果this.value不存在或正length不等于0
+      if ((this.value === false? false :!this.value) || this.value.length === 0) {
+        if (this.valueSingle) {
+          this.value = ''
+        } else {
+          this.value = []
+        }
+      }else {
+        // 如果this.value不是数组
+        if (this.value.constructor !== Array) {
+          if (!this.valueSingle) {
+            this.value = [this.value]
+          }
+        } else {
+          // this.value不是数组并且不是多选
+          if (!this.multiple && this.value.length > 1) {
+            this.value = this.value.slice(0, 1)
+          } else if (this.multiple && this.value.length > this.limit) {
+            this.value = this.value.slice(0, this.limit)
+          }
+        }
+      }
+      let el = this.$els.dropdown
+      let elbtn = this.$els.btn
+      this._closeEvent = EventListener.listen(window, 'mouseup', (e)=> {
+        if (!el.contains(e.target) && this.show && !elbtn.contains(e.target)) {
+          this.show = false
+        }
+      })
+    },
+    data() {
+      return {
+        left:'0',
+
+        searchText: null,
+        show: false,
+        showNotify: false,
+        paramsData: [],
+        // isShowModify: false
+        timer: null,
+        menuwidth: 'auto'
+      }
+    },
+    computed: {
+      // 返回显示的选择内容
+      selectedItems() {
+        // 值为空，返回空串
+        if (this.value === false? false: !this.value) {
+          return ''
+        }
+        // 把单选变成数组
+        let value
+        if (this.valueSingle) {
+          value = [this.value]
+        } else {
+          value = this.value
+        }
+
+        // 根据value值，找到label
+        let foundItems = []
+        if (value === false?true:value && value.length) {
+          for (var item of value) {
+            // 如果没有可选项，直接value内容
+            if (this.options.length === 0)
+            {
+              foundItems = value;
+            }
+            // 有可选项
+            else
+            {
+              // 如果是对象，显示对象给定的列
+              if (typeof item === "object") {
+                for(let o of this.options) {
+                  // 选中对象鱼可选项value值相同，取选项的label
+                  if((o.value === false?true:o.value)&& o.value[this.filerKey] === item[this.filerKey]) {
+                    foundItems.push(o.label)
+                    break
+                  }
+                }
+              } else {
+                // 否则，显示值本身
+                let option
+                this.options.some(o => {
+                  if(o.value === item) {
+                    option = o
+                    return true
+                  }
+                })
+                option && foundItems.push(option.label)
+              }
+            }
+          }
+          if (foundItems.length === 0 || foundItems[0].constructor === Object) {
+            return ''
+          }
+          //选中的
+          let str= foundItems.join(', ')
+          // if(str.length > 4)
+          //   return str.substring(0,4)+'...'
+          // else
+          return str
+        }
+      },
+      showPlaceholder() {
+        if (this.value ===false? true :this.value) {
+          return this.value.length === 0 || this.selectedItems === ''
+        }
+        return true
+      }
+    },
+    watch: {
+      menuMode: {
+        immediate: true,
+        handler() {
+          if (this.menuMode == 'align-button'){
+            this.menuWidth = '100%'
+          }
+        }
+      },
+      value(val) {
+        this.$emit('change', val)
+        this.$emit('selected', this.selected)
+        if (val && val.length > this.limit) {
+          this.showNotify = true
+          this.value.pop()
+          setTimeout(() => this.showNotify = false, 1000)
+        }
+      },
+      show(){
+        this.judgBoundary();
+      },
+      searchText() {
+        // 防抖
+        if (this.timer) {
+          clearTimeout(this.timer)
+        }
+        this.timer = setTimeout(() => {
+          this.$emit('select-search', this.searchText)
+        }, this.timeout)
+      }
+    },
+    methods: {
+      //全选
+      selectAll(v) {
+        this.isSelectAll=!this.isSelectAll
+        if(this.searchText === null){
+          v.forEach((item) => {
+            this.select(item.value, this.isSelectAll)
+          })
+        }else {
+          let result= v.filter((item) => {
+            return item.label.includes(this.searchText)
+          }).forEach((item) => {
+            this.select(item.value, this.isSelectAll)
+          })
+        }
+      },
+      select (v, flag) {
+        if (flag == true) {
+          if (this.multiple) {
+            this.value.$remove(v)
+            this.value.push(v)
+          } else if (this.closeOnSelect) {
+            this.toggleDropdown()
+          }
+        } else if (flag == false) {
+          if (this.multiple) {
+            this.value.$remove(v)
+          } else if (this.closeOnSelect) {
+            this.toggleDropdown()
+          }
+        } else if (flag == null) {
+          if (this.valueSingle || !this.value || this.value.indexOf(v) === -1) {
+            if (this.multiple) {
+              this.value.push(v)
+            } else {
+              if (this.value == v) {
+                this.value = undefined
+              } else if (this.valueSingle) {
+                this.value = v
+              } else {
+                this.value = [v]
+              }
+            }
+          } else {
+            if (this.multiple || this.value) {
+              this.value.$remove(v)
+            }
+          }
+          if (this.closeOnSelect) {
+            this.toggleDropdown()
+          }
+        }
+        this.judgBoundary()
+        this.$emit('select-changed', v)
+      },
+
+      isSelected(v) {
+        if (this.value === false? false: !this.value) {
+          return false
+        }
+        if (this.value.constructor !== Array) {
+          return this.value == v
+        } else {
+          return this.value.indexOf(v) !== -1
+        }
+
+      },
+      toggleDropdown() {
+        this.width = this.$els.group.clientWidth *  this.width +'px'
+        this.show = !this.show
+      },
+      putOptions (val) {
+        if (this.enterPush) {
+          let sign = false
+          this.options.forEach((item) => {
+            if (val === item.label) {
+              sign = true
+            }
+          })
+        }
+        this.judgBoundary();
+      },
+      judgBoundary(){
+        //判断是否超出边界，超出移动
+        if(this.menuMode != 'align-button' && document.documentElement.offsetWidth< this.$els.dropdown.getBoundingClientRect().right){
+          this.left = document.documentElement.offsetWidth - this.$els.dropdown.getBoundingClientRect().right - 25
+        }
+      }
+    },
+    beforeDestroy() {
+      if (this._closeEvent) this._closeEvent.remove()
+    }
+  }
+</script>
+
+<style scoped>
+  .bs-searchbox {
+    padding: 4px 8px;
+  }
+  .menu-align-right {
+    left: unset;
+    right: 0;
+  }
+  .btn-group .dropdown-menu .notify {
+    position: absolute;
+    bottom: 5px;
+    width: 96%;
+    margin: 0 2%;
+    min-height: 26px;
+    padding: 3px 5px;
+    background: #f5f5f5;
+    /*border: 1px solid #e3e3e3;*/
+    box-shadow: inset 0 1px 1px rgba(0,0,0,.05);
+    pointer-events: none;
+    opacity: .9;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  .select-style {
+    border: 0px;
+    /*border-bottom: 2px solid #C9CCCF;*/
+    border: 1px solid #93B2D3;
+    border-radius: 0px;
+    color: #555;
+    overflow:hidden;text-overflow:ellipsis;
+  }
+  /* 为新产品增加修改菜单选项 */
+  .vselect-self-style {
+    text-align: center;
+    border: 2px dashed #ccc;
+    margin: 5px 10px;
+    border-radius: 5px;
+  }
+  /* 当内容超过最大时，显示省略，长度不能超过最大值 */
+  .btn-group > button {
+    max-width: 100%;
+  }
+  .btn-group > button .btn-content {
+    max-width: 100%;
+  }
+</style>

package/src/filiale/tongchuan/android.js

@@ -4,6 +4,7 @@ import Vue from "vue";
 // 手机特殊目录注册到该文件中
 let specialComp = {
   'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
+  'v-select': (resolve) => { require(['./android/Select'], resolve) },
   'paper-feedback' : (resolve) => { require(['./android/PaperFeedback'], resolve) },
   'safecheck-userinfo' : (resolve) => { require(['./android/SafecheckUserInfo'], resolve) },
   'safecheck-devices' : (resolve) => { require(['./android/SafecheckDevices'], resolve) },

package/src/filiale/tongchuan/pc/PaperDefectMain.vue

@@ -653,7 +653,7 @@
           }
           defectIdStr = `(${defectIds.join(',')})`
           let http = new HttpResetClass()
-          let sql = `update t_devices_items set f_deal_dispose = '自行整改',f_live_dispose = '是' where id in ${defectIdStr}`
+          let sql = `update t_devices_items set f_deal_dispose = '自行整改' where id in ${defectIdStr}`
           http.load('POST', 'rs/logic/runSQL', { data: { sql: sql } },
             { resolveMsg: null, rejectMsg: null }).then(()=>{
             this.showModal3 = false

package/src/filiale/tongchuan/utils/EventListener.js

@@ -0,0 +1,29 @@
+const EventListener = {
+  /**
+   * Listen to DOM events during the bubble phase.
+   *
+   * @param {DOMEventTarget} target DOM element to register listener on.
+   * @param {string} eventType Event type, e.g. 'click' or 'mouseover'.
+   * @param {function} callback Callback function.
+   * @return {object} Object with a `remove` method.
+   */
+  listen(target, eventType, callback) {
+    if (target.addEventListener) {
+      target.addEventListener(eventType, callback, false)
+      return {
+        remove() {
+          target.removeEventListener(eventType, callback, false)
+        }
+      }
+    } else if (target.attachEvent) {
+      target.attachEvent('on' + eventType, callback)
+      return {
+        remove() {
+          target.detachEvent('on' + eventType, callback)
+        }
+      }
+    }
+  }
+}
+
+export default EventListener

package/src/filiale/tongchuan/utils/coerceBoolean.js

@@ -0,0 +1,7 @@
+// Attempt to convert a string value to a Boolean. Otherwise, return the value
+// without modification so Vue can throw a warning.
+export default (val) => (typeof val !== "string" ? val :
+  val === "true" ? true :
+  val === "false" ? false :
+  val === "null" ? false :
+  val === "undefined" ? false : val)

package/src/filiale/weinan/android/SafecheckDevices.vue

@@ -997,7 +997,7 @@ export default {
         f_repair_department: this.config[this.device.device].items[item].repairDepartment ? this.config[this.device.device].items[item].repairDepartment : '',
         f_deal_dispose: this.config[this.device.device].items[item].dealDispose ? this.config[this.device.device].items[item].dealDispose : '',
         f_handle_date: '',
-        f_block_pitfall: this.config[this.device.device].items[item].blockPitfall ? this.config[this.device.device].items[item].blockPitfall : false,
+        f_block_pitfall: this.config[this.device.device].items[item].blockPitfall ? this.config[this.device.device].items[item].blockPitfall : '否',
         f_lose_efficacy: this.config[this.device.device].items[item].loseEfficacy ? this.config[this.device.device].items[item].loseEfficacy : '',
         isshow: this.config[this.device.device].items[item].isshow == false ? this.config[this.device.device].items[item].isshow : true,
         readonly: this.config[this.device.device].items[item].readonly == true ? true : false,

package/src/filiale/weinan/android/SafecheckOrderV.vue

@@ -1082,7 +1082,7 @@ export default {
         let msg = ''
         for (let a = 0; a < checkResults.data.length; a++) {
           for (let datumKey in checkResults.data[a]) {
-            msg += datumKey + ':' + checkResults.data[a][datumKey] + ';'
+            msg += datumKey + ','
           }
         }
         this.data.f_defect_text = msg

package/src/filiale/weinan/pc/CheckBookSearchUserList.vue

@@ -56,6 +56,10 @@
             </div>
             <div class="form-group col-sm-4" >
               <button class="button_new" style="margin-right: 10px"  @click="$parent.$parent.showUserCondition()">更多条件</button>
+              <export-excel-safe :data="$parent.$parent.searchData"
+                                 :field="$parent.$parent.excelHeaders"
+                                 :choose-col="true"
+                                 sqlurl="rs/logic/SafeExportExcel" sql-name="FetchUserFileByOrgNoRuHuSXQ" template-name='安检筛选用户信息导出'></export-excel-safe>
               <button class="button_search" style="margin-right: 10px"  @click="search()">查询</button>
               <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.createAndSend()">下发</button>
             </div>
@@ -111,7 +115,7 @@
                       placeholder='请选择'
                       style="width:60%;text-align: center"
                       :disabled-days-of-week="[]"
-                      :format="'yyyy-MM-dd'"
+                      :format="'yyyy-MM-dd 00:00:00'"
                       :show-rest-button="reset"
                       :value.sync="model.f_check_start"
                       v-model="model.f_check_start">
@@ -123,7 +127,7 @@
                       placeholder='请选择'
                       :disabled-days-of-week="[]"
                       style="width:60%;text-align: center"
-                      :format="'yyyy-MM-dd'"
+                      :format="'yyyy-MM-dd 23:59:59'"
                       :show-rest-button="reset"
                       :value.sync="model.f_check_end"
                       v-model="model.f_check_end">
@@ -269,7 +273,31 @@ import {toStandardDateString} from "../../../components/Util";
 export default {
   title: '计划管理',
   data() {
+    let model = new PagedList('/rs/sql/FetchUserFileByOrgNoRuHuSXQ', 20, {
+        "orderitem": "'f_residential_area,f_building,f_unit,f_floor,f_room'",
+        "f_usertype": "''",
+        "month": "''",
+        "SafeCheckSX": 'this.SafeCheckSX',
+        "SafeCheckCQ": "''",
+        "startday":"''",
+        "endday":"''"})
+        model.SafeCheckSX = '1 = 1'
     return {
+      searchData: {
+        condition: "1=1",
+        orderitem: "f_residential_area,f_building,f_unit,f_floor,f_room",
+        SafeCheckSX:""
+      },
+      excelHeaders: {
+        'f_userinfo_code': '用户编号',
+        'f_user_name': '用户姓名',
+        'f_user_type': '用户类型',
+        'f_residential_area': '小区名称',
+        'f_last_check_date': '最后一次安检日期',
+        'f_last_check_state': '最后一次安检状态',
+        'f_address': '详细地址'
+      },
+      model: model,
       createPlan:{
         f_safecheck_type:"年度普检",
         checker:"",
@@ -285,14 +313,6 @@ export default {
       yearList:[{label:"2020",value:"2020"},{label:"2021",value:"2021"},{label:"2022",value:"2022"},{label:"2023",value:"2023"},{label:"2024",value:"2024"},{label:"2025",value:"2025"},{label:"2026",value:"2026"},{label:"2027",value:"2027"},{label:"2028",value:"2028"},{label:"2029",value:"2029"},{label:"2030",value:"2030"}],
       monthList:[{label:"1",value:"1"},{label:"2",value:"2"},{label:"3",value:"3"},{label:"4",value:"4"},{label:"5",value:"5"},{label:"6",value:"6"},{label:"7",value:"7"},{label:"8",value:"8"},{label:"9",value:"9"},{label:"10",value:"10"},{label:"11",value:"11"},{label:"12",value:"12"}],
       showCreatePlan:false,
-      model:new PagedList('/rs/sql/FetchUserFileByOrgNoRuHuSXQ', 20, {
-        "orderitem": "'f_residential_area,f_building,f_unit,f_floor,f_room'",
-        "f_usertype": "''",
-        "month": "''",
-        "SafeCheckSX": {"f_check_start": '', "f_check_end": ''},
-        "SafeCheckCQ": "''",
-        "startday":"''",
-        "endday":"''"}),
       a:'1',
       opt:[{label:"测试",value:"测试"}],
       showCondtion:false,
@@ -357,6 +377,7 @@ export default {
           f_filialeid:this.userlogin.orgid,
           f_subscribe_date:'',
           condition:this.model.condition,
+          SafeCheckSX: this.model.SafeCheckSX,
           switchCheckAll:true,
           checkAll:this.checkAll,
           param:this.checkes,
@@ -398,66 +419,42 @@ export default {
       this.excelUserCondtion=true
     },
     selfSearch (args) {
-      console.log(this.bookrow,"6666")
-      //tag)
-      // 判断时间和状态匹配条件
-      let f_last_check_state = ''
-
-      if(args.model.f_last_check_state.length > 0){
+      if(args.model.f_last_check_state.length > 0) {
         let zzcon = ''
-        if( Util.isEmpty(args.model.f_check_start) && Util.isEmpty(args.model.f_check_end)){
+        if (Util.isEmpty(args.model.f_check_start) || Util.isEmpty(args.model.f_check_end)) {
           this.$showMessage("选择安检状态时，需要选择安检时间区间！")
           return
         }
-        for(let i = 0;i<args.model.f_last_check_state.length;i++){
-          if(args.model.f_last_check_state[i] == '未检'){
-            let lscon = args.model.f_check_start ? ` or ui.f_last_check_date <= '${args.model.f_check_start} 00:00:00'` :''
-            lscon += lscon ? (args.model.f_check_end ? ` or ui.f_last_check_date >= '${args.model.f_check_end} 23:59:59'` :''): (args.model.f_check_end ? `ui.f_last_check_date >= '${args.model.f_check_end} 23:59:59'` :'')
-            if(i == args.model.f_last_check_state.length-1){
-              zzcon += `( ui.f_last_check_state is null or ua.f_last_check_state =''   ${lscon} ) `
-            }else{
-              zzcon += `( ui.f_last_check_state is null or ua.f_last_check_state =''  ${lscon} ) or `
+        this.model.SafeCheckSX = ` f_offsite_time > '${args.model.f_check_start}' and f_offsite_time < '${args.model.f_check_end}'`
+        for (let i = 0; i < args.model.f_last_check_state.length; i++) {
+          if (args.model.f_last_check_state[i] == '未检') {
+            zzcon += ' tcp.ruhu is null '
+            if (i != args.model.f_last_check_state.length - 1) {
+              zzcon += ' or'
             }
-          } else{
-            let lscon = args.model.f_check_start ? ` and ui.f_last_check_date >= '${args.model.f_check_start} 00:00:00'` :''
-            lscon += lscon ? (args.model.f_check_end ? ` and ui.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'') : (args.model.f_check_end ? ` ui.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'')
-            if(i == args.model.f_last_check_state.length-1){
-              zzcon += `(ui.f_last_check_state = '${args.model.f_last_check_state[i]}' ${lscon} ) `
-            }else{
-              zzcon += `(ui.f_last_check_state = '${args.model.f_last_check_state[i]}' ${lscon} ) or `
+          } else if (args.model.f_last_check_state[i] == '入户') {
+            zzcon += `tcp.ruhu > 0`
+            if (i != args.model.f_last_check_state.length - 1) {
+              zzcon += ' or'
+            }
+          } else if (args.model.f_last_check_state[i] == '拒检') {
+            zzcon += `(tcp.jujian > 0 and tcp.ruhu = 0 and tcp.daofang >= 0) `
+            if (i != args.model.f_last_check_state.length - 1) {
+              zzcon += ' or'
+            }
+          } else if (args.model.f_last_check_state[i] == '到访不遇') {
+            zzcon += `(tcp.daofang > 0 and tcp.ruhu = 0 and tcp.jujian = 0) `
+            if (i != args.model.f_last_check_state.length - 1) {
+              zzcon += ' or'
             }
           }
         }
         args.condition += `and ( ${zzcon} )`
-      }else if(args.model.f_last_check_state.length == 0 && (!Util.isEmpty(args.model.f_check_start) || !Util.isEmpty(args.model.f_check_end) )){
-        let lscon = args.model.f_check_start ? ` and ui.f_last_check_date >= '${args.model.f_check_start} 00:00:00'` :''
-        lscon += lscon ? (args.model.f_check_end ? ` and ui.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'') : (args.model.f_check_end ? ` ui.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'')
-        args.condition += lscon
       }else{
-        console.log('这块无条件')
+        //无条件
+        this.model.SafeCheckSX = ` 1 != 1 `
       }
-
-      // if (!Util.isEmpty(args.model.f_last_check_state) && (!Util.isEmpty(args.model.f_check_start) || !Util.isEmpty(args.model.f_check_end) )){
-      //   if (args.model.f_last_check_state == '未检'){
-      //     var lscon = args.model.f_check_start ? ` or ua.f_last_check_date <= '${args.model.f_check_start} 00:00:00'` :''
-      //     lscon += lscon ? (args.model.f_check_end ? ` or ua.f_last_check_date >= '${args.model.f_check_end} 23:59:59'` :''): (args.model.f_check_end ? `ua.f_last_check_date >= '${args.model.f_check_end} 23:59:59'` :'')
-      //     args.condition +=`and (ua.f_last_check_state is null or ua.f_last_check_state =''  ${lscon} ) `
-      //   }else  {
-      //     var lscon = args.model.f_check_start ? ` and ua.f_last_check_date >= '${args.model.f_check_start} 00:00:00'` :''
-      //     lscon += lscon ? (args.model.f_check_end ? ` and ua.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'') : (args.model.f_check_end ? ` ua.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'')
-      //     args.condition += `and ua.f_last_check_state = '${args.model.f_last_check_state}' ${lscon}`
-      //   }
-      //
-      // }else if (Util.isEmpty(args.model.f_last_check_state) && (!Util.isEmpty(args.model.f_check_start) || !Util.isEmpty(args.model.f_check_end) )) {
-      //   var lscon = args.model.f_check_start ? ` and ua.f_last_check_date >= '${args.model.f_check_start} 00:00:00'` :''
-      //   lscon += lscon ? (args.model.f_check_end ? ` and ua.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'') : (args.model.f_check_end ? ` ua.f_last_check_date <= '${args.model.f_check_end} 23:59:59'` :'')
-      //   args.condition += lscon
-      // }else if (!Util.isEmpty(args.model.f_last_check_state) && Util.isEmpty(args.model.f_check_start) && Util.isEmpty(args.model.f_check_end)){
-      //   this.$showMessage("选择安检状态时，需要选择安检时间区间！")
-      //   return
-      // }else{
-      //   console.log('这块无条件')
-      // }
+      this.searchData.SafeCheckSX =  this.model.SafeCheckSX
       let condition1=`(ui.f_last_check_date is null or ui.f_last_check_date ='')`
       let arge = args.condition.replace('从未安检',condition1)
       args.condition = arge
@@ -517,6 +514,7 @@ export default {
       this.cancel()
       this.checkes=[]
       this.checkAll=false
+      this.searchData.condition = args.condition
       this.model.search(args.condition, args.model, args.condValue)
     },
     showUserCondition(){