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 | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/views/projectEngineering/projectLibrary/index.vue b/src/views/projectEngineering/projectLibrary/index.vue
index fbbe70d..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',
@@ -371,6 +367,10 @@
this.getList();
},
methods: {
+ // 鏂板椤甸潰
+ add() {
+ this.$router.push({ path: '/projectEngineering/project/projectDetails' });
+ },
// 閲嶇疆鎺掑簭鐨勬柟娉�
handleResetSort() {
this.defaultColumns = currentRest.map((item, index) => {
@@ -385,6 +385,8 @@
item.serialNumber = index + 1
return item;
});
+ //寮哄埗table娓叉煋
+ this.tableKey = this.tableKey +1;
},
// 鏇存柊鍒楃殑鏂规硶
handleUpdateColumns(row) {
--
Gitblit v1.8.0