From 6ae0fcef149ddbe614746023a58a3885b3ac4bde Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 25 三月 2025 11:31:04 +0800
Subject: [PATCH] Merge branch 'dev'
---
src/views/projectManage/progress/index.vue | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/views/projectManage/progress/index.vue b/src/views/projectManage/progress/index.vue
index b077bc5..35ffa83 100644
--- a/src/views/projectManage/progress/index.vue
+++ b/src/views/projectManage/progress/index.vue
@@ -74,9 +74,9 @@
{{ scope.row.reportStatus === 0 ? '宸蹭笂鎶�' : '鏈笂鎶�' }}
</template>
</el-table-column>
- <el-table-column label="椤圭洰鐮�" align="center" prop="projectColorCode">
+ <el-table-column label="椤圭洰鐮�" align="center" prop="coding">
<template slot-scope="scope">
- <el-tag type="success" v-if="scope.row.projectColorCode === 'green'">缁�</el-tag>
+ <el-tag type="success" v-if="scope.row.coding === 'green'">缁�</el-tag>
</template>
</el-table-column>
<el-table-column label="椤圭洰浠ｇ爜" align="center" prop="projectCode" />
@@ -109,6 +109,11 @@
}}
</template>
</el-table-column>
+ <el-table-column label="寮傚父闂" align="center" prop="exception" >
+ <template slot-scope="scope">
+ {{ scope.row.exception === 0 ? '璁″垝瓒呮湡' : scope.row.exception === 1 ? '杩涘害瓒呮湡' : '' }}
+ </template>
+ </el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
--
Gitblit v1.8.0