From 5c929cfb5286a31a4e067cbc61e8774f4e7d42ae Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 06 五月 2025 11:25:41 +0800
Subject: [PATCH] 任务查看:任务名称undefined解决
---
src/views/projectProcess/index.vue | 223 ++++++++++++++++++++++++++++---------------------------
1 files changed, 113 insertions(+), 110 deletions(-)
diff --git a/src/views/projectProcess/index.vue b/src/views/projectProcess/index.vue
index 6383405..09617b5 100644
--- a/src/views/projectProcess/index.vue
+++ b/src/views/projectProcess/index.vue
@@ -44,111 +44,104 @@
<el-button icon="el-icon-search" size="small" @click="handleQuery">鏌ヨ</el-button>
<el-button icon="el-icon-refresh" size="small" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
- <el-popover :value="popoverValue" trigger="click" :width="500" placement="bottom">
- <span>绛涢�夋潯浠�</span>
- <el-form ref="moreQueryParamsRef" label-width="68px" label-position="right" :model="queryParams">
- <el-row>
- <el-col :span="12">
- <el-form-item label="椤圭洰绫诲瀷">
- <el-select v-model="queryParams.projectType" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery"
- size="small">
- <el-option v-for="item in dict.type.sys_project_type" :key="item.value" :label="item.label"
- :value="item.value"/>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="閲嶇偣鍒嗙被">
- <el-select v-model="queryParams.importanceType" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
- <el-option v-for="item in dict.type.sys_key_categories" :key="item.value" :label="item.label"
- :value="item.value"/>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="椤圭洰鏍囩">
- <el-select v-model="queryParams.tag" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
- <el-option v-for="item in dict.type.sys_project_tags" :key="item.value" :label="item.label"
- :value="item.value"/>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="椤圭洰鐘舵��">
- <el-select v-model="queryParams.projectStatus" :disabled="isProjectCategory" clearable @change="handleQuery"
- placeholder="璇烽�夋嫨" class="select-option">
- <el-option v-for="item in dict.type.sys_project_status" :key="item.value" :label="item.label"
- :value="item.value"/>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="椤圭洰鐮�">
- <el-select v-model="queryParams.coding" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
- <el-option v-for="item in dict.type.sys_project_code" :key="item.value" :label="item.label"
- :value="item.value"/>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鍏宠仈鐘舵��">
- <el-select v-model="queryParams.assignmentStatus" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
- <el-option v-for="item in dict.type.sys_association_status" :key="item.value" :label="item.label"
- :value="item.value"/>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="璧勯噾绫诲瀷">
- <el-select v-model="queryParams.investmentType" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
- <el-option v-for="item in dict.type.sys_funding_type" :key="item.value" :label="item.label"
- :value="item.value"/>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="椤圭洰闃舵">
- <el-select v-model="queryParams.projectPhase" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
- <el-option v-for="item in dict.type.sys_project_phases" :key="item.value" :label="item.label"
- :value="item.value"/>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="鎶曡祫绫诲埆">
- <el-select v-model="queryParams.investType" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
- <el-option v-for="item in dict.type.sys_investment_type" :key="item.value" :label="item.label"
- :value="item.value"/>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="琛屾斂鍖哄垝">
- <el-select v-model="queryParams.area" clearable placeholder="璇烽�夋嫨" class="select-option" @change="handleQuery">
- <el-option v-for="item in dict.type.sys_administrative_divisions" :key="item.value" :label="item.label"
- :value="item.value"/>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- <el-button style="margin-right: 16px; margin-top: 1px; color: #3369ff" slot="reference"
- size="small">
- 鏇村绛涙煡鏉′欢
- <span style="margin-left: 5px">
- <el-icon v-if="!popoverValue" class="el-icon-arrow-down"></el-icon>
- <el-icon v-else-if="popoverValue" class="el-icon-arrow-up"></el-icon>
- </span>
- </el-button>
- </el-popover>
+<!-- <el-popover :value="popoverValue" trigger="click" :width="500" placement="bottom">-->
+<!-- <span>绛涢�夋潯浠�</span>-->
+<!-- <el-form ref="moreQueryParamsRef" label-width="68px" label-position="right" :model="queryParams">-->
+<!-- <el-row>-->
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="椤圭洰绫诲瀷">-->
+<!-- <el-select v-model="queryParams.projectType" clearable placeholder="璇烽�夋嫨" class="select-option"-->
+<!-- @change="handleQuery"-->
+<!-- size="small">-->
+<!-- <el-option v-for="item in dict.type.sys_project_type" :key="item.value" :label="item.label"-->
+<!-- :value="item.value"/>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="閲嶇偣鍒嗙被">-->
+<!-- <el-select v-model="queryParams.importanceType" clearable placeholder="璇烽�夋嫨" class="select-option"-->
+<!-- @change="handleQuery">-->
+<!-- <el-option v-for="item in dict.type.sys_key_categories" :key="item.value" :label="item.label"-->
+<!-- :value="item.value"/>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+<!-- </el-row>-->
+<!-- <el-row>-->
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="椤圭洰鐘舵��">-->
+<!-- <el-select v-model="queryParams.projectStatus" :disabled="isProjectCategory" clearable-->
+<!-- @change="handleQuery"-->
+<!-- placeholder="璇烽�夋嫨" class="select-option">-->
+<!-- <el-option v-for="item in dict.type.sys_project_status" :key="item.value" :label="item.label"-->
+<!-- :value="item.value"/>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="椤圭洰鐮�">-->
+<!-- <el-select v-model="queryParams.coding" clearable placeholder="璇烽�夋嫨" class="select-option"-->
+<!-- @change="handleQuery">-->
+<!-- <el-option v-for="item in dict.type.sys_project_code" :key="item.value" :label="item.label"-->
+<!-- :value="item.value"/>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+<!-- </el-row>-->
+<!-- <el-row>-->
+<!-- </el-row>-->
+<!-- <el-row>-->
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="璧勯噾绫诲瀷">-->
+<!-- <el-select v-model="queryParams.fundType" clearable placeholder="璇烽�夋嫨" class="select-option"-->
+<!-- @change="handleQuery">-->
+<!-- <el-option v-for="item in dict.type.sys_funding_type" :key="item.value" :label="item.label"-->
+<!-- :value="item.value"/>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="椤圭洰闃舵">-->
+<!-- <el-select v-model="queryParams.projectPhase" clearable placeholder="璇烽�夋嫨" class="select-option"-->
+<!-- @change="handleQuery">-->
+<!-- <el-option v-for="item in dict.type.sys_project_phases" :key="item.value" :label="item.label"-->
+<!-- :value="item.value"/>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+<!-- </el-row>-->
+<!-- <el-row>-->
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="鎶曡祫绫诲埆">-->
+<!-- <el-select v-model="queryParams.investType" clearable placeholder="璇烽�夋嫨" class="select-option"-->
+<!-- @change="handleQuery">-->
+<!-- <el-option v-for="item in dict.type.sys_investment_type" :key="item.value" :label="item.label"-->
+<!-- :value="item.value"/>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="琛屾斂鍖哄垝">-->
+<!-- <el-select v-model="queryParams.area" clearable placeholder="璇烽�夋嫨" class="select-option"-->
+<!-- @change="handleQuery">-->
+<!-- <el-option v-for="item in dict.type.sys_administrative_divisions" :key="item.value"-->
+<!-- :label="item.label"-->
+<!-- :value="item.value"/>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+<!-- </el-row>-->
+<!-- </el-form>-->
+<!-- <el-button style="margin-right: 16px; margin-top: 1px; color: #3369ff" slot="reference"-->
+<!-- size="small">-->
+<!-- 鏇村绛涙煡鏉′欢-->
+<!-- <span style="margin-left: 5px">-->
+<!-- <el-icon v-if="!popoverValue" class="el-icon-arrow-down"></el-icon>-->
+<!-- <el-icon v-else-if="popoverValue" class="el-icon-arrow-up"></el-icon>-->
+<!-- </span>-->
+<!-- </el-button>-->
+<!-- </el-popover>-->
</div>
<div class="right-section">
<div>
@@ -190,10 +183,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 +204,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 +403,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