manage-client 3.2.31 → 3.2.35

package/src/components/sale/businessquery/AreaChargeQuery.vue

@@ -0,0 +1,380 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+        <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" title="归属日期">开始日期</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"
+                  >
+                  </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 HH:mm:ss'"
+                              :show-reset-button="true"
+                  >
+                  </datepicker>
+                </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"
+                                :field="$parent.$parent.getfield"
+                                :footer="$parent.$parent.footer"
+                                :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile"
+                                sql-name="areaChargeQuery"
+                                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="小区汇总"
+                              :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">
+                <res-select-group :initres="$parent.$parent.initres"
+                                  :showComponent="['company','department','operator']"
+                                  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <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"
+                            enter-push
+                            multiple
+                            condition="f_residential_area in {}"
+                            v-model="model.f_residential_area"
+                            style="width: 60%"
+                            :options='$parent.$parent.residentialArea' placeholder='选择小区'
+                            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"
+                            @change="$parent.$parent.userTypeChange()"
+                            :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">用气性质</label>
+                  <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
+                            :options='$parent.$parent.gasproperties' placeholder='请选择'
+                            condition="f_gasproperties = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气表类型</label>
+                  <v-select :value.sync="model.f_meter_type" multiple
+                            :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
+                            condition="f_meter_type in {}"
+                            close-on-select></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>
+                </th>
+                <th>
+                  <nobr>小区</nobr>
+                </th>
+                <th>
+                  <nobr>单价</nobr>
+                </th>
+                <th>
+                  <nobr>购气方量</nobr>
+                </th>
+                <th>
+                  <nobr>购气金额</nobr>
+                </th>
+                <th>
+                  <nobr>备&nbsp;&nbsp;&nbsp;&nbsp;注</nobr>
+                </th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align:center">
+                <nobr>{{$index+1}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_residential_area}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_price}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gas}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_money}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr></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">
+              购气方量合计:&emsp;{{sumsmodel.f_gas}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              购气金额合计:&emsp;{{sumsmodel.f_money}}
+            </td>
+          </tr>
+        </table>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+  import exportConfig from '../config/exportConfig'
+
+  let readySomething = async function (self) {
+    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
+    // self.$refs.paged.$refs.cri.search()
+    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+    await self.$MagLoadParams.loadParam()
+    self.initParams()
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+  }
+  export default {
+    title: '小区收费查询',
+    data() {
+      return {
+        config: {
+          defaultPrint: []
+        },
+        other:[],
+        footer:[],
+        //f_price_name:[],
+        gasproperties:[],
+        data: {},
+        rowdata:{},
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[]
+        },
+        model: new PagedList('rs/sql/areaChargeQuery', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}, {
+          f_gas: 0,
+          f_money: 0
+        }),
+        criteriaShow: false,
+        orgCondtionStr: '',
+        // 下拉框
+        meterbrands: [],
+        pricenames: [],
+        prices: [],
+        area: [],
+        //合计数据
+        defaultfield: [],
+        //小区
+        residentialArea: [],
+        sumsmodel: {},
+        f_filialeid: this.$login.f.f_orgid,
+        allorgid:[],
+        tempfalg :false,
+        lastorgstr:''
+      }
+    },
+     ready() {
+       this.getaddress()
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+     },
+    methods: {
+
+      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.getfield;
+        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);
+      },
+      async  getaddress(){
+        console.log('开始获取小区')
+        let HttpReset = new HttpResetClass()
+        var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
+          data: {
+            condition: `1=1 and s.f_filialeid = '${this.$login.f.orgid}'`
+          }
+        }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
+        console.log('小区',data)
+        let house = [{label: '全部', value: ''}]
+        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()
+      },
+      cancel() {
+        this.show = false
+      },
+      showmsg(obj){
+        this.rowdata=obj
+        this.show=true
+      },
+      userTypeChange () {
+        this.gasproperties=[]
+        if(this.$refs.paged.$refs.cri.model !==null) {
+          this.$refs.paged.$refs.cri.model.f_gasproperties=''
+
+          console.log("查看客户类型是什么",this.$refs.paged.$refs.cri.model.f_user_type[0])
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+          // this.gasproperties.push({label: '全部', value: ''})
+        }
+        else{
+          this.gasproperties =[{label: '全部', value: ''}]
+        }
+      },
+      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();
+      },
+      selfSearch(args) {
+        console.log('开始时间',this.$refs.paged.$refs.cri.model.startDate)
+        if (this.$refs.paged.$refs.cri.model.startDate === '' || this.$refs.paged.$refs.cri.model.endDate === ''){
+          this.$showAlert('请先选择开始时间、结束时间，再进行查询操作！', 'warning', 3000)
+        } else {
+          //小区查询条件
+          let f_orgstr = this.orgCondtionStr
+          args.condition = `${args.condition} ` + f_orgstr
+          this.model.search(args.condition, args.model)
+          this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+        }
+      },
+      clear() {
+        //清空部门和人员
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].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] = []
+        })
+
+      },
+      show() {
+        this.criteriaShow = true
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      async getRes(condition,obj) {
+        this.orgCondtionStr = condition
+        this.orgname = obj.orgnames[0]
+        this.depname = obj.depnames[0]
+
+      },
+      async updateParams() {
+        await this.$MagLoadParams.loadParam(this.f_filialeid)
+        this.inputtores = [];
+        this.inputtores.push({label: "全部", value: ""})
+        if(this.allorgid!=null){
+          this.allorgid.forEach((res)=>{
+            this.inputtores = this.inputtores.concat(this.$MagGetSaleParam.getresinputtor(res));
+          })
+        }
+        this.initParams()
+      },
+    },
+    events:{
+
+    },
+    watch: {
+      'model'(val) {
+      },
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      }
+    },
+    computed: {
+      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.areaChargeQueryConfig
+      },
+      usertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
+      metertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
+      }
+    }
+  }
+</script>

package/src/components/sale/businessquery/ChargeQuery.vue

@@ -148,9 +148,10 @@
                   <label class="font_normal_body">气价名称</label>
                   <v-select :value.sync="model.f_price_name"
                             v-model="model.f_price_name"
+                            multiple
                             :options="$parent.$parent.getPricenames"
-                            condition="f_price_name = '{}'"
-                            close-on-select></v-select>
+                            condition="f_price_name in {}"
+                            ></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">&nbsp;&nbsp;&nbsp;表编号</label>
@@ -1180,7 +1181,11 @@
               temp.value = item.value.f_price_name
               priceArr.push(temp)
             })
-            rs = [{label: '全部', value: ''}, ...priceArr]
+            if(priceArr.length == 0 ){
+              rs= [{label: '全部', value: ''}]
+            }else{
+              rs = [ ...priceArr]
+            }
           }
           if (rs.length === 0) {
             console.log('rs读出来是空')

package/src/components/sale/businessquery/CollectManage.vue

@@ -9,6 +9,9 @@
     <tabs header="小区综合查询" v-if="permission('小区综合查询')">
       <area-general-query v-if="show.includes('小区综合查询')"  @deal-msg="dealMsg"></area-general-query>
     </tabs>
+    <tabs header="小区收费查询" v-if="permission('小区收费查询')">
+      <area-charge-query v-if="show.includes('小区收费查询')"  @deal-msg="dealMsg"></area-charge-query>
+    </tabs>
     <tabs header="小区汇总（机表）" v-if="permission('小区汇总（机表）')">
       <residential-query v-if="show.includes('小区汇总（机表）')"  @deal-msg="dealMsg"></residential-query>
     </tabs>

package/src/components/sale/businessquery/InspectListUser.vue

@@ -23,8 +23,9 @@
                         close-on-select >
               </v-select>
             </div>
-            <div   v-if="$parent.$parent.meter_classify == '卡表'" class="col-sm-2 flex-row" style="white-space: nowrap">
-              <label class="font_normal_body">未购天数</label>
+            <div class="col-sm-2 flex-row" style="white-space: nowrap">
+              <label class="font_normal_body" v-if="['卡表','物联网表'].includes($parent.$parent.meter_classify)" >未购天数</label>
+              <label class="font_normal_body" v-else>未抄天数</label>
               <div class="row">
                 <input type="text" style="width:30%" class="input_search" v-model="model.diffdaymin"
                        condition="diffday >= {} " placeholder="">
@@ -33,17 +34,6 @@
                        condition="diffday <= {} " placeholder="">
               </div>
 
-            </div>
-            <div v-if="$parent.$parent.meter_classify == '机表'" class="col-sm-2 flex-row" style="white-space: nowrap">
-              <label class="font_normal_body">未抄天数</label>
-              <div class="row">
-                <input type="text" style="width:30%" class="input_search" v-model="model.handdiffdaymin"
-                       condition="diffday >= {} " placeholder="">
-                <label   class="font_normal_body">  ≤ x ≤ </label>
-                <input type="text" style="width:30%" class="input_search" v-model="model.handdiffdaymax"
-                       condition="diffday <= {} " placeholder="">
-              </div>
-
             </div>
             <div class="col-sm-2 ">
               <label class="font_normal_body">截止时间</label>
@@ -76,12 +66,11 @@
             <div class="col-sm-2 ">
               <label for="f_meter_classify"class="font_normal_body">气表类型</label>
               <v-select id="f_meter_classify"
-                        v-model="model.f_meter_classify"
+                        v-model="$parent.$parent.meter_classify"
                         placeholder='气表类型'
                         style="width:70%"
-                        :value.sync="model.f_meter_classify"
+                        :value.sync="$parent.$parent.meter_classify"
                         :options='$parent.$parent.f_meter_classify'
-                        condition="f_meter_classify = '{}'"
                         :value-single="true"
                         close-on-select >
               </v-select>
@@ -99,8 +88,9 @@
                         close-on-select >
               </v-select>
             </div>
-            <div v-if="$parent.$parent.meter_classify == '卡表'" class="col-sm-2 flex-row" style="white-space: nowrap" >
-              <label   class="font_normal_body">总购次数</label>
+            <div class="col-sm-2 flex-row" style="white-space: nowrap" >
+              <label class="font_normal_body" v-if="['卡表','物联网表'].includes($parent.$parent.meter_classify)">总购次数</label>
+              <label class="font_normal_body" v-else>抄表次数</label>
               <div class="row">
                 <input type="text" style="width:30%" class="input_search" v-model="model.cishumin"
                        condition="cishu >= {} " placeholder="">
@@ -109,21 +99,10 @@
                        condition="cishu <= {} " placeholder="">
               </div>
             </div>
-            <div v-if="$parent.$parent.meter_classify == '机表'" class="col-sm-2 flex-row" style="white-space: nowrap" >
-              <label  class="font_normal_body">抄表次数</label>
-
-              <div class="row">
-                <input type="text" style="width:30%" class="input_search" v-model="model.handmin"
-                       condition="cishu >= {} " placeholder="">
-                <label   class="font_normal_body">  ≤ x ≤ </label>
-                <input type="text" style="width:30%" class="input_search" v-model="model.handmax"
-                       condition="cishu <= {} " placeholder="">
-              </div>
-
-            </div>
-            <div v-if="$parent.$parent.meter_classify == '卡表'" class="col-sm-2 flex-row" style="white-space: nowrap" >
-              <label  class="font_normal_body">总购气量</label>
-
+            <div class="col-sm-2 flex-row" style="white-space: nowrap" >
+              <label class="font_normal_body" v-if="$parent.$parent.meter_classify === '卡表'">总购气量</label>
+              <label class="font_normal_body" v-if="$parent.$parent.meter_classify === '机表'">总用气量</label>
+              <label class="font_normal_body" v-if="$parent.$parent.meter_classify === '物联网表'">总购金额</label>
               <div class="row">
                 <input type="text" style="width:30%" class="input_search" v-model="model.pregasmin"
                        condition="pregas >= {} " placeholder="">
@@ -131,18 +110,6 @@
                 <input type="text" style="width:30%" class="input_search" v-model="model.pregasmax"
                        condition="pregas <= {} " placeholder="">
               </div>
-
-
-            </div>
-            <div v-if="$parent.$parent.meter_classify == '机表'" class="col-sm-2 flex-row" style="white-space: nowrap" >
-              <label class="font_normal_body">总用气量</label>
-              <div class="row">
-                <input type="text" style="width:30%" class="input_search" v-model="model.pregasusemin"
-                       condition="pregas >= {} " placeholder="">
-                <label   class="font_normal_body">  ≤ x ≤ </label>
-                <input type="text" style="width:30%" class="input_search" v-model="model.pregasusemax"
-                       condition="pregas <= {} " placeholder="">
-              </div>
             </div>
 
             <div class="col-sm-2">
@@ -200,14 +167,15 @@
             <th><nobr>气表品牌</nobr></th>
             <th><nobr>气价名称</nobr></th>
             <th><nobr>最后购气日期</nobr></th>
-            <th v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>总购气次数</nobr></th>
-            <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>总抄表次数</nobr></th>
+            <th v-show="['卡表','物联网表'].includes($parent.$parent.$parent.meter_classify)"><nobr>总购气次数</nobr></th>
+            <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>总抄表次数</nobr></th>
 
-            <th v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>总购气量</nobr></th>
-            <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>总用气量</nobr></th>
+            <th v-show="$parent.$parent.$parent.meter_classify === '卡表'"><nobr>总购气量</nobr></th>
+            <th v-show="$parent.$parent.$parent.meter_classify === '物联网表'"><nobr>总购金额</nobr></th>
+            <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>总用气量</nobr></th>
 
-            <th v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>累计未购气天数</nobr></th>
-            <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>累计未抄表天数</nobr></th>
+            <th v-show="['卡表','物联网表'].includes($parent.$parent.$parent.meter_classify)"><nobr>累计未购气天数</nobr></th>
+            <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>累计未抄表天数</nobr></th>
             <th><nobr>组织机构</nobr></th>
           </tr>
         </template>
@@ -229,8 +197,6 @@
 
           <th style="text-align: center;"><nobr>{{row.cishu}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.pregas}}</nobr></th>
-<!--          <th style="text-align: center;"><nobr>{{row.sellcishu}}</nobr></th>-->
-<!--          <th style="text-align: center;"><nobr>{{row.sellpregas}}</nobr></th>-->
           <th style="text-align: center;"><nobr>{{row.diffday}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></th>
         </template>
@@ -239,10 +205,9 @@
         <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 v-if="meter_classify == '卡表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总购气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
-            <!--      <td v-if="meter_classify == '卡表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">阶段购气量合计:&emsp;&emsp;{{sumsmodel.sellpregas}}</td>-->
-            <td v-if="meter_classify == '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总抄表气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
-            <!--      <td v-if="meter_classify == '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">阶段抄表气量合计:&emsp;{{sumsmodel.sellpregas}}</td>-->
+            <td v-if="meter_classify === '卡表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总购气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
+            <td v-if="meter_classify === '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总抄表气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
+            <td v-if="meter_classify === '物联网表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总购金额合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
           </tr>
         </table>
   </div>
@@ -298,22 +263,34 @@
     },
     watch:{
       meter_classify(val){
-        if(val == '卡表') {
-          this.url = 'rs/sql/inspectList'
+        if (val === '卡表') {
+          this.model.url = this.url = 'rs/sql/inspectList'
           this.sqlName = 'inspectList'
           this.getfield = {"f_userinfo_code":"客户编号","f_meternumber":"表号","f_user_name":"客户名称","f_user_phone":"客户电话","f_address":"地址","f_user_type":"用户类型",
             "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
             "delivery_date":"最后购气日期","cishu":"总购气次数","pregas":"总购气量",
             "diffday":"累计未购气天数"}
-        }else{
-          this.url = 'rs/sql/handinspectList'
+        }else if (val === '机表') {
+          this.model.url = this.url = 'rs/sql/handinspectList'
           this.sqlName = 'handinspectList'
           this.getfield = {"f_userinfo_code":"客户编号","f_meternumber":"表号","f_user_name":"客户名称","f_user_phone":"客户电话","f_address":"地址","f_user_type":"用户类型",
             "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
             "delivery_date":"最后抄表日期","cishu":"总抄表次数","pregas":"抄表气量",
             "diffday":"累计未抄表天数"}
+        } else if (val === '物联网表') {
+          this.model.url = this.url = 'rs/sql/getWebMeterList'
+          this.sqlName = 'getWebMeterList'
+          this.getfield = {"f_userinfo_code":"客户编号","f_meternumber":"表号","f_user_name":"客户名称","f_user_phone":"客户电话","f_address":"地址","f_user_type":"用户类型",
+            "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
+            "delivery_date":"最后购气日期","cishu":"总购气次数","f_collection":"总购金额",
+            "diffday":"累计未购气天数"}
         }
         this.clear()
+        this.model.rows = []
+        for(let key in this.model.sums){
+          this.model.sums[key] = 0
+        }
+
       },
       sumsmodel:{
         handler: function(val) {
@@ -378,9 +355,11 @@
         this.$refs.paged.$refs.cri.search()
       },
       selfSearch (args) {
-        this.model.url = this.meter_classify === '卡表' ? 'rs/sql/inspectList': 'rs/sql/handinspectList'
+        if (!this.meter_classify) {
+          this.$showMessage('请选择气表类型。。。')
+          return
+        }
         args.condition = args.condition+ ` ${this.filialeCodeStr}`
-        // console.log("拼接的condition", args.condition, this.model)
         this.model.search(args.condition, args.model)
       },
       hidden(){
@@ -405,7 +384,7 @@
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
       },
       f_meter_classify(){
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]
+        return [{label: '机表', value: '机表'},{label: '卡表', value: '卡表'},{label: '物联网表', value: '物联网表'}]
         // return [{label: '卡表', value: '卡表'}]
       },
 

package/src/components/sale/config/exportConfig.js

@@ -134,6 +134,9 @@ export default{
     'overdue': '滞纳金', 'f_garbage_fee': '附加费', 'f_last_tablebase': '上期抄表底数', 'f_tablebase': '本期抄表底数', 'f_balance': '上期余额',
     'f_oughtfee_all': '合计欠费金额', 'f_cost_type': '缴费方式', 'f_meter_type': '气表类型'
   },
+  areaChargeQueryConfig: {
+    'f_residential_area': '小区','f_price': '单价','f_gas': '购气方量','f_money': '购气金额'
+  },
   arrearsGYConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_meternumber': '表号', 'f_residential_area': '小区名称', 'f_address': '客户地址',
     'f_user_phone': '客户电话', 'f_rent_phone': '备用电话', 'f_inputtor': '抄表员', 'f_book_name': '抄表册', 'f_user_type': '客户类型',