sale-client 4.1.230 → 4.2.1-ronghao

package/src/filiale/meihekou/manualChargeCenter.vue

@@ -0,0 +1,394 @@
+<template>
+  <div class="flex-row">
+    <div class="span" style="overflow-y: auto;">
+      <validator name='v'>
+        <form novalidate class="form-horizontal">
+          <div class="row">
+            <div class="col-sm-4">
+              <label for="f_paytype" class=" font_normal_body" title="参数名称：付款方式">收款方式</label>
+                <v-select id="f_payment"
+                          v-model="f_payment"
+                          placeholder='请选择'
+                          :value.sync="model.f_payment"
+                          :options='paytype'
+                          close-on-select clear-button></v-select>
+            </div>
+            <div class="col-sm-4">
+              <label for="f_price" class="font_normal_body">单价</label>
+              <input class="input_search" style="width:60%" type="number" v-model="model.f_price"  placeholder="请输入单价">
+            </div>
+            <div class="col-sm-4">
+              <label for="f_pregas" class=" font_normal_body">气量</label>
+              <input class="input_search" style="width:60%" type="number"
+                     v-model="model.f_pregas" id="fpregas"
+                     v-validate:f_pregas='{required: true, dctest: [maxgas, "<=" ]}' placeholder="请输入气量"
+                     >
+            </div>
+            <div class="col-sm-4">
+              <label for="f_totalcost" class=" font_normal_body">&nbsp;&nbsp;&nbsp;金额</label>
+              <input class="input_search" style="width:60%" type="number" v-model="model.f_totalcost" placeholder="金额"
+               >
+            </div>
+            <div class="col-sm-4" v-if="row.f_collection_type === '按气量'"
+                 :class="[$v.f_collection.required ? 'has-error' : 'has-success']">
+              <label for="f_collection" class=" font_normal_body">收款</label>
+              <input class="input_search" style="width:60%" type="number" v-model="model.f_collection"
+                     v-validate:f_collection='{required: true, dctest: [model.f_totalcost, ">=" ] }'
+                     v-el:sk v-scale="[model.f_totalcost, 2]" >
+            </div>
+            <div class="col-sm-4" v-if="row.f_collection_type === '按金额'">
+              <label for="f_collection" class=" font_normal_body">收款</label>
+              <input class="input_search" style="width:60%" type="number" v-model="model.f_collection"
+                     v-el:sk v-scale="[model.f_collection, 4]" >
+            </div>
+            <div class="row" style="padding-top: 0.5em;">
+              <div class="col-sm-8">
+                <label for="f_comments" class="font_normal_body">备&emsp;&emsp;注</label>
+                <input class="input_search" style="width:87%" v-model="model.f_comments" placeholder="备注">
+              </div>
+            </div>
+
+          </div>
+        </form>
+        <print-bill :show="print" :bill-config='config' v-ref:printbill :bill-data='billData'  :data='row'
+                    v-on:toggle="close" @printok="printok" :data='row'></print-bill>
+        <div style="text-align:right;height: 25%;">
+          <payment-code-button :clickable="!$v.valid || clickConfirm"
+                               :payment.sync="model.f_payment" :payment-data="paytype"
+                               @confirm-payment="confirm()">
+          </payment-code-button>
+          <button class="button_search btn-gn" @click="confirm()" :disabled='!$v.valid || clickConfirm'>确认</button>
+          <button class="button_clear btn-gn" @click="clean()">取消</button>
+        </div>
+      </validator>
+      <payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_collection"></payment-code>
+      <upload :blodid="row.f_userinfo_id" v-if="config.showupload" :businessid="randomBusinessId" isremark="true" fusetype="自定义收费"></upload>
+    </div>
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+
+  // 输入金额，换算气量
+  let preamountGen = async function (self) {
+    let dymoney = 0
+    let calFee = (self.model.f_totalcost - 0) + (self.row.f_balance - 0)
+    let getGas = await self.$CommonService.feeCalculate(self.model, calFee)
+    if (getGas.data.gas) {
+      if (self.row.f_isdecimal === '是') {
+        if (self.row.f_alias === 'QiaoSong') {
+          self.model.f_pregas = (getGas.data.gas - 0).toFixed(1)
+        } else {
+          self.model.f_pregas = (getGas.data.gas - 0).toFixed(4)
+        }
+      } else {
+        let tempnum = Math.floor(getGas.data.gas - 0)
+        let dymoney1 = await self.$CommonService.gasCalculate(self.model, (tempnum).toFixed(4))
+        dymoney = (getGas.data.chargenum - 0).toFixed(2) - (dymoney1.data.chargenum - 0).toFixed(2)
+        self.model.f_pregas = Math.floor(getGas.data.gas - 0)
+      }
+    }
+    self.model.f_preamount = calFee - (dymoney - 0)
+    self.model.chargeprice = getGas.data.chargeprice
+    Object.assign(self.model, self.model, getGas.data)
+    self.model.f_totalcost = ((self.model.f_totalcost - 0) - (dymoney - 0)).toFixed(4)
+    // self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
+    if(self.config.floor){
+      self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
+    }
+    self.calText(getGas.data.chargeprice)
+  }
+
+  // 输入气量，换算金额
+  let pregasGen = async function (self) {
+    if (self.row.f_isdecimal === '是') {
+      self.model.f_pregas = (self.model.f_pregas - 0).toFixed(4)
+    } else {
+      self.model.f_pregas = (self.model.f_pregas - 0).toFixed(0)
+    }
+    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.f_preamount = getAmount.data.chargenum
+      self.model.f_totalcost = ((self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(4))
+      Object.assign(self.model, self.model, getAmount.data)
+      self.model.chargeprice = getAmount.data.chargeprice
+      self.model.f_collection = self.model.f_totalcost
+      if(self.config.floor){
+        self.model.f_collection=Math.ceil(self.model.f_collection)
+      }
+      self.calText(getAmount.data.chargeprice)
+    }
+  }
+
+
+
+  let asyncCardMeterCenter = async function (self) {
+    await self.$getConfig(self, 'CardMeterCenter')
+    console.log('卡表收费config', self.config)
+    // 默认打印格式
+    self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
+    self.model.f_payment = [self.config.payment]
+    self.mulPrint = self.config.printType instanceof Array
+    // 判断限购
+    let limit_param = {
+      f_userinfo_id: self.row.f_userinfo_id,
+      f_user_id: self.row.f_user_id,
+      f_stairprice_id: self.row.f_stairprice_id
+    }
+    let getLimit = await self.$resetpost('api/af-revenue/logic/sale_getLimitGas', {data: limit_param}, {resolveMsg: null, rejectMsg: '获取限购值失败！！'})
+    console.log('获取限购值', getLimit)
+    self.hasLimit = getLimit.data.hasLimit
+    if (self.hasLimit) {
+      if (getLimit.data.f_limit_value || getLimit.data.f_limit_amount) {
+        if (getLimit.data.f_limit_value < 0 || getLimit.data.f_limit_amount < 0) {
+          self.$showAlert(`${getLimit.data.msg}`, 'warning', 3000)
+          self.$dispatch('refresh')
+        } else {
+          if (getLimit.data.f_limit_value) {
+            self.maxgas = (getLimit.data.f_limit_value - 0)
+            self.limitgas = true
+          }
+          if (getLimit.data.f_limit_amount) {
+            self.maxmoney = (getLimit.data.f_limit_amount - 0)
+            self.limitmoney = true
+          }
+        }
+      }
+    }
+  }
+  export default {
+    title: '自定义收费',
+    data () {
+      return {
+        serialShow: false,
+        resid: [],  // 存放新增的f_files表中id
+        config: {
+          notShowFormula: false, // 不显示计算公式,默认显示
+          hasPrint: true,  // 默认打票
+          hasBillManage: false,  // 默认不启用发票管理
+          floor: false,  // 是否取整收费
+          billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
+          printType: '普通收据', // 收据/电子票/专用发票/国税发票
+          showupload: true,
+          payment: '现金缴费'
+        },
+        model: {
+          f_purchase: 0,
+          f_write_card: '不写卡',
+          f_payment: '',
+          f_pregas: '',
+          f_preamount: 0,
+          f_totalcost: 0,
+          f_curbalance: 0,
+          f_collection: 0,
+          f_balance: 0,
+          f_print: [],
+          f_meter_type: '',
+          f_voucher_number: '',
+          is_accumulate: '计入',
+          f_user_name: '',
+          f_comments: ''
+        },
+        calculatedetail: '',
+        print: false,
+        billData: {
+          url: 'api/af-revenue/report/card_bill',
+          billnumber: ''
+        },
+        randomBusinessId: '',
+        hasLimit: false,
+        maxgas: 99999999, // 限购
+        maxmoney: 99999999,
+        limitmoney: false,
+        limitgas: false,
+        mulPrint: false,
+        clickConfirm: false, // 控制确认按钮只能点击一次
+        // 下拉框值
+        paytype: this.$appdata.getParam('付款方式'),
+        printstyle: this.$appdata.getParam('打印格式'),
+        mjshow: false
+      }
+    },
+    props: ['row'],
+    ready () {
+      // this.getPurchase()
+      console.log('456789', this.row)
+      this.model.f_price_id = this.row.f_price_id
+      this.model.f_user_id = this.row.f_user_id
+      this.model.f_userfiles_id = this.row.f_userfiles_id
+      this.model.f_userinfo_id = this.row.f_userinfo_id
+      this.model.f_userinfo_code = this.row.f_userinfo_code
+      this.model.f_user_name = this.row.f_user_name
+      this.model.f_user_type = this.row.f_user_type
+      this.model.f_meternumber = this.row.f_meternumber
+      this.model.f_address = this.row.f_address
+      this.model.f_meter_brand = this.row.f_meter_brand
+      this.model.f_meter_style = this.row.f_meter_style
+      this.model.f_balance = this.row.f_alias === 'QiaoSong' ? Math.trunc(this.row.f_balance) : this.row.f_balance
+      if (this.row.f_collection_type == '按金额') {
+        this.model.f_totalcost = ''
+        this.model.f_pregas = 0
+      }
+      document.getElementById('fpregas').focus()
+      asyncCardMeterCenter(this)
+      this.getRandomId()
+    },
+    events: {
+      // 删除Resid数组元素
+      'delResid' (val) {
+        this.resid.$remove({id: val, f_biobid: ''})
+        // this.resid.splice(this.resid.indexOf({id:val,f_biobid:''}),1);
+      },
+      // 增加Resid数组元素
+      'resid' (val) {
+        this.resid.push({id: val, f_biobid: ''})
+      }
+    },
+    methods: {
+      getRandomId () {
+        this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+          let res = Math.random() * 16 | 0
+          let v = c == 'x' ? res : (res & 0x3 | 0x8)
+          return v.toString(16)
+        })
+      },
+      confirm () {
+        this.clickConfirm = true
+        this.$showMessage(`对客户${this.model.f_user_name}进行收费。该操作只做收费，不做写卡，确定要进行该操作吗？`, ['confirm', 'cancel']).then(async (res) => {
+          if (res === 'confirm') {
+            let data = {
+              f_user_id: this.model.f_user_id,
+              f_userfiles_id: this.model.f_userfiles_id,
+              f_userinfo_id: this.model.f_userinfo_id,
+              f_user_name: this.model.f_user_name,
+              f_user_type: this.model.f_user_type,
+              f_meternumber: this.model.f_meternumber,
+              f_address: this.model.f_address,
+              f_meter_brand: this.model.f_meter_brand,
+              f_meter_style: this.model.f_meter_style,
+              f_operator: Vue.$login.f.name,
+              f_operatorid: Vue.$login.f.id,
+              f_orgid: Vue.$login.f.orgid,
+              f_orgname: Vue.$login.f.orgs,
+              f_depid: Vue.$login.f.depids,
+              f_depname: Vue.$login.f.deps,
+              f_operate_date: this.$login.toStandardTimeString(),
+              f_payment: this.model.f_payment[0],
+              f_price: this.model.f_price,
+              f_pregas: this.model.f_pregas,
+              f_total_cost: this.model.f_totalcost,
+              f_collection: this.model.f_collection,
+              f_comments: this.model.f_comments
+            }
+            console.log('自定义收费', data)
+            await this.$resetpost('api/af-revenue/entity/save/t_customizedFees', data, {warnMsg: `确定要对用户${this.model.f_user_name}进行自定义收费吗？`, resolveMsg: '收费成功！！', rejectMsg: '收费失败！！请重试！！'})
+            let ss = await this.$refs.paymentcode.flowPath()
+            this.$refs.paymentcode.paymentCodeShow = false
+            console.log('付款码操作返回', ss)
+            if (!ss.result) return
+            this.$dispatch('refresh')
+            this.clickConfirm = false
+          }
+        })
+      },
+      clean () {
+        this.$info('取消操作')
+        this.$dispatch('refresh', this.row)
+      },
+      printok () {
+        // 收据打完，判断是否还有其他票据进行请求
+        for (let i = 0; i < this.model.f_print.length; i++) {
+          if (this.model.f_print[i] === '电子发票') {
+            this.$CommonService.openEticket(this.row.id, '售气收费')
+          }
+        }
+        this.$dispatch('success')
+      },
+      pregas () {
+        if (this.model.f_pregas && this.model.f_pregas > 0) {
+          try {
+            // 对气量进行验证
+            if ((this.row.f_topup_ceil - 0) > 0 && (this.model.f_pregas - 0) > (this.row.f_topup_ceil - 0)) {
+              this.$showAlert(`您输入的气量不能大于该表的充值上限: ${this.row.f_topup_ceil}`, 'warning', 5000)
+              this.model.f_pregas = null
+            } else {
+              pregasGen(this)
+            }
+          } catch (error) {
+            this.$showAlert(`发卡售气划价错误，错误类型：${error}`, 'danger', 0)
+            this.$dispatch('error', '发卡售气', this.model, error)
+          }
+        }
+      },
+      preamount () {
+        if ((this.model.f_totalcost && this.model.f_totalcost > 0) || this.row.f_balance > 0) {
+          try {
+            preamountGen(this)
+          } catch (error) {
+            this.$showAlert(`发卡售气划价错误，错误类型：${error}`, 'danger', 0)
+            this.$dispatch('error', '发卡售气', this.model, error)
+          }
+        }
+      },
+      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('友好提示：本次购气已跨阶梯 计算公式:' + (this.calculatedetail ? this.calculatedetail : ' 暂无'), 'warning', 3000)
+          } else {
+            this.$showMessage('友好提示：本次购气已跨阶梯 计算公式:' + (this.calculatedetail ? this.calculatedetail : ' 暂无'), ['confirm', 'cancel'])
+          }
+        }
+      },
+      close () {
+        this.print = false
+        this.clean()
+      }
+    },
+    watch: {
+      'model.f_payment' (val) {
+        if (val == '免交') {
+          this.mjshow = true
+        } else {
+          this.mjshow = false
+        }
+      }
+    },
+    computed: {
+      'curbalance' () {
+        if (this.model.f_preamount) {
+          if (this.config.calculatePreByCollection) {
+            return ((this.model.f_collection - 0) + (this.row.f_balance - 0) - this.model.f_preamount).toFixed(4)
+          }
+          if (this.row.f_collection_type === '按金额') {
+            return ((this.model.f_totalcost - 0) + (this.row.f_balance - 0) - (this.model.f_preamount - 0)).toFixed(4)
+          } else {
+            if ((this.row.f_balance - 0) > (this.model.f_preamount - 0)) {
+              return ((this.row.f_balance - 0) - (this.model.f_preamount - 0)).toFixed(4)
+            } else {
+              return ((this.model.f_collection - 0) - (this.model.f_totalcost - 0)).toFixed(4)
+            }
+          }
+        } else {
+          return 0
+        }
+      },
+      isMachineMeter() {
+        return this.row.f_meter_type && this.row.f_meter_type.indexOf('机表') !== -1
+      }
+    }
+  }
+</script>
+
+<style>
+</style>

package/src/filiale/meihekou/meterTable.vue

@@ -0,0 +1,220 @@
+<template>
+  <div class="flex-row">
+    <div class="span">
+      <validator name='v'>
+        <form novalidate class="form-horizontal">
+          <div class="row" v-if="isGas">
+            <div class="col-sm-4" :class="[$v.f_pregas.dctest ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">赠费</label>
+              <input class="input_search" style="width:60%" type="number"
+                     v-validate:f_preamount='{ dctest: [0, ">=" ]}' v-model="model.f_preamount" placeholder="赠气量" v-ref:f_pregas>
+            </div>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="参数值:计入/不计入，计入:更新档案结余及累购，不计入:只保存记录不对档案进行操作">计入累购</label>
+            <input v-show="false" v-model="model.f_add_gas" v-validate:f_operat_type='{required: true}'>
+            <v-select :value.sync="model.f_add_gas" value-single
+                      :options='addGas' placeholder='请选择'
+
+                      selected="是否计入累购"
+                      style="width:60%"
+                      close-on-select></v-select>
+          </div>
+          <div class="row" v-if="!isGas">
+            <div class="col-sm-4">
+              <label for="f_preamount" class=" font_normal_body">金额:</label>
+              <input  class="input_search" style="width:60%" type="number" min = "0.01" v-model="model.f_preamount" placeholder="金额">
+            </div>
+            <!--            <div class="col-sm-4">-->
+            <!--              <label for="f_add_gas" class="font_normal_body">是否入累计:</label>-->
+            <!--              <v-select v-model="model.f_add_gas"-->
+            <!--                        placeholder='请选择'-->
+            <!--                        :value.sync="model.f_add_gas"-->
+            <!--                        :options='addGas'-->
+            <!--                        close-on-select clear-button>-->
+            <!--              </v-select>-->
+            <!--            </div>-->
+          </div>
+          <div class="row" style="margin-top:10px;">
+            <label for="f_reason" class=" font_normal_body">备&emsp;&emsp;注</label>
+            <input  class="input_search" style="width:55%" rows="1" v-model="model.f_reason" placeholder="备注">
+          </div>
+        </form>
+        <div style="text-align:right;margin-top: 2%">
+
+          <button class="button_search" @click="confirm()"  :disabled='!$v.valid' >确认</button>
+          <button class="button_clear" @click="clean()" >取消</button>
+        </div>
+      </validator>
+      <print-bill :show="print" :bill-config='config' :bill-data='billData' :data='row' @toggle="close" @printok="printok"  v-ref:printbill></print-bill>
+    </div>
+  </div>
+  <upload :blodid="row.f_userinfo_id" :businessid="randomBusinessId" isremark="true" fusetype="赠气"></upload>
+</template>
+<script>
+let otherGasGen = async function (self) {
+  let data = self.getSell()
+  data.f_total_gas = data.f_add_gas === '计入' ? (self.row.f_total_gas - 0) + (self.model.f_pregas - 0) : (self.row.f_total_gas - 0)
+  data.f_total_fee = data.f_add_gas === '计入' ? (self.row.f_total_fee - 0) + (self.model.f_preamount - 0) : (self.row.f_total_fee - 0)
+  if (self.isGas) {
+    data.f_pregas = self.model.f_pregas
+  } else {
+    data.f_preamount = self.model.f_preamount
+  }
+  data.f_userfiles_id = {
+    f_userfiles_id: self.row.f_userfiles_id,
+    f_userinfo_id: self.row.f_userinfo_id,
+    f_user_id: self.row.f_user_id,
+    version: self.row.version,
+    f_times: self.row.cardInfo.Times + 1,
+    f_total_gas: data.f_add_gas === '计入' ? (self.row.f_total_gas - 0) + (self.model.f_pregas - 0) : (self.row.f_total_gas - 0),
+    f_total_fee: data.f_add_gas === '计入' ? (self.row.f_total_fee - 0) + (self.model.f_preamount - 0) : (self.row.f_total_fee - 0),
+    f_balance_gas: 0,
+    f_balance_amount: 0
+  }
+
+  // 保存表类型
+  data.f_meter_type = self.row.f_meter_type
+  data.f_times = self.row.cardInfo.Times + 1
+
+  await self.$resetpost('api/af-revenue/logic/fedWithgasMeter', data, {resolveMsg: null, rejectMsg: '补气报错！！！'})
+}
+let asyncIcTable = async function (self) {
+  await self.$getConfig(self, 'icTable')
+  console.log('卡表赠气赠费config', self.config)
+  this.model.f_add_gas = self.config.f_add_gas
+}
+
+export default {
+  title: '卡表赠气赠费',
+  data () {
+    return {
+      isGas: false,
+      acceptprint: false,
+      acceptUrl: '',
+      printData: {
+        reason: '',
+        fillgas: '',
+        fillamount: ''
+      },
+      randomBusinessId: '',
+      resid: [],  // 存放新增的f_files表中id
+      model: {
+        f_pregas: 0,
+        f_preamount: 1,
+        f_reason: '',
+        f_add_gas: '计入'
+      },
+      config: {
+        hasPrint: false,
+        f_add_gas: '计入'
+      },
+      billData: {
+        url: 'api/af-revenue/report/icGiftGas',
+        operator: this.$login.f.name,
+        billnumber: ''
+      },
+      print: false
+    }
+  },
+  props: ['row', 'cardData'],
+  ready () {
+    this.isGas = this.row.f_meter_type = false
+    this.row.cardInfo = this.cardData
+    console.log('卡信息', this.row.cardInfo)
+    this.getRandomId()
+    asyncIcTable(this)
+    this.billData.url = 'api/af-revenue/report/iotGiftFee'
+  },
+  events: {
+    // 删除Resid数组元素
+    'delResid' (val) {
+      this.resid.$remove({id: val, f_biobid: ''})
+      // this.resid.splice(this.resid.indexOf({id:val,f_biobid:''}),1);
+    },
+    // 增加Resid数组元素
+    'resid' (val) {
+      this.resid.push({id: val, f_biobid: ''})
+    }
+  },
+  methods: {
+    getRandomId () {
+      this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        let res = Math.random() * 16 | 0
+        let v = c == 'x' ? res : (res & 0x3 | 0x8)
+        return v.toString(16)
+      })
+    },
+    confirm () {
+      otherGasGen(this).then((res) => {
+        let param1 = []
+        for (let row of this.resid) {
+          param1.push({id: row.id})
+        }
+        let data = {
+          param: param1,
+          f_blobid: res
+        }
+        this.$resetpost('api/af-revenue/logic/updatefiles', data)
+
+        if (this.config.hasPrint) {
+          this.row.id = res
+          this.row.f_bill_type = this.isGas ? '机表赠气' : '机表赠费'
+          this.row.f_bill_style = '普通收据'
+          this.print = true
+        } else {
+          this.$dispatch('success')
+        }
+      })
+    },
+    getSell () {
+      return {
+        f_balance: this.row.f_balance,
+        f_curbalance: this.row.f_balance,
+        f_card_id: this.row.f_card_id,
+        f_comments: this.model.f_reason,
+        f_type: this.model.f_pregas != 0 ? '机表赠气' : '机表赠费',
+        f_user_id: this.row.f_user_id,
+        f_userfiles_id: this.row.f_userfiles_id,
+        f_add_gas: this.model.f_add_gas,
+        f_userinfo_id: this.row.f_userinfo_id,
+        f_user_name: this.row.f_user_name,
+        f_user_type: this.row.f_user_type,
+        f_gasproperties: this.row.f_gasproperties,
+        f_address: this.row.f_address,
+        f_meter_brand: this.row.f_meter_brand,
+        f_operat_type: '其他补气',
+        f_describe: `${this.$login.f.name}对客户${this.row.f_user_name}进行${this.model.f_pregas != 0 ? '机表赠气' : '机表赠费'}操作`,
+        f_state: '有效',
+        f_operator: this.$login.f.name,
+        f_operatorid: this.$login.f.id,
+        f_orgid: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgs,
+        f_depid: this.$login.f.depids,
+        f_depname: this.$login.f.deps,
+        f_zoneid: this.$login.f.zoneid,
+        f_zones: this.$login.f.zones
+      }
+    },
+    close () {
+      this.print = false
+      this.clean()
+    },
+    clean () {
+      this.$info('取消操作')
+      this.$dispatch('cancelclean', this.row)
+    },
+    printok () {
+      this.$dispatch('success')
+    }
+  },
+  computed: {
+    addGas () {
+      return [{label: '计入', value: '计入'}, {label: '不计入', value: '不计入'}]
+    }
+  }
+}
+</script>
+
+<style>
+</style>

package/src/filiale/meihekou/sale.js

@@ -52,4 +52,19 @@ export default function () {
   Vue.component('meter-book-add', (resolve) => { require(['./MeterBookAdd'], resolve) })
   // 超用收费
   Vue.component('over-use-charge', (resolve) => { require(['./OverUseCharge'], resolve) })
+  // 过户
+  Vue.component('transfer-manage', (resolve) => { require(['./TransferManage'], resolve) })
+  // 发卡售气
+  Vue.component('show-card-sell-gas', (resolve) => { require(['./ShowCardSellGas'], resolve) })
+  // 无卡收费
+  Vue.component('no-card-meter-center', (resolve) => { require(['./NoCardMeterCenter'], resolve) })
+  Vue.component('manual-charge-center', (resolve) => { require(['./manualChargeCenter'], resolve) })
+  // 卡表收费
+  Vue.component('card-meter-center', (resolve) => { require(['./CardMeterCenter'], resolve) })
+  // 机表抄表
+  Vue.component('machine-hand', (resolve) => { require(['./machineHand'], resolve) })
+  Vue.component('charge-oper', (resolve) => { require(['./ChargeOper'], resolve) })
+  Vue.component('meterTable', (resolve) => { require(['./meterTable'], resolve) })
+  // 卡表赠气
+  Vue.component('icTable', (resolve) => { require(['./icTable'], resolve) })
 }

package/src/filiale/qianneng/MeterMessage.vue

@@ -97,7 +97,7 @@
         } else {
           this.metermessage.f_meter_base = (this.metermessage.f_meter_base - 0).toFixed(0)
         }
-        if (this.metermessage.f_meter_base > this.f_meter_base_max) {
+        if ((this.metermessage.f_meter_base - 0) > (this.f_meter_base_max - 0)) {
           this.$showAlert(`新表底数可录入的最大值为: ${this.f_meter_base_max}, 请核实后重新录入!!!`, 'warning', 3000)
           this.metermessage.f_meter_base = ''
         }