From c78889e71d16d26c03ff59746db47c6d4d2b98e0 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 03 三月 2025 20:41:25 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
src/views/projectProcess/index.vue | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/views/projectProcess/index.vue b/src/views/projectProcess/index.vue
index 218df77..84fc791 100644
--- a/src/views/projectProcess/index.vue
+++ b/src/views/projectProcess/index.vue
@@ -190,10 +190,19 @@
default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
:show-overflow-tooltip="true">
- <el-table-column label="椤圭洰鍚嶇О" prop="projectName" />
+ <el-table-column label="椤圭洰鍚嶇О" min-width="250" :show-overflow-tooltip="true" prop="projectName" />
<el-table-column label="椤圭洰鎺ㄨ繘绫诲瀷" align="center" prop="projectType">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_project_type" :value="scope.row.projectType"/>
+ </template>
+ </el-table-column>
+ <el-table-column label="涓荤閮ㄩ棬" align="center" prop="competentDepartmentName">
+ </el-table-column>
+ <el-table-column label="涓氫富鍗曚綅" align="center" prop="projectOwnerUnitName">
+ </el-table-column>
+ <el-table-column label="骞翠唤" align="center" prop="year">
+ <template slot-scope="scope">
+ {{ scope.row.year ? scope.row.year + '骞�' : '' }}
</template>
</el-table-column>
<el-table-column label="鎶曡祫棰�(涓�)" align="center" prop="investmentAmount" />
@@ -403,9 +412,9 @@
this.nowProcessInsId = row.processInsId ? row.processInsId : '';
const numericPattern = /^\d+(\.\d+)?$/;
if (numericPattern.test(row.id)) {
- this.projectType = "ENGINEERING"
- } else {
this.projectType = "PROJECT"
+ } else {
+ this.projectType = "ENGINEERING"
}
// // 闃叉锛歩d娌″彉涓嶈Е鍙戠洃鍚�
// this.$refs.runProcess.setSelect(row.flowableProcessId);
--
Gitblit v1.8.0