sale-client-xianyang 3.3.446 → 3.3.447

package/build/dev-server.js

@@ -6,13 +6,13 @@ var proxyMiddleware = require('http-proxy-middleware')
 
 var app = express()
 var compiler = webpack(config)
-var server = 'http://172.16.16.162:8300'
-var local = 'http://172.16.16.162:8300'
+var server = 'http://192.168.153.129:8300'
+var local = 'http://127.0.0.1:8080'
 var proxyTable = {
   '/rs/file': {
     target: server
   },
-  '/rs/sql/address_getAddress': {
+  '/rs/sql/iot_getNewMeterBrandAndModel': {
     target: server
   },
   '/rs/logic/address_updateuseraddress': {
@@ -22,7 +22,7 @@ var proxyTable = {
     target: server
   },
   '/rs/logic/changeMeter': {
-    target: local
+    target: server
   },
   '/pos': {
     target: server
@@ -80,13 +80,13 @@ var proxyTable = {
     target: server
   },
   '/rs/logic': {
-    target: local
+    target: server
   },
   '/rs/entity': {
-    target: local
+    target: server
   },
   '/rs/sql': {
-    target: local
+    target: server
   },
   '/webmeter': {
     target: server

package/package.json

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

package/src/components/FilesManage/UserDeviceInfoTest.vue

@@ -131,7 +131,21 @@ export default {
       this.show_devices = !this.show_devices
     },
     deleteDevice (index, row) {
-      this.devicesinfo.splice(index, 1)
+      if (row.id) {
+        this.$showMessage('此操作无法还原，是否确定要删除此设备？', ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            let sql = `delete from t_devices where id = ${row.id}`
+            this.$resetpost('/rs/logic/runSQL', {data: {sql: sql}}, {
+              resolveMsg: `成功删除此设备`,
+              rejectMsg: '删除设备失败'
+            }).then((res) => {
+              this.devicesinfo.splice(index, 1)
+            })
+          }
+        })
+      } else {
+        this.devicesinfo.splice(index, 1)
+      }
     },
     addDevice () {
       console.log('设备信息', this.devicesinfo)

package/src/plugins/ChangeMeterService.js

@@ -713,6 +713,8 @@ let ChangeMeterService = {
               f_user_id: row.f_user_id,
               f_userfiles_id: row.f_userfiles_id,
               version: row.version,
+              // 要求计入累购的情况下需要给 f_balance_gas 加上本次收费气量
+              f_balance_gas: (row.f_balance_gas - 0) + (model.f_pregas - 0),
               f_total_gas: (model.f_pregas - 0) + (row.f_total_gas - 0),
               f_total_fee: (model.f_preamount - 0) + (row.f_total_fee - 0)
               // f_meter_base: (model.f_pregas - 0) + (row.f_total_gas - 0),
@@ -729,6 +731,8 @@ let ChangeMeterService = {
               f_user_id: row.f_user_id,
               f_userfiles_id: row.f_userfiles_id,
               version: row.version,
+              // 要求计入累购的情况下需要给 f_balance_amount 加上本次收费金额
+              f_balance_amount: (row.f_balance_amount - 0) + (model.f_preamount - 0),
               f_total_gas: (model.f_pregas - 0) + (row.f_total_gas - 0),
               f_total_fee: (model.f_preamount - 0) + (row.f_total_fee - 0)
               // f_meter_base: (model.f_pregas - 0) + (row.f_total_gas - 0),

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Fri Nov 28 09:22:31 CST 2025
-gradle.version=5.2.1