manage-client 3.2.280 → 3.2.282

package/package.json

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

package/src/components/SellReport/jingwei/PaymentNotice.vue

@@ -366,7 +366,7 @@
         let otherInData=[];
         otherInData.push(`日期: ${exportdata.startDate}-${exportdata.endDate}`);
         let footerData=[],exportfield=this.getfield;
-        footerData.push("注意：请用户务必于____天内到经纬燃气公司（运城市红旗东街204号）或微信公众号缴纳燃气费，联系电话：8810200");
+        footerData.push("注意：请用户务必于____天内到经纬燃气公司（山西省运城市盐湖区人民南路东阜花苑3号门面房）或微信公众号缴纳燃气费，联系电话：8810200");
         //let self = this;
         //for(var field in self.sumsmodel){
         //  footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);

package/src/components/webmeter/gasStatistics/NewGasStatistics.vue

@@ -86,10 +86,11 @@
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">气表品牌</label>
-                  <v-select :value.sync="model.f_meter_brand"
+                  <v-select :value.sync="model.f_meter_brand" multiple
                             v-model="model.f_meter_brand"
                             :options="$parent.$parent.meterbrands"
                             condition="ss.f_meter_brand = '{}'"
+                            value-single="false"
                             close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">

package/src/filiale/kelai/CollectManage.vue

@@ -0,0 +1,158 @@
+<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.includes('开户查询')"  @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="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>
+  </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) {
+        if (this.$login.r.find(value => value == '综合查询')) {
+          if (!this.$login.r.find(value => value == name)) {
+            return false
+          }
+        }
+        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/kelai/NewAccountQuery.vue

@@ -0,0 +1,409 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main">
+      <div class="flex" v-if="!showinfo">
+
+        <criteria-paged :model="model" v-ref:paged @sort="sort">
+          <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'"
+                              :show-reset-button="true"
+                              condition="f_open_date >= '{} 00:00:00'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <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'"
+                              :show-reset-button="true"
+                              condition="f_open_date <= '{} 23:59:59'">
+                  </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 like '%{}%'" placeholder="客户名称">
+                </div>
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">公&ensp;&ensp;司</label>-->
+<!--                  <res-select :initresid="$parent.$parent.orgid"-->
+<!--                              style="width:60%"-->
+<!--                              @res-select="$parent.$parent.getRes"-->
+<!--                              restype='organization'>-->
+<!--                  </res-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>
+                  <!--<button class="btn btn-default" @click="$parent.$parent.stamp()">打印</button>-->
+
+<!--                  <export-excel :data="$parent.$parent.getCondition"-->
+<!--                                :field="$parent.$parent.getfield"-->
+<!--                                v-if="$parent.$parent.authArr.includes('开户查询导出')"-->
+<!--                                sqlurl="rs/logic/exportfile" sql-name="newAccountQuery" 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">用气性质</label>
+                  <v-select :value.sync="model.f_gasproperties"
+                            v-model="model.f_gasproperties"
+                            :options='$parent.$parent.gaspropertyTypes' 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.f_meter_brand"
+                            v-model="model.f_meter_brand"
+                            :options='$parent.$parent.meterbrands' placeholder='请选择'
+                            condition="f_meter_brand = '{}'"
+                            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">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_residential_area"
+                         condition="f_residential_area like '%{}%'" placeholder="小区"/>
+                </div>
+              </div>
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+                <res-select-group :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>
+                  <data-order field="f_address" name="客户地址"></data-order>
+                </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;">
+                <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
+              </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_phone}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_idnumber}}</nobr>
+              </td>
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.f_price_name}}</nobr>-->
+<!--              </td>-->
+              <td style="text-align: center;">
+                <nobr>{{row.f_open_date}}</nobr>
+              </td>
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.f_meternumber}}</nobr>-->
+<!--              </td>-->
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.f_gas_person}}</nobr>-->
+<!--              </td>-->
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.f_gas_date}}</nobr>-->
+<!--              </td>-->
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.f_gasproperties}}</nobr>-->
+<!--              </td>-->
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.f_total_gas}}</nobr>-->
+<!--              </td>-->
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.f_meter_brand}}</nobr>-->
+<!--              </td>-->
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.isbgl}}</nobr>-->
+<!--              </td>-->
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.f_operator}}</nobr>-->
+<!--              </td>-->
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+      <div v-if="showinfo">
+        <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+  import defaultPrint from './../../components/sale/config/DefaultPrint'
+  import exportConfig from './../../components/sale/config/exportConfig'
+  import plugins from './../../plugins/GetLoginInfoService'
+
+  let readySomething = async function (self) {
+    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
+    self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
+    // await self.$refs.paged.$refs.cri.search()
+    await self.$MagLoadParams.loadParam()
+    self.initParams()
+
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+  }
+  export default {
+    title: '开户统计',
+    data() {
+      return {
+        data: {},
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        orderFields: {
+          f_address: 'no'
+        },
+        orderDefault: "'f_open_date desc'",
+        model: new PagedList('rs/sql/newAccountQuery', 20,{orderitem: "'f_open_date desc'"}),
+        f_orgid: this.$login.f.orgid,
+        criteriaShow: false,
+        modelval: [],
+        printshow: false,
+        all: false,
+        fields: {},
+        thead: '',
+        tfoot: '',
+        orgCondtionStr: '(' + this.$login.f.orgid + ')',
+        // orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
+        meterbrands: [],
+        showinfo:false,
+        rowdata:{},
+        //合计数据
+        sumsmodel: {}
+      }
+    },
+    ready() {
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      cancel() {
+        this.showinfo = false
+      },
+      search() {
+        this.$refs.paged.$refs.cri.search()
+      },
+      getRes(obj) {
+        console.log(obj,"========")
+        this.orgCondtionStr = obj
+      },
+
+      selfSearch(args) {
+        args.condition = `${args.condition}` + this.orgCondtionStr
+        this.model.search(args.condition, args.model)
+      },
+      showmsg(obj){
+        this.rowdata=obj
+        this.showinfo=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]
+      },
+
+      clear() {
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          this.$refs.paged.$refs.cri.model[key] = []
+        })
+      },
+      show() {
+        this.criteriaShow = true
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      dealmsg(val) {
+        console.log('---------------dealmsg')
+        this.rowdata=val
+        this.show=true
+        val.model = this.model.model
+        this.$dispatch('deal-msg', val)
+      },
+      stamp() {
+        this.all = false
+        //默认选择要打印的列
+        this.modelval = defaultPrint.config
+        this.fields = this.getfield
+        console.log('所有打印字段', this.fields)
+        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
+      },
+      close() {
+        this.printshow = false
+        this.all = false
+      },
+      // 对选择的列进行排序
+      sortModelval() {
+        let sortModel = []
+        Object.keys(this.fields).forEach((key) => {
+          if (this.modelval.includes(key)) {
+            sortModel.push(key)
+          }
+        })
+        this.modelval = sortModel
+        console.log('选择的打印的字段', this.modelval)
+      },
+      async updateParams() {
+        await this.$MagLoadParams.loadParam(this.f_filialeid)
+        this.initParams()
+      },
+      sort (field, rule) {
+        // 将所有排序方式设为不排序，实现相互排斥
+        for (let key in this.orderFields) {
+          if (key === field) {
+            this.orderFields[key] = rule
+          } else {
+            this.orderFields[key] = 'no'
+          }
+        }
+        // 如果新规则不排序，还原为默认排序
+        if (rule === 'no') {
+          this.model.paramSource.orderitem = `'${this.orderDefault}'`
+        } else {
+          this.model.paramSource.orderitem = `'${field} ${rule}'`
+        }
+
+        this.search()
+      }
+    },
+    watch: {
+      'all'(val) {
+        if (val) {
+          this.modelval = this.bodyData
+        } else {
+          this.modelval = defaultPrint.config
+          this.put()
+        }
+      },
+      'modelval.length'() {
+        this.put()
+      }
+    },
+    computed: {
+      authArr () {
+        return this.$login.r ? this.$login.r : []
+      },
+      getCondition () {
+        var con = ""
+        if (this.orgCondtionStr) {
+          con = `${this.$refs.paged.$refs.cri.condition} and u.f_orgid in  (${this.orgCondtionStr})`
+        }
+        else {
+          con = `${this.$refs.paged.$refs.cri.condition}and u.f_orgid in ('${this.$login.f.orgid}' )`
+        }
+        return {
+          condition: con
+        }
+      },
+      getfield() {
+        return exportConfig.NewAccountConfig
+      },
+      gaspropertyTypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
+      }
+    }
+  }
+</script>

package/src/filiale/kelai/sale.js

@@ -1,6 +1,10 @@
 // 分公司特殊组件页面注册
 import Vue from 'vue'
 export default function () {
+  // 汇总查询
+  Vue.component('collect-manage', (resolve) => {require(['./CollectManage'], resolve)})
+  // 开户查询
+  Vue.component('new-account-query', (resolve) => { require(['./NewAccountQuery'], resolve) })
   // 用户查询
   Vue.component('user-query', (resolve) => { require(['./UserQuery'], resolve) })
   Vue.component('area-charge-query', (resolve) => { require(['./AreaChargeQuery'], resolve) })

package/src/filiale/wenxi/WebHandQuery.vue

@@ -18,7 +18,7 @@
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户编号</label>
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_userinfo_code" placeholder='客户编号'
-                         condition="f_userinfo_code = '{}'" v-next-el='f_userinfo_code' v-el:meternumber
+                         condition="f_userinfo_code = '{}'" v-next-el='f_userinfo_code' v-el:meternumber @change="$parent.$parent.inputChange"
                   >
                 </div>
                 <div class="col-sm-2">
@@ -281,7 +281,7 @@
         orgCondtionStr: '',
         model: new PagedList('rs/sql/manage_webmeterHandQuery', 50,{
           startDate: 'this.model.startDate',
-          endDate: 'this.model.endDate'
+          endDate: 'this.model.endDate',f_userinfo_code: 'this.model.f_userinfo_code'
         }),
         showbottomsum:false  //页面下方是否有合计: 默认为false, 在watch修改
       }
@@ -293,11 +293,20 @@
       }).catch((error) => {
         this.$emit('error', error)
       })
-      // this.$refs.paged.$refs.criteria.model.startDate = Util.addDate(new Date(),0).substring(0,10) + ' 00:00:00'
-      // this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date(),0).substring(0,10) + ' 23:59:59'
+      this.$refs.paged.$refs.criteria.model.startDate = Util.addDate(new Date(),0).substring(0,10) + ' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date(),0).substring(0,10) + ' 23:59:59'
       // this.$refs.paged.$refs.criteria.search()
     },
     methods: {
+      inputChange () {
+        if (this.$refs.paged.$refs.criteria.model.f_userinfo_code){
+          this.$refs.paged.$refs.criteria.model.startDate = ''
+          this.$refs.paged.$refs.criteria.model.endDate = ''
+        }else{
+          this.$refs.paged.$refs.criteria.model.startDate = Util.addDate(new Date(),0).substring(0,10) + ' 00:00:00'
+          this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date(),0).substring(0,10) + ' 23:59:59'
+        }
+      },
       initParams() {
         // 初始化气表品牌
         let brandArr = []
@@ -354,15 +363,6 @@
       },
 
       search (args) {
-        if (this.$refs.paged.$refs.criteria.model.startDate == '' || this.$refs.paged.$refs.criteria.model.endDate == ''){
-          if (this.$refs.paged.$refs.criteria.model.f_userinfo_code){
-            this.$refs.paged.$refs.criteria.model.startDate = '1990-01-01 00:00:00'
-            this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date(),1).substring(0,10) + ' 00:00:00'
-          }else{
-            this.$refs.paged.$refs.criteria.model.startDate = Util.addDate(new Date(),0).substring(0,10) + ' 00:00:00'
-            this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date(),0).substring(0,10) + ' 23:59:59'
-          }
-        }
         args.condition =  `${args.condition}`+this.orgcondition
         this.condition = args.condition
         this.model.search(args.condition, args.model)

package/src/filiale/wenxi/config/exportConfig.js

@@ -867,22 +867,22 @@ export default{
   },
   // 物联网表抄表
   webmeterHandConfig: {
-    'f_userinfo_code': '用户编号',
-    'f_user_name': '用户名称',
+    'f_userinfo_code': '客户编号',
+    'f_user_name': '客户名称',
     'f_residential_area': '小区名称',
     'f_address': '地址',
-    'f_meter_brand': '气表品牌',
     'f_meternumber': '表号',
-    'f_oughtamount': '本期气量',
-    'f_oughtfee': '本期金额',
-    'f_jval': '表内剩余余额',
+    'f_meter_brand': '气表品牌',
     'f_hand_date': '抄表日期',
     'f_total_fee': '累计购气金额',
     'f_last_tablebase': '上期底数',
     'f_tablebase': '本期底数',
-    'f_balance_amount': '系统余额',
+    'f_curbalance': '系统余额',
+    'f_jval': '表上余额',
     'cyclegas': '当前周期已用气量',
     'cyclefee': '当前周期消费金额',
+    'f_oughtamount': '本次气量',
+    'f_oughtfee': '本次金额',
     'f_stair1price': '一阶气价',
     'f_stairamount1': '一阶气量',
     'f_stair1fee': '一阶金额',