sale-client 3.6.354 → 3.6.356

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Wed Jul 31 10:14:59 CST 2024
+gradle.version=5.2.1

package/package.json

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

package/src/components/charge/business/CardMeterCenter.vue

@@ -70,7 +70,10 @@
               <input class="input_search" style="width:60%" style="width:60%" type="number" v-model="maxmoney"
                      v-scale="[maxmoney, 2]" placeholder='限购金额' disabled>
             </div>
-            <div class="col-sm-4" v-if="!hasLimit">
+            <div class="col-sm-4" v-if="mingas > 0 ">
+              <label class="font_normal_body">&ensp;购气下限</label>
+              <input class="input_search" style="width:60%" style="width:60%" type="number" v-model="mingas"
+                     v-scale="[mingas, 4]" placeholder='最低购气量' disabled>
             </div>
 
             <div class="col-sm-4"
@@ -302,7 +305,7 @@
     } else {
       self.model.f_pregas = (self.model.f_pregas - 0).toFixed(0)
     }
-    if ((self.model.f_pregas - 0) - (self.maxgas - 0) <= 0) {
+    if ((self.model.f_pregas - 0) - (self.maxgas - 0) <= 0 || (self.model.f_pregas - 0) - (self.mingas - 0) >= 0) {
       self.model.f_meter_type = self.row.f_meter_type
       let getAmount = await self.$CommonService.gasCalculate(self.model, self.model.f_pregas)
       self.model.getDeduct = 0
@@ -454,7 +457,7 @@
     self.model.f_use_type = self.config.billType
     self.model.f_bill_type = self.model.f_print
     self.hasValidateBill = self.config.hasBillManage
-
+    self.mingas = self.config.MinSellGas
     // 判断限购
     let limit_param = {
       f_userinfo_id: self.row.f_userinfo_id,
@@ -525,6 +528,7 @@
           quickSale: false,
           showupload: true, // 显示上传
           hasPrint: true,  // 默认打票
+          MinSellGas: 0,
           hasBillManage: false,  // 默认不启用发票管理
           taxforidnumber: true,  // 身份证号同步到纳税人识别号
           billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
@@ -533,6 +537,7 @@
           floor: false,
           overdraftBalance: false // 是否支持系统余额透支
         },
+        mingas: 0,
         eticket_msg: false,
         eticket_show: false,
         invoice_is_pax: '不征税',
@@ -790,6 +795,8 @@
             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 if ((this.model.f_pregas - 0) - (this.mingas - 0) < 0) {
+              this.$showAlert(`注意：购气量最少为：${this.mingas}m³`, 'warning', 3000)
             } else {
               pregasGen(this)
               if (this.config.quickSale) {

package/src/filiale/shangluo/CardMeterCenter.vue

@@ -68,7 +68,10 @@
               <input class="input_search" style="width:60%" style="width:60%" type="number" v-model="maxmoney"
                      v-scale="[maxmoney, 2]" placeholder='限购金额' disabled>
             </div>
-            <div class="col-sm-4" v-if="!hasLimit">
+            <div class="col-sm-4" v-if="mingas > 0 ">
+              <label class="font_normal_body">&ensp;购气下限</label>
+              <input class="input_search" style="width:60%" style="width:60%" type="number" v-model="mingas"
+                     v-scale="[mingas, 4]" placeholder='最低购气量' disabled>
             </div>
 
             <div class="col-sm-4"
@@ -272,7 +275,7 @@
     } else {
       self.model.f_pregas = (self.model.f_pregas - 0).toFixed(0)
     }
-    if ((self.model.f_pregas - 0) - (self.maxgas - 0) <= 0) {
+    if ((self.model.f_pregas - 0) - (self.maxgas - 0) <= 0 || (self.model.f_pregas - 0) - (self.mingas - 0) >= 0) {
       self.model.f_meter_type = self.row.f_meter_type
       let getAmount = await self.$CommonService.gasCalculate(self.model, self.model.f_pregas)
       self.model.f_preamount = getAmount.data.chargenum
@@ -295,7 +298,6 @@
   let sellgasGen = async function (self) {
     try {
       self.row.cardInfo = self.cardData
-
       if (self.paymentModel.length === 0) {
         self.paymentModel = [{
           f_payment: self.model.f_payment[0],
@@ -307,7 +309,6 @@
         self.model.xiekamoney = (self.model.f_pregas * self.model.chargeprice[0].f_price)
         self.model.xiekamoney = self.model.xiekamoney.toFixed(4)
       }
-
       self.model.payments = self.paymentModel
       // 加入扫码盒付款码支付流水号
       self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
@@ -380,38 +381,37 @@
 
   let asyncCardMeterCenter = async function (self) {
     await self.$getConfig(self, 'CardMeterCenter')
-    console.log('卡表收费config', self.config)
-
+    console.log('卡表收费1config', self.config)
     // 添加 “系统余额透支” 付款方式
     let i = -1
     for (const index in self.paytype) {
-      if (self.paytype[index].value == "系统余额透支"){
+      if (self.paytype[index].value == '系统余额透支') {
         i = index
         break
       }
     }
-    if (self.canOverdraftBalance()){
-      if (i == -1){
+    if (self.canOverdraftBalance()) {
+      if (i == -1) {
         self.paytype.push({
-          label: "系统余额透支",
-          value: "系统余额透支"
+          label: '系统余额透支',
+          value: '系统余额透支'
         })
       }
-    }else {
-      if (i != -1){
+    } else {
+      if (i != -1) {
         self.paytype.splice(i, 1)
       }
     }
-
     // 默认打印格式
     self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
     self.model.f_payment = [self.config.payment]
     self.mulPrint = self.config.printType instanceof Array
-
     // 获取当前票号用
     self.model.f_use_type = self.config.billType
     self.model.f_bill_type = self.model.f_print
     self.hasValidateBill = self.config.hasBillManage
+    self.mingas = self.config.MinSellGas
+    console.log('获取最小购气量', self.mingas)
 
     // 判断限购
     let limit_param = {
@@ -480,6 +480,7 @@
           autoCollection: true, // 自动填写收款
           showupload: true, // 显示上传
           hasPrint: true,  // 默认打票
+          MinSellGas: 0,
           hasBillManage: false,  // 默认不启用发票管理
           billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
           printType: '普通收据', // 收据/电子票/专用发票/国税发票
@@ -487,6 +488,7 @@
           floor: false,
           overdraftBalance: false // 是否支持系统余额透支
         },
+        mingas: 0,
         eticket_msg: false,
         eticket_show: false,
         invoice_is_pax: '不征税',
@@ -541,6 +543,7 @@
     },
     props: ['row', 'cardData'],
     async ready () {
+      console.log('看看走不走这个', this.authArr)
       if (this.authArr.includes('余额写卡限定')) {
         this.paytype = [{label: '余额写卡', value: '余额写卡'}]
       } else {
@@ -561,7 +564,7 @@
         this.model.f_preamount = ''
         this.model.f_pregas = 0
       }
-      this.$els.fpregas.focus()
+      // this.$els.fpregas.focus()
       asyncCardMeterCenter(this)
     },
     watch: {
@@ -712,6 +715,8 @@
             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 if ((this.model.f_pregas - 0) - (this.mingas - 0) < 0) {
+              this.$showAlert(`注意：购气量最少为：${this.mingas}m³`, 'warning', 3000)
             } else {
               pregasGen(this)
             }