manage-client 3.2.200 → 3.2.202

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.200",
+  "version": "3.2.202",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/SellReport/ManageSellTypeNew.vue

@@ -0,0 +1,169 @@
+<template>
+  <div class="basic-main" style="height: 100%">
+    <div class="form-group" >
+      <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+        <div class="row">
+          <div class="col-sm-3 form-group" >
+            <label class="font_normal_body" for="startDate">开始日期:</label>
+            <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
+                        v-model="model.startDate"
+                        :value.sync="model.startDate"
+                        :disabled-days-of-Week="[]"
+                        :format="'yyyy-MM-dd HH:mm:ss'"
+                        :show-reset-button="reset">
+            </datepicker>
+          </div>
+          <div class="col-sm-3 form-group" >
+            <label  class="font_normal_body" for="endDate">结束日期:</label>
+            <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
+                        v-model="model.endDate"
+                        :value.sync="model.endDate"
+                        :disabled-days-of-Week="[]"
+                        :format="'yyyy-MM-dd HH:mm:ss'"
+                        :show-reset-button="reset">
+            </datepicker>
+          </div>
+
+          <div class="col-sm-3 form-group" >
+            <label class="font_normal_body" for="org">公&emsp;&emsp;司:</label>
+            <right-tree id="org" @re-res="getRes"></right-tree>
+          </div>
+          <div class="col-sm-3 form-group">
+            <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
+            <res-select id="dep" restype='department'
+                        @res-select="getdep"
+                        :parentresid="depresid"
+                        :initresid='queryData.depid' >
+            </res-select>
+
+          </div>
+          <div class="col-sm-3 form-group">
+            <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>
+            <res-select id="oper" restype='user'
+                        is-mul="false"
+                        @res-select="getuser"
+                        :parentresid="userresid"
+                        :initresid='queryData.operatorid'>
+            </res-select>
+          </div>
+
+          <div class="col-sm-3 form-group">
+            <label class="font_normal_body">收费状态:</label>
+            <v-select :value.sync="queryData.f_state" multiple
+                      v-model="queryData.f_state"
+                      :options='charge_state' placeholder='请选择'
+                      close-on-select></v-select>
+          </div>
+          <div class="col-sm-3 form-group">
+            <button class="button_search" @click="searchData()">查询</button>
+          </div>
+        </div>
+      </div>
+      <div style="width:100%;height: 100%;margin-top: 2%" class="div-iframe">
+        <iframe class="ifarme_style" style="width:100%;height:100%" :src="url" v-if="isShow"></iframe>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '营业厅分项汇总表',
+  data () {
+    return {
+      f_state: [ {label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '销户', value: '销户'}, {label: '预备', value: '预备'} ],
+      orgCondtionStr: '1=1',
+      model: {
+        startDate: '',
+        endDate: ''
+      },
+      isShow: false,
+      url: '',
+      urlPrefix: 'http://192.168.50.77:31039/report/jmreport/shareView/779255398271029248',
+      queryData: {
+        f_state: ['有效'],
+        f_orgid: this.$login.f.orgid,
+        f_depid: this.$login.f.depids,
+        f_operatorid: this.$login.f.id
+      },
+      orgname: '',
+      depresid: [],
+      userresid: [],
+      depname: '',
+      operatorname: '',
+      operatorid: [],
+      depid: []
+    }
+  },
+  ready () {
+    this.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+    this.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+    this.searchData()
+  },
+  methods: {
+    searchData () {
+      let queryData = this.orgCondtionStr
+      for (let key in this.queryData) {
+        if (this.queryData[key] !== null && this.queryData[key] !== '' && this.queryData[key] !== undefined && this.queryData[key].length > 0) {
+          if (Array.isArray(this.queryData[key])) {
+            var stringValue = ''
+            for (var i = 0; i < this.queryData[key].length; i++) {
+              if (i === this.queryData[key].length - 1) {
+                stringValue = stringValue + "'" + this.queryData[key][i] + "'"
+              } else {
+                stringValue = stringValue + "'" + this.queryData[key][i] + "',"
+              }
+            }
+            queryData = queryData + ' and ' + key + ' in (' + stringValue + ')'
+          } else {
+            queryData = queryData + ' and ' + key + ' = ' + this.queryData[key]
+          }
+        }
+      }
+      // 重置url
+      this.url = ''
+      // encodeURIComponent是将该参数中的特殊符号进行编码，后端会进行解码
+      this.url = this.urlPrefix + '?f_orgid=' + encodeURIComponent(queryData) +
+          '&startDate=' + encodeURIComponent(this.model.startDate) +
+          '&endDate=' + encodeURIComponent(this.model.endDate)
+      console.log('报表===' + queryData)
+      console.log('报表===>' + this.url)
+      this.isShow = true
+    },
+    load () {
+      this.isShow = true
+    },
+    getRes (obj) {
+      this.orgname = obj.res[0]
+      this.depresid = obj.resids
+      this.userresid = obj.resids
+      this.queryData.f_orgid = obj.resids
+    },
+    getdep (obj, val) {
+      this.depname = val[0]
+      this.userresid = obj
+      this.queryData.f_depid = obj
+    },
+    getuser (obj, val) {
+      this.operatorname = val[0]
+      this.queryData.f_operatorid = obj
+    }
+  },
+  computed: {
+    charge_state () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
+    }
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+.span{
+  height: 0;
+}
+.ifarme_style{
+  border: medium none;
+}
+</style>

package/src/filiale/WEINAN/BusinessManage.vue

@@ -75,6 +75,9 @@
     <!--      <tabs header="资源操作记录查询" v-if="permission('资源操作记录查询')">-->
     <!--        <resource-operating-query v-if="show == '资源操作记录查询'" @deal-msg="dealMsg" :data="data"></resource-operating-query>-->
     <!--      </tabs>-->
+    <tabs header="档案合并查询" v-if="permission('档案合并查询')">
+      <merge-file-query v-if="show.includes('档案合并查询')"></merge-file-query>
+    </tabs>
   </tab-button>
   <!--  </div>-->
   <!--  <div v-if="!listpage">-->

package/src/filiale/WEINAN/MergeFileQuery.vue

@@ -0,0 +1,185 @@
+<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 @sort="sort">
+                    <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 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_operate_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_operate_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_new_userinfo_code"
+                                           condition="f_new_userinfo_code = '{}' " placeholder="客户编号">
+                                </div>
+                              <div class="col-sm-2 form-group">
+                                <label class="font_normal_body" title="旧客户编号">旧客户编号</label>
+                                <input type="text" style="width:60%" class="input_search" v-model="model.f_old_userinfo_code"
+                                       condition="f_old_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_new"
+                                       condition=" f_user_name_new like '%{}%'" placeholder='旧客户名称'
+                                       :size="model.f_user_name_new ? model.f_user_name_new.length * 2 : 1">
+                              </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='旧客户名称'
+                                       :size="model.f_user_name ? model.f_user_name.length * 2 : 1">
+                              </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>
+                              </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>
+                            </tr>
+                        </template>
+                        <template partial='body'>
+                            <td style="text-align: center;">
+                              <nobr>{{row.f_new_userinfo_code}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                                <nobr>{{row.f_user_name_new}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                                <nobr>{{row.f_user_phone_new}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                                <nobr>{{row.f_address_new}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                              <nobr>{{row.f_old_userinfo_code}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                              <nobr>{{row.f_user_name}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                              <nobr>{{row.f_user_phone}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                                <nobr>{{row.f_address}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                                <nobr>{{row.f_meter_brand_style}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                                <nobr>{{row.f_operator}}</nobr>
+                            </td>
+                            <td style="text-align: center;">
+                                <nobr>{{row.f_operate_date}}</nobr>
+                            </td>
+                        </template>
+                        <template partial='foot'></template>
+                    </data-grid>
+                </criteria-paged>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import {PagedList} from 'vue-client'
+
+    let readySomething = async function (self) {
+      self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
+      self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
+    }
+    export default {
+      props:['data'],
+      title: '档案合并查询',
+        data() {
+            return {
+                model: new PagedList('rs/sql/mergeFileQuery', 20),
+            }
+        },
+        ready() {
+            readySomething(this).then(() => {
+                this.$emit('ready')
+            }).catch((error) => {
+                this.$emit('error', error)
+            })
+        },
+        methods: {
+            search() {
+                this.$refs.paged.$refs.cri.search()
+            },
+            selfSearch(args) {
+              if (this.data) {
+                this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
+                this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
+              }
+                this.model.search(args.condition, args.model)
+            },
+
+            clear() {
+                Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+                    this.$refs.paged.$refs.cri.model[key] = []
+                })
+            },
+            hidden() {
+                this.criteriaShow = !this.criteriaShow
+            }
+        }
+    }
+</script>

package/src/filiale/WEINAN/sale.js

@@ -37,7 +37,9 @@ let specialComp = {
   // 开户查询
   'new-account-query': (resolve) => { require(['./NewAccountQuery'], resolve) },
   // 购气稽查
-  'inspect-list-gas': (resolve) => { require(['./InspectListGas'], resolve) }
+  'inspect-list-gas': (resolve) => { require(['./InspectListGas'], resolve) },
+  // 档案合并查询
+  'merge-file-query': (resolve) => { require(['./MergeFileQuery.vue'], resolve) }
 }
 exports.specialComp = specialComp
 

package/src/filiale/gehua/ReportDataQuery.vue

@@ -0,0 +1,279 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex">
+        <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">客户编号</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">-->
+<!--                  <label class="font_normal_body">组织机构</label>-->
+<!--                  <res-select :initresid="$parent.$parent.org"-->
+<!--                              style="width:60%"-->
+<!--                              @res-select="$parent.$parent.getorg"-->
+<!--                              restype='organization'>-->
+<!--                  </res-select>-->
+
+<!--                </div>-->
+                <div class="col-sm-2">
+                  <label class="font_normal_body">&emsp;公司&emsp;</label>
+                  <right-tree @re-res="$parent.$parent.getorg"
+                              :initresid='$parent.$parent.org'></right-tree>
+                </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" :footer="$parent.$parent.footer"
+                                :field="$parent.$parent.getfield" :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile" sql-name="manage_getReportDataQuery" template-name='结算查询导出'
+                                :choose-col="true"></export-excel>
+                  <div style="float: right" class="button_spacing"
+                       :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                       @click="$parent.$parent.hidden()"></div>
+                </div>
+
+              </div>
+
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">表&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber like '%{}%'" placeholder='表号'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气表品牌</label>
+                  <v-select
+                    placeholder='气表品牌'
+                    :value.sync="model.f_meter_brand"
+                    v-model="model.f_meter_brand"
+                    :options='$parent.$parent.meterbrands'
+                    close-on-select
+                    condition="f_meter_brand='{}'">
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group" >
+                  <label class="font_normal_body">气表型号</label>
+                  <v-select
+                            placeholder='气表型号'
+                            :value.sync="model.f_meter_style"
+                            v-model="model.f_meter_style"
+                            :options='$parent.$parent.metertypes'
+                            close-on-select
+                            condition="f_meter_style='{}'">
+                  </v-select>
+                </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 00:00:00'"
+                              :show-reset-button="true"
+                              condition="f_insert_date >= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;</label>
+                  <datepicker id="endDate" placeholder="插入时间" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd 23:59:59'"
+                              :show-reset-button="true"
+                              condition="f_insert_date <= '{}'">
+                  </datepicker>
+                </div>
+              </div>
+
+            </div>
+          </criteria>
+
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+            <template partial='head'>
+              <tr>
+                <th v-for="row in $parent.$parent.$parent.headData">
+                  <nobr>{{row}}</nobr>
+                </th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <tr v-for="row in $parent.$parent.$parent.model.rows">
+                <td style="text-align: center;" v-for="item in $parent.$parent.$parent.config.fieldMapping">
+                  <nobr v-if="item == 'f_lowlithiumbattery'">{{row[item] == 1 ? '是' : '否'}}</nobr>
+                  <nobr v-if="item == 'f_magneticinterference'">{{row[item] == 1 ? '异常' : '正常'}}</nobr>
+                  <nobr v-if="item != 'f_magneticinterference' && item != 'f_lowlithiumbattery'">{{row[item]}}</nobr>
+                </td>
+              </tr>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+  import tableConfig from './config/tableConfig'
+  import plugins from '../../plugins/GetLoginInfoService'
+  import plugin from 'system-clients/src/plugins/GetLoginInfoService'
+  import exportConfig from './config/exportConfig'
+
+  let readySomething = async function (self) {
+    await self.$MagLoadParams.loadParam()
+    self.initParams()
+    // self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+  }
+  export default {
+    title: '上报数据查询',
+    data() {
+      return {
+        other:[],
+        footer:[],
+        model: new PagedList('rs/sql/manage_getReportDataQuery', 20, {}),
+        criteriaShow: false,
+        config: {
+          fieldMapping: {
+              f_userinfo_code: '客户编号',
+              f_user_name: '客户名称'
+          }
+        },
+        WarningType: [
+          {label: '全部', value: ''}
+        ],
+        Warningstyles: [
+          {label: '全部', value: ''}
+        ],
+        styles:false,
+        headData: [],
+        bodyData: [],
+        orgCondtionStr: " and f_filialeid in (" + this.$login.f.orgid+")",
+        resshow:['company'],
+        org:[this.$login.f.orgid],
+        meterbrands:[]
+      }
+    },
+    created () {
+     this.config.fieldMapping=tableConfig.ReportDataQuery
+      console.log("========================")
+      console.log(this.config.fieldMapping)
+      var item="用户编号"
+      console.log("~~~~~~~~~~~~~~~~~~~~~~~~~~~~")
+      console.log(this.config.fieldMapping[item])
+      this.headData=Object.keys(this.config.fieldMapping)
+      // for(var i=0;i<this.config.fieldMapping;i++){
+      //   this.headData.push(this.config.fieldMapping[i])
+      // }
+
+    },
+    ready() {
+      this.$refs.paged.$refs.cri.search()
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    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]
+        //初始化气表价格
+        this.prices = this.$MagGetSaleParam.getPrices();
+      },
+      showMeterStyle() {
+        this.styles = true
+      },
+      search() {
+        this.$refs.paged.$refs.cri.search()
+      },
+      async selfSearch(args) {
+        args.condition = `${args.condition}` + this.orgCondtionStr
+        await this.model.search(args.condition, args.model)
+        // 查询到数据进行处理
+        // if (this.model.rows.length > 0) {
+        //   this.bodyData =  Object.keys(this.model.rows[0])
+        // }
+      },
+      getorg(obj) {
+        if (obj.resids.length>0) {
+          this.orgCondtionStr = " and f_filialeid in " + plugin.convertToIn(obj.resids)
+        }else
+        {
+          this.orgCondtionStr = " and f_filialeid = " + this.$login.f.orgid
+        }
+      },
+      // getorg(obj) {
+      //   // if(plugins.convertToIn(obj)!==null&&plugins.convertToIn(obj)!==''){
+      //   //   this.orgCondtionStr = " and f_filialeid in " + plugins.convertToIn(obj)
+      //   // }else{
+      //   //   this.orgCondtionStr = " and f_filialeid = " + this.$login.f.orgid
+      //   // }
+      //   // this.orgname = obj.res
+      // },
+      clear() {
+        //清空部门和人员
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
+        this.$refs.paged.$refs.cri.$refs.sel.$children[2].selectres = []
+        //部门和人员变为全选
+        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] = []
+        })
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+
+      // getRes(obj) {
+      //   this.orgCondtionStr = obj
+      // }
+      getotherfooter () {
+        // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
+        // this.$refs.paged.$refs.cri.$refs.exports.footerData = [];
+        this.other = [];
+        this.footer = [];
+        let otherInData = [];
+        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+        let footerData = []
+        this.footer.push(footerData);
+        this.other.push(otherInData);
+      }
+    },
+    watch: {
+    },
+    computed: {
+      metertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
+      },
+      getCondition() {
+        return {
+          startDate: this.$refs.paged.$refs.cri.model.startDate,
+          endDate: this.$refs.paged.$refs.cri.model.endDate,
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr
+        }
+      },
+      getfield() {
+        return exportConfig.ReportDataConfig
+      }
+    }
+  }
+</script>