From f67241a72e48a90cbcca28acbc2ce9aaffdfa43d Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期三, 27 十一月 2024 18:38:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/projectEngineering/projectLibrary/index.vue |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/views/projectEngineering/projectLibrary/index.vue b/src/views/projectEngineering/projectLibrary/index.vue
index 7584bc8..730e22c 100644
--- a/src/views/projectEngineering/projectLibrary/index.vue
+++ b/src/views/projectEngineering/projectLibrary/index.vue
@@ -203,23 +203,19 @@
           <template v-if="item.slotName">
             <!-- projectStatus鎻掓Ы -->
             <template v-if="item.slotName === 'projectStatus'">
-              <div class="mx-1">{{ '鑷畾涔夋牱寮�' }}</div>
+              <dict-tag :options="dict.type.sys_project_status" :value="scope.row.projectStatus"/>
             </template>
             <!-- projectColorCode鎻掓Ы -->
             <template v-if="item.slotName === 'projectColorCode'">
-              <div class="mx-1 has-dot">{{ '鑷畾涔夋牱寮�' }}<span class="dot" style="margin-left: 5px"></span></div>
+              <dict-tag :options="dict.type.sys_project_code" :value="scope.row.projectColorCode"/>
             </template>
             <!-- projectType鎻掓Ы -->
             <template v-if="item.slotName === 'projectType'">
-              <div class="mx-1">{{ '鑷畾涔夋牱寮�' }}</div>
+              <dict-tag :options="dict.type.sys_project_type" :value="scope.row.projectType"/>
             </template>
             <!-- investType鎻掓Ы -->
             <template v-if="item.slotName === 'investType'">
-              <div class="mx-1">{{ '鑷畾涔夋牱寮�' }}</div>
-            </template>
-            <!-- planStartTime鎻掓Ы -->
-            <template v-if="item.slotName === 'planStartTime'">
-              {{ '鑷畾涔夋牱寮�' }}
+              <dict-tag :options="dict.type.sys_investment_type" :value="scope.row.investType"/>
             </template>
           </template>
           <!-- 榛樿鏄剧ず -->
@@ -277,7 +273,7 @@
 <script>
 import {listInfo, getInfo, delInfo, addInfo, updateInfo} from "@/api/projectInfo";
 import {current, currentRest} from '@/views/projectEngineering/projectLibrary/list';
-import FileDialog from '@/views/projectEngineering/component/FileDialog';
+import FileDialog from '@/views/projectEngineering/projectLibrary/component/FileDialog';
 
 export default {
   dicts: ['sys_administrative_divisions', 'sys_investment_type', 'sys_project_phases',

--
Gitblit v1.8.0