safecheck-client 3.0.34-50 → 3.0.34-51

package/src/components/android/CheckPlanSelect.vue

@@ -45,6 +45,23 @@
   color: #FFFFFF;
   font: 14px PingFang-SC-Bold;
 }
+table {
+  text-align: center;
+  white-space: nowrap;
+  font-size: 12px;
+  width: 50%;
+  border-collapse: collapse;
+  margin: 20px 0;
+  margin: auto;
+}
+th, td {
+  padding: 12px;
+  border-bottom: 1px solid #ddd;
+}
+th {
+  background-color: #f2f2f2;
+}
+tr:hover {background-color: #f5f5f5;}
 .qxbtn-color{
   background-color: #FFFFFF;
   border-radius: 4px ;
@@ -66,8 +83,8 @@
 </style>
 <template>
   <div style="height: auto;width: 100%">
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+    <criteria-paged :model="model" v-ref:paged :pager="false">
+      <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
         <div partial>
           <form>
             <div class="row app-row">
@@ -115,7 +132,7 @@
                           v-model="model.f_start_date"
                           class="input-font"
                           :format="'yyyy-MM-dd 00:00:00'" condition="f_issue_time >= '{}'"
-                          readonly="readonly">
+              >
               </datepicker>-
               <datepicker id="f_end_date" style="width: 30%;"
                           :value.sync="model.f_end_date"
@@ -123,11 +140,11 @@
                           v-model="model.f_end_date"
                           class="input-font"
                           :format="'yyyy-MM-dd 23:59:00'" condition="f_issue_time <= '{}'"
-                          readonly="readonly">
+              >
               </datepicker>
             </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%;" @click="search">查询</button>
               <img @click="$parent.$parent.getNewOrder" src="../../assets/shuaxindaiban1.png" style="float: right;margin-right: 3%;width: 40px;padding: 5px; float:right">
             </div>
             <div class="col-sm-12">
@@ -140,19 +157,34 @@
         <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="panel-body panel-self" @click="$parent.$parent.$parent.gotoAreaSelect(row)">
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>计划名称:</b></p>
+                  <p class="panel-title col-xs-5 text-left input-font" style="width: 74%">{{ row.f_plan_name }}</p>
+                </div>
                 <div class="col-xs-12">
-                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户编号:</b></p>
-                  <p class="panel-title col-xs-5 text-left input-font" style="width: 74%">{{ row.f_userinfo_code }}</p>
+                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>计划发型:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font" style="width: 79%">{{ row.f_safecheck_type }}</p>
                 </div>
                 <div class="col-xs-12">
-                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户名称:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font" style="width: 79%">{{ row.f_user_name }}</p>
+                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>计划时间:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font" style="width: 79%">{{ row.f_issue_time }}</p>
                 </div>
-                <div class="col-xs-6">
-                  <p class="panel-title col-xs-5 text-left font"><b>用户类型:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_user_type }}
-                  </p>
+                <div class="col-xs-12">
+                  <table>
+                    <tr>
+                      <td style="color: #00A3F0">{{row.jihuazongshu}}</td>
+                      <td style="color: #3CC51F">{{row.yijian}}</td>
+                      <td style="color: coral">{{row.weijian}}</td>
+                      <td style="color: red">{{row.daofangbuyu}}</td>
+                    </tr>
+                    <tr>
+                      <th>计划总户数</th>
+                      <th>已检户数</th>
+                      <th>未检户数</th>
+                      <th>到访不遇户数</th>
+                    </tr>
+                  </table>
                 </div>
               </div>
             </div>
@@ -164,528 +196,42 @@
 </template>
 <script>
 import LocalPagedList from '../../plugins/LocalPagedList'
-import Vue from 'vue'
-import { PagedList,HttpResetClass } from 'vue-client'
-import * as Util from '../Util'
-import co from 'co'
-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))',
-    userid: Vue.user.id
-  }, {resolveMsg: null, rejectMsg: null}).then((res) => {
-    //tag
-    self.checkers.push({label:'全部',value:''})
-    res.data.forEach((checker)=>{
-      self.checkers.push({label:checker.name,value:checker.id})
-    })
-  })
-}
 export default {
-  title: '无计划安检查询',
+  title: '安检待办',
   props: ['planName'],
   data() {
     return {
+      planNameOptions:[{label: '请选择', value: ''},],
       safecheckTypes:[{label: '请选择', value: ''},{label: '年度安检', value: '年度安检'},{label: '抽检', value: '抽检'}],
-      f_filialeids:'('+Vue.user.orgid+')',
-      //f_filialeids:'(305)',
-      planparam:[],
-      check:'',
-      plan:'',
-      planid:'',
-      model:Vue.android? new LocalPagedList('androidGetuserinfo',20,{condition:'this.condition'}): new PagedList( 'AndroidRest/rs/sql/androidGetuserinfo',20,{condition:'this.condition'}),
-      showModal: false,
-      showModal2:false,
-      showModal3:false,
-      needid:'',
-      criteriaShow: false,
-      planoption:[],
-      condition:'',
-      checkers:[],
-      param: null,
-      f_preset_dt : Util.to3339TimeString(),
-      flow_direction:[
-        {label: '请选择挂表方式', value: ''},
-        {label: '左表', value: '左表'},
-        {label: '右表', value: '右表'}
-      ],
-      check_states: [
-        {label: '请选择安检状态', value: ''},
-        {label: '未检', value: '未检'},
-        {label: '临时保存', value: '已检'},
-      ],
-      last_check_states: [
-        {label: '请选择上次安检状态', value: ''},
-        {label: '入户', value: '入户'},
-        {label: '拒检', value: '拒检'},
-        {label: '到访不遇', value: '到访不遇'},
-        {label: '未使用天然气', value: '未使用天然气'}
-      ],
-      upload_states: [
-        {label: '请选择上传状态', value: ''},
-        {label: '未传', value: '未传'},
-        {label: '已传', value: '已传'}
-      ],
-      user_types: [
-        {label: '请选择用户类型', value: ''},
-        {label: '民用', value: '民用'},
-        {label: '非民用', value: '非民用'},
-      ],
-      verify_state: [
-        {label: '请选择审核状态', value: ''},
-        {label: '未审核', value: '未审核'},
-        {label: '打回', value: '打回'}
-      ],
-      residentialAreaOptions: [],
-      buildOptions: [],
-      unitOptions: [],
-      planNameOptions: [],
-      upcomingCount: 0,
-      doneCount: 0,
-      tempSaveCount: 0,
-      allPlanCount: 0
+      model:new LocalPagedList('androidGetuserinfo',20,{condition:'this.condition'}),
     }
   },
   ready(){
-    this.getAllArea()
     this.getAllPlanName()
-    this.selfSearch()
-    let gen = select(this)
-    co(gen)
-  },
-  mounted(){
-    //tag
-    if (window.history && window.history.pushState) {
-      history.pushState(null, null, document.URL);
-      window.addEventListener('popstate', this.fun, false);//false阻止默认事件
-    }
-  },
-  destroyed(){
-    //tag
-    window.removeEventListener('popstate', this.fun, false);//false阻止默认事件
   },
   methods: {
-    scan(){
-      HostApp.__this__=this,
-        HostApp.scanCode({callback:"javascript:HostApp.__this__.getCode();"})
-    },
-    getCode(){
-      const datapa = HostApp.getCode().data;
-      //tag
-      this.$refs.paged.$refs.cri.model.f_meter_no = datapa
-
-    },
-    fun () {
-      //tag
-      //tag
-    },
-    iscancel(){
-      this.showModal2=false
-      this.showModal3=false
-      this.planoption=[]
-    },
-    timeSet(val){
-      return val
-    },
-    async isok(){
-      if(this.planoption.length==0){
-        this.$showMessage("请选择计划")
-        return false
-      }
-      for (let i = 0; i <this.planoption.length ; i++) {
-        if (this.planoption[i]["selected"]==true){
-          this.planid=this.planoption[i].value
-          break
-        }
-      }
-      if(this.planid==''){
-        this.$showMessage("请选择计划")
-        return false
-      }
-      await this.okput()
-    },
-    async manyisok(){
-      if(this.planoption.length==0){
-        this.$showMessage("请选择计划")
-        return false
-      }
-      for (let i = 0; i <this.planoption.length ; i++) {
-        if (this.planoption[i]["selected"]==true){
-          this.planid=this.planoption[i].value
-          break
-        }
-      }
-      if(this.planid==''){
-        this.$showMessage("请选择计划")
-        return false
-      }
-      await this.manyokput()
-    },
-    changenull(){
-      this.showModal2=false
-      this.showModal3=false
-      this.planoption=[]
-      this.plan=''
-      this.check=''
-    },
-    async okput(){
-      let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/UpCheckPlanItem`, {data:{
-          condition:`i.id='`+this.needid+`'`,
-          f_plan_id:this.planid,
-          switchCheckAll:false,
-          checkAll:false,
-          f_operator:Vue.user.name
-        }
-      })
-      this.$showMessage("上传成功,请等待审核")
-      await this.changenull()
-      await this.getNewOrder()
-    },
-    async manyokput(){
-      let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/UpCheckPlanItem`, {data:{
-          columnName:"i.id",
-          condition:"1=1",
-          f_plan_id:this.planid,
-          switchCheckAll:true,
-          param:this.planparam,
-          checkAll:false,
-          f_operator:Vue.user.name
-        }
-      })
-      await this.changenull()
-      await this.getNewOrder()
-    },
-    async plansearch(){
-      this.planoption=[]
-      let condition= ` f_plan_year=${new Date().getFullYear()}`
-      if(this.check){
-        condition += ` and f_checker_id= '${this.check}'`
-      }
-      if(this.plan){
-        condition += ` and f_plan_name like '%${this.plan}%'`
-      }
-      let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/预约计划下发`, {data:{
-          condition:condition,
-          f_filialeids:this.f_filialeids,
-          groupitem:'',
-          orderitem:'id'
-        }})
-      let resoult=res.data
-      for (let i = 0; i < resoult.length; i++) {
-        this.planoption.push({label: resoult[i].f_plan_name,selected:false, value: resoult[i].id})
-      }
-    },
-
-    select(row, idx) {
-      this.$set('planoption[' + idx + '].selected', true)
-      for (let i = 0; i <this.planoption.length ; i++) {
-        if (i!=idx){
-          this.planoption[i]["selected"]=false
-        }
-      }
-    },
-    planclose(){
-      this.showModal2=false
-      this.showModal3=false
-    },
-    queryplan(val){
-      this.needid=val
-      this.showModal2 = true
-    },
-    queryplanmany(){
-
-      this.showModal3 = true
-    },
-    reload(){
-      // this.getAllArea()
-      // this.getAllPlanName()
-      this.selfSearch()
-    },
-    cancelReserve (idx, id) {
-      if(Vue.android){
-        let res =  this.$androidUtil.bzLogic('BookingCheck', {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.$set('model.rows[' + idx + '].f_prearranged_date', null)
-          if (repanse.data.code == 200) {
-            alert("取消预约成功!")
-          }
-        })
-      }},
-    genuineReserve () {
-      if(Vue.android){
-        if (!this.f_preset_dt) {
-          this.$showMessage('请选择一个日期')
-          return
-        }
-        let pdt = this.f_preset_dt.replace('T', ' ')
-        let respanse =  this.$androidUtil.bzLogic('BookingCheck', {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("预约成功!")
-        }
-        this.showModal = false
-      }else {
-        if (!this.f_preset_dt) {
-          alert('请选择一个日期')
-          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.$set('model.rows[' + this.param + '].f_prearranged_date', pdt)
-          if(res.data.code == 200) {
-            alert("预约成功!")
-          }
-          this.showModal = false
-        })
+    gotoAreaSelect(row){
+      var pardate = {
+        _this:this,
+        title:'待办工作',
+        safe:false
       }
+      this.$dispatch('gotoson',pardate)
+      this.$goto('area-select', {row: row}, 'self')
     },
-    inspect(row) {
-      var _this = this
-      let http = new HttpResetClass()
-      http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: {
-          items: 'id',
-          tablename: 't_check_plan_item',
-          condition:  `id  = '${row.id}'`,
-          orderitem: ' id '
-        }}, {resolveMsg: null, rejectMsg: null}).then((getcheckplan) => {
-        console.log('getcheckplan=', JSON.stringify(getcheckplan))
-        this.getcheckplandata = getcheckplan.data[0]
-        if(this.getcheckplandata){
-          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}},{resolveMsg: null,rejectMsg: null}).then((response) => {
-              row['f_plan_meters'] = response.data
-              var pardate = {
-                _this:_this,
-                title:'安全检查',
-                safe:true
-              }
-              _this.$dispatch('gotoson',pardate)
-              //tag
-              _this.$goto('safecheck-order-v', {f_plan_id: row.f_plan_id, item: row, role: 'inspect',parentPage:'CurrentCreate'}, 'self', _this.reload)
-            }).catch ((msg)=>{
-              this.$showMessage("网络异常,请检查网络后再试！")
-            })
-          }else{
-            this.$showMessage("该安检单已被上传！")
-          }
-        }else {
-          this.$showMessage("该用户安检单已被移除，请联系管理员确认！")
-        }
-      })
-    },
-    reserve (idx) {
-      this.param = idx
-      this.showModal = true
-    },
-    search(args) {
+    search(args){
+      let condition = '1=1'
       this.model.rows = []
-      this.model.search(args.condition, args.model)
-    },
-    selfSearch () {
-      this.getPlanCount()
-      let condition = ""
-      if (Array.isArray(this.$refs.paged.$refs.cri.model.f_residential_area) && this.$refs.paged.$refs.cri.model.f_residential_area.length >0){
-        condition += " and ti.f_residential_area = '"+this.$refs.paged.$refs.cri.model.f_residential_area[0]+"'"
-      }else if(this.$refs.paged.$refs.cri.model.f_residential_area instanceof String && this.$refs.paged.$refs.cri.model.f_residential_area){
-        condition += " and ti.f_residential_area = '"+this.$refs.paged.$refs.cri.model.f_residential_area+"'"
-      }
-      if(this.$refs.paged.$refs.cri.model.f_building)
-        condition += ` and ti.f_building = '${this.$refs.paged.$refs.cri.model.f_building}'`
-      if(this.$refs.paged.$refs.cri.model.f_unit)
-        condition += ` and ti.f_unit = '${this.$refs.paged.$refs.cri.model.f_unit}'`
-      if (this.planName){
-        condition += " and f_plan_name like '%"+this.planName +"%'"
-      }else {
-        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)
-      //   condition += " and f_plan_month = '"+this.$refs.paged.$refs.cri.model.f_plan_month +"'"
-      if(this.$refs.paged.$refs.cri.model.f_userinfo_code)
-        condition += " and ti.f_userinfo_code like '%"+this.$refs.paged.$refs.cri.model.f_userinfo_code+"%'"
-      if(this.$refs.paged.$refs.cri.model.f_keyword)
-        condition += " and ti.f_address like '%"+this.$refs.paged.$refs.cri.model.f_keyword+"%'"
-      if(this.$refs.paged.$refs.cri.model.f_user_name)
-        condition += " and ti.f_user_name like '%"+this.$refs.paged.$refs.cri.model.f_user_name+"%'"
-      if(this.$refs.paged.$refs.cri.model.f_state[0])
-        condition += " and ti.f_state='"+this.$refs.paged.$refs.cri.model.f_state[0]+"'"
-      // if(this.$refs.paged.$refs.cri.model.f_last_state[0])
-      //   condition += " and ti.f_last_check_state='"+this.$refs.paged.$refs.cri.model.f_last_state[0]+"'"
-      if(this.$refs.paged.$refs.cri.model.f_user_type[0])
-        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_flow_direction[0])
-      //   condition += " and tm.f_flow_direction = '"+this.$refs.paged.$refs.cri.model.f_flow_direction[0]+"'"
-      if(this.$refs.paged.$refs.cri.model.f_user_phone){
-        condition += `and ti.f_user_phone like '%${this.$refs.paged.$refs.cri.model.f_user_phone}%'`
-      }
-      if(this.$refs.paged.$refs.cri.model.f_enter_number)
-        condition += " and ti.f_enter_number like '%"+this.$refs.paged.$refs.cri.model.f_enter_number+"%'"
-      if(this.$refs.paged.$refs.cri.model.f_check_version)
-        condition += " and ti.f_check_version <= "+this.$refs.paged.$refs.cri.model.f_check_version
-      //tag
-      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
-      })
-      HostApp.logicWithHint({
-        // logic别名，key必须为logic
-        'logic': 'FreshPlanItem',
-        // 回调执行方法名，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
-      })
-    },
-    getNewOrderCallBack() {
-      this.selfSearch()
-      this.getAllArea()
-      this.getAllPlanName()
-    },
-    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}})
-      //tag)
-      if(result.code == 200){
-        result.data.rows.forEach(item => this.residentialAreaOptions.push({label:item.f_residential_area,value:item.f_residential_area}))
-      }
-      //tag)
-    },
-    getbuilds(f_residential_area){
-      //tag)
-      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 order by f_building+0'
+        items: `tcp.f_plan_name,tcp.f_issue_time,tcp.f_safecheck_type,COUNT(tcp.id) as jihuazongshu,sum( CASE WHEN tcpi.f_state = '未检' THEN 1 ELSE 0 END ) as weijian,sum( CASE WHEN tcpi.f_state = '已检' THEN 1 ELSE 0 END ) as yijian,sum( CASE WHEN tcpi.f_last_check_state = '到访不遇' THEN 1 ELSE 0 END ) as daofangbuyu`,
+        tablename: 't_check_plan tcp LEFT JOIN t_check_plan_item tcpi ON tcp.id = tcpi.f_plan_id',
+        condition: args.condition || condition,
+        groupitem: 'tcp.f_plan_name,tcp.f_issue_time,tcp.f_safecheck_type'
       }
       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}))
-      }
-      this.buildOptions.sort((a,b)=>{
-        return Number(a.label)- Number(b.label)
-      })
-      //tag)
-    },
-    getUnits(f_building){
-      f_building = f_building[0]
-      //tag)
-      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}))
-      }
-      this.unitOptions.sort((a,b)=>{
-        return Number(a.label)- Number(b.label)
-      })
-    },
-    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 is 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
-
-      //tag
-      //tag
-      //tag
-      //tag
+      this.model.rows = result.data.rows
     },
     getAllPlanName(){
-      this.planNameOptions = []
-      this.$refs.paged.$refs.cri.model.f_plan_name = ''
       let criteria = {
         items: 'f_plan_name',
         tablename: 't_check_plan',
@@ -693,11 +239,9 @@ export default {
         groupitem: 'f_plan_name'
       }
       let result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_GroupBy', 'criteria': criteria}})
-      //tag)
       if(result.code == 200){
         result.data.rows.forEach(item => this.planNameOptions.push({label:item.f_plan_name,value:item.f_plan_name}))
       }
-      //tag)
     },
   }
 }