sale-client 4.2.120 → 4.2.121

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://192.168.50.67:31567/']
+const [ serverRul, localUrl ] = ['http://121.36.106.17:31467/', 'http://121.36.106.17:31467/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -51,10 +51,10 @@ var devConfig = {
         target: 'http://localhost:8080'
       },
       '/api/af-revenue': {
-        pathRewrite: {
-          '/api/af-revenue': '/af-revenue'
-        },
-        target: "http://localhost:8080"
+        // pathRewrite: {
+        //   '/api/af-revenue': '/af-revenue'
+        // },
+        target: serverRul
       },
       '/api': {
         target: serverRul

package/package.json

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

package/src/filiale/yangchun/ChangeMeter.vue

@@ -653,6 +653,54 @@ export default {
     clean () {
       this.$dispatch('success', '换表', this.row)
     },
+    // 卡表换表时，保存一条抄表记录（可传入旧表快照，默认用当前 row）
+    async saveCardHandRecord (oldRow) {
+      // 没有录入旧表底数则不保存
+      if (!this.model.f_using_base_old) {
+        return
+      }
+      const row = oldRow || this.row
+      const data = {
+        f_tablebase: Number(this.model.f_using_base_old), // 本期底数
+        // 上期底数（当前档案中的底数即上次抄表底数）
+        f_last_tablebase: row.f_meter_base,
+        f_operator: this.$login.f.name,
+        f_filiale: this.$login.f.f_fengongsi,
+        f_outlets: this.$login.f.f_parentname,
+        f_meter_state: '已抄表',
+        f_hand_state: '有效',
+        f_meter_source: '换表结算抄表',
+        f_input_date: this.$login.toStandardTimeString(),
+        f_last_input_date: row.f_last_input_date ? row.f_last_input_date : this.$login.toStandardTimeString(),
+        f_operate_date: this.$login.toStandardTimeString(),
+        f_filialeids: this.$login.f.orgid,
+        f_orgid: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgs,
+        f_depid: this.$login.f.depids,
+        f_depname: this.$login.f.deps,
+        f_operatorid: this.$login.f.id,
+        f_user_id: row.f_user_id + '',
+        f_total_gas: row.f_total_gas,
+        f_total_fee: row.f_total_fee,
+        f_userfiles_id: row.f_userfiles_id,
+        f_hand_date: this.$login.toStandardTimeString(),
+        f_total_usegas_amount: row.f_total_usegas_amount,
+        f_price_id: this.row.f_price_id,
+        f_meternumber: this.row.f_meternumber,
+        f_meter_brand: this.row.f_meter_brand,
+        f_meter_classify: this.row.f_meter_type,
+        f_user_name: this.row.f_user_name
+      }
+      try {
+        console.log('卡表换表保存抄表记录..', row)
+        await this.$resetpost('api/af-revenue/logic/cardCommonEnter', data, {
+          resolveMsg: null,
+          rejectMsg: '录入数据出错!!!'
+        })
+      } catch (e) {
+        console.log('卡表换表保存抄表记录失败', e)
+      }
+    },
     addTask () {
       if (this.addTaskModel.f_userinfo_code != this.row.f_userinfo_code) {
         this.$showAlert('请填写正确的用户编号！！！', 'warning', 3000)
@@ -765,6 +813,14 @@ export default {
     },
     async saveobj () {
       try {
+        const oldMeterSnapshot = Object.assign({}, this.row)
+        // 换表前先保存卡表抄见，随后调整内存中的版本以避免乐观锁冲突
+        if (oldMeterSnapshot.f_meter_type == '气量卡表' || oldMeterSnapshot.f_meter_type == '金额卡表') {
+          await this.saveCardHandRecord(oldMeterSnapshot)
+          if (typeof this.row.version !== 'undefined') {
+            this.row.version = (this.row.version || 0) + 1
+          }
+        }
         this.model.f_operator = this.$login.f.name
         this.model.f_operatorid = this.$login.f.id
         this.model.f_orgid = this.$login.f.orgid

package/src/main.js

@@ -2,7 +2,7 @@ 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/meihekou/sale'
+import FilialeSale from './filiale/yangchun/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'

package/.gradle/buildOutputCleanup/cache.properties

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