sale-client 3.6.229 → 3.6.230

package/package.json

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

package/src/filiale/ningjin/CardMeterCenter.vue

@@ -310,7 +310,7 @@
       self.model.f_totalcost = self.model.f_preamount
       self.model.f_collection = 0
     } else {
-      self.model.f_collection = self.config.autoCollection ? self.model.f_totalcost : 0
+      self.model.f_collection = self.config.autoCollection ? self.model.f_preamount : 0
       self.model.f_totalcost = ((self.model.f_totalcost - 0) - (self.dymoney - 0)).toFixed(4)
     }
     self.model.f_preamount = (calFee - (self.dymoney - 0)).toFixed(4)
@@ -335,7 +335,7 @@
         self.model.f_totalcost = getAmount.data.chargenum
         self.model.f_collection = 0
       } else {
-        self.model.f_collection = self.config.autoCollection ? self.model.f_totalcost : 0
+        self.model.f_collection = self.config.autoCollection ? getAmount.data.chargenum : 0
         if(self.config.floor){
           self.model.f_collection=Math.ceil(self.model.f_collection)
         }

package/src/filiale/ningjin/IOTMeterCenter.vue

@@ -102,7 +102,7 @@
             <div class="col-sm-3 form-group" v-if="row.f_collection_type === '按金额'">
               <label for="f_collection" class=" font_normal_body">&nbsp;&nbsp;&nbsp;收款&nbsp;&nbsp;&nbsp;</label>
               <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
-                     v-el:sk v-scale="[model.f_collection, 2]" disabled>
+                     v-el:sk v-scale="[model.f_collection, 4]" disabled>
             </div>
             <div class="col-sm-1 form-group">
               <give-change :curbalance="curbalance" :collection.sync="model.f_collection" v-ref:givechange></give-change>
@@ -303,12 +303,13 @@
       self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
     }
     // self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
-    self.model.f_collection = self.model.f_totalcost
+    self.model.f_collection = (self.model.f_totalcost - 0).toFixed(2)
     self.model.f_preamount = ((getGas.data.chargenum - 0) - (self.dymoney - 0))
     if (self.model.f_payment == '赠气') {
       self.model.f_totalcost = self.model.f_preamount
-      self.model.f_collection = 0
-  }
+      self.model.f_collection = 0.00
+    }
+    console.log('self.model.f_collection', self.model.f_collection)
     self.calText(getGas.data.chargeprice)
   }
   // 输入气量，换算金额
@@ -328,11 +329,12 @@
       if(self.config.floor){
         self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
       }
-      self.model.f_collection = self.model.f_totalcost
+      self.model.f_collection = (self.model.f_totalcost - 0).toFixed(2)
       if (self.model.f_payment == '赠气') {
         self.model.f_totalcost = getAmount.data.chargenum
-        self.model.f_collection = 0
+        self.model.f_collection = 0.00
       }
+      console.log('self.model.f_collection', self.model.f_collection)
       self.calText(getAmount.data.chargeprice)
     }
   }

package/src/filiale/ningjin/NoCardMeterCenter.vue

@@ -212,7 +212,7 @@
       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))
       Object.assign(self.model, self.model, getAmount.data)
       self.model.chargeprice = getAmount.data.chargeprice
-      self.model.f_collection = self.model.f_totalcost
+      self.model.f_collection = getAmount.data.chargenum - 0
       if(self.config.floor){
         self.model.f_collection=Math.ceil(self.model.f_collection)
       }