sale-client 4.0.45-preview → 4.0.47-preview

package/package.json

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

package/src/filiale/fugou/components/charge/business/OtherChargeNew.vue

@@ -65,7 +65,7 @@
               <div class="col-sm-4" :class="{'has-success':row.f_discount_amount,'has-error':!row.f_discount_amount}">
                 <label style="" for="f_discount_amount" class=" font_normal_body">&nbsp;优惠金额</label>
                 <input class="input_search" style="width:60%" type="number" min="1" @input.prevent="getcollection()"
-                       v-validate:f_discount_amount='{required: true, dctest: [0, ">" ] }'
+                       v-validate:f_discount_amount='{required: true, dctest: [0, ">=" ] }'
                        v-model="row.f_discount_amount"
                        :value.sync="row.f_discount_amount"
                        :disabled="false"
@@ -543,14 +543,18 @@ export default {
         if (!item.f_unitprice || item.f_unitprice == '0') flag = false
         if (item.f_unitprice && item.f_number) {
           // 新增优惠金额
-          const discount = item.f_discount_amount ? parseFloat(item.f_discount_amount) : 0
+          const discount = item.f_discount_amount ? item.f_discount_amount : 0
           money += ((item.f_unitprice - 0) * (item.f_number - 0)) - discount
         } else {
           flag = false
           this.model.f_collection = 0
         }
       })
-      if (money != 0) {
+      if (money < 0) {
+        this.$showAlert('优惠金额不能大于实收金额!!!', 'danger', 3000)
+        this.model.f_discount_amount = ''
+      }
+      if (money >= 0) {
         this.model.f_collection = money.toFixed(2)
       }
       if (!flag) this.model.f_collection = ''
@@ -581,7 +585,7 @@ export default {
       if (this.isflag) {
         if (this.model.f_collection && this.model.f_collection != '') {
           let collection = (parseFloat(this.model.f_collection - 0)).toFixed(2)
-          if (collection > 0) return !this.isflag
+          if (collection >= 0) return !this.isflag
           else return !this.$v.valid
         } else {
           return !this.$v.valid