From a5d003e1228956b91205d99ad4b1c30a8fe4f781 Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Fri, 28 Jun 2024 03:11:04 +0800
Subject: [PATCH] =?UTF-8?q?2024.6.27=20=E4=BA=A7=E5=93=81=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E6=94=B6=E9=9B=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/eam/com_project_proof_record.vue  | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/eam/com_project_proof_record.vue b/src/views/modules/eam/com_project_proof_record.vue
index f924495..b257209 100644
--- a/src/views/modules/eam/com_project_proof_record.vue
+++ b/src/views/modules/eam/com_project_proof_record.vue
@@ -158,10 +158,10 @@
         </div>
       </el-dialog>
 
-      <el-dialog title="文档清单定义" :visible.sync="documentListVisible" width="50%" style="margin-top: 10vh" :close-on-click-modal="false">
+      <el-dialog title="文档清单定义" @close="documentListVisibleFalse" :visible.sync="documentListVisible" width="50%" style="margin-top: 10vh" :close-on-click-modal="false">
         <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
-          <el-form-item label="项目编码" prop="projectId" >
-            <el-input v-model="modalData.projectId" readonly style="width: 110px;" class="red-text"></el-input>
+          <el-form-item label="项目编码" prop="projectId" class="red-text">
+            <el-input v-model="modalData.projectId" readonly style="width: 110px;" ></el-input>
           </el-form-item>
           <el-form-item label="项目名称" prop="projectDesc" >
             <el-input v-model="modalData.projectDesc" readonly style="width: 170px;" class="red-text"></el-input>
@@ -208,7 +208,7 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+              <span v-if="!item.columnHidden">{{ getColumnValue(scope.row, item) }}</span>
               <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
             </template>
           </el-table-column>
@@ -903,6 +903,18 @@
           }
         })
       },
+      getColumnValue(row, column) {
+        // 根据列的配置信息决定显示的值
+        if (column.columnProp === 'documentType') {
+          return this.getCombinedDocumentType(row);
+        }
+        else if (column.columnProp === 'documentDesc') {
+          return row.documentDesc; // 或者根据实际需求处理其他字段的显示
+        }
+        else {
+          return row[column.columnProp]; // 默认返回对应列的值
+        }
+      },
       getCombinedDocumentType(row) {
         // 根据您的需求，组合或拼接需要显示的字段
         if (row.documentType === null || row.documentType === undefined) {
@@ -913,6 +925,10 @@
         }
         return `${row.documentType}${row.documentDesc}`;
       },
+      documentListVisibleFalse() {
+        this.documentListVisible = false
+        this.documentManifestDefinitionList = []
+      },
       addDocumentList(row) {
         this.documentListVisible = true
         row.bu = row.site + "-" + row.buNo