From 711ba0adbcc4a0c5bc19cbc07778cc65de2a5dbf Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 21 三月 2025 15:56:45 +0800
Subject: [PATCH] 建设内容

---
 src/views/projectProcess/index.vue |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/views/projectProcess/index.vue b/src/views/projectProcess/index.vue
index 6383405..97f8681 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" />
@@ -202,7 +211,7 @@
           <dict-tag :options="dict.type.sys_project_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-
+      <el-table-column label="寤鸿鍐呭" align="center" prop="buildContent"/>
       <!-- 鎿嶄綔鍒� -->
       <el-table-column label="鎿嶄綔" width="140" align="center" >
         <template slot-scope="scope">
@@ -401,10 +410,11 @@
     openOpProcess(row) {
       this.nowProcessDefId = row.processDefId ? row.processDefId : '';
       this.nowProcessInsId = row.processInsId ? row.processInsId : '';
-      if (isNaN(parseFloat(row.id))) {
-        this.projectType = "ENGINEERING"
-      } else {
+      const numericPattern = /^\d+(\.\d+)?$/;
+      if (numericPattern.test(row.id)) {
         this.projectType = "PROJECT"
+      } else {
+        this.projectType = "ENGINEERING"
       }
       // // 闃叉锛歩d娌″彉涓嶈Е鍙戠洃鍚�
       // this.$refs.runProcess.setSelect(row.flowableProcessId);

--
Gitblit v1.8.0