sale-client 3.6.451 → 3.6.453

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.451",
+  "version": "3.6.453",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -75,7 +75,7 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.31",
     "karma-webpack": "^2.0.2",
-    "ldap-clients": "3.0.96",
+    "ldap-clients": "3.0.60",
     "less": "^2.7.3",
     "manage-client": "3.1.8-88",
     "mkdirp": "^0.5.1",
@@ -90,7 +90,7 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.3.2",
+    "system-clients": "3.2.87",
     "url-loader": "^0.5.7",
     "vue-clipboard2": "0.3.1",
     "vue-hot-reload-api": "^1.2.0",

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

@@ -760,11 +760,22 @@
       },
       calText (val) {
         let str = ''
+        let num = 0
         val.forEach((item) => {
+          if (item.f_gas > 0) {
+            num = num + 1
+          }
           str = str + item.f_price + ' x ' + item.f_gas + '+'
         })
         str = str.slice(0, str.length - 1)
         this.calculatedetail = str
+        if (num > 1) {
+          if (this.$login.r.find(item => item == '阶梯提示无按钮')) {
+            this.$showAlert('友好提示：本次购气已跨阶梯', 'warning', 3000)
+          } else {
+            this.$showMessage('友好提示：本次购气已跨阶梯', ['confirm', 'cancel'])
+          }
+        }
       },
       close () {
         this.print = false

package/src/filiale/meihekou/CardHand.vue

@@ -537,7 +537,7 @@
             }
             row.f_user_id = row.f_user_id + ''
                 // 余气量=累购-(本期指数-表初始指数)
-            row.f_shengyu_gas = (row.f_total_gas - (row.f_tablebase - row.f_initial_base)).toFixed(2)
+            // row.f_shengyu_gas = (row.f_total_gas - (row.f_tablebase - row.f_initial_base)).toFixed(2)
             console.log('录入完毕。。', row)
             param.push(row)
           }

package/src/filiale/ningjin/UserInfoDetailManageNew.vue

@@ -0,0 +1,233 @@
+<template>
+  <div class="binary flex" >
+    <div class="row binary-left flex" style="width:99%;height:98%;margin-bottom:0px">
+      <div class="auto">
+        <user-base-info-new :row="row" :buttonshow="buttonshow"
+                            @refresh="search"
+                            @cancel-main="cancel"
+                            @cancel-re="cancelRe"
+        @search-main="search"></user-base-info-new></div>
+      <saletabbut  v-if="row" v-ref:list style="height:72%;margin-top: 1%;overflow-y: scroll">
+        <saletab header="流水查询" v-if="permission('流水查询')">
+          <record-query-user :row="row"></record-query-user>
+        </saletab>
+        <saletab header="机表流水查询" v-if="permission('机表流水查询')&&row.f_meter_type.includes('机表')">
+          <machine-record-query :row="row" v-if="show == '机表流水查询'" @deal-msg="dealMsg"></machine-record-query>
+        </saletab>
+        <saletab header="收费查询" v-if="!newWebHand && permission('收费查询')">
+          <charge-query-user  :row="row" v-if="show == '收费查询'" @deal-msg="dealMsg"></charge-query-user>
+        </saletab>
+        <saletab header="收费查询" v-if="newWebHand && permission('收费查询')">
+          <charge-query-user  :row="row" v-if="show == '收费查询'" @deal-msg="dealMsg"></charge-query-user>
+        </saletab>
+        <saletab header="累购查询" v-if="permission('累购查询')">
+          <Repurchase  :row="row" v-if="show == '累购查询'" @deal-msg="dealMsg"></Repurchase>
+        </saletab>
+        <saletab header="下账查询" v-if="!newWebHand && row.f_meter_type.includes('物联网表')&&permission('自动下账查询')">
+          <automatic-purse  :row="row"   @deal-msg="dealMsg"></automatic-purse>
+        </saletab>
+        <saletab header="下账查询" v-if="newWebHand && row.f_meter_type.includes('物联网表')&&permission('自动下账查询')">
+          <web-automatic-purse  :row="row"   @deal-msg="dealMsg"></web-automatic-purse>
+        </saletab>
+        <saletab header="抄表记录" v-if="row.f_meter_type.includes('卡表')&&permission('抄表记录')">
+          <card-hand-record :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></card-hand-record>
+        </saletab>
+        <saletab header="抄表记录" v-if="!newWebHand && !row.f_meter_type.includes('卡表')&&permission('抄表记录')">
+          <hand-query-user  :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></hand-query-user>
+        </saletab>
+        <saletab header="抄表记录" v-if="newWebHand && !row.f_meter_type.includes('卡表')&&permission('抄表记录')">
+          <web-hand-query-user  :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></web-hand-query-user>
+        </saletab>
+        <saletab header="补卡查询" v-if="row.f_meter_type.includes('卡表')&&permission('补卡查询')">
+          <fill-card-query-user :row="row" v-if="show == '补卡查询'" @deal-msg="dealMsg"></fill-card-query-user>
+        </saletab>
+        <saletab header="补气查询" v-if="permission('补气查询')">
+          <fill-gas-query-user  :row="row" v-if="show == '补气查询'" @deal-msg="dealMsg"></fill-gas-query-user>
+        </saletab>
+        <saletab header="换表查询" v-if="permission('换表查询')">
+          <change-meter-query-user  :row="row" v-if="show == '换表查询'" @deal-msg="dealMsg"></change-meter-query-user>
+        </saletab>
+        <saletab header="其他收费" v-if="permission('其他收费')">
+          <other-charge-query-user  :row="row" v-if="show == '其他收费'" @deal-msg="dealMsg"></other-charge-query-user>
+        </saletab>
+        <saletab header="过户查询" v-if="permission('过户查询')">
+          <transfer-query-user  :row="row" v-if="show == '过户查询'" @deal-msg="dealMsg"></transfer-query-user>
+        </saletab>
+        <saletab header="价格调整" v-if="permission('价格调整')">
+          <price-change-query-user  :row="row" v-if="show == '价格调整'" @deal-msg="dealMsg"></price-change-query-user>
+        </saletab>
+        <saletab header="附件查看" v-if="permission('附件查看')">
+          <upload-file-history :row="row" v-if="show == '附件查看'" @deal-msg="dealMsg"></upload-file-history>
+        </saletab>
+        <saletab header="变更记录" v-if="permission('变更记录')">
+          <change-record  :row="row" v-if="show == '变更记录'" @deal-msg="dealMsg"></change-record>
+        </saletab>
+        <saletab header="指令查看" v-if="row.f_meter_type.includes('物联网表')&&permission('指令查看')">
+          <query-instruct  :row="row" v-if="show == '指令查看'" @deal-msg="dealMsg"></query-instruct>
+        </saletab>
+        <saletab header="历史指令查看" v-if="row.f_meter_type.includes('物联网表')&&permission('历史指令查看')">
+          <query-history-instruct  :row="row" v-if="show == '历史指令查看'" @deal-msg="dealMsg"></query-history-instruct>
+        </saletab>
+        <saletab header="异常报警" v-if="row.f_meter_type.includes('物联网表')&&permission('异常报警')">
+          <watch-warning  :row="row" v-if="show == '异常报警'" @deal-msg="dealMsg"></watch-warning>
+        </saletab>
+        <saletab header="表具采集" v-if="row.f_meter_type.includes('物联网表')&&permission('表具采集')">
+          <watch-collection  :row="row" v-if="show == '表具采集'" @deal-msg="dealMsg"></watch-collection>
+        </saletab>
+        <saletab header="调价补差" v-if="permission('调价补差')">
+          <price-adjustment-query-user  :row="row" v-if="show == '调价补差'" @deal-msg="dealMsg"></price-adjustment-query-user>
+        </saletab>
+        <saletab header="设备查询" v-if="permission('设备查询')">
+          <deveice-record  :row="row" v-if="show == '设备查询'" @deal-msg="dealMsg"></deveice-record>
+        </saletab>
+        <saletab header="流量计参数查看" v-if="permission('流量计参数查看')">
+          <meter-param  :row="row" v-if="show == '流量计参数查看'" @deal-msg="dealMsg"></meter-param>
+        </saletab>
+        <saletab header="表使用量图表" v-if="permission('流量计参数查看')">
+          <table-usage-chart :row="row" v-if="show == '表使用量图表'" @deal-msg="dealMsg"></table-usage-chart>
+        </saletab>
+        <saletab header="用户设备查询"  v-if="permission('用户设备查看')">
+          <user-device-query :row="row" v-if="show == '用户设备查询'" @deal-msg="dealMsg"></user-device-query>
+        </saletab>
+        <saletab header="合同查看"  v-if="permission('合同查看')">
+          <contract-signing-list :row="row" v-if="show == '合同查看'" @deal-msg="dealMsg"></contract-signing-list>
+        </saletab>
+        <saletab header="用户重点记录" >
+          <user-key-record :row="row"  @deal-msg="dealMsg"></user-key-record>
+        </saletab>
+<!--        <saletab header="报装流转记录"   v-if="permission('报装流转记录查看')">-->
+<!--          <supervisory-control :row="row"  ></supervisory-control>-->
+<!--        </saletab>-->
+<!--        <saletab header="报装收费记录"   v-if="permission('报装收费记录查看')">-->
+<!--          <apply-charge-search :row="row"  ></apply-charge-search>-->
+<!--        </saletab>-->
+      </saletabbut>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+  // 导入IC卡相关查询界面
+  import ChangeMeterQueryUser from '../../components/common/userinfo_detail/ic_detail/ChangeMeterQueryUser'
+  import ChargeQueryUser from '../../components/common/userinfo_detail/ic_detail/ChargeQueryUser'
+  import ChargeRecordQueryUser from '../../components/common/userinfo_detail/ic_detail/ChargeRecordQuery'
+  import FillCardQueryUser from '../../components/common/userinfo_detail/ic_detail/FillCardQueryUser'
+  import HandQueryUser from '../../components/common/userinfo_detail/ic_detail/HandQueryUser'
+  import OtherChargeQueryUser from '../../components/common/userinfo_detail/ic_detail/OtherChargeQueryUser'
+  import RecordQueryUser from '../../components/common/userinfo_detail/ic_detail/RecordQueryUser'
+  import TransferQueryUser from '../../components/common/userinfo_detail/ic_detail/TransferQueryUser'
+  import CardHandRecord from '../../components/common/userinfo_detail/ic_detail/CardHandRecord'
+  import AutomaticPurse from '../../components/common/userinfo_detail/ic_detail/AutomaticPurse'
+  import Repurchase from '../../components/common/userinfo_detail/ic_detail/Repurchase'
+  import MachineRecordQuery from '../../components/common/userinfo_detail/ic_detail/MachineRecordQuery'
+  import WebAutomaticPurse from '../../components/common/userinfo_detail/ic_detail/WebAutomaticPurse'
+  import WebChargeQueryUser from '../../components/common/userinfo_detail/ic_detail/WebChargeQueryUser'
+  import WebHandQueryUser from '../../components/common/userinfo_detail/ic_detail/WebHandQueryUser'
+  import UserDeviceQuery from '../../components/common/userinfo_detail/ic_detail/UserDeviceQuery'
+  import contractSigningList from '../../components/common/userinfo_detail/ic_detail/contractSigningList'
+  import UserKeyRecord from '../../components/common/userinfo_detail/ic_detail/UserKeyRecord'
+  // import SupervisoryControl from './apply_detail/Supervisory/SupervisoryControl'
+  // import ApplyChargeSearch from './apply_detail/applyCharge/ApplyChargeSearch'
+  // 导入物联网相关查询
+  import QueryInstruct from '../../components/common/userinfo_detail/iot_detail/QueryInstruct'
+  import QueryHistoryInstruct from '../../components/common/userinfo_detail/iot_detail/QueryHistoryInstruct'
+  import WatchCollection from './WatchCollection'
+  import WatchWarning from '../../components/common/userinfo_detail/iot_detail/WatchWarning'
+  import PriceChangeQueryUser from '../../components/common/userinfo_detail/ic_detail/PriceChangeQueryUser'
+  import ChangeRecord from '../../components/common/userinfo_detail/ic_detail/ChangeRecord'
+  import PriceAdjustmentQueryUser from '../../components/common/userinfo_detail/ic_detail/PriceAdjustmentQueryUser'
+  import MeterParam from '../../components/common/userinfo_detail/ic_detail/MeterParam'
+  import DeveiceRecord from '../../components/common/userinfo_detail/ic_detail/DeveiceRecord'
+
+export default {
+    title: '用户详细信息',
+    props: ['f_userfiles_id', 'f_userinfo_id', 'f_userinfo_code', 'parentname', 'buttonshow'],
+    components: {
+      PriceAdjustmentQueryUser,
+      PriceChangeQueryUser,
+      AutomaticPurse,
+      WebAutomaticPurse,
+      WebChargeQueryUser,
+      WebHandQueryUser,
+      Repurchase,
+      ChangeMeterQueryUser,
+      ChargeQueryUser,
+      ChargeRecordQueryUser,
+      FillCardQueryUser,
+      HandQueryUser,
+      OtherChargeQueryUser,
+      RecordQueryUser,
+      TransferQueryUser,
+      WatchWarning,
+      WatchCollection,
+      QueryInstruct,
+      QueryHistoryInstruct,
+      ChangeRecord,
+      CardHandRecord,
+      MeterParam,
+      DeveiceRecord,
+      MachineRecordQuery,
+      UserDeviceQuery,
+      contractSigningList,
+      UserKeyRecord
+      // SupervisoryControl,
+      // ApplyChargeSearch
+    },
+    data () {
+      return {
+        row: null,
+        name: '自动下账查询',
+        newWebHand: this.$appdata.getSingleValue('新抄表'),
+        show: ''
+      }
+    },
+    ready () {
+      this.search()
+      console.log(this.$login)
+    },
+    methods: {
+      permission (name) {
+        if (this.$login.r.find(value => value == '收费综合查询')) {
+          if (!this.$login.r.find(value => value == name)) {
+            return false
+          }
+        }
+        return true
+      },
+      async search () {
+        let http = new HttpResetClass()
+        let condition = ' 1 = 1'
+        if (this.f_userfiles_id) {
+          condition = `f_userfiles_id = '${this.f_userfiles_id}'`
+        } else if (this.f_userinfo_id) {
+          condition = `f_userinfo_id = '${this.f_userinfo_id}'`
+        } else if (this.f_userinfo_code) {
+          condition = `f_userinfo_code = '${this.f_userinfo_code}'`
+        }
+
+        let getBaseInfo = await http.load('POST', 'rs/sql/iot_getUserBaseData',
+          {data: {condition: condition}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
+        this.row = getBaseInfo.data[0]
+        this.row.parentname = this.parentname || ''
+      },
+
+      cancel (val) {
+        this.$emit('cancel-main', val)
+      },
+
+      cancelRe (val) {
+        this.$emit('cancel-re', val)
+      },
+
+      butOper (val) {
+        this.name = val
+      }
+    },
+    watch: {
+      'f_userinfo_id' () {
+        this.search()
+      }
+    }
+  }
+</script>

package/src/filiale/ningjin/WatchCollection.vue

@@ -0,0 +1,115 @@
+<template >
+  <div id="stand-work-list" >
+    <div @keyup.enter="search" class="span">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
+          <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
+            <div class="row">
+
+              <div class="col-sm-2 form-group ">
+                <label class="font_normal_body">上报时间</label>
+                <datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_start_date"
+                            class="datepicker"
+                            condition="m.f_hand_date >= '{}'"
+                            placeholder="大于等于"
+                            style="width: 60%"
+                            v-model="model.f_start_date"
+                ></datepicker>
+              </div>
+              <div class="col-sm-2 form-group " >
+                <label class="font_normal_body">&nbsp;至</label>
+                <datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_end_date"
+                            class="datepicker"
+                            condition="m.f_hand_date <= '{}'"
+                            placeholder="小于等于"
+                            style="width: 60%"
+                            v-model="model.f_end_date"
+                ></datepicker>
+              </div>
+              <div style="float: right">
+                <button  @click="search()"  class="button_search" v-el:cba>查询</button>
+              </div>
+            </div>
+
+          </div>
+        </criteria>
+        <data-grid :model="model" class="list_area table_sy" partial='list' 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>
+              <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' partial='list'>
+            <tr >
+              <td style="text-align:center"><nobr>{{row.f_hand_date}}</nobr></td>
+              <th style="text-align:center"><nobr>{{row.f_jval}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_tablebase}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_valvestate == 0 ? '开阀' : row.f_valvestate === '1' ? '关阀' : '未上报'}}</nobr>
+              <th style="text-align:center"><nobr>{{row.f_upload_type}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_insert_date}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_meterdebitamt}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_signal}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_snr}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_batterylevel}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_lowlithiumbattery ? ((row.f_lowlithiumbattery - 0) == 0 ? '正常' : '异常') : '未知'}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_networkshutvalve}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_wmprepaytype}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_moneystate}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_magneticInterference}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_compensateState}}</nobr></th>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+
+  export default {
+    title: 'WatchCollection',
+    data () {
+      return {
+        model: new PagedList('rs/sql/iot_getNewLoseUserQuery', 50)
+      }
+    },
+    props: ['row'],
+    ready () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    methods: {
+      search (args) {
+        args.condition = `${args.condition} and f_userfiles_id='${this.row.f_userfiles_id}'`
+        this.model.search(args.condition, args.model)
+      }
+    },
+    watch: {
+      // 监听查询对象
+      'row' (val) {
+        if (this.row != null) {
+          this.$refs.paged.$refs.criteria.search()
+        }
+      }
+    }
+  }
+</script>
+

package/src/filiale/ningjin/sale.js

@@ -37,4 +37,5 @@ export default function () {
   Vue.component('card-hand', (resolve) => { require(['./CardHand'], resolve) })
   // 基本信息 表具信息
   Vue.component('user-base-info-new', (resolve) => { require(['./UserBaseInfoNew'], resolve) })
+  Vue.component('user-info-detail-manage-new', (resolve) => { require(['./UserInfoDetailManageNew'], resolve) })
 }

package/src/filiale/yangchun/BlackList/BlackListList.vue

@@ -151,6 +151,17 @@
               <input type="text" style="width:30%" class="input_search" title="小于等于" v-model="model.f_limit_times_big"
                      condition="f_limit_times <= '{}' " placeholder="小于等于">
             </div>
+            <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">限购类型</label>
+              <v-select
+                :value.sync="model.f_limit_type"
+                v-model="model.f_limit_type"
+                :options="$parent.$parent.limitTypes"
+                placeholder='请选择'
+                condition="f_limit_type = '{}'"
+                close-on-select>
+              </v-select>
+            </div>
             <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}">
               <label class="font_normal_body">气量/金额</label>
               <input type="text" style="width:30%" class="input_search" title="大于等于" v-model="model.f_limit_amount_small"
@@ -176,6 +187,7 @@
             <th style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>限购日期</th>
             <th style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>操作人</th>
             <th style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>限购次数</th>
+            <th style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>限购类型</th>
             <th style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>气量/金额</th>
             <th style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>审核状态</th>
             <th style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>移入原因</th>
@@ -196,6 +208,7 @@
           <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_parameter_value}}</td>
           <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_operator}}</td>
           <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_limit_times}}</td>
+          <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_limit_type}}</td>
           <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_limit_amount}}</td>
           <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_black_state}}</td>
           <td style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>{{row.f_comments}}</td>
@@ -248,9 +261,11 @@
           'f_parameter_value': '限购日期',
           'f_comments': '移入原因',
           'f_limit_times': '限购次数',
+          'f_limit_type': '限购类型',
           'f_limit_amount': '气量/金额',
           'f_remark': '备注'
-        }
+        },
+        limitTypes: [{label: '全部', value: ''}, {label: '气量', value: '气量'}, {label: '金额', value: '金额'}]
       }
     },
     props: {

package/src/filiale/yangchun/BlackList/BlackRecordQuery.vue

@@ -130,6 +130,18 @@
                   <input type="text" style="width:30%" class="input_search" title="小于等于" v-model="model.f_limit_times_big"
                          condition="f_limit_times <= '{}' " placeholder="小于等于">
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label  class=" font_normal_body">限购类型</label>
+                  <v-select
+                    :value.sync="model.f_limit_type"
+                    v-model="model.f_limit_type"
+                    :options="$parent.$parent.limitTypes"
+                    placeholder='请选择'
+                    condition="f_limit_type = '{}'"
+                    close-on-select
+                  >
+                  </v-select>
+                </div>
                 <div class="form-group col-sm-2">
                   <label class="font_normal_body">气量/金额</label>
                   <input type="text" style="width:30%" class="input_search" title="大于等于" v-model="model.f_limit_amount_small"
@@ -178,6 +190,7 @@
                 <th style="text-align: center;">移入（移出）原因</th>
                 <th style="text-align: center;">备注</th>
                 <th style="text-align: center;">限购次数</th>
+                <th style="text-align: center;">限购类型</th>
                 <th style="text-align: center;">气量/金额</th>
                 <th style="text-align: center;">管控级别</th>
                 <th style="text-align: center;">限制功能</th>
@@ -204,6 +217,7 @@
               <td style="text-align: center;">{{row.f_comments}}</td>
               <td style="text-align: center;">{{row.f_remark}}</td>
               <td style="text-align: center;">{{row.f_limit_times}}</td>
+              <td style="text-align: center;">{{row.f_limit_type}}</td>
               <td style="text-align: center;">{{row.f_limit_amount}}</td>
               <td style="text-align: center;">{{row.f_level}}</td>
               <td style="text-align: center;">{{$parent.$parent.$parent.formatFunction(row.f_function)}}</td>
@@ -261,6 +275,7 @@
           'f_black_state': '审核状态',
           'f_audit_comments': '审核备注',
           'f_limit_times': '限购次数',
+          'f_limit_type': '限购类型',
           'f_limit_amount': '气量(金额)',
           'f_level': '管控级别',
           'f_function': '限制功能',
@@ -269,7 +284,8 @@
         },
         operateType: [{label: '全部', value: ''}, {label: '移入重点用户 ', value: '移入重点用户'}, {label: '移出重点用户', value: '移出重点用户'}],
         fstate: [{label: '移入', value: '移入'}, {label: '移出', value: '移出'}],
-        flevel: [{label: '高', value: '高'}, {label: '中', value: '中'}, {label: '低', value: '低'}]
+        flevel: [{label: '高', value: '高'}, {label: '中', value: '中'}, {label: '低', value: '低'}],
+        limitTypes: [{label: '全部', value: ''}, {label: '气量', value: '气量'}, {label: '金额', value: '金额'}]
       }
     },
     props: {

package/src/plugins/MachineChargeService.js

@@ -33,6 +33,8 @@ let MachineChargeService = {
       f_serial_number: f_serial_number,
       f_balance: row.f_balance,
       f_overdue: model.f_overdue,
+      userinfo_version: row.userinfo_version,
+      version: row.version,
       f_collection: model.f_collection - model.f_garbage_fee,
       f_preamount: model.f_totalcost,
       f_payment: model.f_payment[0],