sale-client 4.2.88 → 4.2.89

package/package.json

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

package/src/filiale/jinhong/CardMeterCenterInner.vue

@@ -226,12 +226,12 @@
           <strong style="color:red;margin-right: 5px">{{ $refs.givechange.promptText }}</strong>
           <strong style="font-size: large" v-if="!config.notShowFormula">计算公式:{{calculatedetail ? calculatedetail : ' 暂无'}}</strong><br/>
           <strong style="font-size: large" v-if="deductdetail">{{deductdetail ? deductdetail : ' 暂无'}}</strong><br/>
-          <payment-code-button :clickable="!$v.valid || validateOk || !islegal || clickConfirm|| model.f_preamount === 0"
+          <payment-code-button :clickable="!$v.valid || validateOk || !islegal || clickConfirm || model.f_preamount === 0 || curbalanceInvalid"
                                :payment.sync="model.f_payment" :payment-data="paytype"
                                @confirm-payment="confirm()">
           </payment-code-button>
           <button class="button_search btn-gn" type="submit" @click="checkInvoiceMsg()"
-                  :disabled='!$v.valid || validateOk || !islegal || clickConfirm || model.f_preamount === 0'>确认
+                  :disabled='!$v.valid || validateOk || !islegal || clickConfirm || model.f_preamount === 0 || curbalanceInvalid'>确认
           </button>
           <button class="button_clear btn-gn" @click="clean()">取消</button>
         </div>
@@ -606,6 +606,7 @@
         },
         sumCollection: 0,
         calculateCollectionFlag: false,
+        curbalanceInvalid: false,
         calculatedetail: '',
         deductdetail: '',
 
@@ -721,6 +722,12 @@
         // 获取计算优惠
         this.getPrivilegeList()
         this.sumCollection = (this.model.f_collection - 0) + (this.insurance.f_money_all - 0) + (this.garbagefee - 0)
+      },
+      curbalance (val) {
+        this.curbalanceInvalid = val < 0
+        if (this.curbalanceInvalid) {
+          this.$showAlert('本期结余不能为负', 'warning', 5000)
+        }
       }
     },
     events: {
@@ -824,6 +831,10 @@
         }
       },
       confirm () {
+        if (this.curbalanceInvalid) {
+          this.$showAlert('本期结余不能为负', 'warning', 3000)
+          return
+        }
         if (this.insurance && this.insurance.f_money_all > 0) {
           if (!this.insurance.f_insurance_company) {
             return this.$showMessage('请填写保险公司')