sale-client 4.1.6 → 4.1.7

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Wed Apr 02 14:48:19 CST 2025
+gradle.version=5.2.1

package/build/dev-server.js

@@ -19,6 +19,12 @@ var devConfig = {
       children: false // 不输出子模块构建信息
     },
     proxy: {
+      '/api/af-revenue/report': {
+        pathRewrite: {
+          '/api/af-revenue/report': '/report'
+        },
+        target: localUrl
+      },
     '/api/af-revenue/batchdeduction/all': {
       pathRewrite: {
         '/api/af-revenue/batchdeduction/all': '/batchdeduction/all'
@@ -31,10 +37,10 @@ var devConfig = {
         },
         target: localUrl
       },
-      '/api/af-revenue/file': {
-        // pathRewrite: {
-        //   '/api/af-revenue/file': '/file'
-        // },
+      '/api/af-revenue/downloadfile/file': {
+        pathRewrite: {
+          '/api/af-revenue/downloadfile/file': 'downloadfile/file'
+        },
         target: localUrl
       },
       '/weixin2/rs':{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "4.1.6",
+  "version": "4.1.7",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -32,7 +32,7 @@
     "less-loader": "^2.2.3",
     "system-clients": "3.3.2",
     "ldap-clients": "3.0.96",
-    "address-client": "4.0.1-yunChengV4",
+    "address-client": "4.0.11",
     "manage-client": "3.1.8-88",
     "axios": "0.15.3",
     "babel-core": "^6.0.0",

package/src/filiale/yangchun/CardChangeFill.vue

@@ -244,10 +244,10 @@
         let gas = self.model.f_pregas - self.model.f_fill_gas
         let getAmount = await self.$CommonService.gasCalculate(self.model, gas)
         console.log('划价返回', getAmount, self.openFee, self.row.f_balance)
-        self.model.f_preamount = getAmount.data.chargenum
+        self.model.f_preamount = (getAmount.data.chargenum - 0).toFixed(self.getDecimalPlaces)
         // 计算气费和其他费用(暂时只有开卡费，之后有其他费在加)
         let total = (getAmount.data.chargenum - 0) + (self.openFee - 0)
-        self.model.f_totalcost = (self.row.f_balance - 0) > (total - 0) ? 0 : ((total - 0) - (self.row.f_balance - 0)).toFixed(4)
+        self.model.f_totalcost = (self.row.f_balance - 0) > (total - 0) ? 0 : ((total - 0) - (self.row.f_balance - 0)).toFixed(self.getDecimalPlaces)
         Object.assign(self.model, self.model, getAmount.data)
         self.model.chargeprice = getAmount.data.chargeprice
         self.model.f_collection = self.model.f_totalcost
@@ -433,6 +433,13 @@
 
     props: ['row'],
     async ready () {
+      // 重写 toFixed 方法，实现四舍五入
+      Number.prototype.toFixed = function(digits) {
+        const num = this
+        const multiplier = Math.pow(10, digits)
+        const rounded = Math.round(num * multiplier) / multiplier
+        return rounded.toString()
+      }
       this.blodid = this.row.f_userinfo_id
       this.model.f_price_id = this.row.f_price_id
       this.model.f_user_id = this.row.f_user_id
@@ -536,7 +543,19 @@
           this.model.f_pregasBuy = 0
           return
         }
-        this.model.f_pregas = (this.model.f_fill_gas - 0 + (this.model.f_pregasBuy - 0)).toFixed(4) - 0
+        // 根据f_meter_brand保留对应的小数位数
+        if (this.row.f_isdecimal === '是') {
+          if (this.row.f_meter_brand === '秦川卡表') {
+            this.model.f_pregasBuy = (this.model.f_pregasBuy - 0).toFixed(2)
+          } else if (this.row.f_meter_brand === '重庆精益民用') {
+            this.model.f_pregasBuy = (this.model.f_pregasBuy - 0).toFixed(1)
+          } else {
+            this.model.f_pregasBuy = (this.model.f_pregasBuy - 0).toFixed(4)
+          }
+        } else {
+          this.model.f_pregasBuy = parseInt(this.model.f_pregasBuy - 0)
+        }
+        this.model.f_pregas = (this.model.f_fill_gas - 0 + (this.model.f_pregasBuy - 0)).toFixed(this.getDecimalPlaces) - 0
         this.pregas()
       },
       pregas () {

package/src/filiale/yangchun/CardMeterCenter.vue

@@ -303,7 +303,14 @@
   // 输入气量，换算金额
   let pregasGen = async function (self) {
     if (self.row.f_isdecimal === '是') {
-      self.model.f_pregas = (self.model.f_pregas - 0).toFixed(self.row.f_gas_decimal || 4)
+      // 根据表具品牌判断小数位数
+      if (self.row.f_meter_brand === '秦川卡表') {
+        self.model.f_pregas = Math.floor(self.model.f_pregas * 100) / 100
+      } else if (self.row.f_meter_brand === '重庆精益民用') {
+        self.model.f_pregas = Math.floor(self.model.f_pregas * 10) / 10
+      } else {
+        self.model.f_pregas = (self.model.f_pregas - 0).toFixed(self.row.f_gas_decimal || 4)
+      }
     } else {
       self.model.f_pregas = (self.model.f_pregas - 0).toFixed(0)
     }
@@ -315,8 +322,15 @@
       if (self.row.f_project_money && self.row.f_project_money > 0) {
         self.model.getDeduct = (self.$CommonService.getDeduct(self.row, self.model.f_pregas) - 0)
       }
-      self.model.f_preamount = (getAmount.data.chargenum - 0).toFixed(self.row.f_fee_decimal || 4)
-      self.model.f_totalcost = ((self.row.f_balance - 0) > ((getAmount.data.chargenum - 0) + self.model.getDeduct - 0) ? 0 : (((getAmount.data.chargenum - 0) + self.model.getDeduct - 0) - (self.row.f_balance - 0)).toFixed(self.row.f_fee_decimal || 4))
+      // 根据表具品牌判断金额小数位数
+      let feeDecimal = 4
+      if (self.row.f_meter_brand === '秦川卡表') {
+        feeDecimal = 2
+      } else if (self.row.f_meter_brand === '重庆精益民用') {
+        feeDecimal = 1
+      }
+      self.model.f_preamount = (getAmount.data.chargenum - 0).toFixed(feeDecimal)
+      self.model.f_totalcost = ((self.row.f_balance - 0) > ((getAmount.data.chargenum - 0) + self.model.getDeduct - 0) ? 0 : (((getAmount.data.chargenum - 0) + self.model.getDeduct - 0) - (self.row.f_balance - 0)).toFixed(feeDecimal))
       Object.assign(self.model, self.model, getAmount.data)
       self.model.chargeprice = getAmount.data.chargeprice
       if (self.model.f_payment == '赠气') {
@@ -432,7 +446,7 @@
   let asyncCardMeterCenter = async function (self) {
     await self.$getConfig(self, 'CardMeterCenter')
     console.log('卡表收费config', self.config)
-    // 添加 “系统余额透支” 付款方式
+    // 添加 "系统余额透支" 付款方式
     let i = -1
     for (const index in self.paytype) {
       if (self.paytype[index].value == '系统余额透支') {
@@ -530,7 +544,7 @@
         randomBusinessId: '',
         resid: [],  // 存放新增的f_files表中id
         config: {
-          calculatePreByCollection: false, // 可以更具收款来反向计算预购
+          calculatePreByCollection: false, // 可以根据收款来反向计算预购
           notShowFormula: false, // 不显示计算公式,默认显示
           autoCollection: true, // 自动填写收款
           quickSale: false,
@@ -602,6 +616,13 @@
     },
     props: ['row', 'cardData'],
     async ready () {
+      // 重写 toFixed 方法，实现四舍五入
+      Number.prototype.toFixed = function(digits) {
+        const num = this
+        const multiplier = Math.pow(10, digits)
+        const rounded = Math.round(num * multiplier) / multiplier
+        return rounded.toString()
+      }
       if (this.authArr.includes('余额写卡限定')) {
         this.paytype = [{label: '余额写卡', value: '余额写卡'}]
       } else {
@@ -697,20 +718,41 @@
       async calculatePreByCollection () {
         try {
           this.model.f_collection = (this.model.f_collection - 0)
-          let calFee = ((this.model.f_collection - 0) + (this.row.f_balance)).toFixed(4)
-          // 通过收款进行划价
-          let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
-          this.model.f_pregas = parseInt(getGas.data.gas)
+          // 根据表具品牌判断金额小数位数
+          let feeDecimal = 4
+          if (this.row.f_meter_brand === '秦川卡表') {
+            feeDecimal = 2
+          } else if (this.row.f_meter_brand === '重庆精益民用') {
+            feeDecimal = 1
+          }
+
+          // 根据收款金额计算预购气量
+          let getGas = await this.$CommonService.feeCalculate(this.model, this.model.f_collection)
+
+          // 根据表具品牌判断气量小数位数，使用截取而不是四舍五入
+          if (this.row.f_meter_brand === '秦川卡表') {
+            this.model.f_pregas = Math.floor(getGas.data.gas * 100) / 100
+          } else if (this.row.f_meter_brand === '重庆精益民用') {
+            this.model.f_pregas = Math.floor(getGas.data.gas * 10) / 10
+          } else {
+            this.model.f_pregas = parseInt(getGas.data.gas)
+          }
+
+          // 根据气量计算金额
           let dymoney2 = await this.$CommonService.gasCalculate(this.model, this.model.f_pregas)
           this.model.chargeprice = dymoney2.data.chargeprice
           Object.assign(this.model, this.model, dymoney2.data)
-          this.model.f_totalcost = ((this.row.f_balance - 0) > (dymoney2.data.chargenum - 0) ? 0 : ((dymoney2.data.chargenum - 0) - (this.row.f_balance - 0)).toFixed(this.row.f_fee_decimal || 4))
-          this.model.f_preamount = dymoney2.data.chargenum
+
+          // 计算应收金额
+          let totalCost = ((this.row.f_balance - 0) > (dymoney2.data.chargenum - 0) ? 0 : ((dymoney2.data.chargenum - 0) - (this.row.f_balance - 0)))
+
+          this.model.f_totalcost = totalCost.toFixed(feeDecimal)
+          this.model.f_preamount = ((dymoney2.data.chargenum - 0)).toFixed(feeDecimal)
           this.model.getDeduct = 0
           if (this.row.f_project_money && this.row.f_project_money > 0) {
             this.model.getDeduct = (this.$CommonService.getDeduct(this.row, this.model.f_pregas) - 0)
-            this.model.f_totalcost = (this.model.f_totalcost - 0 ) + (this.model.getDeduct- 0 )
-            this.model.f_collection = (this.model.f_collection - 0 ) + (this.model.getDeduct- 0 )
+            this.model.f_totalcost = ((this.model.f_totalcost - 0) + (this.model.getDeduct - 0)).toFixed(feeDecimal)
+            this.model.f_collection = ((this.model.f_collection - 0) + (this.model.getDeduct - 0)).toFixed(feeDecimal)
           }
           this.calText(dymoney2.data.chargeprice, this.model.getDeduct)
         } catch (error) {

package/src/filiale/yangchun/ChangeMeter.vue

@@ -543,6 +543,13 @@ export default {
     }
   },
   ready () {
+    // 重写 toFixed 方法，实现四舍五入
+    Number.prototype.toFixed = function(digits) {
+      const num = this
+      const multiplier = Math.pow(10, digits)
+      const rounded = Math.round(num * multiplier) / multiplier
+      return rounded.toString()
+    }
     getPrice(this)
     this.getRandomId()
   },
@@ -990,7 +997,7 @@ export default {
         this.$showAlert('该表可能存在超用，请核实输入后进行换表操作！！', 'warning', 5000)
         this.$dispatch('refresh')
       }
-      this.model.f_remanent_gas = (param - (this.model.f_using_base_old - 0)).toFixed(4)
+      this.model.f_remanent_gas = (param - (this.model.f_using_base_old - 0)).toFixed(this.getGasDecimalPlaces())
     },
 
     calMoneyCardRemanent () {
@@ -1007,10 +1014,10 @@ export default {
         this.$showAlert('该表可能存在超用，请核实输入后进行换表操作！！', 'warning', 5000)
         this.$dispatch('refresh')
       }
-      this.model.f_remanent_gas = (param - (this.model.f_using_base_old - 0)).toFixed(4)
+      this.model.f_remanent_gas = (param - (this.model.f_using_base_old - 0)).toFixed(this.getGasDecimalPlaces())
       console.log('金额结算' + this.model.f_remanent_gas)
       if (this.model.f_remanent_price > 0) {
-        this.model.f_remanent_gas = (param - (this.model.f_using_base_old - 0)).toFixed(4)
+        this.model.f_remanent_gas = (param - (this.model.f_using_base_old - 0)).toFixed(this.getGasDecimalPlaces())
         this.model.f_remanent_money = ((this.model.f_remanent_gas - 0) * (this.model.f_remanent_price - 0)).toFixed(4)
         if (this.row.f_remanent_gas > 0) {
           this.model.f_remanent_money = (this.model.f_remanent_money - 0) + ((this.row.f_remanent_gas - 0) * (this.row.f_remanent_price - 0)).toFixed(4)
@@ -1054,32 +1061,17 @@ export default {
         let res = this.$ChangeMeter.changeMeter(oldMeter, newMeter, this.row)
         console.log('看看新旧表的转换结果', res)
         this.changeType = res.name
-/*        if (this.addbalance) {
-          this.addbalance = false
-          this.model.f_remanent_money = (this.model.f_remanent_money - 0) - (this.row.f_balance - 0)
-        }
-        if (this.addgas) {
-          this.addgas = false
-          this.model.f_remanent_gas = (this.model.f_remanent_gas - 0) - (this.addgasnum - 0)
-          this.addgasnum = 0
-        }
-        if (newMeter.f_meter_type == '物联网表' && newMeter.f_collection_type == '按金额' && (!this.addbalance)) {
-          this.addbalance = true
-          this.model.f_remanent_money = this.model.f_remanent_money ? (this.model.f_remanent_money - 0) + (this.row.f_balance - 0) : (this.row.f_balance - 0)
-          if (!this.isGas) {
-            this.addgas = true
+
+        // 根据新表品牌重新计算补气量的小数位数
+        if (this.model.f_remanent_gas) {
+          if (val[0].f_meter_brand === '秦川卡表') {
+            this.model.f_remanent_gas = (this.model.f_remanent_gas - 0).toFixed(2)
+          } else if (val[0].f_meter_brand === '重庆精益民用') {
+            this.model.f_remanent_gas = (this.model.f_remanent_gas - 0).toFixed(1)
+          } else {
+            this.model.f_remanent_gas = (this.model.f_remanent_gas - 0).toFixed(4)
           }
         }
-        if (newMeter.f_meter_type == '物联网表' && newMeter.f_collection_type == '按气量' && (!this.addgas)) {
-          this.addgas = true
-          debugger
-          this.addgasnum = ((this.row.f_balance - 0) / this.model.f_remanent_price).toFixed(4)
-          this.model.f_remanent_gas = this.model.f_remanent_gas ? (this.model.f_remanent_gas - 0) + (this.addgasnum - 0) : this.addgasnum
-          if (!this.isGas) {
-            this.addbalance = true
-            this.model.f_remanent_money = this.model.f_remanent_money ? (this.model.f_remanent_money - 0) + (this.row.f_balance - 0) : (this.row.f_balance - 0)
-          }
-        } */
       }
     },
 
@@ -1178,6 +1170,17 @@ export default {
       this.model.f_remanent_money = totalAmount
       // 计算公式
       this.getComments(allocations)
+    },
+    // 新增：根据表品牌返回补气量小数位数
+    getGasDecimalPlaces() {
+      if (this.model.metermessage.gasbrand && this.model.metermessage.gasbrand[0]) {
+        if (this.model.metermessage.gasbrand[0].f_meter_brand === '秦川卡表') {
+          return 2
+        } else if (this.model.metermessage.gasbrand[0].f_meter_brand === '重庆精益民用') {
+          return 1
+        }
+      }
+      return 4
     }
   },
   watch: {
@@ -1201,7 +1204,7 @@ export default {
       console.log('观察补气金额', val)
       if (!this.isGas) {
         if (this.model.f_remanent_price) {
-          this.model.f_remanent_gas = (val / this.model.f_remanent_price).toFixed(4)
+          this.model.f_remanent_gas = (val / this.model.f_remanent_price).toFixed(this.getGasDecimalPlaces())
         } else {
           this.model.f_remanent_gas = 0
         }

package/src/main.js

@@ -2,8 +2,8 @@ import Vue from 'vue'
 import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
-import FilialeSale from './filiale/fugu/sale'
 import sale from './sale'
+import FilialeSale from './filiale/yangchun/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'
@@ -22,7 +22,7 @@ Vue.config.silent = true
 all()
 system(false)
 sale()
-address()
+address('yangchun')
 ldap()
 FilialeSale()
 require('system-clients/src/styles/less/bootstrap.less')