sale-client 4.2.119 → 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.119",
+  "version": "4.2.121",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/charge/saletabbut.vue

@@ -72,7 +72,7 @@
     methods: {
       handleTabListClick (index, el) {
         this.$parent.show = el.header
-        if (el.comp._scope && el.comp._scope.tab) {
+        if (el.comp && el.comp._scope && el.comp._scope.tab && el.comp._scope.tab.comp && el.comp._scope.tab.comp.name) {
           this.$dispatch('tab-changed', el.comp._scope.tab.comp.name)
         }
         if (!el.disabled) this.active = index

package/src/components/common/userinfo_detail/UserInfoDetailManageNew.vue

@@ -8,104 +8,13 @@
                             @cancel-re="cancelRe"
         @search-main="search"></user-base-info-new></div>
       <saletabbut  v-if="row" v-ref:list style="height:72%;margin-top: 1%;overflow-y: scroll">
-        <saletab header="流水查询" v-if="permission('流水查询')">
-          <record-query-user :row="row"></record-query-user>
-        </saletab>
-        <saletab header="机表流水查询" v-if="permission('机表流水查询')&&row.f_meter_type.includes('机表')">
-          <machine-record-query :row="row" v-if="show == '机表流水查询'" @deal-msg="dealMsg"></machine-record-query>
-        </saletab>
-        <saletab header="收费查询" v-if="!newWebHand && permission('收费查询')">
-          <charge-query-user  :row="row" v-if="show == '收费查询'" @deal-msg="dealMsg"></charge-query-user>
-        </saletab>
-        <saletab header="收费查询" v-if="newWebHand && permission('收费查询')">
-          <charge-query-user  :row="row" v-if="show == '收费查询'" @deal-msg="dealMsg"></charge-query-user>
-        </saletab>
-        <saletab header="累购查询" v-if="permission('累购查询')">
-          <Repurchase  :row="row" v-if="show == '累购查询'" @deal-msg="dealMsg"></Repurchase>
-        </saletab>
-        <saletab header="下账查询" v-if="!newWebHand && row.f_meter_type.includes('物联网表')&&permission('自动下账查询')">
-          <automatic-purse  :row="row"   @deal-msg="dealMsg"></automatic-purse>
-        </saletab>
-        <saletab header="下账查询" v-if="newWebHand && row.f_meter_type.includes('物联网表')&&permission('自动下账查询')">
-          <web-automatic-purse  :row="row"   @deal-msg="dealMsg"></web-automatic-purse>
-        </saletab>
-        <saletab header="抄表记录" v-if="row.f_meter_type.includes('卡表')&&permission('抄表记录')">
-          <card-hand-record :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></card-hand-record>
-        </saletab>
-        <saletab header="抄表记录" v-if="!newWebHand && !row.f_meter_type.includes('卡表')&&permission('抄表记录')">
-          <hand-query-user  :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></hand-query-user>
-        </saletab>
-        <saletab header="抄表记录" v-if="newWebHand && !row.f_meter_type.includes('卡表')&&permission('抄表记录')">
-          <web-hand-query-user  :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></web-hand-query-user>
-        </saletab>
-        <saletab header="补卡查询" v-if="row.f_meter_type.includes('卡表')&&permission('补卡查询')">
-          <fill-card-query-user :row="row" v-if="show == '补卡查询'" @deal-msg="dealMsg"></fill-card-query-user>
-        </saletab>
-        <saletab header="补气查询" v-if="permission('补气查询')">
-          <fill-gas-query-user  :row="row" v-if="show == '补气查询'" @deal-msg="dealMsg"></fill-gas-query-user>
-        </saletab>
-        <saletab header="换表查询" v-if="permission('换表查询')">
-          <change-meter-query-user  :row="row" v-if="show == '换表查询'" @deal-msg="dealMsg"></change-meter-query-user>
-        </saletab>
-        <saletab header="其他收费" v-if="permission('其他收费')">
-          <other-charge-query-user  :row="row" v-if="show == '其他收费'" @deal-msg="dealMsg"></other-charge-query-user>
-        </saletab>
-        <saletab header="保险收费记录" v-if="permission('保险收费记录')">
-          <insurance-charges-record :row="row"  @deal-msg="dealMsg"></insurance-charges-record>
-        </saletab>
-        <saletab header="垃圾费收费记录" v-if="permission('垃圾费收费记录')">
-          <garbage-record-list :row="row"  @deal-msg="dealMsg"></garbage-record-list>
-        </saletab>
-        <saletab header="过户查询" v-if="permission('过户查询')">
-          <transfer-query-user  :row="row" v-if="show == '过户查询'" @deal-msg="dealMsg"></transfer-query-user>
-        </saletab>
-        <saletab header="价格调整" v-if="permission('价格调整')">
-          <price-change-query-user  :row="row" v-if="show == '价格调整'" @deal-msg="dealMsg"></price-change-query-user>
-        </saletab>
-        <saletab header="附件查看" v-if="permission('附件查看')">
-          <upload-file-history :row="row" v-if="show == '附件查看'" @deal-msg="dealMsg"></upload-file-history>
-        </saletab>
-        <saletab header="变更记录" v-if="permission('变更记录')">
-          <change-record  :row="row" v-if="show == '变更记录'" @deal-msg="dealMsg"></change-record>
-        </saletab>
-        <saletab header="指令查看" v-if="row.f_meter_type.includes('物联网表')&&permission('指令查看')">
-          <query-instruct  :row="row" v-if="show == '指令查看'" @deal-msg="dealMsg"></query-instruct>
-        </saletab>
-        <saletab header="历史指令查看" v-if="row.f_meter_type.includes('物联网表')&&permission('历史指令查看')">
-          <query-history-instruct  :row="row" v-if="show == '历史指令查看'" @deal-msg="dealMsg"></query-history-instruct>
-        </saletab>
-        <saletab header="异常报警" v-if="row.f_meter_type.includes('物联网表')&&permission('异常报警')">
-          <watch-warning  :row="row" v-if="show == '异常报警'" @deal-msg="dealMsg"></watch-warning>
-        </saletab>
-        <saletab header="表具采集" v-if="row.f_meter_type.includes('物联网表')&&permission('表具采集')">
-          <watch-collection  :row="row" v-if="show == '表具采集'" @deal-msg="dealMsg"></watch-collection>
-        </saletab>
-        <saletab header="调价补差" v-if="permission('调价补差')">
-          <price-adjustment-query-user  :row="row" v-if="show == '调价补差'" @deal-msg="dealMsg"></price-adjustment-query-user>
-        </saletab>
-        <saletab header="设备查询" v-if="permission('设备查询')">
-          <deveice-record  :row="row" v-if="show == '设备查询'" @deal-msg="dealMsg"></deveice-record>
-        </saletab>
-        <saletab header="流量计参数查看" v-if="permission('流量计参数查看')">
-          <meter-param  :row="row" v-if="show == '流量计参数查看'" @deal-msg="dealMsg"></meter-param>
-        </saletab>
-        <saletab header="表使用量图表" v-if="permission('流量计参数查看')">
-          <table-usage-chart :row="row" v-if="show == '表使用量图表'" @deal-msg="dealMsg"></table-usage-chart>
-        </saletab>
-        <saletab header="用户设备查询"  v-if="permission('用户设备查看')">
-          <user-device-query :row="row" v-if="show == '用户设备查询'" @deal-msg="dealMsg"></user-device-query>
-        </saletab>
-        <saletab header="合同查看"  v-if="permission('合同查看')">
-          <contract-signing-list :row="row" v-if="show == '合同查看'" @deal-msg="dealMsg"></contract-signing-list>
-        </saletab>
-        <saletab header="用户重点记录" v-if="permission('用户重点记录')">
-          <user-key-record :row="row"  @deal-msg="dealMsg"></user-key-record>
-        </saletab>
-        <saletab header="维修记录" v-if="permission('维修记录')">
-          <repair-list :row="row"  @deal-msg="dealMsg"></repair-list>
-        </saletab>
-        <saletab header="安检记录" v-if="permission('安检记录')">
-          <security-check-info :row="row"  @deal-msg="dealMsg"></security-check-info>
+        <saletab v-for="tab in tabConfigs" :header="tab.header" :key="$index">
+          <component
+            :is="tab.component"
+            :row="row"
+            v-if="!tab.needShowCheck || show == tab.header"
+            @deal-msg="dealMsg">
+          </component>
         </saletab>
 <!--        <saletab header="装表记录"  v-if="permission('装表记录')">-->
 <!--          <metering-records :row="row"  @deal-msg="dealMsg"></metering-records>-->
@@ -142,13 +51,13 @@
   import UserDeviceQuery from './ic_detail/UserDeviceQuery'
   import contractSigningList from './ic_detail/contractSigningList'
   import UserKeyRecord from './ic_detail/UserKeyRecord'
-  import RepairList from "./ic_detail/RepairList";
-  import SecurityCheckInfo from './ic_detail/SecuritycheckInfo';
-  // import MeteringRecords from './ic_detail/MeteringRecords'
-  // import SupervisoryControl from './apply_detail/Supervisory/SupervisoryControl'
-  // import ApplyChargeSearch from './apply_detail/applyCharge/ApplyChargeSearch'
-  // 导入物联网相关查询
-  import QueryInstruct from './iot_detail/QueryInstruct'
+  import RepairList from './ic_detail/RepairList'
+import SecurityCheckInfo from './ic_detail/SecuritycheckInfo'
+// import MeteringRecords from './ic_detail/MeteringRecords'
+// import SupervisoryControl from './apply_detail/Supervisory/SupervisoryControl'
+// import ApplyChargeSearch from './apply_detail/applyCharge/ApplyChargeSearch'
+// 导入物联网相关查询
+import QueryInstruct from './iot_detail/QueryInstruct'
   import QueryHistoryInstruct from './iot_detail/QueryHistoryInstruct'
   import WatchCollection from './iot_detail/WatchCollection'
   import WatchWarning from './iot_detail/WatchWarning'
@@ -198,6 +107,345 @@ export default {
       // SupervisoryControl,
       // ApplyChargeSearch
     },
+    computed: {
+      // 标签配置数组
+      tabConfigs () {
+        if (!this.row) {
+          return []
+        }
+        const configs = []
+        // 流水查询
+        if (this.permission('流水查询')) {
+          configs.push({
+            header: '流水查询',
+            permission: '流水查询',
+            component: 'record-query-user',
+            condition: () => true,
+            needShowCheck: false // 流水查询不需要 show 检查
+          })
+        }
+
+        // 机表流水查询
+        if (this.permission('机表流水查询') && this.row.f_meter_type && this.row.f_meter_type.includes('机表')) {
+          configs.push({
+            header: '机表流水查询',
+            permission: '机表流水查询',
+            component: 'machine-record-query',
+            condition: () => this.row.f_meter_type && this.row.f_meter_type.includes('机表'),
+            needShowCheck: true
+          })
+        }
+
+        // 收费查询（根据 newWebHand 选择组件，但这里组件相同）
+        if (this.permission('收费查询')) {
+          configs.push({
+            header: '收费查询',
+            permission: '收费查询',
+            component: 'charge-query-user',
+            condition: () => true,
+            needShowCheck: true
+          })
+        }
+
+        // 累购查询
+        if (this.permission('累购查询')) {
+          configs.push({
+            header: '累购查询',
+            permission: '累购查询',
+            component: 'repurchase',
+            condition: () => true,
+            needShowCheck: true
+          })
+        }
+
+        // 下账查询（根据 newWebHand 选择不同组件）
+        if (this.row.f_meter_type && this.row.f_meter_type.includes('物联网表') && this.permission('自动下账查询')) {
+          configs.push({
+            header: '下账查询',
+            permission: '自动下账查询',
+            component: this.newWebHand ? 'web-automatic-purse' : 'automatic-purse',
+            condition: () => this.row.f_meter_type && this.row.f_meter_type.includes('物联网表'),
+            needShowCheck: false // 下账查询不需要 show 检查
+          })
+        }
+
+        // 抄表记录（根据 meter_type 和 newWebHand 选择不同组件）
+        if (this.permission('抄表记录')) {
+          if (this.row.f_meter_type && this.row.f_meter_type.includes('卡表')) {
+            configs.push({
+              header: '抄表记录',
+              permission: '抄表记录',
+              component: 'card-hand-record',
+              condition: () => this.row.f_meter_type && this.row.f_meter_type.includes('卡表'),
+              needShowCheck: true
+            })
+          } else {
+            configs.push({
+              header: '抄表记录',
+              permission: '抄表记录',
+              component: this.newWebHand ? 'web-hand-query-user' : 'hand-query-user',
+              condition: () => !this.row.f_meter_type || !this.row.f_meter_type.includes('卡表'),
+              needShowCheck: true
+            })
+          }
+        }
+
+        // 补卡查询
+        if (this.row.f_meter_type && this.row.f_meter_type.includes('卡表') && this.permission('补卡查询')) {
+          configs.push({
+            header: '补卡查询',
+            permission: '补卡查询',
+            component: 'fill-card-query-user',
+            condition: () => this.row.f_meter_type && this.row.f_meter_type.includes('卡表'),
+            needShowCheck: true
+          })
+        }
+
+        // 补气查询
+        if (this.permission('补气查询')) {
+          configs.push({
+            header: '补气查询',
+            permission: '补气查询',
+            component: 'fill-gas-query-user',
+            condition: () => true,
+            needShowCheck: true
+          })
+        }
+
+        // 换表查询
+        if (this.permission('换表查询')) {
+          configs.push({
+            header: '换表查询',
+            permission: '换表查询',
+            component: 'change-meter-query-user',
+            condition: () => true,
+            needShowCheck: true
+          })
+        }
+
+        // 其他收费
+        if (this.permission('其他收费')) {
+          configs.push({
+            header: '其他收费',
+            permission: '其他收费',
+            component: 'other-charge-query-user',
+            condition: () => true,
+            needShowCheck: true
+          })
+        }
+
+        // 保险收费记录
+        if (this.permission('保险收费记录')) {
+          configs.push({
+            header: '保险收费记录',
+            permission: '保险收费记录',
+            component: 'insurance-charges-record',
+            condition: () => true,
+            needShowCheck: false
+          })
+        }
+
+        // 垃圾费收费记录
+        if (this.permission('垃圾费收费记录')) {
+          configs.push({
+            header: '垃圾费收费记录',
+            permission: '垃圾费收费记录',
+            component: 'garbage-record-list',
+            condition: () => true,
+            needShowCheck: false
+          })
+        }
+
+        // 过户查询
+        if (this.permission('过户查询')) {
+          configs.push({
+            header: '过户查询',
+            permission: '过户查询',
+            component: 'transfer-query-user',
+            condition: () => true,
+            needShowCheck: true
+          })
+        }
+
+        // 价格调整
+        if (this.permission('价格调整')) {
+          configs.push({
+            header: '价格调整',
+            permission: '价格调整',
+            component: 'price-change-query-user',
+            condition: () => true,
+            needShowCheck: true
+          })
+        }
+
+        // 附件查看
+        if (this.permission('附件查看')) {
+          configs.push({
+            header: '附件查看',
+            permission: '附件查看',
+            component: 'upload-file-history',
+            condition: () => true,
+            needShowCheck: true
+          })
+        }
+
+        // 变更记录
+        if (this.permission('变更记录')) {
+          configs.push({
+            header: '变更记录',
+            permission: '变更记录',
+            component: 'change-record',
+            condition: () => true,
+            needShowCheck: true
+          })
+        }
+
+        // 指令查看
+        if (this.row.f_meter_type && this.row.f_meter_type.includes('物联网表') && this.permission('指令查看')) {
+          configs.push({
+            header: '指令查看',
+            permission: '指令查看',
+            component: 'query-instruct',
+            condition: () => this.row.f_meter_type && this.row.f_meter_type.includes('物联网表'),
+            needShowCheck: true
+          })
+        }
+
+        // 历史指令查看
+        if (this.row.f_meter_type && this.row.f_meter_type.includes('物联网表') && this.permission('历史指令查看')) {
+          configs.push({
+            header: '历史指令查看',
+            permission: '历史指令查看',
+            component: 'query-history-instruct',
+            condition: () => this.row.f_meter_type && this.row.f_meter_type.includes('物联网表'),
+            needShowCheck: true
+          })
+        }
+
+        // 异常报警
+        if (this.row.f_meter_type && this.row.f_meter_type.includes('物联网表') && this.permission('异常报警')) {
+          configs.push({
+            header: '异常报警',
+            permission: '异常报警',
+            component: 'watch-warning',
+            condition: () => this.row.f_meter_type && this.row.f_meter_type.includes('物联网表'),
+            needShowCheck: true
+          })
+        }
+
+        // 表具采集
+        if (this.row.f_meter_type && this.row.f_meter_type.includes('物联网表') && this.permission('表具采集')) {
+          configs.push({
+            header: '表具采集',
+            permission: '表具采集',
+            component: 'watch-collection',
+            condition: () => this.row.f_meter_type && this.row.f_meter_type.includes('物联网表'),
+            needShowCheck: true
+          })
+        }
+
+        // 调价补差
+        if (this.permission('调价补差')) {
+          configs.push({
+            header: '调价补差',
+            permission: '调价补差',
+            component: 'price-adjustment-query-user',
+            condition: () => true,
+            needShowCheck: true
+          })
+        }
+
+        // 设备查询
+        if (this.permission('设备查询')) {
+          configs.push({
+            header: '设备查询',
+            permission: '设备查询',
+            component: 'deveice-record',
+            condition: () => true,
+            needShowCheck: true
+          })
+        }
+
+        // 流量计参数查看
+        if (this.permission('流量计参数查看')) {
+          configs.push({
+            header: '流量计参数查看',
+            permission: '流量计参数查看',
+            component: 'meter-param',
+            condition: () => true,
+            needShowCheck: true
+          })
+        }
+
+        // 表使用量图表
+        if (this.permission('流量计参数查看')) {
+          configs.push({
+            header: '表使用量图表',
+            permission: '流量计参数查看',
+            component: 'table-usage-chart',
+            condition: () => true,
+            needShowCheck: true
+          })
+        }
+
+        // 用户设备查询
+        if (this.permission('用户设备查看')) {
+          configs.push({
+            header: '用户设备查询',
+            permission: '用户设备查看',
+            component: 'user-device-query',
+            condition: () => true,
+            needShowCheck: true
+          })
+        }
+
+        // 合同查看
+        if (this.permission('合同查看')) {
+          configs.push({
+            header: '合同查看',
+            permission: '合同查看',
+            component: 'contract-signing-list',
+            condition: () => true,
+            needShowCheck: true
+          })
+        }
+
+        // 用户重点记录
+        if (this.permission('用户重点记录')) {
+          configs.push({
+            header: '用户重点记录',
+            permission: '用户重点记录',
+            component: 'user-key-record',
+            condition: () => true,
+            needShowCheck: false
+          })
+        }
+
+        // 维修记录
+        if (this.permission('维修记录')) {
+          configs.push({
+            header: '维修记录',
+            permission: '维修记录',
+            component: 'repair-list',
+            condition: () => true,
+            needShowCheck: false
+          })
+        }
+
+        // 安检记录
+        if (this.permission('安检记录')) {
+          configs.push({
+            header: '安检记录',
+            permission: '安检记录',
+            component: 'security-check-info',
+            condition: () => true,
+            needShowCheck: false
+          })
+        }
+
+        return configs
+      }
+    },
     data () {
       return {
         row: null,
@@ -206,8 +454,8 @@ export default {
         show: ''
       }
     },
-    ready () {
-      this.search()
+    async ready () {
+      await this.search()
       console.log(this.$login)
     },
     methods: {
@@ -230,6 +478,10 @@ export default {
           }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
         this.row = getBaseInfo.data
         this.row.parentname = this.parentname || ''
+        // 数据加载完成后，初始化第一个可见标签
+        this.$nextTick(() => {
+          this.initFirstVisibleTab()
+        })
       },
 
       cancel (val) {
@@ -243,6 +495,35 @@ export default {
 
       butOper (val) {
         this.name = val
+      },
+
+      dealMsg (msg) {
+        // 处理消息
+      },
+
+      // 获取组件渲染配置
+      getComponentConfig (tab) {
+        // 返回组件名和是否需要 show 检查
+        return {
+          name: tab.component,
+          needShow: tab.needShowCheck
+        }
+      },
+
+      // 初始化第一个可见的标签
+      initFirstVisibleTab () {
+        // 确保 row 数据存在，因为很多标签的显示依赖于 row
+        if (!this.row) {
+          return
+        }
+        // 如果已经有值且不为空，说明已经初始化过了，不需要再次初始化
+        if (this.show) {
+          return
+        }
+        // 使用 tabConfigs 找到第一个可见的标签
+        if (this.tabConfigs && this.tabConfigs.length > 0) {
+          this.show = this.tabConfigs[0].header
+        }
       }
     },
     watch: {

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