sale-client 3.7.61 → 3.7.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.7.61",
+  "version": "3.7.63",
   "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/jingyang/EticketPrint.vue

@@ -77,14 +77,12 @@ export default {
 
         // 判断 id 是否为数组，如果是数组则去重
         let processedId = Array.isArray(id) ? [...new Set(id)] : id
-
-        let result = await axios.post('/invoice/rs/logic/getInvoice', Object.assign({
+        const param = {
           id: processedId || id,
           f_charge_type,
           retry,
           isTax: is_tax === '不征税' ? 0 : 1,
           invoice_kind: invoice_type,
-          // eticket_id: model.id,
           f_buy_openbank: model.f_paper_account,
           f_buy_phone: model.f_buy_phone,
           bill_type: model.f_print ? model.f_print : null,
@@ -102,7 +100,11 @@ export default {
             dep_id: Vue.$login.f.depids,
             depname: Vue.$login.f.deps
           }
-        }, {f_invoice_type: 0}), {
+        }
+        if (retry) {
+          param.eticket_id = model.id
+        }
+        let result = await axios.post('/invoice/rs/logic/getInvoice', Object.assign(param, {f_invoice_type: 0}), {
           resolveMsg: null,
           rejectMsg: '发票打印失败!!'
         })

package/src/filiale/jingyang/EticketV4/EticketRecordList.vue

@@ -402,7 +402,7 @@ export default {
     },
     async confirm () {
       this.eticket_show = true
-      await this.$refs.eticketbill.rushRedInvoice({id: this.row.f_sell_id, eticket_id: this.row.id, bz: this.bz})
+      await this.$refs.eticketbill.rushRedInvoice({id: this.row.f_sell_id || this.row.sell_id, eticket_id: this.row.id, bz: this.bz})
     },
     async fp_search (row) {
       this.eticket_show = true
@@ -423,7 +423,7 @@ export default {
     },
     kp (row, retry = false) {
       this.eticket_show = true
-      this.$refs.eticketbill.openETicket(row.f_sell_id, row, row.f_charge_type, retry, row.f_invoice_category)
+      this.$refs.eticketbill.openETicket(row.f_sell_id || row.sell_id, row, row.f_charge_type, retry, row.f_invoice_category)
     },
     eticket_toggle () {
       this.eticket_show = false

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)
+      }
     }
   },
 

package/src/filiale/tongchuan/MeterinfoTest.vue

@@ -179,7 +179,6 @@
             <datepicker style="width:60%" placeholder="通气日期"
                         v-model="row.f_gas_date"
                         v-ref:f_gas_date
-                        :disabled ="isedit"
                         :value.sync="row.f_gas_date"
                         :format="'yyyy-MM-dd HH:mm:ss'"
                         :show-reset-button="reset"

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Wed May 13 15:19:48 CST 2026
-gradle.version=5.2.1