[update] -税额+未税金额= 总额 增加判断

src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue

@@ -22,14 +22,14 @@
           <a-input placeholder="请输入税额"
                    v-decorator="['tax',validatorRules.tax]"
                    :maxLength='50'
-                   @blur="addZero"
+                   @blur="(e) => addZeroTaxOrNo(e, 'noTaxAmount', 'invoiceAmount')"
                    @change="e => e.target.value = (e.target.value.replace(/[^0-9.-]/g, '')).trim()"></a-input>
         </a-form-item>
         <a-form-item label="未税金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入未税金额"
                    v-decorator="['noTaxAmount',validatorRules.noTaxAmount]"
                    :maxLength='50'
-                   @blur="addZero"
+                   @blur="(e) => addZeroTaxOrNo(e, 'tax', 'invoiceAmount')"
                    @change="e => e.target.value = (e.target.value.replace(/[^0-9.-]/g, '')).trim()"></a-input>
         </a-form-item>
         <a-form-item label="开票号" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -61,14 +61,15 @@
 <script>
 import JDate from '../../../../components/tools/JDate'
 import pick from 'lodash.pick'
-import { money } from '../../../../utils/validate'
 import { addPayBill, editPayBill } from '../../../../api/incomePaymentsApi'
 import { addZero } from '../../../../utils/util'
 import { getContactsById } from '../../../../api/api'
+import {TaxOperateMixin} from './TaxOperateMixin'
 
 export default {
   name: 'InvoicingModule',
   components: { JDate },
+  mixins: [TaxOperateMixin],
   props: {
     // 项目id
     projectId: {
@@ -220,23 +221,6 @@ export default {
     close() {
       this.visible = false
     },
-    /**
-     * 校验金额格式
-     * @param rules
-     * @param value
-     * @param callback
-     * @param name --校验字段的名字
-     *
-     */
-    checkMoneyTemplate(rules, value, callback, name) {
-      if (value) {
-        if (money(value)) {
-          callback()
-        }
-        callback('请输入合法的金额数字,最多2位小数,10位整数')
-      }
-      callback(`请输入${name}`)
-    },
 
     // 校验金额格式
     checkMoney(rules, value, callback) {
@@ -247,23 +231,7 @@ export default {
     },
     checkTaxMoney(rules, value, callback) {
       this.checkMoneyTemplate(rules, value, callback, '税额')
-    },
-    // 总金额做相关的处理
-    addZeroAmount(event) {
-      this.addZero(event)
-      let finalValue = event.target.value
-      // 计算未税金额和税额的值
-      let obj = this.calcOtherNumber(finalValue)
-      // console.log(event.target.value )
-      this.$nextTick(() => {
-        this.form.setFieldsValue(obj)
-      })
-    },
-    calcOtherNumber(amount) {
-      let noTaxAmount = (amount / 1.06).toFixed(2) // 未税金额
-      let tax =  (amount - noTaxAmount).toFixed(2) // 税额
-      return {noTaxAmount, tax}
-    },
+    }
   }
 }
 </script>