safecheck-client 3.0.31-gongyi → 3.0.32-2

package/src/components/querycheckpaper/CheckPaperList.vue

@@ -26,6 +26,7 @@
           <th>安检人</th>
           <!--          <th>安检开始时间</th>-->
           <th>安检结束时间</th>
+          <th>安检上传时间</th>
           <th>安检状态</th>
           <!--          <th>隐患情况</th>-->
           <th>操作</th>
@@ -36,6 +37,7 @@
           <td style="text-align: center">{{ row.f_checker_name }}</td>
           <!--          <td>{{row.f_onsite_time}}</td>-->
           <td style="text-align: center">{{ row.f_offsite_time }}</td>
+          <td style="text-align: center">{{ row.f_upload_date }}</td>
           <td style="text-align: center">{{ row.f_entry_status }}</td>
           <!--          <td>{{$parent.$parent.getDefect(row.f_defect_content)}}</td>-->
           <td style="text-align: center">
@@ -81,9 +83,12 @@ export default {
     }
   },
   ready() {
-    console.log("开始加载列表------------------------------")
+    //tag
     this.rowdata = this.row
     var condition = "f_userinfoid = '" + this.row.f_userinfo_id + "'"
+    if (this.row.filialeCon){
+      condition += ` and ${this.row.filialeCon}`
+    }
      this.model.params.f_defect_content="CASE WHEN CHARINDEX( '\"result\":\"正常\"', f_defect_content ) > 0 THEN '无隐患' ELSE replace(replace(replace( replace( RIGHT ( f_defect_content, len( f_defect_content ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END"
     this.model.search(condition)
   },
@@ -92,6 +97,9 @@ export default {
       if (val) {
         this.rowdata = val
         var condition = "f_userinfoid = '" + this.row.f_userinfo_id + "'"
+        if (this.row.filialeCon){
+          condition += ` and ${this.row.filialeCon}`
+        }
         this.model.search(condition)
 
       }
@@ -104,14 +112,14 @@ export default {
           var defect = JSON.parse(val)
           return defect.result
         } catch (e) {
-          console.log(val)
+          //tag
           return '正常'
         }
       }
       return '正常'
     },
     goDetail(row) {
-      console.log('doubleclick')
+      //tag
       //Vue.$login = {jwt: row.f_checker_id}
       asyncReady(this).then(() => {
         row.f_upload_state = '已传'

package/src/components/querycheckpaper/CheckPaperSearchUser.vue

@@ -4,6 +4,7 @@
     <div :class="{'basic-main':!showItem,'binary-left':showItem}">
       <!--展示查询界面-->
       <check-search-user class="flex" :tempval="hidden" :style="style" :style2="style2" @select-changed="selected"
+                         @filiale-change="filialeChange"
                          @canel-main="close" v-ref:checksearch></check-search-user>
     </div>
     <div class="binary-right" v-show="showItem">
@@ -27,7 +28,8 @@ export default {
       hidden: true,
       barwidth: '100%',
       showItem: false,
-      rowData: {}
+      rowData: {},
+      filialeCon: ''
     }
   },
   methods: {
@@ -35,13 +37,18 @@ export default {
       this.showItem = this.showItem ? false : true
     },
     selected(row) {
+      if (row.val && this.filialeCon){
+        row.val.filialeCon = this.filialeCon
+      }
       this.showItem = true
       this.barwidth = '50%'
       this.rowData = row.val
       this.hidden = false
-      console.log('2.现在的状态是:' + this.hidden)
+      //tag
+    },
+    filialeChange(filialeCon){
+      this.filialeCon = filialeCon
     },
-
     close() {
       this.showItem = false
       this.barwidth = '100%'
@@ -50,8 +57,8 @@ export default {
   },
   watch: {
     'showItem'(val) {
-      console.log("777777777")
-      console.log(val)
+      //tag
+      //tag
       if (val) {
         this.style = 'col-sm-3 form-group'
         this.style2 = 'col-sm-6 form-group'

package/src/components/querycheckpaper/CheckPaperSearchUserNew.vue

@@ -0,0 +1,67 @@
+<template>
+  <!--安检综合查询主界面-->
+  <div id="unit" class="flex-row" :class="{'binary':showItem}">
+    <div :class="{'basic-main':!showItem,'binary-left':showItem}">
+      <!--展示查询界面-->
+      <check-search-user-new class="flex" :tempval="hidden" :style="style" :style2="style2" @select-changed="selected"
+                         @canel-main="close" v-ref:checksearch></check-search-user-new>
+    </div>
+    <div class="binary-right" v-show="showItem">
+      <div class="flex">
+        <check-paper-list style="height: 100%" :row="rowData"></check-paper-list>
+      </div>
+    </div>
+  </div>
+
+</template>
+
+<script>
+
+export default {
+  title: '用户安检情况',
+  name: 'CheckPaperSearchUser',
+  data() {
+    return {
+      style: 'col-sm-2 form-group',
+      style2: 'col-sm-4 form-group',
+      hidden: true,
+      barwidth: '100%',
+      showItem: false,
+      rowData: {}
+    }
+  },
+  methods: {
+    show() {
+      this.showItem = this.showItem ? false : true
+    },
+    selected(row) {
+      this.showItem = true
+      this.barwidth = '50%'
+      this.rowData = row.val
+      this.hidden = false
+      //tag
+    },
+
+    close() {
+      this.showItem = false
+      this.barwidth = '100%'
+      this.hidden = true
+    }
+  },
+  watch: {
+    'showItem'(val) {
+      //tag
+      //tag
+      if (val) {
+        this.style = 'col-sm-3 form-group'
+        this.style2 = 'col-sm-6 form-group'
+      } else {
+        this.style = 'col-sm-2 form-group'
+        this.style2 = 'col-sm-4 form-group'
+      }
+    }
+  }
+}
+
+</script>
+

package/src/components/querycheckpaper/CheckSearchUser.vue

@@ -8,7 +8,6 @@
               <label class="font_normal_body">用户编号</label>
               <input style="width: 60%" type="text" class="input_search" v-model="model.f_userinfo_code"
                      id="f_userinfo_code"
-
                      placeholder="用户编号" condition="f_userinfo_code like '%{}%'">
             </div>
             <div :class="$parent.$parent.style">
@@ -99,13 +98,11 @@
               <label class="font_normal_body">安检状态</label>
               <v-select id="f_entry"
                         placeholder='安检状态'
+                        :multiple="true"
                         class="select select_list"
-                        :value.sync="model.f_last_check_state"
-                        :value-single="true"
+                        :value.sync="$parent.$parent.checkStates"
                         :options='$parent.$parent.checkstatus'
-                        v-model="model.f_last_check_state"
-                        condition="f_last_check_state = '{}'"
-                        close-on-select clear-button></v-select>
+                        ></v-select>
             </div>
             <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
               <label class="font_normal_body">隐患情况</label>
@@ -116,7 +113,7 @@
                 v-model='model.f_check_result'
                 :value.sync="model.f_check_result"
                 :options='$parent.$parent.f_check_results'
-                condition="f_last_check_result  like '%{}%'"
+                condition="f_defect_content  like '%{}%'"
                 close-on-select clear-button></v-select>
             </div>
             <!--            <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow && !$parent.$parent.$parent.showItem"></div>-->
@@ -182,6 +179,16 @@
                         :value-single="true">
               </v-select>
             </div>
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">距上次安检天数</label>
+              <input type="number" class="input_search" v-model="model.f_check_date"
+                     style="width: 60%" placeholder="距上次安检天数" >
+            </div>
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">到访不遇次数</label>
+              <input type="number" class="input_search" v-model="model.f_check_version"
+                     style="width: 60%" placeholder="到访不遇次数">
+            </div>
           </div>
 
           <div class="row" v-show="$parent.$parent.$parent.showItem">
@@ -286,12 +293,9 @@
               <v-select
                 placeholder='安检状态'
                 class="select select_list"
-
-                :value.sync="model.f_last_check_state"
-                :value-single="true"
+                :value.sync="$parent.$parent.checkStates"
                 :options='$parent.$parent.checkstatus'
-                v-model="model.f_last_check_state"
-                condition="f_last_check_state = '{}'"
+                :multiple="true"
                 close-on-select clear-button></v-select>
             </div>
             <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
@@ -299,15 +303,13 @@
               <v-select
                 placeholder='隐患情况'
                 class="select select_list"
-
                 :value-single="true"
                 v-model='model.f_check_result'
                 :value.sync="model.f_check_result"
                 :options='$parent.$parent.f_check_results'
-                condition="f_last_check_result  like '%{}%'"
+                condition="f_defect_content  like '%{}%'"
                 close-on-select clear-button></v-select>
             </div>
-
           </div>
           <!--<div class="row" v-show="$parent.$parent.$parent.showItem">
             <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
@@ -328,6 +330,9 @@
             <th>
               <nobr>用户名称</nobr>
             </th>
+            <th>
+              <nobr>已安检天数</nobr>
+            </th>
             <th>
               <nobr>用户电话</nobr>
             </th>
@@ -367,11 +372,21 @@
             <th>
               <nobr>安检结果</nobr>
             </th>
+            <th>
+              <nobr>建档日期</nobr>
+            </th>
+            <th>
+              <nobr>通气日期</nobr>
+            </th>
+            <th v-show="$parent.$parent.$parent.showcode">
+              <nobr>二维码</nobr>
+            </th>
           </tr>
         </template>
         <template partial='body'>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center;">{{ row.f_userinfo_code }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center;">{{ row.f_user_name }}</td>
+          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center;">{{$parent.$parent.$parent.dateDiff(row.f_last_check_date)}}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center;">{{ row.f_user_phone }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center;">{{row.f_meternumber}}</td>
 <!--          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center;">{{row.f_meter_brand}}</td>-->
@@ -380,16 +395,37 @@
 <!--          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_safe_haskitchen }}</td>-->
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_residential_area }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_address }}</td>
-          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_last_checker }}</td>
+          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_checker_name }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_last_check_date }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_last_check_state }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">
-            {{row.f_last_check_result }}
+            {{row.f_last_check_state!='入户' ? '': (row.f_last_check_result == '无隐患' ? '无问题' : row.f_last_check_result) }}
+          </td>
+          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_createfile_date }}</td>
+          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_gas_date }}</td>
+          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center" v-show="$parent.$parent.$parent.showcode">
+            <button class="button_spacing button_search-1" @click.stop='$parent.$parent.$parent.searchInfo(row.f_userinfo_code)' >点击</button>
           </td>
         </template>
       </data-grid>
     </criteria-paged>
+    <modal :show.sync="dialogVisible" style="text-align: center"  destroyOnClose={true} v-ref:modal v-if="dialogVisible">
+      <div slot="modal-header" class="modal-header">
+        <h4 class="modal-title">
+          二维码
+        </h4>
+      </div>
+      <div slot="modal-body" class="modal-body" >
+        <div id="dd" ></div>
+      </div>
+      <div slot="modal-footer" class="modal-footer">
+        <print-element class="btn btn-success width-80" id="dd" styleid='style1' top='40' left='60' width='100%' height='100%' v-ref:printelement>打印</print-element>
+        <button type="button" class="btn btn-success width-80" @click="dialogVisible = false">确认</button>
+        <button type="button" class="btn btn-success width-80" @click="dialogVisible = false"  >取消</button>
+      </div>
+    </modal>
   </div>
+
 </template>
 
 <script>
@@ -405,7 +441,7 @@ import Vue from 'vue'
 //     source: 'this.getChildByName($安检员$).getUsers()',
 //     userid: userid
 //   }, {resolveMsg: null, rejectMsg: null})
-//   console.log('获取安检员', getGasman)
+//   //tag
 //   getGasman.data.forEach((checker)=>{
 //     self.checkersid.push({label:checker.name,value:checker.id})
 //   })
@@ -425,12 +461,12 @@ export default {
       moptions.push({label: i + '', value: i + ''})
 
     return {
+      dialogVisible: false,
       searchData: {
         condition: '1=1',
-        orderitem: "f_userinfo_code",
+        orderitem: "f_last_check_date",
         timetype: "dd",
-        f_defect_content: "CASE WHEN CHARINDEX( '\"result\":\"正常\"', ua.f_last_check_result ) > 0 THEN '正常' ELSE replace(replace(replace( replace( RIGHT ( ua.f_last_check_result, len( ua.f_last_check_result ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END"
-
+        f_defect_content: "CASE WHEN CHARINDEX( '\"result\":\"正常\"', tp.f_defect_content ) > 0 THEN '正常' ELSE replace(replace(replace( replace( RIGHT ( tp.f_defect_content, len( tp.f_defect_content ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END"
       },
       excelHeaders: {
         //用户编号	用户名称	用户电话	安检次数	用户类型	小区名称	地址	安检日期	安检状态	安检结果
@@ -440,21 +476,24 @@ export default {
         'f_user_phone': '用户电话',
         'f_meternumber': '用户表号',
         'f_user_type': '用户类型',
-        'f_last_checker': '安检员',
+        'f_checker_name': '安检员',
         'f_residential_area': '小区名称',
         'f_address': '地址',
         'f_last_check_date': '安检日期',
         'f_last_check_state': '安检状态',
-        'f_last_check_result': '安检结果'
+        'f_last_check_result': '安检结果',
+        'f_createfile_date': '建档日期',
+        'f_gas_date': '通气日期'
       },
       model: new PagedList('rs/sql/根据安检员查询用户档案', 20, {
         orderitem: "'f_last_check_date'",
         timetype: "'dd'",
         f_defect_content: 'this.f_defect_content'
       }),
-      f_defect_content:"CASE WHEN CHARINDEX( '\"result\":\"正常\"', ua.f_last_check_result ) > 0 THEN '无隐患' ELSE replace(replace(replace( replace( RIGHT ( ua.f_last_check_result, len( ua.f_last_check_result ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END",
+      f_defect_content:"CASE WHEN CHARINDEX( '\"result\":\"正常\"', tp.f_defect_content ) > 0 THEN '无隐患' ELSE replace(replace(replace( replace( RIGHT ( tp.f_defect_content, len( tp.f_defect_content ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END",
       orgstrs: [{label: '全部', value: ''}],
       checkersid: [],
+      checkStates:[],
       SafeCheckXZ: '',
       civil: '',   //民用安检周期
       civilian: '',      //非民用安检周期
@@ -467,6 +506,7 @@ export default {
       NoBuys: [{label: '是', value: '是'}, {label: '否', value: '否'}],
       criteriaShow: false,
       checkers: [],
+      showcode:false,
       chosenOrg: {id: 0},
       showModal: false,
       checkedAll: false,
@@ -479,7 +519,7 @@ export default {
       checkboxModel: {},
       c_year_list: options,
       c_month_list: moptions,
-      areas: this.areas(),
+      // areas: this.areas(),
       checkstatus: this.checkstatus(),
       usertypes: this.usertypes(),
       userstates: this.userstates(),
@@ -490,7 +530,6 @@ export default {
       cbcs:[],
       cbc:[],
       pcds:[]
-
     }
   },
   props: {
@@ -513,7 +552,7 @@ export default {
   ready() {
     // 获取分公司信息
     this.model.f_defect_content=this.f_defect_content
-
+    this.showcode=this.$appdata.getSingleValue('用户安检情况二维码')
     //this.getfengongsi()
     this.model.chosenOrg = {id: 0}
     this.model.f_filialeids = this.$login.f.f_orgids
@@ -523,6 +562,51 @@ export default {
     this.getAllMeterBook(`('${this.$login.f.orgid}')`)
   },
   methods: {
+
+  dateDiff(date1Str) {
+  // 确保传入的date1Str是有效的字符串格式
+  if (typeof date1Str !== 'string' || !/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(date1Str)) {
+    throw new Error('Invalid date format. Expected format: yyyy-mm-dd hh:mm:ss');
+  }
+  // 将date1Str格式化为Date对象，并提取日期部分
+  const date1 = new Date(date1Str);
+  const year = date1.getFullYear();
+  const month = String(date1.getMonth() + 1).padStart(2, '0'); // 月份从0开始，所以需要加1
+  const day = String(date1.getDate()).padStart(2, '0');
+  const formattedDate1 = `${year}-${month}-${day}`;
+  // 获取当前日期，并同样格式化为yyyy-mm-dd
+  const date2 = new Date();
+  const currentYear = date2.getFullYear();
+  const currentMonth = String(date2.getMonth() + 1).padStart(2, '0');
+  const currentDay = String(date2.getDate()).padStart(2, '0');
+  const formattedDate2 = `${currentYear}-${currentMonth}-${currentDay}`;
+  // 将格式化后的日期字符串转换为Date对象，以便比较
+  const formattedDate1Obj = new Date(`${formattedDate1}T00:00:00`); // 添加时间部分以确保比较准确
+  const formattedDate2Obj = new Date(`${formattedDate2}T00:00:00`);
+  // 计算两个日期之间的差值（以毫秒为单位），然后转换为天数
+  const diffInMilliseconds = Math.abs(formattedDate2Obj - formattedDate1Obj);
+  const diffInDays = Math.ceil(diffInMilliseconds / (1000 * 60 * 60 * 24));
+  // 返回天数差
+  return diffInDays;
+},
+//查询二维码
+     searchInfo(val){
+      this.dialogVisible = true
+      //tag
+       new HttpResetClass().load('POST','rs/logic/QrcodeUtil', {
+        data: {
+          id:val
+        }
+      },{resolveMsg: null, rejectMsg: null}).then(res=>{
+         //tag
+         //tag
+         let imageer=new Image()
+         imageer.src="data:image/jpg;base64,"+res.data.result
+         document.getElementById("dd").appendChild(imageer);
+         //tag
+      })
+
+    },
     //获取省市区列表
     getPcd(val){
       this.pcds = [{label:'全部',value:''}]
@@ -536,7 +620,7 @@ export default {
     },
     getmeterbook(val){
 
-      console.log("进来111")
+      //tag
       this.cbc=[]
       this.cbc.push({
         label:'全部',
@@ -562,8 +646,8 @@ export default {
       }
     },
     Mreadibook(val){
-      //console.log("999999999")
-      //console.log(val)
+      ////tag
+      ////tag
       if (val){
         new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
             items: 'name',
@@ -597,7 +681,7 @@ export default {
         res.data.forEach((item) => {
           this.orgstrs.push({label: item.name, value: item.id})
         })
-        console.log(this.orgstrs.length)
+        //tag
       })
     },
     // 县域分公司发生改变
@@ -616,7 +700,7 @@ export default {
           var defect = JSON.parse(val)
           return defect.result
         } catch (e) {
-          console.log(val)
+          //tag
           return '正常'
         }
       }
@@ -631,8 +715,12 @@ export default {
         this.$showMessage('如果选择 已安检/未安检 选项，需要选择 安检起始时间！')
         return
       }
-      if (this.SafeCheckXZ == '未安检') {
-        args.condition += " and ( f_last_check_date >= '" + args.model.f_check_end + "' or  f_last_check_date <= '" + args.model.f_check_start + "' or f_last_check_date is null)"
+      if ((args.model.f_check_start  || args.model.f_check_end ) && !this.SafeCheckXZ) {
+        this.$showMessage('如果录入 安检起始时间，需要选择 安检筛选条件！')
+        return
+      }
+      /*if (this.SafeCheckXZ == '未安检') {
+        args.condition += " and ( f_last_check_date >= '" + args.model.f_check_start + "' or  f_last_check_date <= '" + args.model.f_check_end + "' or f_last_check_date is null)"
       } else {
         if (args.model.f_check_start) {
           args.condition += " and f_last_check_date >= '" + args.model.f_check_start + "'"
@@ -640,27 +728,62 @@ export default {
         if (args.model.f_check_end) {
           args.condition += " and f_last_check_date <= '" + args.model.f_check_end + "'"
         }
-      }
+      }*/
       args.condition += " and f_filialeid in  " + (this.model.f_filialeids ? this.model.f_filialeids : `(${this.$login.f.orgid})`)
       let con = ' f_filialeid in  ' + (this.model.f_filialeids ? this.model.f_filialeids : `(${this.$login.f.orgid})`)
       con += args.model.f_userinfo_code ? ` and f_userinfo_code like '%${args.model.f_userinfo_code}%'`:''
-      con += args.model.f_user_name ? ` and f_user_name like '%${args.model.f_user_name}%'` : ''
+      /*con += args.model.f_user_name ? ` and f_user_name like '%${args.model.f_user_name}%'` : ''
       con += args.model.f_residential_area ? ` and f_residential_area like '%${args.model.f_residential_area}%'` : ''
       con += args.model.f_address ? ` and f_address like '%${args.model.f_address}%'` : ''
-      con += args.model.f_usertype ? ` and f_check_type = '${args.model.f_usertype}'` : ''
-      if (this.SafeCheckXZ == '未安检') {
-        con += args.model.f_check_start ? ` and ( f_offsite_time < '${args.model.f_check_start}' or f_offsite_time > '${args.model.f_check_end}' )` : ''
-      } else {
-        con += args.model.f_check_start ? ` and f_offsite_time >= '${args.model.f_check_start}'` : ''
-        con += args.model.f_check_end ? ` and f_offsite_time <= '${args.model.f_check_end}'` : ''
+      con += args.model.f_usertype ? ` and f_check_type = '${args.model.f_usertype}'` : ''*/
+      if (this.SafeCheckXZ) {
+        con += ` and f_offsite_time >= '${args.model.f_check_start}' and f_offsite_time <= '${args.model.f_check_end}' `
+        if (this.SafeCheckXZ == '未安检'){
+          args.condition += ' and ruhuid is null'
+        }else{
+          args.condition += ' and ruhuid is not null'
+        }
+      }
+      let states = ` (`
+      if (this.checkStates.length > 0 ){
+        for (let i = 0; i < this.checkStates.length; i++) {
+          if (this.checkStates[i]){
+            states += `'${this.checkStates[i]}',`
+          }else {
+            states = ''
+            break
+          }
+        }
+        if (states){
+          states=states.substring(0,states.length-1)
+          states += `) `
+          args.condition += ` and f_last_check_state in ${states}`
+        }
+      }else {
+        states = ''
+      }
+      if(args.model.f_check_date){
+        const daysBefore = Number(args.model.f_check_date);
+        if ( daysBefore > 0) {
+          // 获取当前日期
+          const now = new Date();
+          // 计算三天前的日期
+          const threeDaysBefore = new Date(now.getTime() - (daysBefore * 24 * 60 * 60 * 1000));
+          // 如果需要格式化日期，可以使用Date对象的方法
+          var formattedDate = threeDaysBefore.toISOString().split('T')[0];
+          args.condition += `  and f_last_check_date<='${formattedDate} 23:59:59'`;
+        } else {
+          console.error('f_check_date不是一个有效的正整数');
+        }
       }
-      con += args.model.f_last_check_state ? ` and f_entry_status = '${args.model.f_last_check_state}'` : ''
-      con += args.model.f_checker_id ? ` and f_checker_name in ${args.model.f_checker_id}` : ''
+      if (args.model.f_check_version){
+        con+= ` and f_check_version  = '${args.model.f_check_version}'`
+      }
+      con += args.model.f_checker_id ? ` and f_checker_name in ${args.model.f_checker_id}` : ' and 1=1'
       let condition = {
         condition1: args.condition,
         condition2: con
       }
-      console.log('查询参数', condition)
       this.searchData.condition = condition
       return this.model.search(condition, args.model)
     },
@@ -746,16 +869,16 @@ export default {
               for (let j = 0; j < respanse.data.length; j++) {
                 _this.checkrows.push(respanse.data[j])
               }
-              console.log(_this.checkrows);
+              //tag;
             }
           })
       }
     },
     addChecked(item) {
-      console.log(item);
+      //tag;
       if (!item.checked) {
         this.checkrows.push(item);
-        console.log(this.checkrows);
+        //tag;
       } else {
         for (let i = 0; i < this.checkrows.length; i++) {
           if (item.f_userinfo_id == this.checkrows[i].f_userinfo_id) {
@@ -791,7 +914,7 @@ export default {
     cancel() {
       this.showModal = false
     },
-    areas() {
+    /*areas() {
       let rs = []
       for (let i = 0; i < this.$login.f.f_allArea.length; i++) {
         let temp = {
@@ -801,9 +924,9 @@ export default {
         rs.push(temp)
       }
       return [{label: '全部', value: ''}, ...rs]
-    },
+    },*/
     initAdjustables() {
-      console.log('初始化调压箱', this.$GetSaleParam)
+      //tag
       let arr = []
       let filter = this.$login.f.f_orgids
       this.$GetSaleParam.getAdjustable(filter).forEach((item) => {
@@ -815,8 +938,8 @@ export default {
       this.adjustables = [{label: '全部', value: ''}, ...arr]
     },
     getAllMeterBook(val){
-      //console.log("999999999")
-      //console.log(val)
+      ////tag
+      ////tag
       this.cbcs=[]
       if (val){
         new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
@@ -895,7 +1018,7 @@ export default {
       }
     },
     // 'checker'(val){
-    //   console.log("checker",this.checker)
+    //   //tag
     //   if(val){
     //     this.checkboxModel.f_checker = this.checker[0].name
     //     this.checkboxModel.f_checker_id = this.checker[0].id