sale-client 3.6.170 → 3.6.172

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [ serverRul, localUrl ] = ['http://61.240.138.248:8400', 'http://61.240.138.248:8400']
+const [ serverRul, localUrl ] = ['http://121.36.106.17:8400/', 'http://121.36.106.17:8400/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -20,6 +20,9 @@ var devConfig = {
       '/rs/file': {
         target: localUrl
       },
+      '/rs/logic/filemanage_fileSave': {
+        target: "http://127.0.0.1:4523/m1/719967-0-default"
+      },
       '/rs/downloadfile': {
         target: localUrl
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.170",
+  "version": "3.6.172",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/FilesManage/FileUserFiles.vue

@@ -666,7 +666,14 @@ let loadParamGem = async function (self) {
         this.rowData = obj
       },
       goChargeManage () {
-        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        try {
+          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        } catch (e) {
+        }
+        try {
+          window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+        } catch (e) {
+        }
       },
       async doCopy () {
         await this.$copyText(this.resdata)

package/src/components/common/userinfo_detail/UserBaseInfoNew.vue

@@ -336,7 +336,14 @@
         if (this.row.parentname === 'charge-manage') {
           this.$emit('cancel-re')
         } else {
-          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+          try {
+            this.$goto('charge-manage', {f: this.$login.f}, 'main')
+          } catch (e) {
+          }
+          try {
+            window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+          } catch (e) {
+          }
         }
       },
       openUser () {

package/src/filiale/ancheng/FilesManage/FileUserFiles.vue

@@ -660,7 +660,14 @@ let loadParamGem = async function (self) {
         this.rowData = obj
       },
       goChargeManage () {
-        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        try {
+          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        } catch (e) {
+        }
+        try {
+          window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+        } catch (e) {
+        }
       },
       async doCopy () {
         await this.$copyText(this.resdata)

package/src/filiale/chengtou/components/FilesManage/FileUserFiles.vue

@@ -655,7 +655,14 @@ let loadParamGem = async function (self) {
         this.rowData = obj
       },
       goChargeManage () {
-        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        try {
+          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        } catch (e) {
+        }
+        try {
+          window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+        } catch (e) {
+        }
       },
       async doCopy () {
         await this.$copyText(this.resdata)

package/src/filiale/dongguan/components/FilesManage/FileUserFiles.vue

@@ -673,7 +673,14 @@ export default {
       this.rowData = obj
     },
     goChargeManage () {
-      this.$goto('charge-manage', {f: this.$login.f}, 'main')
+      try {
+        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+      } catch (e) {
+      }
+      try {
+        window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+      } catch (e) {
+      }
     },
     async doCopy () {
       await this.$copyText(this.resdata)

package/src/filiale/dongguan/components/common/userinfo_detail/UserBaseInfoNew.vue

@@ -371,7 +371,14 @@
       async goChargeManage () {
         await this.$copyText(this.row.f_userinfo_code)
         this.$showAlert(`用户编号已复制到剪切板！`, 'success', 2000)
-        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        try {
+          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        } catch (e) {
+        }
+        try {
+          window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+        } catch (e) {
+        }
       },
       openUser () {
         this.$showMessage(`是否需要给用户进行开户？`, ['confirm', 'cancel']).then(async (res) => {

package/src/filiale/ganquan/components/FilesManage/FileUserFiles.vue

@@ -690,7 +690,14 @@ let loadParamGem = async function (self) {
         this.rowData = obj
       },
       goChargeManage () {
-        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        try {
+          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        } catch (e) {
+        }
+        try {
+          window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+        } catch (e) {
+        }
       },
       async doCopy () {
         await this.$copyText(this.resdata)

package/src/filiale/gehua/FileUserFiles.vue

@@ -643,7 +643,14 @@ let loadParamGem = async function (self) {
         this.rowData = obj
       },
       goChargeManage () {
-        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        try {
+          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        } catch (e) {
+        }
+        try {
+          window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+        } catch (e) {
+        }
       },
       async doCopy () {
         await this.$copyText(this.resdata)

package/src/filiale/gehua/UserBaseInfoNew.vue

@@ -324,7 +324,14 @@
       async goChargeManage () {
         await this.$copyText(this.row.f_userinfo_code)
         this.$showAlert(`用户编号已复制到剪切板！`, 'success', 2000)
-        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        try {
+          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        } catch (e) {
+        }
+        try {
+          window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+        } catch (e) {
+        }
       },
       openUser () {
         this.$showMessage(`是否需要给用户进行开户？`, ['confirm', 'cancel']).then(async (res) => {

package/src/filiale/haile/UserBaseInfoNew.vue

@@ -339,7 +339,14 @@
         if (this.row.parentname === 'charge-manage') {
           this.$emit('cancel-re')
         } else {
-          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+          try {
+            this.$goto('charge-manage', {f: this.$login.f}, 'main')
+          } catch (e) {
+          }
+          try {
+            window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+          } catch (e) {
+          }
         }
       },
       openUser () {

package/src/filiale/haile/sale.js

@@ -24,4 +24,6 @@ export default function () {
   Vue.component('user-meterinfodetail', (resolve) => { require(['./leftview/meterinfodetail'], resolve) })
   // 欠费查询
   Vue.component('sale-arrears-query', (resolve) => { require(['./machineHandManage/ArrearsQuery'], resolve) })
+  // 机表查询
+  Vue.component('un-handplan-query', (resolve) => { require(['./unHandplanQuery'], resolve) })
 }

package/src/filiale/haile/unHandplanQuery.vue

@@ -0,0 +1,739 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search" v-if="!show">
+      <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 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 HH:mm:ss'"
+                              :show-reset-button="true">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&ensp;</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="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 = '{}'" placeholder="客户名称">
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                sqlurl="rs/logic/saleExport" sql-name="unsalehandplanQuery" 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">
+                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes"  :show-component="['company','department','operator']" v-ref:sel></res-select-group>
+
+
+                <!--<div class="col-sm-2 form-group">-->
+                  <!--<label class="font_normal_body">小区名称</label>-->
+                  <!--<v-select :value.sync="model.f_residential_area"-->
+                            <!--class="select_list select"-->
+                            <!--enter-push-->
+                            <!--multiple = "true"-->
+                            <!--v-model="model.f_residential_area"-->
+                            <!--style="width: 60%"-->
+                            <!--condition="f_residential_area in {}"-->
+                            <!--:options='$parent.$parent.residentialArea' placeholder='选择小区'-->
+                            <!--close-on-select>-->
+
+                  <!--</v-select>-->
+                <!--</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_address"
+                         condition="f_address like '%{}%'" placeholder='客户地址'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户类型</label>
+                  <v-select :value.sync="model.f_user_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.pricetype" v-model="model.pricetype"-->
+                            <!--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_name"-->
+                            <!--v-model="model.f_price_name"-->
+                            <!--:options="$parent.$parent.getPricenames"-->
+                            <!--condition="f_price_name = '{}'"-->
+                            <!--close-on-select></v-select>-->
+                <!--</div>-->
+
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气表品牌</label>
+                  <v-select :value.sync="model.f_meter_brand" multiple
+                            v-model="model.f_meter_brand"
+                            :options='$parent.$parent.meterbrands' placeholder='请选择'
+                            condition="f_meter_brand in {}"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">期间用气量</label>
+                  <input type="text" style="width:30%" class="input_search" title="大于等于"
+                         v-model="model.f_oughtamount_big" condition="f_oughtamount >= {}" placeholder='大于等于'>
+                  <input type="text" style="width:30%" class="input_search" title="小于等于"
+                         v-model="model.f_oughtamount_small" condition="f_oughtamount <= {}" placeholder='小于等于'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">期间用气金额</label>
+                  <input type="text" style="width:30%" class="input_search" title="大于等于"
+                         v-model="model.f_oughtfee_big" condition="f_oughtfee >= {}" placeholder='大于等于'>
+                  <input type="text" style="width:30%" class="input_search" title="小于等于"
+                         v-model="model.f_oughtfee_small" condition="f_oughtfee <= {}" placeholder='小于等于'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&ensp;表&ensp;号&ensp;&ensp;</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber = '{}' " placeholder="表号">
+                </div>
+
+                <!--表册片区-->
+                <!--<div class="col-sm-2 form-group">-->
+                  <!--<label class="font_normal_body">表册片区</label>-->
+                  <!--<v-select :value.sync="model.f_book_slice_area" v-model="model.f_book_slice_area"-->
+                            <!--@change="$parent.$parent.inputtorchange"-->
+                            <!--multiple-->
+                            <!--:options='$parent.$parent.bookSlice' placeholder='片区/表册'-->
+                            <!--style="width:60%"-->
+                            <!--close-on-select-->
+                            <!--condition="f_book_slice_area in {}"></v-select>-->
+                <!--</div>-->
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">抄&ensp;表&ensp;册</label>
+                  <v-select :value.sync="model.f_meter_book" v-model="model.f_meter_book"
+                            :options='$parent.$parent.meterbooks' placeholder='抄表册'
+                            style="width:60%"
+                            multiple
+                            close-on-select
+                            condition="f_meter_book_num in {}"></v-select>
+                </div>
+
+              </div>
+            </div>
+          </criteria>
+
+          <data-grid :model="model" partial='list' class="list_area table_sy"  v-ref:grid :classname="$parent.classname">
+            <template partial='head'>
+              <tr>
+                <th>
+                  <nobr>客户编号</nobr>
+                </th>
+                <th>
+                  <nobr>客户名称</nobr>
+                </th>
+                <th>
+                  <nobr>客户地址</nobr>
+                </th>
+                <th>
+                  <nobr>客户状态</nobr>
+                </th>
+                <th>
+                  <nobr>气表状态</nobr>
+                </th>
+                <th>
+                  <nobr>气表类型</nobr>
+                </th>
+                <th>
+                  <nobr>客户类型</nobr>
+                </th>
+                <th>
+                  <nobr>用户性质</nobr>
+                </th>
+                <th>
+                  <nobr>气表品牌</nobr>
+                </th>
+                <th>
+                  <nobr>表号</nobr>
+                </th>
+                <th>
+                  <nobr>抄表册名称</nobr>
+                </th>
+                <th>
+                  <nobr>册内排序</nobr>
+                </th>
+                <th>
+                  <nobr>开户时间</nobr>
+                </th>
+                <th>
+                  <nobr>期间初次上报日期</nobr>
+                </th>
+                <th>
+                  <nobr>期间最后上报日期</nobr>
+                </th>
+                <th>
+                  <nobr>期间上报次数</nobr>
+                </th>
+
+                <th>
+                  <nobr>期间用气量</nobr>
+                </th>
+                <th>
+                  <nobr>期间用气金额</nobr>
+                </th>
+                <th>
+                  <nobr>机表未抄期数</nobr>
+                </th>
+                <th>
+                  <nobr>物联未报天数</nobr>
+                </th>
+                <th>
+                  <nobr>部门</nobr>
+                </th>
+                <th>
+                  <nobr>公司</nobr>
+                </th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;">
+                <nobr>
+                  <span @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_userinfo_code}}</a></span></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_address}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_state}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_table_state}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_classify}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gasproperties}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_brand}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meternumber}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_book_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_book_sort}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_open_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_hand_min_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_hand_max_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_number}}</nobr>
+              </td>
+              <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_hand_month}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_webhand_day}}</nobr>
+              </td>
+
+              <td style="text-align: center;">
+                <nobr>{{row.f_depname}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_orgname}}</nobr>
+              </td>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+
+
+      </div>
+    </div>
+    <div class="flex" v-if="show">
+      <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+    </div>
+    <work-busy :is-busy="iswork" v-show="iswork"></work-busy>
+  </div>
+</template>
+
+<script>
+  import {PagedList, HttpResetClass} from 'vue-client'
+
+
+  let readySomething = async function (self) {
+    // 加载抄表册
+
+    await self.$LoadParams.loadMeterBook(self.f_filialeid)
+    self.loadMeterBooks()
+    self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
+    await self.$LoadParams.loadParam()
+    self.initParams()
+    console.log('开始查询')
+  }
+  export default {
+    props: ['data'],
+    title: '未抄查询',
+    data () {
+      return {
+        iswork: false,
+        other: [],
+        footer: [],
+        data: {},
+        model: new PagedList('rs/sql/unsalehandplanQuery', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}),
+        initres: {
+          org: [this.$login.f.orgid],
+          dep: [],
+          user: []
+        },
+        show: false,
+        rowdata: {},
+        criteriaShow: false,
+        residentialArea: [],
+        orgCondtionStr: '',
+        modelval: [],
+        gasproperties: [],
+        inputtouPerson: [],
+        meterbrands: [],
+        printshow: false,
+        f_filialeid: this.$login.f.f_orgid,
+        all: false,
+        fields: {},
+        thead: '',
+        tfoot: '',
+        showupload: false,
+        selected: {},
+
+        // 下拉框
+
+        // 合计数据
+        sumsmodel: {},
+        defaultfield: [],
+        config: {
+          defaultPrint1: [
+            'f_userinfo_code', 'f_user_name', 'f_user_phone', 'f_pregas', 'f_preamount', 'f_collection', 'f_balance', 'f_curbalance', 'f_idnumber'
+          ],
+          defaultPrint: ['f_userinfo_code', 'f_address', 'f_user_name', 'f_meternumber'],
+          excelHeaders: {'f_userinfo_code': '客户编号',
+            'f_user_name': '客户名称',
+            'f_address': '客户地址',
+            'f_user_state': '客户状态',
+            'f_table_state': '表具状态',
+            'f_meter_classify': '气表类型',
+            'f_user_type': '客户类型',
+            'f_gasproperties': '用户性质',
+            'f_meter_brand': '气表品牌',
+            'f_meternumber': '表号',
+            'f_book_name': '抄表册名称',
+            'f_meter_book_sort': '册内排序',
+            'f_open_date': '开户时间',
+            'f_hand_min_date': '期间初次上报日期',
+            'f_hand_max_date': '期间最后上报日期',
+            'f_number': '期间上报次数',
+            'f_oughtamount': '期间用气量',
+            'f_oughtfee': '期间用气金额',
+            'f_hand_month': '机表未抄期数',
+            'f_webhand_day': '物联未报天数',
+            'f_depname': '部门',
+            'f_orgname': '公司'
+          }
+        },
+        batchmoneyShow: false,
+        prices: [],
+        bgl: [{label: '全部', value: ''}, {label: '有', value: '1'}, {label: '无', value: '0'}],
+        meterbooks: [{label: '全部', value: ''}],  // 抄表册
+        tempfalg: false,
+        lastorgstr: '',
+        allorgid: [],
+        inputtores: [{label: '全部', value: ''}],  // 抄表员
+        // 表册片区
+        bookSlice: [{label: '全部', value: ''}],
+        imgshow: false,
+        imgfilename: '',
+        percent: 0,
+        progressShow: false,
+        uuida: '',
+        timer: '',
+        condition: ' 1 = 1'
+      }
+    },
+    ready () {
+      this.getaddress()
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      loadMeterBooks () {
+        this.meterbooks = [...this.meterbooks, ...this.$GetSaleParam.getMeterBooks()]
+      },
+      progressclose () {
+        this.progressShow = false
+        if (this.timer != null) {
+          clearInterval(this.timer)
+        }
+      },
+      async initmeterbook (orgstr) {
+        if (orgstr == null) {
+          orgstr = this.f_filialeid
+        }
+        // 获取新的抄表册,先去清理所有的抄表册
+        this.$GetSaleParam.meterbooks = []
+      // 开始加载新的抄表册
+        await this.$LoadParams.loadMeterBook(orgstr)
+        this.meterbooks = [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
+      },
+      // 初始化片区
+      async initSlice (val) {
+        if (val) {
+          let getAllArea = await this.$resetpost('/rs/search', {
+            source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
+            userid: this.$login.f.id
+          }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
+          let arr = getAllArea.data.filter((res) => {
+            return res.parentid == val
+          })
+          this.bookSlice = []
+          arr.forEach((res) => {
+            this.bookSlice.push({label: res.name, value: res.name})
+          })
+        }
+      },
+      // 表册片区和抄表册关联
+      async inputtorchange () {
+        this.$set('$refs.paged.$refs.cri.model.f_meter_book', [])
+        let val2 = this.$refs.paged.$refs.cri.model.f_book_slice_area
+        if ((val2.length > 0)) {
+          let condition = ` 1=1 and f_orgid ='${this.f_filialeid}' and f_book_state='有效' `
+          let aaa = '('
+          val2.forEach((item) => {
+            aaa = aaa + `'${item}',`
+          })
+          aaa = aaa + `'')`
+          condition = condition + ` and f_book_slice_area in ${aaa} `
+          let param = {
+            items: '*',
+            tablename: 't_meter_book',
+            condition: condition,
+            orderitem: 'id'
+          }
+          let getMeterBooks = await this.$resetpost('rs/sql/singleTable_OrderBy', {data: param}, {resolveMsg: null, rejectMsg: '获取营收参数出错！！！'})
+          if (getMeterBooks.data) {
+            if (getMeterBooks.data.length > 0) {
+              let rs = []
+              getMeterBooks.data.forEach((item) => {
+                let temp = {
+                  label: item.f_book_name,
+                  value: item.id
+                }
+                rs.push(temp)
+              })
+              this.meterbooks = [{label: '全部', value: ''}, ...rs]
+            } else {
+              this.meterbooks = [{label: '全部', value: ''}]
+            }
+          }
+        } else {
+          this.meterbooks = [{label: '全部', value: ''}]
+          this.initmeterbook()
+        }
+      },
+
+      async getinputtores () {
+        // 获取抄表员
+        let rs = []
+        if (this.$login.f.f_gasman.length > 0) {
+          for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
+            let temp = {
+              label: this.$login.f.f_gasman[i].name,
+              value: this.$login.f.f_gasman[i].name
+            }
+            rs.push(temp)
+          }
+        }
+        this.inputtores = [{label: '全部', value: ''}, ...rs]
+        this.inputtores.push({label: '微信公众号', value: '微信公众号'})
+      },
+      async updateParams () {
+        await this.$LoadParams.loadParam(this.f_filialeid)
+        this.inputtores = []
+        this.inputtores.push({label: '全部', value: ''})
+        this.initSlice(this.f_filialeid)
+        if (this.allorgid != null) {
+          this.allorgid.forEach((res) => {
+            this.inputtores = this.inputtores.concat(this.$GetSaleParam.getresinputtor(res))
+          })
+        }
+        this.initParams(this.f_filialeid)
+      },
+      imgclose () {
+        this.imgshow = false
+      },
+      imgShow (val) {
+        this.imgfilename = `rs/image/file/` + val
+        this.imgshow = true
+      },
+      initParams () {
+        // 初始化气表品牌
+        let brandArr = []
+        this.$GetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+          temp.label = item.label
+          temp.value = item.label
+          brandArr.push(temp)
+        })
+        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+        // 初始化气表价格
+        this.prices = this.$GetSaleParam.getPrice(this.$login.f.orgid)
+      },
+      async  getaddress () {
+        let HttpReset = new HttpResetClass()
+        var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
+          data: {
+            condition: `1=1 and s.f_orgid = '${this.$login.f.orgid}'`
+          }
+        }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
+        console.log('小区', data)
+        let house = [{label: '全部', value: ''}]
+        for (let row of data.data) {
+          house.push({label: row.f_residential_area, value: row.f_residential_area})
+        }
+        this.residentialArea = house
+      },
+      Fileinput () {
+        this.batchmoneyShow = true
+      },
+      search () {
+        this.$refs.paged.$refs.cri.search()
+      },
+      cancel () {
+        this.show = false
+      },
+      selfSearch (args) {
+        if (this.data) {
+          this.$parent.$parent.$parent.data.startDate = this.$refs.paged.$refs.cri.model.startDate
+          this.$parent.$parent.$parent.data.endDate = this.$refs.paged.$refs.cri.model.endDate
+        }
+        args.condition = `${args.condition}` + this.orgCondtionStr
+        this.condition = args.condition
+        this.model.search(args.condition, args.model)
+      },
+      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] = []
+        })
+        this.$refs.paged.$refs.cri.model.f_meter_classify = []
+      },
+      show () {
+        this.criteriaShow = true
+      },
+      hidden () {
+        this.criteriaShow = !this.criteriaShow
+      },
+      async getRes (condition, obj) {
+        console.log('condition:----------', condition)
+        console.log('obj:----------', obj)
+        this.orgCondtionStr = condition
+      },
+      stamp () {
+        this.all = false
+        // 默认选择要打印的列
+        this.modelval = this.defaultPrint1
+        this.fields = this.getfield
+        this.printshow = true
+        this.put()
+      },
+      put () {
+        // 对Modelval进行排序
+        this.sortModelval()
+        this.thead = `<tr><th colspan=${this.modelval.length}>抄表查询统计报表</th></tr><tr>`
+        for (let key of this.modelval) {
+          this.thead += '<th>' + this.fields[key] + '</th>'
+        }
+        this.thead += '</tr>'
+      },
+      print () {
+        this.$refs.print.PrintAsFile()
+        this.printshow = false
+      },
+      dealmsg (val) {
+        this.rowdata = val
+        this.show = true
+        val.model = this.model.model
+        this.$dispatch('deal-msg', val)
+      },
+      close () {
+        this.printshow = false
+        this.all = false
+      },
+
+      userTypeChange () {
+        this.gasproperties = []
+        if (this.$refs.paged.$refs.cri.model !== null) {
+          this.$refs.paged.$refs.cri.model.f_gasproperties = ''
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+        } else {
+          this.gasproperties = [{label: '全部', value: ''}]
+        }
+      },
+      // 对选择的列进行排序
+      sortModelval () {
+        let sortModel = []
+        Object.keys(this.fields).forEach((key) => {
+          if (this.modelval.includes(key)) {
+            sortModel.push(key)
+          }
+        })
+        this.modelval = sortModel
+      }
+    },
+    watch: {
+      'model.rows' (val) {
+        if (val.length === 0) {
+          this.sumsmodel = {}
+        }
+      },
+      'all' (val) {
+        if (val) {
+          this.modelval = this.bodyData
+        } else {
+          this.modelval = this.defaultPrint1
+          this.put()
+        }
+      },
+      'modelval.length' () {
+        this.put()
+      },
+    },
+    computed: {
+      banklist () {
+        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.condition
+        }
+      },
+      getfield () {
+        return this.config.excelHeaders
+      },
+      usertypes () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
+      accountsState () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('下账状态')]
+      },
+      meterstate () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表状态')]
+      },
+      handstate () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('表单状态')]
+      },
+      // inputtor() {
+      //   return [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表员')]
+      // },
+      pricetypes () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
+      },
+      getPricenames () {
+        let f_filialeid = this.f_filialeid
+        let result = []
+        this.$GetSaleParam.prices.forEach((item) => {
+          if (item.f_state === '有效' && f_filialeid == item.f_filialeid) {
+            let value = {
+              label: item.f_price_name,
+              value: item
+            }
+            result.push(value)
+          }
+        })
+        return Array.from(new Set(result))
+      },
+      inputtores () {
+        // 获取抄表员
+        console.log('获取抄表员', this.$login.f)
+        let rs = []
+        if (this.$login.f.f_gasman.length > 0) {
+          for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
+            let temp = {
+              label: this.$login.f.f_gasman[i].name,
+              value: this.$login.f.f_gasman[i].name
+            }
+            rs.push(temp)
+          }
+        }
+        return [...rs]
+      },
+      whetherPay () {
+        return [{label: '全部', value: ''}, {label: '是', value: '是'}, {label: '否', value: '否'}]
+      }
+
+    },
+    events: {
+    }
+  }
+</script>

package/src/filiale/huayin/FileUserFiles.vue

@@ -643,7 +643,14 @@ let loadParamGem = async function (self) {
         this.rowData = obj
       },
       goChargeManage () {
-        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        try {
+          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        } catch (e) {
+        }
+        try {
+          window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+        } catch (e) {
+        }
       },
       async doCopy () {
         await this.$copyText(this.resdata)

package/src/filiale/kelai/FileUserFilesKeLai.vue

@@ -663,7 +663,14 @@ let loadParamGem = async function (self) {
         this.rowData = obj
       },
       goChargeManage () {
-        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        try {
+          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        } catch (e) {
+        }
+        try {
+          window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+        } catch (e) {
+        }
       },
       async doCopy () {
         await this.$copyText(this.resdata)

package/src/filiale/konggang/FileUserFiles.vue

@@ -629,7 +629,14 @@ let loadParamGem = async function (self) {
         this.rowData = obj
       },
       goChargeManage () {
-        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        try {
+          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        } catch (e) {
+        }
+        try {
+          window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+        } catch (e) {
+        }
       },
       async doCopy () {
         await this.$copyText(this.resdata)

package/src/filiale/ningjin/FileUserFiles.vue

@@ -643,7 +643,14 @@ let loadParamGem = async function (self) {
         this.rowData = obj
       },
       goChargeManage () {
-        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        try {
+          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        } catch (e) {
+        }
+        try {
+          window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+        } catch (e) {
+        }
       },
       async doCopy () {
         await this.$copyText(this.resdata)

package/src/filiale/qianneng/components/common/userinfo_detail/UserBaseInfoNew.vue

@@ -347,7 +347,14 @@
       async goChargeManage () {
         await this.$copyText(this.row.f_userinfo_code)
         this.$showAlert(`用户编号已复制到剪切板！`, 'success', 2000)
-        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        try {
+          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        } catch (e) {
+        }
+        try {
+          window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+        } catch (e) {
+        }
       },
       openUser () {
         this.$showMessage(`是否需要给用户进行开户？`, ['confirm', 'cancel']).then(async (res) => {

package/src/filiale/qingjian/FileUserFiles.vue

@@ -670,7 +670,14 @@ let loadParamGem = async function (self) {
         this.rowData = obj
       },
       goChargeManage () {
-        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        try {
+          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        } catch (e) {
+        }
+        try {
+          window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+        } catch (e) {
+        }
       },
       async doCopy () {
         await this.$copyText(this.resdata)

package/src/filiale/shanxian/components/FilesManage/FileUserFiles.vue

@@ -640,7 +640,14 @@ let loadParamGem = async function (self) {
         this.rowData = obj
       },
       goChargeManage () {
-        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        try {
+          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        } catch (e) {
+        }
+        try {
+          window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+        } catch (e) {
+        }
       },
       async doCopy () {
         await this.$copyText(this.resdata)

package/src/filiale/shexian/FilesManage/FileUserFiles.vue

@@ -681,7 +681,14 @@ let loadParamGem = async function (self) {
         this.rowData = obj
       },
       goChargeManage () {
-        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        try {
+          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        } catch (e) {
+        }
+        try {
+          window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+        } catch (e) {
+        }
       },
       async doCopy () {
         await this.$copyText(this.resdata)

package/src/filiale/shexian/UserBaseInfoNew.vue

@@ -336,7 +336,14 @@
         if (this.row.parentname === 'charge-manage') {
           this.$emit('cancel-re')
         } else {
-          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+          try {
+            this.$goto('charge-manage', {f: this.$login.f}, 'main')
+          } catch (e) {
+          }
+          try {
+            window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+          } catch (e) {
+          }
         }
       },
       openUser () {

package/src/filiale/wenxi/FileUserFiles.vue

@@ -663,7 +663,14 @@ let loadParamGem = async function (self) {
         this.rowData = obj
       },
       goChargeManage () {
-        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        try {
+          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        } catch (e) {
+        }
+        try {
+          window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+        } catch (e) {
+        }
       },
       async doCopy () {
         await this.$copyText(this.resdata)

package/src/filiale/wuan/FileUserFiles.vue

@@ -639,7 +639,14 @@ let loadParamGem = async function (self) {
         this.rowData = obj
       },
       goChargeManage () {
-        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        try {
+          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        } catch (e) {
+        }
+        try {
+          window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+        } catch (e) {
+        }
       },
       async doCopy () {
         await this.$copyText(this.resdata)

package/src/filiale/xinkang/UserBaseInfoNew.vue

@@ -323,7 +323,14 @@
       async goChargeManage () {
         await this.$copyText(this.row.f_userinfo_code)
         this.$showAlert(`用户编号已复制到剪切板！`, 'success', 2000)
-        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        try {
+          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        } catch (e) {
+        }
+        try {
+          window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+        } catch (e) {
+        }
       },
       openUser () {
         this.$showMessage(`是否需要给用户进行开户？`, ['confirm', 'cancel']).then(async (res) => {

package/src/filiale/yuansheng/UserBaseInfoNew.vue

@@ -323,7 +323,14 @@
         if (this.row.parentname === 'charge-manage') {
           this.$emit('cancel-re')
         } else {
-          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+          try {
+            this.$goto('charge-manage', {f: this.$login.f}, 'main')
+          } catch (e) {
+          }
+          try {
+            window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+          } catch (e) {
+          }
         }
       },
       openUser () {

package/src/filiale/zhongsheng/charge/UserBaseInfoNew.vue

@@ -328,7 +328,14 @@
       async goChargeManage () {
         await this.$copyText(this.row.f_userinfo_code)
         this.$showAlert(`用户编号已复制到剪切板！`, 'success', 2000)
-        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        try {
+          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        } catch (e) {
+        }
+        try {
+          window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+        } catch (e) {
+        }
       },
       openUser () {
         this.$showMessage(`是否需要给用户进行开户？`, ['confirm', 'cancel']).then(async (res) => {

package/src/filiale/zhongyi/FileUserFiles.vue

@@ -642,7 +642,14 @@ let loadParamGem = async function (self) {
         this.rowData = obj
       },
       goChargeManage () {
-        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        try {
+          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        } catch (e) {
+        }
+        try {
+          window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+        } catch (e) {
+        }
       },
       async doCopy () {
         await this.$copyText(this.resdata)