sale-client 3.7.51 → 3.7.52

package/package.json

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

package/src/filiale/alashan/eticket/CustQueryEticket.vue

@@ -53,7 +53,8 @@
                           v-model="model.startDate"
                           :value.sync="model.startDate"
                           :disabled-days-of-Week="[]"
-                          condition="f_operate_date >='{}'"
+                          format="yyyy-MM-dd"
+                          condition="f_operate_date >= '{} 00:00:00'"
                           style="width:60%"
                           >
               </datepicker>
@@ -64,7 +65,8 @@
                           v-model="model.endDate"
                           :value.sync="model.endDate"
                           :disabled-days-of-Week="[]"
-                          condition="f_operate_date <='{}'"
+                          format="yyyy-MM-dd"
+                          condition="f_operate_date <= '{} 23:59:59'"
                           style="width:60%"
                          >
               </datepicker>
@@ -321,7 +323,7 @@
     },
     computed: {
       chargetypes () {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费类型')]
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('开票业务类型')]
       }
     },
     watch: {

package/src/filiale/kelai/CardMeterCenter.vue

@@ -442,6 +442,16 @@
     })
     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.limitmoney = false
+      self.limitgas = false
+      self.maxgas = 99999999
+      self.maxmoney = 99999999
+      // 重置验证状态
+      self.$resetValidation()
+    }
     if (self.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) {
@@ -622,6 +632,15 @@
         }
       },
       '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 == '免交') {
           this.mjshow = true
         } else if (val == '赠气' && (this.model.f_preamount || this.model.f_preamount != '')) {

package/src/filiale/kelai/IOTMeterCenter.vue

@@ -430,6 +430,16 @@
     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.limitmoney = false
+      self.limitgas = false
+      self.maxgas = 99999999
+      self.maxmoney = 99999999
+      // 重置验证状态
+      self.$resetValidation()
+    }
     if (self.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) {
@@ -583,6 +593,15 @@
         this.getPrivilegeList()
       },
       '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 == '免交') {
           this.mjshow = true
         } else if (val == '赠气' && (this.model.f_preamount || this.model.f_preamount != '')) {

package/src/filiale/kelai/NoCardMeterCenter.vue

@@ -318,6 +318,16 @@
     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.limitmoney = false
+      self.limitgas = false
+      self.maxgas = 99999999
+      self.maxmoney = 99999999
+      // 重置验证状态
+      self.$resetValidation()
+    }
     if (self.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) {
@@ -645,6 +655,15 @@
         }
       },
       '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()
+        }
         let _payment = this.$appdata.getSingleValue('需要输入业务单号的付款方式') || ''
         if (val == '免交' || _payment.includes(val)) {
           this.mjshow = true

package/src/filiale/shimen/GiftFee/icTable.vue

@@ -207,7 +207,7 @@ export default {
     async giftGasReasonChange () {
       if (this.model.f_gift_gas_reason === '低保赠气') {
         // this.isDiBao = true
-        this.model.f_pregas = this.$appdata.getSingleValue('低保赠气气量') ? this.$appdata.getSingleValue('低保赠气气量') : 0
+        // this.model.f_pregas = this.$appdata.getSingleValue('低保赠气气量') ? this.$appdata.getSingleValue('低保赠气气量') : this.model.f_pregas
         // 进行划价
         let getAmount = await this.$CommonService.gasCalculate(this.row, this.model.f_pregas)
         this.model.f_preamount = getAmount.data.chargenum
@@ -242,11 +242,14 @@ export default {
         }
       })
     },
-    pregas () {
+    async pregas () {
       // 对气量进行验证
       if ((this.row.f_topup_ceil - 0) > 0 && (this.model.f_pregas - 0) > (this.row.f_topup_ceil - 0)) {
         this.$showAlert(`您输入的气量不能大于该表的充值上限: ${this.row.f_topup_ceil}`, 'warning', 5000)
         this.model.f_pregas = null
+      } else {
+        let getAmount = await this.$CommonService.gasCalculate(this.row, this.model.f_pregas)
+        this.model.f_preamount = getAmount.data.chargenum
       }
     },
     getSell () {