manage-client 4.0.72 → 4.0.74

package/src/filiale/bayan/MonthlyReport.vue

@@ -91,7 +91,6 @@
 
 <script>
 import { DataModel } from 'vue-client'
-import co from 'co'
 export default {
   title: '月报表',
   props: ['data'],
@@ -125,16 +124,13 @@ export default {
     },
     selfSearch (args) {
       this.printTime = this.$login.toStandardTimeString()
-      let orgcondition = '1=1'
+      let orgcondition = 'and 1=1'
       if (this.f_orgid && this.f_orgid[0]) {
         orgcondition += ` and f_orgid in ('${this.f_orgid}')`
       }
       if (this.f_depid && this.f_depid[0]) {
         orgcondition += ` and f_depid in ('${this.f_depid}')`
       }
-      if(this.f_operatorid && this.f_operatorid[0]) {
-        orgcondition += ` and f_operatorid in ('${this.f_operatorid}')`
-      }
       this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
       this.$refs.paged.search(args)
     },
@@ -147,15 +143,11 @@ export default {
       this.depname = val[0]
       this.userresid = obj
       this.f_depid = obj
-    },
-    getuser ( obj, val) {
-      this.operatorname = val[0]
-      this.f_operatorid = obj
     }
   },
   watch: {
     'model.data' (val) {
-      this.spans = val.split('</tr>').map(item => item.split('</td>').length-1).reduce((x, y) => x > y ? x : y)
+      this.spans = val.split('</tr>').map(item => item.split('</td>').length - 1).reduce((x, y) => x > y ? x : y)
     }
   },
   computed: {

package/src/filiale/bayan/businessquery/weChatBind.vue

@@ -0,0 +1,423 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex">
+        <div style="flex:1;" 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 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'"
+                                :show-reset-button="true"
+                                condition="f_band_time >= '{}'">
+                    </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'"
+                                :show-reset-button="true"
+                                condition="f_band_time <= '{}'">
+                    </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_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="span" style="float:right;">
+                    <button class="button_search button_spacing" @click="search()">查询</button>
+                    <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                    <!--<button class="btn btn-default" @click="$parent.$parent.stamp()">打印</button>-->
+
+                    <export-excel :data="$parent.$parent.getCondition"
+                                  :field="$parent.$parent.getExportField"
+                                  sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="wechatQuery" 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">
+                  <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"></res-select-group>
+                  <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_phone"
+                           condition="f_user_phone like '%{}%'" 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_address"
+                           condition="f_address like '%{}%'" placeholder='客户地址'>
+                  </div>
+                  <div class="col-sm-2 form-group" >
+                    <label class="font_normal_body">气表品牌</label>
+                    <v-select :value.sync="model.gasbrand" v-model="model.gasbrand"
+                              :options='$parent.$parent.meterbrands' placeholder='气表品牌' close-on-select
+                              v-model='$parent.$parent.gasbrand'
+                              condition="f_meter_brand = '{}'"
+                    ></v-select>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
+                    <v-select :value.sync="model.f_residential_area"
+                              class="select_list select"
+                              v-model="model.f_residential_area"
+                              style="width: 60%"
+                              multiple
+                              condition="f_residential_area in {}"
+                              :options='$parent.$parent.residentialArea' placeholder='选择小区'
+                              close-on-select>
+
+                    </v-select>
+                  </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_area_period"
+                           condition="f_area_period = '{}'" 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_building"
+                           condition="f_building = '{}'" 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_unit"
+                           condition="f_unit = '{}'" 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_floor"
+                           condition="f_floor = '{}'" 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_room"
+                           condition="f_room = '{}'" placeholder='房间号'>
+                  </div>
+                </div>
+              </div>
+            </criteria>
+
+            <data-grid :model="model" partial='list' class="list_area table_sy" @dblclick="$parent.dblclick" 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>
+                </tr>
+              </template>
+              <template partial='body'>
+                <td  :class="'back-blue'" style="text-align: center;" >
+                  <nobr>
+                  {{row.f_userinfo_code}}
+                </nobr> </td>
+                <td :class="'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_user_name}}</nobr>
+                </td>
+                <td :class="'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_meter_brand}}</nobr>
+                </td>
+                <td :class="'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_meter_type}}</nobr>
+                </td>
+                <td :class="'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_user_phone}}</nobr>
+                </td>
+                <td :class="'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_open_id}}</nobr>
+                </td>
+                <td :class="'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_band_state}}</nobr>
+                </td>
+                <td :class="'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_residential_area}}</nobr>
+                </td>
+                <td :class="'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_address}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <button type="button" name="button" class="btn btn-link"
+                          @click="$parent.$parent.$parent.wechatbing(row)">解绑
+                  </button>
+                </td>
+              </template>
+            </data-grid>
+          </criteria-paged>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+  import defaultPrint from '../config/DefaultPrint'
+  import exportConfig from '../config/exportConfig'
+
+  let readySomething = async function (self) {
+
+
+    await self.$MagLoadParams.loadParam()
+    await self.$LoadParams.loadParam(self.f_filialeid)
+    self.loadMeterBooks()
+    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'
+    await self.$refs.paged.$refs.cri.search()
+    // self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+
+  }
+
+  export default {
+    title: '微信绑定查询',
+    data() {
+      return {
+        model: new PagedList('api/af-revenue/sql/wechatQuery', 20, {}),
+        criteriaShow: false,
+        orgCondtionStr: '',
+        modelval: [],
+        residentialArea: [],
+        printshow: false,
+        all: false,
+        fields: {},
+        meterbrands:[{label: '全部',value: ''}],
+        thead: '',
+        tfoot: '',
+        area: [],
+        //合计数据
+        // sumsmodel: {},
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        userdetail: {
+          show: false,
+          f_userinfo_code: '',
+          f_filialeids: ''
+        },
+        show:false,
+        rowdata:{},
+        sliceArea: []
+      }
+    },
+    ready() {
+      this.getaddress()
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+      this.initAreas(this.$login.f.orgid)
+    },
+    methods: {
+      loadMeterBooks(){
+        let meterbrand = this.$GetSaleParam.getGasbrand()
+        for(let row of meterbrand){
+          this.meterbrands.push({label: row.label,value: row.value.f_meter_brand})
+        }
+      },
+      async getaddress(){
+        console.log('开始获取小区')
+        let HttpReset = new HttpResetClass()
+        var data = await HttpReset.load('POST', 'api/af-revenue/sql/manage_getarealist', {
+          data: {
+            condition: `1=1 and s.f_filialeid = '${this.$login.f.orgid}'`
+          }
+        }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
+        console.log('小区',data)
+        let house = []
+        for (let row of data.data){
+          console.log('开始保存小区')
+          house.push({label: row.f_residential_area, value: row.f_residential_area})
+        }
+        this.residentialArea = house
+      },
+      //把数据库查询数据转换为下拉数据
+      calculate(rows){
+        let data = []
+        rows.forEach((row, n) => {
+          data[n] = {label: row.f_residential_area, value: row.id}
+        })
+        return data
+      },
+      search(){
+        this.$refs.paged.$refs.cri.search()
+      },
+      wechatbing(row) {
+        console.log('微信解绑用户', row)
+        let param = {
+          id: row.id
+        }
+        this.$resetpost('api/af-revenue/logic/wechatbind', {data: param}, {warnMsg: '确定对这条记录进行解绑吗？'}).then(() => {
+          this.$refs.paged.$refs.cri.search()
+        })
+      },
+      cancel(obj) {
+        this.show = false
+      },
+      async initAreas (val) {
+
+        if (val) {
+          let getAllArea = await this.$resetpost('/rs/search', {
+            source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
+            userid: this.$login.f.id
+          }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
+
+          let arr = getAllArea.data.filter((res) => {
+            return res.parentid == val
+          })
+          console.log('过滤之后的片区', arr)
+          this.sliceArea = []
+          this.sliceArea.push({label: "全部", value: ""})
+          arr.forEach((res) => {
+            this.sliceArea.push({label: res.name, value: res.name})
+          })
+          console.log(this.sliceArea)
+        }
+      },
+      selfSearch(args) {
+        if (!this.orgCondtionStr) {
+          args.condition = `${args.condition}` + " and f_orgid = " + this.$login.f.orgid
+        } else {
+          args.condition = `${args.condition}` + this.orgCondtionStr
+        }
+        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
+      },
+      getRes(obj) {
+        this.orgCondtionStr = obj
+      },
+      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
+      },
+      // 对选择的列进行排序
+      sortModelval() {
+        let sortModel = []
+        Object.keys(this.fields).forEach((key) => {
+          if (this.modelval.includes(key)) {
+            sortModel.push(key)
+          }
+        })
+        this.modelval = sortModel
+        console.log('选择的打印的字段', this.modelval)
+      },
+      dblclick(row, index) {
+        console.log('双击之后数据', row, index)
+        this.userdetail.show = true
+        this.userdetail.f_userinfo_code = row.f_userinfo_code
+        this.userdetail.f_filialeids = row.f_filialeids
+      }
+    },
+    watch: {
+      'all'(val) {
+        if (val) {
+          this.modelval = this.bodyData
+        } else {
+          this.modelval = defaultPrint.config
+          this.put()
+        }
+      },
+      'modelval.length'() {
+        this.put()
+      },
+    },
+    computed: {
+      authArr () {
+        return this.$login.r ? this.$login.r : []
+      },
+
+      getCondition() {
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+      },
+      getfield() {
+        let data = {}
+        this.bodyData.forEach((value, index) => {
+          data[this.bodyData[index]] = this.headData[index]
+        })
+        return data
+      },
+      getExportField() {
+        return exportConfig.wechatConfig
+      }
+    }
+  }
+</script>
+<style>
+  .back-red{		/* 红色背景 */
+    background-color: #F6C6CE;
+  }
+  .back-blue{		/* 蓝色背景 */
+
+  }
+</style>
+

package/src/filiale/bayan/sale.js

@@ -1,16 +1,19 @@
-// 分公司特殊组件页面注册
-import Vue from 'vue'
-
-export default function () {
-  Vue.component('charge-query', (resolve) => { require(['./ChargeQuery'], resolve) })
-  // 打印
-  Vue.component('print-table', (resolve) => { require(['./PrintTableManage'], resolve) })
-  // 其他收费查询
-  Vue.component('other-charge-query', (resolve) => {
-    require(['./OtherChargeQuery'], resolve)
-  })
-  // 综合档案信息查询
-  Vue.component('record-info-query', (resolve) => {
-    require(['./RecordInfoQuery'], resolve)
-  })
-}
+// 分公司特殊组件页面注册
+import Vue from 'vue'
+
+export default function () {
+  Vue.component('charge-query', (resolve) => { require(['./ChargeQuery'], resolve) })
+  // 打印
+  Vue.component('print-table', (resolve) => { require(['./PrintTableManage'], resolve) })
+  // 其他收费查询
+  Vue.component('other-charge-query', (resolve) => {
+    require(['./OtherChargeQuery'], resolve)
+  })
+  // 综合档案信息查询
+  Vue.component('record-info-query', (resolve) => {
+    require(['./RecordInfoQuery'], resolve)
+  })
+  Vue.component('wechat-bind', (resolve) => {
+    require(['./businessquery/weChatBind'], resolve)
+  })
+}

package/src/filiale/shexian/ChangeMeterQuery.vue

@@ -192,12 +192,12 @@
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">旧&emsp;表&emsp;号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber_old"
                          condition="f_meternumber_old = '{}'" placeholder='旧表号'>
                 </div>
                 <div class="col-sm-2 form-group">
                 <label class="font_normal_body">旧&emsp;卡&emsp;号</label>
-                <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_card_old"
                        condition="f_card_old = '{}'" placeholder='旧卡号'>
                 </div>
                 <div class="col-sm-2 form-group">

package/src/filiale/yangchun/DeviceQuery.vue

@@ -287,7 +287,7 @@
                   <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>

package/src/filiale/yangchun/MeterQuery.vue

@@ -167,14 +167,14 @@
                     </datepicker>
                   </div>
                   <div class="col-sm-2 form-group">
-                    <label for="startDate" class="font_normal_body">通气日期</label>
+                    <label for="startDate" class="font_normal_body">表具通气日期</label>
                     <datepicker id="startDate" placeholder="开始日期" style="width:60%" v-model="model.startTQDate"
                                 :value.sync="model.startTQDate" :format="'yyyy-MM-dd'" :show-reset-button="true"
                                 condition="f_gas_date >= '{} 00:00:00'">
                     </datepicker>
                   </div>
                   <div class="col-sm-2 form-group">
-                    <label for="endDate" class="font_normal_body">通气日期</label>
+                    <label for="endDate" class="font_normal_body">表具通气日期</label>
                     <datepicker id="endDate" placeholder="结束日期" style="width:60%" v-model="model.endTQDate"
                                 :value.sync="model.endTQDate" :format="'yyyy-MM-dd'" :show-reset-button="true"
                                 condition="f_gas_date <= '{} 23:59:59'">
@@ -226,13 +226,23 @@
                   <div class="col-sm-2 form-group">
                     <label for="startGasDate" class="font_normal_body">首次通气日期</label>
                     <datepicker id="startGasDate" placeholder="开始日期" style="width:60%"
-                                v-model="model.startGasDate"
-                                :value.sync="model.startGasDate"
+                                v-model="model.startuserGasDate"
+                                :value.sync="model.startuserGasDate"
                                 :format="'yyyy-MM-dd'"
                                 :show-reset-button="true"
                                 condition="f_uservent_date >= '{} 00:00:00'">
                     </datepicker>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label for="startGasDate" class="font_normal_body">首次通气日期</label>
+                    <datepicker id="startGasDate" placeholder="截至日期" style="width:60%"
+                                v-model="model.enduserGasDate"
+                                :value.sync="model.enduserGasDate"
+                                :format="'yyyy-MM-dd'"
+                                :show-reset-button="true"
+                                condition="f_uservent_date <= '{} 00:00:00'">
+                    </datepicker>
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -315,7 +325,7 @@
                   </th>
                   <th>
                     <!--<nobr>通气时间</nobr>-->
-                    <data-order field="f_gas_date" name="通气时间"
+                    <data-order field="f_gas_date" name="表具通气时间"
                                 :order.sync="$parent.$parent.$parent.orderFields.f_gas_date"></data-order>
                   </th>
                   <th>

package/src/filiale/yangchun/WebHandplanQuery.vue

@@ -196,6 +196,17 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_curbalance"
                          condition="f_curbalance < '{}' " placeholder="本期余额小于">
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">使用类型</label>
+                  <v-select :value.sync="model.f_usetype"
+                            v-model="model.f_usetype"
+                            :options='$parent.$parent.usetype'
+                            placeholder='使用类型'
+                            style="width:60%"
+                            close-on-select
+                            condition="f_usetype = '{}'">
+                  </v-select>
+                </div>
               </div>
             </div>
           </criteria>
@@ -268,6 +279,7 @@
                 <th>
                   <nobr>气价名称</nobr>
                 </th>
+                <th><nobr>使用类型</nobr></th>
                 <th>
                   <nobr>一阶气量</nobr>
                 </th>
@@ -399,6 +411,7 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_price_name}}</nobr>
               </td>
+              <th style="text-align:center"><nobr>{{row.f_usetype}}</nobr></th>
               <td style="text-align: center;">
                 <nobr>{{row.f_stair1amount}}</nobr>
               </td>
@@ -935,7 +948,7 @@
           'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_address': '客户地址', 'f_zones': '片区', 'phone': '客户手机', 'f_valve_state': '阀门状态',
           'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_oughtamount': '用气量', 'f_oughtfee': '用气金额','f_meternumber': '表号', 'ym_data': '数据年月',
           'f_balance': '上期余额', 'f_curbalance': '本期余额', 'f_hand_date': '抄表日期','f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
-          'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司',
+          'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司','f_usetype': '使用类型',
           'f_stair1amount': '一阶气量', 'f_stair1price': '一阶单价', 'f_stair1fee': '一阶气费','f_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair2fee': '二阶气费',
           'f_stair3amount': '三阶气量','f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'belongmonth': '所属年月','f_current_deduct_amount':'本次抵扣金额','f_remaining_deduct_amount':'剩余抵扣金额'
         }
@@ -949,6 +962,9 @@
       meterstate() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表状态')]
       },
+      usetype() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('使用类型')]
+      },
       handstate() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('表单状态')]
       },

package/src/filiale/yangchun/config/exportConfig.js

@@ -118,7 +118,7 @@ export default {
     'f_inputtor': '户管员',
     'f_gas_person': '通气人',
     'f_uservent_date': '首次通气日期',
-    'f_gas_date': '通气时间',
+    'f_gas_date': '表具通气时间',
     'f_input_date': '建表时间',
     'f_table_state': '气表状态',
     'isbgl': '是否壁挂炉',