manage-client 3.3.1 → 3.3.3

package/src/filiale/shanxian/newwebmeter/TotalExceptionByMeter.vue

@@ -0,0 +1,608 @@
+<template>
+  <div class="flex-row" v-if="!showdetail">
+    <div id='app1' class="basic-main" v-show="(!echarts)&&(!isActiveTotalForm)">
+      <criteria-paged :model="model" :pager='true' v-ref:paged>
+        <criteria partial='criteria' @condition-changed='$parent.search' 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">{{$parent.$parent.usertitle}}编号</label>
+                <input style="width:60%" type="text" class="input_search"
+                       v-model="model.f_userinfo_code"
+                       placeholder='用户编号'
+                       @keyup.enter="search"
+                       condition="f_userinfo_code like '%{}%'"
+                       v-el:xq v-next-el='f_userinfo_code'
+                       v-el:username>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">{{$parent.$parent.usertitle}}名称</label>
+                <input style="width:60%" type="text" class="input_search"
+                       v-model="model.f_user_name"
+                       @keyup.enter="search"
+                       placeholder='用户名称'
+                       condition="f_user_name like '%{}%'"
+                       v-el:xq v-next-el='username'
+                       v-el:username>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">{{$parent.$parent.usertitle}}地址</label>
+                <input style="width:60%" type="text" class="input_search"
+                       v-model="model.f_area" placeholder='地址'
+                       condition="f_address like '%{}%'"
+                       @keyup.enter="search"
+                       v-el:xq v-next-el='address' v-el:area
+                >
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">&nbsp;&nbsp;&nbsp;表号&nbsp;&nbsp;&nbsp;</label>
+                <input style="width:60%" type="text" class="input_search"
+                       v-model="model.f_meternumber" placeholder='表号'
+                       @keyup.enter="search"
+                       condition="f_meternumber like '%{}%'"
+                       v-next-el='meternumber' v-el:meternumber>
+              </div>
+            <div style="float:right">
+                <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="DrillErrorByUserinfo" template-name='异常分析'
+                            :choose-col="true"></export-excel>
+                <!--<button class="button_export button_spacing" style="width: max-content" @click="$parent.$parent.showTotalForm()">显示汇总</button>-->
+                <button class="button_search button_spacing" @click="$parent.$parent.showEcharts()">显示图表</button>
+              <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"  :show-component="['company']" @re-res="$parent.$parent.getorg" 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>
+              <right-tree @re-res="$parent.$parent.getorg"
+                          :initresid='$parent.$parent.org'></right-tree>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">{{$parent.$parent.usertitle}}用户类型</label>
+              <v-select style="width:60%" id="f_user_type"
+                        v-model="model.f_user_type"
+                        placeholder='用户类型'
+                        @change="$parent.$parent.userTypeChange()"
+                        :value.sync="model.f_user_type"
+                        :options='$parent.$parent.usertypes'
+                        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 style="width:60%" id="f_gasproperties"
+                        v-model="model.f_gasproperties"
+                        placeholder='用气性质'
+                        @keyup.enter="search"
+                        :value.sync="model.f_gasproperties"
+                        :options='$parent.$parent.gasproperties'
+                        condition="f_gasproperties = '{}'"
+                        close-on-select>
+              </v-select>
+              </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">气表品牌</label>
+              <v-select
+                placeholder='气表品牌'
+                :value.sync="model.f_meter_brand"
+                v-model="model.f_meter_brand"
+                :options='$parent.$parent.WarningType'
+                @change="$parent.$parent.getMeterType"
+                close-on-select
+                condition="f_meter_brand='{}'">
+              </v-select>
+            </div>
+            <div class="col-sm-2 form-group" >
+              <label class="font_normal_body">气表型号</label>
+              <v-select v-if="$parent.$parent.styles"
+                        placeholder='气表型号'
+                        :value.sync="model.f_meter_style"
+                        v-model="model.f_meter_style"
+                        :options='$parent.$parent.Warningstyle'
+                        close-on-select
+                        condition="f_meter_style='{}'">
+              </v-select>
+              <v-select v-if="!$parent.$parent.styles"
+                        placeholder='气表型号'
+                        :value.sync="model.f_meter_style"
+                        v-model="model.f_meter_style"
+                        :options='$parent.$parent.Warningstyles'
+                        close-on-select
+                        condition="f_meter_style='{}'">
+              </v-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">{{$parent.$parent.usertitle}}用户状态</label>
+              <v-select
+                placeholder='用户状态'
+                value-single="true"
+                style="width:60%"
+                :value.sync="model.f_user_state"
+                v-model="model.f_user_state"
+                :options='$parent.$parent.userstate'
+                close-on-select condition="f_user_state ='{}'">
+              </v-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">上报区间</label>
+              <datepicker style="width:60%" id="startdate" placeholder="开始时间"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          condition="f_insert_date >= '{}'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body" style="word-break:keep-all;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;</label>
+              <datepicker style="width:60%" id="enddate" placeholder="结束日期"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :disabled-days-of-Week="[]"
+                          condition="f_insert_date <= '{}'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">异常级别</label>
+              <v-select style="width:60%"
+                        v-model="model.f_error_level"
+                        placeholder='异常级别'
+                        @change="$parent.$parent.getErrorInfo('f_error_type')"
+                        :value.sync="model.f_error_level"
+                        :options='$parent.$parent.GetErrorLevel'
+                        condition="f_error_level = '{}'"
+                        close-on-select>
+              </v-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">异常类型</label>
+              <v-select style="width:60%"
+                        v-model="model.f_error_type"
+                        placeholder='异常类型'
+                        :value.sync="model.f_error_type"
+                        :options='$parent.$parent.GetErrorType'
+                        condition="f_error_type = '{}'"
+                        close-on-select>
+              </v-select>
+            </div>
+
+
+
+        </div>
+        </div>
+      </criteria>
+      <data-grid id="lostuserlist" :model="model" class="list_area table_sy" partial='list' v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th style="text-align:center">
+              <nobr>序号</nobr>
+            </th>
+            <th style="text-align:center">
+              <nobr>{{$parent.$parent.$parent.usertitle}}编号</nobr>
+            </th>
+            <th style="text-align:center">
+              <nobr>{{$parent.$parent.$parent.usertitle}}名称</nobr>
+            </th>
+            <th style="text-align:center">
+              <nobr>{{$parent.$parent.$parent.usertitle}}地址</nobr>
+            </th>
+            <th style="text-align:center">
+              <nobr>{{$parent.$parent.$parent.usertitle}}类型</nobr>
+            </th>
+            <th style="text-align:center">
+              <nobr>用气性质</nobr>
+            </th>
+            <th style="text-align:center">
+              <nobr>表号</nobr>
+            </th>
+            <th style="text-align:center">
+              <nobr>气表品牌</nobr>
+            </th>
+            <th style="text-align:center">
+              <nobr>异常时间</nobr>
+            </th>
+            <th style="text-align:center">
+              <nobr>异常类型</nobr>
+            </th>
+            <th style="text-align:center">
+              <nobr>异常级别</nobr>
+            </th>
+            <th style="text-align:center">
+              <nobr>异常描述</nobr>
+            </th>
+            <th style="text-align:center" >
+              <nobr>气表型号</nobr>
+            </th>
+            <th style="text-align:center" >
+              <nobr>{{$parent.$parent.$parent.usertitle}}状态</nobr>
+            </th>
+            <th style="text-align:center">
+              <nobr>组织机构</nobr>
+            </th>
+
+          </tr>
+
+        </template>
+        <template partial='body'>
+          <td style="text-align:center">
+            <nobr>{{$index+1}}</nobr>
+          </td>
+          <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>
+            <nobr>{{row.f_address}}</nobr>
+          </td>
+          <td style="text-align:center">{{row.f_user_type}}</td>
+          <td style="text-align:center">{{row.f_gasproperties}}</td>
+          <td style="text-align:center"><nobr>{{row.f_meternumber}}</nobr></td>
+          <td style="text-align:center">
+            <nobr>{{row.f_meter_brand}}</nobr>
+          </td>
+          <td style="text-align:center">
+            <nobr>{{row.f_insert_date}}</nobr>
+          </td>
+          <td style="text-align:center">
+            <nobr>{{row.f_error_type}}</nobr>
+          </td>
+          <td style="text-align:center">
+            <nobr>{{row.f_error_level}}</nobr>
+          </td>
+          <td style="text-align:center">
+            <nobr>{{row.f_error_msg}}</nobr>
+          </td>
+          <td style="text-align:center">
+            <nobr>{{row.f_meter_style}}</nobr>
+          </td>
+          <td style="text-align:center">
+            <nobr>{{row.f_user_state}}</nobr>
+          </td>
+          <td style="text-align:center">
+            <nobr>{{row.f_orgname}}</nobr>
+          </td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+  <!--<div style="height: 40px;width: 100%;" v-show="echarts">
+    <div style="display: inline-block;width: 20%;">
+      <button class="button_search button_spacing" v-show="echarts" @click="notShowEcharts()">隐藏图表</button>
+      <button class="button_search button_spacing" v-show="isActiveTotalForm" @click="notShowTotalForm()">隐藏汇总</button>
+    </div>
+    &lt;!&ndash;图显示模板&ndash;&gt;
+    <div class="mystyle" style="display: inline-block;" >
+      <label class="font_normal_body">图表统计项</label>
+      <v-select style="width:60%"  id="groupname" v-model="groupname"
+                placeholder='分组项'
+                value-single="true"
+                :value.sync="groupname"
+                :options='getgroupname'
+                close-on-select></v-select>
+    </div>
+  </div>
+  <div v-show="echarts" style="width: 100%;height: 90%;">
+    <new-exception-echarts :condition="condition" :startdate="startDate" :groupname="groupname[0]"
+                           :enddate="endDate" :echarts="echarts"></new-exception-echarts>
+  </div>
+  <div v-show="isActiveTotalForm" style="width: 100%;height: 90%;">
+    <new-exception-eform-total :condition="condition" :startdate="startDate"
+                         :enddate="endDate"></new-exception-eform-total>
+  </div>-->
+    <div v-if="echarts" style="width: 100%;height: 98%;">
+      <new-exception-echarts :condition="condition" :startdate="startDate" :groupname="groupname[0]"
+                             :enddate="endDate" :echarts="echarts"></new-exception-echarts>
+    </div>
+  </div>
+  <div  class="flex" v-if="showdetail">
+    <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+  import * as Util from '../../../Util'
+  import getLodop from '../.././../plugins/LodopFuncs'
+  import plugin from 'system-clients/src/plugins/GetLoginInfoService'
+
+  let readySomething = async function (self) {
+    await self.$MagLoadParams.loadParam()
+    self.initParams()
+    self.getMeterTypeAndBrand('f_meter_brand', '1=1')
+  }
+  export default {
+    title: '异常分析',
+    props: ['data'],
+    data() {
+      return {
+        model: new PagedList('rs/sql/DrillErrorByUserinfo', 20),
+        reportStr: null,
+        show: false,
+        startDate: '',
+        endDate: '',
+        WarningType: [
+          {label: '全部', value: ''}
+        ],
+        Warningstyles: [
+          {label: '全部', value: ''}
+        ],
+        styles:false,
+        f_error_type:'',
+        groupname: ['day'],
+        getgroupname: [
+          {label: '年份', value: 'year'},
+          {label: '月份', value: 'month'},
+          {label: '周', value: 'week'},
+          {label: '日', value: 'day'}
+        ],
+        getfield:{
+          "f_userinfo_code":"用户编号", "f_user_name":"用户名称", "f_address":"用户地址","f_user_type":"用户类型","f_gasproperties":"用气性质",
+          "f_meternumber":"表号","f_meter_brand":"气表品牌","f_insert_date":"上报时间","f_error_level":"异常级别","f_error_type":"异常类型",
+          "f_error_msg":"异常描述","f_orgname":"组织机构"
+        },
+        usertitle: this.$appdata.getSingleValue('用户名称前缀') ? this.$appdata.getSingleValue('用户名称前缀') : '客户',
+        outlets: [],
+        operator: [],
+        gasproperties:[{label: '全部', value: ''}],
+        showdetail:false,
+        rowdata:{},
+        filename: '',
+        criteriaShow: false,
+        echarts: false,
+        searchshow: false,
+        isActiveTotalForm: false,
+        GetErrorLevel:[],
+        GetErrorType:[],
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[]
+        },
+        condition: '1=1',
+        org:[this.$login.f.orgid],
+        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`
+      }
+    },
+    ready() {
+      readySomething(this)
+      this.$refs.paged.$refs.cri.model.startDate = Util.addDate(new Date(),-2).substring(0,10) + ' 00:00:00'
+      // this.$refs.paged.$refs.cri.model.startDate = Util.toStandardDateString() + ' 00:00:00'
+      this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
+      // console.log("type:"+this.$refs.paged.$refs.cri.model.f_error_type)
+      this.getErrorInfo('f_error_level')
+      // console.log("type:"+this.$refs.paged.$refs.cri.model.f_error_type)
+      this.$refs.paged.$refs.cri.search()
+
+    },
+    methods: {
+      getMeterType() {
+        this.Warningstyle = [{label: '全部', value: ''}]
+        this.styles = false
+        let f_meter_brand = this.$refs.paged.$refs.cri.model.f_meter_brand
+        this.getMeterTypeAndBrand('f_meter_style', `f_meter_brand='${f_meter_brand}'`)
+      },
+      getMeterTypeAndBrand(groupname, condition) {
+        condition = `${condition} and ui.f_orgid like '${this.$login.f.orgid}%'`
+        let self = this
+        self.$refs.paged.$refs.cri.model.f_meter_style=''
+        let load = new HttpResetClass()
+        load.load('POST', 'rs/sql/getMeterStyleAndBrand1', {
+          data: {
+            condition: condition,
+            groupname: groupname
+          }
+        }, {warnMsg: null, resolveMsg: null}).then((res) => {
+          for (let i = 0; i < res.data.length; i++) {
+            if (groupname == 'f_meter_brand') {
+              self.WarningType.push({label: res.data[i].f_meter_brand, value:res.data[i].f_meter_brand})
+              console.log('气表品牌~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~')
+              console.log( self.WarningType)
+            } else if (groupname == 'f_meter_style') {
+              //气表类型
+              self.Warningstyle.push({label: res.data[i].f_meter_style, value:res.data[i].f_meter_style})
+            }
+          }
+          if (self.Warningstyle.length > 1) {
+            self.showMeterStyle()
+          }
+        })
+
+      },
+      showMeterStyle() {
+        this.styles = true
+      },
+      userTypeChange () {
+        this.gasproperties=[{label: '全部', value: ''}]
+        if(this.$refs.paged.$refs.cri.model !==null) {
+          this.$refs.paged.$refs.cri.model.f_gasproperties=''
+          if(this.$refs.paged.$refs.cri.model.f_user_type){
+            console.log(this.$refs.paged.$refs.cri.model.f_user_type)
+            this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+          }
+          // this.gasproperties.push({label: '全部', value: ''})
+        }
+      },
+      showmsg(obj){
+        this.rowdata=obj
+        this.showdetail=true
+      },
+      cancel() {
+        this.showdetail = false
+      },
+      getRes(condition,obj) {
+        this.orgCondtionStr = condition
+        this.orgname = obj.orgnames[0]
+        this.depname = obj.depnames[0]
+      },
+      getorg(obj) {
+        if (obj.resids.length>0) {
+          this.orgCondtionStr = " and f_orgid in " + plugin.convertToIn(obj.resids)
+        }else
+        {
+          this.orgCondtionStr = " and f_orgid = " + this.$login.f.orgid
+        }
+      },
+      initParams () {
+        let arr = []
+        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+          if(item.value.f_meter_type==='物联网表'){
+            temp.label = item.label
+            temp.value = item.value.f_meter_brand
+            arr.push(temp )
+          }
+
+        })
+        this.meterbrands = [{label: '全部', value: ''}, ...arr]
+      },
+      hidden(){
+        this.criteriaShow = !this.criteriaShow
+      },
+      clickshow() {
+        this.searchshow = !this.searchshow
+      },
+      getErrorInfo(items){
+        let self = this
+        self.$refs.paged.$refs.cri.model.f_error_type=''
+        console.log("self.model.f_error_type=''",self.model.f_error_type)
+        let f_error_level=''
+        if (items!='f_error_level') {
+          if(this.$refs.paged.$refs.cri.model.f_error_level){
+            f_error_level=this.$refs.paged.$refs.cri.model.f_error_level[0]
+          }
+        }
+          let load = new HttpResetClass()
+          load.load('POST', 'rs/sql/singleTableParam', {
+            data: {
+              items:items+' f_type',
+              tablename:'t_exception',
+              condition:items=='f_error_level'?'1=1 group by '+items:`f_error_level='${f_error_level}' group by `+items
+            }
+          },{warnMsg:null,resolveMsg:null}).then((res) => {
+            let rows=res.data
+            let array1=[]
+            array1.push({label: '全部', value: ''})
+            for (let i = 0; i < rows.length; i++) {
+              array1.push({label: rows[i].f_type,value: rows[i].f_type})
+            }
+            console.log("array1========",array1)
+            if (items=='f_error_level'){
+              self.GetErrorLevel=array1
+            }else {
+              self.GetErrorType=array1
+            }
+          })
+
+      },
+      search(args) {
+        this.startDate = this.$refs.paged.$refs.cri.model.startDate
+        this.endDate = this.$refs.paged.$refs.cri.model.endDate
+        this.f_error_type=this.$refs.paged.$refs.cri.model.f_error_type
+        console.log('1231321312312321')
+       /* if (this.endDate == '' || this.startDate == '') {
+          return this.$showMessage("时间区间的开始和结束时间不能为空！")
+        }*/
+          this.condition = this.$refs.paged.$refs.cri.condition +  this.orgCondtionStr
+
+        args.condition = this.condition
+        this.model.search(args.condition, args.model)
+      },
+      SaveAsFile(str) {
+        this.$showMessage('您是否需要导出本页数据？', ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            let style = '<style>' +
+              'td {border-width: 1px;padding: 2px;border-style: solid; border-color:black; border-collapse:collapse;} .tdright{text-align: right;}  .tdcenter{text-align: center;}</style>';
+            let strHtml = style + document.getElementById(str).innerHTML;
+            console.log(strHtml);
+            let LODOP = getLodop();
+            LODOP.PRINT_INIT('');
+            LODOP.ADD_PRINT_TABLE(5, 5, '99%', '100%', strHtml);
+            LODOP.SAVE_TO_FILE('异常分析(表统计).xls')
+          }
+        })
+      },
+      clearmsg() {
+        this.$refs.paged.$refs.cri.model = {}
+      },
+      close() {
+        this.show = false
+      },
+      // 显示柱状图
+      showEcharts() {
+        this.echarts = true
+        this.isActiveTotalForm = false
+      },
+      notShowTotalForm() {
+        this.echarts = false
+        this.isActiveTotalForm = false
+      },
+      // 不显示柱状图
+      notShowEcharts() {
+        this.echarts = false
+        this.isActiveTotalForm = false
+      },
+      // 显示汇总数据表格
+      showTotalForm() {
+        this.echarts = false
+        this.isActiveTotalForm = true
+      }
+    },
+    watch: {
+      'data'(val) {
+        if (val.f_files_path) {
+          this.getFileContent(val.f_files_path)
+        } else {
+          this.reportStr = null
+        }
+      }
+    },
+    computed: {
+      // usertypes () {
+      //   return this.$appdate.getParams("用户类型")
+      // },
+      getCondition() {
+        let condition=this.$refs.paged.$refs.cri.condition + this.orgCondtionStr
+        return {
+          condition: condition  ,
+          startDate:`${this.$refs.paged.$refs.cri.model.startDate}`,
+          endDate:`${this.$refs.paged.$refs.cri.model.endDate}`
+        }
+
+      },
+      usertypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
+      userstate() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')]
+      }
+    }
+  }
+</script>
+<style>
+  .form-input-group label {
+    text-align: right;
+    width: auto;
+  }
+
+  .mystyle {
+    float: right;
+    padding-right: 10%;
+  }
+
+  .datapanel {
+    color: #333;
+    background-color: white;
+    box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
+    padding: 10px 30px 10px 30px;
+    border-radius: 15px;
+  }
+</style>

package/src/filiale/shanxian/sale.js

@@ -23,4 +23,24 @@ export default function () {
   Vue.component('user-query', (resolve) => { require(['./UserQuery'], resolve) })
   // 收费查询
   Vue.component('charge-query', (resolve) => { require(['./ChargeQuery'], resolve) })
+  // 过户查询
+  Vue.component('transfer-query', (resolve) => { require(['./TransferQuery'], resolve) })
+  // 冲正查询
+  Vue.component('reverse-query', (resolve) => { require(['./ReverseQuery'], resolve) })
+  // 启用查询
+  Vue.component('enable-query', (resolve) => { require(['./EnableQuery'], resolve) })
+  // 停用查询
+  Vue.component('disable-query', (resolve) => { require(['./DisableQuery'], resolve) })
+  // 销户查询
+  Vue.component('cancellation-query', (resolve) => { require(['./CancellationQuery'], resolve) })
+  // 表具查询
+  Vue.component('meter-query', (resolve) => { require(['./MeterQuery'], resolve) })
+  // 表具设备查询
+  Vue.component('equipment-query', (resolve) => { require(['./DeviceQuery'], resolve) })
+  // 档案变更查询
+  Vue.component('changeuser-query', (resolve) => { require(['./ChangeUserQuery'], resolve) })
+  // 用气查询
+  Vue.component('fmygas-query', (resolve) => { require(['./FMYGasQuery'], resolve) })
+  // 月用气查询
+  Vue.component('month-gas-query', (resolve) => { require(['./MonthGasQuery'], resolve) })
 }

package/src/filiale/shanxian/webmeterManage.js

@@ -9,4 +9,8 @@ export default function () {
   Vue.component('new-webmeter-user-gas-all', (resolve) => { require(['./UserGasAll.vue'], resolve) })
   // 失联查询
   Vue.component('user-gas-echarts', (resolve) => { require(['./UserGasEcharts.vue'], resolve) })
+
+  Vue.component('new-query-instruct', (resolve) => { require(['./NewQueryInstruct'], resolve) })
+  // 异常汇总分析
+  Vue.component('total-exception-by-meter', (resolve) => { require(['./newwebmeter/TotalExceptionByMeter'], resolve) })
 }

package/src/filiale/wenxi/GasStatistics.vue

@@ -63,12 +63,12 @@
                          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_residential_area" placeholder='燃气证号'
-                         condition="ss.f_residential_area like '%{}%'" v-next-el='f_residential_area' v-el:f_gascode
-                  >
-                </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_residential_area" placeholder='燃气证号'-->
+<!--                         condition="ss.f_residential_area like '%{}%'" v-next-el='f_residential_area' 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"