manage-client 4.1.92 → 4.1.94-whls

package/package.json

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

package/src/components/DataGrid.vue

@@ -0,0 +1,483 @@
+<template>
+  <div @scroll="scroll()" style="overflow:auto;" id="listrefeshx" v-el:grid>
+    <table replace='table' class="{{classname}}" v-if="!optional">
+      <thead a-partial='head' v-for='h in 1' class="text-left" @dblclick.stop="headDblclickGo($event)" v-el:the>
+      </thead>
+      <tbody>
+      <tr
+        :id="'vc-datagrid-'+attach+'-'+$index"
+        v-for='row in model.rows || model.children || model.data'
+        v-bind:class="{  'success': isSelected(row)&&!customize,'customizestyle':isSelected(row)&&customize }"
+        @click="select(row)" @dblclick.stop="dblclickGo(row, $index)"
+        a-partial='body' track-by="$index">
+      </tr>
+      </tbody>
+      <tr a-partial='foot' v-for='f in 1'></tr>
+    </table>
+    <!-- 自带选择框的table -->
+    <table replace='table' class="{{classname}}" v-if="optional">
+      <thead v-for='h in 1' class="text-left" @dblclick.stop="headDblclickGo($event)">
+      <tr a-partial='head'>
+        <th style="text-align:center">
+          <input type="checkbox" v-model="checkAll[model.pageIndex-1]" @change="selectAll()" @click.stop/>
+        </th>
+      </tr>
+      </thead>
+      <tbody>
+      <tr
+        :id="'vc-datagrid-'+attach+'-'+$index"
+        v-for='row in model.rows || model.children || model.data'
+        v-bind:class="{  'success': isSelected(row)&&!customize,'customizestyle':isSelected(row)&&customize }"
+        @click="select(row)" @dblclick.stop="dblclickGo(row, $index)"
+        a-partial='body' track-by="$index">
+        <td style="text-align: center;">
+          <input @click.stop :id="'bodycheckbox'+model.pageIndex" type='checkbox' @change="selectOne($event,row,$index)" :checked="ischecked(model.pageIndex-1,$index)"/>
+        </td>
+      </tr>
+      </tbody>
+      <tr a-partial='foot' v-for='f in 1'></tr>
+    </table>
+
+    <modal :show.sync="show" backdrop="false">
+      <header slot="modal-header" class="modal-header text-center">
+        <h4 class="modal-title">显示列选择</h4>
+        <input type="checkbox" :id="'theadNodeAll' + dateTime" v-model="all">
+        <label :for="'theadNodeAll' + dateTime" 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 theadval">
+            <input type="checkbox" :id="'water-owe-details-' + dateTime + $index" v-model="modelval" :value="f.index">
+            <label :for="'water-owe-details-'+ dateTime + $index" class="font-size">{{f.innerText}}</label>
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <center>
+          <button type="button" class="btn btn-default" @click='show = false'>取消</button>
+          <button type="button" class="btn btn-success" @click='displayColumnSettings()'>确定</button>
+        </center>
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+  // Selector mixin 可能在外部库中，如果不存在则创建一个空的
+  let Selector = {}
+  try {
+    Selector = require('../mixins/Selector').default || require('../mixins/Selector')
+  } catch (e) {
+    // 如果找不到 Selector，创建一个空的 mixin
+    Selector = {
+      data() {
+        return {
+          selectStore: {
+            selected: null
+          }
+        }
+      },
+      methods: {
+        isSelected(row) {
+          return this.selectStore.selected === row
+        },
+        select(row) {
+          this.selectStore.selected = row
+          this.$dispatch('select', row)
+        }
+      }
+    }
+  }
+
+  export default {
+    props: {
+      classname: {
+        type: String,
+        default: 'table table-bordered table-striped table-hover'
+      },
+      model: {},
+      thumbWidth: {
+        type: Number,
+        default: 8
+      },
+      // 为测试添加，需要为元素指定id
+      attach: {
+        type: String,
+        default: 'name'
+      },
+      customize: {
+        type: Boolean,
+        default: false
+      },
+      // 是否添加勾选框,开启后别加tr标签, 调用getRowData()获取选中数据
+      // 建议在重新查询时调用selectInit方法, 重置选中数据, 防止出现bug
+      optional: {
+        type: Boolean,
+        default: false
+      },
+      //查询后是否滚回第一行
+      isScrollto: {
+        type: Boolean,
+        default: true
+      }
+    },
+    data () {
+      return {
+        dateTime: new Date().getTime(),
+        theadNode: null,
+        tbodyTrNode: null,
+        theadval: null,
+        allTheadRows: null, // 保存所有行的 th，用于显示/隐藏时同时处理
+        modelval: [],
+        all: false,
+        show: false,
+        // 选择的用户
+        rowsdata: [],
+        // 控制全选
+        checkAll : [],
+        // 控制单选
+        radio: []
+      }
+    },
+    ready () {
+      // 做兼容处理
+      if (window.NodeList && !NodeList.prototype.forEach) {
+        NodeList.prototype.forEach = function (callback, thisArg) {
+          thisArg = thisArg || window
+          for (var i = 0; i < this.length; i++) {
+            callback.call(thisArg, this[i], i, this)
+          }
+        }
+      }
+      // var HostApp
+      try {
+        HostApp
+        // 如果为移动端设备，将.span的高度设置为auto
+        let spans = document.getElementsByClassName('span')
+        for (var i = 0; i < spans.length; i++) {
+          spans[i].style.height = 'auto'
+        }
+      } catch (e) {
+      }
+      let el = this.$els.grid
+      let translate = 'translate(' + (el.scrollLeft - (el.scrollWidth - el.offsetWidth) - this.thumbWidth) + 'px,0)'
+      // 新加载时，平移右侧固定列表体
+      el.querySelectorAll('table tbody .stickToRight').forEach((element) => {
+        element.style.transform = translate
+      })
+
+      translate = 'translate(' + (el.scrollLeft - (el.scrollWidth - el.offsetWidth) - this.thumbWidth) + 'px,' + el.scrollTop + 'px)'
+      // 新加载时，平移右侧固定表头
+      el.querySelectorAll('table thead th.stickToRight').forEach((element) => {
+        element.style.transform = translate
+      })
+    },
+    methods: {
+      InitializedData () {
+        this.$nextTick(() => {
+          const theadElement = this.$el.querySelector('thead')
+          // 只获取最后一行的 th 标签（对应实际 td 的列）
+          const trs = theadElement.getElementsByTagName('tr')
+          const lastTr = trs[trs.length - 1]
+          this.theadNode = lastTr ? lastTr.getElementsByTagName('th') : theadElement.getElementsByTagName('th')
+          this.tbodyTrNode = theadElement.nextElementSibling.getElementsByTagName('tr')
+        })
+      },
+      scroll () {
+        let el = this.$els.grid
+        let translate = 'translate(0,' + el.scrollTop + 'px)'
+        // 滚动时，平移除右侧除右侧固定以外的表头
+        el.querySelectorAll('table thead th:not(.stickToRight)').forEach((element) => {
+          element.style.transform = translate
+        })
+        // 滚动时，平移除右侧除左侧侧固定以外的表头
+        el.querySelectorAll('table thead th:not(.stickToLeft)').forEach((element) => {
+          element.style.transform = translate
+        })
+
+        // 滚动时，平移左侧固定的表体
+        translate = 'translate(' + el.scrollLeft + 'px,0)'
+        el.querySelectorAll('table tbody .stickToLeft').forEach((element) => {
+          element.style.transform = translate
+        })
+        // 滚动时，平移右侧固定的表体
+        translate = 'translate(' + (el.scrollLeft - (el.scrollWidth - el.offsetWidth) - this.thumbWidth) + 'px,0)'
+        el.querySelectorAll('table tbody .stickToRight').forEach((element) => {
+          element.style.transform = translate
+        })
+        // 滚动时，平移左侧固定的表头
+        translate = 'translate(' + el.scrollLeft + 'px,' + el.scrollTop + 'px)'
+        el.querySelectorAll('table thead th.stickToLeft').forEach((element) => {
+          element.style.transform = translate
+        })
+        // 滚动时，平移右侧固定的表头
+        translate = 'translate(' + (el.scrollLeft - (el.scrollWidth - el.offsetWidth) - this.thumbWidth) + 'px,' + el.scrollTop + 'px)'
+        el.querySelectorAll('table thead th.stickToRight').forEach((element) => {
+          element.style.transform = translate
+        })
+
+      },
+      dblclickGo (row, index) {
+        this.$dispatch('dblclick', row, index)
+      },
+      headDblclickGo (e) {
+        const theadElement = e.currentTarget
+        // 只获取最后一行的 th 标签（对应实际 td 的列）
+        const trs = theadElement.getElementsByTagName('tr')
+        const lastTr = trs[trs.length - 1]
+        this.theadNode = lastTr ? lastTr.getElementsByTagName('th') : theadElement.getElementsByTagName('th')
+        // 保存所有行的 th，用于显示/隐藏时同时处理
+        this.allTheadRows = []
+        for (let i = 0; i < trs.length; i++) {
+          this.allTheadRows.push(trs[i].getElementsByTagName('th'))
+        }
+        // 保存第一行 th 的【初始】原始 colspan，只在首次或列数变化时记录，
+        // 避免后面我们动态修改 colspan 之后再被当成“原始值”，导致分组错乱
+        if (this.allTheadRows.length > 0) {
+          const firstRowThs = this.allTheadRows[0]
+          if (!this.originalColspans || this.originalColspans.length !== firstRowThs.length) {
+            this.originalColspans = []
+            for (let i = 0; i < firstRowThs.length; i++) {
+              const th = firstRowThs[i]
+              this.originalColspans.push(parseInt(th.getAttribute('colspan') || '1', 10))
+            }
+          }
+        }
+        this.tbodyTrNode = theadElement.nextElementSibling.getElementsByTagName('tr')
+        if (!this.tbodyTrNode.length) {
+          this.$showMessage('当前无数据, 请查询后再试')
+          return
+        }
+        if (!this.theadval) {
+          this.theadval = []
+          for (let i = 0; i < this.theadNode.length; i++) {
+            this.theadval.push({index: i, innerText: this.theadNode[i].innerText.replace(/[\n]/g, "").trim()})
+          }
+        }
+        // 初始化 modelval 为当前所有可见列的索引
+        this.modelval = []
+        for (let i = 0; i < this.theadNode.length; i++) {
+          if (this.theadNode[i].style.display !== 'none') {
+            this.modelval.push(i)
+          }
+        }
+        // 如果所有列都可见，设置全选为 true
+        this.all = this.modelval.length === this.theadNode.length
+        this.show = true
+      },
+      displayColumnSettings (watch) {
+        if (this.modelval.length <= 0) {
+          // 如果是从监听过来的, 不进行提示
+          if (!watch) this.$showMessage('请至少选择一列展示!')
+          return
+        }
+        if (!this.tbodyTrNode || !this.theadNode) return
+        
+        // 将 modelval 中的索引转换为数字数组（因为 v-model 可能返回字符串）
+        const selectedIndices = this.modelval.map(v => parseInt(v, 10))
+        
+        for (let tr of this.tbodyTrNode) {
+          let td = tr.getElementsByTagName('td')
+          for (let i = 0; i < this.theadNode.length; i++) {
+            // 检查 td[i] 是否存在，避免访问 undefined
+            if (i >= td.length) {
+              continue
+            }
+            // 使用索引来判断是否显示，而不是文本
+            const shouldShow = selectedIndices.includes(i)
+            
+            // 显示/隐藏最后一行的 th（对应实际列）
+            if (this.theadNode[i]) {
+              this.theadNode[i].style.display = shouldShow ? '' : 'none'
+            }
+            
+            // 显示/隐藏对应的 td
+            if (td[i]) {
+              td[i].style.display = shouldShow ? '' : 'none'
+            }
+          }
+        }
+        
+        // 处理第一行的 th（根据子列的显示状态来决定是否隐藏）
+        if (this.allTheadRows && this.allTheadRows.length > 1) {
+          this.updateFirstRowThs()
+        }
+        
+        this.show = false
+      },
+      // 更新第一行 th 的显示状态（根据子列的显示状态）
+      updateFirstRowThs () {
+        if (!this.allTheadRows || this.allTheadRows.length < 2 || !this.theadNode || !this.originalColspans) return
+        
+        const firstRowThs = this.allTheadRows[0]
+        let currentColIndex = 0
+        
+        for (let i = 0; i < firstRowThs.length; i++) {
+          const th = firstRowThs[i]
+          const originalColspan = this.originalColspans[i] || parseInt(th.getAttribute('colspan') || '1', 10)
+          
+          // 统计当前分组下可见的子列数量
+          let visibleCount = 0
+          for (let j = 0; j < originalColspan && currentColIndex + j < this.theadNode.length; j++) {
+            const childTh = this.theadNode[currentColIndex + j]
+            if (childTh && childTh.style.display !== 'none') {
+              visibleCount++
+            }
+          }
+
+          // 没有任何可见子列，则隐藏这一组表头
+          if (visibleCount === 0) {
+            if (th) {
+              th.style.display = 'none'
+              // 保留原始的 colspan 记录，方便后续再次计算
+              th.setAttribute('colspan', originalColspan)
+            }
+          } else {
+            // 有可见子列，显示这一组表头，并将 colspan 设置为可见子列数，保证上下表头对齐
+            if (th) {
+              th.style.display = ''
+              th.setAttribute('colspan', visibleCount)
+            }
+          }
+          
+          // 更新列索引（使用原始 colspan，因为我们需要按照原始结构遍历）
+          currentColIndex += originalColspan
+        }
+      },
+      // 多选框初始化
+      selectInit () {
+        this.rowsdata = []
+        this.checkAll = []
+        this.radio = []
+      },
+      // 返回选择数据(合并二维数组并去空)
+      getRowData () {
+        let data = []
+        // 合并
+        for (let array of this.rowsdata) {
+          data.push.apply(data, array)
+        }
+        // 去空
+        data = this.removeEmpty(data)
+        return data
+      },
+      removeEmpty (data) {
+        for (var i = 0; i < data.length; i++) {
+          if (data[i] == "" || typeof (data[i]) == "undefined") {
+            data.splice(i, 1);
+            i--;
+          }
+        }
+        return data;
+      },
+      selectAll () {
+        let index = this.model.pageIndex - 1
+        console.log('全选', this.checkAll[index])
+        if (!this.radio[index]) {
+          this.radio.$set(index, [])
+        }
+        if (this.checkAll[index]) {
+          // 数据
+          this.rowsdata[index] = Object.assign([], this.model.rows)
+          // 勾选
+          for (let i = 0; i < this.model.rows.length; i++) {
+            this.radio[index].$set(i, true)
+          }
+        } else {
+          // 数据
+          this.rowsdata[index] = []
+          // 不勾选
+          for (let i = 0; i < this.model.rows.length; i++) {
+            this.radio[index].$set(i, false)
+          }
+        }
+      },
+      selectOne (event, row, i) {
+        console.log('单选', event.target.checked)
+        let index = this.model.pageIndex - 1
+        if (!this.rowsdata[index]) {
+          this.rowsdata[index] = []
+        }
+        if (!this.radio[index]) {
+          this.radio.$set(index, [])
+        }
+        if (event.target.checked) {
+          // 数据
+          this.rowsdata[index][i] = row
+          // 勾选
+          this.radio[index].$set(i, true)
+          // 判断是否全部选中
+          var allState = true
+          if (this.model.rows.length != this.radio[index].length) {
+            allState = false
+          }
+          for (var state of this.radio[index]) {
+            if (!state) {
+              allState = false
+            }
+          }
+          if (allState) {
+            this.checkAll.$set(index, true)
+          } else {
+            this.checkAll.$set(index, false)
+          }
+        } else {
+          // 数据
+          this.rowsdata[index][i] = []
+          // 不勾选
+          this.radio[index].$set(i, false)
+          // 任意取消一个则全选状态设为false
+          this.checkAll.$set(index, false)
+        }
+      }
+    },
+    watch: {
+      'all' (val) {
+        this.modelval = []
+        if (val) {
+          for (let row of this.theadval) {
+            this.modelval.push(row.index)
+          }
+        }
+      },
+      'model.rows' () {
+        this.selectStore.selected = null
+        if (this.model.rows) {
+          this.displayColumnSettings('watch')
+          this.$dispatch('dataGrid', this.model.rows)
+        }
+      },
+      'model.pageIndex' () {
+        if(this.isScrollto){
+          this.$els.grid.scrollTo(0,0)
+        }
+      },
+      deep: true
+    },
+    computed: {
+      // 判断页面框选中
+      ischecked () {
+        return function (index, i) {
+          // console.log("计算属性")
+          if (!this.radio[index]) {
+            return false
+          }
+          return this.radio[index][i]
+        }
+      }
+    },
+    mixins: [Selector]
+  }
+</script>
+<style>
+  th.stickToLeft {
+    position: relative;
+    z-index: 1;
+  }
+
+  th.stickToRight {
+    position: relative;
+    z-index: 1;
+  }
+</style>
+

package/src/filiale/bayan/OtherChargeQuery.vue

@@ -201,10 +201,10 @@
                   >
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label  class="font_normal_body">小于</label>
+                  <label  class="font_normal_body">小于等于</label>
                   <input style="width:60%" type="number" class="input_search"
                          v-model="model.f_money_end" placeholder='小于等于'
-                         condition="f_money < {}"
+                         condition="f_money <= {}"
                          @keyup.enter="search"
                          v-el:xq v-next-el='f_day' v-el:area
                   >

package/src/filiale/wuhai/UserGasList.vue

@@ -5,60 +5,17 @@
         <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">客户编号</label>
-                <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
-                       v-model="model.f_userinfo_code" placeholder='客户编号'
-                       condition="u.f_userinfo_code like '%{}%'" v-next-el='f_userinfo_code' v-el:meternumber
-                >
-              </div>
-              <div class="col-sm-2 form-group">
-                <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="u.f_user_name like '%{}%'" v-next-el='userid' v-el:username>
-              </div>
-            <div class="col-sm-2 form-group">
-              <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="a.f_address like '%{}%'" v-el:xq v-next-el='address' v-el:area
-              >
-            </div>
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">表&emsp;&emsp;号</label>
-                <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
-                       v-model="model.f_meternumber" placeholder='表钢号'
-                       condition="uf.f_meternumber like '%{}%'" v-next-el='meternumber' v-el:meternumber
-                >
-              </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="api/af-revenue/logic/openapi/exportfile" sql-name="webmeter_getNewHandChanceList" template-name='抄表分析'
-                              :choose-col="true"></export-excel>
-                <button class="button_export 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">
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body">公&emsp;&emsp;司</label>
                 <right-tree @re-res="$parent.$parent.getRes"
                             :initresid='$parent.$parent.orgid'></right-tree>
-<!--                    <label class="font_normal_body">组织机构</label>-->
-<!--                <res-select :initresid="$parent.$parent.orgid"-->
-<!--                            style="width:60%"-->
-<!--                            @res-select="$parent.$parent.getRes"-->
-<!--                            restype='organization'>-->
-<!--                </res-select>-->
+                <!--                    <label class="font_normal_body">组织机构</label>-->
+                <!--                <res-select :initresid="$parent.$parent.orgid"-->
+                <!--                            style="width:60%"-->
+                <!--                            @res-select="$parent.$parent.getRes"-->
+                <!--                            restype='organization'>-->
+                <!--                </res-select>-->
               </div>
-              <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
-
-<!--              <res-select-group :initres="$parent.$parent.initres"  :show-component="['company']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>-->
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body">用户类型</label>
                 <v-select style="width:60%" id="f_user_type"
@@ -71,17 +28,6 @@
                           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='用气性质'
-                          :value.sync="model.f_gasproperties"
-                          :options='$parent.$parent.gasproperties'
-                          condition="uf.f_gasproperties = '{}'"
-                          close-on-select>
-                </v-select>
-              </div>
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body">气表品牌</label>
                 <v-select
@@ -95,37 +41,19 @@
                   v-model="model.f_meter_brand">
                 </v-select>
               </div>
-<!--              <div class="col-sm-2 form-group">-->
-<!--                <label class="font_normal_body">气表品牌</label>-->
-<!--                <v-select-->
-<!--                  placeholder='气表品牌'-->
-<!--                  :value.sync="model.f_meter_brand"-->
-<!--                  v-model="model.f_meter_brand"-->
-<!--                  :options='$parent.$parent.WarningType'-->
-<!--                  @change="$parent.$parent.getMeterType"-->
-<!--                  close-on-select-->
-<!--                  condition="gb.f_meter_brand='{}'">-->
-<!--                </v-select>-->
-<!--              </div>-->
-              <div class="col-sm-2 form-group" >
-                <label class="font_normal_body">气表型号</label>
-                <v-select
-                          placeholder='气表型号'
-                          :value.sync="model.f_meter_style"
-                          v-model="model.f_meter_style"
-                          :options='$parent.$parent.meterstyle[model.f_meter_brand]'
-                          close-on-select
-                          condition="gm.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 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="api/af-revenue/logic/openapi/exportfile" sql-name="webmeter_getNewHandChanceList" template-name='抄表分析'
+                              :choose-col="true"></export-excel>
+                <button class="button_export 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">
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body" style="word-break:keep-all;">上报时间</label>
                 <datepicker style="width:60%" placeholder="起始时间"
@@ -142,48 +70,6 @@
                             :format="'yyyy-MM-dd HH:mm:ss'"
                 ></datepicker>
               </div>
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">气价类型</label>
-                <v-select :value.sync="model.pricetype" v-model="model.pricetype"
-                          @change="$parent.$parent.pricetypechanged"
-                          placeholder='气价类型' :options="$parent.$parent.pricetypes"
-                          close-on-select v-ref:type>
-                </v-select>
-              </div>
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">气价名称</label>
-                <v-select :value.sync="model.f_price_id"
-                          v-model="model.f_price_id"
-                          :multiple="true"
-                          :options="$parent.$parent.getPricenames"
-                          condition="uf.f_price_id in {}"
-                ></v-select>
-              </div>
-<!--              <div class="col-sm-2 form-group">-->
-<!--                <label class="font_normal_body">壁&ensp;挂&ensp;炉</label>-->
-<!--                <v-select id="f_meter_brand"-->
-<!--                          v-model="model.f_usetype"-->
-<!--                          placeholder='壁挂炉'-->
-<!--                          :value.sync="model.f_usetype"-->
-<!--                          :options='$parent.$parent.usetypes'-->
-<!--                          condition="" :search="false"-->
-<!--                          close-on-select style="width: 60%">-->
-<!--                </v-select>-->
-<!--              </div>-->
-<!--              <div class="col-sm-2 form-group">-->
-<!--                <label class="font_normal_body">房屋类型</label>-->
-<!--                <v-select :value.sync="model.f_house_type" v-model="model.f_house_type"-->
-<!--                          :options='$parent.$parent.houseTypes' placeholder='请选择'-->
-<!--                          close-on-select-->
-<!--                          condition=""></v-select>-->
-<!--              </div>-->
-<!--              <div class="col-sm-2 form-group">-->
-<!--                <label class="font_normal_body">安装位置</label>-->
-<!--                <v-select :value.sync="model.f_position" v-model="model.f_position"-->
-<!--                          :options='$parent.$parent.positions' placeholder='请选择'-->
-<!--                          condition=""-->
-<!--                          close-on-select></v-select>-->
-<!--              </div>-->
             </div>
           </div>
         </criteria>
@@ -194,10 +80,10 @@
               <th style="text-align:center"><nobr>上报日期</nobr></th>
               <th style="text-align:center" title="安装户数=正常户数+停用户数+未注册户数"><nobr>安装户数</nobr></th>
 
-              <th style="text-align:center" title="停用户数:表具状态为停用的用户数"><nobr>停用户数</nobr></th>
-              <th style="text-align:center" title="在用户数:表具状态为正常的用户数"><nobr>在用户数</nobr></th>
+<!--              <th style="text-align:center" title="停用户数:表具状态为停用的用户数"><nobr>停用户数</nobr></th>-->
+<!--              <th style="text-align:center" title="在用户数:表具状态为正常的用户数"><nobr>在用户数</nobr></th>-->
 
-              <th style="text-align:center" title="用户使用率=在用户数/正常户数"><nobr>用户使用率</nobr></th>
+<!--              <th style="text-align:center" title="用户使用率=在用户数/正常户数"><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>
@@ -214,10 +100,10 @@
               <td style="text-align:center;width: 170px;"><nobr>{{row.f_insert_date}}</nobr></td>
               <td style="text-align:center">{{row.anzhuang}}</td>
 
-              <th style="text-align:center">{{row.c0}}</th>
-              <td style="text-align:center"><nobr>{{row.c}}</nobr></td>
+<!--              <th style="text-align:center">{{row.c0}}</th>-->
+<!--              <td style="text-align:center"><nobr>{{row.c}}</nobr></td>-->
 
-              <td style="text-align:center"><nobr>{{row.user_bv}}%</nobr></td>
+<!--              <td style="text-align:center"><nobr>{{row.user_bv}}%</nobr></td>-->
               <!--<td style="text-align:center"><nobr>{{row.f_gas}}</nobr></td>-->
               <td style="text-align:center">{{row.c1}}</td>
               <td style="text-align:center">{{row.f_gas_all}}</td>
@@ -300,8 +186,6 @@
           "rownumber":"序号",
           "f_insert_date":"上报日期",
           "anzhuang":"安装户数",
-          "c0":"停用户数",
-          "c":"在用户数","user_bv":"用户使用率",
           "c1":"抄表成功户数",
           "f_gas_all":"总用气量",
           "f_fee_all":"总用气金额",

package/src/filiale/yangchun/NewGasStatistics.vue

@@ -284,6 +284,9 @@
             <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_curbalance}}
+            </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>
@@ -357,6 +360,7 @@
           f_oughtamount: 0,
           f_oughtfee: 0,
           f_collection:0,
+          f_curbalance: 0,
           f_stairamount1:0,
           f_stair1fee:0,
           f_stairamount2:0,