sale-client 3.6.279 → 3.6.281

package/.npmignore

@@ -0,0 +1,12 @@
+src/bootstrap
+.idea/
+.DS_Store
+node_modules/
+dist/
+examples/
+gradle/
+npm-debug.log
+selenium-debug.log
+test/unit/coverage
+test/e2e/reports
+lib/**/lib

package/package.json

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

package/src/.npmignore

@@ -0,0 +1 @@
+

package/src/components/FilesManage/FileUserFiles.vue

@@ -299,6 +299,29 @@
                     <input class="input_search" condition="f_comments like '%{}%'" placeholder='备注' style="width:60%"
                            type="text" v-model="model.f_comments">
                   </div>
+
+                  <div
+                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    class="form-group" >
+                    <label class="font_normal_body" title="参数名称:阀控状态">阀控状态</label>
+                    <v-select :options='$parent.$parent.f_network_valve' :search='true'
+                              :value.sync="model.f_network_valve"
+                              close-on-select
+                              condition="f_network_valve = '{}'" placeholder='阀控状态'
+                              v-model='model.f_network_valve'>
+                    </v-select>
+                  </div>
+                  <div
+                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    class="form-group" >
+                    <label class="font_normal_body" title="参数名称:阀门状态">阀门状态</label>
+                    <v-select :options='$parent.$parent.f_valvestate' :search='true'
+                              :value.sync="model.f_valvestate"
+                              close-on-select
+                              condition="f_valvestate = '{}'" placeholder='阀门状态'
+                              v-model='model.f_valvestate'>
+                    </v-select>
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -624,7 +647,10 @@ let loadParamGem = async function (self) {
         titleShow: true, //是否显示部分档案信息类的筛选框
         useoptions: this.$appdata.getParam('使用类型'),
 
-        userlevel: this.$appdata.getParam('用户等级') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户等级')] : []
+        userlevel: this.$appdata.getParam('用户等级') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户等级')] : [],
+        f_network_valve: this.$appdata.getParam('阀控状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('阀控状态')] : [],
+        f_valvestate: this.$appdata.getParam('阀门状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('阀门状态')] : []
+
       }
     },
     ready () {

package/src/components/charge/business/CardMeterCenter.vue

@@ -219,6 +219,7 @@
         <div style="text-align:right; height: 25%">
           <strong style="color:red;margin-right: 5px">{{ $refs.givechange.promptText }}</strong>
           <strong style="font-size: large" v-if="!config.notShowFormula">计算公式:{{calculatedetail ? calculatedetail : ' 暂无'}}</strong><br/>
+          <strong style="font-size: large" v-if="deductdetail">{{deductdetail ? deductdetail : ' 暂无'}}</strong><br/>
           <payment-code-button :clickable="!$v.valid || validateOk || !islegal || clickConfirm|| model.f_preamount === 0"
                                :payment.sync="model.f_payment" :payment-data="paytype"
                                @confirm-payment="confirm()">
@@ -238,7 +239,6 @@
 </template>
 <script>
   import {HttpResetClass} from 'vue-client'
-  import XML from '../../../plugins/ObjTree'
 
   /**
    *综合业务
@@ -274,7 +274,13 @@
         self.model.f_pregas = Math.floor(getGas.data.gas - 0)
       }
     }
-    self.model.f_totalcost = ((self.row.f_balance - 0) >= (self.model.f_preamount - 0) ? 0 : (self.model.f_preamount - 0 - self.row.f_balance))
+    self.model.getDeduct = 0
+    // 计算抵扣包间费用抵扣金额
+    if (self.row.f_project_money && self.row.f_project_money > 0) {
+      self.model.getDeduct = (self.$CommonService.getDeduct(self.row, self.model.f_pregas) - 0)
+    }
+    // end
+    self.model.f_totalcost = ((self.row.f_balance - 0) >= ((self.model.f_preamount - 0) + self.model.getDeduct) ? 0 : ((self.model.f_preamount - 0) + self.model.getDeduct) - self.row.f_balance)
 
     self.model.chargeprice = getGas.data.chargeprice
     Object.assign(self.model, self.model, getGas.data)
@@ -286,7 +292,7 @@
       self.model.f_totalcost = ((self.model.f_totalcost - 0) - (self.dymoney - 0)).toFixed(self.row.f_fee_decimal || 4)
     }
     self.model.f_preamount = (calFee - (self.dymoney - 0)).toFixed(self.row.f_fee_decimal || 4)
-    self.calText(getGas.data.chargeprice)
+    self.calText(getGas.data.chargeprice, self.model.getDeduct)
   }
 
   // 输入气量，换算金额
@@ -299,8 +305,13 @@
     if ((self.model.f_pregas - 0) - (self.maxgas - 0) <= 0) {
       self.model.f_meter_type = self.row.f_meter_type
       let getAmount = await self.$CommonService.gasCalculate(self.model, self.model.f_pregas)
+      self.model.getDeduct = 0
+      // 计算抵扣包间费用抵扣金额
+      if (self.row.f_project_money && self.row.f_project_money > 0) {
+        self.model.getDeduct = (self.$CommonService.getDeduct(self.row, self.model.f_pregas) - 0)
+      }
       self.model.f_preamount = getAmount.data.chargenum.toFixed(self.row.f_fee_decimal || 4)
-      self.model.f_totalcost = ((self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(self.row.f_fee_decimal || 4))
+      self.model.f_totalcost = ((self.row.f_balance - 0) > ((getAmount.data.chargenum - 0) + self.model.getDeduct - 0) ? 0 : (((getAmount.data.chargenum - 0) + self.model.getDeduct - 0) - (self.row.f_balance - 0)).toFixed(self.row.f_fee_decimal || 4))
       Object.assign(self.model, self.model, getAmount.data)
       self.model.chargeprice = getAmount.data.chargeprice
       if (self.model.f_payment == '赠气') {
@@ -312,7 +323,7 @@
           self.model.f_collection = Math.ceil(self.model.f_collection)
         }
       }
-      self.calText(getAmount.data.chargeprice)
+      self.calText(getAmount.data.chargeprice, self.model.getDeduct)
     }
   }
   // 执行保存逻辑
@@ -542,9 +553,11 @@
           f_banktransfer_date: '',
           f_privilege_id: 0,
           f_privilege_money: 0,
-          f_after_discount: 0
+          f_after_discount: 0,
+          getDeduct: 0
         },
         calculatedetail: '',
+        deductdetail: '',
 
         // 启用发票管理需要对票号进行验证
         hasValidateBill: false,
@@ -680,7 +693,13 @@
           Object.assign(this.model, this.model, dymoney2.data)
           this.model.f_totalcost = dymoney2.data.chargenum
           this.model.f_preamount = dymoney2.data.chargenum
-          this.calText(dymoney2.data.chargeprice)
+          this.model.getDeduct = 0
+          if (this.row.f_project_money && this.row.f_project_money > 0) {
+            this.model.getDeduct = (this.$CommonService.getDeduct(this.row, this.model.f_pregas) - 0)
+            this.model.f_totalcost = this.model.f_totalcost + this.model.getDeduct
+            this.model.f_collection = this.model.f_collection + this.model.getDeduct
+          }
+          this.calText(dymoney2.data.chargeprice, this.model.getDeduct)
         } catch (error) {
           this.$showAlert(`发卡售气划价错误，错误类型：${error}`, 'danger', 0)
           this.$dispatch('error', '发卡售气', this.model, error)
@@ -798,7 +817,7 @@
           this.$dispatch('error', '发卡售气', this.model, error)
         }
       },
-      calText (val) {
+      calText (val, getDeduct = 0) {
         let str = ''
         let num = 0
         val.forEach((item) => {
@@ -811,6 +830,13 @@
             str = str + item.f_price + ' x ' + Math.floor(item.f_gas) + '+'
           }
         })
+        if (getDeduct > 0) {
+          if ((this.model.f_pregas * this.row.f_gas_type) > this.row.f_project_money) {
+            this.deductdetail = '当前未结金额' + this.row.f_project_money + '元，不足抵扣，以未结金额为准'
+          } else {
+            this.deductdetail = '未结金额计算公式:' + this.row.f_gas_type + ' x ' + this.model.f_pregas + '=' + getDeduct
+          }
+        }
         str = str.slice(0, str.length - 1)
         this.calculatedetail = str
         if (num > 1) {

package/src/components/revenue/base/leftview/Userinfo.vue

@@ -30,6 +30,10 @@
           <label class="col-sm-5">账户余额</label>
           <span class="col-sm-7">{{ data ? data.f_balance : dafault.f_user_type }}</span>
         </div>
+        <div class="row" v-show="data.f_project_money && data.f_project_money > 0">
+          <label class="col-sm-5">未结金额</label>
+          <span class="col-sm-7">{{ data ?data.f_project_money: '' }} | {{ data ?data.f_gas_type: '' }}</span>
+        </div>
         <div class="row" v-show="data &&  data.f_sys_balance !== 0">
           <label class="col-sm-5">系统余额</label>
           <span class="col-sm-7">{{ data.f_sys_balance ? data.f_sys_balance : dafault.f_user_type }}</span>

package/src/components/revenue/base/rightview/RecordCancel.vue

@@ -93,6 +93,10 @@
       }
       await self.$resetpost('invoice/rs/logic/getInvoice', {data: params}, {resolveMsg: null, rejectMsg: '发票冲红失败！！！'})
     }
+    if (name === 'otherFeeRollback') {
+      console.log('准备刷新了！。。', res, self.model)
+      self.$dispatch('cancel-success')
+    }
 
     // 判断需不需要冲正电子票
     // if (self.isNeedEticket(getRecord.data, self.data.type)) {

package/src/components/revenue/machineHandManage/machineHand.vue

@@ -47,7 +47,7 @@
               </div>
 
               <div class="span" style="float:right;">
-                <button v-if="$parent.$parent.jurisdiction.includes('单户抄表')"
+                <button
                   class="button_search button_spacing" style="width:90px" @click="$parent.$parent.danhuShow()">
                   单户抄表
                 </button>

package/src/filiale/qianneng/ArrearsList.vue

@@ -0,0 +1,417 @@
+<template>
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
+        <div class="form-horizontal select-overspread container-fluid auto" novalidate  partial>
+          <p class="bg-info text-center" style="padding: 8px;font-size: 20px">欠费信息</p>
+          <div class="row">
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">用户状态</label>
+              <v-select id=""
+                        v-model="$parent.$parent.f_whether"
+                        placeholder='用户状态'
+                        :value.sync="$parent.$parent.f_whether"
+                        :options='$parent.$parent.whether'
+                        style="width: 60%"
+                        close-on-select >
+              </v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">银行代扣</label>
+              <v-select :value.sync="model.f_isbank" v-model="model.f_isbank"
+                        :options='$parent.$parent.isbankwhether' placeholder='银行代扣'
+                        close-on-select
+                        condition="f_isbank = '{}'"
+                        style="width: 60%">
+              </v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">气表类型</label>
+              <v-select :value.sync="model.f_meter_classify" v-model="model.f_meter_classify"
+                        :options='$parent.$parent.meters' placeholder='气表类型'
+                        close-on-select
+                        condition="f_meter_classify = '{}'"
+                        style="width: 60%"
+                        default-value="'机表'">
+
+              </v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">用户类型</label>
+              <v-select :value.sync="model.f_user_type" v-model="model.f_user_type"
+                        :options='$parent.$parent.getusertype' placeholder='用户类型'
+                        close-on-select
+                        condition="f_user_type = '{}'"
+                        style="width: 60%">
+
+              </v-select>
+            </div>
+            <div class="span" style="float:right;">
+              <button class="button_search button_spacing width-60" @click="search()" v-el:cx>查询</button>
+              <button class="button_clear button_spacing width-60" @click="$parent.$parent.arrcreate()">生成短信</button>
+              <button v-show="$parent.$parent.rollback" class="button_clear button_spacing width-60" @click="$parent.$parent.retrun()"  v-el:cba>返回</button>
+
+              <div
+                :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                @click="$parent.$parent.hidden()" class="button_spacing" style="float: right">
+              </div>
+            </div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">开始日期</label>
+              <datepicker placeholder="开始日期"
+                          style="width:60%"
+                          class="datepicker"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+              ></datepicker>
+            </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">结束日期</label>
+              <datepicker placeholder="结束日期"
+                          style="width:60%"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+              ></datepicker>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">用户编号</label>
+              <input  type="text" class="form-control" v-model="model.f_userinfo_code" placeholder='用户编号' v-filter v-figure_filter
+                      condition="f_userinfo_code = '{}'" v-next-el='username'  style="width: 60%"
+                      :size="model.f_userinfo_code ? model.f_userinfo_id.length  : 4">
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">用户姓名</label>
+              <input  type="text" class="form-control" v-model="model.f_user_name" placeholder='用户姓名'
+                      condition="f_user_name = '{}'" v-next-el='area'  style="width: 60%"
+                      :size="model.f_user_name ? model.f_user_name.length * 2 : 4">
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body" style="color: orange" title="可多选">小区名称</label>
+              <v-select :value.sync="model.f_residential_area" :value-single="true"
+                        class="select_list select"
+                        style="width: 60%"
+                        condition="f_residential_area like '%{}%'"
+                        :options='$parent.$parent.residentialArea' placeholder='选择小区'
+                        close-on-select search="true">
+              </v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body" style="color: orange" title="可多选">付款类型</label>
+              <v-select :value.sync="model.f_payment" :value-single="true"
+                        class="select_list select"
+                        v-model="model.f_payment"
+                        style="width: 60%"
+                        :options='$parent.$parent.chonetype' placeholder='付款类型'
+                        condition="f_cost_type like '%{}%'"
+                        close-on-select search="true">
+              </v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">应交金额</label>
+              <v-input :value.sync="$parent.f_oughtfee" :expression.sync = 'model.f_oughtfee'
+                       condition="f_oughtfee {}" v-model="model.f_oughtfee"  style="width: 60%"
+                       placeholder="应交金额" v-next-el="cx" ></v-input>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">违约金</label>
+              <v-input :value.sync="$parent.overdue" :expression.sync = 'model.overdue'
+                       condition="overdue {}" v-model="model.overdue"  style="width: 60%"
+                       placeholder="违约金" v-next-el="cx" ></v-input>
+            </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">短信区间</label>
+              <datepicker placeholder="开始日期"
+                          style="width:60%"
+                          class="datepicker"
+                          v-model="model.startDate1"
+                          :value.sync="model.startDate1"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+              ></datepicker>
+            </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">&emsp;&ensp;至&ensp;&emsp;</label>
+              <datepicker placeholder="结束日期"
+                          style="width:60%"
+                          v-model="model.endDate1"
+                          :value.sync="model.endDate1"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+              ></datepicker>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">短信条数</label>
+              <v-input :value.sync="$parent.f_sendsums" :expression.sync = 'model.f_sendsums'
+                       condition="f_sendsums {}" v-model="model.f_sendsums"  style="width: 60%"
+                       placeholder="短信条数" ></v-input>
+            </div>
+          </div>
+
+
+
+        </div>
+      </criteria>
+      <data-grid  :model="model" partial='list' class="table_sy"  v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>
+              <input type="checkbox"  @click="$parent.$parent.$parent.isAll(model.pageIndex)">
+            </th>
+            <th>序号</th>
+            <th>用户信息</th>
+            <th>用户编号</th>
+            <th>用户类型</th>
+            <th>小区</th>
+            <th>抄表时间</th>
+            <th>上次抄表底数</th>
+            <th>本次抄表底数</th>
+            <th>应交气量</th>
+            <th>应交金额</th>
+            <th>账户结余</th>
+            <th>欠费金额</th>
+            <th>违约金</th>
+            <th>短信条数</th>
+            <th>银行代扣</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td style="text-align:center">
+            <input type="checkbox" v-model="$parent.$parent.$parent.ids"
+                   :value="row.f_userinfo_id">
+          </td>
+          <td>{{$index+1}}</td>
+          <td style="text-align:center">{{row.f_userinfo_code}}&nbsp;&nbsp;{{row.f_user_name}}&nbsp;&nbsp;{{row.f_user_phone}}</td>
+          <td style="text-align:center">{{row.f_userinfo_code}}</td>
+          <td style="text-align:center">{{row.f_user_type}}</td>
+          <td style="text-align:center">{{row.f_residential_area}}</td>
+          <td style="text-align:center">{{row.f_input_date}}</td>
+          <td style="text-align:center">{{row.f_last_tablebase.toFixed(2)}}</td>
+          <td style="text-align:center">{{row.f_tablebase.toFixed(2)}}</td>
+          <td style="text-align:center">{{row.f_oughtamount.toFixed(2)}}</td>
+          <td style="text-align:center">{{row.f_oughtfee.toFixed(2)}}</td>
+          <td style="text-align:center">{{row.f_balance.toFixed(2)}}</td>
+          <td style="text-align:center">{{row.f_oughtfee_all.toFixed(2)}}</td>
+          <td style="text-align:center">{{row.overdue.toFixed(2)}}</td>
+          <td style="text-align:center">{{row.f_sendsums}}</td>
+          <td style="text-align:center">{{row.f_isbank}}</td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+    <modal :show.sync="arrshow" v-ref:modal backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <h4 class="modal-title">短信发送</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="form-group">
+          {{this.isbank === '是' ? config.qianmsg : config.msg }}
+        </div>
+        <div class="form-group" style="margin-top: 80px">
+          <label class="label-control">发送截至日期</label>
+          <!-- <input  type="text" class="form-control" v-model="downDate" placeholder='下发日期'> -->
+          <datepicker  placeholder="发送截至日期" :value.sync="arrdownDate" :disabled-days-of-Week="[]" :format="'yyyy-MM-dd HH:mm:ss'" :show-reset-button="reset"></datepicker>
+        </div>
+        <!-- <div class="form-group" style="color: red;" v-if="dateError">
+          日期格式错误
+        </div> -->
+        <!-- <div class="form-group">
+          为保证数据统一，下发日期格式统一为yyyyMM，例如："201709"
+        </div> -->
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button v-show="arrshow" type="button" class="btn btn-default" @click='close'>取消</button>
+        <button v-show="arrshow" type="button" class="btn btn-success" @click='create()'>确认</button>
+      </footer>
+    </modal>
+</template>
+
+<script>
+  /**
+   *阶梯水价查询列表
+   */
+  import { PagedList, HttpResetClass } from 'vue-client'
+  import Vue from 'vue'
+
+  let asyncArrearsList = async function (self) {
+    await self.$getConfig(self, 'arrearslist')
+    console.log('欠费短信发送config', self.config)
+  }
+
+  export default {
+    data () {
+      return {
+        model: new PagedList('rs/sql/arrearsQuery', 50, {startDate: 'this.model.startDate', endDate: 'this.model.endDate', startDate1: 'this.model.startDate1', endDate1: 'this.model.endDate1', condValue:'` 1=1 `',orderitem: '"' + this.orderitem + '"'}),
+        definedShow: false,
+        userdefinedMessage: '',
+        arrdownDate: '',
+        arrshow: false,
+        isbank: '否',
+        // 小区
+        residentialArea: [],
+        chonetype: this.$appdata.getParam('付款类型'),
+        criteriaShow: false,
+        ids: [],
+        pages: [],
+        whether: [{ label: '全部', value: '全部' },
+          { label: '欠费', value: '欠费' }],
+        isbankwhether: [{ label: '是', value: '是' },
+          { label: '否', value: '否' }],
+        f_whether: '欠费',
+        meters: [
+          {label: '全部', value: ''},
+          {label: '机表', value: '机表'},
+          {label: '远传表', value: '远传表'}
+        ],
+        getusertype: [{ label: '全部', value: '' },
+          { label: '民用', value: '民用' },
+          { label: '非民用', value: '非民用' }],
+        filialeName: [],
+        outletsname: [],
+        filiale: '',
+        filialetype: '',
+        isFirst: true,
+        config: {
+          msg: `'尊敬的['+f_userinfo_code+']-['+f_user_name+']客户,您位于['+f_address+']的燃气已欠费：起数['+f_last_tablebase+'],止数['+f_tablebase+']，气量['+f_oughtamount+']，金额['+f_oughtfee+']元;你的预存余额为['+f_oughtfee_col+']元，已不足抵扣。为避免产生违约金，请到营业厅或通过微信公众号(cqqnrq)或支付宝进行缴费!'`,
+          qianmsg: `'尊敬的['+f_userinfo_code+']-['+f_user_name+']客户,您位于['+f_address+']的燃气已欠费：起数['+f_last_tablebase+'],止数['+f_tablebase+']，气量['+f_oughtamount+']，金额['+f_oughtfee+']元。您已办理银行代扣业务，如扣款失败，为避免产生违约金，请到营业厅或通过微信公众号(cqqnrq)或支付宝进行缴费!'`
+        }
+      }
+    },
+    props: {
+      orderitem: {
+        type: String,
+        default: 'p.f_userinfo_id'
+      },
+      rollback: false
+    },
+    ready () {
+      this.getaddress()
+      asyncArrearsList(this)
+      this.$refs.paged.$refs.cri.model.f_isbank = '否'
+      this.$refs.paged.$refs.cri.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+      this.$refs.paged.$refs.cri.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+      this.$refs.paged.$refs.cri.model.startDate1 = this.$login.toStandardDateString() + ' 00:00:00'
+      this.$refs.paged.$refs.cri.model.endDate1 = this.$login.toStandardDateString() + ' 23:59:59'
+      this.search({condition: `1=1 `, model: this.$refs.paged.$refs.cri.model})
+    },
+    watch: {
+      'f_whether' (val) {
+        if (val[0] === '全部') {
+          this.f_whether = '欠费'
+          this.$dispatch('all', '全部')
+        }
+      }
+    },
+    methods: {
+      hidden () {
+        this.criteriaShow = !this.criteriaShow
+      },
+      async  getaddress () {
+        console.log('开始获取小区')
+        let HttpReset = new HttpResetClass()
+        var data = await HttpReset.load('POST', 'rs/sql/address_getarealist', {
+          data: {
+            condition: '1=1'
+          }
+        }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
+        console.log('小区', data)
+        let house = []
+        for (let row of data.data) {
+          console.log('开始保存小区')
+          house.push({label: row.f_residential_area, value: row.f_residential_area})
+        }
+        this.residentialArea = house
+      },
+
+      retrun () {
+        this.alllist = false
+        this.$dispatch('allchange6')
+      },
+      cleanOutlet () {
+        this.outletsname = []
+      },
+      create () {
+        this.arrshow = false
+        let tmp = this.model.condition + " and f_orgid = \'" + Vue.$login.f.orgid + "\'"
+        if (this.ids.length !== 0) {
+          this.model.condition = tmp + ' and f_userinfo_id in (' + this.ids + ')'
+        }
+        if (this.arrdownDate === '' || this.arrdownDate === null) {
+          this.$showAlert('发送截至时间不能为空！', 'danger', 3000)
+        } else {
+          var magdata = this.config.msg
+          if (this.$refs.paged.$refs.cri.model.f_isbank[0] === '是') {
+            console.log(this.config)
+            magdata = this.config.qianmsg
+            console.log(magdata)
+          }
+          this.$dispatch('create', this.model.condition, this.userdefinedMessage, this.arrdownDate,
+            null,this.$refs.paged.$refs.cri.model.startDate,this.$refs.paged.$refs.cri.model.endDate, magdata)
+        }
+      },
+      search (args) {
+        args.condition = `${args.condition} and f_orgid = ` + `'${Vue.$login.f.orgid}'`
+        if (args.model.f_meter_brand && args.model.f_meter_brand.length > 0) {
+          if (args.model.f_meter_brand[0].f_meter_brand) {
+            args.condition = `${args.condition} and f_meter_brand = '${args.model.f_meter_brand[0].f_meter_brand}'`
+          }
+        }
+        console.log('查看条件', args.condition)
+        this.model.search(args.condition, args.model)
+        if (this.isFirst) {
+          this.isFirst = false
+        } else {
+          this.$dispatch('allchange5')
+          this.alllist = true
+        }
+      },
+
+      arrcreate () {
+        this.isbank = this.$refs.paged.$refs.cri.model.f_isbank[0]
+        this.arrshow = true
+      },
+      defined () {
+        this.definedShow = true
+      },
+      close () {
+        this.arrshow = false
+        this.definedShow = false
+      },
+      isAll (page) {
+        if (this.pages.includes(page)) { // 已添加,取消动作
+          // 从ids中删除本页所有数据的ids
+          this.addOrRemove(false)
+          this.pages = this.pages.filter((item) => {
+            return item !== page
+          })
+        } else { // 未添加
+          this.pages.push(page) // 添加id，添加动作
+          this.addOrRemove(true)
+        }
+      },
+      addOrRemove (is) {
+        let that = this
+        if (is) { // 添加本页所有数据到ids中
+          this.model.rows.forEach((row) => {
+            if (!that.ids.includes(row.f_userinfo_id)) {
+              that.ids.push(row.f_userinfo_id)
+            }
+          })
+        } else { // 从ids中取消所有的数据
+          this.model.rows.forEach((row) => {
+            that.ids = that.ids.filter((item) => {
+              return item !== row.f_userinfo_id
+            })
+          })
+        }
+      }
+    },
+    computed: {
+
+    }
+  }
+</script>
+<style>
+  .form-group{
+    height: 30px;
+  }
+</style>

package/src/filiale/qianneng/sale.js

@@ -95,4 +95,6 @@ export default function () {
   Vue.component('file-user-meter-info', (resolve) => { require(['./FilesManage/UserMeterInfoTest'], resolve) })
 // 当前选择用户的表具基本信息
   Vue.component('sale-userinfo', (resolve) => { require(['./revenue/Userinfo'], resolve) })
+  // 用户欠费记录查询
+  Vue.component('arrears-list', (resolve) => { require(['./ArrearsList'], resolve) })
 }