safecheck-client 4.0.0-98 → 4.0.1-1

package/src/filiale/meihekou/android/CheckPlanListArea.vue

@@ -1,190 +1,190 @@
-<style scoped>
-.bg {
-  background-color: blue;
-  height: 1px;
-  border: 0;
-}
-.app-row {
-  background-color: white;
-  padding: 10px 10px 0 10px;
-  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
-}
-.search_input {
-  border: 0;
-  outline: none;
-}
-.font{
-  font: 15px PingFang-SC-Medium;
-  color: #666666;
-}
-.input-font{
-  font: 15px PingFang-SC-Medium;
-  color: #333333;
-}
-.btn-font{
-  font:600 16px PingFang-SC-Bold;
-  color: #499EDF;
-}
-.btn-color{
-  background-color: #FFFFFF;
-  border-radius: 10px ;
-  border: 1px solid #499EDF;
-}
-.app-text {
-  font-size: 12px;
-}
-.panel-self{
-  border-radius: 10px;
-  border:1px solid #499EDF;
-  background-color: #F8F8F8;
-}
-.yybtn-color{
-  background-color:#499edf;
-  border-radius: 4px ;
-  border: 1px solid #499EDF;
-  color: #FFFFFF;
-  font: 14px PingFang-SC-Bold;
-}
-.qxbtn-color{
-  background-color: #FFFFFF;
-  border-radius: 4px ;
-  color: #499edf;
-  font: 14px PingFang-SC-Bold;
-  border: 1px solid #499EDF;
-}
-
-.button_shrink_top {width: 35px; height: 35px; background-size:100%;background-image: url("../../../../static/newStyle/stretch_top.png")}
-.button_shrink_bottom {width: 35px; height: 35px;  background-size:100%;background-image: url("../../../../static/newStyle/stretch_bottom.png")}
-.button_shrink_left {width: 35px; height: 35px;  background-size:100%;background-image: url("../../../../static/newStyle/stretch_left.png")}
-.button_shrink_right {width: 35px; height: 35px; background-size:100%;background-image: url("../../../../static/newStyle/stretch_right.png")}
-</style>
-<template>
-  <div style="height: auto;width: 100%">
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
-        <div partial>
-          <form>
-            <div class="row app-row">
-              <div class="col-xs-4">
-                <img src="../../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label  class="font text-left">小区名称：</label>
-              </div>
-              <div class="col-xs-8" >
-                <input  class="search_input input-font" v-model=model.f_residential_area condition="f_residential_area like '%{}%'" />
-              </div>
-            </div>
-            <div class="row app-row">
-              <div class="col-xs-4">
-                <img src="../../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label  class="font text-left">楼栋：</label>
-              </div>
-              <div class="col-xs-8" >
-                <input  class="search_input input-font" v-model=model.f_building condition="f_building like '%{}%'" />
-              </div>
-            </div>
-            <div class="row text-center" style="margin-top: 20px;">
-              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 25%;" @click="search">查询</button>
-            </div>
-            <div style="height:30px;"></div>
-          </form>
-        </div>
-      </criteria>
-      <list :model="model" partial='list'>
-        <div partial>
-          <div  class="auto app-text" style="margin-top: 5px;">
-            <div class="panel" style="padding: 10px 10px 5px 10px;">
-              <div class="panel-body panel-self" @click="$parent.$parent.$parent.toPlanItem(row)">
-                <div class="col-xs-12">
-                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>小区名称:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font" style="width: 74%">{{ row.f_residential_area }}</p>
-                </div>
-                <div class="col-xs-12">
-                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>楼栋:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font" style="width: 79%">{{ row.f_building }}</p>
-                </div>
-                <div class="col-xs-6">
-                  <p class="panel-title col-xs-5 text-left font"><b>入户:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.checked }}
-                  </p>
-                </div>
-                <div class="col-xs-6">
-                  <p class="panel-title col-xs-5 text-left font"><b>到访不遇:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{  row.daofang }}
-                  </p>
-                </div>
-                <div class="col-xs-6">
-                  <p class="panel-title col-xs-5 text-left font"><b>拒检:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{  row.jujian }}
-                  </p>
-                </div>
-                <div class="col-xs-6">
-                  <p class="panel-title col-xs-5 text-left font"><b>未检:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.no_check }}</p>
-                </div>
-                <div class="col-xs-6">
-                  <p class="panel-title col-xs-5 text-left font"><b>总数:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.checked + row.no_check + row.daofang +  row.jujian }}</p>
-                </div>
-                <div class="col-xs-6">
-                  <p class="panel-title col-xs-5 text-left font"><b>完成率:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">
-                    {{((((row.checked+ row.daofang +  row.jujian) / (row.checked + row.no_check+ row.daofang +  row.jujian))) * 100).toFixed(0) + '%' }}
-                  </p>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </list>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-
-import Vue from 'vue'
-import LocalPagedList from "../../../components/android/LocalPagedList";
-
-export default {
-  title: '小区待办',
-  data() {
-    return {
-      f_orgid: Vue.user.orgid,
-      model: new LocalPagedList(`safe_singleTable_GroupBy`, 20, {
-        items: '"f_residential_area, f_building,'+
-        'SUM( CASE WHEN t2.f_state = \'未检\' THEN 1 ELSE 0 END ) AS no_check,'+
-        'SUM( CASE WHEN t2.f_state = \'已检\' and f_last_check_state=\'入户\' THEN 1 ELSE 0 END ) AS  checked,' +
-        'SUM( CASE WHEN t2.f_state = \'已检\' and f_last_check_state=\'到访不遇\' THEN 1 ELSE 0 END ) AS daofang,' +
-        'SUM( CASE WHEN t2.f_state = \'已检\' and f_last_check_state=\'拒检\' THEN 1 ELSE 0 END ) AS jujian"',
-        tablename: '"t_check_plan t1 LEFT JOIN t_check_plan_item t2 ON t1.id = t2.f_plan_id "',
-        groupitem: '"f_residential_area, f_building"'
-      }),
-      criteriaShow: false
-    }
-  },
-  props: ['planName'],
-  ready(){
-  },
-  methods: {
-    selfSearch (args) {
-      if(this.planName){
-        if(this.planName.toString().trim()){
-          args.condition += " and f_plan_name like '%"+this.planName+"%'"
-        }
-      }
-      this.model.search(args.condition,args.model)
-    },
-    toPlanItem(row) {
-      this.$dispatch('gotoson', {
-        _this: this,
-        title: '安检计划',
-        safe: false
-      })
-      this.$goto('current-create', {planName:this.planName,f_residential_area:row.f_residential_area ,f_building:row.f_building},'self')
-    },
-    hidden() {
-      this.criteriaShow = !this.criteriaShow
-    }
-  }
-}
-</script>
+<style scoped>
+.bg {
+  background-color: blue;
+  height: 1px;
+  border: 0;
+}
+.app-row {
+  background-color: white;
+  padding: 10px 10px 0 10px;
+  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+}
+.search_input {
+  border: 0;
+  outline: none;
+}
+.font{
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
+.input-font{
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+.btn-font{
+  font:600 16px PingFang-SC-Bold;
+  color: #499EDF;
+}
+.btn-color{
+  background-color: #FFFFFF;
+  border-radius: 10px ;
+  border: 1px solid #499EDF;
+}
+.app-text {
+  font-size: 12px;
+}
+.panel-self{
+  border-radius: 10px;
+  border:1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+.yybtn-color{
+  background-color:#499edf;
+  border-radius: 4px ;
+  border: 1px solid #499EDF;
+  color: #FFFFFF;
+  font: 14px PingFang-SC-Bold;
+}
+.qxbtn-color{
+  background-color: #FFFFFF;
+  border-radius: 4px ;
+  color: #499edf;
+  font: 14px PingFang-SC-Bold;
+  border: 1px solid #499EDF;
+}
+
+.button_shrink_top {width: 35px; height: 35px; background-size:100%;background-image: url("../../../../static/newStyle/stretch_top.png")}
+.button_shrink_bottom {width: 35px; height: 35px;  background-size:100%;background-image: url("../../../../static/newStyle/stretch_bottom.png")}
+.button_shrink_left {width: 35px; height: 35px;  background-size:100%;background-image: url("../../../../static/newStyle/stretch_left.png")}
+.button_shrink_right {width: 35px; height: 35px; background-size:100%;background-image: url("../../../../static/newStyle/stretch_right.png")}
+</style>
+<template>
+  <div style="height: auto;width: 100%">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div partial>
+          <form>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label  class="font text-left">小区名称：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input  class="search_input input-font" v-model=model.f_residential_area condition="f_residential_area like '%{}%'" />
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label  class="font text-left">楼栋：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input  class="search_input input-font" v-model=model.f_building condition="f_building like '%{}%'" />
+              </div>
+            </div>
+            <div class="row text-center" style="margin-top: 20px;">
+              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 25%;" @click="search">查询</button>
+            </div>
+            <div style="height:30px;"></div>
+          </form>
+        </div>
+      </criteria>
+      <list :model="model" partial='list'>
+        <div partial>
+          <div  class="auto app-text" style="margin-top: 5px;">
+            <div class="panel" style="padding: 10px 10px 5px 10px;">
+              <div class="panel-body panel-self" @click="$parent.$parent.$parent.toPlanItem(row)">
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>小区名称:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font" style="width: 74%">{{ row.f_residential_area }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>楼栋:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font" style="width: 79%">{{ row.f_building }}</p>
+                </div>
+                <div class="col-xs-6">
+                  <p class="panel-title col-xs-5 text-left font"><b>入户:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.checked }}
+                  </p>
+                </div>
+                <div class="col-xs-6">
+                  <p class="panel-title col-xs-5 text-left font"><b>到访不遇:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{  row.daofang }}
+                  </p>
+                </div>
+                <div class="col-xs-6">
+                  <p class="panel-title col-xs-5 text-left font"><b>拒检:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{  row.jujian }}
+                  </p>
+                </div>
+                <div class="col-xs-6">
+                  <p class="panel-title col-xs-5 text-left font"><b>未检:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.no_check }}</p>
+                </div>
+                <div class="col-xs-6">
+                  <p class="panel-title col-xs-5 text-left font"><b>总数:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.checked + row.no_check + row.daofang +  row.jujian }}</p>
+                </div>
+                <div class="col-xs-6">
+                  <p class="panel-title col-xs-5 text-left font"><b>完成率:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">
+                    {{((((row.checked+ row.daofang +  row.jujian) / (row.checked + row.no_check+ row.daofang +  row.jujian))) * 100).toFixed(0) + '%' }}
+                  </p>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+
+import Vue from 'vue'
+import LocalPagedList from "../../../components/android/LocalPagedList";
+
+export default {
+  title: '小区待办',
+  data() {
+    return {
+      f_orgid: Vue.user.orgid,
+      model: new LocalPagedList(`safe_singleTable_GroupBy`, 20, {
+        items: '"f_residential_area, f_building,'+
+        'SUM( CASE WHEN t2.f_state = \'未检\' THEN 1 ELSE 0 END ) AS no_check,'+
+        'SUM( CASE WHEN t2.f_state = \'已检\' and f_last_check_state=\'入户\' THEN 1 ELSE 0 END ) AS  checked,' +
+        'SUM( CASE WHEN t2.f_state = \'已检\' and f_last_check_state=\'到访不遇\' THEN 1 ELSE 0 END ) AS daofang,' +
+        'SUM( CASE WHEN t2.f_state = \'已检\' and f_last_check_state=\'拒检\' THEN 1 ELSE 0 END ) AS jujian"',
+        tablename: '"t_check_plan t1 LEFT JOIN t_check_plan_item t2 ON t1.id = t2.f_plan_id "',
+        groupitem: '"f_residential_area, f_building"'
+      }),
+      criteriaShow: false
+    }
+  },
+  props: ['planName'],
+  ready(){
+  },
+  methods: {
+    selfSearch (args) {
+      if(this.planName){
+        if(this.planName.toString().trim()){
+          args.condition += " and f_plan_name like '%"+this.planName+"%'"
+        }
+      }
+      this.model.search(args.condition,args.model)
+    },
+    toPlanItem(row) {
+      this.$dispatch('gotoson', {
+        _this: this,
+        title: '安检计划',
+        safe: false
+      })
+      this.$goto('current-create', {planName:this.planName,f_residential_area:row.f_residential_area ,f_building:row.f_building},'self')
+    },
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    }
+  }
+}
+</script>

package/src/filiale/meihekou/android/CurrentCreate.vue

@@ -86,6 +86,16 @@
                         close-on-select clear-button>
               </v-select>
             </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_floor" class="font text-left">楼层：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input id="f_floor" class="search_input input-font"
+                       v-model=model.f_floor condition="ti.f_floor like '%{}%'" />
+              </div>
+            </div>
             <div class="row app-row">
               <div class="col-xs-4">
                 <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
@@ -250,106 +260,28 @@
         <div partial>
           <div  class="auto app-text" style="margin-top: 5px;">
             <div class="panel" style="padding: 10px 10px 5px 10px;">
-              <div class="panel-body panel-self" :style="{ backgroundColor: $parent.$parent.$parent.getLastCheckStateStyle(row.f_last_check_state) }">
+              <div class="panel-body panel-self" :style="{ backgroundColor: $parent.$parent.$parent.getLastCheckStateStyle(row.f_state,row.f_last_check_state) }">
                 <div class="col-xs-12">
-                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户编号:</b></p>
-                  <p class="panel-title col-xs-5 text-left input-font" style="width: 74%">{{ row.f_userinfo_code }}</p>
+                  <p class="panel-title col-xs-5 text-left input-font" style="width: 74%">{{ row.f_userinfo_code }}&emsp;&emsp;&emsp;&emsp;{{ row.f_user_name }}</p>
                   <p class="panel-title col-xs-2 text-left input-font" style="width: 5%;float:right">
                     <input type="checkbox" @click="$parent.$parent.$parent.setPlanParam(row.id, $event)"/>
                   </p>
                 </div>
-                <div class="col-xs-12">
-                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户名称:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font" style="width: 79%">{{ row.f_user_name }}</p>
-                </div>
-                <div class="col-xs-6">
-                  <p class="panel-title col-xs-5 text-left font"><b>用户类型:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_user_type }}
-                  </p>
-                </div>
                 <div class="col-xs-6">
-                  <p class="panel-title col-xs-5 text-left font"><b>计划名称:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_plan_name }}</p>
-                </div>
-                <div class="col-xs-6">
-                  <p class="panel-title col-xs-5 text-left font"><b>小区名称:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_residential_area }}</p>
-                </div>
-                <div class="col-xs-12">
-                  <p class="panel-title text-left font" style="width: 23%;float: left"><b>用户电话:</b></p>
                   <p class="panel-title text-left input-font" style="width: 77%">{{ row.f_user_phone }}
                     <img src="../../../assets/phone.png" style="width: 6%"
                          v-on:click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(row.f_user_phone)'/>
                   </p>
                 </div>
-                <div class="col-xs-12">
-                  <p class="panel-title text-left font" style="width: 23%;float: left"><b>备用电话:</b></p>
-                  <p class="panel-title text-left input-font" style="width: 77%">{{ row.f_rent_phone}}
-                    <img v-if="row.f_rent_phone" src="../../../assets/phone.png" style="width: 6%"
-                         v-on:click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(row.f_rent_phone)'/>
-                  </p>
-                </div>
-                <div class="col-xs-12">
-                  <p class="panel-title text-left font" style="width: 23%;float: left"><b>租户电话:</b></p>
-                  <p class="panel-title text-left input-font" style="width: 77%">{{ row.f_zuhu_phone }}
-                    <img v-if="row.f_zuhu_phone" src="../../../assets/phone.png" style="width: 6%"
-                         v-on:click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(row.f_zuhu_phone)'/>
-                  </p>
-                </div>
-
-                <div class="col-xs-12">
-                  <p class="panel-title text-left font" style="width: 21%;float: left"><b>用户地址:</b></p>
-                  <p class="panel-title text-left input-font" style="width: 79%">{{ row.f_address }}</p>
-                </div>
-
-                <!--                <div class="row">-->
-                <!--                  <p class="panel-title col-xs-4 text-left font">计划年份</p>-->
-                <!--                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_plan_year }}</p>-->
-                <!--                </div>-->
-                <!--                <div class="row">-->
-                <!--                  <p class="panel-title col-xs-4 text-left font">计划月份</p>-->
-                <!--                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_plan_month }}</p>-->
-                <!--                </div>-->
-                <!--                <div class="row">-->
-                <!--                  <p class="panel-title col-xs-4 text-left font">预约时间</p>-->
-                <!--                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_prearranged_date }}</p>-->
-                <!--                </div>-->
-                <div class="row">
-                  <p class="panel-title col-xs-4 text-left font"><b>上次安检状态:</b></p>
-                  <p class="panel-title col-xs-8 text-left input-font"  v-if="row.f_last_check_state=='入户'" >{{ row.f_last_check_state }}</p>
-                </div>
                 <div class="col-xs-6">
-                  <p class="panel-title col-xs-5 text-left font"><b>安检状态:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_state }}</p>
+                  <p class="panel-title text-left input-font" style="width: 79%">{{ row.f_unit}}单元{{ row.f_floor}}楼{{ row.f_room}}室</p>
                 </div>
                 <div class="col-xs-6">
-                  <p class="panel-title col-xs-5 text-left font"><b>上传状态:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_upload_state }}</p>
-                </div>
-                <div class="col-xs-12" v-if="row.f_prearranged_date !=null">
-                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>预约时间:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font" style="width: 79%">{{ row.f_prearranged_date }}</p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{row.f_state==='未检'? row.f_state:row.f_last_check_state}}</p>
                 </div>
                 <div class="col-xs-6">
-                  <p class="panel-title col-xs-5 text-left font"><b>安检类型:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_safecheck_type }}</p>
-                </div>
-                <div class="col-xs-12">
-                  <p class="panel-title col-xs-5 text-left font"><b>到访不遇次数:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_check_version }}</p>
-                </div>
-                <div class="col-xs-6">
-                  <p class="panel-title col-xs-5  text-left font" ><b>是否通过:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_approved }}</p>
-                </div>
-                <div class="col-xs-6" v-show="row.f_approved == '不通过'">
-                  <p class="panel-title col-xs-5  text-left font" style="color: red;"><b>未通过原因:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_approved_note }}</p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_upload_state }}</p>
                 </div>
-                <!--<div class="col-xs-12">-->
-                <!--<p class="panel-title col-xs-5 text-left font"><b>送气期限:</b></p>-->
-                <!--<p class="panel-title col-xs-7 text-left input-font">{{timeSet(row.f_issue_time)}}</p>-->
-                <!--</div>-->
                 <div class="col-xs-12">
                   <button type="button" name="button" class="btn btn-primary" style="background-color:#499edf;float: right" @click="$parent.$parent.$parent.inspect(row)">处理</button>
                   <button type="button" name="button" class="btn btn-primary" style="background-color:#499edf;float: right;margin-right:10px;" @click="$parent.$parent.$parent.queryplan(row.id)">转发</button>
@@ -521,7 +453,7 @@ export default {
       check:'',
       plan:'',
       planid:'',
-      model:Vue.android? new LocalPagedList('androidGetuserinfo',20,{condition:'this.condition'}): new PagedList( 'AndroidRest/api/af-safecheck/sql/androidGetuserinfo',20,{condition:'this.condition'}),
+      model:Vue.android? new LocalPagedList('androidGetuserinfo',50,{condition:'this.condition'}): new PagedList( 'AndroidRest/api/af-safecheck/sql/androidGetuserinfo',20,{condition:'this.condition'}),
       showModal: false,
       showModal2:false,
       showModal3:false,
@@ -600,12 +532,19 @@ export default {
     window.removeEventListener('popstate', this.fun, false);//false阻止默认事件
   },
   methods: {
-    getLastCheckStateStyle(state){
-      switch(state) {
-        case '入户': return '#00ff71'
-        case '拒检': return '#00f3ff'
-        case '到访不遇': return '#fff600'
-        default: return 'transparent'
+    getLastCheckStateStyle(state, f_last_check_state) {
+      if (state === '未检') {
+        return 'transparent';
+      }
+      switch(f_last_check_state) {
+        case '入户':
+          return '#00ff71';
+        case '拒检':
+          return '#00f3ff';
+        case '到访不遇':
+          return '#fff600';
+        default:
+          return 'transparent';
       }
     },
     scan(){
@@ -823,9 +762,10 @@ export default {
                 }
                 _this.$dispatch('gotoson',pardate)
                 //tag
-                _this.$goto('safecheck-order-v', {f_plan_id: row.f_plan_id, item: row, role: 'inspect',parentPage:'CurrentCreate'}, 'self', _this.reload)
+                _this.$goto('safecheck-order-v', {f_plan_id: row.f_plan_id, item: row, role: 'inspect',parentPage:'CurrentCreate'}, 'self')
               }).catch ((msg)=>{
                 this.noLineInspect(row)
+                this.$showMessage("网络异常,请检查网络后再试！")
               })
             }
           }else {
@@ -893,6 +833,8 @@ export default {
       //   condition += " and f_plan_month = '"+this.$refs.paged.$refs.cri.model.f_plan_month +"'"
       if(this.$refs.paged.$refs.cri.model.f_userinfo_code)
         condition += " and ti.f_userinfo_code like '%"+this.$refs.paged.$refs.cri.model.f_userinfo_code+"%'"
+      if(this.$refs.paged.$refs.cri.model.f_floor)
+        condition += " and ti.f_floor like '%"+this.$refs.paged.$refs.cri.model.f_floor+"%'"
       if(this.$refs.paged.$refs.cri.model.f_keyword)
         condition += " and ti.f_address like '%"+this.$refs.paged.$refs.cri.model.f_keyword+"%'"
       if(this.$refs.paged.$refs.cri.model.f_user_name)