From e7cfe2a2c78e00f358c25170fd420745dedea52b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 26 十一月 2024 15:53:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectPlan/planRecord.vue | 63 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/src/views/project/plan/planRecord.vue b/src/views/projectPlan/planRecord.vue
similarity index 79%
rename from src/views/project/plan/planRecord.vue
rename to src/views/projectPlan/planRecord.vue
index 63e6f5e..a3ddfbe 100644
--- a/src/views/project/plan/planRecord.vue
+++ b/src/views/projectPlan/planRecord.vue
@@ -11,20 +11,20 @@
<el-button type="primary" size="small" style="float: right" @click="handleAddMonthPlan">鏂板</el-button>
<el-table :data="monthRecords" style="width: 100%">
<!-- 琛ㄥご -->
- <el-table-column prop="id" label="搴忓彿"></el-table-column>
- <el-table-column prop="projectName" label="椤圭洰鍚嶇О"></el-table-column>
- <el-table-column prop="projectCode" label="椤圭洰浠ｇ爜"></el-table-column>
- <el-table-column label="璁″垝鏈�">
+ <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 label="璁″垝鏈�" align="center">
<template slot-scope="scope">
<span>
{{ scope.row.planTime }}{{ scope.row.planTimeFlag === 0 ? '鏈堝害' : scope.row.planTimeFlag === 1 ? '瀛ｅ害' : '骞村害' }}
</span>
</template>
</el-table-column>
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿"></el-table-column>
- <el-table-column fixed="right" label="鎿嶄綔">
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" align="center"></el-table-column>
+ <el-table-column fixed="right" label="鎿嶄綔" align="center">
<template slot-scope="scope">
- <el-button type="primary" size="small" :disabled="scope.row.reportStatus === 0">缂栬緫涓婃姤</el-button>
+ <el-button type="primary" size="small" :disabled="scope.row.reportStatus === 0" @click="handlePlanInfo(scope.row)">缂栬緫涓婃姤</el-button>
<el-button type="danger" size="small">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -35,20 +35,20 @@
<el-button type="primary" size="small" style="float: right" @click="handleAddSeasonPlan">鏂板</el-button>
<el-table :data="seasonRecords" style="width: 100%">
<!-- 琛ㄥご -->
- <el-table-column prop="id" label="搴忓彿"></el-table-column>
- <el-table-column prop="projectName" label="椤圭洰鍚嶇О"></el-table-column>
- <el-table-column prop="projectCode" label="椤圭洰浠ｇ爜"></el-table-column>
- <el-table-column label="璁″垝鏈�">
+ <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 label="璁″垝鏈�" align="center">
<template slot-scope="scope">
<span>
{{ scope.row.planTime }}{{ scope.row.planTimeFlag === 0 ? '鏈堝害' : scope.row.planTimeFlag === 1 ? '瀛ｅ害' : '骞村害' }}
</span>
</template>
</el-table-column>
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿"></el-table-column>
- <el-table-column fixed="right" label="鎿嶄綔">
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" align="center"></el-table-column>
+ <el-table-column fixed="right" label="鎿嶄綔" align="center">
<template slot-scope="scope">
- <el-button type="primary" size="small" :disabled="scope.row.reportStatus === 0">缂栬緫涓婃姤</el-button>
+ <el-button type="primary" size="small" :disabled="scope.row.reportStatus === 0" @click="handlePlanInfo(scope.row)">缂栬緫涓婃姤</el-button>
<el-button type="danger" size="small">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -59,20 +59,20 @@
<el-button type="primary" size="small" style="float: right" @click="handleAddYearPlan">鏂板</el-button>
<el-table :data="yearRecords" style="width: 100%">
<!-- 琛ㄥご -->
- <el-table-column prop="id" label="搴忓彿"></el-table-column>
- <el-table-column prop="projectName" label="椤圭洰鍚嶇О"></el-table-column>
- <el-table-column prop="projectCode" label="椤圭洰浠ｇ爜"></el-table-column>
- <el-table-column label="璁″垝鏈�">
+ <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 label="璁″垝鏈�" align="center">
<template slot-scope="scope">
<span>
{{ scope.row.planTime }}{{ scope.row.planTimeFlag === 0 ? '鏈堝害' : scope.row.planTimeFlag === 1 ? '瀛ｅ害' : '骞村害' }}
</span>
</template>
</el-table-column>
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿"></el-table-column>
- <el-table-column fixed="right" label="鎿嶄綔">
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" align="center"></el-table-column>
+ <el-table-column fixed="right" label="鎿嶄綔" align="center">
<template slot-scope="scope">
- <el-button type="primary" size="small" :disabled="scope.row.reportStatus === 0">缂栬緫涓婃姤</el-button>
+ <el-button type="primary" size="small" :disabled="scope.row.reportStatus === 0" @click="handlePlanInfo(scope.row)">缂栬緫涓婃姤</el-button>
<el-button type="danger" size="small">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -86,13 +86,12 @@
</template>
<script>
-import {addRecord, getPlanRecordList} from "@/api/project/plan/index";
+import {addRecord, getPlanRecordList} from "@/api/projectPlan/index";
export default {
- // name: "planRecord",
+ name: "planRecord",
data() {
return {
- loading: true,
// 鎺ユ敹浼犻�掕繃鏉ョ殑椤圭洰璁″垝鏁版嵁
planInfoData: {},
// 鏈堝害璁″垝鏁版嵁
@@ -101,8 +100,6 @@
seasonRecords: [],
// 骞村害璁″垝鏁版嵁
yearRecords: [],
- // 鏂板璁″垝
-
}
},
methods: {
@@ -115,21 +112,17 @@
// 浠庢煡璇㈠弬鏁颁腑鑾峰彇鏁版嵁
if (this.$route.query.data) {
this.planInfoData = JSON.parse(this.$route.query.data);
- console.log(JSON.parse(this.$route.query.data))
this.getPlanRecordData(this.planInfoData.id);
}
},
// 鑾峰彇椤圭洰璁″垝璁板綍鏁版嵁
getPlanRecordData(id) {
- this.loading = true;
getPlanRecordList(id).then(res => {
this.monthRecords = res.data.monthRecords;
// 鑾峰彇瀛ｅ害璁″垝鏁版嵁
this.seasonRecords = res.data.seasonRecords;
// 鑾峰彇骞村害璁″垝鏁版嵁
this.yearRecords = res.data.yearRecords;
- console.log(this.monthRecords);
- this.loading = false;
})
},
// 鏂板鏈堝害璁″垝璁板綍
@@ -186,6 +179,16 @@
this.search();
});
},
+ /** 鏌ョ湅椤圭洰璁″垝椤� */
+ handlePlanInfo(row) {
+ this.$router.push({
+ path: '/projectPlan/planInfo',
+ query: {
+ data: JSON.stringify(row),
+ planInfoData: this.planInfoData
+ }
+ })
+ }
},
created() {
--
Gitblit v1.8.0