From 39846174f3224603a60bc7e45b89b71aed19014e Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 12 Oct 2021 17:51:38 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProjectDetailModal.vue | 22 ++++++++++++++++++++--
 src/components/jero/PreviewFile.vue   |  4 ++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue
index b83c118..b3efb70 100644
--- a/src/components/ProjectDetailModal.vue
+++ b/src/components/ProjectDetailModal.vue
@@ -20,11 +20,17 @@
         </a-col>
       </a-row>
       <a-row :gutter="24">
-        <a-col :span="12">
+        <a-col>
           <label>备注：</label>
           <span><j-ellipsis :value="basicInfo.remarks" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
+      <a-row :gutter="24" v-if="basicInfo.files">
+        <a-col>
+          <label>资料：</label>
+          <span><preview-file :file-id="basicInfo.files"></preview-file></span>
+        </a-col>
+      </a-row>
       <!--      来款方式为合同的显示-->
       <a-row :gutter="24" v-if="!!basicInfo.contractNum">
         <a-col :span="12">
@@ -36,6 +42,16 @@
           <span class="contract-num" @click="toContractDetail">{{ basicInfo.contractNum }}</span>
         </a-col>
       </a-row>
+      <a-row :gutter="24" v-if="basicInfo.chargeWay === 3">
+        <a-col :span="12" >
+          <label>收费通知号：</label>
+          <span><j-ellipsis :value="basicInfo.chargeNoticeNo" :length="20"></j-ellipsis></span>
+        </a-col>
+        <a-col :span="12">
+          <label>收费通知：</label>
+          <span><preview-file :file-id="basicInfo.chargeNoticeId"></preview-file></span>
+        </a-col>
+      </a-row>
     </section>
     <!-- 基本信息end-->
     <!-- 企业信息begin-->
@@ -144,6 +160,7 @@
 <script>
 import {queryCommonProjectById} from '@api/incomePaymentsApi'
 import JEllipsis from '@comp/jero/JEllipsis'
+import PreviewFile from './jero/PreviewFile'
 // import {getAction} from "@api/manage";
 const paymentInfoList = [
   {
@@ -257,7 +274,8 @@ export default {
   },
   computed: {},
   components: {
-    JEllipsis
+    JEllipsis,
+    PreviewFile
   },
   methods: {
     open(record) {
diff --git a/src/components/jero/PreviewFile.vue b/src/components/jero/PreviewFile.vue
index f30bdbb..48b64c5 100644
--- a/src/components/jero/PreviewFile.vue
+++ b/src/components/jero/PreviewFile.vue
@@ -1,9 +1,9 @@
 <template>
   <!--  父组件的文件id如果是异步获取的 需要加上v-if判断-->
 <div style="display: inline-block">
-  <span v-for="(item) of fileList" :key="item.id">{{ item.name +'  ' }}
+  <div v-for="(item) of fileList" :key="item.id">{{ item.name +'  ' }}
     <span class="m-l-4 color-blue" @click="handleDownLoad(item)">下载</span> <span class="m-l-4 color-blue" @click="handlePreview(item)">查看</span>
-  </span>
+  </div>
 </div>
 </template>