manage-client 3.3.84-wn → 3.3.84

package/build/dev-server.js

@@ -19,9 +19,9 @@ var qtx= 'http://36.103.222.144:6300/'
 // var bendi = 'http://203.57.101.233:8400/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://121.36.106.17:8400'
+var bendi = 'http://192.168.50.4:8400/'
 // var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://121.36.106.17:8400'
+var wode = 'http://192.168.50.4:8400/'
 // 192.168.
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
 // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'

package/package.json

@@ -1,111 +1,111 @@
-{
-  "name": "manage-client",
-  "version": "3.3.84-wn",
-  "description": "经营管控模块前台组件",
-  "main": "src/index.js",
-  "directories": {
-    "test": "test"
-  },
-  "dependencies": {
-    "crypto-js": "^4.1.1",
-    "swiper": "^5.4.5"
-  },
-  "devDependencies": {
-    "axios": "0.15.3",
-    "babel-core": "^6.0.0",
-    "babel-loader": "^6.0.0",
-    "babel-plugin-transform-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-stage-2": "^6.0.0",
-    "chai": "^3.5.0",
-    "co": "^4.6.0",
-    "connect-history-api-fallback": "^1.1.0",
-    "cross-env": "^1.0.7",
-    "cross-spawn": "^2.1.5",
-    "css-loader": "^0.23.0",
-    "echarts": "^4.1.0",
-    "eslint": "^2.0.0",
-    "eslint-config-standard": "^5.1.0",
-    "eslint-friendly-formatter": "^1.2.2",
-    "eslint-loader": "^1.3.0",
-    "eslint-plugin-html": "^1.3.0",
-    "eslint-plugin-promise": "^1.0.8",
-    "eslint-plugin-standard": "^1.3.2",
-    "eslint-plugin-vue": "^0.1.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "filemanager-webpack-plugin": "^2.0.5",
-    "file-loader": "^0.8.4",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.8.1",
-    "http-proxy-middleware": "^0.11.0",
-    "inject-loader": "^2.0.1",
-    "isparta-loader": "^2.0.0",
-    "jasmine-core": "^2.4.1",
-    "jquery": "^3.3.1",
-    "jsencrypt": "3.0.0-rc.1",
-    "json-loader": "^0.5.4",
-    "karma": "^1.4.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "ldap-clients": "3.0.7",
-    "less": "^2.7.3",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "moment": "2.24.0",
-    "ncp": "^2.0.0",
-    "rimraf": "^2.5.0",
-    "sale-client": "3.4.14",
-    "selenium-server": "2.52.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "style": "0.0.3",
-    "style-loader": "^0.20.3",
-    "swiper": "^5.4.5",
-    "system-clients": "3.2.61",
-    "url-loader": "^0.5.7",
-    "vue-amap": "0.5.10",
-    "vue-client": "1.24.108",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "8.2.1",
-    "vue-resource": "^1.5.0",
-    "vue-router": "^0.7.13",
-    "vue-strap": "^1.0.9",
-    "vue-style-loader": "^1.0.0",
-    "vue-validator": "2.1.7",
-    "webpack": "1.12.2",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3",
-    "webpack-parallel-uglify-plugin": "^1.0.0"
-  },
-  "scripts": {
-    "unit": "karma start test/unit/karma.conf.js --single-run",
-    "example": "node build/example-server.js",
-    "dev": "node build/dev-server.js",
-    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "oldbuild": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.oldprod.conf.js",
-    "build": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_ENTRY=reportManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_BUILDEND=true VUE_APP_ENTRY=webmeterManage webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "buildSaleManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "buildReportManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=reportManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "buildWebmeterManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=webmeterManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "e2e": "node test/e2e/runner.js",
-    "release": "bash build/release.sh"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/aote/management_modules.git"
-  },
-  "keywords": [
-    "manage"
-  ],
-  "author": "liuxudong",
-  "license": "ISC"
-}
+{
+  "name": "manage-client",
+  "version": "3.3.84",
+  "description": "经营管控模块前台组件",
+  "main": "src/index.js",
+  "directories": {
+    "test": "test"
+  },
+  "dependencies": {
+    "crypto-js": "^4.1.1",
+    "swiper": "^5.4.5"
+  },
+  "devDependencies": {
+    "axios": "0.15.3",
+    "babel-core": "^6.0.0",
+    "babel-loader": "^6.0.0",
+    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "co": "^4.6.0",
+    "connect-history-api-fallback": "^1.1.0",
+    "cross-env": "^1.0.7",
+    "cross-spawn": "^2.1.5",
+    "css-loader": "^0.23.0",
+    "echarts": "^4.1.0",
+    "eslint": "^2.0.0",
+    "eslint-config-standard": "^5.1.0",
+    "eslint-friendly-formatter": "^1.2.2",
+    "eslint-loader": "^1.3.0",
+    "eslint-plugin-html": "^1.3.0",
+    "eslint-plugin-promise": "^1.0.8",
+    "eslint-plugin-standard": "^1.3.2",
+    "eslint-plugin-vue": "^0.1.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "filemanager-webpack-plugin": "^2.0.5",
+    "file-loader": "^0.8.4",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.8.1",
+    "http-proxy-middleware": "^0.11.0",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
+    "jasmine-core": "^2.4.1",
+    "jquery": "^3.3.1",
+    "jsencrypt": "3.0.0-rc.1",
+    "json-loader": "^0.5.4",
+    "karma": "^1.4.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.3.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "ldap-clients": "3.0.7",
+    "less": "^2.7.3",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "moment": "2.24.0",
+    "ncp": "^2.0.0",
+    "rimraf": "^2.5.0",
+    "sale-client": "3.4.14",
+    "selenium-server": "2.52.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.8.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "swiper": "^5.4.5",
+    "system-clients": "3.2.61",
+    "url-loader": "^0.5.7",
+    "vue-amap": "0.5.10",
+    "vue-client": "1.24.108",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "8.2.1",
+    "vue-resource": "^1.5.0",
+    "vue-router": "^0.7.13",
+    "vue-strap": "^1.0.9",
+    "vue-style-loader": "^1.0.0",
+    "vue-validator": "2.1.7",
+    "webpack": "1.12.2",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3",
+    "webpack-parallel-uglify-plugin": "^1.0.0"
+  },
+  "scripts": {
+    "unit": "karma start test/unit/karma.conf.js --single-run",
+    "example": "node build/example-server.js",
+    "dev": "node build/dev-server.js",
+    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+    "oldbuild": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.oldprod.conf.js",
+    "build": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_ENTRY=reportManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_BUILDEND=true VUE_APP_ENTRY=webmeterManage webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "buildSaleManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "buildReportManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=reportManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "buildWebmeterManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=webmeterManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "e2e": "node test/e2e/runner.js",
+    "release": "bash build/release.sh"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/aote/management_modules.git"
+  },
+  "keywords": [
+    "manage"
+  ],
+  "author": "liuxudong",
+  "license": "ISC"
+}

package/src/components/webmeter/reportdata/ckhReportDataQuery.vue

@@ -0,0 +1,275 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex">
+        <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 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">-->
+<!--                  <label class="font_normal_body">组织机构</label>-->
+<!--                  <res-select :initresid="$parent.$parent.org"-->
+<!--                              style="width:60%"-->
+<!--                              @res-select="$parent.$parent.getorg"-->
+<!--                              restype='organization'>-->
+<!--                  </res-select>-->
+
+<!--                </div>-->
+                <div class="col-sm-2">
+                  <label class="font_normal_body">&emsp;公司&emsp;</label>
+                  <right-tree @re-res="$parent.$parent.getorg"
+                              :initresid='$parent.$parent.org'></right-tree>
+                </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" :footer="$parent.$parent.footer"
+                                :field="$parent.$parent.getfield" :header="$parent.$parent.other"
+                                sqlurl="rs/ckh/export" sql-name="ckh_getReportDataQuery" template-name='结算查询导出'
+                                :choose-col="true"></export-excel>
+                  <div style="float: right" class="button_spacing"
+                       :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                       @click="$parent.$parent.hidden()"></div>
+                </div>
+
+              </div>
+
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">表&nbsp;&nbsp;&nbsp;&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
+                    placeholder='气表品牌'
+                    :value.sync="model.f_meter_brand"
+                    v-model="model.f_meter_brand"
+                    :options='$parent.$parent.meterbrands'
+                    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
+                            placeholder='气表型号'
+                            :value.sync="model.f_meter_style"
+                            v-model="model.f_meter_style"
+                            :options='$parent.$parent.metertypes'
+                            close-on-select
+                            condition="f_meter_style='{}'">
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="startDate" class="font_normal_body">插入时间</label>
+                  <datepicker id="startDate" placeholder="插入时间" style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd 00:00:00'"
+                              :show-reset-button="true"
+                              condition="f_insert_date >= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;</label>
+                  <datepicker id="endDate" placeholder="插入时间" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd 23:59:59'"
+                              :show-reset-button="true"
+                              condition="f_insert_date <= '{}'">
+                  </datepicker>
+                </div>
+              </div>
+
+            </div>
+          </criteria>
+
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+            <template partial='head'>
+              <tr>
+                <th v-for="row in $parent.$parent.$parent.headData">
+                  <nobr>{{row}}</nobr>
+                </th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <tr v-for="row in $parent.$parent.$parent.model.rows">
+                <td style="text-align: center;" v-for="item in $parent.$parent.$parent.config.fieldMapping">
+                  <nobr v-if="item == 'f_lowlithiumbattery'">{{row[item] == 1 ? '是' : '否'}}</nobr>
+                  <nobr v-if="item == 'f_magneticinterference'">{{row[item] == 1 ? '异常' : '正常'}}</nobr>
+                  <nobr v-if="item != 'f_magneticinterference' && item != 'f_lowlithiumbattery'">{{row[item]}}</nobr>
+                </td>
+              </tr>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+  import tableConfig from './../../sale/config/tableConfig'
+  import exportConfig from '../../sale/config/exportConfig'
+  import plugins from '../../../plugins/GetLoginInfoService'
+  import plugin from 'system-clients/src/plugins/GetLoginInfoService'
+
+  let readySomething = async function (self) {
+    await self.$MagLoadParams.loadParam()
+    self.initParams()
+    // self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+  }
+  export default {
+    title: '上报数据查询',
+    data() {
+      return {
+        other:[],
+        footer:[],
+        model: new PagedList('rs/ckh/ckh_getReportDataQuery', 20, {}),
+        criteriaShow: false,
+        config: {
+          fieldMapping: {
+              f_userinfo_code: '客户编号',
+              f_user_name: '客户名称'
+          }
+        },
+        WarningType: [
+          {label: '全部', value: ''}
+        ],
+        Warningstyles: [
+          {label: '全部', value: ''}
+        ],
+        styles:false,
+        headData: [],
+        bodyData: [],
+        orgCondtionStr: ` and f_filialeid in (' + ${this.$login.f.orgid}+')`,
+        resshow:['company'],
+        org:[this.$login.f.orgid],
+        meterbrands:[]
+      }
+    },
+    created () {
+     this.config.fieldMapping=tableConfig.ReportDataQuery
+      console.log("========================")
+      console.log(this.config.fieldMapping)
+      var item="用户编号"
+      console.log("~~~~~~~~~~~~~~~~~~~~~~~~~~~~")
+      console.log(this.config.fieldMapping[item])
+      this.headData=Object.keys(this.config.fieldMapping)
+      // for(var i=0;i<this.config.fieldMapping;i++){
+      //   this.headData.push(this.config.fieldMapping[i])
+      // }
+
+    },
+    ready() {
+      this.$refs.paged.$refs.cri.search()
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      initParams() {
+        // 初始化气表品牌
+        let brandArr = []
+        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+          if(item.value.f_meter_type==='物联网表'){
+            temp.label = item.label
+            temp.value = item.value.f_meter_brand
+            brandArr.push(temp )
+          }
+        })
+        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+        //初始化气表价格
+        this.prices = this.$MagGetSaleParam.getPrices();
+      },
+      showMeterStyle() {
+        this.styles = true
+      },
+      search() {
+        this.$refs.paged.$refs.cri.search()
+      },
+      async selfSearch(args) {
+        args.condition = `${args.condition}` + this.orgCondtionStr
+        await this.model.search(args.condition, args.model)
+        // 查询到数据进行处理
+        // if (this.model.rows.length > 0) {
+        //   this.bodyData =  Object.keys(this.model.rows[0])
+        // }
+      },
+      getorg(obj) {
+        if (obj.resids.length>0) {
+          this.orgCondtionStr = " and f_filialeid in " + plugin.convertToIn(obj.resids)
+        }else
+        {
+          this.orgCondtionStr = " and f_filialeid = " + this.$login.f.orgid
+        }
+      },
+      // getorg(obj) {
+      //   // if(plugins.convertToIn(obj)!==null&&plugins.convertToIn(obj)!==''){
+      //   //   this.orgCondtionStr = " and f_filialeid in " + plugins.convertToIn(obj)
+      //   // }else{
+      //   //   this.orgCondtionStr = " and f_filialeid = " + this.$login.f.orgid
+      //   // }
+      //   // this.orgname = obj.res
+      // },
+      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
+      // }
+      getotherfooter () {
+        // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
+        // this.$refs.paged.$refs.cri.$refs.exports.footerData = [];
+        this.other = [];
+        this.footer = [];
+        let otherInData = [];
+        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+        let footerData = []
+        this.footer.push(footerData);
+        this.other.push(otherInData);
+      }
+    },
+    watch: {
+    },
+    computed: {
+      metertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
+      },
+      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.ReportDataConfig
+      }
+    }
+  }
+</script>

package/src/filiale/WEINAN/ManageCompanyGasSummary.vue

@@ -67,7 +67,7 @@
               <div class="row" v-if="$parent.$parent.criteriaShow">
                 <res-select-group
                   :style="$parent.$parent.style"
-                  :show-component="['company']"
+                  :show-component="['company','slicearea']"
                   :initres="$parent.$parent.initres"
                   @re-res="$parent.$parent.getRes"
                   v-ref:sel
@@ -96,7 +96,7 @@
                             @change="$parent.$parent.userTypeChange()"
                             :value-single="true"
                             placeholder='请选择' v-model="model.f_user_type"
-                            close-on-select></v-select>
+                            ></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label for="f_user_usetype" class="font_normal_body ">用气类型</label>
@@ -159,9 +159,15 @@
                 <th>
                   <nobr>期间用气量</nobr>
                 </th>
+                <th>
+                  <nobr>期间用气金额</nobr>
+                </th>
                 <th>
                   <nobr>期间售气量</nobr>
                 </th>
+                <th>
+                  <nobr>期间售气金额</nobr>
+                </th>
                 <th>
                   <nobr>表具数量</nobr>
                 </th>
@@ -180,9 +186,15 @@
               <td style="text-align: center;">
                 <nobr>{{ row.f_oughtamount }}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{ row.f_oughtfee }}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{ row.f_pregas }}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{ row.f_collection }}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{ row.f_table_num }}</nobr>
               </td>
@@ -198,9 +210,18 @@
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               用气量:&emsp;{{ sumsmodel.f_oughtamount.toFixed(2) }}m³
             </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.toFixed(2) }}元
+            </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               售气量:&emsp;{{ sumsmodel.f_pregas.toFixed(2) }}m³
             </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.toFixed(2) }}元
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              表具数量:&emsp;{{ sumsmodel.f_table_num }}
+            </td>
           </tr>
         </table>
       </div>
@@ -246,7 +267,10 @@ export default {
         f_use_institution : 'this.model.f_use_institution'
       }, {
         f_oughtamount: 0,
-        f_pregas: 0
+        f_oughtfee: 0,
+        f_pregas: 0,
+        f_collection: 0,
+        f_table_num: 0
       }),
       gasproperties: [],
       show: false,
@@ -266,8 +290,9 @@ export default {
       sumExport: { 'f_oughtamount': '期间用气量', 'f_pregas': '期间售气量'},
       initres: {
         org: [this.$login.f.orgid],
+        slice_area: [],
       },
-      criteriaShow: false,
+      criteriaShow: true,
       userusetypes: [],
       useinstitutions: [],
       userusenatures: [],
@@ -340,6 +365,7 @@ export default {
       })
     },
     userTypeChange () {
+      console.log("======"+this.$refs.paged.$refs.cri.model.f_user_type)
       this.userusetypes = []
       this.userusenatures = []
       this.useinstitutions = []