From c56a1c4b6f3acbb387eb2f56794df14b2b77d4f8 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 8 Nov 2022 11:58:01 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E7=BD=91=E5=91=98=20=E6=88=90=E5=91=98=E5=BA=94?=
 =?UTF-8?q?=E6=94=B6=E9=87=91=E9=A2=9D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/CalcAmountMixin.js                 |  7 ++-
 .../modules/SafeguardMemberModal.vue          | 61 +++++++++++++++++--
 2 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/src/mixins/CalcAmountMixin.js b/src/mixins/CalcAmountMixin.js
index 06c0f4a..4acbbc3 100644
--- a/src/mixins/CalcAmountMixin.js
+++ b/src/mixins/CalcAmountMixin.js
@@ -4,6 +4,11 @@
  * */
 
 export const CalcAmountMixin =  {
+  data() {
+    return {
+      ysjeKey:'receivableAmount',// 应收金额的表单key值
+    }
+  },
   methods:{
     /**
      * 改变应收金额 计算税额 未税金额
@@ -27,7 +32,7 @@ export const CalcAmountMixin =  {
      * */
     calcAmount(){
       // 获取应收金额
-      let ysje = Number(this.form.getFieldValue('receivableAmount'))
+      let ysje = Number(this.form.getFieldValue(this.ysjeKey))
       // 没有输入应收金额 不进行计算
       if(!ysje) return
       // 获取税率
diff --git a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
index 1d90a08..0d868f3 100644
--- a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
+++ b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue
@@ -79,20 +79,59 @@
               <a-input
                 placeholder="请输入应收金额"
                 :maxLength="50"
+                @change="changeReceivableAmount"
                 v-decorator="[
                   'amountReceivable',
                   validatorRules.amountReceivable,
                 ]"
                 @blur="addZero"
-                @change="
-                  (e) => {
-                    e.target.value = e.target.value.replace(/[^0-9.]/g, '');
-                  }
-                "
               ></a-input>
               <span class="yuan">元</span>
             </a-form-item>
           </a-col>
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="税率" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag @change="changeRate" placeholder="请选择税率" dict-code="rate" :trigger-change="true"
+                                 v-decorator="['taxRate',validatorRules.taxRate]"></j-dict-select-tag>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="税额" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-row :gutter="10">
+                <a-col :span="20">
+                  <a-input placeholder="请输入税额"
+                           v-decorator="['tax',validatorRules.tax]"
+                           :maxLength='50'
+                           @blur="addZero"
+                           read-only
+                           disabled
+                           @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}"></a-input>
+                </a-col>
+                <a-col :span="1">元</a-col>
+              </a-row>
+            </a-form-item>
+          </a-col>
+
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="未税金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-row :gutter="10">
+                <a-col :span="20">
+                  <a-input placeholder="请输入未税金额"
+                           v-decorator="['noTaxAmount',validatorRules.noTaxAmount]"
+                           :maxLength='50'
+                           disabled
+                           @blur="addZero"
+                           read-only
+                           @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}"></a-input>
+                </a-col>
+                <a-col :span="1">元</a-col>
+              </a-row>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row>
           <a-col :xl="12" :sm="24">
             <a-form-item
               label="需要发票"
@@ -232,11 +271,15 @@ import { addZero } from '@/utils/util'
 import { money } from '@/utils/validate'
 import { checkAssociatedProject } from '@/utils/projectCheck'
 import SelectRevenueContract from '../../../../components/tools/SelectRevenueContract'
+import JDictSelectTag from '@comp/dict/JDictSelectTag'
+import {CalcAmountMixin} from '@/mixins/CalcAmountMixin'
 
 export default {
   name: 'SafeguardMemberModal',
+  mixins:[CalcAmountMixin],
   components: {
     JUpload,
+    JDictSelectTag,
     CompanySelect,
     // ContactManagementModule,
     SelectContacts,
@@ -245,6 +288,7 @@ export default {
   data() {
     return {
       title: '操作',
+      ysjeKey:'amountReceivable',
       width: 800,
       visible: false,
       confirmLoading: false,
@@ -294,6 +338,10 @@ export default {
           ],
           validateTrigger: ['blur']
         },
+        taxRate: {
+          rules: [{ required: true,message: '请选择税率'  }],
+          validateTrigger: 'change',initialValue:'0.06'
+        },
 
         chargeNoticeNo: {
           rules: [{ required: true, message: '请输入收费通知号' }],
@@ -396,6 +444,9 @@ export default {
             'companyContactId',
             'postContactId',
             'amountReceivable',
+            'taxRate',
+            'tax',
+            'noTaxAmount',
             'needInvoice',
             'paymentMethod',
             'contractNo',