From 938e1396d5bccc64fe742b69172d2f83ea45ec59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Tue, 29 Nov 2022 13:54:10 +0800
Subject: [PATCH] up

---
 .../components/detailPaymentRegistration.vue  | 30 +++++++---
 .../components/paymentRegistration.vue        | 55 ++++++++++++-------
 .../contract/components/printRegistration.vue | 10 ++--
 3 files changed, 63 insertions(+), 32 deletions(-)

diff --git a/src/views/contract/components/detailPaymentRegistration.vue b/src/views/contract/components/detailPaymentRegistration.vue
index 0c1805a..9e92abd 100644
--- a/src/views/contract/components/detailPaymentRegistration.vue
+++ b/src/views/contract/components/detailPaymentRegistration.vue
@@ -32,7 +32,7 @@
           <div class="xy-table-item-label">审计金额
           </div>
           <div class="xy-table-item-content xy-table-item-price">
-            <el-input clearable placeholder="请填写审计金额" v-model="form.audit_money" style="width: 150px;" />
+            <el-input clearable placeholder="请填写审计金额" v-model="contract_form.audit_money" style="width: 150px;" />
           </div>
         </div>
       </template>
@@ -116,7 +116,10 @@
 <script>
   import {
     moneyFormatter
-  } from '@/utils'
+  } from '@/utils'
+  import {
+    editorContract
+  } from "@/api/contract/contract";
   import {
     detailFundLog,
     editorFundLog
@@ -138,6 +141,9 @@
         plansPageIndex: 1,
         planTotal: 0,
         plans: [],
+        contract_form: {
+          audit_money: 0
+        },
         searchContent: "",
         planTable: [{
             sortable: false,
@@ -230,7 +236,8 @@
         const res = await detailFundLog({
           id
         })
-        this.form = res
+        this.form = res;
+        this.contract_form.audit_money=res.contract.audit_money;
         console.log(this.form)
       },
       async getBudgets() {
@@ -251,11 +258,18 @@
       editor() {
         editorFundLog(this.form).then(res => {
           this.$emit('success')
-          this.isShow = false
-          Message({
-            type: "success",
-            message: '操作成功'
-          })
+          this.isShow = false
+          
+          //付款申请后同时更新一下合同中审计金额
+          editorContract({
+            id: this.form.contract_id, 
+            audit_money: this.contract_form.audit_money
+          }).then(r => {
+            Message({
+              type: 'success',
+              message: "操作成功"
+            })
+          });
         })
       },
 
diff --git a/src/views/contract/components/paymentRegistration.vue b/src/views/contract/components/paymentRegistration.vue
index 5ecd1c3..0647b8f 100644
--- a/src/views/contract/components/paymentRegistration.vue
+++ b/src/views/contract/components/paymentRegistration.vue
@@ -68,16 +68,16 @@
               style="width: 150px;" />
           </div>
         </div>
-      </template>
-
-      <template v-slot:audit_money>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">审计金额
-          </div>
-          <div class="xy-table-item-content xy-table-item-price">
-            <el-input clearable placeholder="请填写审计金额" v-model="paymentRegistrationForm.audit_money" style="width: 150px;" />
-          </div>
-        </div>
+      </template>
+
+      <template v-slot:audit_money>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">审计金额
+          </div>
+          <div class="xy-table-item-content xy-table-item-price">
+            <el-input clearable placeholder="请填写审计金额" v-model="form.audit_money" style="width: 150px;" />
+          </div>
+        </div>
       </template>
       <template v-slot:deductionMoney>
         <div class="xy-table-item">
@@ -159,7 +159,8 @@
     getBudget
   } from "@/api/budget/budget";
   import {
-    detailContract
+    detailContract,
+    editorContract
   } from "@/api/contract/contract";
   import {
     Message
@@ -207,13 +208,16 @@
         isShowPaymentRegistration: false,
         paymentRegistrationForm: {
           applyMoney: "",
-          deductionMoney: "",
-          audit_money:"",
+          deductionMoney: "",
+          audit_money: "",
           type: "",
           isLast: false,
           plan: [],
           remark: ""
         },
+        form: {
+          audit_money: 0
+        },
         paymentRegistrationRules: {
           applyMoney: [{
               required: true,
@@ -316,18 +320,22 @@
       async getContract(info) {
         this.contract = await detailContract({
           id: info.id
-        })
+        });
+        
         this.paymentRegistrationForm.plan = this.contract.plans.map(item => {
           return {
             plan_id: item.id,
             use_money: item.useMoney,
             new_money: item.money,
           }
-        })
+        });
+
+        this.form.audit_money = this.contract.audit_money;
 
         const res = await getFundLog({
           contract_id: this.contract.id
         })
+
         this.payment = res.data
       },
 
@@ -338,14 +346,21 @@
           discount_money: this.paymentRegistrationForm.deductionMoney,
           type: this.paymentRegistrationForm.type,
           is_end: this.paymentRegistrationForm.isLast ? 1 : 0,
-          remark: this.paymentRegistrationForm.remark
+          remark: this.paymentRegistrationForm.remark,
+          audit_money: this.paymentRegistrationForm.audit_money
         }
         addFundLog(data).then(res => {
           this.isShowPaymentRegistration = false
-          Message({
-            type: 'success',
-            message: "操作成功"
-          })
+          //付款申请后同时更新一下合同中审计金额
+          editorContract({
+            id: this.contract.id,
+            audit_money: this.form.audit_money
+          }).then(r => {
+            Message({
+              type: 'success',
+              message: "操作成功"
+            })
+          });
           this.$refs['paymentRegistration'].reset()
         })
       },
diff --git a/src/views/contract/components/printRegistration.vue b/src/views/contract/components/printRegistration.vue
index 29d3a01..3ccc5f9 100644
--- a/src/views/contract/components/printRegistration.vue
+++ b/src/views/contract/components/printRegistration.vue
@@ -29,7 +29,7 @@
             <div style="grid-area: tb4-4"></div>
             <div style="grid-area: tb5-1" class="print-table1-grid-center">B</div>
             <div style="grid-area: tb5-2" class="print-table1-grid-center">审计金额</div>
-            <div style="grid-area: tb5-3" class="print-table1-grid-center">{{priceFormat(registration.audit_money)}}</div>
+            <div style="grid-area: tb5-3" class="print-table1-grid-center">{{priceFormat(registration.contract.audit_money)}}</div>
             <div style="grid-area: tb5-4"></div>
             <div style="grid-area: tb6-1" class="print-table1-grid-center">C</div>
             <div style="grid-area: tb6-2" class="print-table1-grid-center">前期累计已支付</div>
@@ -73,7 +73,7 @@
             <div style="grid-area: tb11-1" class="print-table1-grid-center">H</div>
             <div style="grid-area: tb11-2" class="print-table1-grid-center">质保金</div>
             <div style="grid-area: tb11-3;align-items: center;">
-              {{guaranteeRate(registration.contract.guarantee_money,registration.contract.money)}}%，质保期{{registration.contract.guarantee_year}}年，需审计的以审计价为计费依据。
+              {{guaranteeRate(registration.contract.guarantee_money,registration.contract.money,registration.contract.audit_money)}}%，质保期{{registration.contract.guarantee_year}}年，需审计的以审计价为计费依据。
             </div>
 
             <div style="grid-area: tb12" class="print-table1-grid-bottom1">
@@ -131,8 +131,10 @@
         })
         return res.toString()
       },
-      guaranteeRate(gua, money) {
-        if (gua && money) return ((moneyRecovery(gua) / money) * 100).toFixed(2)
+      guaranteeRate(gua, money, auditmoney) {
+        let _money = money;
+        if(auditmoney&&auditmoney>0) _money=auditmoney;
+        if (gua && _money) return ((moneyRecovery(gua) / _money) * 100).toFixed(2)
       },
 
       async getDetailFundLog(id) {