sale-client 3.6.533 → 3.6.534

package/package.json

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

package/src/filiale/bayan/NoCardMeterCenter.vue

@@ -30,9 +30,9 @@
 
             <div class="col-sm-4">
               <label for="f_preamount" class=" font_normal_body">预购金额</label>
-              <input class="input_search" style="width:60%" type="number" v-model="model.f_preamount"
+              <input class="input_search" style="width:60%" type="text" v-model="model.f_preamount"
                      v-validate:f_preamount='{required: true, dctest: [maxmoney, "<=" ] }'
-                     v-scale="[model.f_preamount, 2]" placeholder="预购金额" disabled>
+                     placeholder="预购金额" disabled>
             </div>
           </div>
           <div class="row" style="margin-top:6px;">
@@ -66,10 +66,10 @@
                      class=" font_normal_body">应收金额</label>
               <label for="f_temp_amount" v-if="row.f_collection_type === '按金额'"
                      class=" font_normal_body">本次缴费</label>
-              <input class="input_search" style="width:60%" type="number"
+              <input class="input_search" style="width:60%" type="text"
                      @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, 2]" >
+                     v-next-el='sk'  >
             </div>
           </div>
           <div class="row">
@@ -87,14 +87,14 @@
             <div class="col-sm-4" v-if="row.f_collection_type === '按气量'"
                  :class="[$v.f_collection.required ? 'has-error' : 'has-success']">
               <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"
+              <input class="input_search" style="width:60%" type="text" v-model="model.f_collection"
                      v-validate:f_collection='{required: true, dctest: [model.f_totalcost, ">=" ] }'
-                     v-el:sk v-scale="[model.f_totalcost, 2]" disabled>
+                     v-el:sk  disabled>
             </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, 2]" disabled>
+              <input class="input_search" style="width:60%" type="text" v-model="model.f_collection"
+                     v-el:sk  disabled>
             </div>
           </div>
           <div class="row" style="margin-top:5px;">
@@ -169,6 +169,10 @@
    */
   import CardService from './CardService'
     // 输入金额，换算气量
+  function stringRound(num, decimals = 2) {
+    const strValue = num + 'e' + decimals
+    return Math.round(Number(strValue)) / Math.pow(10, decimals)
+  }
   let preamountGen = async function (self) {
     let dymoney = 0
     let calFee = (self.model.f_totalcost - 0) + (self.row.f_balance - 0)
@@ -208,8 +212,8 @@
     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(2))
+      self.model.f_preamount = stringRound(getAmount.data.chargenum)
+      self.model.f_totalcost = stringRound((self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)))
       Object.assign(self.model, self.model, getAmount.data)
       self.model.chargeprice = getAmount.data.chargeprice
       self.model.f_collection = self.model.f_totalcost
@@ -492,6 +496,10 @@
         } else {
           return 0
         }
+      },
+      formattedAmount() {
+        // 四舍五入保留两位小数
+        return (Math.round(this.model.f_preamount * 100) / 100).toFixed(2);
       }
     }
   }

package/src/filiale/jingyang/wechatValidateManage.vue

@@ -5,7 +5,7 @@
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
 
-<!--            <res-select-group :initres="$parent.$parent.initres" :show-component="['company']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>-->
+            <res-select-group :initres="$parent.$parent.initres" :show-component="['company']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
 
               <div class="col-sm-2  form-group">
               <label for="startDate"  class="font_normal_body">开始日期</label>