From 0417817fd8c7b5b79efd721da77f70217cda0201 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 28 十一月 2024 01:33:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectManage/plan/planRecord.vue | 59 +++++++++++++++++++++++++++++------------------------------
1 files changed, 29 insertions(+), 30 deletions(-)
diff --git a/src/views/projectManage/plan/planRecord.vue b/src/views/projectManage/plan/planRecord.vue
index cdbe15a..f2022b1 100644
--- a/src/views/projectManage/plan/planRecord.vue
+++ b/src/views/projectManage/plan/planRecord.vue
@@ -1,8 +1,8 @@
<template>
<div class="app-container">
<el-container>
- <el-header v-show="planInfoData && planInfoData.projectName" class="header-title">椤圭洰鍚嶇О锛歿{ planInfoData.projectName }}</el-header>
- <h4 v-show="planInfoData && planInfoData.projectCode" style="text-align: center">椤圭洰浠ｇ爜锛歿{ planInfoData.projectCode }}</h4>
+ <el-header v-show="planRecordData && planRecordData.projectName" class="header-title">椤圭洰鍚嶇О锛歿{ planRecordData.projectName }}</el-header>
+ <h4 v-show="planRecordData && planRecordData.projectCode" style="text-align: center">椤圭洰浠ｇ爜锛歿{ planRecordData.projectCode }}</h4>
<el-main>
<el-card shadow="hover">
<el-row :gutter="20">
@@ -11,11 +11,11 @@
<span style="font-size: 20px; font-weight: bold;">鏈堝害璁″垝</span>
<el-button type="primary" size="small" style="float: right" @click="handleAddMonthPlan">鏂板</el-button>
</div>
- <el-table :data="monthRecords" style="width: 100%">
+ <el-table :data="monthRecords" border stripe style="width: 100%; margin-bottom: 20px">
<!-- 琛ㄥご -->
- <el-table-column prop="id" label="搴忓彿" align="center"></el-table-column>
- <el-table-column prop="projectName" label="椤圭洰鍚嶇О" align="center"></el-table-column>
- <el-table-column prop="projectCode" label="椤圭洰浠ｇ爜" align="center"></el-table-column>
+ <el-table-column prop="id" label="搴忓彿" align="center" width="50"/>
+ <el-table-column prop="projectName" label="椤圭洰鍚嶇О" align="center" />
+ <el-table-column prop="projectCode" label="椤圭洰浠ｇ爜" align="center" />
<el-table-column label="璁″垝鏈�" align="center">
<template slot-scope="scope">
<span>
@@ -23,7 +23,7 @@
</span>
</template>
</el-table-column>
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" align="center"></el-table-column>
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" align="center" />
<el-table-column fixed="right" label="鎿嶄綔" align="center">
<template slot-scope="scope">
<el-button type="primary" size="small" :disabled="scope.row.reportStatus === 0" @click="handlePlanInfo(scope.row)">缂栬緫涓婃姤</el-button>
@@ -38,11 +38,11 @@
<span style="font-size: 20px; font-weight: bold;">瀛ｅ害璁″垝</span>
<el-button type="primary" size="small" style="float: right" @click="handleAddSeasonPlan">鏂板</el-button>
</div>
- <el-table :data="seasonRecords" style="width: 100%">
+ <el-table :data="seasonRecords" border stripe style="width: 100%; margin-bottom: 20px">
<!-- 琛ㄥご -->
- <el-table-column prop="id" label="搴忓彿" align="center"></el-table-column>
- <el-table-column prop="projectName" label="椤圭洰鍚嶇О" align="center"></el-table-column>
- <el-table-column prop="projectCode" label="椤圭洰浠ｇ爜" align="center"></el-table-column>
+ <el-table-column prop="id" label="搴忓彿" align="center" width="50" />
+ <el-table-column prop="projectName" label="椤圭洰鍚嶇О" align="center" />
+ <el-table-column prop="projectCode" label="椤圭洰浠ｇ爜" align="center" />
<el-table-column label="璁″垝鏈�" align="center">
<template slot-scope="scope">
<span>
@@ -50,7 +50,7 @@
</span>
</template>
</el-table-column>
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" align="center"></el-table-column>
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" align="center" />
<el-table-column fixed="right" label="鎿嶄綔" align="center">
<template slot-scope="scope">
<el-button type="primary" size="small" :disabled="scope.row.reportStatus === 0" @click="handlePlanInfo(scope.row)">缂栬緫涓婃姤</el-button>
@@ -65,11 +65,11 @@
<span style="font-size: 20px; font-weight: bold;">骞村害璁″垝</span>
<el-button type="primary" size="small" style="float: right" @click="handleAddYearPlan">鏂板</el-button>
</div>
- <el-table :data="yearRecords" style="width: 100%">
+ <el-table :data="yearRecords" border stripe style="width: 100%; margin-bottom: 20px">
<!-- 琛ㄥご -->
- <el-table-column prop="id" label="搴忓彿" align="center"></el-table-column>
- <el-table-column prop="projectName" label="椤圭洰鍚嶇О" align="center"></el-table-column>
- <el-table-column prop="projectCode" label="椤圭洰浠ｇ爜" align="center"></el-table-column>
+ <el-table-column prop="id" label="搴忓彿" align="center" width="50" />
+ <el-table-column prop="projectName" label="椤圭洰鍚嶇О" align="center" />
+ <el-table-column prop="projectCode" label="椤圭洰浠ｇ爜" align="center" />
<el-table-column label="璁″垝鏈�" align="center">
<template slot-scope="scope">
<span>
@@ -77,7 +77,7 @@
</span>
</template>
</el-table-column>
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" align="center"></el-table-column>
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" align="center" />
<el-table-column fixed="right" label="鎿嶄綔" align="center">
<template slot-scope="scope">
<el-button type="primary" size="small" :disabled="scope.row.reportStatus === 0" @click="handlePlanInfo(scope.row)">缂栬緫涓婃姤</el-button>
@@ -102,7 +102,7 @@
data() {
return {
// 鎺ユ敹浼犻�掕繃鏉ョ殑椤圭洰璁″垝鏁版嵁
- planInfoData: {},
+ planRecordData: {},
// 鏈堝害璁″垝鏁版嵁
monthRecords: [],
// 瀛ｅ害璁″垝鏁版嵁
@@ -114,15 +114,13 @@
methods: {
// 椤甸潰鍔犺浇
search() {
- this.getPlanRecordData(this.planInfoData.id);
+ this.getPlanRecordData(this.planRecordData.id);
},
// 鑾峰彇浼犻�掕繃鏉ョ殑椤圭洰璁″垝璇︽儏
getPlanInfoData() {
// 浠庢煡璇㈠弬鏁颁腑鑾峰彇鏁版嵁
- if (this.$route.query.data) {
- this.planInfoData = JSON.parse(this.$route.query.data);
- this.getPlanRecordData(this.planInfoData.id);
- }
+ this.planRecordData = this.$route.query.data
+ this.getPlanRecordData(this.planRecordData.id);
},
// 鑾峰彇椤圭洰璁″垝璁板綍鏁版嵁
getPlanRecordData(id) {
@@ -138,7 +136,7 @@
handleAddMonthPlan() {
let planRecordData = {
id: undefined,
- projectInfoId: this.planInfoData.id,
+ projectInfoId: this.planRecordData.id,
planTimeFlag: 0
}
// 鍒ゆ柇鏈堝害璁″垝鏄惁涓虹┖
@@ -156,7 +154,7 @@
handleAddSeasonPlan() {
let planRecordData = {
id: undefined,
- projectInfoId: this.planInfoData.id,
+ projectInfoId: this.planRecordData.id,
planTimeFlag: 1
}
// 鍒ゆ柇瀛ｅ害璁″垝鏄惁涓虹┖
@@ -174,7 +172,7 @@
handleAddYearPlan() {
let planRecordData = {
id: undefined,
- projectInfoId: this.planInfoData.id,
+ projectInfoId: this.planRecordData.id,
planTimeFlag: 2
}
// 鍒ゆ柇骞村害璁″垝鏄惁涓虹┖
@@ -191,10 +189,10 @@
/** 淇敼椤圭洰璁″垝椤� */
handlePlanInfo(row) {
this.$router.push({
- name: 'PlanInfo',
+ path: '/projectManage/planInfo',
query: {
- data: JSON.stringify(row),
- planInfoData: this.planInfoData
+ data: row,
+ planRecordData: this.planRecordData
}
})
},
@@ -209,7 +207,8 @@
this.$router.push({
path: '/projectManage/planInfoCheck',
query: {
- data: JSON.stringify(row),
+ data: row,
+ planRecordData: this.planRecordData
}
})
}
--
Gitblit v1.8.0