sale-client 3.7.52 → 3.7.54

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.67:30785/', 'http://localhost:8080/', 'http://192.168.50.67:30785']
+const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.67:30785/', 'http://localhost:9014/', 'http://192.168.50.67:30785']
 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.7.52",
+  "version": "3.7.54",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/filiale/kelai/CardMeterCenter.vue

@@ -442,9 +442,9 @@
     })
     console.log('获取限购值', getLimit)
     self.hasLimit = getLimit.data.hasLimit
-    // 如果选择了"城边村补贴"，忽略限购
+    // 如果选择了"城边村补贴"，标记忽略限购（但不改变hasLimit，保持限购值可用）
     if (self.hasLimit && self.model.f_payment && self.model.f_payment.includes && self.model.f_payment.includes('城边村补贴')) {
-      self.hasLimit = false
+      self.ignoreLimitBySubsidy = true
       self.limitmoney = false
       self.limitgas = false
       self.maxgas = 99999999
@@ -574,7 +574,8 @@
         garbage_money: 0,
         totalCharge: 0,
         accountperiod: '',
-        canPay: false
+        canPay: false,
+        ignoreLimitBySubsidy: false // 标记是否因城边村补贴而忽略限购
       }
     },
     props: ['row', 'cardData'],
@@ -633,13 +634,20 @@
       },
       'model.f_payment' (val) {
         // 如果选择了"城边村补贴"，忽略限购
-        if (this.hasLimit && val && val.includes && val.includes('城边村补贴')) {
-          this.hasLimit = false
-          this.limitmoney = false
-          this.limitgas = false
-          this.maxgas = 99999999
-          this.maxmoney = 99999999
-          this.$resetValidation()
+        if (val && val.includes && val.includes('城边村补贴')) {
+          if (this.hasLimit) {
+            this.ignoreLimitBySubsidy = true
+            this.limitmoney = false
+            this.limitgas = false
+            this.maxgas = 99999999
+            this.maxmoney = 99999999
+            this.$resetValidation()
+          }
+        } else {
+          // 切换到其他付款方式，重新获取限购值
+          if (this.ignoreLimitBySubsidy) {
+            this.queryLimit()
+          }
         }
         if (val == '免交') {
           this.mjshow = true
@@ -675,6 +683,40 @@
       }
     },
     methods: {
+      // 查询限购
+      async queryLimit () {
+        let limit_param = {
+          f_userinfo_id: this.row.f_userinfo_id,
+          f_user_id: this.row.f_user_id,
+          f_stairprice_id: this.row.f_stairprice_id
+        }
+        let getLimit = await this.$resetpost('rs/logic/sale_getLimitGas', {data: limit_param}, {
+          resolveMsg: null,
+          rejectMsg: '获取限购值失败！！'
+        })
+        console.log('重新获取限购值', getLimit)
+        this.hasLimit = getLimit.data.hasLimit
+        this.ignoreLimitBySubsidy = false
+        if (this.hasLimit) {
+          if (getLimit.data.f_limit_value || getLimit.data.f_limit_amount) {
+            if (getLimit.data.f_limit_value < 0 || getLimit.data.f_limit_amount < 0) {
+              this.maxmoney = 0
+              this.limitmoney = true
+              this.$showAlert(`${getLimit.data.msg}\n限购原因:${getLimit.data.limitMessage}`, 'warning', 3000)
+            } else {
+              if (getLimit.data.f_limit_value) {
+                this.maxgas = (getLimit.data.f_limit_value - 0)
+                this.limitgas = true
+              }
+              if (getLimit.data.f_limit_amount) {
+                this.maxmoney = (getLimit.data.f_limit_amount - 0)
+                this.limitmoney = true
+              }
+            }
+          }
+        }
+        this.$resetValidation()
+      },
       // 查询垃圾费
       async getList () {
         let res = await this.$resetpost('rs/logic/queryGarbageCharges', {f_userfiles_id: this.row.f_userfiles_id}, {resolveMsg: null, rejectMsg: '查询垃圾费异常'})

package/src/filiale/kelai/IOTMeterCenter.vue

@@ -430,9 +430,9 @@
     let getLimit = await self.$resetpost('rs/logic/sale_getLimitGas', {data: limit_param}, {resolveMsg: null, rejectMsg: '获取限购值失败！！'})
     console.log('获取限购值', getLimit)
     self.hasLimit = getLimit.data.hasLimit
-    // 如果选择了"城边村补贴"，忽略限购
+    // 如果选择了"城边村补贴"，标记忽略限购
     if (self.hasLimit && self.model.f_payment && self.model.f_payment.includes && self.model.f_payment.includes('城边村补贴')) {
-      self.hasLimit = false
+      self.ignoreLimitBySubsidy = true
       self.limitmoney = false
       self.limitgas = false
       self.maxgas = 99999999
@@ -535,7 +535,8 @@
         garbage_money: 0,
         totalCharge: 0,
         accountperiod: '',
-        canPay : false
+        canPay : false,
+        ignoreLimitBySubsidy: false // 标记是否因城边村补贴而忽略限购
       }
     },
     props: ['row'],
@@ -594,13 +595,20 @@
       },
       'model.f_payment' (val) {
         // 如果选择了"城边村补贴"，忽略限购
-        if (this.hasLimit && val && val.includes && val.includes('城边村补贴')) {
-          this.hasLimit = false
-          this.limitmoney = false
-          this.limitgas = false
-          this.maxgas = 99999999
-          this.maxmoney = 99999999
-          this.$resetValidation()
+        if (val && val.includes && val.includes('城边村补贴')) {
+          if (this.hasLimit) {
+            this.ignoreLimitBySubsidy = true
+            this.limitmoney = false
+            this.limitgas = false
+            this.maxgas = 99999999
+            this.maxmoney = 99999999
+            this.$resetValidation()
+          }
+        } else {
+          // 切换到其他付款方式，重新获取限购值
+          if (this.ignoreLimitBySubsidy) {
+            this.queryLimit()
+          }
         }
         if (val == '免交') {
           this.mjshow = true
@@ -633,6 +641,40 @@
       }
     },
     methods: {
+      // 查询限购
+      async queryLimit () {
+        let limit_param = {
+          f_userinfo_id: this.row.f_userinfo_id,
+          f_user_id: this.row.f_user_id,
+          f_stairprice_id: this.row.f_stairprice_id
+        }
+        let getLimit = await this.$resetpost('rs/logic/sale_getLimitGas', {data: limit_param}, {
+          resolveMsg: null,
+          rejectMsg: '获取限购值失败！！'
+        })
+        console.log('重新获取限购值', getLimit)
+        this.hasLimit = getLimit.data.hasLimit
+        this.ignoreLimitBySubsidy = false
+        if (this.hasLimit) {
+          if (getLimit.data.f_limit_value || getLimit.data.f_limit_amount) {
+            if (getLimit.data.f_limit_value < 0 || getLimit.data.f_limit_amount < 0) {
+              this.maxmoney = 0
+              this.limitmoney = true
+              this.$showAlert(`${getLimit.data.msg}\n限购原因:${getLimit.data.limitMessage}`, 'warning', 3000)
+            } else {
+              if (getLimit.data.f_limit_value) {
+                this.maxgas = (getLimit.data.f_limit_value - 0)
+                this.limitgas = true
+              }
+              if (getLimit.data.f_limit_amount) {
+                this.maxmoney = (getLimit.data.f_limit_amount - 0)
+                this.limitmoney = true
+              }
+            }
+          }
+        }
+        this.$resetValidation()
+      },
       // 查询垃圾费
       async getList () {
         let res = await this.$resetpost('rs/logic/queryGarbageCharges', {f_userfiles_id: this.row.f_userfiles_id}, {resolveMsg: null, rejectMsg: '查询垃圾费异常'})

package/src/filiale/kelai/NoCardMeterCenter.vue

@@ -318,9 +318,9 @@
     let getLimit = await self.$resetpost('rs/logic/sale_getLimitGas', {data: limit_param}, {resolveMsg: null, newly: true, rejectMsg: '获取限购值失败！！'})
     console.log('获取限购值', getLimit)
     self.hasLimit = getLimit.data.hasLimit
-    // 如果选择了"城边村补贴"，忽略限购
+    // 如果选择了"城边村补贴"，标记忽略限购
     if (self.hasLimit && self.model.f_payment && self.model.f_payment.includes && self.model.f_payment.includes('城边村补贴')) {
-      self.hasLimit = false
+      self.ignoreLimitBySubsidy = true
       self.limitmoney = false
       self.limitgas = false
       self.maxgas = 99999999
@@ -417,6 +417,7 @@
         limitgas: false,
         mulPrint: false,
         clickConfirm: false, // 控制确认按钮只能点击一次
+        ignoreLimitBySubsidy: false, // 标记是否因城边村补贴而忽略限购
         // 下拉框值
         paytype: this.$appdata.getParam('付款方式'),
         printstyle: this.$appdata.getParam('打印格式'),
@@ -452,6 +453,41 @@
       }
     },
     methods: {
+      // 查询限购
+      async queryLimit () {
+        let limit_param = {
+          f_userinfo_id: this.row.f_userinfo_id,
+          f_user_id: this.row.f_user_id,
+          f_stairprice_id: this.row.f_stairprice_id
+        }
+        let getLimit = await this.$resetpost('rs/logic/sale_getLimitGas', {data: limit_param}, {
+          resolveMsg: null,
+          newly: true,
+          rejectMsg: '获取限购值失败！！'
+        })
+        console.log('重新获取限购值', getLimit)
+        this.hasLimit = getLimit.data.hasLimit
+        this.ignoreLimitBySubsidy = false
+        if (this.hasLimit) {
+          if (getLimit.data.f_limit_value || getLimit.data.f_limit_amount) {
+            if (getLimit.data.f_limit_value < 0 || getLimit.data.f_limit_amount < 0) {
+              this.maxmoney = 0
+              this.limitmoney = true
+              this.$showAlert(`${getLimit.data.msg}\n限购原因:${getLimit.data.limitMessage}`, 'warning', 3000)
+            } else {
+              if (getLimit.data.f_limit_value) {
+                this.maxgas = (getLimit.data.f_limit_value - 0)
+                this.limitgas = true
+              }
+              if (getLimit.data.f_limit_amount) {
+                this.maxmoney = (getLimit.data.f_limit_amount - 0)
+                this.limitmoney = true
+              }
+            }
+          }
+        }
+        this.$resetValidation()
+      },
       // 根据收款金额计算划价信息
       // 需要配置 calculatePreByCollection = true
       async calculatePreByCollection () {
@@ -656,13 +692,20 @@
       },
       'model.f_payment' (val) {
         // 如果选择了"城边村补贴"，忽略限购
-        if (this.hasLimit && val && val.includes && val.includes('城边村补贴')) {
-          this.hasLimit = false
-          this.limitmoney = false
-          this.limitgas = false
-          this.maxgas = 99999999
-          this.maxmoney = 99999999
-          this.$resetValidation()
+        if (val && val.includes && val.includes('城边村补贴')) {
+          if (this.hasLimit) {
+            this.ignoreLimitBySubsidy = true
+            this.limitmoney = false
+            this.limitgas = false
+            this.maxgas = 99999999
+            this.maxmoney = 99999999
+            this.$resetValidation()
+          }
+        } else {
+          // 切换到其他付款方式，重新获取限购值
+          if (this.ignoreLimitBySubsidy) {
+            this.queryLimit()
+          }
         }
         let _payment = this.$appdata.getSingleValue('需要输入业务单号的付款方式') || ''
         if (val == '免交' || _payment.includes(val)) {

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/shiquan/sale'
+import FilialeSale from './filiale/kelai/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'