From 4c261f55500e6c877ce1c414d9688e35845bfcd2 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期二, 26 十一月 2024 20:33:36 +0800
Subject: [PATCH] bug
---
src/views/projectPlan/planInfoCheck.vue | 84 ++++++++++++++++++++++++++++++++++++------
src/views/projectPlan/planInfo.vue | 2
src/views/projectPlan/planRecord.vue | 18 ++++++---
3 files changed, 85 insertions(+), 19 deletions(-)
diff --git a/src/views/projectPlan/planInfo.vue b/src/views/projectPlan/planInfo.vue
index f99ec7c..7e0b7cc 100644
--- a/src/views/projectPlan/planInfo.vue
+++ b/src/views/projectPlan/planInfo.vue
@@ -132,7 +132,7 @@
// 涓婃姤鏁版嵁
handleSubmit() {
// 閬嶅巻tableData锛岃幏寰楀�间笉涓虹┖瀛楃涓茬殑琛�
- const validList = this.tableData.filter(item => item.title !== '' && item.startTime !== '' && item.endTime !== '');
+ const validList = this.tableData.filter(item => item.title !== '' || item.startTime !== '' || item.endTime !== '');
this.addData = {
projectPlanRecordId: this.planRecordData.id,
actualInvest: this.actualInvest,
diff --git a/src/views/projectPlan/planInfoCheck.vue b/src/views/projectPlan/planInfoCheck.vue
index 4121112..a3476cf 100644
--- a/src/views/projectPlan/planInfoCheck.vue
+++ b/src/views/projectPlan/planInfoCheck.vue
@@ -7,6 +7,7 @@
<el-card shadow="hover">
<el-row :gutter="20">
<el-col :span="24" class="mb-4">
+ <!--椤圭洰璁″垝椤�-->
<el-table :data="tableData" border stripe style="width: 100%; margin-bottom: 20px">
<el-table-column prop="index" label="搴忓彿" width="50" align="center">
<template #default="scope">
@@ -20,12 +21,12 @@
</el-table-column>
<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" disabled/>
</template>
</el-table-column>
<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" disabled/>
</template>
</el-table-column>
<el-table-column :label="planRecordData.planTimeFlag === 0 ? '鏈堝害' : planRecordData.planTimeFlag === 1 ? '瀛ｅ害' : '骞村害' " width="100" align="center">
@@ -37,7 +38,6 @@
<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>
- <el-button size="small" type="danger" @click="handleDelete(scope.$index)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -54,6 +54,60 @@
@input="handleInput">
</el-input>
</div>
+
+ <!--涓婄骇鎵瑰-->
+ <div style="margin-bottom: 10px; margin-top: 40px;">
+ <span style="font-size: 20px; font-weight: bold;">涓婄骇鎵瑰</span>
+ </div>
+ <el-table :data="tableData" border stripe style="width: 100%; margin-bottom: 20px">
+ <el-table-column prop="index" label="搴忓彿" width="50" align="center">
+ <template #default="scope">
+ {{ scope.$index + 1 }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="taskName" label="浜嬮」鍚嶇О" width="200" align="center" />
+ <el-table-column prop="startTime" label="涓婄骇瀹℃牳" width="100" align="center" />
+ <el-table-column prop="startTime" label="鎵瑰鍐呭" width="160" align="center" />
+ <el-table-column prop="endTime" label="鎵瑰鍥炲" width="160" align="center">
+ <template #default="scope">
+ <el-input type="textarea" v-model="scope.row.title" placeholder="璇疯緭鍏�" rows="3" />
+ </template>
+ </el-table-column>
+ <el-table-column prop="startTime" label="涓荤閮ㄩ棬瀹℃牳" width="100" align="center" />
+ <el-table-column prop="startTime" label="鎵瑰鍐呭" width="160" align="center" />
+ <el-table-column prop="endTime" label="鎵瑰鍥炲" width="160" align="center">
+ <template #default="scope">
+ <el-input type="textarea" v-model="scope.row.title" placeholder="璇疯緭鍏�" rows="3" />
+ </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>
+ </el-table>
+
+
+ <!--璁″垝鏃ュ織-->
+ <div style="margin-bottom: 10px; margin-top: 40px;">
+ <span style="font-size: 20px; font-weight: bold;">璁″垝鏃ュ織</span>
+ </div>
+ <el-table :data="tableData" border stripe style="width: 100%; margin-bottom: 20px">
+ <el-table-column prop="index" label="搴忓彿" width="50" align="center">
+ <template #default="scope">
+ {{ scope.$index + 1 }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="taskName" label="浜嬮」鍚嶇О" width="200" align="center" />
+ <el-table-column prop="startTime" label="涓婄骇瀹℃牳" width="100" align="center" />
+ <el-table-column prop="startTime" label="鎵瑰鍐呭" width="160" align="center" />
+ <el-table-column prop="endTime" label="鎵瑰鍥炲" width="160" align="center" />
+ <el-table-column prop="startTime" label="涓荤閮ㄩ棬瀹℃牳" width="100" align="center" />
+ <el-table-column prop="startTime" label="鎵瑰鍐呭" width="160" align="center" />
+ <el-table-column prop="endTime" label="鎵瑰鍥炲" width="160" align="center" />
+ <el-table-column fixed="right" label="鏃堕棿" align="center" />
+ </el-table>
</el-col>
</el-row>
</el-card>
@@ -86,7 +140,7 @@
addData: {
projectPlanRecordId: '',
actualInvest: '',
- addList:[]
+ addList: []
}
}
},
@@ -94,7 +148,9 @@
methods: {
// 椤甸潰鍔犺浇
search() {
- this.getPlanInfoData(this.planRecordData.id);
+ this.getPlanInfoData(this.planRecordData.id); // 鑾峰彇椤圭洰璁″垝椤�
+ this.getDepartmentApproval(this.planRecordData.id); // 鑾峰彇涓婄骇鎵瑰
+ //this.getPlanLog(); // 鑾峰彇璁″垝鏃ュ織
},
// 鑾峰彇浼犻�掕繃鏉ョ殑椤圭洰璁″垝璇︽儏
getPlanRecordData() {
@@ -109,17 +165,21 @@
getPlanInfoData(id) {
getPlanInfoData(id).then(response => {
this.actualInvest = response.data.actualInvest;
- if (response.data.list.length === 0){
- this.tableData = [{ title: '', startTime: '', endTime: '' }];
- }else {
+ if (response.data.list.length === 0) {
+ this.tableData = [{title: '', startTime: '', endTime: ''}];
+ } else {
this.tableData = response.data.list;
}
});
},
- // 鍒犻櫎涓�琛屾暟鎹�
- handleDelete(index) {
- this.tableData.splice(index, 1);
+ // 鑾峰彇涓婄骇鎵瑰
+ getDepartmentApproval(projectPlanRecordId) {
+ getExamineRecord(projectPlanRecordId).then(response => {
+ console.log(response.data)
+ });
},
+ // 鑾峰彇璁″垝鏃ュ織
+
// 閲嶇疆褰撳墠琛屾暟鎹�
handleReset(index) {
this.tableData[index].title = '';
@@ -134,7 +194,7 @@
data: JSON.stringify(planInfoData)
}
})
- }
+ },
},
created() {
this.getPlanRecordData();
diff --git a/src/views/projectPlan/planRecord.vue b/src/views/projectPlan/planRecord.vue
index 3f4c1da..9ec2764 100644
--- a/src/views/projectPlan/planRecord.vue
+++ b/src/views/projectPlan/planRecord.vue
@@ -7,8 +7,10 @@
<el-card shadow="hover">
<el-row :gutter="20">
<el-col :span="24" class="mb-4">
- <span>鏈堝害璁″垝</span>
- <el-button type="primary" size="small" style="float: right" @click="handleAddMonthPlan">鏂板</el-button>
+ <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>
+ </div>
<el-table :data="monthRecords" style="width: 100%">
<!-- 琛ㄥご -->
<el-table-column prop="id" label="搴忓彿" align="center"></el-table-column>
@@ -32,8 +34,10 @@
</el-table>
</el-col>
<el-col :span="24" class="mb-4" style="margin-top: 20px">
- <span>瀛ｅ害璁″垝</span>
- <el-button type="primary" size="small" style="float: right" @click="handleAddSeasonPlan">鏂板</el-button>
+ <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>
+ </div>
<el-table :data="seasonRecords" style="width: 100%">
<!-- 琛ㄥご -->
<el-table-column prop="id" label="搴忓彿" align="center"></el-table-column>
@@ -57,8 +61,10 @@
</el-table>
</el-col>
<el-col :span="24" class="mb-4" style="margin-top: 20px">
- <span>骞村害璁″垝</span>
- <el-button type="primary" size="small" style="float: right" @click="handleAddYearPlan">鏂板</el-button>
+ <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>
+ </div>
<el-table :data="yearRecords" style="width: 100%">
<!-- 琛ㄥご -->
<el-table-column prop="id" label="搴忓彿" align="center"></el-table-column>
--
Gitblit v1.8.0