sale-client 3.7.45 → 3.7.47

package/package.json

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

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

@@ -228,8 +228,8 @@
       self.model.f_pregas = (self.model.f_pregas - 0).toFixed(0)
     }
     self.model.f_meter_type = self.row.f_meter_type
-    // 判断限购
-    if ((self.model.f_pregas - 0) - (self.maxgas - 0) <= 0) {
+    // 限购检查只检查购气量（不含补气量），限购值限制的是额外购买的气量
+    if ((self.model.f_pregasBuy - 0) - (self.maxgas - 0) <= 0) {
       if ((self.model.f_fill_gas - 0) < (self.model.f_pregas - 0)) {
         // 超出【补气气量不符】部分走划价
         let gas = self.model.f_pregas - self.model.f_fill_gas
@@ -250,6 +250,13 @@
         self.model.f_collection = 0
       }
       self.remstrgas()
+    } else {
+      self.$showAlert(`购气量不能超过限购值${self.maxgas}方`, 'warning', 3000)
+      self.model.f_preamount = 0
+      self.model.f_totalcost = 0
+      self.model.f_collection = 0
+      self.model.f_pregasBuy = 0
+      self.model.f_pregas = self.model.f_fill_gas
     }
   }
 

package/src/filiale/rongchuang/CardMeterCenter.vue

@@ -329,590 +329,555 @@
         f_blobid: writeid
       }
 
-      await self.$resetpost('rs/logic/updatefiles', data)
-      // 开始打票
-      if (self.config.hasPrint && !self.$login.r.includes('不打印发票')) {
-        if (!['电子发票', '数电普票', '数电专票'].includes(self.model.f_print[0])) {
-          if (self.config.hasBillManage) {
-            // 启用发票管理，获取票据管理中的票号并存储记录
-            self.row.id = res
-            self.row.f_bill_type = '卡表收费'
-            self.row.f_bill_style = self.model.f_print[0]
-            self.print = true
-          } else {
-            self.row.id = res
-            self.print = true
-          }
-        } else {
-          if (['数电普票', '数电专票'].includes(self.model.f_print[0])) {
-            self.row.f_paper_type = self.model.f_print[0]
-            // self.eticket_show = true
-            self.$refs.asynceticket.openETicketNoModal(res, self.row, '卡表收费').then(
-              (_res) => {
-                if (self.config.hasBillManage) {
-                  // 启用发票管理，获取票据管理中的票号并存储记录
-                  self.row.id = res
-                  self.row.f_bill_type = '卡表收费'
-                  self.row.f_bill_style = self.model.f_print[0]
-                  self.print = true
-                } else {
-                  self.row.id = res
-                  self.print = true
-                }
-              }
-            ).catch((error) => {
-              console.log('捕获到异常', error)
-              if (error instanceof Object) {
-                self.$showAlert(error.data, 'danger', 0)
-              } else {
-                self.$showAlert('收费成功,电子票开具失败，' + error + '，请在自定义开票页面补开发票。', 'danger', 0)
-              }
-              if (self.config.hasBillManage) {
-                // 启用发票管理，获取票据管理中的票号并存储记录
-                self.row.id = res
-                self.row.f_bill_type = '卡表收费'
-                self.row.f_bill_style = self.model.f_print[0]
-                self.print = true
-              } else {
-                self.row.id = res
-                self.print = true
-              }
-            })
-          }
-        }
+    await self.$resetpost('rs/logic/updatefiles', data)
+    // 开始打票
+    if (self.config.hasPrint && !self.$login.r.includes('不打印发票')) {
+      if (self.config.hasBillManage) {
+        // 启用发票管理，获取票据管理中的票号并存储记录
+        self.row.id = res
+        self.row.f_bill_type = '卡表收费'
+        self.row.f_bill_style = self.model.f_print[0]
+        self.print = true
       } else {
-        self.$dispatch('success')
+        self.row.id = res
+        self.print = true
       }
-      self.clickConfirm = false
-    } catch (error) {
-      console.log('捕获到异常', error)
-      if (error instanceof Object) {
-        self.$showAlert(error.data, 'danger', 0)
-      } else {
-        self.$showAlert(error, 'danger', 0)
-      }
-      self.$dispatch('refresh')
-      self.clickConfirm = false
+    } else {
+      self.$dispatch('success')
     }
-  }
-
-  let asyncCardMeterCenter = async function (self) {
-    await self.$getConfig(self, 'CardMeterCenter')
-    console.log('卡表收费config', self.config)
-    console.log('row', self.row)
-    // 默认打印格式
-    if (self.row.f_paper_type) {
-      self.model.f_print = self.row.f_paper_type instanceof Array ? self.row.f_paper_type : [self.row.f_paper_type ]
+    self.clickConfirm = false
+  } catch (error) {
+    console.log('捕获到异常', error)
+    if (error instanceof Object) {
+      self.$showAlert(error.data, 'danger', 0)
     } else {
-      self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
+      self.$showAlert(error, 'danger', 0)
     }
-    // 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
+    self.$dispatch('refresh')
+    self.clickConfirm = false
+  }
+}
 
-    // 获取当前票号用
-    self.model.f_use_type = self.config.billType
-    self.model.f_bill_type = self.model.f_print
-    self.hasValidateBill = self.config.hasBillManage
+let asyncCardMeterCenter = async function (self) {
+  await self.$getConfig(self, 'CardMeterCenter')
+  console.log('卡表收费config', self.config)
+  console.log('row', self.row)
+  // 默认打印格式
+  if (self.row.f_paper_type) {
+    self.model.f_print = self.row.f_paper_type instanceof Array ? self.row.f_paper_type : [self.row.f_paper_type]
+  } else {
+    self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
+  }
+  // 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('rs/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
-          }
+  // 获取当前票号用
+  self.model.f_use_type = self.config.billType
+  self.model.f_bill_type = self.model.f_print
+  self.hasValidateBill = self.config.hasBillManage
+
+  // 判断限购
+  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('rs/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
         }
       }
     }
-    let nowrite_param = {
-      f_userfiles_id: self.row.f_userfiles_id
-    }
-    let getNoWriteCard = await self.$resetpost('rs/sql/getnowritecard', {data: nowrite_param}, {
-      resolveMsg: null,
-      rejectMsg: '获取限购值失败！！'
-    })
-    if (getNoWriteCard.data.length > 0) {
-      self.$showMessage(`三小时内存在写卡失败的记录，是否重新写卡？`, ['confirm', 'cancel']).then(async (res) => {
-        if (res === 'confirm') {
-          let url = 'http://127.0.0.1:8003/' + getNoWriteCard.data[0].f_cardpost
-          let param = JSON.parse(getNoWriteCard.data[0].f_cardparam)
-          let cardRes = await self.$resetpost(url, param, {resolveMsg: null, rejectMsg: '重新写卡失败'})
-          if (cardRes.data.Err || cardRes.data.Exception) {
-            self.$showAlert(`卡服务错误：${cardRes.data.Err}${cardRes.data.Exception}，请联系开发人员处理！！`, 'danger', 3000)
-            self.$dispatch('refresh', self.row)
-          } else {
-            self.$resetpost('rs/logic/writeCardAgin', getNoWriteCard.data[0], {resolveMsg: '重新写卡成功', rejectMsg: '重新写卡失败'})
-            self.$dispatch('success')
-          }
-        } else {
+  }
+  let nowrite_param = {
+    f_userfiles_id: self.row.f_userfiles_id
+  }
+  let getNoWriteCard = await self.$resetpost('rs/sql/getnowritecard', {data: nowrite_param}, {
+    resolveMsg: null,
+    rejectMsg: '获取限购值失败！！'
+  })
+  if (getNoWriteCard.data.length > 0) {
+    self.$showMessage(`三小时内存在写卡失败的记录，是否重新写卡？`, ['confirm', 'cancel']).then(async (res) => {
+      if (res === 'confirm') {
+        let url = 'http://127.0.0.1:8003/' + getNoWriteCard.data[0].f_cardpost
+        let param = JSON.parse(getNoWriteCard.data[0].f_cardparam)
+        let cardRes = await self.$resetpost(url, param, {resolveMsg: null, rejectMsg: '重新写卡失败'})
+        if (cardRes.data.Err || cardRes.data.Exception) {
+          self.$showAlert(`卡服务错误：${cardRes.data.Err}${cardRes.data.Exception}，请联系开发人员处理！！`, 'danger', 3000)
           self.$dispatch('refresh', self.row)
+        } else {
+          self.$resetpost('rs/logic/writeCardAgin', getNoWriteCard.data[0], {
+            resolveMsg: '重新写卡成功',
+            rejectMsg: '重新写卡失败'
+          })
+          self.$dispatch('success')
         }
-      })
-    }
+      } else {
+        self.$dispatch('refresh', self.row)
+      }
+    })
   }
-  export default {
-    title: '卡表收费',
-    data () {
-      return {
-        // 发票相关
-        eticket_msg: false,
-        eticket_show: false,
-        mjshow: false,
-        serialShow: false,
-        resid: [],  // 存放新增的f_files表中id
-        config: {
-          showupload: true, // 显示上传
-          hasPrint: false,  // 默认打票
-          hasBillManage: false,  // 默认不启用发票管理
-          billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
-          printType: '普通收据', // 收据/电子票/专用发票/国税发票
-          payment: '现金缴费'
-        },
-        resetShow: false,
-        preDisable: false,
-        model: {
-          f_purchase: 0,
-          f_payment: [],
-          f_pregas: '',
-          f_preamount: 0,
-          f_totalcost: 0,
-          f_curbalance: 0,
-          f_collection: '',
-          f_balance: 0,
-          f_print: [],
-          f_meter_type: '',
-          f_voucher_number: '',
-          f_banktransfer_person: '',
-          f_banktransfer_date: '',
-          f_privilege_id: 0,
-          f_privilege_money: 0,
-          f_privilege_gas: 0,
-          f_after_discount: 0,
-          f_comments: ''
-        },
-        calculatedetail: '',
+}
+export default {
+  title: '卡表收费',
+  data() {
+    return {
+      // 发票相关
+      eticket_msg: false,
+      eticket_show: false,
+      mjshow: false,
+      serialShow: false,
+      resid: [],  // 存放新增的f_files表中id
+      config: {
+        showupload: true, // 显示上传
+        hasPrint: false,  // 默认打票
+        hasBillManage: false,  // 默认不启用发票管理
+        billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
+        printType: '普通收据', // 收据/电子票/专用发票/国税发票
+        payment: '现金缴费'
+      },
+      resetShow: false,
+      preDisable: false,
+      model: {
+        f_purchase: 0,
+        f_payment: [],
+        f_pregas: '',
+        f_preamount: 0,
+        f_totalcost: 0,
+        f_curbalance: 0,
+        f_collection: '',
+        f_balance: 0,
+        f_print: [],
+        f_meter_type: '',
+        f_voucher_number: '',
+        f_banktransfer_person: '',
+        f_banktransfer_date: '',
+        f_privilege_id: 0,
+        f_privilege_money: 0,
+        f_privilege_gas: 0,
+        f_after_discount: 0,
+        f_comments: ''
+      },
+      calculatedetail: '',
 
-        // 启用发票管理需要对票号进行验证
-        hasValidateBill: false,
-        validateOk: false,
+      // 启用发票管理需要对票号进行验证
+      hasValidateBill: false,
+      validateOk: false,
 
-        print: false,
-        billData: {
-          url: 'rs/report/card_bill',
-          billnumber: ''
-        },
-        hasLimit: false,
-        maxgas: 99999999, // 限购
-        maxmoney: 99999999,
-        limitmoney: false,
-        limitgas: false,
+      print: false,
+      billData: {
+        url: 'rs/report/card_bill',
+        billnumber: ''
+      },
+      hasLimit: false,
+      maxgas: 99999999, // 限购
+      maxmoney: 99999999,
+      limitmoney: false,
+      limitgas: false,
 
-        paymentModel: [], // 多笔付款方式
+      paymentModel: [], // 多笔付款方式
 
-        mulPrint: false,
-        clickConfirm: false, // 控制确认按钮只能点击一次
-        // 下拉框值
-        paytype: [],
-        privilegeList: [{label: '无优惠', value: '0'}],
-        BankTransfer: false,
-        // 小数是否支持,导致划价产生的多余气量,金额
-        dymoney: 0
+      mulPrint: false,
+      clickConfirm: false, // 控制确认按钮只能点击一次
+      // 下拉框值
+      paytype: [],
+      privilegeList: [{label: '无优惠', value: '0'}],
+      BankTransfer: false,
+      // 小数是否支持,导致划价产生的多余气量,金额
+      dymoney: 0
+    }
+  },
+  props: ['row', 'cardData'],
+  async ready() {
+    if (this.authArr.includes('余额写卡限定')) {
+      this.paytype = [{label: '余额写卡', value: '余额写卡'}]
+    } else {
+      this.paytype = await this.$appdata.getParam('付款方式') ? await this.$appdata.getParam('付款方式') : []
+      if (!this.$login.r.includes('免交充值付款')) {
+        this.paytype = this.paytype.filter((item) => {
+          return item.label != '免交'
+        })
       }
-    },
-    props: ['row', 'cardData'],
-    async ready () {
-      if (this.authArr.includes('余额写卡限定')) {
-        this.paytype = [{label: '余额写卡', value: '余额写卡'}]
+    }
+    // this.getPurchase()
+    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_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_preamount = ''
+      this.model.f_pregas = 0
+    }
+    asyncCardMeterCenter(this)
+  },
+  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.paytype = await this.$appdata.getParam('付款方式') ? await this.$appdata.getParam('付款方式') : []
-        if (!this.$login.r.includes('免交充值付款')) {
-          this.paytype = this.paytype.filter((item) => {
-            return item.label != '免交'
-          })
-        }
-      }
-      // this.getPurchase()
-      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_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_preamount = ''
-        this.model.f_pregas = 0
-      }
-      asyncCardMeterCenter(this)
-    },
-    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()
+        this.paymentModel = []
 
-          // 获取计算优惠
-          this.getPrivilegeList()
-        }
-      },
-      'model.f_payment' (val) {
-        if (val == '免交') {
-          this.mjshow = true
-        } else if (val == '赠气' && (this.model.f_preamount || this.model.f_preamount != '')) {
-          if (this.row.f_collection_type == '按气量') {
-            this.pregas()
-          } else {
-            this.preamount()
+        this.model.f_payment.forEach((res) => {
+          let temp = {
+            f_payment: res,
+            f_money: 0
           }
-        } else {
-          this.mjshow = false
-        }
-        // if(this.row.f_collection_type == '按气量'){
-        //   this.pregas();
-        // }else{
-        //   this.preamount();
-        // }
-      },
-      'model.f_collection' (val) {
+          this.paymentModel.push(temp)
+        })
+        this.$resetValidation()
+
         // 获取计算优惠
         this.getPrivilegeList()
       }
     },
-    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: ''})
+    'model.f_payment'(val) {
+      if (val == '免交') {
+        this.mjshow = true
+      } else if (val == '赠气' && (this.model.f_preamount || this.model.f_preamount != '')) {
+        if (this.row.f_collection_type == '按气量') {
+          this.pregas()
+        } else {
+          this.preamount()
+        }
+      } else {
+        this.mjshow = false
       }
+      // if(this.row.f_collection_type == '按气量'){
+      //   this.pregas();
+      // }else{
+      //   this.preamount();
+      // }
     },
-    methods: {
-      onHoverOut () {
-        this.resetShow = false
-      },
-      onHover () {
-        this.resetShow = true
-      },
-      resetParam () {
-        this.model.f_preamount = 0
-        this.model.f_pregas = 0
-        this.model.f_collection = 0
-        this.model.f_totalcost = 0
-        this.dymoney = 0
-        this.preDisable = false
-        this.pregas()
-        this.preamount()
-      },
-      checkInvoiceMsg () {
-        if (['电子发票', '数电普票', '数电专票'].includes(this.model.f_print[0])) {
-          if (!this.row.f_taxpayer_id) {
-            this.row.f_taxpayer_id = this.row.f_idnumber
-          }
-          if (!this.row.f_paper_name) {
-            this.row.f_paper_name = this.row.f_user_name
-          }
-          if (!this.row.f_address_phone) {
-            this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
-          }
-          if (!this.row.f_buy_phone) {
-            this.row.f_buy_phone = this.row.f_user_phone
-          }
-          this.confirm()
-        } else {
-          this.confirm()
+    'model.f_collection'(val) {
+      // 获取计算优惠
+      this.getPrivilegeList()
+    }
+  },
+  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: {
+    onHoverOut() {
+      this.resetShow = false
+    },
+    onHover() {
+      this.resetShow = true
+    },
+    resetParam() {
+      this.model.f_preamount = 0
+      this.model.f_pregas = 0
+      this.model.f_collection = 0
+      this.model.f_totalcost = 0
+      this.dymoney = 0
+      this.preDisable = false
+      this.pregas()
+      this.preamount()
+    },
+    checkInvoiceMsg() {
+      if (['电子发票', '数电普票', '数电专票'].includes(this.model.f_print[0])) {
+        if (!this.row.f_taxpayer_id) {
+          this.row.f_taxpayer_id = this.row.f_idnumber
+        }
+        if (!this.row.f_paper_name) {
+          this.row.f_paper_name = this.row.f_user_name
+        }
+        if (!this.row.f_address_phone) {
+          this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
+        }
+        if (!this.row.f_buy_phone) {
+          this.row.f_buy_phone = this.row.f_user_phone
+        }
+        this.confirm()
+      } else {
+        this.confirm()
+      }
+    },
+    eticket_toggle() {
+      this.eticket_show = false
+      this.$dispatch('success')
+    },
+    confirm() {
+      this.eticket_msg = false
+      if (this.model.f_payment.length > 0 && this.model.f_payment.includes('余额写卡')) {
+        if (this.model.f_collection > this.row.f_balance) {
+          this.$showAlert('请注意！您的账户余额小于当前写卡金额,无法进行余额写卡,请修改后重试', 'warning', 2000)
+          return
         }
-      },
-      eticket_toggle () {
-        this.eticket_show = false
-        this.$dispatch('success')
-      },
-      confirm () {
-        this.eticket_msg = false
-        if (this.model.f_payment.length > 0 && this.model.f_payment.includes('余额写卡')) {
-          if (this.model.f_collection > this.row.f_balance) {
-            this.$showAlert('请注意！您的账户余额小于当前写卡金额,无法进行余额写卡,请修改后重试', 'warning', 2000)
-            return
-          }
 
-          if (this.model.f_collection > 0) {
-            this.$showAlert('请注意！进行余额写卡,收款不能大于0', 'warning', 1000)
-            return
-          }
+        if (this.model.f_collection > 0) {
+          this.$showAlert('请注意！进行余额写卡,收款不能大于0', 'warning', 1000)
+          return
         }
-        this.$showMessage(`确定对用户${this.row.f_user_name}进行卡表收费吗？`, ['confirm', 'cancel']).then(async (res) => {
-          if (res === 'confirm') {
-            // 先调用付款码支付组件流程
-            let ss = await this.$refs.paymentcode.flowPath()
-            this.$refs.paymentcode.paymentCodeShow = false
-            console.log('付款码操作返回', ss)
-            if (!ss.result) return
+      }
+      this.$showMessage(`确定对用户${this.row.f_user_name}进行卡表收费吗？`, ['confirm', 'cancel']).then(async (res) => {
+        if (res === 'confirm') {
+          // 先调用付款码支付组件流程
+          let ss = await this.$refs.paymentcode.flowPath()
+          this.$refs.paymentcode.paymentCodeShow = false
+          console.log('付款码操作返回', ss)
+          if (!ss.result) return
 
-            this.clickConfirm = true
-            this.model.f_curbalance = this.curbalance
-            this.$dispatch('no-button')
-            sellgasGen(this)
-          }
-        })
-      },
-      clean () {
-        this.$info('取消操作')
-        this.$dispatch('refresh', this.row)
-      },
-      validateBill (val) {
-        this.validateOk = !val.isOk
-        this.billData.bill = val.bill
-      },
-      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.clickConfirm = true
+          this.model.f_curbalance = this.curbalance
+          this.$dispatch('no-button')
+          sellgasGen(this)
         }
-        this.$dispatch('success')
-      },
-      pregas () {
-        this.dymoney = 0
-        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)
-              this.preDisable = true
-            }
-          } catch (error) {
-            this.$showAlert(`发卡售气划价错误，错误类型：${error}`, 'danger', 0)
-            this.$dispatch('error', '发卡售气', this.model, error)
-          }
-        } else {
-          this.model.f_pregas = null
+      })
+    },
+    clean() {
+      this.$info('取消操作')
+      this.$dispatch('refresh', this.row)
+    },
+    validateBill(val) {
+      this.validateOk = !val.isOk
+      this.billData.bill = val.bill
+    },
+    printok() {
+      // 收据打完，判断是否还有其他票据进行请求
+      for (let i = 0; i < this.model.f_print.length; i++) {
+        if (this.model.f_print[i] === '电子发票') {
+          this.$CommonService.openEticket(this.row.id, '售气收费')
         }
-      },
-      preamount () {
-        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.$dispatch('success')
+    },
+    pregas() {
+      this.dymoney = 0
+      if (this.model.f_pregas && this.model.f_pregas > 0) {
         try {
-          preamountGen(this)
-          if (this.model.f_preamount > 0 && this.model.f_preamount) {
+          // 对气量进行验证
+          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)
             this.preDisable = true
           }
         } 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
-          }
-          if (this.row.f_isdecimal === '是') {
-            str = str + item.f_price + ' x ' + item.f_gas + '+'
-          } else {
-            str = str + item.f_price + ' x ' + Math.floor(item.f_gas) + '+'
-          }
-        })
-        str = str.slice(0, str.length - 1)
-        this.calculatedetail = str
-        if (num > 1) {
-          this.$showAlert('友好提示：本次购气已跨阶梯', 'warning', 3000)
+      } else {
+        this.model.f_pregas = null
+      }
+    },
+    preamount() {
+      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
+      try {
+        preamountGen(this)
+        if (this.model.f_preamount > 0 && this.model.f_preamount) {
+          this.preDisable = true
         }
-      },
-      close () {
-        this.print = false
-        this.clean()
-      },
-      paymentchange () {
-        console.log('model.f_payment', this.model.f_payment[0])
-        if (JSON.stringify(this.model.f_payment).indexOf('转账') !== -1) {
-          // 进入转账筛选条件
-          this.model.f_banktransfer_person = ''
-          this.model.f_banktransfer_date = ''
-          this.BankTransfer = true
+      } 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
+        }
+        if (this.row.f_isdecimal === '是') {
+          str = str + item.f_price + ' x ' + item.f_gas + '+'
         } else {
-          this.model.f_banktransfer_person = ''
-          this.model.f_banktransfer_date = ''
-          this.BankTransfer = false
+          str = str + item.f_price + ' x ' + Math.floor(item.f_gas) + '+'
         }
-      },
-      // 根据选择的付款方式 获取优惠列表
-      async getPrivilegeList () {
-        // 初始化下拉选择列表
-        this.privilegeList = [{label: '无优惠', value: '0'}]
-        // 初始为无优惠
-        this.model.f_privilege_id = '0'
-        if (this.model.f_payment && this.model.f_payment.length) {
-          // 查询条件
-          let payments = JSON.stringify(this.model.f_payment)
-          payments = payments.replace('[', '(').replace(']', ')').replace(/"/g, '\'')
-          let HttpReset = new HttpResetClass()
-          let privilege = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
-            data: {
-              items: 'id,f_privilege_name,f_privilege_type',
-              tablename: 't_privilege',
-              condition: `f_payment in ${payments} and f_gasproperties = '${this.row.f_gasproperties}' and f_user_type = '${this.row.f_user_type}' and f_perform_date <= GETDATE() and f_end_date >= GETDATE() and f_state = '有效'`,
-              orderitem: 'id'
-            }
-          }, {resolveMsg: null, rejectMsg: '查询优惠信息失败'})
-          // 查询结果放到下拉列表
-          for (let p of privilege.data) {
-            this.privilegeList.push({label: p.f_privilege_name, value: p.id, type: p.f_privilege_type})
+      })
+      str = str.slice(0, str.length - 1)
+      this.calculatedetail = str
+      if (num > 1) {
+        this.$showAlert('友好提示：本次购气已跨阶梯', 'warning', 3000)
+      }
+    },
+    close() {
+      this.print = false
+      this.clean()
+    },
+    paymentchange() {
+      console.log('model.f_payment', this.model.f_payment[0])
+      if (JSON.stringify(this.model.f_payment).indexOf('转账') !== -1) {
+        // 进入转账筛选条件
+        this.model.f_banktransfer_person = ''
+        this.model.f_banktransfer_date = ''
+        this.BankTransfer = true
+      } else {
+        this.model.f_banktransfer_person = ''
+        this.model.f_banktransfer_date = ''
+        this.BankTransfer = false
+      }
+    },
+    // 根据选择的付款方式 获取优惠列表
+    async getPrivilegeList() {
+      // 初始化下拉选择列表
+      this.privilegeList = [{label: '无优惠', value: '0'}]
+      // 初始为无优惠
+      this.model.f_privilege_id = '0'
+      if (this.model.f_payment && this.model.f_payment.length) {
+        // 查询条件
+        let payments = JSON.stringify(this.model.f_payment)
+        payments = payments.replace('[', '(').replace(']', ')').replace(/"/g, '\'')
+        let HttpReset = new HttpResetClass()
+        let privilege = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
+          data: {
+            items: 'id,f_privilege_name,f_privilege_type',
+            tablename: 't_privilege',
+            condition: `f_payment in ${payments} and f_gasproperties = '${this.row.f_gasproperties}' and f_user_type = '${this.row.f_user_type}' and f_perform_date <= GETDATE() and f_end_date >= GETDATE() and f_state = '有效'`,
+            orderitem: 'id'
           }
-          this.privilegeCalculate()
+        }, {resolveMsg: null, rejectMsg: '查询优惠信息失败'})
+        // 查询结果放到下拉列表
+        for (let p of privilege.data) {
+          this.privilegeList.push({label: p.f_privilege_name, value: p.id, type: p.f_privilege_type})
         }
-      },
-      // 优惠计算
-      async privilegeCalculate () {
-        // 初始化减免金额
-        this.model.f_privilege_money = 0
-        this.model.f_after_discount = this.model.f_collection
-        // 判断是否是自定义优惠
-        if (this.model.f_privilege_id != null && parseInt(this.model.f_privilege_id)) {
-          for (let p of this.privilegeList) {
-            if (p.value == this.model.f_privilege_id && p.type == '自定义') {
-              this.model.f_privilege_money = window.prompt('请输入你想优惠的金额')
-              if (!(/^[1-9]\d*(\.\d+)?$/).test(this.model.f_privilege_money) || !(/^[1-9]\d*(\.\d+)?$/).test(this.model.f_privilege_money)) {
-                this.$showMessage('金额输入格式不正确!')
-                this.model.f_privilege_money = 0
-                return
-              }
-              if ((this.model.f_privilege_money - 0) >= this.model.f_collection) {
-                this.$showMessage('减免金额不能大于等于收款金额')
-                this.model.f_privilege_money = 0
-                return
-              }
-              this.model.f_comments = this.model.f_comments + ' 优惠金额：' + this.model.f_privilege_money
+        this.privilegeCalculate()
+      }
+    },
+    // 优惠计算
+    async privilegeCalculate() {
+      // 初始化减免金额
+      this.model.f_privilege_money = 0
+      this.model.f_after_discount = this.model.f_collection
+      // 判断是否是自定义优惠
+      if (this.model.f_privilege_id != null && parseInt(this.model.f_privilege_id)) {
+        for (let p of this.privilegeList) {
+          if (p.value == this.model.f_privilege_id && p.type == '自定义') {
+            this.model.f_privilege_money = window.prompt('请输入你想优惠的金额')
+            if (!(/^[1-9]\d*(\.\d+)?$/).test(this.model.f_privilege_money) || !(/^[1-9]\d*(\.\d+)?$/).test(this.model.f_privilege_money)) {
+              this.$showMessage('金额输入格式不正确!')
+              this.model.f_privilege_money = 0
+              return
             }
-            if (p.value == this.model.f_privilege_id && p.type == '自定义气量') {
-              this.model.f_privilege_gas = window.prompt('请输入你想优惠的气量')
-              if (!(/^[1-9]\d*(\.\d+)?$/).test(this.model.f_privilege_gas) || !(/^[1-9]\d*(\.\d+)?$/).test(this.model.f_privilege_gas)) {
-                this.$showMessage('金额输入格式不正确!')
-                this.model.f_privilege_gas = 0
-                return
-              }
-              let f_price = 0
-              let param = {
-                tablename: 't_detailprice',
-                condition: `f_price_name = '1' and f_stairprice_id = '${this.row.f_stairprice_id}'`
-              }
-              let res = await this.$resetpost('rs/sql/saleSingleTable', {
-                data: param
-              }, {
-                resolveMsg: null,
-                rejectMsg: '获取一阶单价!!'
-              })
-              if (res.data.length > 0) {
-                f_price = res.data[0].f_price
-              }
-              this.model.f_privilege_money = (this.model.f_privilege_gas - 0) * (f_price - 0)
-              if ((this.model.f_privilege_money - 0) >= this.model.f_collection) {
-                this.$showMessage('减免金额不能大于等于收款金额')
-                this.model.f_privilege_money = 0
-                this.model.f_privilege_gas = 0
-                return
-              }
-              this.model.f_comments = this.model.f_comments + ' 优惠气量：' + this.model.f_privilege_gas
+            if ((this.model.f_privilege_money - 0) >= this.model.f_collection) {
+              this.$showMessage('减免金额不能大于等于收款金额')
+              this.model.f_privilege_money = 0
+              return
             }
+            this.model.f_comments = this.model.f_comments + ' 优惠金额：' + this.model.f_privilege_money
           }
-        }
-        // 优惠方式, 收款 缺一不计算
-        if (this.model.f_payment && this.model.f_payment.length && parseInt(this.model.f_privilege_id) && this.model.f_collection) {
-          let c = {
-            f_privilege_id: this.model.f_privilege_id,
-            f_collection: this.model.f_collection,
-            f_privilege_money: this.model.f_privilege_money
+          if (p.value == this.model.f_privilege_id && p.type == '自定义气量') {
+            this.model.f_privilege_gas = window.prompt('请输入你想优惠的气量')
+            if (!(/^[1-9]\d*(\.\d+)?$/).test(this.model.f_privilege_gas) || !(/^[1-9]\d*(\.\d+)?$/).test(this.model.f_privilege_gas)) {
+              this.$showMessage('金额输入格式不正确!')
+              this.model.f_privilege_gas = 0
+              return
+            }
+            let f_price = 0
+            let param = {
+              tablename: 't_detailprice',
+              condition: `f_price_name = '1' and f_stairprice_id = '${this.row.f_stairprice_id}'`
+            }
+            let res = await this.$resetpost('rs/sql/saleSingleTable', {
+              data: param
+            }, {
+              resolveMsg: null,
+              rejectMsg: '获取一阶单价!!'
+            })
+            if (res.data.length > 0) {
+              f_price = res.data[0].f_price
+            }
+            this.model.f_privilege_money = (this.model.f_privilege_gas - 0) * (f_price - 0)
+            if ((this.model.f_privilege_money - 0) >= this.model.f_collection) {
+              this.$showMessage('减免金额不能大于等于收款金额')
+              this.model.f_privilege_money = 0
+              this.model.f_privilege_gas = 0
+              return
+            }
+            this.model.f_comments = this.model.f_comments + ' 优惠气量：' + this.model.f_privilege_gas
           }
-          let privilegeData = await this.$resetpost('rs/logic/calculatePrivilege', c, {
-            resolveMsg: null,
-            rejectMsg: '计算优惠金额出错'
-          })
-          // 减免金额
-          this.model.f_privilege_money = privilegeData.data.f_privilege_money
-          // 减免后收款金额
-          this.model.f_after_discount = privilegeData.data.f_collection
         }
       }
-    },
-    computed: {
-      printstyle () {
-        return this.row.f_filialeid === '33520' ? this.$appdata.getParam('打印格式') : this.$appdata.getParam('打印格式').filter(item => item.label !== '电子发票')
-      },
-      authArr () {
-        return this.$login.r ? this.$login.r : []
-      },
-      'curbalance' () {
-        if (this.model.f_payment == '赠气') {
-          return this.model.f_balance
+      // 优惠方式, 收款 缺一不计算
+      if (this.model.f_payment && this.model.f_payment.length && parseInt(this.model.f_privilege_id) && this.model.f_collection) {
+        let c = {
+          f_privilege_id: this.model.f_privilege_id,
+          f_collection: this.model.f_collection,
+          f_privilege_money: this.model.f_privilege_money
         }
-        if (this.model.f_preamount) {
-          if (this.row.f_collection_type === '按金额') {
-            return ((this.model.f_collection - 0) - (this.model.f_totalcost - 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) + (this.model.f_collection - 0) ).toFixed(4)
-            // } else {
-            //   return ((this.model.f_collection - 0) + (this.row.f_balance - 0) - (this.model.f_totalcost - 0)).toFixed(4)
-            // }
-            return ((this.model.f_collection - 0) - (this.model.f_totalcost - 0)).toFixed(4)
-          }
-        } else {
-          return 0
-        }
-      },
-      'islegal' () {
-        console.log('支付分离。。。', this.paymentModel.length, this.model.f_collection)
-        if (this.paymentModel.length > 1 && this.model.f_collection) {
-          let sum = 0
-          this.paymentModel.forEach((res) => {
-            sum += (res.f_money - 0)
-          })
-          return (this.model.f_collection - 0) === (sum - 0)
+        let privilegeData = await this.$resetpost('rs/logic/calculatePrivilege', c, {
+          resolveMsg: null,
+          rejectMsg: '计算优惠金额出错'
+        })
+        // 减免金额
+        this.model.f_privilege_money = privilegeData.data.f_privilege_money
+        // 减免后收款金额
+        this.model.f_after_discount = privilegeData.data.f_collection
+      }
+    }
+  },
+  computed: {
+    printstyle() {
+      return this.row.f_filialeid === '33520' ? this.$appdata.getParam('打印格式') : this.$appdata.getParam('打印格式').filter(item => item.label !== '电子发票')
+    },
+    authArr() {
+      return this.$login.r ? this.$login.r : []
+    },
+    'curbalance'() {
+      if (this.model.f_payment == '赠气') {
+        return this.model.f_balance
+      }
+      if (this.model.f_preamount) {
+        if (this.row.f_collection_type === '按金额') {
+          return ((this.model.f_collection - 0) - (this.model.f_totalcost - 0)).toFixed(4)
         } else {
-          return true
+          // if ((this.row.f_balance - 0) > (this.model.f_preamount - 0)) {
+          //   return ((this.row.f_balance - 0) - (this.model.f_preamount - 0) + (this.model.f_collection - 0) ).toFixed(4)
+          // } else {
+          //   return ((this.model.f_collection - 0) + (this.row.f_balance - 0) - (this.model.f_totalcost - 0)).toFixed(4)
+          // }
+          return ((this.model.f_collection - 0) - (this.model.f_totalcost - 0)).toFixed(4)
         }
+      } else {
+        return 0
+      }
+    },
+    'islegal'() {
+      console.log('支付分离。。。', this.paymentModel.length, this.model.f_collection)
+      if (this.paymentModel.length > 1 && this.model.f_collection) {
+        let sum = 0
+        this.paymentModel.forEach((res) => {
+          sum += (res.f_money - 0)
+        })
+        return (this.model.f_collection - 0) === (sum - 0)
+      } else {
+        return true
       }
     }
   }
+}
 </script>
 
 <style>

package/src/filiale/rongchuang/IOTMeterCenter.vue

@@ -323,7 +323,6 @@
       console.log('开始打票', self.config, self.model.f_print)
 
       if (self.config.hasPrint) {
-        if (!['电子发票', '数电普票', '数电专票'].includes(self.model.f_print[0])) {
           console.log('self.config.hasBillManage', self.config.hasBillManage)
           if (self.config.hasBillManage) {
             // 启用发票管理，获取票据管理中的票号并存储记录
@@ -335,44 +334,6 @@
             self.row.id = res.data.id
             self.print = true
           }
-        } else if (self.config.printType === '国税发票') {
-          // TODO
-        } else if (['数电普票', '数电专票'].includes(self.model.f_print[0])) {
-          self.row.f_paper_type = self.model.f_print[0]
-          // self.eticket_show = true
-          await self.$refs.asynceticket.openETicketNoModal(res.data.id, self.row, '物联网收费').then(
-            (_res) => {
-              if (self.config.hasBillManage) {
-                // 启用发票管理，获取票据管理中的票号并存储记录
-                self.row.id = res.data.id
-                self.row.f_bill_type = '物联网收费'
-                self.row.f_bill_style = self.model.f_print
-                self.print = true
-              } else {
-                self.row.id = res.data.id
-                self.print = true
-              }
-            }
-          ).catch((error) => {
-            if (error.status === 301) {
-              self.$dispatch('refresh')
-            } else {
-              if (error) {
-                self.$showAlert('收费成功,电子票开具失败，' + error + '，请在自定义开票页面补开发票。', 'danger', 0)
-              }
-            }
-            if (self.config.hasBillManage) {
-              // 启用发票管理，获取票据管理中的票号并存储记录
-              self.row.id = res.data.id
-              self.row.f_bill_type = '物联网收费'
-              self.row.f_bill_style = self.model.f_print
-              self.print = true
-            } else {
-              self.row.id = res.data.id
-              self.print = true
-            }
-          })
-        }
       } else {
         self.$dispatch('success')
       }

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Wed Mar 18 10:18:57 CST 2026
-gradle.version=5.2.1