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/planInfo.vue | 54 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/src/views/projectManage/plan/planInfo.vue b/src/views/projectManage/plan/planInfo.vue
index 310c175..789eaf3 100644
--- a/src/views/projectManage/plan/planInfo.vue
+++ b/src/views/projectManage/plan/planInfo.vue
@@ -7,8 +7,13 @@
<el-card shadow="hover">
<el-row :gutter="20">
<el-col :span="24" class="mb-4">
- <el-button type="primary" size="small" @click="handlePlanRecord" style="float: right; margin-bottom: 10px; margin-left: 10px">杩斿洖</el-button>
- <el-button type="primary" size="small" @click="handleAdd" style="float: right; margin-bottom: 10px">鏂板</el-button>
+ <el-button
+ type="text"
+ size="medium"
+ icon="el-icon-plus"
+ @click="handleAdd"
+ style="float: right;
+ margin-bottom: 10px">鏂板</el-button>
<el-table :data="tableData" border stripe style="width: 100%; margin-bottom: 20px">
<el-table-column prop="index" label="搴忓彿" width="50" align="center">
<template #default="scope">
@@ -25,14 +30,14 @@
<el-date-picker v-model="scope.row.startTime"
type="date"
placeholder="閫夋嫨鏃ユ湡"
- size="small"
+ size="medium"
style="width: 130px"
value-format="yyyy-MM-dd HH:mm:ss"/>
</template>
</el-table-column>
<el-table-column prop="endTime" label="璁″垝瀹屾垚鏃堕棿" width="160" align="center">
<template #default="scope">
- <el-date-picker v-model="scope.row.endTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="small" style="width: 130px" value-format="yyyy-MM-dd HH:mm:ss"/>
+ <el-date-picker v-model="scope.row.endTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="medium" style="width: 130px" value-format="yyyy-MM-dd HH:mm:ss"/>
</template>
</el-table-column>
<el-table-column :label="planInfoData.planTimeFlag === 0 ? '鏈堝害' : planInfoData.planTimeFlag === 1 ? '瀛ｅ害' : '骞村害' " width="100" align="center">
@@ -42,9 +47,21 @@
</el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" align="center">
<template #default="scope">
- <el-button size="small" @click="handleSave(scope.$index)">淇濆瓨</el-button>
- <el-button size="small" type="danger" @click="handleReset(scope.$index)">閲嶇疆</el-button>
- <el-button size="small" type="danger" @click="handleDelete(scope.$index)">鍒犻櫎</el-button>
+ <el-button
+ size="medium"
+ type="text"
+ icon="el-icon-check"
+ @click="handleSave(scope.$index)">淇濆瓨</el-button>
+ <el-button
+ size="medium"
+ type="text"
+ icon="el-icon-refresh-left"
+ @click="handleReset(scope.$index)">閲嶇疆</el-button>
+ <el-button
+ size="medium"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.$index)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -62,8 +79,16 @@
</el-input>
</div>
<div style="display: flex; justify-content: center; align-items: center; margin-top: 20px">
- <el-button type="primary" size="small" @click="handleSubmit">涓婃姤</el-button>
- <el-button type="primary" size="small" @click="handleResetAll">閲嶇疆</el-button>
+ <el-button
+ type="text"
+ size="medium"
+ icon="el-icon-upload2"
+ @click="handleSubmit">涓婃姤</el-button>
+ <el-button
+ type="text"
+ size="medium"
+ icon="el-icon-refresh-left"
+ @click="handleResetAll">閲嶇疆</el-button>
</div>
</el-col>
</el-row>
@@ -112,13 +137,8 @@
// 鑾峰彇浼犻�掕繃鏉ョ殑椤圭洰璁″垝璇︽儏
getProjectInfoData() {
// 浠庢煡璇㈠弬鏁颁腑鑾峰彇鏁版嵁
- this.projectInfoData = this.$route.query.projectInfoData
- this.planInfoData.id = this.$route.query.id;
- this.planInfoData.projectName = this.$route.query.projectName;
- this.planInfoData.projectCode = this.$route.query.projectCode;
- this.planInfoData.planTime = this.$route.query.planTime;
- this.planInfoData.planTimeFlag = this.$route.query.planTimeFlag;
- this.planInfoData.managerFlag = this.$route.query.managerFlag;
+ this.projectInfoData = JSON.parse(this.$route.query.projectInfoData)
+ this.planInfoData = JSON.parse(this.$route.query.data)
this.search();
},
// 鑾峰彇椤圭洰璁″垝椤�
@@ -182,7 +202,7 @@
this.$router.push({
path: '/projectManage/planRecord',
query: {
- data: this.projectInfoData
+ data: JSON.stringify(this.projectInfoData)
}
})
}
--
Gitblit v1.8.0