sale-client 4.2.75 → 4.2.77

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Mon Oct 27 16:31:04 CST 2025
+#Thu Oct 30 09:31:24 CST 2025
 gradle.version=5.2.1

package/.npmignore

@@ -0,0 +1,12 @@
+src/bootstrap
+.idea/
+.DS_Store
+node_modules/
+dist/
+examples/
+gradle/
+npm-debug.log
+selenium-debug.log
+test/unit/coverage
+test/e2e/reports
+lib/**/lib

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://123.57.92.217:8900/', 'http://123.57.92.217:8900/']
+const [ serverRul, localUrl ] = ['http://192.168.50.67:31467/', 'http://192.168.50.67:31467/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -47,14 +47,14 @@ var devConfig = {
       //   },
       //   target: localUrl
       // },
-      '/rs/pay': {
-        target: 'http://localhost:8080'
-      },
+      // '/rs/pay': {
+      //   target: 'http://localhost:8080'
+      // },
       '/api/af-revenue': {
-        // pathRewrite: {
-        //   '/api/af-revenue': '/af-revenue'
-        // },
-        target: serverRul
+        pathRewrite: {
+          '/api/af-revenue': ''
+        },
+        target: 'http://127.0.0.1:9026'
       },
       '/api': {
         target: serverRul

package/package.json

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

package/src/.npmignore

@@ -0,0 +1 @@
+

package/src/components/FilesManageNew/FileUserFiles.vue

@@ -676,7 +676,7 @@ let loadParamGem = async function (self) {
         'onFileUpload': function (file, res) {
           if (this.batchmoneyShow) {
             let param = {
-              filepath: res.f_downloadpath,
+              filepath: res.f_realpath,
               f_operator: this.$login.f.name,
               f_operatorid: this.$login.f.id,
               f_orgid: this.$login.f.orgid,
@@ -695,7 +695,7 @@ let loadParamGem = async function (self) {
             this.iswork = true
             // 当前上传的是批量导入的档案
             let param = {
-              filepath: res.f_downloadpath,
+              filepath: res.f_realpath,
               f_operator: this.$login.f.name,
               f_operatorid: this.$login.f.id,
               f_orgid: this.$login.f.orgid,
@@ -708,7 +708,7 @@ let loadParamGem = async function (self) {
               axios.post('api/af-revenue/logic/newPrepareSettleFileImport',
                     {data: param}, {timeout: 10 * 60 * 1000, headers: {token: Vue.$login.jwt, Authorization: 'Bearer ' + Vue.$login.jwtNew}}).then((res) => {
                       if (res.data) {
-                        self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)
+                        self.$showMessage(`本次上传共上传${res.data.data.totalsum}条数据, 成功${res.data.data.successnum}条,失败${res.data.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)
                         self.iswork = false
                   // this.$showAlert('导入成功','success',2000)
                       }

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

@@ -638,7 +638,7 @@
           // 通过收款进行划价
           let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
           if (this.row.f_isdecimal === '是') {
-            this.model.f_pregas = getGas.data.gas.toFixed(this.row.f_gas_decimal || 4)
+            this.model.f_pregas = (getGas.data.gas - 0).toFixed(this.row.f_gas_decimal || 4)
           } else {
             this.model.f_pregas = parseInt(getGas.data.gas)
           }
@@ -649,7 +649,8 @@
           this.model.f_preamount = dymoney2.data.chargenum
           this.calText(dymoney2.data.chargeprice)
         } catch (error) {
-          this.$showAlert(`发卡售气划价错误，错误类型：${error}`, 'danger', 0)
+          console.error(error)
+          this.$showAlert(`划价错误，错误类型：${error}`, 'danger', 0)
           this.$dispatch('error', '发卡售气', this.model, error)
         }
       },

package/src/filiale/alashan/business/IOTMeterCenter.vue

@@ -638,7 +638,7 @@
           // 通过收款进行划价
           let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
           if (this.row.f_isdecimal === '是') {
-            this.model.f_pregas = getGas.data.gas.toFixed(this.row.f_gas_decimal || 4)
+            this.model.f_pregas = (getGas.data.gas - 0).toFixed(this.row.f_gas_decimal || 4)
           } else {
             this.model.f_pregas = parseInt(getGas.data.gas)
           }