sale-client 3.7.53 → 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://10.218.0.52:8600/', 'http://10.218.0.52:8600/', 'http://10.218.0.52:8600/']
+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.53",
+  "version": "3.7.54",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -24,7 +24,7 @@
     "qrcodejs2": "^0.0.2",
     "vue": "^1.0.17",
     "webpack-dev-server": "^2.11.5",
-    "vue-client": "1.26.8",
+    "vue-client": "1.25.38",
     "yarn": "^1.22.10"
   },
   "devDependencies": {
@@ -76,7 +76,7 @@
     "karma-spec-reporter": "0.0.31",
     "karma-webpack": "^2.0.2",
     "ldap-clients": "3.0.96",
-    "system-clients": "3.2.90-tongchuan",
+    "system-clients": "4.0.12",
     "less": "^2.7.3",
     "manage-client": "3.1.8-88",
     "mkdirp": "^0.5.1",

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/filiale/tongchuan/FileUserFiles.vue

@@ -135,7 +135,7 @@
                   </div>
                   <div  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                         class="form-group">
-                    <label class="font_normal_body">户档案开户时间</label>
+                    <label class="font_normal_body">开户时间</label>
                     <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
                                 class="datepicker"
                                 condition="f_open_date >= '{} 00:00:00' "
@@ -155,28 +155,6 @@
                                 v-model="model.f_end_date"
                     ></datepicker>
                   </div>
-                  <div  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
-                        class="form-group">
-                    <label class="font_normal_body">表档案开户时间</label>
-                    <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
-                                class="datepicker"
-                                condition="f_open_date_uf >= '{} 00:00:00' "
-                                placeholder="起始时间"
-                                style="width:60%"
-                                v-model="model.f_start_date"
-                    ></datepicker>
-                  </div>
-                  <div  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
-                        class="form-group" >
-                    <label class="font_normal_body" >&emsp;&ensp;至&emsp;&ensp;</label>
-                    <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_end_date"
-                                class="datepicker"
-                                condition="f_open_date_uf <= '{} 23:59:59' "
-                                placeholder="结束时间"
-                                style="width:60%"
-                                v-model="model.f_end_date"
-                    ></datepicker>
-                  </div>
                   <div
                     :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                     class="form-group">
@@ -440,10 +418,7 @@
                     <nobr>发卡状态</nobr>
                   </th>
                   <th v-if="!$parent.$parent.$parent.createFile">
-                    <nobr>户档案开户时间</nobr>
-                  </th>
-                  <th v-if="!$parent.$parent.$parent.createFile">
-                    <nobr>表档案开户时间</nobr>
+                    <nobr>开户时间</nobr>
                   </th>
                   <th v-if="!$parent.$parent.$parent.createFile">
                     <nobr>建档人</nobr>
@@ -505,7 +480,6 @@
                 <td style="text-align: center;">{{row.f_price_name}}</td>
                 <td style="text-align: center;">{{row.f_whether_hairpin}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_open_date}}</td>
-                <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_open_date_uf}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_createfile_person}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_userfiles_address}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_feed_method}}</td>

package/src/filiale/tongchuan/MeterinfoTest.vue

@@ -179,7 +179,6 @@
             <datepicker style="width:60%" placeholder="通气日期"
                         v-model="row.f_gas_date"
                         v-ref:f_gas_date
-                        :disabled ="isedit"
                         :value.sync="row.f_gas_date"
                         :format="'yyyy-MM-dd HH:mm:ss'"
                         :show-reset-button="reset"
@@ -472,7 +471,7 @@ let meterBookGen = function * (self) {
         finalDate: ''
       }
     },
-    props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id', 'isedit'],
+    props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id'],
     ready () {
       console.log('看看meter里面的数据', this.meter, this.row)
       console.log('--------------====================', this.meter.f_aroundmeter, this.row.f_aroundmeter)

package/src/filiale/tongchuan/UserGeneralInfoTest.vue

@@ -17,7 +17,7 @@
 
       <div style="height: auto;width: 100%">
         <file-user-meter-info :meterinfo="data.meterinfo" :f_filialeid="f_filialeid" :metervalid.sync="meterInfo"
-                         :f_userinfo_id="data.baseinfo.base.f_userinfo_id" :isedit="isedit" v-ref:meter></file-user-meter-info>
+                         :f_userinfo_id="data.baseinfo.base.f_userinfo_id" v-ref:meter></file-user-meter-info>
       </div>
 
       <div style="height: auto;width: 100%">

package/src/filiale/tongchuan/UserMeterInfoTest.vue

@@ -9,7 +9,7 @@
         <button class="button_search" style="width: max-content" @click="showDevices($index, row)">用气设备信息</button>
       </div>
       <file-meter-info :meter="row" :f_filialeid="f_filialeid" :usertype="usertype" :gasproperties="gasproperties" @self-valid='valida'
-                  @delete-meter="deleteMeter($index)" :f_userinfo_id="f_userinfo_id" :isedit="isedit"></file-meter-info>
+                  @delete-meter="deleteMeter($index)" :f_userinfo_id="f_userinfo_id"></file-meter-info>
 
     </div>
     <div class="panel panel-default auto text-center" @click="addMeter()" style="cursor: pointer;">
@@ -46,8 +46,7 @@ export default {
         twoWay: true
       },
       f_filialeid: {},
-      f_userinfo_id: {},
-      isedit: ''
+      f_userinfo_id: {}
     },
     ready () {
       console.log('表具信息，，，，', this.meterinfo)

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/tongchuan/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'

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Wed Mar 18 10:18:57 CST 2026
-gradle.version=5.2.1