safecheck-client 3.1.1-gaomi-7 → 4.0.1

package/src/components/notice/NoticeQuery.vue

@@ -60,7 +60,7 @@ import AppData from '../../stores/AppData'
 export default {
   title: '公告查询',
   data () {
-    let model = new PagedList('rs/sql/公告查询', 20, {f_subcompany: 'this.f_division[0]'})
+    let model = new PagedList('api/af-safecheck/sql/公告查询', 20, {f_subcompany: 'this.f_division[0]'})
     model.f_division = [this.$login.f.f_fengongsi]
     return {
       model: model,

package/src/components/outsideSafecheck/android/androidCheckPlanDown/CheckPlanDownTS.vue

@@ -0,0 +1,253 @@
+<template>
+  <div class="auto">
+
+    <div class="auto">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria partial='criteria' @condition-changed='search' 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 for="f_plan_name" class="font text-left">计划名称：</label>
+                </div>
+                <div class="col-xs-8" >
+                  <input id="f_plan_name" class="search_input input-font"
+                         v-model="model.f_plan_name" condition="f_plan_name 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: 45%;" @click="search">查询</button>
+              </div>
+              <!--<div class="row app-btn">-->
+              <!--<button class="btn btn-primary col-xs-6" type="button"  @click="search"><span class="glyphicon  glyphicon-search" style="margin-right: 20px;">查询</span></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">
+                  <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_name }}</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 }}/{{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_create_operator }}/{{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_send_operator }}/{{row.f_plan_month}}</p>-->
+                  <!--</div>-->
+                  <div class="row text-right" >
+                    <button type="button" class="btn yybtn-color" v-on:click.stop.prevent='$parent.$parent.$parent.downHand(row)' v-if="$parent.$parent.$parent.isDown(row)">下载</button>&nbsp;
+                  </div>
+                </div>
+              </div>
+
+            </div>
+          </div>
+        </list>
+      </criteria-paged>
+    </div>
+    <!--<div class="row text-center" style="margin-top: 20px;">-->
+      <!--<button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="downHand()">共享计划下载</button>-->
+      <!--&lt;!&ndash;<button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="dat abase()">数据库导出</button>&ndash;&gt;-->
+    <!--</div>-->
+    <!-- <div class="auto" style="padding-top: 20px;" v-if='show'>
+      <p class="text-warning" style="padding: 0 10px">正在下载抄表单...</p>
+    </div> -->
+    <!-- <hand-info v-if="show" :data="handinfo"></hand-info> -->
+    <!-- <div class="auto" v-if="!show">
+      <p class="text-warning" style="padding: 0 10px">
+        暂无可操作的抄表信息
+      </p>
+    </div> -->
+  </div>
+  <!--<back-page :need-back='true'  @flag="$back()"></back-page>-->
+</template>
+<script>
+  import AppData from '../../../../stores/AppData'
+  import { PagedList } from 'vue-client'
+  import * as Util from '../../../Util'
+  import co from 'co'
+  import Vue from 'vue'
+  const downloadHand = function * (self, row) {
+    let res = yield self.$showMessage('正在进行共享计划下载，请确认！', ['confirm', 'cancel'])
+    let flag = false
+    if (res === 'confirm') {
+      flag = true
+    }
+    if (flag) {
+      let result = yield self.$androidUtil.bzLogic('DownCheckPlanInfoTS', {id: row.id})
+      //安卓端
+      if (result.state === 0) {
+        if (result.data.length > 0) {
+          self.getlocalCheckPlan()
+          self.$showMessage(`下载成功，您可前往计划导航进行查看！`)
+        } else {
+          self.$showMessage('无可下载的共享计划！')
+        }
+      } else {
+        self.$showMessage('下载失败！')
+      }
+      //PC端模拟安卓
+      // if (result.data.state === 0) {
+      //   console.log(result.data.data)
+      //   if (result.data.data.length > 0) {
+      //     self.handcount = result.data.data.length
+      //     self.handinfo = [...result.data.data]
+      //     self.$showMessage(`下载成功`)
+      //     self.reload()
+      //   } else {
+      //     self.$showMessage('无可下载的共享计划！')
+      //   }
+      // } else {
+      //   self.$showMessage('下载失败！')
+      // }
+    }
+  }
+
+  export default {
+    title: '共享计划下载',
+    data () {
+      return {
+        model: new PagedList( `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/getShareCheckPlanTS`,5,{f_fengongsi:`'${Vue.user.orgid}'`}),
+        checkPlanInfo: [],
+        localcheckPlanInfo:[]
+      }
+    },
+    ready () {
+      // Vue.user.f_fengongsi = '中海油.海南分公司'
+      this.getlocalCheckPlan()
+    },
+    methods: {
+      reload(){
+        console.log('页面刷新 ')
+        this.$refs.paged.loadPage(this.$refs.paged.model.pageIndex)
+      },
+      getlocalCheckPlan(){
+        let value = this.$androidUtil.bzLogic('getLocalShareCheckPlanTS',{condition: ''})
+        console.log(value)
+        this.localcheckPlanInfo = value.data
+        // this.$androidUtil.path({alias: 'getLocalCheckPlan', data:{}}).then((value)=>{
+        //   console.log(value)
+        //   this.localcheckPlanInfo = value.data
+        // })
+      },
+      async downHand (row) {
+        // TODO: 先检查网络情况
+        // this.show = true
+        // this.$showAlert('正在下载抄表单,请勿操作！', 'success', 1000)
+        let res = await this.$showMessage('正在进行共享计划下载，请确认！', ['confirm', 'cancel'])
+        if (res === 'confirm') {
+          HostApp.__this__ = this
+          HostApp.param_cache(JSON.stringify({id: row.id}))
+          HostApp.syncLogic({
+            // logic别名，key必须为logic
+            'logic': 'DownCheckPlanInfoTS',
+            // 回调执行方法名，key必须为callback
+            'callback': 'javascript:HostApp.__this__.downLoadCallBack()',
+            // 固定key，代表是否将logic执行结果作为参数传入回调方法，1代表true，0代表false，
+            // 执行回调方法传入key为backresult
+            // 如需额外拼接参数，写在logic返回值的params，例如xxlogic返回:{"params": "success"}
+            'backresult': 1
+          })
+        }
+      },
+      downLoadCallBack(jo){
+        console.log('====》' + JSON.stringify(jo))
+        if (jo.state == 'ok') {
+          let result = JSON.parse(jo.result)
+          console.log('下载结果的f_paper_id===》' + JSON.stringify(result))
+          if (result.state === 0) {
+            if (result.data.length > 0) {
+              this.getlocalCheckPlan()
+              this.$showMessage(`下载成功，您可前往计划导航进行查看！`)
+            } else {
+              this.$showMessage('无可下载的共享计划！')
+            }
+          } else {
+            this.$showMessage('下载失败！')
+          }
+        }
+      }
+    },
+    computed:{
+      isDown(){
+        return function (row) {
+          for (let info of this.localcheckPlanInfo) {
+            if(info.id == row.id){
+              return false
+            }
+          }
+          return true
+        }
+      }
+    }
+  }
+</script>
+<style>
+  .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;
+  }
+
+</style>

package/src/components/{rongcheng/AspiratedAreaPlan.vue → outsideSafecheck/android/safecheckAlreadyDoneWork/AreaPlanTS.vue}

@@ -52,10 +52,10 @@
     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")}
+  .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>
 
@@ -67,7 +67,7 @@
           <form>
             <div class="row app-row">
               <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_plan_name" class="font text-left">计划名称：</label>
               </div>
               <div class="col-xs-8" >
@@ -77,7 +77,7 @@
             </div>
             <div class="row app-row">
               <div class="col-xs-4">
-                <img src="../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <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" >
@@ -88,7 +88,7 @@
 
             <div class="row app-row">
               <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_name" class="font text-left">用户姓名：</label>
               </div>
               <div class="col-xs-8" >
@@ -98,7 +98,7 @@
             </div>
             <div class="row app-row" v-show="$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_keyword" class="font text-left">小区名称：</label>
               </div>
               <div class="col-xs-8" >
@@ -108,27 +108,27 @@
             </div>
             <div class="row app-row" v-show="$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_building" class="font text-left">楼&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号：</label>
               </div>
               <div class="col-xs-8" >
                 <input id="f_building" class="search_input input-font"
-                       v-model="model.f_building" condition="ti.f_building like '%{}%'" />
+                       v-model="model.f_building" condition="ti.f_building = '{}'" />
               </div>
             </div>
             <div class="row app-row" v-show="$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_unit" class="font text-left">单&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;元：</label>
               </div>
               <div class="col-xs-8" >
                 <input id="f_unit" class="search_input input-font"
-                       v-model="model.f_unit" condition="ti.f_unit like '%{}%'" />
+                       v-model="model.f_unit" condition="ti.f_unit = '{}'" />
               </div>
             </div>
             <div class="row app-row" v-show="$parent.$parent.criteriaShow">
               <div class="col-xs-4">
-                <img src="../../assets/shijian.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <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" >
@@ -138,7 +138,7 @@
             </div>
             <div class="row app-row" v-show="$parent.$parent.criteriaShow">
               <div class="col-xs-4">
-                <img src="../../assets/shijian.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <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" >
@@ -148,7 +148,7 @@
             </div>
             <div class="row app-row" v-show="$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  class="font text-left">用户地址：</label>
               </div>
               <div class="col-xs-8" >
@@ -160,7 +160,7 @@
 
             <div class="row app-row" v-show="$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>
               <div class="col-xs-8" >
@@ -171,7 +171,7 @@
             </div>
             <div class="row app-row" v-show="$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  class="font text-left">挂表方式：</label>
               </div>
               <div class="col-xs-8" >
@@ -181,9 +181,9 @@
                             v-model="model.f_flow_direction" condition="tm.f_flow_direction='{}'" close-on-select clear-button></v-select>
               </div>
             </div>
-            <!--<div class="row app-row" v-show="$parent.$parent.criteriaShow">
+            <div class="row app-row" v-show="$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_no_checkplan" class="font text-left">有无计划：</label>
               </div>
               <div class="col-xs-8" >
@@ -191,7 +191,7 @@
                           :options='$parent.$parent.planstates' placeholder='请选择有无计划'
                           v-model="model.f_no_checkplan" condition="ti.f_no_checkplan='{}'" close-on-select clear-button></v-select>
               </div>
-            </div>-->
+            </div>
 <!--            <div class="row app-row" v-show="false">-->
 <!--              <div class="col-xs-4">-->
 <!--                <img src="../../assets/是否已检.png" style="width: 20px;margin-bottom: 5px" alt="">-->
@@ -203,9 +203,9 @@
 <!--                          v-model="model.f_state" condition="ti.f_state='{}'" close-on-select clear-button></v-select>-->
 <!--              </div>-->
 <!--            </div>-->
-            <!--<div class="row app-row" v-show="$parent.$parent.criteriaShow">
+            <div class="row app-row" v-show="$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_last_state" class="font text-left">安检状态：</label>
               </div>
               <div class="col-xs-8" >
@@ -213,10 +213,10 @@
                           :options='$parent.$parent.last_check_states' placeholder='请选择安检状态'
                           v-model="model.f_last_state" condition="ti.f_last_check_state='{}'" close-on-select clear-button></v-select>
               </div>
-            </div>-->
+            </div>
             <div class="row app-row" v-show="$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_upload_state" class="font text-left">上传状态：</label>
               </div>
               <div class="col-xs-8" >
@@ -261,7 +261,7 @@
                 <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>
+                    <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>
                 <div class="col-xs-12">
@@ -270,7 +270,7 @@
                 </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 col-xs-7 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>
@@ -280,9 +280,9 @@
                   <p class="panel-title col-xs-4 text-left font">有无计划</p>
                   <p class="panel-title col-xs-8 text-left input-font">{{ row.f_no_checkplan }}</p>
                 </div>
-                <div class="row" v-if="row.f_upload_state=='已传'">
-                  <p class="panel-title col-xs-4 text-left font"><b>上传时间</b></p>
-                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_upload_date }}</p>
+                <div class="row" v-if="row.f_last_check_state=='到访不遇'">
+                  <p class="panel-title col-xs-4 text-left font">到访不遇次数</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_check_version }} 次</p>
                 </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;-->
@@ -314,16 +314,16 @@
 </template>
 
 <script>
-  import LocalPagedList from '../../plugins/LocalPagedList'
+  import LocalPagedList from '../../../../plugins/LocalPagedList'
   import Vue from 'vue'
-  import { PagedList } from 'vue-client'
-  import * as Util from '../Util'
+  import { PagedList,HttpResetClass} from 'vue-client'
+  import * as Util from '../../../Util'
 
   export default {
     title: '安检计划项',
     data() {
       return {
-        model:Vue.android? new LocalPagedList('androidGetHasDone',5): new PagedList( 'AndroidRest/rs/sql/androidGetHasDone',5),
+        model:Vue.android? new LocalPagedList('androidGetHasDoneTS',5): new PagedList( 'AndroidRest/api/af-safecheck/sql/androidGetHasDoneTS',5),
         showModal: false,
         param: null,
         criteriaShow: false,
@@ -381,24 +381,30 @@
         this.$refs.paged.loadPage(this.$refs.paged.model.pageIndex)
       },
       inspect(row) {
-        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}}).then((response) => {
+        if(this.enableButton){
+          return
+        }
+        this.enableButton=true
+        new HttpResetClass().load('POST',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息TS`, {data: {f_userid: row.f_userinfoid}}).then((response) => {
         console.log(JSON.stringify(response))
         row['f_plan_meters'] = response.data
           var pardate = {
             _this:this,
-            tittle:'安检计划',
+            title:'安检计划',
             safe:true
           }
           this.$dispatch('gotoson',pardate)
-          this.$goto('AspiratedOrderV', {f_plan_id: row.f_plan_id, item: row, role: 'inspect'}, 'self', this.reload)
+          this.enableButton=false
+          this.$goto('safecheck-order-v-ts', {f_plan_id: row.f_plan_id, item: row, role: 'inspect', buttonState:false}, 'self', this.reload)
         /* if (row.f_user_type == '民用') {
           this.$goto('paper-set', {f_plan_id: row.f_plan_id, item: row, role: 'inspect'}, 'self', this.reload)
         } else {
           this.$goto('paper-set-noncivil', {f_plan_id: row.f_plan_id, item: row, role: 'inspect'}, 'self', this.reload)
         }*/
-      }).catch((err)=>{
-          this.$showMessage('网络异常，请稍后再试！')
-        })
+      }).catch((mes)=>{
+        this.$showMessage("网络故障，请稍候再试!")
+          this.enableButton=false
+      })
 
       },
       makeAPhoneCall(phoneNumber) {
@@ -410,13 +416,13 @@
       },
       cancelReserve (idx, id) {
         if(Vue.android){
-          let res =  this.$androidUtil.bzLogic('BookingCheck', {dt: '', id: id})
+          let res =  this.$androidUtil.bzLogic('BookingCheckTS', {dt: '', id: id})
           this.$set('model.rows[' + idx + '].f_prearranged_date', null)
           if (res.code == 200) {
             this.$showMessage("取消预约成功")
           }
         }else {
-          this.$androidUtil.bzLogic('PCbookingCheck', {dt: '', id: id}).then((repanse) => {
+          this.$androidUtil.bzLogic('PCbookingCheckTS', {dt: '', id: id}).then((repanse) => {
             this.$set('model.rows[' + idx + '].f_prearranged_date', null)
             if (repanse.data.code == 200) {
               alert("取消预约成功!")
@@ -430,7 +436,7 @@
             return
           }
           let pdt = this.f_preset_dt.replace('T', ' ')
-          let respanse =  this.$androidUtil.bzLogic('BookingCheck', {id: this.model.rows[this.param].id, dt: pdt})
+          let respanse =  this.$androidUtil.bzLogic('BookingCheckTS', {id: this.model.rows[this.param].id, dt: pdt})
           this.$set('model.rows[' + this.param + '].f_prearranged_date', pdt)
           if(respanse.code == 200) {
             this.$showMessage("预约成功!")
@@ -442,7 +448,7 @@
             return
           }
           let pdt = this.f_preset_dt.replace('T', ' ')
-          this.$androidUtil.bzLogic('PCbookingCheck', {id: this.model.rows[this.param].id, dt: pdt}).then((res) => {
+          this.$androidUtil.bzLogic('PCbookingCheckTS', {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("预约成功!")
@@ -452,7 +458,7 @@
         }
       },
       selfSearch (args) {
-        args.condition += " and f_complete = '已完成' "
+        //args.condition += " and f_complete = '已完成' "
         console.log('args ==>' + JSON.stringify(args))
         this.model.search(args.condition,args.model)
       },