From 12437e8fd9d9825a2e1208c1ffca5e6bbf9d80f2 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Fri, 24 Dec 2021 16:24:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B0=E8=B4=A6=E5=BC=80=E7=A5=A8=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=92=8C=E6=9D=A5=E6=AC=BE=E5=9B=9E=E6=98=BE=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81pdf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ArriveStageModule.vue                | 16 +++++++++++-----
 .../modules/AuditProofModule.vue                 | 14 +++++++-------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue
index 5a3c36e..db5aa93 100644
--- a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue
@@ -33,10 +33,15 @@
           <a-col>
             <div class="stage">
               <div class="stage-title">缴费凭证：</div>
-              <div v-if="item.proof && item.proof !== ''"  class="stage-content">
-                <div v-for="(tt, indexs) in item.proof.split(',')" :key="indexs">
-                  <div class="proof-img"><img :src="proofSrc(tt)" @click="previewProof(item.proof)"></div>
-                </div>
+              <div class="stage-content">
+                <template v-if="!item.paymentMethod || item.paymentMethod+'' === '1'">
+                  <div v-for="(tt, indexs) in item.proof.split(',')" :key="indexs">
+                    <div class="proof-img" ><img :src="proofSrc(tt)" @click="previewProof(item.proof)"></div>
+                  </div>
+                </template>
+                <template v-if="item.paymentMethod && item.paymentMethod+'' === '2'">
+                  <preview-file :file-id="item.proof"></preview-file>
+                </template>
               </div>
             </div>
           </a-col>
@@ -69,10 +74,11 @@
 import ArriveModule from './ArriveModule'
 import { amountReceivedList } from '../../../../api/incomePaymentsApi'
 import PreviewImgModal from '../../../../components/PreviewImgModal'
+import PreviewFile from '../../../../components/jero/PreviewFile.vue'
 
 export default {
   name: 'ArriveStageModule',
-  components: { ArriveModule, PreviewImgModal },
+  components: { ArriveModule, PreviewImgModal, PreviewFile },
   props: {
     // 项目id
     projectId: {
diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/AuditProofModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/AuditProofModule.vue
index 954886a..ed3fe81 100644
--- a/src/views/financialManagement/arriveAndInvoicing/modules/AuditProofModule.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/modules/AuditProofModule.vue
@@ -136,10 +136,10 @@ export default {
   methods: {
    async open(record) {
       let flag = await this.getProofInfo(record)
-     if(!flag){
-       this.$message.warn('项目已审核')
-       return
-     }
+      if(!flag){
+        this.$message.warn('项目已审核')
+        return
+      }
       this.form.resetFields()
       let userInfo = Vue.ls.get(USER_INFO)
       // 默认隐藏说明
@@ -157,15 +157,15 @@ export default {
      */
     getProofType(record) {
       if (record.projectType && (record.projectType.toString() === '5' || record.projectType.toString() === '6'))  {
-        if (this.proofInfo.paymentMethod === '1') {
+        if (this.proofInfo.paymentMethod.toString() === '1') {
           this.proofType = 'img'
           return
         }
-        if (this.proofInfo.paymentMethod === '2') {
+        if (this.proofInfo.paymentMethod.toString() === '2') {
           this.proofType = 'pdf'
           return
         }
-        if (this.proofInfo.paymentMethod === '3') {
+        if (this.proofInfo.paymentMethod.toString() === '3') {
           this.proofType = 'none'
           return
         }