safecheck-client 3.0.33-13 → 3.0.33-132

package/src/components/phonestate/PostMap.vue

@@ -1,82 +1,82 @@
-<template>
-  <div class="auto">
-    <button type="button" class="btn btn-default" @click="this.$back('ass')">&lt;&lt;</button>
-    <div id="allmap2" :style="mapStyle"></div>
-  </div>
-</template>
-
-<script>
-// because of some weired behavior of baidu map, logic cant be extracted out and factored into a map component
-
-import Vue from 'vue'
-
-export default {
-  title: '岗位图',
-  props: ['lonlats'],
-  data () {
-    return {
-      mapStyle: {
-        width: (this.$parent.$el.clientWidth -30) + 'px',
-        height: (this.$parent.$el.clientHeight - 80) + 'px'
-      },
-      markers : []
-    }
-  },
-  ready () {
-    this.lonlats.filter((item) => {
-      return item.f_longitude != 0 && item.f_latitude != 0
-    }).forEach((item) => {
-      this.markers.push({
-        longitude: item.f_longitude,
-        latitude: item.f_latitude,
-        hint: item.f_user_name + '[' + item.f_datetime + ']'
-      })
-    })
-    if(Vue.mapLoaded) {
-      this.render()
-    } else {
-      window.__mapCallback__ = this.mapCallback
-      let element = document.createElement('script')
-      element.setAttribute("type","text/javascript")
-      element.setAttribute("src", 'http://api.map.baidu.com/api?v=2.0&ak=CAErfbr2DatVA6rHdoUELPynrdPh9A6S&callback=__mapCallback__')
-      document.body.appendChild(element)
-    }
-  },
-  methods: {
-    mapCallback () {
-      Vue.mapLoaded = true
-      this.render()
-    },
-    patch () {
-      let a = document.getElementById('allmap2').getElementsByClassName('BMap_cpyCtrl BMap_noprint anchorBL')
-      if(a.length != 0) {
-        a[0].style.height = 'auto'
-      } else {
-        window.setTimeout(this.patch, 500)
-      }
-    },
-    render () {
-      window.map = new BMap.Map("allmap2")
-      window.map.clearOverlays();
-      if(this.markers.length == 0)
-        window.map.centerAndZoom(new BMap.Point(116.404, 39.915), 11)
-      else
-        window.map.centerAndZoom(new BMap.Point(this.markers[0].longitude, this.markers[0].latitude), 11)
-      window.map.addControl(new BMap.NavigationControl())
-      this.markers.forEach(function(pos) {
-        var point = new BMap.Point(pos.longitude,pos.latitude)
-      	var marker = new BMap.Marker(point)  // 创建标注
-        var label = new BMap.Label(pos.hint, {offset: new BMap.Size(20, 0)})
-        marker.setLabel(label)
-        label.setStyle({ border : '0px', padding: '0px'})
-      	window.map.addOverlay(marker)              // 将标注添加到地图中
-      // 	var infoWindow = new BMap.InfoWindow(pos.hint)  // 创建信息窗口对象
-      // 	marker.addEventListener("click", function(){
-      // 		window.map.openInfoWindow(infoWindow,point) //开启信息窗口
-      // 	})
-      })
-      this.patch()
-    }
-  }
-}
-</script>
+<template>
+  <div class="auto">
+    <button type="button" class="btn btn-default" @click="this.$back('ass')">&lt;&lt;</button>
+    <div id="allmap2" :style="mapStyle"></div>
+  </div>
+</template>
+
+<script>
+// because of some weired behavior of baidu map, logic cant be extracted out and factored into a map component
+
+import Vue from 'vue'
+
+export default {
+  title: '岗位图',
+  props: ['lonlats'],
+  data () {
+    return {
+      mapStyle: {
+        width: (this.$parent.$el.clientWidth -30) + 'px',
+        height: (this.$parent.$el.clientHeight - 80) + 'px'
+      },
+      markers : []
+    }
+  },
+  ready () {
+    this.lonlats.filter((item) => {
+      return item.f_longitude != 0 && item.f_latitude != 0
+    }).forEach((item) => {
+      this.markers.push({
+        longitude: item.f_longitude,
+        latitude: item.f_latitude,
+        hint: item.f_user_name + '[' + item.f_datetime + ']'
+      })
+    })
+    if(Vue.mapLoaded) {
+      this.render()
+    } else {
+      window.__mapCallback__ = this.mapCallback
+      let element = document.createElement('script')
+      element.setAttribute("type","text/javascript")
+      element.setAttribute("src", 'http://api.map.baidu.com/api?v=2.0&ak=CAErfbr2DatVA6rHdoUELPynrdPh9A6S&callback=__mapCallback__')
+      document.body.appendChild(element)
+    }
+  },
+  methods: {
+    mapCallback () {
+      Vue.mapLoaded = true
+      this.render()
+    },
+    patch () {
+      let a = document.getElementById('allmap2').getElementsByClassName('BMap_cpyCtrl BMap_noprint anchorBL')
+      if(a.length != 0) {
+        a[0].style.height = 'auto'
+      } else {
+        window.setTimeout(this.patch, 500)
+      }
+    },
+    render () {
+      window.map = new BMap.Map("allmap2")
+      window.map.clearOverlays();
+      if(this.markers.length == 0)
+        window.map.centerAndZoom(new BMap.Point(116.404, 39.915), 11)
+      else
+        window.map.centerAndZoom(new BMap.Point(this.markers[0].longitude, this.markers[0].latitude), 11)
+      window.map.addControl(new BMap.NavigationControl())
+      this.markers.forEach(function(pos) {
+        var point = new BMap.Point(pos.longitude,pos.latitude)
+      	var marker = new BMap.Marker(point)  // 创建标注
+        var label = new BMap.Label(pos.hint, {offset: new BMap.Size(20, 0)})
+        marker.setLabel(label)
+        label.setStyle({ border : '0px', padding: '0px'})
+      	window.map.addOverlay(marker)              // 将标注添加到地图中
+      // 	var infoWindow = new BMap.InfoWindow(pos.hint)  // 创建信息窗口对象
+      // 	marker.addEventListener("click", function(){
+      // 		window.map.openInfoWindow(infoWindow,point) //开启信息窗口
+      // 	})
+      })
+      this.patch()
+    }
+  }
+}
+</script>

package/src/components/planmanage/PlanManage.vue

@@ -16,7 +16,7 @@
                       close-on-select value-single >
             </v-select>
           </div>
-          <div class="row auto safe-div-p"><!--<span style="margin-right: 5px" @click="refresh()" style="cursor:default">测试</span>--><span style="margin-right: 5px" @click="delCheckPlan()" style="cursor:default">删除</span> <span @click="sendCheckPlan()" style="cursor:default">下发</span></div>
+          <div class="row auto safe-div-p"><!--<span style="margin-right: 5px" @click="refresh()" style="cursor:default">测试</span>--><span style="margin-right: 5px" @click="delCheckPlan()" style="cursor:default" v-if="isdelete">删除</span> <span @click="sendCheckPlan()" style="cursor:default">下发</span></div>
         </div>
         <div class="leftplan-center safe_plan_list">
           <div class="row safe-leftplan safe_list_li" :class="{'safe-selectplan':selectPlan.id==row.id}" v-for="row in checkplan.list.data" @click="selectPlanChange(row)">
@@ -399,6 +399,7 @@
             a:'1',
             opt:[{label:"按时间降序",value:"按时间降序"},{label:"按时间升序",value:"按时间升序"}],
             currentorder:'按时间降序',
+            isdelete:this.$login.r ? this.$login.r.includes("安检计划删除"):false,
             checkplan : new SearchList(true),
             selectPlan:{id:''},
             upCheckPlan:{
@@ -451,6 +452,13 @@
         },
       async ready(){
         await this.loadpage()
+        if (!this.userlogin.orgid){
+          if (this.$login.f.f_orgids){
+            this.userlogin.orgid = this.$login.f.f_orgids.endsWith('.')?this.$login.f.f_orgids.substring(0,this.$login.f.f_orgids.length-1):this.$login.f.f_orgids
+          }else {
+            this.userlogin.orgid = ''
+          }
+        }
       },
    computed: {
         ntoway() {
@@ -575,8 +583,10 @@
         //查询安检员selectChanged
         async searchChecker(id){
           let res=await new HttpResetClass().load('POST', '/rs/search', {
-            source: `root.getResourceById($${this.userlogin.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,
-            userid: this.$login.f.id
+            data:{
+              source: `this.getSpecialResByType($user$).where(row.getAttributes().get($rolestr$)!=null ).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,
+              userid: this.userlogin.orgid
+            }
           }, {resolveMsg: null, rejectMsg: null})
           let arr = []
           res.data.forEach((resRow) => {
@@ -727,7 +737,7 @@
           this.isSend=true
           let res=await new HttpResetClass().load("POST", "/rs/logic/deleteCheckPlan", {
             data:{
-              f_operator:this.userlogin.orgstr,//global.login.name,
+              f_operator:this.userlogin.name,//global.login.name,
               condition:"",
               switchCheckAll:true,
               checkAll:false,

package/src/components/planmanage/checkPlanList.vue

@@ -50,7 +50,7 @@
             </div>
             <div class="form-group col-sm-2" style="float: right">
               <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.showplanModal()">计划调整</button>
-              <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.delPlanItem()">移出计划</button>
+              <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.delPlanItem()" v-show="$parent.$parent.isdelete">移出计划</button>
             </div>
             <modal :show.sync="$parent.$parent.showCondtion" v-ref:modal :width="'50%'" :backdrop="false">
               <div slot="modal-header" class="modal-header">
@@ -178,6 +178,7 @@
     data() {
       return {
         model:new PagedList('/rs/sql/planItem', 100, {}),
+        isdelete:this.$login.r ? this.$login.r.includes("安检计划删除"):false,
         a:'1',
         opt:[{label:"测试",value:"测试"}],
         showCondtion:false,

package/src/components/planmanage/checkUserList.vue

@@ -371,6 +371,7 @@
             <th><nobr>抄表册</nobr></th>
             <th title="当前所在的安检计划名称"><nobr>所属计划</nobr></th>
             <th title="最后一次安检日期"><nobr>安检日期</nobr></th>
+            <th><nobr>首次通气时间</nobr></th>
             <th><nobr>详细地址</nobr></th>
           </tr>
         </template>
@@ -386,6 +387,7 @@
           <td style="text-align: center"><nobr>{{row.f_book_name}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_plan_name}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_last_check_date}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_uservent_date}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_address}}</nobr></td>
         </template>
       </data-grid>

package/src/components/querycheckpaper/PaperItem.vue

@@ -1,59 +1,59 @@
-<template>
-  <div style="height: 100%;width: 100%;padding:10px 0px 10px 0px;">
-    <div class="auto">
-      <partial-view v-ref:pv>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-4 control-label">用户姓名:</label>
-          <span class = "col-sm-8">{{rowdata.f_user_name}}</span>
-        </div>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-4 control-label">用户地址:</label>
-          <span class = "col-sm-8">{{rowdata.f_address}}</span>
-        </div>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">安检人:</label>
-          <span class = "col-sm-3">{{rowdata.f_checker_name}}</span>
-          <label class = "col-sm-3 control-label">安检状态:</label>
-          <span class = "col-sm-3">{{rowdata.f_entry_status}}</span>
-        </div>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">入户时间:</label>
-          <span class = "col-sm-9">{{rowdata.f_onsite_time}}</span>
-        </div>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">离开时间:</label>
-          <span class = "col-sm-9">{{rowdata.f_offsite_time}}</span>
-        </div>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">用户评价:</label>
-          <span class = "col-sm-3">{{rowdata.f_client_evaluation}}</span>
-        </div>
-      </partial-view>
-    </div>
-    <check-paper-items :row="rowdata"></check-paper-items>
-  </div>
-</template>
-
-<script>
-  import Vue from 'vue'
-  import co from 'co'
-
-  export default {
-    title: '安检项信息',
-    name: 'CheckPaperItem',
-    props: ['row'],
-    data () {
-      return {
-        rowdata: this.row
-      }
-    },
-    ready () {
-      this.rowdata = this.row
-    },
-    watch: {
-      'row' (val) {
-        this.rowdata = val
-      }
-    }
-  }
-</script>
+<template>
+  <div style="height: 100%;width: 100%;padding:10px 0px 10px 0px;">
+    <div class="auto">
+      <partial-view v-ref:pv>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-4 control-label">用户姓名:</label>
+          <span class = "col-sm-8">{{rowdata.f_user_name}}</span>
+        </div>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-4 control-label">用户地址:</label>
+          <span class = "col-sm-8">{{rowdata.f_address}}</span>
+        </div>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">安检人:</label>
+          <span class = "col-sm-3">{{rowdata.f_checker_name}}</span>
+          <label class = "col-sm-3 control-label">安检状态:</label>
+          <span class = "col-sm-3">{{rowdata.f_entry_status}}</span>
+        </div>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">入户时间:</label>
+          <span class = "col-sm-9">{{rowdata.f_onsite_time}}</span>
+        </div>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">离开时间:</label>
+          <span class = "col-sm-9">{{rowdata.f_offsite_time}}</span>
+        </div>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">用户评价:</label>
+          <span class = "col-sm-3">{{rowdata.f_client_evaluation}}</span>
+        </div>
+      </partial-view>
+    </div>
+    <check-paper-items :row="rowdata"></check-paper-items>
+  </div>
+</template>
+
+<script>
+  import Vue from 'vue'
+  import co from 'co'
+
+  export default {
+    title: '安检项信息',
+    name: 'CheckPaperItem',
+    props: ['row'],
+    data () {
+      return {
+        rowdata: this.row
+      }
+    },
+    ready () {
+      this.rowdata = this.row
+    },
+    watch: {
+      'row' (val) {
+        this.rowdata = val
+      }
+    }
+  }
+</script>

package/src/components/report/CheckPlanCountChartArea.vue

@@ -1,120 +1,120 @@
-<template>
-  <div id='app' class="basic-main" style="height: 100%">
-    <criteria-paged :model="model" :pager='false' v-ref:paged>
-      <criteria partial='criteria' @condition-changed='$parent.search' class="search_area" v-ref:criteria>
-        <div novalidate class="form-inline auto" partial>
-          <div class="row">
-            <div class="col-sm-4 form-group">
-              <role-selector-safe
-                role-name="安检员"
-                role-lable="安&ensp;检&ensp;员"
-                @re-res="$parent.$parent.getRes"
-                :value.sync="model.f_checker_id"
-                v-model="model.f_checker_id"
-                condition="f_checker_name = '{}'">
-              </role-selector-safe>
-            </div>
-            <div  :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}">
-              <label class="font_normal_body">小区名称</label>
-              <input type="text" class="input_search" style="width:60%" v-model="model.f_residential_area" placeholder='小区名称'
-                     condition="f_residential_area like '%{}%'" v-next-el="cx" v-el:qjmc>
-            </div>
-            <div class="col-sm-2 form-group">
-              <label for="startDate" class="font_normal_body">开始日期:</label>
-              <datepicker id="startDate" placeholder="开始日期"
-                          v-model="model.startDate"
-                          :value.sync="model.startDate"
-                          style="width: 60%;"
-                          :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
-                          :show-reset-button="reset">
-              </datepicker>
-            </div>
-            <div class="col-sm-2 form-group">
-              <label for="endDate" class="font_normal_body">结束日期:</label>
-              <datepicker id="endDate" placeholder="结束日期"
-                          v-model="model.endDate"
-                          :value.sync="model.endDate"
-                          :disabled-days-of-Week="[]"
-                          style="width: 60%;"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
-                          :show-reset-button="reset">
-              </datepicker>
-            </div>
-            <div class="col-sm-3 form-group" style="margin-top: 8px">
-              <button class="button_search button_spacing" @click="search()">查询</button>
-              <report-print class="button_export button_spacing" style="width:28%" id='shexian'></report-print>
-              <report-excel class="button_export button_spacing" style="width:28%" id='shexian'></report-excel>
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <div partial='list' id='shexian' class="list_area" style="overflow-y: scroll">
-        <table class='tableprint' style="margin: 0px auto">
-          <thead>
-          <tr>
-            <th colspan='5' style="font-weight: normal; text-align: left;">
-              <h3 style="text-align: center">安检数据报表</h3>
-            </th>
-          </tr>
-          <tr>
-            <th colspan='5' style="font-weight: normal; text-align: center;">
-              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
-              结束时间：{{ model.model.endDate }}
-            </th>
-          </tr>
-          </thead>
-          <tr>
-            <th colspan='5' style="font-weight: normal;">
-              {{{ model.data.substring(26,model.data.length-8) }}}
-            </th>
-          </tr>
-        </table>
-      </div>
-    </criteria-paged>
-  </div>
-
-</template>
-
-<script>
-  import {DataModel} from 'vue-client'
-  import * as Util from "../Util";
-
-  export default {
-    title: '维修员报表',
-    data() {
-      let model = new DataModel('/rs/safecheck/report/CheckPlanCountChartArea', {startDate: 'this.model.startDate', endDate: 'this.model.endDate', f_filialeid: 'this.f_filialeid'})
-      model.f_filialeid = '(' + this.$login.f.orgid + ')'
-      return {
-        filialeNameStr: '',
-        filialeCodeStr: '',
-        userid: this.$login.f.id,
-        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
-        model: model
-      }
-    },
-    methods: {
-      getRes(obj) {
-        this.model.f_filialeid = this.$login.convertToIn(obj.resids);
-      },
-      search(args){
-        if (args.model.endDate){
-          args.condition += ` and f_offsite_time <= '${args.model.endDate}'`
-        }
-        if (args.model.startDate){
-          args.condition += ` and f_offsite_time >= '${args.model.startDate}'`
-        }
-        this.model.search(args.condition,args.model)
-      }
-    },
-    ready() {
-      this.$refs.paged.$refs.criteria.model.startDate = Util.toStandardDateString()+' 00:00:00'
-      this.$refs.paged.$refs.criteria.model.endDate = Util.toStandardDateString()+' 23:59:59'
-    },
-    computed: {
-      selected() {
-        return this.$refs.grid.selected
-      },
-    }
-  }
-</script>
+<template>
+  <div id='app' class="basic-main" style="height: 100%">
+    <criteria-paged :model="model" :pager='false' v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.search' class="search_area" v-ref:criteria>
+        <div novalidate class="form-inline auto" partial>
+          <div class="row">
+            <div class="col-sm-4 form-group">
+              <role-selector-safe
+                role-name="安检员"
+                role-lable="安&ensp;检&ensp;员"
+                @re-res="$parent.$parent.getRes"
+                :value.sync="model.f_checker_id"
+                v-model="model.f_checker_id"
+                condition="f_checker_name = '{}'">
+              </role-selector-safe>
+            </div>
+            <div  :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">小区名称</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_residential_area" placeholder='小区名称'
+                     condition="f_residential_area like '%{}%'" v-next-el="cx" v-el:qjmc>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label for="startDate" class="font_normal_body">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          style="width: 60%;"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label for="endDate" class="font_normal_body">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          style="width: 60%;"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-3 form-group" style="margin-top: 8px">
+              <button class="button_search button_spacing" @click="search()">查询</button>
+              <report-print class="button_export button_spacing" style="width:28%" id='shexian'></report-print>
+              <report-excel class="button_export button_spacing" style="width:28%" id='shexian'></report-excel>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <div partial='list' id='shexian' class="list_area" style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto">
+          <thead>
+          <tr>
+            <th colspan='5' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">安检数据报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='5' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <th colspan='5' style="font-weight: normal;">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </th>
+          </tr>
+        </table>
+      </div>
+    </criteria-paged>
+  </div>
+
+</template>
+
+<script>
+  import {DataModel} from 'vue-client'
+  import * as Util from "../Util";
+
+  export default {
+    title: '维修员报表',
+    data() {
+      let model = new DataModel('/rs/safecheck/report/CheckPlanCountChartArea', {startDate: 'this.model.startDate', endDate: 'this.model.endDate', f_filialeid: 'this.f_filialeid'})
+      model.f_filialeid = '(' + this.$login.f.orgid + ')'
+      return {
+        filialeNameStr: '',
+        filialeCodeStr: '',
+        userid: this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
+        model: model
+      }
+    },
+    methods: {
+      getRes(obj) {
+        this.model.f_filialeid = this.$login.convertToIn(obj.resids);
+      },
+      search(args){
+        if (args.model.endDate){
+          args.condition += ` and f_offsite_time <= '${args.model.endDate}'`
+        }
+        if (args.model.startDate){
+          args.condition += ` and f_offsite_time >= '${args.model.startDate}'`
+        }
+        this.model.search(args.condition,args.model)
+      }
+    },
+    ready() {
+      this.$refs.paged.$refs.criteria.model.startDate = Util.toStandardDateString()+' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.endDate = Util.toStandardDateString()+' 23:59:59'
+    },
+    computed: {
+      selected() {
+        return this.$refs.grid.selected
+      },
+    }
+  }
+</script>

package/src/components/report/HiddenSituation.vue

@@ -51,9 +51,9 @@
                 v-model='model.userType'
                 :value.sync="model.userType"
                 :options='$parent.$parent.userTypes'
-                condition="tuf.f_gasproperties = '{}'"
-                :value-single="true"
-                close-on-select clear-button></v-select>
+                condition="tuf.f_gasproperties in {} "
+                :multiple="true"
+               ></v-select>
             </div>
             <div class="col-sm-2 form-group" >
               <label class="font_normal_body">气表类型</label>