safecheck-client 3.1.1-gaomi-7 → 4.0.1

package/src/{filiale/wuan/android/CurrentCreate.vue → components/android/DailyworkloadQuery.vue}

@@ -53,10 +53,10 @@
     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")}
+  .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>
@@ -66,78 +66,74 @@
         <div partial>
           <form>
             <div class="row app-row">
-              <!--小区名称-->
-              <v-select :value.sync="model.f_residential_area"
-                        class="input-font"
-                        :options='$parent.$parent.residentialAreaOptions'
-                        placeholder='小区名称'
-                        :width="'32.5%'"
-                        v-model="model.f_residential_area"
-                        condition="ti.f_residential_area = '{}'"
-                        @change="$parent.$parent.getbuilds"
-                        close-on-select clear-button>
-              </v-select>
-              <!--楼栋-->
-              <v-select :value.sync="model.f_building"
-                        class="input-font"
-                        :options='$parent.$parent.buildOptions'
-                        placeholder='楼栋'
-                        :width="'32.5%'"
-                        v-model="model.f_building"
-                        condition="ti.f_building = '{}'"
-                        @change="$parent.$parent.getUnits"
-                        close-on-select clear-button>
-              </v-select>
-              <!--单元-->
-              <v-select :value.sync="model.f_unit"
-                        class="input-font"
-                        :options='$parent.$parent.unitOptions'
-                        placeholder='单元'
-                        :width="'32.5%'"
-                        v-model="model.f_unit"
-                        condition="ti.f_unit = '{}'"
-                        close-on-select clear-button>
-              </v-select>
+              <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_user_name condition="f_user_name 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="">
+                <label for="f_userinfo_code" class="font text-left">用户编号：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input id="f_userinfo_code" class="search_input input-font"
+                       v-model=model.f_userinfo_code condition="f_userinfo_code = '%{}%'" />
+              </div>
             </div>
             <div class="row app-row" >
               <div class="col-xs-4">
-                <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label  class="font text-left">表&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号：</label>
+                <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_meter_no condition="f_meter_no like '%{}%'" />
+                       v-model=model.f_address condition="f_address like '%{}%'"  />
               </div>
             </div>
-
-            <div class="row app-row" v-if="$parent.$parent.criteriaShow">
+            <div class="row app-row">
               <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>
+                <img src="../../assets/是否已检.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_state" 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>
-              </v-select>
+              <datepicker id="f_start_date"
+                          placeholder= '起始时间'
+                          :value.sync="model.f_start_date"
+                          :disabled-days-of-Week="[]"
+                          v-model="model.f_start_date"
+                          class="input-font"
+                          :format="'yyyy-MM-dd 00:00:000'"
+                          :show-reset-button="reset" readonly="readonly">
+              </datepicker>
+            </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_state" class="font text-left">结束时间：</label>
+              </div>
+              <datepicker id="f_end_date"
+                          placeholder= '结束时间'
+                          :value.sync="model.f_end_date"
+                          :disabled-days-of-Week="[]"
+                          v-model="model.f_end_date"
+                          class="input-font"
+                          :format="'yyyy-MM-dd 23:59:000'"
+                          :show-reset-button="reset" readonly="readonly">
+              </datepicker>
             </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_state" class="font text-left">是否已检：</label>
+                <img src="../../assets/是否已检.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_state" class="font text-left">安检结果：</label>
               </div>
               <v-select id="f_state"
                         :value.sync="model.f_state"
                         class="input-font"
                         :options='$parent.$parent.check_states'
-                        placeholder='是否已检'
+                        placeholder='安检结果'
                         :width="'60%'"
                         v-model="model.f_state"
                         condition="f_state='{}'"
@@ -147,59 +143,7 @@
 
             <div class="row app-row" v-if="$parent.$parent.criteriaShow">
               <div class="col-xs-4">
-                <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label for="f_userinfo_code" class="font text-left">用户编号：</label>
-              </div>
-              <div class="col-xs-8" >
-                <input id="f_userinfo_code" class="search_input input-font"
-                       v-model=model.f_userinfo_code condition="f_userinfo_code like '%{}%'" />
-              </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_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>-->
-            <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  class="font text-left">用户姓名：</label>
-              </div>
-              <div class="col-xs-8" >
-                <input  class="search_input input-font" v-model=model.f_user_name condition="f_user_name 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 class="font text-left">用户地址：</label>
-              </div>
-              <div class="col-xs-8" >
-                <input class="search_input input-font"
-                       v-model=model.f_keyword condition="f_address 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="">
+                <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"
@@ -208,58 +152,35 @@
                           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">
-                <span class="font text-left">待办{{$parent.$parent.upcomingCount}}条</span>
+              <div class="col-xs-4">
+                <img src="../../assets/是否已检.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="safechecktype" class="font text-left">安检类型：</label>
               </div>
+              <v-select id="safechecktype" :value.sync="model.f_safecheck_type" class="input-font"
+                        :width="'60%'"
+                        :options='$parent.$parent.safechecktypes' placeholder='请选择安检类型'
+                        v-model="model.f_safecheck_type" condition="f_safecheck_type ='{}'" close-on-select clear-button></v-select>
+            </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>
+              <div style="float: right;margin-right: 3% " class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"  @click="$parent.$parent.hidden()"></div>
+              <!--<img style="float: right;margin-right: 3% " @click="$parent.$parent.getNewOrder" src="../../assets/shuaxindaiban1.png" style="width: 40px;padding: 5px; float:right">-->
+            </div>
+            <!--<div class="row app-row" >
               <div class="col-xs-6" style="text-align: center">
-                <span class="font text-left">已办{{$parent.$parent.doneCount}}条</span>
+                <span class="font text-left">已检{{$parent.$parent.upcomingCount}}条</span>
               </div>
               <div class="col-xs-6" style="text-align: center">
-                <span class="font text-left">临时保存{{$parent.$parent.tempSaveCount}}条</span>
+                <span class="font text-left">入户{{$parent.$parent.doneCount}}条</span>
               </div>
               <div class="col-xs-6" style="text-align: center">
-                <span class="font text-left">总共{{$parent.$parent.allPlanCount}}条</span>
+                <span class="font text-left">拒检{{$parent.$parent.tempSaveCount}}条</span>
               </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>-->
-            <!--<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>-->
-            <!--</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 class="col-xs-6" style="text-align: center">
+                <span class="font text-left">到访不遇{{$parent.$parent.allPlanCount}}条</span>
               </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>
-              <div style="float: right;margin-right: 3% " class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"  @click="$parent.$parent.hidden()"></div>
-              <img style="float: right;margin-right: 3% " @click="$parent.$parent.getNewOrder" src="../../../assets/shuaxindaiban1.png" style="width: 40px;padding: 5px; float:right">
-            </div>
             <div class="col-sm-12">
 
             </div>
@@ -279,9 +200,6 @@
                 <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-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>
@@ -289,21 +207,17 @@
                 </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 class="panel-title col-xs-7 text-left input-font">{{ row.f_check_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_phone2 ? row.f_user_phone2 : row.f_user_phone }}
-                    <img src="../../../assets/phone.png" style="width: 6%" v-on:click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(row.f_user_phone2 ? row.f_user_phone2 : row.f_user_phone)'></img>
+                  <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_phone2 ? row.f_user_phone2 : row.f_user_phone)'></img>-->
                   </p>
                 </div>
 
@@ -330,11 +244,11 @@
                 <!--</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 == '已检'?'临时保存':row.f_state }}</p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_entry_status }}</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>
+                  <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_date }}</p>
                 </div>
                 <div class="col-xs-6">
                   <p class="panel-title col-xs-5 text-left font"><b>安检类型:</b></p>
@@ -344,11 +258,11 @@
                 <!--<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">
+                <!--<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>
+                  &lt;!&ndash;<button type="button" class="btn btn-default" @click="$parent.$parent.$parent.ceshi">确认2</button>&ndash;&gt;
+                </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'-->
@@ -374,7 +288,7 @@
       </div>
     </modal>
     <!--<back-page :need-back='true'  @flag="$back()"></back-page>-->
-    <modal :show.sync="showModal2" v-ref:modal>
+    <modal :show.sync="showModal2" v-ref:modal :backdrop="false">
       <div slot="modal-header" class="modal-header">
         <h4 class="modal-title">
           选择计划
@@ -485,10 +399,10 @@
 </template>
 
 <script>
-  import LocalPagedList from '../../../plugins/LocalPagedList'
+  import LocalPagedList from '../../plugins/LocalPagedList'
   import Vue from 'vue'
   import { PagedList,HttpResetClass } from 'vue-client'
-  import * as Util from '../../Util'
+  import * as Util from '../Util'
   import co from 'co'
    let select = function * (self) {
     let http = new HttpResetClass()
@@ -507,13 +421,13 @@
     title: '无计划安检查询',
     data() {
       return {
-        f_filialeids:'('+Vue.user.orgid+')',
-        //f_filialeids:'(305)',
+        //f_filialeids:`('${Vue.user.orgid}')`,
+        f_filialeids:'',
         planparam:[],
         check:'',
         plan:'',
-        planid:'',
-        model:Vue.android? new LocalPagedList('androidGetuserinfo',20,{condition:'this.condition'}): new PagedList( 'AndroidRest/rs/sql/androidGetuserinfo',20,{condition:'this.condition'}),
+        planid:'',//http://ssl.odc.hk:8300
+        model:new PagedList( `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/Get_khrq`,20,{condition:'this.condition',f_filialeids:`'${Vue.user.orgid}'`,f_checker_id:`'${Vue.user.id}'`}),
         showModal: false,
         showModal2:false,
         showModal3:false,
@@ -531,8 +445,9 @@
         ],
         check_states: [
           {label: '请选择安检状态', value: ''},
-          {label: '未检', value: '未检'},
-          {label: '临时保存', value: '已检'},
+          {label: '入户', value: '入户'},
+          {label: '到访不遇', value: '到访不遇'},
+          {label: '拒检', value: '拒检'}
         ],
         last_check_states: [
           {label: '请选择上次安检状态', value: ''},
@@ -551,6 +466,11 @@
           {label: '民用', value: '民用'},
           {label: '非民用', value: '非民用'},
         ],
+        safechecktypes: [
+          {label: '请选择安检类型', value: ''},
+          {label: '年度普检', value: '年度普检'},
+          {label: '散户安检', value: '散户安检'},
+        ],
         verify_state: [
           {label: '请选择审核状态', value: ''},
           {label: '未审核', value: '未审核'},
@@ -567,28 +487,13 @@
       }
     },
     ready(){
-       this.getAllArea()
-       this.getAllPlanName()
+       /*this.getAllArea()
+       this.getAllPlanName()*/
+      let d=new Date()
+      this.$refs.paged.$refs.cri.model.f_start_date=`${Util.toStandardDateString()} 00:00:000`
       this.selfSearch()
-      let gen = select(this)
-       co(gen)
-    },
-    mounted(){
-      console.log('66666监听返回事件')
-      if (window.history && window.history.pushState) {
-        history.pushState(null, null, document.URL);
-        window.addEventListener('popstate', this.fun, false);//false阻止默认事件
-      }
-    },
-    destroyed(){
-      console.log('页面销毁  取消监听')
-      window.removeEventListener('popstate', this.fun, false);//false阻止默认事件
     },
     methods: {
-      fun () {
-        console.log('111111111111')
-        console.log('监听手机返回')
-      },
       iscancel(){
         this.showModal2=false
         this.showModal3=false
@@ -639,7 +544,7 @@
         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:`it.id='`+this.needid+`'`,
             f_plan_id:this.planid,
@@ -652,7 +557,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,
@@ -671,7 +576,7 @@
         if (!this.check){
           condition=`f_plan_name like '%`+this.plan+`%'`
         }
-        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:'',
@@ -690,7 +595,7 @@
             this.planoption[i]["selected"]=false
           }
         }
-        },
+      },
       planclose(){
         this.showModal2=false
         this.showModal3=false
@@ -704,9 +609,10 @@
         this.showModal3 = true
       },
       reload(){
-        this.getAllArea()
-        this.getAllPlanName()
-        this.selfSearch()
+        // this.getAllArea()
+        // this.getAllPlanName()
+        // this.selfSearch()
+        this.$refs.paged.loadPage(this.model.pageIndex)
       },
       cancelReserve (idx, id) {
         if(Vue.android){
@@ -752,24 +658,24 @@
         }
       },
       inspect(row) {
-        var _this = this
+        /*var _this = this
         console.log('进入inspect')
         if (row.f_upload_state == '未传' || (row.f_upload_state == '已传' && row.f_state == '未检' && row.f_no_checkplan != '无计划安检' ) ) {
-          _this.$resetpost(`${_this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}}).then((response) => {
+          _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,
-              title:'安检抽单',
+              title:'安检单',
               safe:true
             }
             _this.$dispatch('gotoson',pardate)
             console.log('进入safecheck-order-v')
-            _this.$goto('safecheck-order-v', {f_plan_id: row.f_plan_id, item: row, role: 'inspect'}, 'self', _this.reload)
+            _this.$goto('safecheck-order-v', {f_plan_id: row.f_plan_id, item: row, role: 'inspect', buttonState:true}, 'self', _this.reload)
           })
       }else(
           this.$showMessage("该安检单已被上传！")
-        )
+        )*/
       },
       makeAPhoneCall(phoneNumber) {
         this.$androidUtil.makeAPhoneCall(phoneNumber)
@@ -778,22 +684,62 @@
         this.param = idx
         this.showModal = true
       },
-      search(args) {
+      /*search(args) {
         this.model.rows = []
         this.model.search(args.condition, args.model)
-      },
+      },*/
       selfSearch () {
-        this.getPlanCount()
-        let condition = ""
-        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)
+       // this.getPlanCount()
+        //let condition = `f_filialeid='${Vue.user.orgid}' and f_checker_id='${Vue.user.id}' `
+        let condition = "1=1 "
+        if(this.$refs.paged.$refs.cri.model.f_user_name){
+          if(this.$refs.paged.$refs.cri.model.f_user_name.toString().trim()){
+            condition += " and f_user_name like '"+this.$refs.paged.$refs.cri.model.f_user_name+"%'"
+          }
+        }
+        if(this.$refs.paged.$refs.cri.model.f_userinfo_code){
+          if(this.$refs.paged.$refs.cri.model.f_userinfo_code.toString().trim()){
+            condition += " and f_userinfo_code = '"+this.$refs.paged.$refs.cri.model.f_userinfo_code+"'"
+          }
+        }
+        if(this.$refs.paged.$refs.cri.model.f_address){
+          if(this.$refs.paged.$refs.cri.model.f_address.toString().trim()){
+            condition += " and f_address like '%"+this.$refs.paged.$refs.cri.model.f_address+"%'"
+          }
+        }
+        if(this.$refs.paged.$refs.cri.model.f_start_date){
+          if(this.$refs.paged.$refs.cri.model.f_start_date.toString().trim()){
+            condition += " and f_offsite_time >= '"+this.$refs.paged.$refs.cri.model.f_start_date +"'"
+          }
+        }
+        if(this.$refs.paged.$refs.cri.model.f_end_date){
+          if(this.$refs.paged.$refs.cri.model.f_end_date.toString().trim()){
+            condition += " and f_offsite_time <= '"+this.$refs.paged.$refs.cri.model.f_end_date +"'"
+          }
+        }
+        if(this.$refs.paged.$refs.cri.model.f_state){
+          if(this.$refs.paged.$refs.cri.model.f_state.toString().trim()){
+            condition += " and f_entry_status = '"+this.$refs.paged.$refs.cri.model.f_state +"'"
+          }
+        }
+        if(this.$refs.paged.$refs.cri.model.f_user_type){
+          if(this.$refs.paged.$refs.cri.model.f_user_type.toString().trim()){
+            condition += " and f_check_type = '"+this.$refs.paged.$refs.cri.model.f_user_type +"'"
+          }
+        }
+        if(this.$refs.paged.$refs.cri.model.f_safecheck_type){
+          if(this.$refs.paged.$refs.cri.model.f_safecheck_type.toString().trim()){
+            condition += " and f_safecheck_type = '"+this.$refs.paged.$refs.cri.model.f_safecheck_type +"'"
+          }
+        }
+        /*
+
+
+
+
+
+        */
+        /*// 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)
         //   condition += " and f_plan_month = '"+this.$refs.paged.$refs.cri.model.f_plan_month +"'"
@@ -811,25 +757,12 @@
           condition += " and ti.f_user_type='"+this.$refs.paged.$refs.cri.model.f_user_type[0]+"'"
         if(this.$refs.paged.$refs.cri.model.f_meter_no)
           condition += " and tm.f_meter_no like '%"+this.$refs.paged.$refs.cri.model.f_meter_no+"%'"
+        if(this.$refs.paged.$refs.cri.model.f_safecheck_type)
+          condition += " and ti.f_safecheck_type = '"+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 = '未检')) and ti.f_no_checkplan = '有计划安检'" + condition)
-      },
-      getNewOrder(){
-        HostApp.__this__ = this
-        HostApp.logicWithHint({
-          // logic别名，key必须为logic
-          'logic': 'SafeCheckServiceTimeOut',
-          // 回调执行方法名，key必须为callback
-          'callback': 'javascript:HostApp.__this__.getNewOrderCallBack()',
-          // logic执行需要的业务参数
-          'data': {params: ''},
-          // 固定key，代表是否将logic执行结果作为参数传入回调方法，1代表true，0代表false，
-          // 执行回调方法传入key为backresult
-          // 如需额外拼接参数，写在logic返回值的params，例如xxlogic返回:{"params": "success"}
-          'backresult': 1
-        })
+          this.model.search(condition)
       },
       getNewOrderCallBack() {
         this.selfSearch()
@@ -838,147 +771,6 @@
       },
       hidden() {
         this.criteriaShow = !this.criteriaShow
-      },
-      getAllArea(){
-        this.residentialAreaOptions = []
-        this.buildOptions = []
-        this.unitOptions = []
-        this.$refs.paged.$refs.cri.model.f_residential_area = ''
-        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_state <> '已检'`,
-            groupitem: 'f_residential_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.residentialAreaOptions.push({label:item.f_residential_area,value:item.f_residential_area}))
-        }
-        console.log('this.residentialAreaOptions ===> ' + JSON.stringify(this.residentialAreaOptions))
-      },
-      getbuilds(f_residential_area){
-        console.log('f_residential_area ===> ' + JSON.stringify(f_residential_area))
-        this.buildOptions = []
-        this.unitOptions = []
-        this.$refs.paged.$refs.cri.model.f_building = ''
-        this.$refs.paged.$refs.cri.model.f_unit = ''
-        if(!f_residential_area){
-          return
-        }
-        let criteria = {
-          items: 'f_building',
-          tablename: 't_check_plan_item',
-          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){
-          result.data.rows.forEach(item => this.buildOptions.push({label:item.f_building,value:item.f_building}))
-        }
-        console.log('this.buildOptions ===> ' + JSON.stringify(this.buildOptions))
-      },
-      getUnits(f_building){
-        f_building = f_building[0]
-        console.log('f_building ===> ' + JSON.stringify(f_building))
-        this.unitOptions = []
-        this.$refs.paged.$refs.cri.model.f_unit = ''
-        if(!f_building){
-          return
-        }
-        let criteria = {
-          items: 'f_unit',
-          tablename: 't_check_plan_item',
-          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}})
-        if(result.code == 200){
-          result.data.rows.forEach(item => this.unitOptions.push({label:item.f_unit,value:item.f_unit}))
-        }
-        console.log('this.unitOptions ===> ' + JSON.stringify(this.unitOptions))
-      },
-      getPlanCount(){
-        this.upcomingCount = 0
-        this.tempSaveCount = 0
-        this.doneCount = 0
-        this.allPlanCount = 0
-        let criteria = {
-          items: 'count(id) count',
-          tablename: 't_check_plan_item',
-          condition: `f_state = '未检'`,
-          groupitem: 'f_state'
-        }
-        let result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_GroupBy', 'criteria': criteria}})
-        if(result.code && result.code == 200){
-          if(result.data.rows[0] && !isNaN(result.data.rows[0].count)) {
-            this.upcomingCount = result.data.rows[0].count
-          }
-        }
-        criteria = {
-          items: 'count(id) count',
-          tablename: 't_check_plan_item',
-          condition: `(f_complete = '' or f_complete = null or f_complete = '未完成') AND f_state = '已检'`,
-          groupitem: 'f_state'
-        }
-        result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_GroupBy', 'criteria': criteria}})
-        if(result.code && result.code == 200){
-          if(result.data.rows[0] && !isNaN(result.data.rows[0].count)){
-            this.tempSaveCount = result.data.rows[0].count
-          }
-        }
-        criteria = {
-          items: 'count(id) count',
-          tablename: 't_check_plan_item',
-          condition: `f_complete = '已完成' AND f_state = '已检'`,
-          groupitem: 'f_state'
-        }
-        result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_GroupBy', 'criteria': criteria}})
-        if(result.code && result.code == 200){
-          if(result.data.rows[0] && !isNaN(result.data.rows[0].count)){
-            this.doneCount = result.data.rows[0].count
-          }
-        }
-        this.allPlanCount = this.upcomingCount + this.tempSaveCount + this.doneCount
-
-        console.log('this.upcomingCount ===> ' + this.upcomingCount)
-        console.log('this.tempSaveCount ===> ' + this.tempSaveCount)
-        console.log('this.doneCount ===> ' + this.doneCount)
-        console.log('this.allPlanCount ===> ' + this.allPlanCount)
-      },
-      getAllPlanName(){
-        this.planNameOptions = []
-        this.$refs.paged.$refs.cri.model.f_plan_name = ''
-        let criteria = {
-          items: 'f_plan_name',
-          tablename: 't_check_plan',
-          condition: `f_plan_name IS NOT NULL AND f_plan_name != ''`,
-          groupitem: 'f_plan_name'
-        }
-        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.planNameOptions.push({label:item.f_plan_name,value:item.f_plan_name}))
-        }
-        console.log('this.planNameOptions ===> ' + JSON.stringify(this.planNameOptions))
-      },
-      setPlanParam(detailsType, event) {
-        if (event.srcElement.checked) {
-          this.planparam.push(detailsType)
-          console.log(this.planparam)
-        } else {
-          if(this.planparam.length>0){
-            let planid=  this.planparam.findIndex((value) => {
-              return value === detailsType
-            })
-            this.planparam.splice(planid, 1)
-            console.log(this.planparam)
-
-          }
-
-        }
       }
     }
   }