sale-client 3.6.509 → 3.6.510

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Mon Mar 17 13:40:05 CST 2025
+#Wed Mar 26 10:38:22 CST 2025
 gradle.version=5.2.1

package/package.json

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

package/src/filiale/wuhai/CardMeterCenter.vue

@@ -19,7 +19,7 @@
               <label for="f_pregas" class=" font_normal_body">*预购气量</label>
               <input class="input_search" style="width:60%" type="number" :disabled="config.calculatePreByCollection"
                      @blur="pregas()" v-model="model.f_pregas" v-el:fpregas
-                     v-scale="[model.f_pregas, 2]"
+                     v-scale="[model.f_pregas, 3]"
                      v-validate:f_pregas='{required: true, dctest: [maxgas, "<=" ]}' placeholder="预购气量"
                      v-next-el='fcollection'>
             </div>
@@ -27,7 +27,7 @@
               <label for="f_pregas" class=" font_normal_body">*预购气量</label>
               <input class="input_search" style="width:60%" type="number" v-el:fpregas
                      @blur="pregas()" v-model="model.f_pregas" placeholder="预购气量"
-                     v-scale="[model.f_pregas, 2]"
+                     v-scale="[model.f_pregas, 3]"
                      v-next-el='fcollection' :disabled="config.calculatePreByCollection"/>
             </div>
             <div class="col-sm-4"
@@ -42,7 +42,7 @@
             <div class="col-sm-4" v-if="row.f_collection_type == '按气量'">
               <label for="f_preamount" class=" font_normal_body">&nbsp;预购金额</label>
               <input class="input_search" style="width:60%" type="number" v-model="model.f_preamount"
-                     v-scale="[model.f_preamount, 4]" placeholder="预购金额" disabled>
+                     v-scale="[model.f_preamount, 3]" placeholder="预购金额" disabled>
             </div>-->
 
           </div>
@@ -63,12 +63,12 @@
             <div class="col-sm-4 " v-if="hasLimit&&limitgas">
               <label class="font_normal_body">&ensp;购气上限</label>
               <input class="input_search" style="width:60%" style="width:60%" type="number" v-model="maxgas"
-                     v-scale="[maxgas, 4]" placeholder='限购余气' disabled>
+                     v-scale="[maxgas, 3]" placeholder='限购余气' disabled>
             </div>
             <div class="col-sm-4 form-group" v-if="hasLimit&&limitmoney">
               <label class="font_normal_body">金额上限</label>
               <input class="input_search" style="width:60%" style="width:60%" type="number" v-model="maxmoney"
-                     v-scale="[maxmoney, 2]" placeholder='限购金额' disabled>
+                     v-scale="[maxmoney, 3]" placeholder='限购金额' disabled>
             </div>
             <div class="col-sm-4" v-if="!hasLimit">
             </div>
@@ -88,13 +88,13 @@
             <div class="col-sm-4">
               <label for="f_balance" class="font_normal_body">上期结余</label>
               <input class="input_search" style="width:60%" type="number" v-model="model.f_balance"
-                     v-scale="[model.f_balance, 4]" placeholder="上期结余" disabled>
+                     v-scale="[model.f_balance, 3]" placeholder="上期结余" disabled>
             </div>
 
             <div class="col-sm-4">
               <label for="f_curbalance" class="font_normal_body">&nbsp;本期结余</label>
               <input class="input_search" style="width:60%" type="number" v-model="curbalance"
-                     v-scale="[curbalance, 4]" placeholder="本期结余" disabled>
+                     v-scale="[curbalance, 3]" placeholder="本期结余" disabled>
             </div>
 
             <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment!='赠气' && row.f_meter_type.includes('卡表') && !config.calculatePreByCollection"
@@ -103,13 +103,13 @@
               <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
                      v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0), ">=" ] }'
                      v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"
-                     v-scale="[model.f_collection, 2]" :disabled="$refs.givechange.promptText != ''"/>
+                     v-scale="[model.f_collection, 3]" :disabled="$refs.givechange.promptText != ''"/>
             </div>
             <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment!='赠气' && row.f_meter_type.includes('卡表') && config.calculatePreByCollection"
                  :class="[$v.f_collection.required ? 'has-error' : 'has-success']">
               <label for="f_collection" class=" font_normal_body">*收&emsp;&emsp;款</label>
               <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
-                     v-scale="[model.f_collection, 2]"
+                     v-scale="[model.f_collection, 3]"
                      v-validate:f_collection='{required: true }'
                      @blur="calculatePreByCollection()"
                      v-el:fcollection
@@ -120,15 +120,15 @@
               <label for="f_collection" class=" font_normal_body"><font size="4px" style="font-weight:bold">*收&emsp;款</font></label>
               <input id="f_collection" class="input_search" style="width:60%;font-size: 18px;font-weight:bold;" type="number" v-model="model.f_collection"
                      @blur="config.calculatePreByCollection && calculatePreByCollection()"
-                     v-scale="[model.f_collection, 2]"
-                     v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_totalcost, 4]" :disabled="$refs.givechange.promptText != ''">
+                     v-scale="[model.f_collection, 3]"
+                     v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_totalcost, 3]" :disabled="$refs.givechange.promptText != ''">
             </div>
             <div class="col-sm-3" v-if="row.f_collection_type === '按金额' && row.f_meter_type.includes('卡表')">
               <label for="f_collection" class=" font_normal_body"><font size="4px" style="font-weight:bold">*收&emsp;款</font></label>
               <input id="f_collection" class="input_search" style="width:50%;font-size: 18px;font-weight:bold;" type="number" v-model="model.f_collection"
                      @blur="config.calculatePreByCollection && calculatePreByCollection()"
-                     v-scale="[model.f_collection, 2]"
-                     v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_collection, 4]" :disabled="$refs.givechange.promptText != ''">
+                     v-scale="[model.f_collection, 3]"
+                     v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_collection, 3]" :disabled="$refs.givechange.promptText != ''">
             </div>
             <div class="col-sm-4" v-if="!row.f_meter_type.includes('卡表')">
               <label for="f_collection" class=" font_normal_body"><font size="4px"
@@ -138,7 +138,7 @@
                      v-el:fcollection
                      @blur="config.calculatePreByCollection && calculatePreByCollection()"
                      @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"
-                     v-scale="[model.f_collection, 4]" :disabled="!config.calculatePreByCollection">
+                     v-scale="[model.f_collection, 3]" :disabled="!config.calculatePreByCollection">
             </div>
             <div class="col-sm-1 form-group" v-show=" row.f_meter_type.includes('卡表')">
               <give-change :curbalance="curbalance" :collection.sync="model.f_collection" v-ref:givechange></give-change>
@@ -164,12 +164,12 @@
             <div class="col-sm-4">
               <label for="f_preamount" class=" font_normal_body">&nbsp;优惠金额</label>
               <input class="input_search" style="width:60%" type="number" v-model="model.f_privilege_money"
-                     v-scale="[model.f_privilege_money, 2]" placeholder="优惠金额" disabled>
+                     v-scale="[model.f_privilege_money, 3]" placeholder="优惠金额" disabled>
             </div>
             <div class="col-sm-4">
               <label for="f_preamount" class=" font_normal_body">&nbsp;实际收款</label>
               <input class="input_search" style="width:60%" type="number" v-model="model.f_after_discount"
-                     v-scale="[model.f_after_discount, 2]" placeholder="优惠后收款" disabled>
+                     v-scale="[model.f_after_discount, 3]" placeholder="优惠后收款" disabled>
             </div>
           </div>
 
@@ -248,9 +248,9 @@
 
     // 输入金额，换算气量
   let preamountGen = async function (self) {
-    let calFee = ((self.model.f_preamount - 0)).toFixed(4)
+    let calFee = ((self.model.f_preamount - 0)).toFixed(3)
     if (self.model.f_payment == '赠气') {
-      calFee = (self.model.f_preamount - 0).toFixed(4)
+      calFee = (self.model.f_preamount - 0).toFixed(3)
     }
       // 通过金额进行划价
     let getGas = await self.$CommonService.feeCalculate(self.model, calFee)
@@ -259,18 +259,18 @@
         if (self.row.f_alias === 'QiaoSong') {
           self.model.f_pregas = (getGas.data.gas - 0).toFixed(1)
         } else {
-          self.model.f_pregas = (getGas.data.gas - 0).toFixed(4)
+          self.model.f_pregas = (getGas.data.gas - 0).toFixed(3)
         }
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
-          self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(3))
+          self.dymoney = (getGas.data.chargenum - 0).toFixed(3) - (dymoney2.data.chargenum - 0).toFixed(3)
         }
       } else {
           // 如果不支持小数,将划价出的多余非整数气量进行划价为金额
         let tempnum = Math.floor(getGas.data.gas - 0)
-        let dymoney1 = await self.$CommonService.gasCalculate(self.model, (tempnum).toFixed(4))
+        let dymoney1 = await self.$CommonService.gasCalculate(self.model, (tempnum).toFixed(3))
         self.dymoney = (getGas.data.chargenum - 0).toFixed(2) - (dymoney1.data.chargenum - 0).toFixed(2)
         self.model.f_pregas = Math.floor(getGas.data.gas - 0)
       }
@@ -284,24 +284,24 @@
       self.model.f_collection = 0
     } else {
       self.model.f_collection = self.config.autoCollection ? self.model.f_totalcost : 0
-      self.model.f_totalcost = ((self.model.f_totalcost - 0) - (self.dymoney - 0)).toFixed(4)
+      self.model.f_totalcost = ((self.model.f_totalcost - 0) - (self.dymoney - 0)).toFixed(3)
     }
-    self.model.f_preamount = (calFee - (self.dymoney - 0)).toFixed(4)
+    self.model.f_preamount = (calFee - (self.dymoney - 0)).toFixed(3)
     self.calText(getGas.data.chargeprice)
   }
 
   // 输入气量，换算金额
   let pregasGen = async function (self) {
     if (self.row.f_isdecimal === '是') {
-      self.model.f_pregas = (self.model.f_pregas - 0).toFixed(4)
+      self.model.f_pregas = (self.model.f_pregas - 0).toFixed(3)
     } else {
       self.model.f_pregas = (self.model.f_pregas - 0).toFixed(0)
     }
     if ((self.model.f_pregas - 0) - (self.maxgas - 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
-      self.model.f_totalcost = ((self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(4))
+      self.model.f_preamount = getAmount.data.chargenum.toFixed(3)
+      self.model.f_totalcost = ((self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(3))
       Object.assign(self.model, self.model, getAmount.data)
       self.model.chargeprice = getAmount.data.chargeprice
       if (self.model.f_payment == '赠气') {
@@ -330,7 +330,7 @@
       self.model.xiekamoney = self.model.f_preamount
       if (self.row.f_price_type == '阶梯气价' && self.row.f_is_step == '否' && self.row.f_collection_type == '按金额') {
         self.model.xiekamoney = (self.model.f_pregas * self.model.chargeprice[0].f_price)
-        self.model.xiekamoney = self.model.xiekamoney.toFixed(4)
+        self.model.xiekamoney = self.model.xiekamoney.toFixed(3)
       }
 
       self.model.payments = self.paymentModel
@@ -658,7 +658,7 @@
       async calculatePreByCollection() {
         try {
           this.model.f_collection = (this.model.f_collection - 0)
-          let calFee = ((this.model.f_collection - 0) + (this.row.f_balance)).toFixed(4)
+          let calFee = ((this.model.f_collection - 0) + (this.row.f_balance)).toFixed(3)
           // 通过收款进行划价
           let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
           this.model.f_pregas = parseInt(getGas.data.gas)
@@ -908,17 +908,17 @@
         }
         if (this.model.f_preamount) {
           if (this.config.calculatePreByCollection) {
-            return ((this.model.f_collection - 0) + (this.row.f_balance - 0) - this.model.f_preamount).toFixed(4)
+            return ((this.model.f_collection - 0) + (this.row.f_balance - 0) - this.model.f_preamount).toFixed(3)
           }
           // if (this.row.f_collection_type === '按金额') {
-          //   return ((this.model.f_collection - 0) - (this.model.f_totalcost - 0)).toFixed(4)
+          //   return ((this.model.f_collection - 0) - (this.model.f_totalcost - 0)).toFixed(3)
           // } else {
           if ((this.row.f_balance - 0) > (this.model.f_preamount - 0)) {
-            return ((this.row.f_balance - 0) - (this.model.f_preamount - 0) + (this.model.f_collection - 0)).toFixed(4)
+            return ((this.row.f_balance - 0) - (this.model.f_preamount - 0) + (this.model.f_collection - 0)).toFixed(3)
           } else {
-            return ((this.model.f_collection - 0) - (this.model.f_totalcost - 0)).toFixed(4)
+            return ((this.model.f_collection - 0) - (this.model.f_totalcost - 0)).toFixed(3)
           }
-            // return ((this.model.f_collection - 0) - (this.model.f_totalcost - 0)).toFixed(4)
+            // return ((this.model.f_collection - 0) - (this.model.f_totalcost - 0)).toFixed(3)
           // }
         } else {
           return this.row.f_balance

package/src/filiale/wuhai/IOTMeterCenter.vue

@@ -226,14 +226,14 @@
         if (self.row.f_alias === 'QiaoSong') {
           self.model.f_pregas = (getGas.data.gas - 0).toFixed(1)
         } else {
-          self.model.f_pregas = (getGas.data.gas - 0).toFixed(4)
+          self.model.f_pregas = (getGas.data.gas - 0).toFixed(2)
         }
         self.dymoney = 0
       } else {
         // 如果不支持小数,将划价出的多余非整数气量进行划价为金额
         let tempnum = Math.floor(getGas.data.gas - 0)
         if (getGas.data.gas > tempnum) {  // getGas.data.gas-tempnum-0
-          let dymoney1 = await self.$CommonService.gasCalculate(self.model, (tempnum).toFixed(4))
+          let dymoney1 = await self.$CommonService.gasCalculate(self.model, (tempnum).toFixed(2))
           if (dymoney1.data.money) {
             self.dymoney = (getGas.data.money - 0).toFixed(2) - (dymoney1.data.money - 0).toFixed(2)
           }
@@ -247,7 +247,7 @@
     if (self.config.priceCalculation) {
       self.model.f_pregas = 0
     }
-    self.model.f_totalcost = ((self.row.f_balance - 0) > (self.model.f_preamount - 0) ? 0 : ((self.model.f_preamount - 0) - (self.row.f_balance - 0)).toFixed(4))
+    self.model.f_totalcost = ((self.row.f_balance - 0) > (self.model.f_preamount - 0) ? 0 : ((self.model.f_preamount - 0) - (self.row.f_balance - 0)).toFixed(2))
 
     self.model.chargeprice = getGas.data.chargeprice
     Object.assign(self.model, self.model, getGas.data)
@@ -267,7 +267,7 @@
   // 输入气量，换算金额
   let pregasGen = async function (self) {
     if (self.row.f_isdecimal === '是') {
-      self.model.f_pregas = (self.model.f_pregas - 0).toFixed(4)
+      self.model.f_pregas = (self.model.f_pregas - 0).toFixed(2)
     } else {
       self.model.f_pregas = (self.model.f_pregas - 0).toFixed(0)
     }
@@ -275,12 +275,12 @@
       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
-      self.model.f_totalcost = (self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(4)
+      self.model.f_totalcost = (self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(2)
       Object.assign(self.model, self.model, getAmount.data)
       self.model.chargeprice = getAmount.data.chargeprice
-      if (self.config.floor) {
-        self.model.f_totalcost = Math.ceil(self.model.f_totalcost)
-      }
+      // if (self.config.floor) {
+      //   self.model.f_totalcost = Math.ceil(self.model.f_totalcost)
+      // }
       self.model.f_collection = self.model.f_totalcost
       if (self.model.f_payment == '赠气') {
         self.model.f_totalcost = getAmount.data.chargenum

package/src/filiale/wuhai/NoCardMeterCenter.vue

@@ -32,7 +32,7 @@
               <label for="f_preamount" class=" font_normal_body">预购金额</label>
               <input class="input_search" style="width:60%" type="number" v-model="model.f_preamount"
                      v-validate:f_preamount='{required: true, dctest: [maxmoney, "<=" ] }'
-                     v-scale="[model.f_preamount, 4]" placeholder="预购金额" disabled>
+                     v-scale="[model.f_preamount, 3]" placeholder="预购金额" disabled>
             </div>
           </div>
           <div class="row" style="margin-top:6px;">
@@ -69,19 +69,19 @@
               <input class="input_search" style="width:60%" type="number"
                      @blur="preamount()" v-model="model.f_totalcost"
                      v-validate:f_totalcost='{required: true, dctest: [0, ">=" ] }' placeholder="应收金额"
-                     v-next-el='sk' v-scale="[model.f_totalcost, 4]" >
+                     v-next-el='sk' v-scale="[model.f_totalcost, 3]" >
             </div>
           </div>
           <div class="row">
             <div class="col-sm-4">
               <label for="f_balance" class="font_normal_body">上期结余</label>
               <input class="input_search" style="width:60%" type="number" v-model="model.f_balance"
-                     v-scale="[model.f_balance, 4]" placeholder="上期结余" disabled>
+                     v-scale="[model.f_balance, 3]" placeholder="上期结余" disabled>
             </div>
             <div class="col-sm-4">
               <label for="f_curbalance" class="font_normal_body">本期结余</label>
               <input class="input_search" style="width:60%" type="number" v-model="curbalance"
-                     v-scale="[model.f_curbalance, 4]" placeholder="本期结余" disabled>
+                     v-scale="[model.f_curbalance, 3]" placeholder="本期结余" disabled>
             </div>
 
             <div class="col-sm-4" v-if="row.f_collection_type === '按气量'"
@@ -89,12 +89,12 @@
               <label for="f_collection" class=" font_normal_body">&nbsp;&nbsp;&nbsp;收款&nbsp;&nbsp;&nbsp;</label>
               <input class="input_search" style="width:60%" type="number" v-model="model.f_collection"
                      v-validate:f_collection='{required: true, dctest: [model.f_totalcost, ">=" ] }'
-                     v-el:sk v-scale="[model.f_totalcost, 2]">
+                     v-el:sk v-scale="[model.f_totalcost, 3]">
             </div>
             <div class="col-sm-4" v-if="row.f_collection_type === '按金额'">
               <label for="f_collection" class=" font_normal_body">&nbsp;&nbsp;&nbsp;收款&nbsp;&nbsp;&nbsp;</label>
               <input class="input_search" style="width:60%" type="number" v-model="model.f_collection"
-                     v-el:sk v-scale="[model.f_collection, 4]" disabled>
+                     v-el:sk v-scale="[model.f_collection, 3]" disabled>
             </div>
           </div>
           <div class="row" style="margin-top:5px;">
@@ -178,7 +178,7 @@
         if (self.row.f_alias === 'QiaoSong') {
           self.model.f_pregas = (getGas.data.gas - 0).toFixed(1)
         } else {
-          self.model.f_pregas = (getGas.data.gas - 0).toFixed(4)
+          self.model.f_pregas = (getGas.data.gas - 0).toFixed(3)
         }
       } else {
         let tempnum = Math.floor(getGas.data.gas - 0)
@@ -190,26 +190,27 @@
     self.model.f_preamount = calFee - (dymoney - 0)
     self.model.chargeprice = getGas.data.chargeprice
     Object.assign(self.model, self.model, getGas.data)
-    self.model.f_totalcost = ((self.model.f_totalcost - 0) - (dymoney - 0)).toFixed(4)
+    self.model.f_totalcost = ((self.model.f_totalcost - 0) - (dymoney - 0)).toFixed(3)
+    // self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
+    // if(self.config.floor){
+    //   self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
+    // }
     // self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
-    if(self.config.floor){
-      self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
-    }
     self.calText(getGas.data.chargeprice)
   }
 
   // 输入气量，换算金额
   let pregasGen = async function (self) {
     if (self.row.f_isdecimal === '是') {
-      self.model.f_pregas = (self.model.f_pregas - 0).toFixed(4)
+      self.model.f_pregas = (self.model.f_pregas - 0).toFixed(3)
     } else {
       self.model.f_pregas = (self.model.f_pregas - 0).toFixed(0)
     }
     if ((self.model.f_pregas - 0) - (self.maxgas - 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
-      self.model.f_totalcost = ((self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(4))
+      self.model.f_preamount = getAmount.data.chargenum.toFixed(3)
+      self.model.f_totalcost = ((self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(3))
       Object.assign(self.model, self.model, getAmount.data)
       self.model.chargeprice = getAmount.data.chargeprice
       self.model.f_collection = self.model.f_totalcost
@@ -226,7 +227,7 @@
       self.model.f_write_money = self.model.f_preamount
       if (self.row.f_price_type == '阶梯气价' && self.row.f_is_step == '否') {
         self.model.f_write_money = (self.model.f_pregas * self.model.chargeprice[0].f_price)
-        self.model.f_write_money = self.model.f_write_money.toFixed(2)
+        self.model.f_write_money = self.model.f_write_money.toFixed(3)
       }
       // 加入扫码盒付款码支付流水号
       self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no

package/src/filiale/wuhai/ShowCardSellGas.vue

@@ -18,7 +18,7 @@
                  :class="[$v.f_pregas.required || $v.f_pregas.dctest? 'has-error' : 'has-success']">
               <label for="f_pregas" class=" font_normal_body">*预购气量</label>
               <input class="input_search" style="width:60%" type="number" id="fouces"
-                     v-scale="[model.f_pregas, 2]"
+                     v-scale="[model.f_pregas, 3]"
                      @blur="pregas()" v-model="model.f_pregas" :disabled="config.calculatePreByCollection"
                      v-validate:f_pregas='{required: true, dctest: [maxgas, "<=" ]}' placeholder="预购气量"
                      v-next-el='sk'>
@@ -51,12 +51,12 @@
             <div class="col-sm-4 form-group" v-if="hasLimit&&limitgas">
               <label class="font_normal_body">&nbsp;购气上限</label>
               <input class="input_search" style="width:60%" style="width:60%" type="number" v-model="maxgas"
-                     v-scale="[maxgas, 4]" placeholder='限购余气' disabled>
+                     v-scale="[maxgas, 3]" placeholder='限购余气' disabled>
             </div>
             <div class="col-sm-4 form-group" v-if="hasLimit&&limitmoney">
               <label class="font_normal_body">金额上限</label>
               <input class="input_search" style="width:60%" style="width:60%" type="number" v-model="maxmoney"
-                     v-scale="[maxmoney, 2]" placeholder='限购金额' disabled>
+                     v-scale="[maxmoney, 3]" placeholder='限购金额' disabled>
             </div>
             <div class="col-sm-4 form-group" v-if="!hasLimit">
             </div>
@@ -77,12 +77,12 @@
             <div class="col-sm-4 form-group">
               <label for="f_balance" class="font_normal_body">上期结余</label>
               <input class="input_search" style="width:60%" type="number" v-model="model.f_balance"
-                     v-scale="[model.f_balance, 4]" placeholder="上期结余" disabled>
+                     v-scale="[model.f_balance, 3]" placeholder="上期结余" disabled>
             </div>
             <div class="col-sm-4 form-group">
               <label for="f_curbalance" class="font_normal_body">&nbsp;本期结余</label>
               <input class="input_search" style="width:60%" type="number" v-model="curbalance"
-                     v-scale="[model.f_curbalance, 4]" placeholder="本期结余" disabled>
+                     v-scale="[model.f_curbalance, 3]" placeholder="本期结余" disabled>
             </div>
 
             <div class="col-sm-3 form-group" v-if="row.f_collection_type === '按气量'"
@@ -92,17 +92,17 @@
                      @blur="calculatePreByCollection()"
                      v-show="config.calculatePreByCollection"
                      v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0) + (openFee - 0), ">=" ] }'
-                     v-el:sk v-scale="[model.f_collection, 2]" :disabled="$refs.givechange.promptText != ''">
+                     v-el:sk v-scale="[model.f_collection, 3]" :disabled="$refs.givechange.promptText != ''">
               <input class="input_search" style="width:60%" type="number" v-model="model.f_collection"
                      v-show="!config.calculatePreByCollection"
                      v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0) + (openFee - 0), ">=" ] }'
-                     v-el:sk v-scale="[model.f_collection, 2]" :disabled="$refs.givechange.promptText != ''">
+                     v-el:sk v-scale="[model.f_collection, 3]" :disabled="$refs.givechange.promptText != ''">
             </div>
             <div class="col-sm-3 form-group" v-if="row.f_collection_type === '按金额'">
               <label for="f_collection" class=" font_normal_body">*收&emsp;&emsp;款</label>
               <input class="input_search" style="width:50%" type="number" v-model="model.f_collection"
                      @blur="config.calculatePreByCollection && calculatePreByCollection()"
-                     v-el:sk v-scale="[model.f_collection, 2]" :disabled="$refs.givechange.promptText != ''">
+                     v-el:sk v-scale="[model.f_collection, 3]" :disabled="$refs.givechange.promptText != ''">
             </div>
             <div class="col-sm-1 form-group">
               <give-change :curbalance="curbalance" :collection.sync="model.f_collection"
@@ -121,12 +121,12 @@
             <div class="col-sm-4 form-group">
               <label for="f_preamount" class=" font_normal_body">&nbsp;优惠金额</label>
               <input class="input_search" style="width:60%" type="number" v-model="model.f_privilege_money"
-                     v-scale="[model.f_privilege_money, 2]" placeholder="优惠金额" disabled>
+                     v-scale="[model.f_privilege_money, 3]" placeholder="优惠金额" disabled>
             </div>
             <div class="col-sm-4 form-group">
               <label for="f_preamount" class=" font_normal_body">&nbsp;实际收款</label>
               <input class="input_search" style="width:60%" type="number" v-model="model.f_after_discount"
-                     v-scale="[model.f_after_discount, 2]" placeholder="优惠后收款" disabled>
+                     v-scale="[model.f_after_discount, 3]" placeholder="优惠后收款" disabled>
             </div>
           </div>
           <div class="row" v-if="openFee > 0">
@@ -275,9 +275,9 @@
 
 import {HttpResetClass} from 'vue-client'
 let preamountGen = async function (self) {
-  let calFee = ((self.model.f_preamount - 0)).toFixed(4)
+  let calFee = ((self.model.f_preamount - 0)).toFixed(3)
   if (self.model.f_payment == '赠气') {
-    calFee = (self.model.f_preamount - 0).toFixed(4)
+    calFee = (self.model.f_preamount - 0).toFixed(3)
   }
   // 通过金额进行划价
   let getGas = await self.$CommonService.feeCalculate(self.model, calFee)
@@ -286,46 +286,46 @@ let preamountGen = async function (self) {
       if (self.row.f_alias === 'QiaoSong') {
         self.model.f_pregas = (getGas.data.gas - 0).toFixed(1)
       } else {
-        self.model.f_pregas = (getGas.data.gas - 0).toFixed(4)
+        self.model.f_pregas = (getGas.data.gas - 0).toFixed(3)
       }
       if (self.row.f_collection_type === '按金额') {
         self.dymoney = 0
       } else {
-        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
-        self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
+        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(3))
+        self.dymoney = (getGas.data.chargenum - 0).toFixed(3) - (dymoney2.data.chargenum - 0).toFixed(3)
       }
     } else {
       // 如果不支持小数,将划价出的多余非整数气量进行划价为金额
       let tempnum = Math.floor(getGas.data.gas - 0)
-      let dymoney1 = await self.$CommonService.gasCalculate(self.model, (tempnum).toFixed(4))
-      self.dymoney = (getGas.data.chargenum - 0).toFixed(2) - (dymoney1.data.chargenum - 0).toFixed(2)
+      let dymoney1 = await self.$CommonService.gasCalculate(self.model, (tempnum).toFixed(3))
+      self.dymoney = (getGas.data.chargenum - 0).toFixed(3) - (dymoney1.data.chargenum - 0).toFixed(3)
       self.model.f_pregas = Math.floor(getGas.data.gas - 0)
     }
   }
-  self.model.f_totalcost = ((self.row.f_balance - 0) >= (calFee - 0) ? 0 : ((calFee - 0) - (self.row.f_balance - 0)).toFixed(2))
+  self.model.f_totalcost = ((self.row.f_balance - 0) >= (calFee - 0) ? 0 : ((calFee - 0) - (self.row.f_balance - 0)).toFixed(3))
   self.model.chargeprice = getGas.data.chargeprice
   Object.assign(self.model, self.model, getGas.data)
-  self.model.f_totalcost = ((self.dymoney - 0) >= (self.model.f_totalcost - 0) ? 0 : (self.model.f_totalcost - 0) - (self.dymoney - 0).toFixed(2))
+  self.model.f_totalcost = ((self.dymoney - 0) >= (self.model.f_totalcost - 0) ? 0 : (self.model.f_totalcost - 0) - (self.dymoney - 0).toFixed(3))
   self.model.f_collection = self.model.f_totalcost
   if (self.config.floor) {
     self.model.f_collection = Math.ceil(self.model.f_collection)
   }
-  self.model.f_preamount = (calFee - (self.dymoney - 0)).toFixed(4)
+  self.model.f_preamount = (calFee - (self.dymoney - 0)).toFixed(3)
   self.calText(getGas.data.chargeprice)
 }
 
 // 输入气量，换算金额
 let pregasGen = async function (self) {
   if (self.row.f_isdecimal === '是') {
-    self.model.f_pregas = (self.model.f_pregas - 0).toFixed(4)
+    self.model.f_pregas = (self.model.f_pregas - 0).toFixed(3)
   } else {
     self.model.f_pregas = (self.model.f_pregas - 0).toFixed(0)
   }
   if ((self.model.f_pregas - 0) - (self.maxgas - 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
-    self.model.f_totalcost = ((self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(4))
+    self.model.f_preamount = getAmount.data.chargenum.toFixed(3)
+    self.model.f_totalcost = ((self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(3))
     Object.assign(self.model, self.model, getAmount.data)
     self.model.chargeprice = getAmount.data.chargeprice
     self.model.f_collection = self.model.f_totalcost
@@ -348,7 +348,7 @@ let initCardGen = async function (self) {
     self.model.xiekamoney = self.model.f_preamount
     if (self.row.f_price_type == '阶梯气价' && self.row.f_is_step == '否' && self.row.f_collection_type == '按金额') {
       self.model.xiekamoney = (self.model.f_pregas * self.model.chargeprice[0].f_price)
-      self.model.xiekamoney = self.model.xiekamoney.toFixed(4)
+      self.model.xiekamoney = self.model.xiekamoney.toFixed(3)
     }
 
     self.model.payments = self.paymentModel
@@ -644,7 +644,7 @@ export default {
     async calculatePreByCollection() {
       try {
         this.model.f_collection = (this.model.f_collection - 0)
-        let calFee = ((this.model.f_collection - 0) + (this.row.f_balance)).toFixed(4)
+        let calFee = ((this.model.f_collection - 0) + (this.row.f_balance)).toFixed(3)
         // 通过收款进行划价
         let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
         this.model.f_pregas = parseInt(getGas.data.gas)
@@ -889,13 +889,13 @@ export default {
         return this.model.f_balance
       }
       if (this.config.calculatePreByCollection) {
-        return ((this.model.f_collection - 0) + (this.row.f_balance - 0) - this.model.f_preamount).toFixed(4)
+        return ((this.model.f_collection - 0) + (this.row.f_balance - 0) - this.model.f_preamount).toFixed(3)
       }
       if (this.model.f_preamount) {
         if ((this.row.f_balance - 0) > (this.model.f_preamount - 0)) {
-          return ((this.row.f_balance - 0) - (this.model.f_preamount - 0) + (this.model.f_collection - 0)).toFixed(4)
+          return ((this.row.f_balance - 0) - (this.model.f_preamount - 0) + (this.model.f_collection - 0)).toFixed(3)
         } else {
-          return ((this.model.f_collection - 0) - (this.model.f_totalcost - 0)).toFixed(4)
+          return ((this.model.f_collection - 0) - (this.model.f_totalcost - 0)).toFixed(3)
         }
       } else {
         return this.row.f_balance