From 56246d3f7778fb54998011aa307a4bdc3f3fa364 Mon Sep 17 00:00:00 2001
From: lynn <lynnlinyong@qq.com>
Date: Fri, 6 Jun 2025 12:35:37 +0800
Subject: [PATCH] update

---
 .../contract/components/printPaymentForm.vue  | 19 +++++++++----------
 src/views/finance/paymentRegistrationList.vue |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/views/contract/components/printPaymentForm.vue b/src/views/contract/components/printPaymentForm.vue
index 758f8ec..dbacdb7 100644
--- a/src/views/contract/components/printPaymentForm.vue
+++ b/src/views/contract/components/printPaymentForm.vue
@@ -4,13 +4,13 @@
       <template v-slot:normalContent>
         <div class="form-switch">
           <RadioGroup v-model="currentForm" type="button">
-            <Radio label="pre" :disabled="!getBeforeForms">事前审批表格</Radio>
-            <Radio label="finance" :disabled="!fundLog">财务审核表</Radio>
-            <Radio label="post" :disabled="!getForms">事后支付表格</Radio>
+            <!-- <Radio label="pre" :disabled="!getBeforeForms">事前审批表格</Radio> -->
+            <!-- <Radio label="finance" :disabled="!fundLog">财务审核表</Radio> -->
+            <Radio label="post" :disabled="!getForms">事后支付表格2</Radio>
           </RadioGroup>
         </div>
         
-        <div class="white-container" ref="printtable">
+        <div class="white-container">
           <div class="form-container">
             <!-- Pre-payment Form -->
             <div v-if="currentForm === 'pre'" class="payment-form">
@@ -20,12 +20,7 @@
 
             <!-- Post-payment Form -->
             <div v-else-if="currentForm === 'post'" class="payment-form">
-              <div v-if="getForms" v-html="getForms"></div>
-              <div v-else class="no-form-message">暂无事后支付表格内容</div>
-            </div>
-
-            <!-- Finance Review Form -->
-            <div v-else-if="currentForm === 'finance'" class="payment-form">
+              <!-- 财务审核表内容放到事后支付表头部 -->
               <table class="finance-review-table">
                 <tr>
                   <th colspan="2" class="finance-header-row">合同信息</th>
@@ -58,7 +53,11 @@
                   <td colspan="2">{{ fundLog && fundLog.remark || '-' }}</td>
                 </tr>
               </table>
+              <div v-if="getForms" v-html="getForms"></div>
+              <div v-else class="no-form-message">暂无事后支付表格内容</div>
             </div>
+
+
           </div>
         </div>
       </template>
diff --git a/src/views/finance/paymentRegistrationList.vue b/src/views/finance/paymentRegistrationList.vue
index b1ef8f6..40734df 100644
--- a/src/views/finance/paymentRegistrationList.vue
+++ b/src/views/finance/paymentRegistrationList.vue
@@ -549,7 +549,7 @@ export default {
       try {
         // if (row.contract && (row.contract.forms || row.contract.before_forms)) {
         await this.$refs['printPaymentForm'].getDetailFundLog(row.id);
-        this.$refs['printPaymentForm'].currentForm = 'finance';
+        this.$refs['printPaymentForm'].currentForm = 'post';
         this.$refs['printPaymentForm'].isShow = true;
         // return;
         // }