sale-client 4.2.13 → 4.2.15

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Wed Jun 25 17:54:33 CST 2025
+#Mon Jul 29 08:34:01 CST 2024
 gradle.version=5.2.1

package/package.json

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

package/src/filiale/meihekou/PrintBill.vue

@@ -56,11 +56,16 @@
         value.stairEndDate = `'${a.data.stairEndDate}'`
         let jt = a.data.chargeprice.length
         if (jt > 1) {
-          value.f_hasuse1 = (value.sumamount >= value.f_stair1ceiling - 0 ? value.f_stair1ceiling - 0 : value.sumamount - 0).toFixed(4)
-          value.f_hasuse2 = (value.sumamount >= value.f_stair2ceiling ? value.f_stair2ceiling - value.f_stair1ceiling : value.sumamount - value.f_stair1ceiling).toFixed(4)
-          value.f_hasuse3 = (value.sumamount >= value.f_stair3ceiling ? value.f_stair3ceiling - value.f_stair2ceiling : value.sumamount - value.f_stair2ceiling).toFixed(4)
-          if (value.f_hasuse2 < 0) value.f_hasuse2 = 0
-          if (value.f_hasuse3 < 0) value.f_hasuse3 = 0
+          // 转换为数字进行比较，避免字符串比较问题
+          const sumAmount = parseFloat(value.sumamount)
+          const stair1Ceiling = parseFloat(value.f_stair1ceiling)
+          const stair2Ceiling = parseFloat(value.f_stair2ceiling)
+          const stair3Ceiling = parseFloat(value.f_stair3ceiling)
+          value.f_hasuse1 = (sumAmount >= stair1Ceiling ? stair1Ceiling : sumAmount).toFixed(4)
+          value.f_hasuse2 = (sumAmount >= stair2Ceiling ? stair2Ceiling - stair1Ceiling : sumAmount - stair1Ceiling).toFixed(4)
+          value.f_hasuse3 = (sumAmount >= stair3Ceiling ? stair3Ceiling - stair2Ceiling : sumAmount - stair2Ceiling).toFixed(4)
+          if (parseFloat(value.f_hasuse2) < 0) value.f_hasuse2 = 0
+          if (parseFloat(value.f_hasuse3) < 0) value.f_hasuse3 = 0
         } else {
           let parm1 = {
             items: 'f_pregas',

package/src/filiale/meihekou/ReissueBill.vue

@@ -8,7 +8,7 @@
         <validator name='v'>
           <form class="form-horizontal  select-overspread">
             <div class="row" style="display: flex;justify-content: center;" id='reissue-bill'>
-              {{{bill.data}}}
+              <div v-html="bill.data"></div>
             </div>
             <div class="row" v-if="config.hasBillManage">
               <div v-if="!messShow">
@@ -57,7 +57,6 @@
                               v-model="model.f_bill_type"
                               :options='printtypes'
                               placeholder='请选择'
-                              v-model="model.f_bill_type"
                               @change="useTypeChange"
                               :value-single="true"
                               close-on-select v-ref:billtype>
@@ -73,7 +72,6 @@
                               v-model="model.f_use_type"
                               :options='usetypes'
                               placeholder='请选择'
-                              v-model="model.f_use_type"
                               @change="useTypeChange"
                               :value-single="true"
                               close-on-select v-ref:usetype>
@@ -209,11 +207,17 @@
       let jt = a.data.chargeprice.length
       console.log('value', value)
       if (jt > 1) {
-        value.f_hasuse1 = (value.sumamount >= value.f_stair1ceiling ? value.f_stair1ceiling - 0 : value.sumamount - 0).toFixed(4)
-        value.f_hasuse2 = (value.sumamount >= value.f_stair2ceiling ? value.f_stair2ceiling - value.f_stair1ceiling : value.sumamount - value.f_stair1ceiling).toFixed(4)
-        value.f_hasuse3 = (value.sumamount >= value.f_stair3ceiling ? value.f_stair3ceiling - value.f_stair2ceiling : value.sumamount - value.f_stair2ceiling).toFixed(4)
-        if (value.f_hasuse2 < 0) value.f_hasuse2 = 0
-        if (value.f_hasuse3 < 0) value.f_hasuse3 = 0
+        // 转换为数字进行比较，避免字符串比较问题
+        const sumAmount = parseFloat(value.sumamount)
+        const stair1Ceiling = parseFloat(value.f_stair1ceiling)
+        const stair2Ceiling = parseFloat(value.f_stair2ceiling)
+        const stair3Ceiling = parseFloat(value.f_stair3ceiling)
+        value.f_hasuse1 = (sumAmount >= stair1Ceiling ? stair1Ceiling : sumAmount).toFixed(4)
+        value.f_hasuse2 = (sumAmount >= stair2Ceiling ? stair2Ceiling - stair1Ceiling : sumAmount - stair1Ceiling).toFixed(4)
+        value.f_hasuse3 = (sumAmount >= stair3Ceiling ? stair3Ceiling - stair2Ceiling : sumAmount - stair2Ceiling).toFixed(4)
+        if (parseFloat(value.f_hasuse2) < 0) value.f_hasuse2 = 0
+        if (parseFloat(value.f_hasuse3) < 0) value.f_hasuse3 = 0
+        console.log('111value', value)
       } else {
         let parm1 = {
           items: 'f_pregas',
@@ -228,10 +232,33 @@
         value.f_stair2price = 0
         value.f_stair3price = 0
       }
-
       billParam = Object.assign(billParam, value)
     }
-    self.bill = new DataModel(self.data.billUrl, billParam, 'af-revenue')
+    // 确保所有参数值都是合法的JavaScript表达式
+    const sanitizeParams = (params) => {
+      const sanitized = {}
+      for (const [key, val] of Object.entries(params)) {
+        if (typeof val === 'string' && val.startsWith("'") && val.endsWith("'")) {
+          // 字符串参数，保持原样
+          sanitized[key] = val
+        } else if (typeof val === 'number' || typeof val === 'boolean') {
+          // 数值和布尔值，转换为字符串
+          sanitized[key] = val.toString()
+        } else if (val === null || val === undefined) {
+          // null 或 undefined，转换为空字符串
+          sanitized[key] = "''"
+        } else if (typeof val === 'object') {
+          // 对象，转换为JSON字符串
+          sanitized[key] = `'${JSON.stringify(val)}'`
+        } else {
+          // 其他情况，转换为字符串
+          sanitized[key] = `'${String(val)}'`
+        }
+      }
+      return sanitized
+    }
+    const safeBillParam = sanitizeParams(billParam)
+    self.bill = new DataModel(self.data.billUrl, safeBillParam, 'af-revenue')
     await self.bill.search(self.data.id)
     // self.bill.data = '我是补打发票'
     await getBillGen(self)

package/src/filiale/meihekou/common/userinfo_detail/ic_detail/MachineRecordQuery.vue

@@ -11,7 +11,7 @@
                 <label class="font_normal_body">开始时间</label>
                 <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
                             class="datepicker"
-                            condition="f_operate_date >= '{} 00:00:00' "
+                            condition="tt.f_operate_date >= '{} 00:00:00' "
                             placeholder="起始时间"
                             style="width:60%"
                             v-model="model.f_start_date"
@@ -21,7 +21,7 @@
                 <label class="font_normal_body" >结束时间</label>
                 <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_end_date"
                             class="datepicker"
-                            condition="f_operate_date <= '{} 23:59:59' "
+                            condition="tt.f_operate_date <= '{} 23:59:59' "
                             placeholder="结束时间"
                             style="width:60%"
                             v-model="model.f_end_date"

package/src/filiale/meihekou/manualChargeCenter.vue

@@ -1,394 +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>
+<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>