From be935300089c97ea7477edd6e888a43ab244c44f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 10 十二月 2024 09:35:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectManage/plan/planRecord.vue | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/src/views/projectManage/plan/planRecord.vue b/src/views/projectManage/plan/planRecord.vue
index a28215b..ed81999 100644
--- a/src/views/projectManage/plan/planRecord.vue
+++ b/src/views/projectManage/plan/planRecord.vue
@@ -9,7 +9,7 @@
<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">鏂板</el-button>
+ <el-button type="primary" size="small" style="float: right" @click="handleAddMonthPlan" v-show="!projectInfoData.managerFlag">鏂板</el-button>
</div>
<el-table :data="monthRecords" border stripe style="width: 100%; margin-bottom: 20px">
<!-- 琛ㄥご -->
@@ -26,9 +26,14 @@
<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>
- <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>
+ <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>
+ </div>
+ <div v-show="projectInfoData.managerFlag">
+ <el-button type="primary" size="small" v-show="scope.row.reportStatus === 0" @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button>
+ </div>
</template>
</el-table-column>
</el-table>
@@ -36,7 +41,7 @@
<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">鏂板</el-button>
+ <el-button type="primary" size="small" style="float: right" @click="handleAddSeasonPlan" v-show="!projectInfoData.managerFlag">鏂板</el-button>
</div>
<el-table :data="seasonRecords" border stripe style="width: 100%; margin-bottom: 20px">
<!-- 琛ㄥご -->
@@ -53,9 +58,14 @@
<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>
- <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>
+ <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>
+ </div>
+ <div v-show="projectInfoData.managerFlag">
+ <el-button type="primary" size="small" v-show="scope.row.reportStatus === 0" @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button>
+ </div>
</template>
</el-table-column>
</el-table>
@@ -63,7 +73,7 @@
<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">鏂板</el-button>
+ <el-button type="primary" size="small" style="float: right" @click="handleAddYearPlan" v-show="!projectInfoData.managerFlag">鏂板</el-button>
</div>
<el-table :data="yearRecords" border stripe style="width: 100%; margin-bottom: 20px">
<!-- 琛ㄥご -->
@@ -80,9 +90,14 @@
<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>
- <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>
+ <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>
+ </div>
+ <div v-show="projectInfoData.managerFlag">
+ <el-button type="primary" size="small" v-show="scope.row.reportStatus === 0" @click="handleCheckPlanInfo(scope.row)">鏌ョ湅</el-button>
+ </div>
</template>
</el-table-column>
</el-table>
@@ -98,7 +113,7 @@
import {addRecord, getPlanRecordList, deletePlanRecord} from "@/api/projectPlan/index";
export default {
- name: "planRecord",
+ name: "PlanRecord",
data() {
return {
// 鎺ユ敹浼犻�掕繃鏉ョ殑椤圭洰璁″垝鏁版嵁
@@ -115,12 +130,13 @@
// 椤甸潰鍔犺浇
search() {
this.getPlanRecordData(this.projectInfoData.id);
+ console.log(this.projectInfoData);
},
// 鑾峰彇浼犻�掕繃鏉ョ殑椤圭洰璁″垝璇︽儏
getProjectInfoData() {
// 浠庢煡璇㈠弬鏁颁腑鑾峰彇鏁版嵁
this.projectInfoData = this.$route.query.data
- this.getPlanRecordData(this.projectInfoData.id);
+ this.search();
},
// 鑾峰彇椤圭洰璁″垝璁板綍鏁版嵁
getPlanRecordData(id) {
@@ -204,7 +220,6 @@
},
// 鏌ョ湅椤圭洰璁″垝椤�
handleCheckPlanInfo(row) {
- console.log(this.projectInfoData);
this.$router.push({
path: '/projectManage/planInfoCheck',
query: {
--
Gitblit v1.8.0