manage-client 3.2.279 → 3.2.280

package/package.json

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

package/src/filiale/kelai/GasStatistics.vue

@@ -0,0 +1,525 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main">
+      <div class="flex" :class="{showbottom:showbottomsum}" v-if="!show">
+        <criteria-paged :model="model" v-ref:paged>
+          <criteria partial='criteria' v-ref:criteria  @condition-changed='$parent.search'>
+            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+              <div class="row" >
+                <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"
+                              :is-mul=false
+                              restype='organization'>
+                  </res-select>
+                </div>
+                <div class="col-sm-2">
+                  <label class="font_normal_body">客户编号</label>
+                  <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_userinfo_code" placeholder='客户编号'
+                         condition="ss.f_userinfo_code like '%{}%'" v-next-el='f_userinfo_code' v-el:meternumber
+                  >
+                </div>
+                <div class="col-sm-2">
+                  <label class="font_normal_body">客户名称</label>
+                  <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_username" placeholder='客户名称'
+                         condition="ss.f_user_name like '%{}%'" v-next-el='userid' v-el:username>
+                </div>
+                <div class="col-sm-2">
+                  <label class="font_normal_body">客户地址</label>
+                  <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_address" placeholder='客户地址'
+                         condition="ss.f_address like '%{}%'" v-next-el='f_address' v-el:f_address>
+                </div>
+                <div class="span" style="float:right;margin-top:10px">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clearmsg">清空</button>
+                  <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
+                                :field="$parent.$parent.getfield"
+                                sqlurl="rs/logic/exportfile" sql-name="gasStatisticsQuery" template-name='用气量统计表'
+                                :choose-col="true"></export-excel>
+                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
+                              :defaultfield="$parent.$parent.defaultfield"
+                              titletable="缴费记录报表" :starthead="$parent.$parent.getstart"
+                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+                  <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">
+                  <label class="font_normal_body">电&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;话</label>
+                  <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_user_phone" placeholder='电话'
+                         condition="ss.f_user_phone like '%{}%'" v-next-el='f_user_phone' v-el:f_user_phone
+                  >
+                </div>
+                <div class="col-sm-2">
+                  <label class="font_normal_body">小&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;区</label>
+                  <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_residential_area" placeholder='小区'
+                         condition="ss.f_residential_area like '%{}%'" v-next-el='f_residential_area' v-el:f_residential_area>
+                </div>
+                <div class="col-sm-2">
+                  <label class="font_normal_body">表&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
+                  <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_meternumber" placeholder='表号'
+                         condition="ss.f_meternumber like '%{}%'" v-next-el='meternumber' v-el:meternumber
+                  >
+                </div>
+                <div class="col-sm-2">
+                  <label class="font_normal_body">燃气证号</label>
+                  <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_gascode" placeholder='燃气证号'
+                         condition="ss.f_gascode like '%{}%'" v-next-el='f_gascode' v-el:f_gascode
+                  >
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气价类型</label>
+                  <v-select :value.sync="model.pricetype" v-model="model.pricetype"
+                            placeholder='气价类型' :options="$parent.$parent.pricetypes"
+                            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_price_name"
+                            v-model="model.f_price_name"
+                            :options="$parent.$parent.getPricenames"
+                            condition="ss.f_price_name = '{}'"
+                            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"
+                            condition="ss.f_meter_brand = '{}'"
+                            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_changetable_state"
+                            v-model="model.f_changetable_state"
+                            :options="$parent.$parent.isChange"
+                            condition="ss.f_changetable_state = '{}'"
+                            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_gas_state"
+                            v-model="model.f_gas_state"
+                            :options="$parent.$parent.gasState"
+                            condition="ss.f_gas_state = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
+                  <label class="font_normal_body">用气量区间</label>
+                  <div class="row">
+                    <input type="text" style="width:27%" class="input_search" v-model="model.f_oughtamount1"
+                           condition="ss.f_oughtamount >= {} " placeholder="">
+                    <label class="font_normal_body"> ≤ x ≤ </label>
+                    <input type="text" style="width:27%" class="input_search" v-model="model.f_oughtamount2"
+                           condition="ss.f_oughtamount <= {} " placeholder="">
+                  </div>
+                </div>
+                <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
+                  <label class="font_normal_body">&nbsp;充值区间&nbsp;&nbsp;</label>
+                  <div class="row">
+                    <input type="text" style="width:27%" class="input_search" v-model="model.f_collection1"
+                           condition="ss.f_collection >= {} " placeholder="">
+                    <label class="font_normal_body"> ≤ x ≤ </label>
+                    <input type="text" style="width:27%" class="input_search" v-model="model.f_collection2"
+                           condition="ss.f_collection <= {} " placeholder="">
+                  </div>
+                </div>
+                <div class="col-sm-2 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 00:00:00'"
+                              :show-reset-button="reset">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 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 23:59:59'"
+                              :show-reset-button="reset">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
+                  <label class="font_normal_body">余额区间</label>
+                  <div class="row">
+                    <input type="text" style="width:27%" class="input_search" v-model="model.f_balance_amount_sta"
+                           condition="ss.f_balance_amount >= {} " placeholder="">
+                    <label class="font_normal_body"> ≤ x ≤ </label>
+                    <input type="text" style="width:27%" class="input_search" v-model="model.f_balance_amount_end"
+                           condition="ss.f_balance_amount <= {} " placeholder="">
+                  </div>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户类型</label>
+                  <v-select :value.sync="model.f_user_type"
+                            v-model="model.f_user_type"
+                            @change="$parent.$parent.userTypeChange()"
+                            :options="$parent.$parent.usertypes"
+                            condition="ss.f_user_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_gasproperties"
+                            v-model="model.f_gasproperties"
+                            :options="$parent.$parent.gasproperties"
+                            condition="ss.f_gasproperties = '{}'"
+                            close-on-select></v-select>
+                </div>
+              </div>
+            </div>
+          </criteria>
+          <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
+            <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>
+                <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' partial='list'>
+              <tr >
+                <td style="text-align: left;"><nobr> <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span></nobr></td>
+                <td style="text-align: left;"><nobr>{{row.f_user_name}}</nobr></td>
+                <td style="text-align: left;"><nobr>{{row.f_residential_area}}</nobr></td>
+                <td style="text-align: left;"><nobr>{{row.f_address}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
+
+                <td style="text-align:center"><nobr>{{row.f_gascode}}</nobr></td>
+                <th style="text-align:center"><nobr>{{row.f_meternumber}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_meter_classify}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_meter_title}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_price_name}}</nobr></th>
+
+                <th style="text-align:center"><nobr>{{row.f_stair1price}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_stair2price}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_stair3price}}</nobr></th>
+
+                <th style="text-align:center"><nobr>{{row.f_user_type}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_gasproperties}}</nobr></th>
+
+
+                <th style="text-align:center"><nobr>{{row.f_balance}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_last_tablebase}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_tablebase}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_oughtamount}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_oughtfee}}</nobr></th>
+
+                <th style="text-align:center"><nobr>{{row.f_collection}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_curbalance}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_gas_state}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_changetable_state}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_input_date}}</nobr></th>
+              </tr>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+        <table class="table-hover">
+          <tr style="position: relative" class="table-bordered">
+            <td
+              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
+              汇总信息
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              期间用气量:&emsp;{{sumsmodel.f_oughtamount}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              期间用气金额:&emsp;{{sumsmodel.f_oughtfee}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              期间充值金额:&emsp;{{sumsmodel.f_collection}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              一阶气量合计:&emsp;{{sumsmodel.f_stairamount1}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              一阶气费合计:&emsp;{{sumsmodel.f_stair1fee}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              二阶气量合计:&emsp;{{sumsmodel.f_stairamount2}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              二阶气费合计:&emsp;{{sumsmodel.f_stair2fee}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              三阶气量合计:&emsp;{{sumsmodel.f_stairamount3}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              三阶气费合计:&emsp;{{sumsmodel.f_stair3fee}}
+            </td>
+          </tr>
+        </table>
+      </div>
+      <div  class="flex" style="width:99%;height:98%;margin-bottom:0px" v-if="show">
+        <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+  import exportConfig from './exportConfig'
+  import * as Util from '../../Util'
+  import plugins from '../../plugins/GetLoginInfoService'
+
+  let readySomething = async function (self) {
+    await self.$MagLoadParams.loadParam()
+    self.initParams()
+    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
+  }
+  export default {
+    title: '用气量统计表',
+    data () {
+      return {
+        show:false,
+        org:[this.$login.f.orgid],
+        orgcondition: ' and ss.f_orgid = ' + this.$login.f.orgid,
+        //f_filialeid: this.$login.f.f_orgid,
+        detaillist: [],
+        meterbrands: [],
+        prices: [],
+        gasproperties:[],
+        condition:'',
+        rowdata:{},
+        getstart:'',
+        config: {
+          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_meternumber', 'f_gasproperties', 'f_balance', 'f_last_tablebase','f_tablebase',
+            'f_oughtamount', 'f_oughtfee', 'f_collection', 'f_curbalance', 'f_gas_state', 'f_changetable_state', 'f_input_date']
+        },
+        sumsmodel: {},
+        orgid:[this.$login.f.orgid],
+        criteriaShow:false,
+        //默认打印列
+        defaultfield: [],
+        orgCondtionStr: '',
+        model: new PagedList('rs/sql/gasStatisticsQuery', 50,{
+          startDate: 'this.model.startDate',
+          endDate: 'this.model.endDate'
+        },{
+          f_oughtamount: 0,
+          f_oughtfee: 0,
+          f_collection:0,
+          f_stairamount1:0,
+          f_stair1fee:0,
+          f_stairamount2:0,
+          f_stair2fee:0,
+          f_stairamount3:0,
+          f_stair3fee:0
+        }),
+        showbottomsum:false  //页面下方是否有合计: 默认为false, 在watch修改
+      }
+    },
+    ready () {
+      // this.$refs.paged.$refs.criteria.search()
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+      this.$refs.paged.$refs.criteria.model.startDate = Util.addDate(new Date(),-1).substring(0,10) + ' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date(),-1).substring(0,10) + ' 23:59:59'
+      this.$refs.paged.$refs.criteria.model.inputStartDate = Util.addDate(new Date(),-1).substring(0,10) + ' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.inputEndDate = Util.addDate(new Date(),-1).substring(0,10) + ' 23:59:59'
+      // this.$refs.paged.$refs.criteria.search()
+    },
+    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();
+      },
+      async updateParams() {
+        await this.$MagLoadParams.loadParam(this.f_filialeid)
+        this.initParams()
+      },
+      getorg(obj) {
+        if(plugins.convertToIn(obj)!==null&&plugins.convertToIn(obj)!==''){
+          this.orgcondition = " and ss.f_orgid  in " + plugins.convertToIn(obj)
+        }else{
+          this.orgcondition = " and ss.f_orgid  = " + this.$login.f.orgid
+        }
+      },
+      userTypeChange () {
+        this.gasproperties=[]
+        if(this.$refs.paged.$refs.criteria.model !==null) {
+          this.$refs.paged.$refs.criteria.model.f_gasproperties=''
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type[0])
+        }
+        else{
+          this.gasproperties =[{label: '全部', value: ''}]
+        }
+      },
+      hidden(){
+        this.criteriaShow = !this.criteriaShow
+      },
+      cancel() {
+        this.show = false
+      },
+      clearmsg () {
+        Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
+          this.$refs.paged.$refs.criteria.model[key] = []
+        })
+      },
+      getRes (obj) {
+        this.orgCondtionStr = condition
+        this.orgname = obj.orgnames[0]
+        this.depname = obj.depnames[0]
+      },
+      showmsg(obj){
+        console.log(1)
+        this.rowdata=obj
+        this.show=true
+      },
+
+      search (args) {
+        args.condition =  `${args.condition}`+this.orgcondition
+        this.condition = args.condition
+        this.model.search(args.condition, args.model)
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+        // args.condition = `${args.condition}`
+        // if (this.orgcondition)
+        //   args.condition = `${args.condition}` +  this.orgcondition
+        // else
+        //   args.condition = `${args.condition}` + 'and m.f_orgid in ' + '(' + this.$login.f.orgid + ')'
+        // this.model.search(args.condition, args.model)
+      }
+    },
+    watch: {
+      'model.rows'(val) {
+        //如果有合计 这里为true, 其他为false ,反正相反
+        this.showbottomsum=true;
+        if(val.length === 0){
+          this.sumsmodel = {}
+          this.showbottomsum=false;
+        }
+      },
+      'orgCondtionStr'(val) {
+        let res = val.match(/'(.*?)'/)
+        console.log('正则提取:',res && res[1])
+        if (res) {
+          this.f_filialeid = res[1]
+          // this.updateParams()
+        }
+      }
+    },
+    computed: {
+      getCondition() {
+
+        return {
+          condition: this.condition,
+          startDate:`${this.$refs.paged.$refs.criteria.model.startDate}`,
+          endDate:`${this.$refs.paged.$refs.criteria.model.endDate}`
+        }
+      },
+      getstart(){
+        return `开始时间：${this.$refs.paged.$refs.criteria.model.startDate} 结束时间：${this.$refs.paged.$refs.criteria.model.endDate}`
+      },
+      getPricenames() {
+        let f_user_type = this.$refs.paged.$refs.criteria.model.f_user_type;
+        let f_gasproperties = this.$refs.paged.$refs.criteria.model.f_gasproperties;
+        let pricetype = this.$refs.paged.$refs.criteria.model.pricetype;
+        console.log("打印一下:",f_user_type,f_gasproperties,pricetype,this.f_filialeid,this.prices)
+        console.log("查看f_orgid:",this.$login.f.f_orgid)
+        if(this.$refs.paged.$refs.criteria.model !==null) {
+          let rs = []
+          let priceArr = []
+          if ( pricetype.length >0) {
+            let params = {
+              f_price_type: pricetype[0],
+              filter: this.org[0],
+              prices: this.prices
+            }
+            console.log("打印一下params:",params)
+            this.$MagGetSaleParam.getPrice(params).forEach((item) => {
+              console.log("====================================》")
+              let temp = {}
+              temp.label = item.label
+              temp.value = item.value.f_price_name
+              priceArr.push(temp)
+              console.log("打印一下temp:",temp)
+            })
+
+            rs = [{label: '全部', value: ''}, ...priceArr]
+          }
+          if (rs.length === 0) {
+            console.log('rs读出来是空')
+            this.$refs.paged.$refs.criteria.model.f_price_name = ''
+          }
+          return rs
+        }
+      },
+      getfield () {
+        return exportConfig.GasStatistics
+      },
+      usertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
+      pricetypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
+      },
+      gasState() {
+        return [{label:'正常', value:'正常'},
+          {label:'异常', value:'异常'},
+         ]
+      },
+      isChange() {
+        return [{label:'是', value:'是'},
+          {label:'否', value:'否'},
+        ]
+      }
+    }
+  }
+</script>
+
+<style>
+  .showbottom{
+    height:95%
+  }
+</style>
+

package/src/filiale/kelai/exportConfig.js

@@ -633,7 +633,7 @@ export default{
   },
   GasStatistics: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_residential_area': '小区', 'f_address': '地址', 'f_user_phone': '电话', 'f_gascode': '燃气证号', 'f_meternumber': '表号',
-    'f_meter_classify': '表具类型', 'f_meter_title': '表描述', 'f_price_name': '气价名称', 'f_user_nature': '用气类型','f_gasproperties': '用气性质', 'f_balance': '期初余额', 'f_last_tablebase': '起方', 'f_tablebase': '止方',
+    'f_meter_classify': '表具类型', 'f_meter_title': '表描述', 'f_price_name': '气价名称', 'f_user_type': '客户类型','f_gasproperties': '用气性质', 'f_balance': '期初余额', 'f_last_tablebase': '起方', 'f_tablebase': '止方',
     'f_oughtamount': '期间用气量', 'f_oughtfee': '期间用气金额', 'f_collection': '期末充值金额', 'f_curbalance': '期末余额', 'f_gas_state': '用气状态', 'f_changetable_state': '是否换表', 'f_input_date': '最后通讯日期'
   },
   ArrearageConfig: {

package/src/filiale/kelai/webmeterManage.js

@@ -0,0 +1,7 @@
+// 分公司特殊组件页面注册
+import Vue from 'vue'
+
+export default function () {
+  // 物联网表用气量统计表
+  Vue.component('use-gas-statistics', (resolve) => { require(['./GasStatistics'], resolve) })
+}

package/src/filiale/rongcheng/DeviceQuery.vue

@@ -0,0 +1,606 @@
+<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 @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 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 class="font_normal_body" title="旧客户编号">档案编号</label>
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
+                           condition="f_olduserinfo_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_phone"
+                            condition="f_user_phone 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"
+                                  :header="$parent.$parent.other"
+                                  v-if="$parent.$parent.authArr.includes('档案查询导出')"
+                                  sqlurl="rs/logic/exportfile" sql-name="deviceQuery" template-name='表具设备查询导出'  :choose-col="true"></export-excel>
+                    <print-data :sum-field="$parent.$parent.getExportField" :model="$parent.model" :field="$parent.$parent.getExportField"
+                                :defaultfield="$parent.$parent.defaultfield"
+                                titletable="表具设备查询"
+                                :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+                    <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">客户地址</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.f_user_state"
+                              v-model="model.f_user_state"
+                              :options='$parent.$parent.userstates' placeholder='请选择'
+                              condition="f_user_state = '{}'"
+                              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_user_type"
+                              :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
+                              condition="f_user_type = '{}'"
+                              close-on-select></v-select>
+                  </div>
+                  <div class="col-sm-2 form-group" >
+                    <label class="font_normal_body">所属表&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 :value.sync="model.f_devices_type"
+                              v-model="model.f_devices_type"
+                              :options='$parent.$parent.deviceTypes' placeholder='请选择'
+                              condition="f_devices_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.watchpurchase"
+                              v-model="model.watchpurchase"
+                              :options='$parent.$parent.watchpurchases' placeholder='请选择'
+                              condition="watchpurchase = '{}'"
+                              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_pipe_type"
+                              v-model="model.f_pipe_type"
+                              :options='$parent.$parent.pipetype' placeholder='请选择'
+                              condition="f_pipe_type = '{}'"
+                              close-on-select></v-select>
+                  </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_meter_number"
+                           condition="f_meternumber = '{}'" 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_card_id"
+                           condition="f_card_id = '{}'" 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_devices_no"
+                            condition="f_devices_no 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_brand"
+                            condition="f_brand 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_devices_model"
+                            condition="f_devices_model 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_devices_num"
+                            condition="f_devices_num = {}" placeholder='设备数量'>
+                  </div>
+                  <div class="col-sm-2 form-group" >
+                    <label  class="font_normal_body" title="安装日期大于">安装日期</label>
+                    <datepicker  placeholder="安装日期大于" style="width:60%"
+                                 v-model="model.f_input_start_date"
+                                 :value.sync="model.f_input_start_date"
+                                 :format="'yyyy-MM-dd'"
+                                 :show-reset-button="true"
+                                 condition="f_input_date >= '{} 00:00:00'">
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group" >
+                    <label  class="font_normal_body" title="安装日期小于">安装日期</label>
+                    <datepicker  placeholder="安装日期小于" style="width:60%"
+                                 v-model="model.f_input_end_date"
+                                 :value.sync="model.f_input_end_date"
+                                 :format="'yyyy-MM-dd'"
+                                 :show-reset-button="true"
+                                 condition="f_input_date <= '{} 23:59:59'">
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group" >
+                    <label  class="font_normal_body" >到期日期</label>
+                    <datepicker  placeholder="到期日期大于" style="width:60%"
+                                 v-model="model.f_expire_start_date"
+                                 :value.sync="model.f_expire_start_date"
+                                 :format="'yyyy-MM-dd'"
+                                 :show-reset-button="true"
+                                 condition="f_expire_date >= '{} 00:00:00'">
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group" >
+                    <label  class="font_normal_body">到期日期</label>
+                    <datepicker  placeholder="到期日期小于" style="width:60%"
+                                 v-model="model.f_expire_end_date"
+                                 :value.sync="model.f_expire_end_date"
+                                 :format="'yyyy-MM-dd'"
+                                 :show-reset-button="true"
+                                 condition="f_expire_date <= '{} 23:59:59'">
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group" >
+                    <label  class="font_normal_body" title="生产日期大于" >生产日期</label>
+                    <datepicker  placeholder="生产日期大于" style="width:60%"
+                                 v-model="model.f_make_start_date"
+                                 :value.sync="model.f_make_start_date"
+                                 :format="'yyyy-MM-dd'"
+                                 :show-reset-button="true"
+                                 condition="f_make_date >= '{} 00:00:00'">
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group" >
+                    <label  class="font_normal_body" title="生产日期小于">生产日期</label>
+                    <datepicker  placeholder="生产日期小于" style="width:60%"
+                                 v-model="model.f_make_end_date"
+                                 :value.sync="model.f_make_end_date"
+                                 :format="'yyyy-MM-dd'"
+                                 :show-reset-button="true"
+                                 condition="f_make_date <= '{} 23:59:59'">
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group" >
+                    <label for="startDate" class="font_normal_body" title="操作开始日期">开始日期</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_operate_date >= '{} 00:00:00'">
+                    </datepicker>
+                  </div>
+                  <div class="col-sm-2 form-group" >
+                    <label for="endDate" class="font_normal_body" title="操作结束日期">结束日期</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_operate_date <= '{} 23:59:59'">
+                    </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_service_life"
+                            condition="f_service_life = '{}'" 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_comments"
+                            condition="f_comments like '%{}%'" placeholder='备注'>
+                  </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body" >抄表员&emsp;</label>
+                    <v-select :value.sync="model.f_inputtor"
+                              v-model="model.f_inputtor"
+                              :options='$parent.$parent.inputtores' placeholder='请选择'
+                              condition="f_inputtor = '{}'"
+                              close-on-select :search="false">
+                    </v-select>
+                  </div>
+                  <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>
+                    <v-select :value.sync="model.f_devices_type"
+                              v-model="model.f_devices_type"
+                              :options='$parent.$parent.devicestype' placeholder='请选择'
+                              condition="f_devices_type = '{}'"
+                              close-on-select :search="false">
+                    </v-select>
+                  </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>-->
+                    <data-order field="f_userinfo_code" name="客户编号" :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
+                  </th>
+                  <th><nobr>客户名称</nobr></th>
+                  <th><nobr>档案编号</nobr></th>
+                  <th><nobr>客户电话</nobr></th>
+                  <th>
+                    <!--<nobr>客户地址</nobr>-->
+                    <data-order field="f_address" name="客户地址" :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
+                  </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>
+                  <th>
+                    <data-order field="f_firstcheck_date" name="首校日期" :order.sync="$parent.$parent.$parent.orderFields.f_firstcheck_date"></data-order>
+                  </th>
+                  <th>
+                    <data-order field="f_nextcheck_date" name="下次校验日期" :order.sync="$parent.$parent.$parent.orderFields.f_nextcheck_date"></data-order>
+                  </th>
+                  <th>
+                    <!--<nobr>生产日期</nobr>-->
+                    <data-order field="f_make_date" name="生产日期" :order.sync="$parent.$parent.$parent.orderFields.f_make_date"></data-order>
+                  </th>
+                  <th><nobr>使用年限</nobr></th>
+                  <th><nobr>安装人</nobr></th>
+                  <th>
+                    <!--<nobr>安装日期</nobr>-->
+                    <data-order field="f_input_date" name="安装日期" :order.sync="$parent.$parent.$parent.orderFields.f_input_date"></data-order>
+                  </th>
+                  <th>
+                    <!--<nobr>到期日期</nobr>-->
+                    <data-order field="f_expire_date" name="到期日期" :order.sync="$parent.$parent.$parent.orderFields.f_expire_date"></data-order>
+                  </th>
+                  <th><nobr>操作人</nobr></th>
+                  <th>
+                    <!--<nobr>操作时间</nobr>-->
+                    <data-order field="f_operate_date" name="操作时间" :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
+                  </th>
+                  <th><nobr>备注</nobr></th>
+                </tr>
+              </template>
+              <template partial='body'>
+                <td style="text-align: center;"><nobr>
+                  <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
+                </nobr> </td>
+                <td style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_olduserinfo_code}}</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_user_state}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_meternumber}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.watchpurchase}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_devices_type}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_devices_no}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_brand}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_devices_model}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_devices_num}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_userinfodevices_state}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_pipe_type}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_manufactor}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_rate_flow}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_pressure_range}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_firstcheck_date}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_nextcheck_date}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_make_date}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_service_life}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_input_person}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_input_date}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_expire_date}}</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>
+                <td style="text-align: center;"><nobr>{{row.f_comments}}</nobr></td>
+              </template>
+              <template partial='foot'>
+
+              </template>
+            </data-grid>
+          </criteria-paged>
+
+          <table class="table-hover">
+            <tr style="position: relative" class="table-bordered">
+              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">汇总信息</td>
+              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">暂无合计字段</td>
+            </tr>
+          </table>
+
+          <modal :show.sync="printshow" v-ref:modal backdrop="false">
+            <header slot="modal-header" class="modal-header text-center">
+              <h4 class="modal-title">打印列选择</h4>
+              <input type="checkbox" class="" id="f_generations" v-model="all">
+              <label for="f_generations" class="font-size">全选</label>
+            </header>
+            <article slot="modal-body">
+              <div class="auto col-sm-11 col-md-offset-1"  style="margin-top: 10px;">
+                <div class="col-sm-3" v-for="f in fields">
+                  <input type="checkbox" class="" :id="'water-owe-details-'+$index" v-model="modelval" :value="$key">
+                  <label :for="'water-owe-details-'+$index" class="font-size">{{f}}</label>
+                </div>
+              </div>
+            </article>
+            <footer slot="modal-footer" class="modal-footer">
+              <center>
+                <button v-show="printshow" type="button" class="btn btn-default" @click='close()'>取消</button>
+                <button v-show="printshow" type="button" class="btn btn-success" @click='print()'>打印</button>
+                <print-table :model='model' v-show="false" v-ref:print
+                             :top='40' :left='60' :right='40' :bottom='60'
+                             :thead="thead" :tfoot='tfoot' :attach="yangsen"
+                             :fields="modelval" :printpage="true">
+                </print-table>
+              </center>
+            </footer>
+          </modal>
+        </div>
+        <div class="flex" v-if="show">
+          <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+        </div>
+      </div></div></div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  import defaultPrint from '../../components/sale/config/DefaultPrint'
+  import exportConfig from './exportConfig'
+
+  let readySomething = async function (self) {
+    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+    self.$MagGetSaleParam.initinputtor();
+    self.getinputtores();
+    // self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
+    // self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
+    // await self.$refs.paged.$refs.cri.search()
+  }
+  export default {
+    title: '表具设备查询',
+    data() {
+      return {
+        other:[],
+        footer:[],
+        model: new PagedList('rs/sql/deviceQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_userinfo_code desc'`}),
+        criteriaShow: false,
+        orgCondtionStr: '',
+        modelval: [],
+        printshow: false,
+        all: false,
+        fields: {},
+        //排序
+        orderitem:'f_userinfo_code desc',
+        orderFields: {
+          f_userinfo_id: 'no'
+        },
+        thead: '',
+        tfoot: '',
+        defaultfield: [],
+        config: {
+          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_user_phone']
+        },
+        show:false,
+        rowdata:{},
+        // 下拉框参数
+        inputtores:[],
+        usertypes:this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : [],
+        userstates:this.$appdata.getParam('用户状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')] : [],
+        devicestype: [{label: '全部', value: ''},{label: '调压器', value: '调压器'}, {label: '报警器', value: '报警器'}, {label: '切断阀', value: '切断阀'}, ...this.$appdata.getParam('设备类型') ],
+        // brand: this.$appdata.getParam('设备品牌') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('设备品牌')] : [],
+        watchpurchases: this.$appdata.getParam('购买方式') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('购买方式')] : [],
+        pipetype:  this.$appdata.getParam('管道类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('管道类型')] : [],
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        // 合计数据
+        sumsmodel: {}
+      }
+    },
+    ready(){
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      async getinputtores () {
+        // 获取抄表员
+        let rs = []
+        if (this.$login.f.f_gasman.length > 0) {
+          for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
+            let temp = {
+              label: this.$login.f.f_gasman[i].name,
+              value: this.$login.f.f_gasman[i].name
+            }
+            rs.push(temp)
+          }
+        }
+        this.inputtores = [{label: '全部', value: ''}, ...rs]
+      },
+      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.toStandardTimeString()}`);
+        // let footerData = [], exportfield = this.getExportField;
+        // footerData.push("合计");
+        // let self = this;
+        // for (var field in self.sumsmodel) {
+        //   footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
+        // }
+        // this.footer.push(footerData);
+        this.other.push(otherInData);
+      },
+      search(){
+        this.$refs.paged.$refs.cri.search()
+      },
+      cancel() {
+        this.show = false
+      },
+      showmsg(obj){
+        this.rowdata=obj
+        this.show=true
+      },
+      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)
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+        console.log('合计字段',this.sumsmodel)
+      },
+      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
+        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)
+      },
+      sort (field, rule) {
+        // 将所有排序方式设为不排序，实现相互排斥
+        for (let key in this.orderFields) {
+          if (key === field) {
+            this.orderFields[key] = rule
+          } else {
+            this.orderFields[key] = 'no'
+          }
+        }
+        // 如果新规则不排序，还原为默认排序
+        if (rule === 'no') {
+          this.model.paramSource.orderitem = `'${this.orderitem}'`
+        } else {
+          this.model.paramSource.orderitem = `'${field} ${rule}'`
+        }
+
+        this.search()
+      }
+    },
+    watch:{
+      'all' (val) {
+        if (val) {
+          this.modelval = this.bodyData
+        } else {
+          this.modelval = defaultPrint.config
+          this.put()
+        }
+      },
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      },
+      'modelval.length' () {
+        this.put()
+      },
+    },
+    computed:{
+      authArr () {
+        return this.$login.r ? this.$login.r : []
+      },
+      getCondition(){
+        return {condition: `${this.$refs.paged.$refs.cri.condition}`+this.orgCondtionStr,orderitem:this.orderitem}
+      },
+      getfield(){
+        let data = {}
+        this.bodyData.forEach((value, index)=>{
+          data[this.bodyData[index]] = this.headData[index]
+        })
+        //合计字段打印
+        this.tfoot = `<tr><th colspan=${this.modelval.length}>全表汇总信息: `
+        if(this.sumsmodel){
+          Object.keys(this.sumsmodel).forEach((key) => {
+            this.tfoot += this.fields[key] + '合计: ' + `<font color="blue">${this.sumsmodel[key]} </font>`
+          })
+        }else{
+          this.tfoot += '暂无'
+        }
+        this.tfoot += '</th></tr>'
+        return data
+      },
+      getExportField() {
+        return exportConfig.deviceConfig
+      }
+    }
+  }
+</script>

package/src/filiale/rongcheng/exportConfig.js

@@ -16,9 +16,13 @@ export default{
     'f_debt_money':'相抵','f_charge_money':'实收','f_qianfei':'欠费'
   },
   deviceConfig: {
-    'f_userinfo_code': '客户编号','f_user_name':'客户名称','f_address': '客户地址', 'f_meternumber': '表号',
-    'f_devices_type': '设备类型','f_devices_no': '设备编号','f_brand': '设备品牌', 'f_devices_model': '设备型号',
-    'f_operate_date': '录入日期'
+    'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_user_phone': '客户电话', 'f_address': '客户地址',
+    'f_user_state': '客户状态', 'f_meternumber': '表号', 'watchpurchase': '购买方式', 'f_devices_type': '设备类型',
+    'f_devices_no': '设备编号', 'f_manufactor': '厂家', 'f_rate_flow': '流量', 'f_pressure_range': '压力范围', 'f_firstcheck_date': '首校日期', 'f_nextcheck_date': '下次校验日期',
+    'f_brand': '设备品牌', 'f_devices_model': '设备型号', 'f_devices_num': '设备数量', 'f_userinfodevices_state': '设备状态',
+    'f_pipe_type': '管道类型', 'f_make_date': '生产日期', 'f_service_life': '使用年限', 'f_input_person': '安装人',
+    'f_input_date': '安装日期', 'f_expire_date': '到期日期', 'f_operator': '操作人', 'f_operate_date': '操作时间',
+    'f_comments': '备注'
   },
 
   chargeConfig: {

package/src/filiale/rongcheng/sale.js

@@ -14,4 +14,6 @@ export default function () {
   Vue.component('month-gas-query', (resolve) => { require(['./MonthGasQuery'], resolve) })
   // 表具查询
   Vue.component('meter-query', (resolve) => { require(['./MeterQuery'], resolve) })
+  // 表具设备查询
+  Vue.component('equipment-query', (resolve) => { require(['./DeviceQuery'], resolve) })
 }

package/src/filiale/wenxi/GasDeviceQuery.vue

@@ -442,12 +442,12 @@
                 </td>
 
                 <!--每年充值-->
-                <td style="text-align: center;">
-                  <nobr>{{row.yeartimes}}</nobr>
-                </td>
-                <td style="text-align: center;">
-                  <nobr>{{row.f_preamount_all}}</nobr>
-                </td>
+<!--                <td style="text-align: center;">-->
+<!--                  <nobr>{{row.yeartimes}}</nobr>-->
+<!--                </td>-->
+<!--                <td style="text-align: center;">-->
+<!--                  <nobr>{{row.f_preamount_all}}</nobr>-->
+<!--                </td>-->
 
                 <!--安检信息-->
                 <td style="text-align: center;">