manage-client 3.2.76-jb → 3.2.77-aode

package/src/components/sale/report/aode/iot/ReportQuery.vue

@@ -0,0 +1,387 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex" v-if="!show">
+        <criteria-paged :model="model" v-ref:paged>
+          <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri >
+            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+              <div class="row">
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
+                  <right-tree @re-res="$parent.$parent.getorg"
+                              :initresid='$parent.$parent.org'></right-tree>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
+                         condition="f_userinfo_code = '{}' " placeholder="客户编号">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户名称</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                         condition="f_user_name like '%{}%'" placeholder="客户名称">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="startDate" class="font_normal_body">开始日期</label>
+                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              condition="f_hand_date >= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">结束日期</label>
+                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              condition="f_hand_date <= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">表号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber = '{}' " placeholder="表号">
+                </div>
+                <div class="col-sm-2">
+                  <label class="font_normal_body">气表品牌</label>
+                  <v-select :value.sync="model.f_meter_brand"
+                            v-model="model.f_meter_brand"
+                            :options='$parent.$parent.meterbrands' placeholder='请选择'
+                            condition="f_meter_brand = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear  button_spacing" @click="$parent.$parent.clear()">清空</button>
+
+                  <export-excel :data="$parent.$parent.getCondition" :defaultselect="$parent.$parent.selectfields"
+                                :field="$parent.$parent.getfield"
+                                :defaultselect="$parent.$parent.selectfields"
+                                sqlurl="rs/logic/exportfile" sql-name="getReportQuery" template-name='上报数据'
+                                :choose-col="true"></export-excel>
+                </div>
+              </div>
+
+            </div>
+          </criteria>
+
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+            <template partial='head'>
+              <tr>
+                <th>
+                  <nobr>客户编号</nobr>
+                </th>
+                <th>
+                  <nobr>客户名称</nobr>
+                </th>
+                <th>
+                  <nobr>本次抄表底数</nobr>
+                </th>
+                <th>
+                  <nobr>气表品牌</nobr>
+                </th>
+                <th>
+                  <nobr>压力</nobr>
+                </th>
+                <th>
+                  <nobr>温度</nobr>
+                </th>
+                <th>
+                  <nobr>上次抄表底数</nobr>
+                </th>
+                <th>
+                  <nobr>表计剩余金额</nobr>
+                </th>
+                <th>
+                  <nobr>表内剩余金额</nobr>
+                </th>
+                <th>
+                  <nobr>表号</nobr>
+                </th>
+                <th>
+                  <nobr>抄表日期</nobr>
+                </th>
+                <th>
+                  <nobr>上次抄表日期</nobr>
+                </th>
+
+                <th>
+                  <nobr>组织名称</nobr>
+                </th>
+                <th>
+                  <nobr>部门名称</nobr>
+                </th>
+
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;">
+                <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_tablebase}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_brand}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.flowmeterpressure}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.flowmetertemperature}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_last_tablebase}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_jval}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meterBalanceAmt}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meternumber}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_hand_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_last_hand_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_orgname}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_depname}}</nobr>
+              </td>
+
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+
+        </criteria-paged>
+
+
+      </div>
+      <div v-if="show">
+        <user-info-detail-manage :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+  import exportConfig from '../../../config/exportConfig'
+  import defaultPrint from "../../../config/DefaultPrint";
+  import plugin from "system-clients/src/plugins/GetLoginInfoService";
+
+  let readySomething = async function (self) {
+    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
+    // self.$refs.paged.$refs.cri.search()
+    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+    await self.$MagLoadParams.loadParam()
+    self.initParams()
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+  }
+  export default {
+    title: '上报数据',
+    data() {
+      return {
+        org:[this.$login.f.orgid],
+        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        config: {
+          defaultPrint: ['f_userinfo_code', 'f_address', 'f_pregas', 'f_preamount']
+        },
+        //f_price_name:[],
+        gasproperties:[],
+        showinfo: false,
+        data: {},
+        show:false,
+        rowdata:{},
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        model: new PagedList('rs/sql/getReportQuery', 20, {}, ),
+        criteriaShow: false,
+        orgCondtionStr: '',
+        // 下拉框
+        meterbrands: [],
+        pricenames: [],
+        prices: [],
+        //合计数据
+        defaultfield: [],
+        sumsmodel: {},
+        f_filialeid: this.$login.f.f_orgid,
+        selectfields:[]
+      }
+    },
+    props:['selectorg'],
+    ready() {
+      if(this.selectorg != null && this.selectorg != null != ''){
+        this.initres.org=[]
+        this.initres.org.push(this.selectorg);
+      }
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+      for(var item in exportConfig.reportConfig){
+        this.selectfields.push(item)
+      }
+    },
+    methods: {
+      initParams() {
+        // 初始化气表品牌
+        let brandArr = []
+        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+          temp.label = item.label
+          temp.value = item.value.f_meter_brand
+          brandArr.push(temp)
+        })
+        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+      },
+      getorg (obj) {
+        if(obj.resids.length>0){
+          this.selectorgid = obj.resids
+          this.filialeCodeStr =" and f_orgid in " + plugin.convertToIn(obj.resids)
+        }
+        else{
+          this.filialeCodeStr= " and f_orgid = " + this.$login.f.orgid
+        }
+      },
+      search(){
+        this.$refs.paged.$refs.cri.search()
+      },
+      cancel() {
+        this.show = false
+      },
+      showmsg(obj){
+        this.rowdata=obj
+        this.show=true
+      },
+      userTypeChange () {
+        this.gasproperties=[]
+        if(this.$refs.paged.$refs.cri.model !==null) {
+          this.$refs.paged.$refs.cri.model.f_gasproperties=''
+
+          console.log(this.$refs.paged.$refs.cri.model.f_user_type[0])
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+          // this.gasproperties.push({label: '全部', value: ''})
+        }
+        else{
+          this.gasproperties =[{label: '全部', value: ''}]
+        }
+      },
+
+      selfSearch(args) {
+        args.condition = args.condition+ ` ${this.filialeCodeStr}`
+        this.model.search(args.condition, args.model)
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+
+        // let f_orgstr = this.orgCondtionStr
+        // args.condition = `${args.condition} ` + f_orgstr + 'and f_orgid in ('+ this.f_orgid +')'
+        // this.model.search(args.condition, args.model)
+        // this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+      },
+      clear() {
+        this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          this.$refs.paged.$refs.cri.model[key] = []
+        })
+
+      },
+      dealmsg(val) {
+        val.model = this.model.model
+        this.$dispatch('deal-msg', val)
+      },
+      show() {
+        this.criteriaShow = true
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      getRes(condition,obj) {
+        this.orgCondtionStr = condition
+        this.f_orgid = obj.resids
+      },
+      stamp() {
+        this.all = false
+        //默认选择要打印的列
+        this.modelval = defaultPrint.config
+        this.fields = this.getfield
+        console.log('所有打印字段', this.fields)
+        this.printshow = true
+        this.put()
+      },
+      put() {
+        // 对Modelval进行排序
+        this.sortModelval()
+        this.thead = `<tr><th colspan=${this.modelval.length}>补卡查询统计报表</th></tr><tr>`
+        for (let key of this.modelval) {
+          this.thead += '<th>' + this.fields[key] + '</th>'
+        }
+        this.thead += '</tr>'
+      },
+      print() {
+        this.$refs.print.PrintAsFile()
+        this.printshow = false
+      },
+      close() {
+        this.printshow = false
+        this.all = false
+      },
+      // 对选择的列进行排序
+      sortModelval() {
+        let sortModel = []
+        Object.keys(this.fields).forEach((key) => {
+          if (this.modelval.includes(key)) {
+            sortModel.push(key)
+          }
+        })
+        this.modelval = sortModel
+        console.log('选择的打印的字段', this.modelval)
+      },
+      async updateParams() {
+        await this.$MagLoadParams.loadParam(this.f_filialeid)
+        this.initParams()
+      },
+    },
+    watch: {
+      'model'(val) {
+        console.log(val, "12222222222222222222")
+      },
+      'orgCondtionStr'(val) {
+        let res = val.match(/'(.*?)'/)
+        console.log('正则提取:',res && res[1])
+        if (res) {
+          this.selectorg = res[1]
+          this.f_filialeid = res[1]
+          this.updateParams()
+        }
+      }
+    },
+    computed: {
+
+      getCondition() {
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+      },
+      getfield() {
+        return exportConfig.reportConfig
+      },
+
+    }
+  }
+</script>

package/src/components/sale/report/aode/life/LifeDayReportList.vue

@@ -5,27 +5,12 @@
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
             <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :mul="false" :style="$parent.$parent.style" v-ref:sel></res-select-group>
-            <div class="span" style = "float:right;margin:10px;">
-              <button class="button_search button_spacing" @click="search()">查询</button>
-              <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
-              <export-excel :data="$parent.$parent.getCondition"
-                            :field="$parent.$parent.getfield"
-                            sqlurl="rs/logic/exportfile" sql-name="aode_lifedayReport" template-name='悦生活日报表'  :choose-col="true"
-                            class="button_export button_spacing"></export-excel>
-              <life-day-report-list-print :countmodel="{sumsmodel:$parent.$parent.sumsmodel,model:$parent.$parent.model,orgname:$parent.$parent.orgname,depname:$parent.$parent.depname}"></life-day-report-list-print>
-              <div style="float: right"  class="button_spacing" :class="{'button_shrink_left':$parent.$parent.criteriaShow,'button_shrink_right':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.show()"></div>
-              <div style="float: right"  class="button_spacing"
-                   :class="{'button_shrink_top':$parent.$parent.criteriaShowTwo,'button_shrink_bottom':!$parent.$parent.criteriaShowTwo}"
-                   @click="$parent.$parent.hidden()"></div>
-            </div>
-          </div>
-          <div class="row" v-show="$parent.$parent.criteriaShowTwo">
             <div :class="$parent.$parent.style" >
               <label for="startDate" class="font_normal_body">开始日期</label>
               <datepicker  placeholder="开始日期" style="width:60%"
                            v-model="model.f_startDate"
                            :value.sync="model.f_startDate"
-                           :format="'yyyy-MM-dd'"
+                           :format="'yyyy-MM-dd HH:mm:ss'"
                            :show-reset-button="true"
                            class="select"
               >
@@ -36,12 +21,50 @@
               <datepicker  placeholder="结束日期" style="width:60%"
                            v-model="model.f_endDate"
                            :value.sync="model.f_endDate"
-                           :format="'yyyy-MM-dd'"
+                           :format="'yyyy-MM-dd HH:mm:ss'"
                            :show-reset-button="true"
-                           class="select">
+                           class="select"
+              >
               </datepicker>
             </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">用气性质</label>
+              <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
+                        :options='$parent.$parent.gasproperties' placeholder='请选择'
+                        condition="f_gasproperties = '{}'"
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">气表类型</label>
+              <v-select :value.sync="model.f_meter_type" value-single
+                        :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">气表品牌</label>
+              <v-select :value.sync="model.f_meter_brand"
+                        v-model="model.f_meter_brand"
+                        :options='$parent.$parent.meterbrands' placeholder='请选择'
+                        condition="f_meter_brand = '{}'"
+                        close-on-select></v-select>
+            </div>
+            <div>
+              <div class="span" style = "float:right;margin:10px;">
+                <button class="button_search button_spacing" @click="search()">查询</button>
+                <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                <export-excel-hand :data="$parent.$parent.getCondition"
+                                   :field="$parent.$parent.getfield" v-ref:exports
+                                   :defaultselect="$parent.$parent.selectfields"
+                                   :other-data="$parent.$parent.other"
+                                   :footer-data="$parent.$parent.footer"
+                                   sqlurl="rs/logic/reportExportfile" sql-name="aode_lifedayReport" template-name='悦生活日报表'  :choose-col="true"
+                                   class="button_export button_spacing"></export-excel-hand>
+                <life-day-report-list-print :countmodel="{sumsmodel:$parent.$parent.sumsmodel,model:$parent.$parent.model,orgname:$parent.$parent.orgname,depname:$parent.$parent.depname}"></life-day-report-list-print>
+                <div style="float: right"  class="button_spacing" :class="{'button_shrink_left':$parent.$parent.criteriaShow,'button_shrink_right':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.show()"></div>
+              </div>
+            </div>
           </div>
+
         </div>
       </criteria>
       <data-grid  :model="model" :sumsmodel="sumsmodel" partial='list' class="list_area table_sy" v-ref:grid >
@@ -52,6 +75,9 @@
               <!--<nobr>客户编号</nobr>-->
             </th>
             <th><data-order field="f_user_name" name="客户姓名"></data-order></th>
+            <th><data-order field="f_user_name" name="用气性质"></data-order></th>
+            <th><nobr>表具类型</nobr></th>
+            <th><nobr>表具型号</nobr></th>
             <th><nobr>气量</nobr></th>
             <th><nobr>金额</nobr></th>
             <th><data-order field="f_operate_date" name="写卡时间"></data-order>
@@ -67,13 +93,18 @@
               <data-order field="f_payment" name="付款方式"></data-order>
               <!--<nobr>付款方式</nobr>-->
             </th>
+            <th><nobr>订单号</nobr></th>
             <th><nobr>交易号</nobr></th>
             <th><nobr>写卡服务机</nobr></th>
+            <th><nobr>所属公司</nobr></th>
           </tr>
         </template>
         <template partial='body'>
           <td style="text-align: center;"><nobr>{{row.f_userinfo_code}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.f_gasproperties}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.f_meter_classify}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_pregas}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_collection}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
@@ -84,8 +115,10 @@
           <td style="text-align: center;"><nobr>{{row.f_stair3price}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_stair3amount}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_payment}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.f_serial_id}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_pay_id}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_terminal_num}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></td>
         </template>
       </data-grid>
     </criteria-paged>
@@ -96,7 +129,10 @@
 
   import { PagedList } from 'vue-client'
   import exportConfig from '../../../config/exportConfig'
-
+  let initdata = async function(self){
+    await self.$MagLoadParams.loadParam()
+    self.initParams()
+  }
   export default {
     title: '悦生活日报表',
     props: {
@@ -122,7 +158,6 @@
           f_shouru_fee:0
         }),
         orgCondtionStr: '',
-        criteriaShowTwo: false,
         userTypes: [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')],
         count: 0,
         sumsmodel: {},
@@ -131,17 +166,52 @@
         orgname: '',
         depname: '',
         criteriaShow: false,
+        selectfields:[],
+        other:[],
+        footer:[],
+        gasproperties:[],
+        meterbrands: [], //气表品牌
       }
     },
     ready() {
       this.$refs.paged.$refs.cri.condition += this.orgCondtionStr
-      this.$refs.paged.$refs.cri.model.f_startDate = this.$login.toStandardDateString()
-      this.$refs.paged.$refs.cri.model.f_endDate = this.$login.toStandardDateString()
-      // this.search()
+      this.$refs.paged.$refs.cri.model.f_startDate = this.$login.toStandardDateString()+' 00:00:00'
+      this.$refs.paged.$refs.cri.model.f_endDate = this.$login.toStandardDateString()+' 23:59:59'
+      for(var item in exportConfig.lifeDataReportConfig){
+        this.selectfields.push(item)
+      }
+      initdata(this);
     },
     methods: {
-      hidden(){
-        this.criteriaShowTwo = !this.criteriaShowTwo
+      initParams() {
+        // 初始化气表品牌
+        let brandArr = []
+        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+          temp.label = item.label
+          temp.value = item.value.f_meter_brand
+          brandArr.push(temp)
+        })
+        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+      },
+      getotherfooter(){
+        this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
+        this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
+        this.other=[];
+        this.footer=[];
+        let exportdata = this.getCondition;
+        let otherInData=[];
+
+        otherInData.push(`导出时间: ${this.$login.toStandardDateString()}`);
+        otherInData.push(`导出人：${this.$login.f.name}`)
+        let footerData=[],exportfield=this.getfield;
+        footerData.push("合计");
+        let self = this;
+        for(var field in self.sumsmodel){
+          footerData.push(`${self.sumsmodel[field]}`);
+        }
+        this.footer.push(footerData);
+        this.other.push(otherInData);
       },
       search() {
         this.$refs.paged.$refs.cri.search()
@@ -153,8 +223,9 @@
         }
         args.condition = `${args.condition} ` + f_orgstr +  ` and f_operator = '悦生活'`
 
-        this.model.params.startDate = this.$refs.paged.$refs.cri.model.f_startDate + ' 00:00:00'
-        this.model.params.endDate = this.$refs.paged.$refs.cri.model.f_endDate + ' 23:59:59'
+        this.model.params.startDate = this.$refs.paged.$refs.cri.model.f_startDate
+        this.model.params.endDate = this.$refs.paged.$refs.cri.model.f_endDate
+        this.model.params.f_meter_type = this.$refs.paged.$refs.cri.model.f_meter_type
 
         await this.model.search(args.condition, args.model)
 
@@ -180,10 +251,10 @@
         this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
         this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
         Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
-          this.$refs.paged.$refs.cri.model[key] = []
+          this.$refs.paged.$refs.cri.model[key] = ''
         })
-        this.$refs.paged.$refs.cri.model.f_startDate = this.$login.toStandardDateString()
-        this.$refs.paged.$refs.cri.model.f_endDate = this.$login.toStandardDateString()
+        this.$refs.paged.$refs.cri.model.f_startDate = this.$login.toStandardDateString()+' 00:00:00'
+        this.$refs.paged.$refs.cri.model.f_endDate = this.$login.toStandardDateString()+' 23:59:59'
       },
       close() {
         this.printshow = false
@@ -220,11 +291,15 @@
       },
     },
     computed: {
+      metertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
+      },
       getCondition() {
           return {
             condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr + ` and f_operator = '悦生活'`,
-            startDate: this.$refs.paged.$refs.cri.model.f_startDate + ' 00:00:00',
-            endDate: this.$refs.paged.$refs.cri.model.f_endDate + ' 23:59:59',
+            startDate: this.$refs.paged.$refs.cri.model.f_startDate,
+            endDate: this.$refs.paged.$refs.cri.model.f_endDate,
+            f_meter_type: this.$refs.paged.$refs.cri.model.f_meter_type,
             orderitem: this.model.paramSource.orderitem.split("'")[1].split("'")[0]
           }
 
@@ -235,6 +310,14 @@
       getfield() {
         return exportConfig.lifeDataReportConfig
       }
+    },
+    watch:{
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      }
     }
   }