From acf78f6ef785df7f5fa15d1ee0fc62c0bbbe74f6 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期五, 29 十一月 2024 02:37:42 +0800
Subject: [PATCH] 项目计划审批
---
src/views/projectManage/plan/planInfo.vue | 10 +-
src/views/projectManage/progress/progressRecord.vue | 2
src/views/projectManage/plan/index.vue | 62 +++-----------
src/api/projectPlan/index.js | 15 +++
src/views/projectManage/plan/planInfoCheck.vue | 96 +++++++++++++++--------
src/views/projectManage/progress/index.vue | 2
src/views/projectManage/plan/planRecord.vue | 44 +++++++---
7 files changed, 127 insertions(+), 104 deletions(-)
diff --git a/src/api/projectPlan/index.js b/src/api/projectPlan/index.js
index 7340072..43f804e 100644
--- a/src/api/projectPlan/index.js
+++ b/src/api/projectPlan/index.js
@@ -85,10 +85,19 @@
})
}
-// 鍥炲涓婄骇鎵瑰
-export function replyDepartmentApproval(data) {
+// 淇濆瓨瀹℃壒
+export function saveExamine(data) {
return request({
- url: '/api/project-plan-examine-record/replyDepartmentApproval',
+ url: '/api/project-plan-examine-record/saveExamine',
+ method: 'post',
+ data: data
+ })
+}
+
+// 鍥炲瀹℃壒
+export function replyExamine(data) {
+ return request({
+ url: '/api/project-plan-examine-record/replyExamine',
method: 'post',
data: data
})
diff --git a/src/views/projectManage/plan/index.vue b/src/views/projectManage/plan/index.vue
index 676cbd7..ac6e35f 100644
--- a/src/views/projectManage/plan/index.vue
+++ b/src/views/projectManage/plan/index.vue
@@ -189,12 +189,14 @@
</template>
<script>
-import { getList, getRecord, delRecord, addRecord, updateRecord } from "@/api/projectPlan/index";
+import {getList, getManagerFlag} from "@/api/projectPlan/index";
export default {
- name: "index",
+ name: "Index",
data() {
return {
+ // 涓荤鏍囪瘑
+ managerFlag: undefined,
// 閬僵灞�
loading: true,
// 閫変腑鏁扮粍
@@ -280,46 +282,6 @@
this.open = true;
this.title = "娣诲姞椤圭洰璁″垝璁板綍";
},
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.reset();
- const id = row.id || this.ids
- getRecord(id).then(response => {
- this.form = response.data;
- this.open = true;
- this.title = "淇敼椤圭洰璁″垝璁板綍";
- });
- },
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- if (this.form.id != null) {
- updateRecord(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- addRecord(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- }
- }
- });
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎椤圭洰璁″垝璁板綍缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return delRecord(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
- },
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
this.download('plan/record/export', {
@@ -328,12 +290,18 @@
},
/** 鏌ョ湅椤圭洰璁″垝璁板綍 */
handlePlanRecord(row) {
- this.$router.push({
- path: '/projectManage/planRecord',
- query: {
- data: row
- }
+ // 鑾峰緱涓荤鏍囧織
+ getManagerFlag(row.id).then(res => {
+ this.managerFlag = res.data;
+ row.managerFlag = this.managerFlag;
+ this.$router.push({
+ path: '/projectManage/planRecord',
+ query: {
+ data: row
+ }
+ })
})
+
}
}
};
diff --git a/src/views/projectManage/plan/planInfo.vue b/src/views/projectManage/plan/planInfo.vue
index e28e4aa..bf620a5 100644
--- a/src/views/projectManage/plan/planInfo.vue
+++ b/src/views/projectManage/plan/planInfo.vue
@@ -1,8 +1,8 @@
<template>
<div class="app-container">
<el-container>
- <el-header v-show="projectInfoData && projectInfoData.projectName" class="header-title">椤圭洰鍚嶇О锛歿{ projectInfoData.projectName }} {{ projectInfoData.planTimeFlag === 0 ? '(鏈堝害璁″垝)' : projectInfoData.planTimeFlag === 1 ? '(瀛ｅ害璁″垝)' : '(骞村害璁″垝)' }}</el-header>
- <h4 v-show="projectInfoData && projectInfoData.projectCode" style="text-align: center">椤圭洰浠ｇ爜锛歿{ projectInfoData.projectCode }}</h4>
+ <el-header class="header-title">椤圭洰鍚嶇О锛歿{ planInfoData.projectName }} ({{planInfoData.planTime}} {{ planInfoData.planTimeFlag === 0 ? '鏈堝害璁″垝' : planInfoData.planTimeFlag === 1 ? '瀛ｅ害璁″垝' : '骞村害璁″垝' }})</el-header>
+ <h4 style="text-align: center">椤圭洰浠ｇ爜锛歿{ planInfoData.projectCode }}</h4>
<el-main>
<el-card shadow="hover">
<el-row :gutter="20">
@@ -30,9 +30,9 @@
<el-date-picker v-model="scope.row.endTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="small" style="width: 130px" />
</template>
</el-table-column>
- <el-table-column :label="projectInfoData.planTimeFlag === 0 ? '鏈堝害' : projectInfoData.planTimeFlag === 1 ? '瀛ｅ害' : '骞村害' " width="100" align="center">
+ <el-table-column :label="planInfoData.planTimeFlag === 0 ? '鏈堝害' : planInfoData.planTimeFlag === 1 ? '瀛ｅ害' : '骞村害' " width="100" align="center">
<template #default="scope">
- <span>{{ projectInfoData.planTime }}{{ projectInfoData.planTimeFlag === 0 ? '鏈堝害' : projectInfoData.planTimeFlag === 1 ? '瀛ｅ害' : '骞村害' }}</span>
+ <span>{{ planInfoData.planTime }}{{ planInfoData.planTimeFlag === 0 ? '鏈堝害' : planInfoData.planTimeFlag === 1 ? '瀛ｅ害' : '骞村害' }}</span>
</template>
</el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" align="center">
@@ -72,7 +72,7 @@
import { getPlanInfoData, addPlanInfo, savePlanInfo } from "@/api/projectPlan/index";
export default {
- name: "planInfo",
+ name: "PlanInfo",
data() {
return {
loading: true,
diff --git a/src/views/projectManage/plan/planInfoCheck.vue b/src/views/projectManage/plan/planInfoCheck.vue
index 516be05..0a3ed72 100644
--- a/src/views/projectManage/plan/planInfoCheck.vue
+++ b/src/views/projectManage/plan/planInfoCheck.vue
@@ -1,8 +1,8 @@
<template>
<div class="app-container">
<el-container>
- <el-header v-show="planRecordData && planRecordData.projectName" class="header-title">椤圭洰鍚嶇О锛歿{ planRecordData.projectName }} {{ planRecordData.planTimeFlag === 0 ? '(鏈堝害璁″垝)' : planRecordData.planTimeFlag === 1 ? '(瀛ｅ害璁″垝)' : '(骞村害璁″垝)' }}</el-header>
- <h4 v-show="planRecordData && planRecordData.projectCode" style="text-align: center">椤圭洰浠ｇ爜锛歿{ planRecordData.projectCode }}</h4>
+ <el-header class="header-title">椤圭洰鍚嶇О锛歿{ planInfoData.projectName }} ({{ planInfoData.planTime}} {{ planInfoData.planTimeFlag === 0 ? '鏈堝害璁″垝' : planInfoData.planTimeFlag === 1 ? '瀛ｅ害璁″垝' : '骞村害璁″垝' }})</el-header>
+ <h4 style="text-align: center">椤圭洰浠ｇ爜锛歿{ planInfoData.projectCode }}</h4>
<el-main>
<el-card shadow="hover">
<el-row :gutter="20">
@@ -20,27 +20,29 @@
<el-input type="textarea" v-model="scope.row.title" placeholder="璇疯緭鍏�" rows="3" readonly />
</template>
</el-table-column>
- <el-table-column prop="startTime" label="璁″垝寮�濮嬫椂闂�" width="160" align="center">
+ <el-table-column prop="startTime" label="璁″垝寮�濮嬫椂闂�" width="160" align="center" >
<template #default="scope">
- <el-date-picker v-model="scope.row.startTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="small" style="width: 130px"/>
+ <el-date-picker v-model="scope.row.startTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="small" style="width: 130px" :readonly="projectInfoData.managerFlag"/>
</template>
</el-table-column>
- <el-table-column prop="endTime" label="璁″垝瀹屾垚鏃堕棿" width="160" align="center">
+ <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"/>
+ <el-date-picker v-model="scope.row.endTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="small" style="width: 130px" :readonly="projectInfoData.managerFlag" />
</template>
</el-table-column>
- <el-table-column :label="planRecordData.planTimeFlag === 0 ? '鏈堝害' : planRecordData.planTimeFlag === 1 ? '瀛ｅ害' : '骞村害' " width="100" align="center">
+ <el-table-column :label="planInfoData.planTimeFlag === 0 ? '鏈堝害' : planInfoData.planTimeFlag === 1 ? '瀛ｅ害' : '骞村害' " align="center">
<template #default="scope">
- <span>{{ planRecordData.planTime }}{{ planRecordData.planTimeFlag === 0 ? '鏈堝害' : planRecordData.planTimeFlag === 1 ? '瀛ｅ害' : '骞村害' }}</span>
+ <span>{{ planInfoData.planTime }}{{ planInfoData.planTimeFlag === 0 ? '鏈堝害' : planInfoData.planTimeFlag === 1 ? '瀛ｅ害' : '骞村害' }}</span>
</template>
</el-table-column>
- <el-table-column fixed="right" label="鎿嶄綔" align="center">
- <template #default="scope">
- <el-button size="small" @click="handleDelay(scope.$index)">寤舵湡</el-button>
- <el-button size="small" type="danger" @click="handleReset(scope.$index)">閲嶇疆</el-button>
- </template>
- </el-table-column>
+ <div v-if="!projectInfoData.managerFlag">
+ <el-table-column fixed="right" label="鎿嶄綔" align="center">
+ <template #default="scope">
+ <el-button size="small" @click="handleDelay(scope.$index)">寤舵湡</el-button>
+ <el-button size="small" type="danger" @click="handleReset(scope.$index)">閲嶇疆</el-button>
+ </template>
+ </el-table-column>
+ </div>
</el-table>
<div style="display: flex; align-items: center;">
<h1 style="margin: 0;">
@@ -68,32 +70,55 @@
</template>
</el-table-column>
<el-table-column prop="title" label="浜嬮」鍚嶇О" width="200" align="center" />
- <el-table-column prop="departmentExamine" label="涓婄骇瀹℃牳" width="100" align="center">
- <template #default="scope">
+ <el-table-column prop="departmentExamine" label="涓婄骇瀹℃牳" width="130" align="center">
+ <template #default="scope" v-if="!projectInfoData.managerFlag">
{{ scope.row.departmentExamine === 0 ? '鍚屾剰' : scope.row.departmentExamine === 1 ? '椹冲洖' : '鏈鏍�' }}
</template>
+ <template v-if="projectInfoData.managerFlag" #default="scope">
+ <el-select v-model="scope.row.departmentExamine" placeholder="璇烽�夋嫨" size="small" clearable>
+ <el-option label="鍚屾剰" :value="0"></el-option>
+ <el-option label="椹冲洖" :value="1"></el-option>
+ </el-select>
+ </template>
</el-table-column>
- <el-table-column prop="departmentApproval" label="鎵瑰鍐呭" width="160" align="center" />
+ <el-table-column prop="departmentApproval" label="鎵瑰鍐呭" width="160" align="center">
+ <template v-if="projectInfoData.managerFlag" #default="scope">
+ <el-input type="textarea" v-model="scope.row.departmentApproval" placeholder="璇疯緭鍏�" rows="3" />
+ </template>
+ </el-table-column>
<el-table-column prop="departmentApprovalReply" label="鎵瑰鍥炲" width="160" align="center">
- <template #default="scope">
+ <template #default="scope" v-if="!projectInfoData.managerFlag">
<el-input type="textarea" v-model="scope.row.departmentApprovalReply" placeholder="璇疯緭鍏�" rows="3" />
</template>
</el-table-column>
- <el-table-column prop="manageExamine" label="涓荤閮ㄩ棬瀹℃牳" width="100" align="center" >
- <template #default="scope">
+ <el-table-column prop="manageExamine" label="涓荤閮ㄩ棬瀹℃牳" width="130" align="center" >
+ <template #default="scope" v-if="!projectInfoData.managerFlag">
{{ scope.row.manageExamine === 0 ? '鍚屾剰' : scope.row.manageExamine === 1 ? '椹冲洖' : '鏈鏍�' }}
</template>
+ <template v-if="projectInfoData.managerFlag" #default="scope">
+ <el-select v-model="scope.row.manageExamine" placeholder="璇烽�夋嫨" size="small" clearable>
+ <el-option label="鍚屾剰" :value="0"></el-option>
+ <el-option label="椹冲洖" :value="1"></el-option>
+ </el-select>
+ </template>
</el-table-column>
- <el-table-column prop="manageApproval" label="鎵瑰鍐呭" width="160" align="center" />
+ <el-table-column prop="manageApproval" label="鎵瑰鍐呭" width="160" align="center">
+ <template v-if="projectInfoData.managerFlag" #default="scope">
+ <el-input type="textarea" v-model="scope.row.manageApproval" placeholder="璇疯緭鍏�" rows="3" />
+ </template>
+ </el-table-column>
<el-table-column prop="manageApprovalReply" label="鎵瑰鍥炲" width="160" align="center">
- <template #default="scope">
+ <template #default="scope" v-if="!projectInfoData.managerFlag">
<el-input type="textarea" v-model="scope.row.manageApprovalReply" placeholder="璇疯緭鍏�" rows="3" />
</template>
</el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" align="center">
- <template #default="scope">
+ <template #default="scope" v-if="!projectInfoData.managerFlag">
<el-button size="small" @click="handleReply(scope.$index)">鍥炲</el-button>
<el-button size="small" type="danger" @click="handleReset(scope.$index)">閲嶇疆</el-button>
+ </template>
+ <template v-if="projectInfoData.managerFlag" #default="scope">
+ <el-button size="small" @click="handleSave(scope.$index)">淇濆瓨</el-button>
</template>
</el-table-column>
</el-table>
@@ -135,15 +160,15 @@
</template>
<script>
-import { getPlanInfoData, delayPlanInfo, getDepartmentApproval, getPlanLog, replyDepartmentApproval } from "@/api/projectPlan/index";
+import { getPlanInfoData, delayPlanInfo, getDepartmentApproval, getPlanLog, replyExamine, saveExamine } from "@/api/projectPlan/index";
export default {
- name: "planInfoCheck",
+ name: "PlanInfoCheck",
data() {
return {
loading: true,
// 鎺ユ敹浼犻�掕繃鏉ョ殑椤圭洰璁″垝鏁版嵁
- planRecordData: {},
+ planInfoData: {},
projectInfoData: {},
// 璁″垝椤规暟鎹�
tableData: [
@@ -171,14 +196,14 @@
methods: {
// 椤甸潰鍔犺浇
search() {
- this.getPlanInfoData(this.planRecordData.id); // 鑾峰彇椤圭洰璁″垝椤�
- this.getDepartmentApproval(this.planRecordData.id); // 鑾峰彇涓婄骇鎵瑰
- this.getPlanLog(this.planRecordData.id); // 鑾峰彇璁″垝鏃ュ織
+ this.getPlanInfoData(this.planInfoData.id); // 鑾峰彇椤圭洰璁″垝椤�
+ this.getDepartmentApproval(this.planInfoData.id); // 鑾峰彇涓婄骇鎵瑰
+ this.getPlanLog(this.planInfoData.id); // 鑾峰彇璁″垝鏃ュ織
},
// 鑾峰彇浼犻�掕繃鏉ョ殑椤圭洰璁″垝璇︽儏
getPlanRecordData() {
// 浠庢煡璇㈠弬鏁颁腑鑾峰彇鏁版嵁
- this.planRecordData = this.$route.query.data
+ this.planInfoData = this.$route.query.data
this.projectInfoData = this.$route.query.projectInfoData
this.search();
},
@@ -206,14 +231,19 @@
this.departmentApprovalData = response.data;
});
},
- // 鍥炲
+ // 鍥炲瀹℃壒
handleReply(index) {
- replyDepartmentApproval(this.departmentApprovalData[index]).then(response => {
+ replyExamine(this.departmentApprovalData[index]).then(response => {
this.$message.success('鍥炲鎴愬姛');
this.search()
});
},
-
+ // 淇濆瓨瀹℃壒
+ handleSave(index) {
+ saveExamine(this.departmentApprovalData[index]).then(response => {
+ this.$message.success('淇濆瓨鎴愬姛');
+ });
+ },
// 鑾峰彇璁″垝鏃ュ織
getPlanLog(projectPlanRecordId) {
getPlanLog(projectPlanRecordId).then(response => {
diff --git a/src/views/projectManage/plan/planRecord.vue b/src/views/projectManage/plan/planRecord.vue
index a28215b..dc9e845 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) {
diff --git a/src/views/projectManage/progress/index.vue b/src/views/projectManage/progress/index.vue
index dbc8f48..514064a 100644
--- a/src/views/projectManage/progress/index.vue
+++ b/src/views/projectManage/progress/index.vue
@@ -192,7 +192,7 @@
import { getList, getRecord, delRecord, addRecord, updateRecord } from "@/api/projectPlan/index";
export default {
- name: "index",
+ name: "Index",
data() {
return {
// 閬僵灞�
diff --git a/src/views/projectManage/progress/progressRecord.vue b/src/views/projectManage/progress/progressRecord.vue
index 693cb58..566a7e9 100644
--- a/src/views/projectManage/progress/progressRecord.vue
+++ b/src/views/projectManage/progress/progressRecord.vue
@@ -180,7 +180,7 @@
import progressRecord from "./progressRecord.vue";
export default {
- name: "progressRecord",
+ name: "ProgressRecord",
computed: {
progressRecord() {
return progressRecord
--
Gitblit v1.8.0