manage-client 3.3.246 → 3.3.248

package/package.json

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

package/src/components/SellReport/xihu/XHManageSummary.vue

@@ -0,0 +1,179 @@
+<template>
+  <div class="basic-main" style="height: 100%">
+    <criteria-paged :model="model" :pager='false' v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <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" for="startDate">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group" >
+              <label  class="font_normal_body" for="endDate">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres"  :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+          </div>
+          <div class="span" style = "float:right;">
+            <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
+            <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
+            <report-excel id='gasprice'></report-excel>
+          </div>
+        </div>
+      </criteria>
+      <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto">
+          <thead>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">收费结账报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;<br/>
+              <!--打印时间：{{{$parent.printTime}}}-->
+              打印时间：{{$parent.printTime}}
+              <!--收费员：{{// $parent.operatorname}}-->
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              <div>
+                <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
+                <span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
+                <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.operatorname">人员：{{$parent.operatorname}}</span>
+              </div>
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <td :colspan='$parent.spans' class="noborder">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <tfoot>
+<!--          <tr style="text-align: left">-->
+<!--            <th :colspan='Math.floor($parent.spans/3)'>财务审核：</th>-->
+<!--            <th :colspan='Math.floor($parent.spans/3)'>收款审核：</th>-->
+<!--            <th :colspan='Math.floor($parent.spans/3)'>收款员：</th>-->
+<!--          </tr>-->
+          </tfoot>
+        </table>
+        {{{ $parent.reportStr}}}
+      </div>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import { DataModel } from 'vue-client'
+import co from 'co'
+export default {
+  title: '收费结账报表',
+  props: ['data'],
+  data () {
+    return {
+      printTime: this.$login.toStandardTimeString(),
+      depresid: [],
+      userresid: [],
+      f_orgid: this.$login.f.orgid,
+      f_depid: this.$login.f.depids,
+      // f_operatorid: this.$login.f.id,
+      operatorid: [],
+      depid: [],
+      orgname: '',
+      depname: '',
+      criteriaShow: false,
+      operatorname: '',
+      orgCondtionStr: '1=1',
+      f_user_type: '',
+      f_state: ['有效'],
+      model: new DataModel('api/af-revenue/report/xh_sell_report', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      resshow: ['company', 'department', 'operator'],
+      spans: 0,
+      initres: {
+        org: [this.$login.f.orgid],
+        dep: [],
+        user: []
+      }
+    }
+  },
+  ready () {
+    this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+    this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+  },
+  methods: {
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch (args) {
+      this.printTime = this.$login.toStandardTimeString()
+      let orgcondition = '1=1'
+      let orgstr = this.orgCondtionStr
+      orgcondition = orgcondition + orgstr
+      this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+      this.$refs.paged.search(args)
+    },
+
+    hidden () {
+      this.criteriaShow = !this.criteriaShow
+    },
+    getRes (condition, obj) {
+      this.orgCondtionStr = condition
+      this.orgname = obj.orgnames[0]
+      this.depname = obj.depnames[0]
+      this.operatorname = obj.operatornames[0]
+    },
+    getdep (obj, val) {
+      this.depname = val[0]
+      this.userresid = obj
+      this.f_depid = obj
+    },
+    getuser ( obj, val) {
+      this.operatorname = val[0]
+      this.f_operatorid = obj
+    }
+  },
+  watch: {
+    'model.data' (val) {
+      let len=0
+      let a=val.split('</tr>')
+      for(let i=0;i<a.length;i++){
+        if(a[i].split('</td>').length-1>len){
+          len=a[i].split('</td>').length-1
+        }
+      }
+      this.spans = len
+    }
+  },
+  computed: {
+    charge_state () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
+    },
+    user_type () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+    }
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

package/src/components/sale/businessquery/AccountQuery/ExpectGasList.vue

@@ -14,7 +14,7 @@
                               :value.sync="model.startDate"
                               :format="'yyyy-MM-dd HH:mm:ss'"
                               :show-reset-button="true"
-                              condition="f_hand_date >= '{}'">
+                              condition="f_input_date >= '{}'">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -24,7 +24,7 @@
                               :value.sync="model.endDate"
                               :format="'yyyy-MM-dd HH:mm:ss'"
                               :show-reset-button="true"
-                              condition="f_hand_date <= '{}'">
+                              condition="f_input_date <= '{}'">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group ">

package/src/components/webmeter/newwebmeter/NewException/TotalExceptionByMeter.vue

@@ -367,8 +367,8 @@
           user:[]
         },
         condition: '1=1',
-        org:`u.${[this.$login.f.orgid]}`,
-        orgCondtionStr: ` and u.f_orgid = ${this.$login.f.orgid}`
+        org:`${[this.$login.f.orgid]}`,
+        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`
       }
     },
     ready() {

package/src/filiale/WEINAN/UserLostContactAnalysis.vue

@@ -60,6 +60,16 @@
               <right-tree @re-res="$parent.$parent.getorg"
                           :initresid='$parent.$parent.org'></right-tree>
             </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body" for="dep" >部&emsp;&emsp;门</label>
+                <res-select id="dep" restype='department' style="width: 60%"
+                            is-mul="false"
+                            @res-select="$parent.$parent.getdep"
+                            :parentresid="$parent.$parent.depresid"
+                            :initresid='$parent.$parent.depid' >
+                </res-select>
+
+              </div>
             <div class="col-sm-2 form-group">
               <label class="font_normal_body">客户类型</label>
               <v-select style="width:60%" id="f_user_type"
@@ -379,6 +389,14 @@
         Warningstyles: [
           {label: '全部', value: ''}
         ],
+        depid: [],
+        depresid: [],
+        queryData: {
+          f_orgid: [],
+          f_depid: [],
+          f_operatorid: [],
+          f_payment: []
+        },
         styles:false,
         org:[this.$login.f.orgid],
         orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`,
@@ -401,6 +419,23 @@
     },
 
     methods: {
+      getdep(obj, val) {
+        this.orgCondtionStr = ""
+        this.depname = val[0]
+        this.userresid = obj
+        this.queryData.f_depid = obj
+        console.log(this.queryData.f_depid)
+        if (obj.length > 0) {
+          this.orgCondtionStr += " and f_depid in " + plugin.convertToIn(obj)
+        }
+        if (this.depresid && this.depresid.length > 0) {
+          this.orgCondtionStr = " and f_orgid in " + plugin.convertToIn(this.depresid) + this.orgCondtionStr
+        } else {
+          this.orgCondtionStr = " and f_orgid = " + this.$login.f.orgid + this.orgCondtionStr
+        }
+
+        console.log(this.orgCondtionStr);
+      },
       userUseInstitutionChange () {
         this.userusenatures = []
         this.$refs.paged.$refs.cri.model.f_user_usenature = ''
@@ -485,12 +520,14 @@
         this.model.search(args.condition, args.model)
       },
       getorg(obj) {
-        if (obj.resids.length>0) {
+        if (obj.resids.length > 0) {
+          this.depresid = obj.resids
           this.orgCondtionStr = " and f_orgid in " + plugin.convertToIn(obj.resids)
-        }else
-        {
+        } else {
+          this.depresid = obj.resids
           this.orgCondtionStr = " and f_orgid = " + this.$login.f.orgid
         }
+        console.log(this.orgCondtionStr);
       },
       clearmsg() {
         this.$refs.paged.$refs.cri.model = {}

package/src/filiale/qingtongxia/NewWebMeterHandPlan.vue

@@ -665,7 +665,7 @@
     },
     computed: {
       getCondition() {
-        let condition=this.$refs.paged.$refs.criteria.condition + this.orgCondtionStr
+        let condition=this.$refs.paged.$refs.criteria.condition + `and ui.f_orgid in ${this.orgCondtionStr}`
         return {
           condition: condition
         }

package/src/filiale/zhongyi/CollectManage.vue

@@ -0,0 +1,164 @@
+<template>
+  <tab-button v-ref:list :active="-1">
+    <tabs header="欠费查询" v-if="permission('欠费查询')">
+      <arrears-query v-if="show.includes('欠费查询')"></arrears-query>
+    </tabs>
+    <tabs header="非收费业务查询" v-if="permission('非收费业务查询')">
+      <no-business-query v-if="show.includes('非收费业务查询')"  @deal-msg="dealMsg"></no-business-query>
+    </tabs>
+    <tabs header="小区综合查询" v-if="!newWebHand&&permission('小区综合查询')">
+      <area-general-query v-if="show.includes('小区综合查询')"  @deal-msg="dealMsg"></area-general-query>
+    </tabs>
+    <tabs header="小区综合查询" v-if="newWebHand&&permission('小区综合查询')">
+      <new-area-general-query v-if="show.includes('小区综合查询')"  @deal-msg="dealMsg"></new-area-general-query>
+    </tabs>
+    <tabs header="小区收费查询" v-if="permission('小区收费查询')">
+      <area-charge-query v-if="show.includes('小区收费查询')"  @deal-msg="dealMsg"></area-charge-query>
+    </tabs>
+    <tabs header="小区汇总（机表）" v-if="permission('小区汇总（机表）')">
+      <residential-query v-if="show.includes('小区汇总（机表）')"  @deal-msg="dealMsg"></residential-query>
+    </tabs>
+    <tabs header="小区汇总（卡表）" v-if="permission('小区汇总（卡表）')">
+      <residential-card-query v-if="show.includes('小区汇总（卡表）')"  @deal-msg="dealMsg" ></residential-card-query>
+    </tabs>
+    <!--<tabs header="小区欠费汇总（机表）" v-if="permission('小区欠费汇总（机表）')">-->
+      <!--<residential-arrears-query v-if="show.includes('小区欠费汇总（机表）')"  @deal-msg="dealMsg"></residential-arrears-query>-->
+    <!--</tabs>-->
+    <tabs header="收费员汇总表" v-if="permission('收费员汇总表')">
+      <sell-people-query v-if="show.includes('收费员汇总表')" @deal-msg="dealMsg"></sell-people-query>
+    </tabs>
+    <tabs header="分公司汇总表" v-if="permission('分公司汇总表')">
+      <sell-orgname-query v-if="show.includes('分公司汇总表')"  @deal-msg="dealMsg"></sell-orgname-query>
+    </tabs>
+    <tabs header="抄表员统计" v-if="permission('抄表员统计')">
+      <hand-people-query v-if="show.includes('抄表员统计')"  @deal-msg="dealMsg"></hand-people-query>
+    </tabs>
+    <!--<tabs header="开户查询" v-if="permission('开户查询')">-->
+      <!--<new-account-query v-if="show == '开户查询'"  @deal-msg="dealMsg"></new-account-query>-->
+    <!--</tabs>-->
+    <tabs header="用气查询" v-if="permission('用气查询')">
+      <fmygas-query v-if="show.includes('用气查询')"  @deal-msg="dealMsg"></fmygas-query>
+    </tabs>
+    <tabs header="物联网用气查询" v-if="newWebHand && permission('用气查询')">
+      <newfmygas-query v-if="show.includes('物联网用气查询')"  @deal-msg="dealMsg"></newfmygas-query>
+    </tabs>
+    <tabs header="气费回收率" v-if="permission('气费回收率')">
+      <hand-rate-query v-if="show.includes('气费回收率')"  @deal-msg="dealMsg"></hand-rate-query>
+    </tabs>
+    <tabs header="收费抄表" v-if="permission('收费抄表')">
+      <selling-hand v-if="show.includes('收费抄表')" @deal-msg="dealMsg"></selling-hand>
+    </tabs>
+    <tabs header="月用气状况" v-if="permission('月用气状况')">
+      <month-gas-query v-if="show.includes('月用气状况')"  @deal-msg="dealMsg"></month-gas-query>
+    </tabs>
+    <tabs header="用户余额分析" v-if="permission('用户余额分析')">
+      <user-sell-head-detail v-if="show.includes('用户余额分析')" @deal-msg="dealMsg"></user-sell-head-detail>
+    </tabs>
+    <!--<tabs header="年度月份用量分析" v-if="permission('年度月份用量分析')">-->
+      <!--<year-gas-query v-if="show == '年度月份用量分析'"  @deal-msg="dealMsg"></year-gas-query>-->
+    <!--</tabs>-->
+    <!--<tabs header="余额统计查询" v-if="permission('余额统计查询')">-->
+      <!--<balance-query v-if="show == '余额统计查询'"  @deal-msg="dealMsg"></balance-query>-->
+    <!--</tabs>-->
+    <tabs header="用户余额表" v-if="permission('用户余额表')">
+      <balance-table v-if="show.includes('用户余额表')"  @deal-msg="dealMsg"></balance-table>
+    </tabs>
+    <tabs header="抄表册统计" v-if="permission('抄表册统计')">
+      <hand-book-query v-if="show.includes('抄表册统计')"  @deal-msg="dealMsg"></hand-book-query>
+    </tabs>
+    <tabs header="抄表册统计2" v-if="permission('抄表册统计2')">
+      <hand-book-two-query v-if="show.includes('抄表册统计2')"  @deal-msg="dealMsg"></hand-book-two-query>
+    </tabs>
+    <tabs header="用气性质抄表率统计" v-if="permission('用气性质抄表率统计')">
+      <hand-gas-properties-query v-if="show.includes('用气性质抄表率统计')"  @deal-msg="dealMsg"></hand-gas-properties-query>
+    </tabs>
+    <tabs header="每月应收汇总统计" v-if="permission('每月应收汇总统计')">
+      <hand-gas-query v-if="show.includes('每月应收汇总统计')"  @deal-msg="dealMsg"></hand-gas-query>
+    </tabs>
+    <tabs header="小区缴费汇总(机表)" v-if="permission('小区缴费汇总(机表)')">
+      <community-paymen v-if="show.includes('小区缴费汇总(机表)')"  @deal-msg="dealMsg"></community-paymen>
+    </tabs>
+    <tabs header="预存明细查询" v-if="permission('预存明细查询')">
+      <deposit-detail v-if="show.includes('预存明细查询')" @deal-msg="dealMsg"></deposit-detail>
+    </tabs>
+    <tabs header="小区用户分布统计" v-if="permission('小区用户分布统计')">
+      <plot-summary-query v-if="show.includes('小区用户分布统计')"  @deal-msg="dealMsg"></plot-summary-query>
+    </tabs>
+    <tabs header="用户用气收费情况" v-if="permission('用户用气收费情况')">
+      <usergas v-if="show.includes('用户用气收费情况')"  @deal-msg="dealMsg"></usergas>
+    </tabs>
+    <tabs header="卡表用户结余明细" v-if="permission('卡表用户结余明细')">
+      <yonghu-jieyu v-if="show.includes('卡表用户结余明细')"  @deal-msg="dealMsg"></yonghu-jieyu>
+    </tabs>
+    <tabs header="应收实收明细" v-if="permission('应收实收明细')">
+      <ying-shou-ming-xi v-if="show.includes('应收实收明细')"  @deal-msg="dealMsg"></ying-shou-ming-xi>
+    </tabs>
+    <tabs header="操作员日结列表" v-if="permission('操作员日结列表')">
+      <proceeds-oper v-if="show.includes('操作员日结列表')"  @deal-msg="dealMsg"></proceeds-oper>
+    </tabs>
+    <tabs header="抄表情况记录表" v-if="permission('抄表情况记录表')">
+      <handplan-info v-if="show.includes('抄表情况记录表')"  @deal-msg="dealMsg"></handplan-info>
+    </tabs>
+    <tabs header="未抄表用户报表" v-if="permission('未抄表用户报表')">
+      <unhand-business @deal-msg="dealMsg"></unhand-business>
+    </tabs>
+    <tabs header="明细报表查询" v-if="permission('明细报表查询')">
+      <report-detail ></report-detail>
+    </tabs>
+    <tabs header="重点用户用气排行查询" v-if="permission('重点用户用气排行查询')">
+      <key-user-gas-ranking v-if="show.includes('重点用户用气排行查询')"  @deal-msg="dealMsg" ></key-user-gas-ranking>
+    </tabs>
+    <tabs header="抄表员汇总表"  v-if="permission('抄表员汇总表')">
+      <hand-people-query1 v-if="show.includes('抄表员汇总表')"  @deal-msg="dealMsg" ></hand-people-query1>
+    </tabs>
+  </tab-button>
+
+</template>
+
+<script>
+  import TabButton from '../../components/sale/common/TabButton'
+  import Tabs from '../../components/sale/common/Tabs'
+
+  export default {
+    title: '汇总查询',
+    data () {
+      return {
+        f_start_date: '',
+        f_end_date: '',
+        listpage: true,
+        width: {
+          left: '100%',
+          right: '0%'
+        },
+        // searchNumber:'',
+        rowData: {},
+        newWebHand: this.$appdata.getSingleValue('新抄表'),
+        show: []
+      }
+    },
+    components: {Tabs, TabButton},
+    methods: {
+      permission (name) {
+        console.log(this.$login.r)
+        if (!this.$login.r.find(value => value == name)) {
+          return false
+        } else {
+          return true
+        }
+      },
+      cancel (obj) {
+        this.listpage = true
+      },
+      dealMsg (obj) {
+        this.rowData = obj
+        this.listpage = false
+        console.log(obj.model)
+        this.f_start_date = obj.model.startDate
+        this.f_end_date = obj.model.endDate
+      }
+    }
+  }
+</script>
+
+<style scoped>
+</style>

package/src/filiale/zhongyi/HandPeopleQuery.vue

@@ -0,0 +1,461 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div :class="{'basic-main':((!isdetail) && (!usershow)),'binary-left':isdetail||usershow}" @keyup.enter="search">
+      <div class="flex" v-if="!show">
+        <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':!$parent.$parent.usershow,'col-sm-3 form-group':$parent.$parent.usershow}">
+                  <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':!$parent.$parent.usershow,'col-sm-3 form-group':$parent.$parent.usershow}">
+                  <label for="endDate" class="font_normal_body">结束日期</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':!$parent.$parent.usershow,'col-sm-3 form-group':$parent.$parent.usershow}">
+                  <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%"
+                            :options='$parent.$parent.residentialArea' placeholder='选择小区'
+                            close-on-select>
+                  </v-select>
+                </div>
+                <div
+                  :class="{'col-sm-2 form-group':!$parent.$parent.usershow,'col-sm-3 form-group':$parent.$parent.usershow}">
+                  <label class="font_normal_body">抄&ensp;表&ensp;员</label>
+                  <v-select :value.sync="model.f_inputtor"
+                            v-model="model.f_inputtor"
+                            :options='$parent.$parent.inputtores' placeholder='请选择'
+                            multiple="true"
+                            close-on-select></v-select>
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear  button_spacing" @click="$parent.$parent.clear()">清空</button>
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                :footer="$parent.$parent.footer"
+                                :header="$parent.$parent.other"
+                                sqlurl="api/af-revenue/logic/openapi/exportfile"
+                                sql-name="handPeopleQuery1"
+                                template-name='抄表员统计查询导出'
+                                :choose-col="true"></export-excel>
+                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model"
+                              :field="$parent.$parent.getfield"
+                              :defaultfield="$parent.$parent.defaultfield"
+                              titletable="抄表员统计查询导出"
+                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+                </div>
+              </div>
+              <div class="row">
+                <res-select-group :show-component="['company']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+              </div>
+            </div>
+          </criteria>
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+            <template partial='head'>
+              <tr>
+                <th>
+                  <nobr>小区名称</nobr>
+                </th>
+                <th>
+                  <nobr>抄表员</nobr>
+                </th>
+                <th>
+                  <nobr>户数</nobr>
+                </th>
+                <th>
+                  <nobr>气量</nobr>
+                </th>
+                <th>
+                  <nobr>金额</nobr>
+                </th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;">
+                <nobr>{{ row.f_residential_area }}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{ row.f_inputtor }}</nobr>
+              </td>
+              <td style="text-align: center">
+                <nobr>{{ row.f_user_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>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+        <table class="table-hover">
+          <tr style="position: relative" class="table-bordered">
+            <td
+              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
+              汇总信息
+            </td>
+            <td
+              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              户数合计:&emsp;{{ sumsmodel.f_user_number }}
+            </td>
+            <td
+              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              气量合计:&emsp;{{ sumsmodel.f_oughtamount }}
+            </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 }}
+            </td>
+          </tr>
+        </table>
+      </div>
+    </div>
+    <div class="binary-right" v-if="usershow">
+      <handplan-user :start-date.sync="startd"
+                     :end-date.sync="endd"
+                     :inputtor.sync="selectinputtor" :f_filialeid="f_filialeid"></handplan-user>
+    </div>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+import exportConfig from './exportConfig'
+
+let readySomething = async function (self) {
+  self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+  self.$MagGetSaleParam.initinputtor();
+  self.getinputtores();
+  self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
+  self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
+  self.startd = self.$login.toStandardDateString() + ' 00:00:00'
+  self.endd = self.$login.toStandardDateString() + ' 23:59:59'
+  await self.$MagLoadParams.loadParam()
+  self.initParams()
+  self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+}
+export default {
+  title: '抄表员统计',
+  data() {
+    return {
+      defaultfield: [],
+      config: {
+        defaultPrint: ['f_residential_area', 'f_inputtor', 'f_user_number', 'f_oughtamount', 'f_oughtfee']
+      },
+      other: [],
+      footer: [],
+      showinfo: false,
+      data: {},
+      show: false,
+      rowdata: {},
+      initres: {
+        org: [this.$login.f.orgid],
+        dep: [],
+        user: []
+      },
+      model: new PagedList('api/af-revenue/sql/handPeopleQuery1', 20, {
+        startDate: 'this.model.startDate',
+        endDate: 'this.model.endDate'
+      }, {
+        f_user_number: 0,
+        f_oughtamount: 0,
+        f_oughtfee: 0
+      }),
+      criteriaShow: false,
+      orgCondtionStr: '',
+      // 下拉框
+      meterbrands: [],
+      meterbooks: [{label: '全部', value: ''}],
+      pricenames: [],
+      prices: [],
+      area: [],
+      //合计数据
+      defaultfield: [],
+      //小区
+      residentialArea: [],
+      sumsmodel: {},
+      inputtouPerson: [],
+      inputtores2: [], // 下发时使用自定义抄表员,
+      f_filialeid: this.$login.f.f_orgid,
+      f_orgid: this.$login.f.orgid,
+      f_depid: this.$login.f.depids,
+      f_operatorid: this.$login.f.id,
+      inputtores: [{label: '全部', value: ''}],  //抄表员
+      bookSlice: [{label: '全部', value: ''}],   //表册片区
+      allorgid: [],
+      isdetail: false,
+      usershow: false,
+      selectinputtor: '',
+      startd: '',
+      endd: ''
+    }
+  },
+  ready() {
+    this.getaddress()
+    readySomething(this).then(() => {
+      this.$emit('ready')
+    }).catch((error) => {
+      this.$emit('error', error)
+    })
+  },
+  methods: {
+    //显示抄表户数
+    operate(inputtor) {
+      if (inputtor != null) {
+        this.selectinputtor = inputtor;
+      } else {
+        this.$showAlert('当前抄表员有误', 'warning', 2000)
+        return;
+      }
+      this.isdetail = true;
+      this.usershow = true;
+    },
+    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]
+    },
+    //初始化片区
+    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 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 updateParams() {
+      await this.$MagLoadParams.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.$MagGetSaleParam.getresinputtor(res));
+        })
+      }
+      this.initParams()
+    },
+    getotherfooter() {
+      this.other = [];
+      this.footer = [];
+      let otherInData = [];
+      otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+      let footerData = [], exportfield = this.getfield;
+      footerData.push("合计");
+      let self = this;
+      for (var field in self.sumsmodel) {
+        footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
+      }
+      this.footer.push(footerData);
+      this.other.push(otherInData);
+      let date = []
+      date.push(`起始时间:${this.$refs.paged.$refs.cri.model.startDate}`)
+      date.push(`终止时间:${this.$refs.paged.$refs.cri.model.endDate}`)
+      this.other.push(date)
+    },
+    async getaddress() {
+      let HttpReset = new HttpResetClass()
+      var data = await HttpReset.load('POST', 'api/af-revenue/sql/manage_getarealist', {
+        data: {
+          condition: `1=1 and s.f_filialeid = '${this.$login.f.orgid}'`
+        }
+      }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
+      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
+    },
+    //把数据库查询数据转换为下拉数据
+    calculate(rows) {
+      let data = []
+      rows.forEach((row, n) => {
+        data[n] = {label: row.f_residential_area, value: row.id}
+      })
+      return data
+    },
+
+    search() {
+      this.$refs.paged.$refs.cri.search()
+    },
+    cancel() {
+      this.show = false
+    },
+    showmsg(obj) {
+      this.rowdata = obj
+      this.show = true
+    },
+    initParams() {
+      // 初始化气表品牌
+      let brandArr = []
+      this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+        let temp = {}
+        temp.label = item.label
+        temp.value = item.value.f_meter_brand
+        brandArr.push(temp)
+      })
+      this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+      //初始化气表价格
+      this.prices = this.$MagGetSaleParam.getPrices();
+    },
+    selfSearch(args) {
+      if (this.$refs.paged.$refs.cri.model.startDate == '' || this.$refs.paged.$refs.cri.model.endDate == '') {
+        this.$showAlert('请先选择开始时间、结束时间，再进行查询操作！', 'warning', 3000)
+        return
+      }
+      //抄表员查询条件
+      this.inputtouPerson = this.$refs.paged.$refs.cri.model.f_inputtor
+      if (this.inputtouPerson.length !== 0) {
+        let str = JSON.stringify(this.inputtouPerson)
+        str = str.replace(/"/g, `'`)
+        str = str.replace(/\[/g, ``)
+        str = str.replace(/\]/g, ``)
+        //查询多个抄表员时条件
+        args.condition += ` and f_inputtor in  ( ${str} )`
+      }
+      //小区查询条件
+      this.area = this.$refs.paged.$refs.cri.model.f_residential_area
+      if (this.area.length !== 0) {
+        let str = JSON.stringify(this.area)
+        str = str.replace(/"/g, `'`)
+        str = str.replace(/\[/g, ``)
+        str = str.replace(/\]/g, ``)
+        //查询多个小区时条件
+        args.condition += ` and f_residential_area in  ( ${str} )`
+      }
+      let f_orgstr = this.orgCondtionStr
+      args.condition = `${args.condition} ` + f_orgstr
+      self.startd = args.model.startDate;
+      self.endd = args.model.endDate;
+      this.model.search(args.condition, args.model)
+      this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
+      this.isdetail = false;
+      this.usershow = false;
+    },
+    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] = []
+      })
+
+    },
+    dealmsg(val) {
+      val.model = this.model.model
+      this.$dispatch('deal-msg', val)
+    },
+    show() {
+      this.criteriaShow = true
+    },
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    getRes(obj) {
+      this.orgCondtionStr = obj
+    },
+  },
+  events: {
+    'getidcard'(IdCard) {
+      this.$refs.paged.$refs.cri.model.f_info_idnumber = IdCard.strID
+    }
+  },
+  watch: {
+    'model'(val) {
+    },
+    'orgCondtionStr'(val) {
+      this.$refs.paged.$refs.cri.model.f_inputtor = []
+      let res = val.match(/'(.*?)'/)
+      console.log('正则提取:', res && res[1])
+      if (res) {
+        this.f_filialeid = res[1]
+        if (res.input != null) {
+          let resorgid = res.input.substring(res.input.indexOf("'"));
+          if (resorgid != null && resorgid != '') {
+            resorgid = resorgid.substring(0, resorgid.lastIndexOf("'") + 1);
+            resorgid = resorgid.replace(/'/g, "");
+            this.allorgid = resorgid.split(",")
+          }
+        }
+        this.updateParams()
+      }
+    },
+    sumsmodel: {
+      handler: function (val) {
+        this.getotherfooter();
+      },
+      deep: true
+    }
+  },
+  computed: {
+    getCondition() {
+      return {
+        startDate: this.$refs.paged.$refs.cri.model.startDate,
+        endDate: this.$refs.paged.$refs.cri.model.endDate,
+        condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr
+      }
+    },
+    inputtor() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表员')]
+    },
+    getfield() {
+      return exportConfig.handPeopleConfig1
+    }
+  }
+}
+</script>

package/src/filiale/zhongyi/exportConfig.js

@@ -378,6 +378,13 @@ export default {
     'f_sell_hand': '已收户数',
     'f_sell_lv': '收费率'
   },
+  handPeopleConfig1: {
+    'f_residential_area': '小区名称',
+    'f_inputtor': '抄表员',
+    'f_user_number': '户数',
+    'f_oughtamount': '气量',
+    'f_oughtfee': '金额'
+  },
   handBookConfig: {
     'f_inputtor': '抄表员',
     'f_book_name': '抄表册',

package/src/filiale/zhongyi/sale.js

@@ -30,4 +30,7 @@ export default function () {
   Vue.component('fill-card-query', (resolve) => { require(['./FillCardQuery'], resolve) })
   // 收费查询
   Vue.component('charge-query', (resolve) => { require(['./ChargeQuery'], resolve) })
+  // 抄表员汇总表
+  Vue.component('hand-people-query1', (resolve) => { require(['./HandPeopleQuery'], resolve) })
+  Vue.component('collect-manage', (resolve) => { require(['./CollectManage'], resolve) })
 }

package/src/reportManage.js

@@ -774,4 +774,8 @@ export default function () {
   Vue.component('gas-group-summary', (resolve) => {
     require(['./components/SellReport/ManageGasGroupSummary'], resolve)
   })
+  // 西户收费结账报表
+  Vue.component('xh-manage-summary', (resolve) => {
+    require(['./components/SellReport/xihu/XHManageSummary.vue'], resolve)
+  })
 }