sale-client-xianyang 3.3.448 → 3.3.450

package/package.json

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

package/src/components/SellGasCharge/ChargeCancel/CardMeterChargeCancel.vue

@@ -348,6 +348,17 @@ export default {
       //   }
       // }
       this.hascard = hascard
+      // 检查撤销剩余天数限制
+      let cancelDays = this.$appdata.getSingleValue('撤销剩余天数') ? this.$appdata.getSingleValue('撤销剩余天数') : 30
+      if (this.model.f_date) {
+        let chargeDate = new Date(this.model.f_date).getTime()
+        let currentDate = new Date().getTime()
+        let dayDiff = Math.floor((currentDate - chargeDate) / (1000 * 60 * 60 * 24))
+        if (dayDiff > cancelDays) {
+          this.$showAlert(`已超过撤销冲正退款时限：${cancelDays}天。`, 'warning', 2000)
+          return
+        }
+      }
       if (this.config.cancletime) {
         let a = this.$login.toStandardDateString() + ' 00:00:00'
         // console.log('当前时间',row.f_date>a)

package/src/plugins/CardService.js

@@ -1387,7 +1387,7 @@ let reissueCardGen = function * (model, row) {
     f_card_id: model.f_card_id,
     f_ispick_table: model.f_ispick_table,
     f_cardfees: model.f_cardfees,
-    f_payment: model.f_payment[0],
+    f_payment: model.f_cardfees === 0 || model.f_cardfees === '0' ? '现金缴费' : model.f_payment[0],
     f_bill_style: model.f_print[0],
     f_comments: model.f_comments,
     record_userinfo: row.f_userinfo_id,

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Thu Dec 18 17:45:08 CST 2025
-gradle.version=5.2.1