sale-client 3.7.62 → 3.7.63-byls

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Mon Jun 22 09:12:25 CST 2026
+gradle.version=5.2.1

package/package.json

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

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

@@ -459,7 +459,7 @@
       }
       console.log('获取到的欠费记录', owes)
       self.alldue_fee = owes.reduce((total, item) => {
-        return total + (item.f_oughtfee + item.overdue)
+        return total + (item.f_oughtfee + item.overdue - item.f_debt_money)
       }, 0)
       console.log('总欠费金额为', self.alldue_fee)
       self.owes = res.data

package/src/filiale/bayan/ChangeSendCard.vue

@@ -0,0 +1,23 @@
+<template>
+  <div class="auto">
+    <card-change-fill v-if="row.f_meter_type.includes('卡表')||(row.f_meter_type.includes('物联网表') && row.f_open_type ==='发卡开户')" :row.sync="row"></card-change-fill>
+    <iot-change-fill v-if="row.f_meter_type.includes('物联网表')&& row.f_open_type !=='发卡开户'" :row.sync="row"></iot-change-fill>
+    <machine-change-fill v-if="row.f_meter_type.includes('机表')" :row.sync="row"></machine-change-fill>
+  </div>
+</template>
+<script>
+  import IotChangeFill from './IotChangeFill'
+  import CardChangeFill from './../../components/charge/business/CardChangeFill'
+  import MachineChangeFill from './../../components/charge/business/machine/MachineChangeFill'
+
+  export default {
+    components: {CardChangeFill, IotChangeFill, MachineChangeFill},
+    title: '换表补气',
+    data () {
+      return {
+
+      }
+    },
+    props: ['row']
+  }
+</script>

package/src/filiale/bayan/IotChangeFill.vue

@@ -0,0 +1,495 @@
+<template>
+  <div class="flex-row">
+    <div class="span" style="overflow-y: auto;">
+      <validator name='v'>
+        <form novalidate class="form-horizontal">
+          <p class="bg-info text-center" style="padding: 8px;">换表{{showGas ? '补气' : '补费'}}</p>
+
+          <div class="row">
+            <div class="col-sm-4" v-if="showGas">
+              <label for="f_pregas" class=" font_normal_body">剩余气量</label>
+              <input class="input_search" style="width:60%" type="number"
+                     v-model="model.f_fill_gas"
+                     placeholder="剩余补气量" disabled>
+              <!--<button type="button" class="btn button_new btn-lg" style="width:13%"-->
+                      <!--@click="openExplain">-->
+                <!--<span class="glyphicon glyphicon-question-sign"></span>-->
+              <!--</button>-->
+            </div>
+            <div class="col-sm-4" v-if="!showGas">
+              <label for="f_pregas" class=" font_normal_body">应补金额</label>
+              <input class="input_search" style="width:60%" type="number"
+                     :value="model.f_fill_money" disabled>
+              <!--<button type="button" class="btn button_new btn-lg" style="width:13%"-->
+                      <!--@click="openExplain">-->
+                <!--<span class="glyphicon glyphicon-question-sign"></span>-->
+              <!--</button>-->
+            </div>
+          </div>
+          <div v-show="remanentfalg">
+            <strong style="font-size: large" >【补气提示】:{{remanentstr}}</strong><br/>
+          </div>
+          <div v-show="false">
+            <div class="row" style="margin-top:5px;">
+              <div class="col-sm-4">
+                <label class=" font_normal_body" title="参数名称：付款方式">收款方式</label>
+                <v-select v-model="f_payment"
+                          placeholder='请选择'
+                          style="width:60%"
+                          :value.sync="model.f_payment"
+                          :options='paytype'
+                          clear-button></v-select>
+
+              </div>
+              <div class="col-sm-4">
+                <label for="f_print" class="font_normal_body">打印格式</label>
+                <v-select id="print"
+                          v-model="f_print"
+                          placeholder='请选择'
+                          style="width:60%"
+                          :value.sync="model.f_print"
+                          :options='printstyle'
+                          close-on-select clear-button>
+                </v-select>
+
+              </div>
+              <div class="col-sm-4" v-if="model.f_payment[0].includes('POS')">
+                <label for="f_voucher_number" class="font_normal_body">凭证号</label>
+                <input type="text" class="input_search" style="width:60%" v-model="model.f_voucher_number" placeholder="凭证号">
+              </div>
+            </div>
+
+            <div class="row" style="margin-top:5px;">
+
+              <div class="col-sm-4" v-if="(row.f_balance_gas - 0) < 0">
+                <label for="f_balance_gas" class="font_normal_body">超用气量</label>
+                <input type="text" class="input_search" style="width:60%" v-model="(0 - row.f_balance_gas)" disabled>
+              </div>
+
+              <div class="col-sm-4" v-if="(row.f_balance_amount - 0) < 0">
+                <label for="f_balance_amount" class="font_normal_body">超用金额</label>
+                <input type="text" class="input_search" style="width:60%" v-model="(0 - row.f_balance_amount)" disabled>
+              </div>
+
+              <div class="col-sm-4" v-if="showGas"
+                   :class="[$v.f_pregas.required || $v.f_pregas.dctest ? 'has-error' : 'has-success']">
+                <label for="f_pregas" class="font_normal_body">预购气量</label>
+                <input id="f_pregas" class="input_search" style="width:60%" type="number" v-model="model.f_pregas"
+                       @blur="pregas"
+                       v-validate:f_pregas='{required: true, dctest: [(0 - row.f_balance_gas) < 0 ? 0 : (0 - row.f_balance_gas), ">=" ]}'
+                       v-scale="[model.f_pregas, 4]">
+              </div>
+
+              <div class="col-sm-4" v-if="!showGas"
+                   :class="[$v.f_preamount.required || $v.f_preamount.dctest ? 'has-error' : 'has-success']">
+                <label for="f_preamount" class="font_normal_body">预购金额</label>
+                <input id="f_preamount" class="input_search" style="width:60%" type="number" v-model="model.f_preamount"
+                       @blur="remstrgas" v-validate:f_preamount='{required: true, dctest: [(0 - row.f_balance_amount) < 0 ? 0 : (0 - row.f_balance_amount) , ">" ]}'
+                       v-scale="[model.f_preamount, 4]" :disabled="showGas">
+              </div>
+
+              <div class="col-sm-4" v-if="showGas">
+                <label for="f_preamount" class="font_normal_body">预购金额</label>
+                <input class="input_search" style="width:60%" type="number" v-model="model.f_preamount"
+                       v-scale="[model.f_preamount, 4]" :disabled="showGas">
+              </div>
+            </div>
+            <div class="row" style="margin-top:5px;">
+              <div class="col-sm-12">
+                <label for="f_curbalance" class="font_normal_body">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
+                <input class="input_search" style="width:53.5%" v-model="model.f_comments">
+              </div>
+            </div>
+          </div>
+          <div v-if="paymentModel.length >1">
+            <div class="row" style="margin-top:10px;" >
+              <p class="col-sm-2 text-left" style="padding: 10px;"><img src="../../../../../static/juxing.png"/><strong style="margin-left: 4%">付款明细</strong></p>
+            </div>
+            <div class="row" style="margin-top:10px;" >
+              <div class="col-sm-4 " v-for="pay in paymentModel" >
+                <label class="font_normal_body">{{pay.f_payment}}</label>
+                <input id="f_money" type="text" class="input_search" style="width:60%" v-model="pay.f_money">
+              </div>
+              <div class="col-sm-4 ">
+                <strong v-if="!islegal" style="color: red">所输入的金额必须等于收款金额</strong>
+              </div>
+            </div>
+          </div>
+        </form>
+        <validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>
+        <print-bill :show="print" :bill-data='billData' v-ref:printbill :bill-config='config'
+                    @printok="printok" @toggle="printCancel" :data='row' ></print-bill>
+        <div style="text-align:right;height: 25%;margin-top: 2%">
+          <strong style="font-size: large" v-if="!config.notShowFormula && showGas">计算公式:{{calculatedetail ? calculatedetail : ' 暂无'}}</strong><br/>
+          <payment-code-button :clickable="!$v.valid || validateOk || !islegal"
+                               :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 || validateOk || !islegal'>确认</button>
+          <button class="button_clear btn-gn" @click="clean()">取消</button>
+        </div>
+      </validator>
+    </div>
+
+    <payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_collection"></payment-code>
+  </div>
+</template>
+<script>
+  /**
+   *综合业务
+   *物联网表收费组件
+   */
+  import XML from '../../../../plugins/ObjTree'
+
+  let asyncIOTMeterCenter = async function (self) {
+    await self.$getConfig(self, 'IotChangeFill')
+    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.model.f_use_type = self.config.billType
+    self.model.f_bill_type = self.model.f_print
+    self.hasValidateBill = self.config.hasBillManage
+  }
+
+  let pregasGen = async function (self) {
+    if ((self.model.f_fill_gas - 0) < (self.model.f_pregas - 0)) {
+      let calGas = 0
+      if (self.row.f_isdecimal === '是') {
+        calGas = ((self.model.f_pregas - 0) - (self.model.f_fill_gas - 0)).toFixed(4)
+      } else {
+        calGas = ((self.model.f_pregas - 0) - (self.model.f_fill_gas - 0)).toFixed(0)
+      }
+      self.model.f_user_id = self.row.f_user_id
+      self.model.f_userfiles_id = self.row.f_userfiles_id
+      let getAmount = await self.$CommonService.gasCalculate(self.model, calGas)
+      self.model.f_preamount = getAmount.data.chargenum
+      Object.assign(self.model, self.model, getAmount.data)
+      self.model.chargeprice = getAmount.data.chargeprice
+      self.calText(getAmount.data.chargeprice)
+    } else {
+      self.model.f_preamount = 0
+    }
+    self.remstrgas()
+  }
+
+  let IOTChargeGen = async function (self) {
+    try {
+      if (self.paymentModel.length === 0) {
+        self.paymentModel = [{
+          f_payment: self.model.f_payment[0],
+          f_money: self.model.f_preamount
+        }]
+      }
+
+      self.model.payments = self.paymentModel
+
+      let param = {
+        f_share_times: self.row.f_share_times,
+        f_hascard: self.row.f_hascard,
+        f_open_way: self.row.f_open_type,
+        f_user_name: self.row.f_user_name,
+        f_user_type: self.row.f_user_type,
+        f_meter_type: self.row.f_meter_type,
+        f_gasproperties: self.row.f_gasproperties,
+        f_userinfo_id: self.row.f_userinfo_id,
+        f_address: self.row.f_address,
+        f_meter_brand: self.row.f_meter_brand,
+        f_meternumber: self.row.f_meternumber,
+        f_card_id: self.row.f_card_id,
+        f_old_total_gas: self.row.f_total_gas,
+        f_old_total_fee: self.row.f_total_fee,
+
+        f_fill_gas: self.model.f_fill_gas ? self.model.f_fill_gas : 0,
+        f_fill_money: self.model.f_fill_money ? self.model.f_fill_money : 0,
+
+        f_remanent_gas: self.row.f_remanent_gas,
+        f_remanent_price: self.row.f_remanent_price,
+        f_remanent_money: self.row.f_remanent_money,
+        f_remanent_type: self.row.f_remanent_type,
+
+        f_user_id: self.row.f_user_id,
+        f_userfiles_id: self.row.f_userfiles_id,
+        f_pregas: self.model.f_pregas - 0,
+        f_balance: self.row.f_balance,
+        f_balance_gas: self.row.f_balance_gas,
+        f_balance_amount: self.row.f_balance_amount,
+        f_preamount: self.model.f_preamount - 0,
+        f_payment: self.model.f_payment.toString(),
+        payments: self.model.payments,
+        f_print: self.model.f_print.toString(),
+        f_voucher_number: self.model.f_voucher_number,
+        userinfo_version: self.row.userinfo_version,
+        version: self.row.version,
+        f_operator: self.$login.f.name,
+        f_operatorid: self.$login.f.id,
+        f_orgid: self.$login.f.orgid,
+        f_orgname: self.$login.f.orgs,
+        f_depid: self.$login.f.depids,
+        f_depname: self.$login.f.deps,
+        f_comments: self.model.f_comments,
+        times: self.row.f_iot_times,
+        bothGasFee: self.config.bothGasFee,
+        // 额外判断
+        f_collection_type: self.row.f_collection_type,
+        f_calculation: self.row.f_calculation
+      }
+
+      if (self.row.f_remanent_type == 1) {
+        if (self.row.f_change_type == '原表换表') {
+          param.f_total_gas = (self.row.f_total_gas - 0)
+          param.f_total_fee = (self.row.f_total_fee - 0)
+        } else {
+          // 换新表
+          param.f_total_gas = (self.row.f_total_gas - 0) + (self.model.f_pregas - 0)
+          param.f_total_fee = (self.row.f_total_fee - 0) + (self.model.f_preamount - 0)
+        }
+      } else {
+        // 清零换表 （不考虑，物联网不存在清零换表）
+        if (self.model.f_fill_gas > 0 && !self.showGas) {
+          param.f_total_fee = (self.row.f_total_fee - 0) + (self.model.f_preamount - 0) - (self.model.f_fill_money - 0)
+        } else {
+          param.f_total_gas = (self.row.f_total_gas - 0) + (self.model.f_pregas - self.model.f_fill_gas)
+          param.f_total_fee = (self.row.f_total_fee - 0) + (self.model.f_preamount - 0) - (self.model.f_fill_money - 0)
+        }
+      }
+      // 加入扫码盒付款码支付流水号
+      param.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
+      let res = await self.$resetpost('rs/logic/sale_iotRemanentGas', {data: param}, {
+        warnMsg: `确定对客户${self.row.f_user_name}进行物联网表缴费吗？`,
+        resolveMsg: '物联网收费成功！！',
+        rejectMsg: '物联网收费出错!!!'
+      })
+
+      // 开始打票
+      console.log('开始打票', self.config)
+      if (self.config.hasPrint) {
+        console.log('self.config.printType', self.config.printType)
+        if (self.config.printType != '电子发票') {
+          console.log('self.config.hasBillManage', self.config.hasBillManage)
+          if (self.config.hasBillManage) {
+            // 启用发票管理，获取票据管理中的票号并存储记录
+            self.row.id = res.data.fillgasid
+            self.row.f_bill_type = '物联网收费'
+            self.row.f_bill_style = self.model.f_print[0]
+            self.print = true
+          } else {
+            self.row.id = res.data.fillgasid
+            self.print = true
+          }
+        } else if (self.config.printType === '国税发票') {
+          // TODO
+        } else if (self.config.printType === '电子发票') {
+          // TODO
+        }
+      } else {
+        self.$dispatch('success')
+      }
+    } catch (error) {
+      if (error.status === 301) {
+        self.$dispatch('refresh')
+      } else if (error.status === 505){
+        self.$showAlert('改数据失败，数据已在其他地方进行修改，请尝试重新操作','danger',0)
+      } else {
+        if (error) {
+          self.$showAlert(error, 'danger', 0)
+        }
+      }
+
+      self.$dispatch('refresh')
+    }
+  }
+
+  export default {
+    title: '物联网表收费',
+    data () {
+      return {
+        config: {
+          notShowFormula: false, // 不显示计算公式,默认显示
+          hasPrint: false,  // 默认打票
+          hasBillManage: false,  // 默认不启用发票管理
+          bothGasFee: false, // 默认 false 金额表加金额 气量表加气量
+          billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
+          printType: '普通收据', // 收据/电子票/专用发票/国税发票
+          payment: '现金缴费'
+        },
+        model: {
+          f_payment: ['现金缴费'],
+          f_pregas: null,
+          f_preamount: null,
+          f_print: [],
+          f_fill_gas: 0,
+          f_fill_money: 0,
+          f_comments: ''
+        },
+        showGas: false,
+        calculatedetail: '',
+
+        print: false,
+        billData: {
+          url: 'rs/report/iot_sell',
+          bill: ''
+        },
+
+        // 启用发票管理需要对票号进行验证
+        hasValidateBill: false,
+        validateOk: false,
+
+        paymentModel: [],
+
+        // 补气提示控制
+        remanentfalg: false,
+        remanentstr: '',
+
+        // 下拉框值
+        paytype: this.$appdata.getParam('付款方式'),
+        printstyle: this.$appdata.getParam('打印格式')
+      }
+    },
+    props: ['row'],
+    async ready () {
+      this.showGas = (this.row.f_collection_type === '按气量')
+      await asyncIOTMeterCenter(this)
+      await this.calRemanentMoney()
+    },
+    watch: {
+      'model.f_payment.length' (val) {
+        console.log('付款方式多选。。', val)
+        if (val > 1 && !this.model.f_preamount) {
+          this.model.f_payment = ['现金缴费']
+          this.$showAlert('请先计算付款金额', 'warning', 2000)
+        } else {
+          this.paymentModel = []
+
+          this.model.f_payment.forEach((res) => {
+            let temp = {
+              f_payment: res,
+              f_money: 0
+            }
+            this.paymentModel.push(temp)
+          })
+          this.$resetValidation()
+        }
+      }
+    },
+    methods: {
+      async confirm () {
+        this.model.f_userinfo_id = this.row.f_userinfo_id
+        this.model.f_userfiles_id = this.row.f_userfiles_id
+        this.model.f_user_id = this.row.f_user_id
+        this.model.userinfo_version = this.row.userinfo_version
+        this.model.version = this.row.version
+
+        this.model.f_operator = this.$login.f.name
+        this.model.f_operatorid = this.$login.f.id
+        this.model.f_orgid = this.$login.f.orgid
+        this.model.f_orgname = this.$login.f.orgs
+        this.model.f_depid = this.$login.f.depids
+        this.model.f_depname = this.$login.f.deps
+        // 先调用付款码支付组件流程
+        let ss = await this.$refs.paymentcode.flowPath()
+        this.$refs.paymentcode.paymentCodeShow = false
+        console.log('付款码操作返回', ss)
+        if (!ss.result) return
+
+        IOTChargeGen(this)
+      },
+      clean () {
+        this.$info('取消操作')
+        this.$dispatch('refresh', this.row)
+      },
+      close () {
+        this.print = false
+        this.clean()
+      },
+      printok () {
+        this.$dispatch('success')
+      },
+      validateBill (val) {
+        this.validateOk = !val.isOk
+        this.billData.bill = val.bill
+      },
+      printCancel () {
+        this.$dispatch('refresh')
+      },
+      calRemanentMoney () {
+        console.log('======', this.row)
+        // 计算 应补金额
+        let getResult = this.$CommonService.calRemanentMoney(this.row)
+        if (this.showGas) {
+          this.model.f_pregas = this.model.f_fill_gas = getResult
+          this.model.f_preamount = this.config.bothGasFee ? (this.model.f_pregas * this.row.f_remanent_price).toFixed(this.row.f_isdecimal === '否' ? 0 : 4) : 0
+        } else {
+          this.model.f_preamount = this.model.f_fill_money = getResult
+          this.model.f_pregas = this.config.bothGasFee ? ((this.model.f_preamount - 0) / (this.row.f_remanent_price - 0)).toFixed(this.row.f_isdecimal === '否' ? 0 : 4) : 0
+        }
+      },
+      openExplain () {
+
+      },
+      pregas () {
+        if (this.model.f_pregas && this.model.f_pregas > 0 && this.model.f_pregas - (0 - this.row.f_balance_gas) >= 0) {
+          try {
+            pregasGen(this)
+          } catch (error) {
+            this.$showAlert(`发卡售气划价错误，错误类型：${error}`, 'danger', 0)
+            this.$dispatch('error', '发卡售气', this.model, error)
+          }
+        } else {
+          this.model.f_pregas = null
+        }
+      },
+      remstrgas () {
+        if (this.row.f_collection_type == '按气量') {
+          if (this.model.f_fill_gas > this.model.f_pregas && this.model.f_pregas > 0) {
+            this.remanentstr = '您已经成功抵扣' + this.model.f_pregas + '补气量！！，该气量不会产生任何费用'
+            this.remanentfalg = true
+          } else if (this.model.f_fill_gas < this.model.f_pregas) {
+            this.remanentstr = '您已经成功抵扣' + this.model.f_fill_gas + '补气量！！！，该气量不会产生任何费用,并且超出购买' + (this.model.f_pregas - this.model.f_fill_gas) +
+            '方气量，超出部分产生费用!'
+            this.remanentfalg = true
+          } else {
+            this.remanentfalg = false
+            this.remanentstr = ''
+          }
+        } else {
+          let temp = (this.model.f_fill_money - 0)
+
+          if (temp > (this.model.f_preamount - 0) && (this.model.f_preamount - 0) > 0) {
+            this.remanentstr = '您已经成功抵扣' + this.model.f_preamount + '元！！！，本次不收取费用！！'
+            this.remanentfalg = true
+          } else if (temp < (this.model.f_preamount - 0)) {
+            this.remanentstr = '您已经成功抵扣' + temp + '元！！！，本次将收取' + (this.model.f_preamount - temp) + '元！！！'
+            this.remanentfalg = true
+          } else {
+            this.remanentfalg = false
+            this.remanentstr = ''
+          }
+        }
+      },
+      calText (val) {
+        let str = ''
+        val.forEach((item) => {
+          str = str + item.f_price + ' x ' + item.f_gas + '+'
+        })
+        str = str.slice(0, str.length - 1)
+        this.calculatedetail = str
+      }
+    },
+    computed: {
+      'islegal' () {
+        if (this.paymentModel.length > 1 && this.model.f_preamount) {
+          let sum = 0
+          this.paymentModel.forEach((res) => {
+            sum += (res.f_money - 0)
+          })
+
+          return (this.model.f_preamount - 0) === (sum - 0)
+        } else {
+          return true
+        }
+      }
+    }
+  }
+</script>

package/src/filiale/bayan/sale.js

@@ -79,4 +79,6 @@ export default function () {
   Vue.component('transfer-manage', (resolve) => { require(['./TransferManage'], resolve) })
   // pos对账界面
   Vue.component('wechat-validate-manage', (resolve) => { require(['./wechatValidateManage.vue'], resolve) })
+  // 换表补卡
+  Vue.component('change_fill_sendcard', (resolve) => { require(['./ChangeSendCard'], resolve) })
 }

package/src/filiale/liaoyuan/ChangeMeter.vue

@@ -339,7 +339,7 @@ export default {
           return
         }
       }
-      if (this.model.metermessage.f_meter_type[0] == '机表') {
+      if (this.model.metermessage.f_meter_type[0] != '机表') {
         console.log('进来了')
         if (this.books.data.length > 0) {
           console.log('进来了2')
@@ -671,10 +671,10 @@ export default {
       console.log('获取到的欠费记录', books)
       this.books = books
       // 如果是机表验证是否有欠费
-      // if ((this.row.f_balance - 0) < 0 || this.books.data.length > 0) {
-      //   this.$showAlert('该表有欠费，请到机表缴费界面进行缴费', 'warning', 3000)
-      //   this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
-      // }
+      if ((this.row.f_balance - 0) < 0 || this.books.data.length > 0) {
+        this.$showAlert('该表有欠费，请到机表缴费界面进行缴费', 'warning', 3000)
+        this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
+      }
     }
   },