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/planRecord.vue | 130 ++++++++++++++++++++++++++++++++-----------
1 files changed, 96 insertions(+), 34 deletions(-)
diff --git a/src/views/projectManage/plan/planRecord.vue b/src/views/projectManage/plan/planRecord.vue
index ad63175..cf6401e 100644
--- a/src/views/projectManage/plan/planRecord.vue
+++ b/src/views/projectManage/plan/planRecord.vue
@@ -9,7 +9,13 @@
<el-col :span="24" class="mb-4">
<div style="margin-bottom: 10px">
<span style="font-size: 20px; font-weight: bold;">鏈堝害璁″垝</span>
- <el-button type="primary" size="small" style="float: right" @click="handleAddMonthPlan" v-show="!projectInfoData.managerFlag">鏂板</el-button>
+ <el-button
+ type="text"
+ size="medium"
+ icon="el-icon-plus"
+ style="float: right"
+ @click="handleAddMonthPlan"
+ v-show="!projectInfoData.managerFlag">鏂板</el-button>
</div>
<el-table :data="monthRecords" border stripe style="width: 100%; margin-bottom: 20px">
<!-- 琛ㄥご -->
@@ -27,12 +33,27 @@
<el-table-column fixed="right" label="鎿嶄綔" align="center">
<template slot-scope="scope">
<div v-show="!projectInfoData.managerFlag">
- <el-button type="primary" size="small" :disabled="scope.row.reportStatus === 0" @click="handlePlanInfo(scope.row)">缂栬緫涓婃姤</el-button>
- <el-button type="danger" size="small" v-show="scope.row.reportStatus === 1" @click="handleDeletePlanRecord(scope.row.id)">鍒犻櫎</el-button>
- <el-button type="danger" size="small" v-show="scope.row.reportStatus === 0" @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button>
+ <el-button
+ type="text"
+ size="medium"
+ icon="el-icon-edit"
+ :disabled="scope.row.reportStatus === 0"
+ @click="handlePlanInfo(scope.row)">缂栬緫涓婃姤</el-button>
+ <el-button
+ type="text"
+ size="medium"
+ icon="el-icon-delete"
+ v-show="scope.row.reportStatus === 1"
+ @click="handleDeletePlanRecord(scope.row.id)">鍒犻櫎</el-button>
+ <el-button type="text" size="medium" v-show="scope.row.reportStatus === 0" @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button>
</div>
<div v-show="projectInfoData.managerFlag">
- <el-button type="primary" size="small" v-show="scope.row.reportStatus === 0" @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button>
+ <el-button
+ type="text"
+ size="medium"
+ icon="el-icon-view"
+ v-show="scope.row.reportStatus === 0"
+ @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button>
</div>
</template>
</el-table-column>
@@ -41,7 +62,13 @@
<el-col :span="24" class="mb-4" style="margin-top: 20px">
<div style="margin-bottom: 10px">
<span style="font-size: 20px; font-weight: bold;">瀛ｅ害璁″垝</span>
- <el-button type="primary" size="small" style="float: right" @click="handleAddSeasonPlan" v-show="!projectInfoData.managerFlag">鏂板</el-button>
+ <el-button
+ type="text"
+ size="medium"
+ icon="el-icon-plus"
+ style="float: right"
+ @click="handleAddSeasonPlan"
+ v-show="!projectInfoData.managerFlag">鏂板</el-button>
</div>
<el-table :data="seasonRecords" border stripe style="width: 100%; margin-bottom: 20px">
<!-- 琛ㄥご -->
@@ -59,12 +86,32 @@
<el-table-column fixed="right" label="鎿嶄綔" align="center">
<template slot-scope="scope">
<div v-show="!projectInfoData.managerFlag">
- <el-button type="primary" size="small" :disabled="scope.row.reportStatus === 0" @click="handlePlanInfo(scope.row)">缂栬緫涓婃姤</el-button>
- <el-button type="danger" size="small" v-show="scope.row.reportStatus === 1" @click="handleDeletePlanRecord(scope.row.id)">鍒犻櫎</el-button>
- <el-button type="danger" size="small" v-show="scope.row.reportStatus === 0" @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button>
+ <el-button
+ type="text"
+ size="medium"
+ icon="el-icon-edit"
+ :disabled="scope.row.reportStatus === 0"
+ @click="handlePlanInfo(scope.row)">缂栬緫涓婃姤</el-button>
+ <el-button
+ type="text"
+ size="medium"
+ icon="el-icon-delete"
+ v-show="scope.row.reportStatus === 1"
+ @click="handleDeletePlanRecord(scope.row.id)">鍒犻櫎</el-button>
+ <el-button
+ type="text"
+ size="medium"
+ icon="el-icon-view"
+ v-show="scope.row.reportStatus === 0"
+ @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button>
</div>
<div v-show="projectInfoData.managerFlag">
- <el-button type="primary" size="small" v-show="scope.row.reportStatus === 0" @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button>
+ <el-button
+ type="text"
+ size="medium"
+ icon="el-icon-view"
+ v-show="scope.row.reportStatus === 0"
+ @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button>
</div>
</template>
</el-table-column>
@@ -73,7 +120,13 @@
<el-col :span="24" class="mb-4" style="margin-top: 20px">
<div style="margin-bottom: 10px">
<span style="font-size: 20px; font-weight: bold;">骞村害璁″垝</span>
- <el-button type="primary" size="small" style="float: right" @click="handleAddYearPlan" v-show="!projectInfoData.managerFlag">鏂板</el-button>
+ <el-button
+ type="text"
+ size="medium"
+ icon="el-icon-plus"
+ style="float: right"
+ @click="handleAddYearPlan"
+ v-show="!projectInfoData.managerFlag">鏂板</el-button>
</div>
<el-table :data="yearRecords" border stripe style="width: 100%; margin-bottom: 20px">
<!-- 琛ㄥご -->
@@ -91,12 +144,32 @@
<el-table-column fixed="right" label="鎿嶄綔" align="center">
<template slot-scope="scope">
<div v-show="!projectInfoData.managerFlag">
- <el-button type="primary" size="small" :disabled="scope.row.reportStatus === 0" @click="handlePlanInfo(scope.row)">缂栬緫涓婃姤</el-button>
- <el-button type="danger" size="small" v-show="scope.row.reportStatus === 1" @click="handleDeletePlanRecord(scope.row.id)">鍒犻櫎</el-button>
- <el-button type="danger" size="small" v-show="scope.row.reportStatus === 0" @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button>
+ <el-button
+ type="text"
+ size="medium"
+ icon="el-icon-edit"
+ :disabled="scope.row.reportStatus === 0"
+ @click="handlePlanInfo(scope.row)">缂栬緫涓婃姤</el-button>
+ <el-button
+ type="text"
+ size="medium"
+ icon="el-icon-delete"
+ v-show="scope.row.reportStatus === 1"
+ @click="handleDeletePlanRecord(scope.row.id)">鍒犻櫎</el-button>
+ <el-button
+ type="text"
+ size="medium"
+ icon="el-icon-view"
+ v-show="scope.row.reportStatus === 0"
+ @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button>
</div>
<div v-show="projectInfoData.managerFlag">
- <el-button type="primary" size="small" v-show="scope.row.reportStatus === 0" @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button>
+ <el-button
+ type="text"
+ size="medium"
+ icon="el-icon-view"
+ v-show="scope.row.reportStatus === 0"
+ @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button>
</div>
</template>
</el-table-column>
@@ -113,7 +186,7 @@
import {addRecord, getPlanRecordList, deletePlanRecord} from "@/api/projectPlan/index";
export default {
- name: "PlanRecord",
+ // name: "PlanRecord",
data() {
return {
// 鎺ユ敹浼犻�掕繃鏉ョ殑椤圭洰璁″垝鏁版嵁
@@ -137,10 +210,7 @@
// 鑾峰彇浼犻�掕繃鏉ョ殑椤圭洰璁″垝璇︽儏
getProjectInfoData() {
// 浠庢煡璇㈠弬鏁颁腑鑾峰彇鏁版嵁
- this.projectInfoData.id = this.$route.query.id;
- this.projectInfoData.projectName = this.$route.query.projectName;
- this.projectInfoData.projectCode = this.$route.query.projectCode;
- this.projectInfoData.managerFlag = this.$route.query.managerFlag;
+ this.projectInfoData = JSON.parse(this.$route.query.data);
// 鑾峰彇椤圭洰璁″垝璁板綍鏁版嵁
this.search();
},
@@ -210,16 +280,12 @@
},
/** 淇敼椤圭洰璁″垝椤� */
handlePlanInfo(row) {
+ row.managerFlag = this.projectInfoData.managerFlag;
this.$router.push({
path: '/projectManage/planInfo',
query: {
- id: row.id,
- projectName: row.projectName,
- projectCode: row.projectCode,
- planTime: row.planTime,
- planTimeFlag: row.planTimeFlag,
- managerFlag: row.managerFlag,
- projectInfoData: this.projectInfoData
+ data: JSON.stringify(row),
+ projectInfoData: JSON.stringify(this.projectInfoData)
}
})
},
@@ -231,16 +297,12 @@
},
// 鏌ョ湅椤圭洰璁″垝椤�
handleCheckPlanInfo(row) {
+ row.managerFlag = this.projectInfoData.managerFlag;
this.$router.push({
path: '/projectManage/planInfoCheck',
query: {
- id: row.id,
- projectName: row.projectName,
- projectCode: row.projectCode,
- planTime: row.planTime,
- planTimeFlag: row.planTimeFlag,
- managerFlag: row.managerFlag,
- projectInfoData: this.projectInfoData
+ data: JSON.stringify(row),
+ projectInfoData: JSON.stringify(this.projectInfoData)
}
})
}
--
Gitblit v1.8.0