safecheck-client 3.1.1-gaomi-7 → 4.0.1

package/src/components/rongcheng/CheckCurrentCreate.vue

@@ -115,15 +115,15 @@
                 <label for="f_plan_name" class="font text-left">计划名称：</label>
               </div>
               <v-select
-                id="f_plan_name"
-                :value.sync="model.f_plan_name"
-                class="input-font"
-                :options='$parent.$parent.planNameOptions'
-                placeholder='计划名称'
-                :width="'60%'"
-                v-model="model.f_plan_name"
-                condition="f_plan_name like '%{}%'"
-                close-on-select clear-button>
+                  id="f_plan_name"
+                  :value.sync="model.f_plan_name"
+                  class="input-font"
+                  :options='$parent.$parent.planNameOptions'
+                  placeholder='计划名称'
+                  :width="'60%'"
+                  v-model="model.f_plan_name"
+                  condition="f_plan_name like '%{}%'"
+                  close-on-select clear-button>
               </v-select>
             </div>
 
@@ -156,24 +156,24 @@
             </div>
 
             <!--<div class="row app-row">-->
-            <!--<div class="col-xs-4">-->
-            <!--<img src="../../assets/shijian.png" style="width: 20px;margin-bottom: 5px" alt="">-->
-            <!--<label for="f_plan_year" class="font text-left">计划年份：</label>-->
-            <!--</div>-->
-            <!--<div class="col-xs-8" >-->
-            <!--<input id="f_plan_year" class="search_input input-font"-->
-            <!--v-model="model.f_plan_year" condition="f_plan_year = '{}'" />-->
-            <!--</div>-->
+              <!--<div class="col-xs-4">-->
+                <!--<img src="../../assets/shijian.png" style="width: 20px;margin-bottom: 5px" alt="">-->
+                <!--<label for="f_plan_year" class="font text-left">计划年份：</label>-->
+              <!--</div>-->
+              <!--<div class="col-xs-8" >-->
+                <!--<input id="f_plan_year" class="search_input input-font"-->
+                       <!--v-model="model.f_plan_year" condition="f_plan_year = '{}'" />-->
+              <!--</div>-->
             <!--</div>-->
             <!--<div class="row app-row">-->
-            <!--<div class="col-xs-4">-->
-            <!--<img src="../../assets/shijian.png" style="width: 20px;margin-bottom: 5px" alt="">-->
-            <!--<label for="f_plan_month" class="font text-left">计划月份：</label>-->
-            <!--</div>-->
-            <!--<div class="col-xs-8" >-->
-            <!--<input id="f_plan_month" class="search_input input-font"-->
-            <!--v-model="model.f_plan_month" condition="f_plan_month = '{}'" />-->
-            <!--</div>-->
+              <!--<div class="col-xs-4">-->
+                <!--<img src="../../assets/shijian.png" style="width: 20px;margin-bottom: 5px" alt="">-->
+                <!--<label for="f_plan_month" class="font text-left">计划月份：</label>-->
+              <!--</div>-->
+              <!--<div class="col-xs-8" >-->
+                <!--<input id="f_plan_month" class="search_input input-font"-->
+                       <!--v-model="model.f_plan_month" condition="f_plan_month = '{}'" />-->
+              <!--</div>-->
             <!--</div>-->
 
             <div class="row app-row" v-if="$parent.$parent.criteriaShow">
@@ -186,23 +186,7 @@
                        v-model=model.f_meter_no condition="f_meter_no like '%{}%'" />
               </div>
             </div>
-            <div class="row app-row" v-if="$parent.$parent.criteriaShow">
-              <div class="col-xs-4">
-                <img src="../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label for="f_plan_name" class="font text-left">所属区域：</label>
-              </div>
-              <v-select
-                id="f_small_area"
-                :value.sync="model.f_small_area"
-                class="input-font"
-                :options='$parent.$parent.smallAreaOptions'
-                placeholder='小区域'
-                :width="'60%'"
-                v-model="model.f_small_area"
-                condition="f_small_area = '{}'"
-                close-on-select clear-button>
-              </v-select>
-            </div>
+
             <div class="row app-row" v-if="$parent.$parent.criteriaShow">
               <div class="col-xs-4">
                 <img src="../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
@@ -218,10 +202,10 @@
                 <img src="../../assets/用户类型.png" style="width: 20px;margin-bottom: 5px" alt="">
                 <label for="f_user_type" class="font text-left">用户类型：</label>
               </div>
-              <v-select id="f_user_type" :value.sync="model.f_user_type" class="input-font"
-                        :width="'60%'"
-                        :options='$parent.$parent.user_types' placeholder='请选择用户类型'
-                        v-model="model.f_user_type" condition="f_user_type='{}'" close-on-select clear-button></v-select>
+                <v-select id="f_user_type" :value.sync="model.f_user_type" class="input-font"
+                          :width="'60%'"
+                          :options='$parent.$parent.user_types' placeholder='请选择用户类型'
+                          v-model="model.f_user_type" condition="f_user_type='{}'" close-on-select clear-button></v-select>
             </div>
             <div class="row app-row" v-if="$parent.$parent.criteriaShow">
               <div class="col-xs-6" style="text-align: center">
@@ -238,38 +222,38 @@
               </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" >-->
-            <!--<v-select   :value.sync="model.f_flow_direction"-->
-            <!--:options='$parent.$parent.flow_direction' placeholder='请选择挂表方式'-->
-            <!--v-model="model.f_flow_direction" condition="f_flow_direction='{}'" close-on-select clear-button></v-select>-->
-            <!--</div>-->
+              <!--<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" >-->
+              <!--<v-select   :value.sync="model.f_flow_direction"-->
+                         <!--:options='$parent.$parent.flow_direction' placeholder='请选择挂表方式'-->
+                         <!--v-model="model.f_flow_direction" condition="f_flow_direction='{}'" close-on-select clear-button></v-select>-->
+              <!--</div>-->
             <!--</div>-->
             <!--<div class="row app-row">-->
-            <!--<div class="col-xs-4">-->
-            <!--<img src="../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">-->
-            <!--<label for="f_last_state" class="font text-left">安检状态：</label>-->
-            <!--</div>-->
-            <!--<div class="col-xs-8" >-->
-            <!--<v-select id="f_last_state" :value.sync="model.f_last_state" class="input-font"-->
-            <!--:options='$parent.$parent.last_check_states' placeholder='请选择安检状态'-->
-            <!--v-model="model.f_last_state" condition="f_last_check_state='{}'" close-on-select clear-button></v-select>-->
+              <!--<div class="col-xs-4">-->
+                <!--<img src="../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">-->
+                <!--<label for="f_last_state" class="font text-left">安检状态：</label>-->
+              <!--</div>-->
+              <!--<div class="col-xs-8" >-->
+                <!--<v-select id="f_last_state" :value.sync="model.f_last_state" class="input-font"-->
+                          <!--:options='$parent.$parent.last_check_states' placeholder='请选择安检状态'-->
+                          <!--v-model="model.f_last_state" condition="f_last_check_state='{}'" close-on-select clear-button></v-select>-->
+              <!--</div>-->
             <!--</div>-->
-            <!--</div>-->
-            <!--  <div class="row app-row">
-                <div class="col-xs-4">
-                  <img src="../../assets/审核状态.png" style="width: 20px;margin-bottom: 5px" alt="">
-                  <label for="f_approved" class="font text-left">审核状态：</label>
-                </div>
-                <div class="col-xs-8" >
-                  <v-select id="f_approved" :value.sync="model.f_approved" class="input-font"
-                            :options='$parent.$parent.verify_state' placeholder='请选择审核状态'
-                            v-model="model.f_approved" condition="f_approved='{}'" close-on-select clear-button></v-select>
-                </div>
-              </div>-->
+          <!--  <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/审核状态.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_approved" class="font text-left">审核状态：</label>
+              </div>
+              <div class="col-xs-8" >
+                <v-select id="f_approved" :value.sync="model.f_approved" class="input-font"
+                          :options='$parent.$parent.verify_state' placeholder='请选择审核状态'
+                          v-model="model.f_approved" condition="f_approved='{}'" close-on-select clear-button></v-select>
+              </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="$parent.$parent.selfSearch">查询</button>
               <button type="button" class="btn btn-lg btn-font btn-color" style="width: 25%;margin-left: 10px" @click="$parent.$parent.queryplanmany">转发</button>
@@ -296,8 +280,8 @@
                   <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-2 text-left input-font" style="width: 5%;float:right">
-                    <input type="checkbox" @click="$parent.$parent.$parent.setPlanParam(row.id, $event)"/>
-                  </p>
+                  <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>
@@ -312,10 +296,10 @@
                   <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-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_phone2 ? row.f_user_phone2 : row.f_user_phone }}
@@ -328,21 +312,21 @@
                   <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">计划年份</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">上次安检状态</p>-->
-                <!--<p class="panel-title col-xs-8 text-left input-font">{{ row.f_last_check_state }}</p>-->
+                  <!--<p class="panel-title col-xs-4 text-left font">上次安检状态</p>-->
+                  <!--<p class="panel-title col-xs-8 text-left input-font">{{ 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>
@@ -356,28 +340,20 @@
                   <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_last_check_date }}</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_last_check_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>-->
                 <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>
                   <!--<button type="button" class="btn btn-default" @click="$parent.$parent.$parent.ceshi">确认2</button>-->
                 </div>
-                <!--                <div class="row text-right" v-show="row.f_upload_state != '已传'" >-->
-                <!--                  <button type="button" class="btn yybtn-color" v-on:click.stop.prevent='$parent.$parent.$parent.reserve($index)'>预约</button>&nbsp;-->
-                <!--                  <button type="button" class="btn qxbtn-color" v-if ='row.f_prearranged_date'-->
-                <!--                          v-on:click.stop.prevent='$parent.$parent.$parent.cancelReserve($index, row.id)'>取消预约</button>-->
-                <!--                </div>-->
+<!--                <div class="row text-right" v-show="row.f_upload_state != '已传'" >-->
+<!--                  <button type="button" class="btn yybtn-color" v-on:click.stop.prevent='$parent.$parent.$parent.reserve($index)'>预约</button>&nbsp;-->
+<!--                  <button type="button" class="btn qxbtn-color" v-if ='row.f_prearranged_date'-->
+<!--                          v-on:click.stop.prevent='$parent.$parent.$parent.cancelReserve($index, row.id)'>取消预约</button>-->
+<!--                </div>-->
               </div>
             </div>
           </div>
@@ -424,7 +400,7 @@
           <div class="col-xs-1" >
             <!--<label  style="font-size: 20px;line-height: 35px">计划</label>-->
           </div>
-          <!--<input placeholder="安检员" type="text"  v-model="check" style="height:30px;width: 100px"/>-->
+            <!--<input placeholder="安检员" type="text"  v-model="check" style="height:30px;width: 100px"/>-->
           <div class="col-xs-2" style="float: right">
             <button type="button" class="btn btn-primary" @click="plansearch" style="background-color:#499edf;float: right;margin-right:10px;border: 1px solid #93B2D3;height:34px;width: 100%;line-height: 1px;padding-left: 12px">查询</button>
           </div>
@@ -514,7 +490,7 @@
   import { PagedList,HttpResetClass } from 'vue-client'
   import * as Util from '../Util'
   import co from 'co'
-  let select = function * (self) {
+   let select = function * (self) {
     let http = new HttpResetClass()
     http.load('POST', `${self.$androidUtil.getProxyUrl()}/rs/search`, {
       source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1))',
@@ -537,7 +513,7 @@
         check:'',
         plan:'',
         planid:'',
-        model:Vue.android? new LocalPagedList('androidGetuserinfo',5,{condition:'this.condition'}): new PagedList( 'AndroidRest/rs/sql/androidGetuserinfo',20,{condition:'this.condition'}),
+        model:Vue.android? new LocalPagedList('androidGetuserinfo',20,{condition:'this.condition'}): new PagedList( 'AndroidRest/api/af-safecheck/sql/androidGetuserinfo',20,{condition:'this.condition'}),
         showModal: false,
         showModal2:false,
         showModal3:false,
@@ -583,7 +559,6 @@
         residentialAreaOptions: [],
         buildOptions: [],
         unitOptions: [],
-        smallAreaOptions: [],
         planNameOptions: [],
         upcomingCount: 0,
         doneCount: 0,
@@ -592,12 +567,11 @@
       }
     },
     ready(){
-      this.getAllArea()
-      this.getAllPlanName()
+       this.getAllArea()
+       this.getAllPlanName()
       this.selfSearch()
-      this.getAllSmall_area()
       let gen = select(this)
-      co(gen)
+       co(gen)
     },
     methods: {
       iscancel(){
@@ -623,7 +597,7 @@
           this.$showMessage("请选择计划")
           return false
         }
-        await this.okput()
+       await this.okput()
       },
       async manyisok(){
         if(this.planoption.length==0){
@@ -640,7 +614,7 @@
           this.$showMessage("请选择计划")
           return false
         }
-        await this.manyokput()
+       await this.manyokput()
       },
       changenull(){
         this.showModal2=false
@@ -650,9 +624,9 @@
         this.check=''
       },
       async okput(){
-        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/UpCheckPlanItem`, {data:{
+        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/UpCheckPlanItem`, {data:{
 
-            condition:`i.id='`+this.needid+`'`,
+          condition:`it.id='`+this.needid+`'`,
             f_plan_id:this.planid,
             switchCheckAll:false,
             checkAll:false,
@@ -663,7 +637,7 @@
         await this.getNewOrder()
       },
       async manyokput(){
-        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/UpCheckPlanItem`, {data:{
+        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/UpCheckPlanItem`, {data:{
             columnName:"it.id",
             condition:"1=1",
             f_plan_id:this.planid,
@@ -682,7 +656,7 @@
         if (!this.check){
           condition=`f_plan_name like '%`+this.plan+`%'`+` and f_safecheck_type='年度普检'`
         }
-        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/预约计划下发`, {data:{
+        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/预约计划下发`, {data:{
             condition:condition,
             f_filialeids:this.f_filialeids,
             groupitem:'',
@@ -701,7 +675,7 @@
             this.planoption[i]["selected"]=false
           }
         }
-      },
+        },
       planclose(){
         this.showModal2=false
         this.showModal3=false
@@ -715,10 +689,9 @@
         this.showModal3 = true
       },
       reload(){
-        //this.getAllArea()
-        //this.getAllPlanName()
-        this.$refs.paged.loadPage(this.model.pageIndex)
-        // this.selfSearch()
+        this.getAllArea()
+        this.getAllPlanName()
+        this.selfSearch()
       },
       cancelReserve (idx, id) {
         if(Vue.android){
@@ -730,10 +703,10 @@
         }else {
           this.$androidUtil.bzLogic('PCbookingCheck', {dt: '', id: id}).then((repanse) => {
             this.$set('model.rows[' + idx + '].f_prearranged_date', null)
-            if (repanse.data.code == 200) {
-              alert("取消预约成功!")
-            }
-          })
+          if (repanse.data.code == 200) {
+            alert("取消预约成功!")
+          }
+        })
         }},
       genuineReserve () {
         if(Vue.android){
@@ -756,39 +729,30 @@
           let pdt = this.f_preset_dt.replace('T', ' ')
           this.$androidUtil.bzLogic('PCbookingCheck', {id: this.model.rows[this.param].id, dt: pdt}).then((res) => {
             this.$set('model.rows[' + this.param + '].f_prearranged_date', pdt)
-            if(res.data.code == 200) {
-              alert("预约成功!")
-            }
-            this.showModal = false
-          })
+          if(res.data.code == 200) {
+            alert("预约成功!")
+          }
+          this.showModal = false
+        })
         }
       },
       inspect(row) {
         var _this = this
         console.log('进入inspect')
-        if (row.f_upload_state == '未传' || (row.f_upload_state == '已传' && row.f_state == '未检' && row.f_no_checkplan != '无计划安检' ) ||(row.f_upload_state == '已传' && row.f_last_check_state != '入户' ) ) {
-
-          _this.$resetpost(`${_this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}}).then((response) => {
-            console.log(JSON.stringify(response))
+        if (row.f_upload_state == '未传' || (row.f_upload_state == '已传' && row.f_state == '未检' && row.f_no_checkplan != '无计划安检' ) ) {
+          _this.$resetpost(`${_this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}}).then((response) => {
+          console.log(JSON.stringify(response))
             row['f_plan_meters'] = response.data
             var pardate = {
-              _this:_this,
+             _this:_this,
               title:'安检计划',
               safe:true
             }
             _this.$dispatch('gotoson',pardate)
             console.log('进入safecheck-order-v'+JSON.stringify(row))
-            if(row.f_user_type=='民用'){
-              _this.$goto('safecheck-order-v', {f_plan_id: row.f_plan_id, item: row, role: 'inspect'}, 'self', _this.reload)
-            }else if(row.f_user_type=='非民用'){
-              _this.$goto('safecheck-order-v-cli', {f_plan_id: row.f_plan_id, item: row, role: 'inspect'}, 'self', _this.reload)
-            }else{
-              this.$showMessage('当前用户类型不明确，请联系管理员！')
-            }
-          }).catch((err)=>{
-            this.$showMessage('网络异常，请稍后再试！')
+            _this.$goto('safecheck-order-v', {f_plan_id: row.f_plan_id, item: row, role: 'inspect'}, 'self', _this.reload)
           })
-        }else(
+      }else(
           this.$showMessage("该安检单已被上传！")
         )
       },
@@ -806,32 +770,14 @@
       selfSearch () {
         this.getPlanCount()
         let condition = ""
-        console.log("this.$refs.paged.$refs.cri.model.f_residential_area:"+this.$refs.paged.$refs.cri.model.f_residential_area)
-        if(this.$refs.paged.$refs.cri.model.f_residential_area){
-          if(this.$refs.paged.$refs.cri.model.f_residential_area.toString().trim()){
-            condition += " and ti.f_residential_area = '"+this.$refs.paged.$refs.cri.model.f_residential_area+"'"
-          }
-        }
-        if(this.$refs.paged.$refs.cri.model.f_building){
-          if(this.$refs.paged.$refs.cri.model.f_building.toString().trim()){
-            condition += " and ti.f_building = '"+this.$refs.paged.$refs.cri.model.f_building+"'"
-          }
-        }
-        if(this.$refs.paged.$refs.cri.model.f_unit){
-          if(this.$refs.paged.$refs.cri.model.f_unit.toString().trim()){
-            condition += " and ti.f_unit = '"+this.$refs.paged.$refs.cri.model.f_unit+"'"
-          }
-        }
-        if(this.$refs.paged.$refs.cri.model.f_plan_name){
-          if(this.$refs.paged.$refs.cri.model.f_plan_name.toString().trim()){
-            condition += " and f_plan_name = '"+this.$refs.paged.$refs.cri.model.f_plan_name +"'"
-          }
-        }
-        if(this.$refs.paged.$refs.cri.model.f_small_area){
-          if(this.$refs.paged.$refs.cri.model.f_small_area.toString().trim()){
-            condition += " and f_small_area = '"+this.$refs.paged.$refs.cri.model.f_small_area +"'"
-          }
-        }
+        if(this.$refs.paged.$refs.cri.model.f_residential_area)
+          condition += " and ti.f_residential_area like '%"+this.$refs.paged.$refs.cri.model.f_residential_area+"%'"
+        if(this.$refs.paged.$refs.cri.model.f_building)
+          condition += " and ti.f_building like '%"+this.$refs.paged.$refs.cri.model.f_building+"%'"
+        if(this.$refs.paged.$refs.cri.model.f_unit)
+          condition += " and ti.f_unit like '%"+this.$refs.paged.$refs.cri.model.f_unit+"%'"
+        if(this.$refs.paged.$refs.cri.model.f_plan_name)
+          condition += " and f_plan_name like '%"+this.$refs.paged.$refs.cri.model.f_plan_name +"%'"
         // if(this.$refs.paged.$refs.cri.model.f_plan_year)
         //   condition += " and f_plan_year = '"+this.$refs.paged.$refs.cri.model.f_plan_year +"'"
         // if(this.$refs.paged.$refs.cri.model.f_plan_month)
@@ -852,8 +798,8 @@
           condition += " and tm.f_meter_no like '%"+this.$refs.paged.$refs.cri.model.f_meter_no+"%'"
         // if(this.$refs.paged.$refs.cri.model.f_flow_direction[0])
         //   condition += " and tm.f_flow_direction = '"+this.$refs.paged.$refs.cri.model.f_flow_direction[0]+"'"
-        console.log('condition ===> '+ condition)
-        this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成') or (f_state = '未检') or (f_upload_state = '已传' and f_last_check_state != '入户')) and ti.f_no_checkplan = '有计划安检' and ti.f_safecheck_type='年度普检'" + condition)
+          console.log('condition ===> '+ condition)
+          this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成') or (f_state = '未检')) and ti.f_no_checkplan = '有计划安检' and ti.f_safecheck_type='年度普检'" + condition)
       },
       getNewOrder(){
         HostApp.__this__ = this
@@ -878,20 +824,6 @@
       hidden() {
         this.criteriaShow = !this.criteriaShow
       },
-      getAllSmall_area(){
-        let criteria = {
-          items: 'f_small_area',
-          tablename: 't_check_plan_item',
-          condition: `f_residential_area IS NOT NULL AND f_residential_area != '' AND f_state <> '已检'`,
-          groupitem: 'f_small_area'
-        }
-        let result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_GroupBy', 'criteria': criteria}})
-        console.log('result ===> ' + JSON.stringify(result))
-        if(result.code == 200){
-          result.data.rows.forEach(item => this.smallAreaOptions.push({label:item.f_small_area,value:item.f_small_area}))
-        }
-        console.log('this.residentialAreaOptions ===> ' + JSON.stringify(this.smallAreaOptions))
-      },
       getAllArea(){
         this.residentialAreaOptions = []
         this.buildOptions = []
@@ -900,10 +832,10 @@
         this.$refs.paged.$refs.cri.model.f_building = ''
         this.$refs.paged.$refs.cri.model.f_unit = ''
         let criteria = {
-          items: 'f_residential_area',
-          tablename: 't_check_plan_item',
-          condition: `f_residential_area IS NOT NULL AND f_residential_area != '' AND ((f_complete = '' or f_complete = null or f_complete = '未完成' or (f_upload_state = '已传' and f_last_check_state != '入户')) or (f_state = '未检'))`,
-          groupitem: 'f_residential_area'
+            items: 'f_residential_area',
+            tablename: 't_check_plan_item',
+            condition: `f_residential_area IS NOT NULL AND f_residential_area != '' AND f_state <> '已检'`,
+            groupitem: 'f_residential_area'
         }
         let result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_GroupBy', 'criteria': criteria}})
         console.log('result ===> ' + JSON.stringify(result))
@@ -924,8 +856,8 @@
         let criteria = {
           items: 'f_building',
           tablename: 't_check_plan_item',
-          condition: `f_building IS NOT NULL AND f_building != '' AND  ((f_complete = '' or f_complete = null or f_complete = '未完成') or (f_state = '未检') or (f_upload_state = '已传' and f_last_check_state != '入户')) AND f_residential_area = '${f_residential_area}'`,
-          groupitem: `f_building order by CAST(REPLACE(f_building,'#','') as int)`
+          condition: `f_building IS NOT NULL AND f_building != '' AND f_state <> '已检' AND f_residential_area = '${f_residential_area}'`,
+          groupitem: 'f_building'
         }
         let result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_GroupBy', 'criteria': criteria}})
         if(result.code == 200){
@@ -944,7 +876,7 @@
         let criteria = {
           items: 'f_unit',
           tablename: 't_check_plan_item',
-          condition: `f_unit IS NOT NULL AND f_unit != '' AND  ((f_complete = '' or f_complete = null or f_complete = '未完成') or (f_state = '未检') or (f_upload_state = '已传' and f_last_check_state != '入户')) AND f_residential_area = '${this.$refs.paged.$refs.cri.model.f_residential_area}' AND f_building = '${f_building}'`,
+          condition: `f_unit IS NOT NULL AND f_unit != '' AND f_state <> '已检' AND f_residential_area = '${this.$refs.paged.$refs.cri.model.f_residential_area}' AND f_building = '${f_building}'`,
           groupitem: 'f_unit'
         }
         let result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_GroupBy', 'criteria': criteria}})