From 47ba40516a8c2c83d287171d5d79fc96ff42fd51 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 19 二月 2025 15:36:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectEngineering/projectLibrary/index.vue | 108 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 78 insertions(+), 30 deletions(-)
diff --git a/src/views/projectEngineering/projectLibrary/index.vue b/src/views/projectEngineering/projectLibrary/index.vue
index ef50cbe..5a355a4 100644
--- a/src/views/projectEngineering/projectLibrary/index.vue
+++ b/src/views/projectEngineering/projectLibrary/index.vue
@@ -198,7 +198,7 @@
@selection-change="handleSelectionChange"
height="100%"
sortable="custom"
- :show-overflow-tooltip="true">
+ >
<el-table-column type="selection" width="55" align="center"/>
<!-- 鍔ㄦ�佸垪 -->
<el-table-column
@@ -216,13 +216,17 @@
<template v-if="item.slotName === 'projectStatus'">
<dict-tag :options="dict.type.sys_project_status" :value="scope.row.projectStatus"/>
</template>
- <!-- projectColorCode鎻掓Ы -->
+ <!-- coding鎻掓Ы -->
<template v-if="item.slotName === 'coding'">
<dict-tag :options="dict.type.sys_project_code" :value="scope.row.coding"/>
</template>
<!-- projectType鎻掓Ы -->
<template v-if="item.slotName === 'projectType'">
<dict-tag :options="dict.type.sys_project_type" :value="scope.row.projectType"/>
+ </template>
+ <!-- constructionNature鎻掓Ы -->
+ <template v-if="item.slotName === 'constructionNature'">
+ <dict-tag :options="dict.type.construction_nature" :value="scope.row.constructionNature"/>
</template>
<!-- investType鎻掓Ы -->
<template v-if="item.slotName === 'investType'">
@@ -236,38 +240,60 @@
<template v-if="item.slotName === 'planStartTime'">
{{ scope.row.planStartTime ? scope.row.planStartTime.split('-')[0] + '骞�' : '' }}
</template>
+ <!-- usedStatus鎻掓Ы -->
+ <template v-if="item.slotName === 'usedStatus'">
+ <dict-tag :options="dict.type.sys_used_status" :value="scope.row.usedStatus"/>
+ </template>
</template>
<!-- 榛樿鏄剧ず -->
<span v-else>{{ scope.row[item.id] }}</span>
</template>
</el-table-column>
-
+ <el-table-column v-if="this.$route.query.projectCategory==6" label="瀹℃牳澶囨敞" width="140" align="center" prop="remark"/>
<!-- 鎿嶄綔鍒� -->
<el-table-column label="鎿嶄綔" width="140" align="center">
<template slot-scope="scope">
- <el-button
- size="medium"
- type="text"
- icon="el-icon-view"
- @click="handleDetail(scope.row)"
- >
- </el-button>
- <el-button
- v-if="isReserve"
- size="medium"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- >
- </el-button>
- <el-button
- v-if="isReserve"
- size="medium"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- >
- </el-button>
+ <el-tooltip class="item" effect="dark" content="瀹℃牳" placement="top">
+ <el-button
+ v-if="scope.row.auditRole && $route.query.projectCategory==='6' && scope.row.usedStatus === 1"
+ size="medium"
+ type="text"
+ icon="el-icon-circle-check"
+ @click="handleDetail(scope.row)"
+ >
+ </el-button>
+ </el-tooltip>
+ <el-tooltip class="item" effect="dark" content="璇︽儏" placement="top">
+ <el-button
+ size="medium"
+ type="text"
+ icon="el-icon-view"
+ @click="handleDetail(scope.row)"
+ >
+ </el-button>
+ </el-tooltip>
+ <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+ <el-button
+ v-if="isReserve"
+ v-hasRole="['user']"
+ size="medium"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ >
+ </el-button>
+ </el-tooltip>
+ <el-tooltip class="item" effect="dark" content="鍒犻櫎" placement="top">
+ <el-button
+ v-if="isReserve"
+ size="medium"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ >
+ </el-button>
+ </el-tooltip>
+
</template>
</el-table-column>
</el-table>
@@ -299,7 +325,7 @@
export default {
dicts: ['sys_administrative_divisions', 'sys_investment_type', 'sys_project_phases',
'sys_funding_type', 'sys_association_status', 'sys_project_status', 'sys_project_code',
- 'sys_project_tags', 'sys_key_categories', 'sys_project_type'],
+ 'sys_project_tags', 'sys_key_categories', 'sys_project_type','sys_used_status', 'construction_nature'],
name: "ProjectInfo",
components: {
FileDialog
@@ -350,7 +376,7 @@
projectType: '', // 椤圭洰绫诲瀷
importanceType: '', // 閲嶇偣鍒嗙被
projectStatus: '', // 椤圭洰鐘舵��
- projectColorCode: '', // 椤圭洰鐮�
+ coding: '', // 椤圭洰鐮�
investmentType: '', // 璧勯噾绫诲瀷
projectPhase: '', // 椤圭洰闃舵
investType: '', // 鎶曡祫绫诲埆
@@ -374,7 +400,7 @@
created() {
this.queryParams.importanceType = this.$route.query.importanceType;
const projectCategory = this.$route.query.projectCategory;
- if (!projectCategory || projectCategory === '1') {
+ if (!projectCategory || projectCategory === '1' || projectCategory === '6') {
this.isReserve = true;
}
if (projectCategory) {
@@ -384,6 +410,13 @@
item.index = index + 1;
item.key = index;
item.serialNumber = index + 1;
+ if(item.id ==='usedStatus' ){
+ if(projectCategory !== '6') {
+ item.visible = false
+ } else {
+ item.visible = true
+ }
+ }
return item;
});
this.columns = columns;
@@ -401,7 +434,8 @@
},
handleDetail(row) {
this.removeStore();
- this.$router.push({path: '/projectEngineering/project/ProjectDetails', query: {projectId: row.id,disabled: 'true' }});
+ const audit = this.$route.query.projectCategory==='6'? 1:0
+ this.$router.push({path: '/projectEngineering/project/ProjectDetails', query: {projectId: row.id,disabled: 'true',audit: audit }});
},
// 鏂板椤甸潰
add() {
@@ -423,12 +457,26 @@
item.index = index + 1;
item.key = index;
item.serialNumber = index + 1
+ if(item.id ==='usedStatus' ){
+ if(projectCategory !== '6') {
+ item.visible = false
+ } else {
+ item.visible = true
+ }
+ }
return item;
});
this.columns = currentRest.map((item, index) => {
item.index = index + 1;
item.key = index;
item.serialNumber = index + 1
+ if(item.id ==='usedStatus' ){
+ if(projectCategory !== '6') {
+ item.visible = false
+ } else {
+ item.visible = true
+ }
+ }
return item;
});
//寮哄埗table娓叉煋
--
Gitblit v1.8.0