sale-client 3.6.83 → 3.6.84

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://localhost:8080/']
+const [serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue

@@ -298,7 +298,7 @@
 import { HttpResetClass } from 'vue-client'
 let getPrice = async function (self) {
   await self.$LoadParams.loadParam(self.$login.f.orgid)
-  await self.$getConfig(self, 'ChargeMeter')
+  await self.$getConfig(self, 'ChangeMeter')
 
   self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
   self.model.f_payment = self.config.payment
@@ -416,7 +416,7 @@ export default {
         payment: '现金缴费',
         open_way: '指令开户',
         hasArrearsChange: false, // 是否可以有欠费换表
-        isPraseInt: false,
+        castInt: true,
         dispatch: false, // 是否派工
         showupload: true, //
         approve: false  // 是否开启审核
@@ -631,8 +631,9 @@ export default {
     async confirm () {
       let msg = ''
       if (this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) {
-        let isPraseInt = this.config.isPraseInt
-        if ((parseInt(this.model.f_using_base_old) > parseInt(this.row.f_meter_base)) || (isPraseInt && this.model.f_using_base_old > this.row.f_meter_base)) {
+        let a = this.config.castInt ? parseInt(this.model.f_using_base_old) : this.model.f_using_base_old
+        let b = this.config.castInt ? parseInt(this.row.f_meter_base) : this.row.f_meter_base
+        if (a > b) {
           msg = (this.row.f_meter_type === '机表' ? '该用户表底数大于上次抄表底数，请确定是否继续生成欠费记录' : '该用户表底数大于上次抄表底数，请确定是否进行结算')
         } else if (this.row.f_capacity && this.row.f_capacity > 0 && (parseInt(this.model.f_using_base_old) < parseInt(this.row.f_meter_base))) {
           msg = '该用户表底数大于上次抄表底数，且已超越最大量程，请确定是否继续生成欠费记录'
@@ -810,8 +811,9 @@ export default {
       }
       let msg = ''
       if (this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) {
-        let isPraseInt = this.config.isPraseInt
-        if ((parseInt(this.model.f_using_base_old) > parseInt(this.row.f_meter_base)) || (isPraseInt && this.model.f_using_base_old > this.row.f_meter_base)) {
+        let a = this.config.castInt ? parseInt(this.model.f_using_base_old) : this.model.f_using_base_old
+        let b = this.config.castInt ? parseInt(this.row.f_meter_base) : this.row.f_meter_base
+        if (a > b) {
           msg = (this.row.f_meter_type === '机表' ? '该用户表底数大于上次抄表底数，请确定是否继续生成欠费记录' : '该用户表底数大于上次抄表底数，请确定是否进行结算')
         } else if (this.row.f_capacity && this.row.f_capacity > 0 && (parseInt(this.model.f_using_base_old) < parseInt(this.row.f_meter_base))) {
           msg = '该用户表底数大于上次抄表底数，且已超越最大量程，请确定是否继续生成欠费记录'