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/plan/index.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/views/projectManage/plan/index.vue b/src/views/projectManage/plan/index.vue
index 16a8ffc..2ab1a9f 100644
--- a/src/views/projectManage/plan/index.vue
+++ b/src/views/projectManage/plan/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" />
@@ -107,6 +107,11 @@
scope.row.investType === 'abroad_investment' ? '澧冨鎶曡祫' :
'鏈煡绫诲瀷'
}}
+ </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">
@@ -240,10 +245,7 @@
this.$router.push({
path: '/projectManage/planRecord',
query: {
- id: row.id,
- projectName: row.projectName,
- projectCode: row.projectCode,
- managerFlag: row.managerFlag
+ data: JSON.stringify(row)
}
})
})
--
Gitblit v1.8.0