From 0417817fd8c7b5b79efd721da77f70217cda0201 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 28 十一月 2024 01:33:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectManage/plan/planInfo.vue | 19
src/views/projectManage/progress/progressRecord.vue | 277 +++++++++++++++++++++
src/views/projectManage/plan/index.vue | 2
src/views/projectManage/plan/planInfoCheck.vue | 15
src/api/projectManage/progress/index.js | 54 ++++
src/views/projectManage/progress/index.vue | 340 ++++++++++++++++++++++++++
src/views/projectManage/plan/planRecord.vue | 59 ++--
7 files changed, 717 insertions(+), 49 deletions(-)
diff --git a/src/api/projectManage/progress/index.js b/src/api/projectManage/progress/index.js
new file mode 100644
index 0000000..e5c2eda
--- /dev/null
+++ b/src/api/projectManage/progress/index.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 鏌ヨ椤圭洰璁″垝璁板綍鍒楄〃
+export function getList(query) {
+ return request({
+ url: '/api/plan/page',
+ method: 'get',
+ params: query
+ })
+}
+
+// 鏌ヨ璁″垝璁板綍鍒楄〃
+export function getPlanRecordList(id) {
+ return request({
+ url: '/api/project-plan-record/' + id,
+ method: 'post'
+ })
+}
+
+// 鏌ヨ椤圭洰璁″垝璁板綍璇︾粏
+export function getRecord(id) {
+ return request({
+ url: '/plan/record/' + id,
+ method: 'get'
+ })
+}
+
+// 鑾峰彇椤圭洰杩涘害璁″垝椤�
+export function getProgressInfoList(id) {
+ return request({
+ url: '/api/progress-plan/' + id,
+ method: 'get'
+ })
+}
+
+// 鑾峰彇杩涘害涓婃姤鍐呭
+export function getProgressReport(id) {
+ return request({
+ url: '/api/project-plan-progress-report/' + id,
+ method: 'get'
+ })
+}
+
+// 鎻愪氦涓婃姤鍐呭
+export function recordSubmit(data) {
+ return request({
+ url: '/api/project-plan-progress-report',
+ method: 'post',
+ data: data
+ })
+}
+
+
+
diff --git a/src/views/projectManage/plan/index.vue b/src/views/projectManage/plan/index.vue
index 7d2d5f5..676cbd7 100644
--- a/src/views/projectManage/plan/index.vue
+++ b/src/views/projectManage/plan/index.vue
@@ -331,7 +331,7 @@
this.$router.push({
path: '/projectManage/planRecord',
query: {
- data: JSON.stringify(row)
+ data: row
}
})
}
diff --git a/src/views/projectManage/plan/planInfo.vue b/src/views/projectManage/plan/planInfo.vue
index 3fd438b..9608965 100644
--- a/src/views/projectManage/plan/planInfo.vue
+++ b/src/views/projectManage/plan/planInfo.vue
@@ -7,6 +7,7 @@
<el-card shadow="hover">
<el-row :gutter="20">
<el-col :span="24" class="mb-4">
+ <el-button type="primary" size="small" @click="handlePlanRecord" style="float: right; margin-bottom: 10px; margin-left: 10px">杩斿洖</el-button>
<el-button type="primary" size="small" @click="handleAdd" style="float: right; margin-bottom: 10px">鏂板</el-button>
<el-table :data="tableData" border stripe style="width: 100%; margin-bottom: 20px">
<el-table-column prop="index" label="搴忓彿" width="50" align="center">
@@ -99,15 +100,13 @@
methods: {
// 椤甸潰鍔犺浇
search() {
- this.getPlanInfoData(this.planRecordData.id);
+ this.getPlanInfoData(this.planInfoData.id);
},
// 鑾峰彇浼犻�掕繃鏉ョ殑椤圭洰璁″垝璇︽儏
getPlanRecordData() {
// 浠庢煡璇㈠弬鏁颁腑鑾峰彇鏁版嵁
- if (this.$route.query.data) {
- this.planRecordData = JSON.parse(this.$route.query.data)
- }
- this.planInfoData = this.$route.query.planInfoData
+ this.planRecordData = this.$route.query.planRecordData
+ this.planInfoData = this.$route.query.data
this.search();
},
// 鑾峰彇椤圭洰璁″垝椤�
@@ -134,12 +133,12 @@
// 閬嶅巻tableData锛岃幏寰楀�间笉涓虹┖瀛楃涓茬殑琛�
const validList = this.tableData.filter(item => item.title !== '' || item.startTime !== '' || item.endTime !== '');
this.addData = {
- projectPlanRecordId: this.planRecordData.id,
+ projectPlanRecordId: this.planInfoData.id,
actualInvest: this.actualInvest,
addList: validList
}
addPlanInfo(this.addData).then(response => {
- this.handlePlanRecord(this.planInfoData)
+ this.handlePlanRecord()
})
},
// 閲嶇疆褰撳墠琛屾暟鎹�
@@ -167,11 +166,11 @@
});
},
/** 杩斿洖椤圭洰璁″垝璁板綍 */
- handlePlanRecord(planInfoData) {
+ handlePlanRecord() {
this.$router.push({
- name: '/projectManage/planRecord',
+ path: '/projectManage/planRecord',
query: {
- data: JSON.stringify(planInfoData)
+ data: this.planRecordData
}
})
}
diff --git a/src/views/projectManage/plan/planInfoCheck.vue b/src/views/projectManage/plan/planInfoCheck.vue
index 30c2174..ae85cde 100644
--- a/src/views/projectManage/plan/planInfoCheck.vue
+++ b/src/views/projectManage/plan/planInfoCheck.vue
@@ -7,6 +7,7 @@
<el-card shadow="hover">
<el-row :gutter="20">
<el-col :span="24" class="mb-4">
+ <el-button type="primary" size="small" @click="handlePlanRecord" style="float: right; margin-bottom: 10px;">杩斿洖</el-button>
<!--椤圭洰璁″垝椤�-->
<el-table :data="tableData" border stripe style="width: 100%; margin-bottom: 20px">
<el-table-column prop="index" label="搴忓彿" width="50" align="center">
@@ -176,9 +177,7 @@
// 鑾峰彇浼犻�掕繃鏉ョ殑椤圭洰璁″垝璇︽儏
getPlanRecordData() {
// 浠庢煡璇㈠弬鏁颁腑鑾峰彇鏁版嵁
- if (this.$route.query.data) {
- this.planRecordData = JSON.parse(this.$route.query.data)
- }
+ this.planRecordData = this.$route.query.data
this.planInfoData = this.$route.query.planInfoData
this.search();
},
@@ -226,15 +225,15 @@
this.tableData[index].startTime = '';
this.tableData[index].endTime = '';
},
- /** 杩斿洖椤圭洰璁″垝璁板綍椤甸潰 */
- handlePlanRecord(planInfoData) {
+ /** 杩斿洖椤圭洰璁″垝璁板綍 */
+ handlePlanRecord() {
this.$router.push({
- name: '/projectManage/planRecord',
+ path: '/projectManage/planRecord',
query: {
- data: JSON.stringify(planInfoData)
+ data: this.planRecordData
}
})
- },
+ }
},
created() {
this.getPlanRecordData();
diff --git a/src/views/projectManage/plan/planRecord.vue b/src/views/projectManage/plan/planRecord.vue
index cdbe15a..f2022b1 100644
--- a/src/views/projectManage/plan/planRecord.vue
+++ b/src/views/projectManage/plan/planRecord.vue
@@ -1,8 +1,8 @@
<template>
<div class="app-container">
<el-container>
- <el-header v-show="planInfoData && planInfoData.projectName" class="header-title">椤圭洰鍚嶇О锛歿{ planInfoData.projectName }}</el-header>
- <h4 v-show="planInfoData && planInfoData.projectCode" style="text-align: center">椤圭洰浠ｇ爜锛歿{ planInfoData.projectCode }}</h4>
+ <el-header v-show="planRecordData && planRecordData.projectName" class="header-title">椤圭洰鍚嶇О锛歿{ planRecordData.projectName }}</el-header>
+ <h4 v-show="planRecordData && planRecordData.projectCode" style="text-align: center">椤圭洰浠ｇ爜锛歿{ planRecordData.projectCode }}</h4>
<el-main>
<el-card shadow="hover">
<el-row :gutter="20">
@@ -11,11 +11,11 @@
<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 :data="monthRecords" border stripe style="width: 100%; margin-bottom: 20px">
<!-- 琛ㄥご -->
- <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 prop="id" label="搴忓彿" align="center" width="50"/>
+ <el-table-column prop="projectName" label="椤圭洰鍚嶇О" align="center" />
+ <el-table-column prop="projectCode" label="椤圭洰浠ｇ爜" align="center" />
<el-table-column label="璁″垝鏈�" align="center">
<template slot-scope="scope">
<span>
@@ -23,7 +23,7 @@
</span>
</template>
</el-table-column>
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" align="center"></el-table-column>
+ <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>
@@ -38,11 +38,11 @@
<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 :data="seasonRecords" border stripe style="width: 100%; margin-bottom: 20px">
<!-- 琛ㄥご -->
- <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 prop="id" label="搴忓彿" align="center" width="50" />
+ <el-table-column prop="projectName" label="椤圭洰鍚嶇О" align="center" />
+ <el-table-column prop="projectCode" label="椤圭洰浠ｇ爜" align="center" />
<el-table-column label="璁″垝鏈�" align="center">
<template slot-scope="scope">
<span>
@@ -50,7 +50,7 @@
</span>
</template>
</el-table-column>
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" align="center"></el-table-column>
+ <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>
@@ -65,11 +65,11 @@
<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 :data="yearRecords" border stripe style="width: 100%; margin-bottom: 20px">
<!-- 琛ㄥご -->
- <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 prop="id" label="搴忓彿" align="center" width="50" />
+ <el-table-column prop="projectName" label="椤圭洰鍚嶇О" align="center" />
+ <el-table-column prop="projectCode" label="椤圭洰浠ｇ爜" align="center" />
<el-table-column label="璁″垝鏈�" align="center">
<template slot-scope="scope">
<span>
@@ -77,7 +77,7 @@
</span>
</template>
</el-table-column>
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" align="center"></el-table-column>
+ <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>
@@ -102,7 +102,7 @@
data() {
return {
// 鎺ユ敹浼犻�掕繃鏉ョ殑椤圭洰璁″垝鏁版嵁
- planInfoData: {},
+ planRecordData: {},
// 鏈堝害璁″垝鏁版嵁
monthRecords: [],
// 瀛ｅ害璁″垝鏁版嵁
@@ -114,15 +114,13 @@
methods: {
// 椤甸潰鍔犺浇
search() {
- this.getPlanRecordData(this.planInfoData.id);
+ this.getPlanRecordData(this.planRecordData.id);
},
// 鑾峰彇浼犻�掕繃鏉ョ殑椤圭洰璁″垝璇︽儏
getPlanInfoData() {
// 浠庢煡璇㈠弬鏁颁腑鑾峰彇鏁版嵁
- if (this.$route.query.data) {
- this.planInfoData = JSON.parse(this.$route.query.data);
- this.getPlanRecordData(this.planInfoData.id);
- }
+ this.planRecordData = this.$route.query.data
+ this.getPlanRecordData(this.planRecordData.id);
},
// 鑾峰彇椤圭洰璁″垝璁板綍鏁版嵁
getPlanRecordData(id) {
@@ -138,7 +136,7 @@
handleAddMonthPlan() {
let planRecordData = {
id: undefined,
- projectInfoId: this.planInfoData.id,
+ projectInfoId: this.planRecordData.id,
planTimeFlag: 0
}
// 鍒ゆ柇鏈堝害璁″垝鏄惁涓虹┖
@@ -156,7 +154,7 @@
handleAddSeasonPlan() {
let planRecordData = {
id: undefined,
- projectInfoId: this.planInfoData.id,
+ projectInfoId: this.planRecordData.id,
planTimeFlag: 1
}
// 鍒ゆ柇瀛ｅ害璁″垝鏄惁涓虹┖
@@ -174,7 +172,7 @@
handleAddYearPlan() {
let planRecordData = {
id: undefined,
- projectInfoId: this.planInfoData.id,
+ projectInfoId: this.planRecordData.id,
planTimeFlag: 2
}
// 鍒ゆ柇骞村害璁″垝鏄惁涓虹┖
@@ -191,10 +189,10 @@
/** 淇敼椤圭洰璁″垝椤� */
handlePlanInfo(row) {
this.$router.push({
- name: 'PlanInfo',
+ path: '/projectManage/planInfo',
query: {
- data: JSON.stringify(row),
- planInfoData: this.planInfoData
+ data: row,
+ planRecordData: this.planRecordData
}
})
},
@@ -209,7 +207,8 @@
this.$router.push({
path: '/projectManage/planInfoCheck',
query: {
- data: JSON.stringify(row),
+ data: row,
+ planRecordData: this.planRecordData
}
})
}
diff --git a/src/views/projectManage/progress/index.vue b/src/views/projectManage/progress/index.vue
new file mode 100644
index 0000000..dbc8f48
--- /dev/null
+++ b/src/views/projectManage/progress/index.vue
@@ -0,0 +1,340 @@
+<template>
+ <div class="app-container">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form-item label="椤圭洰鍚嶇О" prop="projectName">
+ <el-input
+ v-model="queryParams.projectName"
+ placeholder="鏀寔妯＄硦鏌ヨ"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="椤圭洰浠ｇ爜" prop="projectCode">
+ <el-input
+ v-model="queryParams.projectCode"
+ placeholder="鏀寔妯＄硦鏌ヨ"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="涓婃姤鐘舵��" prop="reportStatus">
+ <el-select v-model="queryParams.reportStatus" @change="handleQuery" placeholder="璇烽�夋嫨鐘舵��" clearable>
+ <el-option label="宸蹭笂鎶�" value="0"></el-option>
+ <el-option label="鏈笂鎶�" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="瀹℃壒鐘舵��" prop="reportStatus">
+ <el-select placeholder="璇烽�夋嫨鐘舵��" clearable>
+ <el-option label="宸插鎵�" value="0"></el-option>
+ <el-option label="鏈鎵�" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="椤圭洰骞撮檺" prop="reportStatus">
+ <el-select placeholder="涓嬫媺閫夋嫨" clearable>
+ <el-option label="2024" value="2024"></el-option>
+ <el-option label="2025" value="2025"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="椤圭洰鏈堝害" prop="reportStatus">
+ <el-select placeholder="涓嬫媺閫夋嫨" clearable>
+ <el-option label="1鏈堝害" value="1"></el-option>
+ <el-option label="2鏈堝害" value="2"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="椤圭洰瀛ｅ害" prop="reportStatus">
+ <el-select placeholder="涓嬫媺閫夋嫨" clearable>
+ <el-option label="1瀛ｅ害" value="1"></el-option>
+ <el-option label="2瀛ｅ害" value="2"></el-option>
+ <el-option label="3瀛ｅ害" value="3"></el-option>
+ <el-option label="4瀛ｅ害" value="4"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
+
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAdd"
+ >鏂板</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleQuery"
+ >鏌ヨ</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleReset"
+ >閲嶇疆</el-button>
+ </el-col>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ </el-row>
+
+ <el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column label="ID" align="center" prop="id" />
+ <el-table-column label="椤圭洰鍚嶇О" align="center" prop="projectName" />
+ <el-table-column label="涓婃姤鐘舵��" align="center" prop="reportStatus" >
+ <template slot-scope="scope">
+ {{ scope.row.reportStatus === 0 ? '宸蹭笂鎶�' : '鏈笂鎶�' }}
+ </template>
+ </el-table-column>
+ <el-table-column label="椤圭洰鐮�" align="center" prop="" />
+ <el-table-column label="椤圭洰浠ｇ爜" align="center" prop="projectCode" />
+ <el-table-column label="椤圭洰绫诲瀷" align="center" prop="projectType" >
+ <template slot-scope="scope">
+ {{
+ scope.row.projectType === 0 ? '鎴垮眿寤虹瓚' :
+ scope.row.projectType === 1 ? '鍩庡競鍩虹璁炬柦' :
+ scope.row.projectType === 2 ? '浜ら�氳繍杈�' :
+ scope.row.projectType === 3 ? '姘村埄' :
+ scope.row.projectType === 4 ? '鑳芥簮' :
+ scope.row.projectType === 5 ? '闈炵叅鐭垮北' :
+ scope.row.projectType === 6 ? '鍏朵粬' : '鏈煡'
+ }}
+ </template>
+ </el-table-column>
+ <el-table-column label="椤圭洰闃舵" align="center" prop="projectPhase" >
+ <template slot-scope="scope">
+ {{
+ scope.row.projectPhase === 0 ? '鍌ㄥ瑙勫垝闃舵' :
+ scope.row.projectPhase === 1 ? '椤圭洰鍓嶆湡闃舵' :
+ scope.row.projectPhase === 2 ? '瀹炴柦闃舵' :
+ scope.row.projectPhase === 3 ? '绔ｅ伐鎶曠敤闃舵' :
+ '鏈煡'
+ }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鏈堝害" align="center" prop="monthStatus" >
+ <template slot-scope="scope">
+ {{ scope.row.monthStatus === 0 ? '宸蹭笂鎶�' : '鏈笂鎶�' }}
+ </template>
+ </el-table-column>
+ <el-table-column label="瀛ｅ害" align="center" prop="seasonStatus" >
+ <template slot-scope="scope">
+ {{ scope.row.seasonStatus === 0 ? '宸蹭笂鎶�' : '鏈笂鎶�' }}
+ </template>
+ </el-table-column>
+ <el-table-column label="骞村害" align="center" prop="yearStatus" >
+ <template slot-scope="scope">
+ {{ scope.row.yearStatus === 0 ? '宸蹭笂鎶�' : '鏈笂鎶�' }}
+ </template>
+ </el-table-column>
+ <el-table-column label="椤圭洰鐘舵��" align="center" prop="projectStatus" >
+ <template slot-scope="scope">
+ {{
+ scope.row.projectStatus === 0 ? '鏈紑宸�' :
+ scope.row.projectStatus === 1 ? '宸插紑宸�' :
+ scope.row.projectStatus === 2 ? '宸茬宸�' :
+ scope.row.projectStatus === 3 ? '鏆傚仠' :
+ '鏈煡鐘舵��'
+ }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鎶曡祫绫诲埆" align="center" prop="investType" >
+ <template slot-scope="scope">
+ {{
+ scope.row.investType === 0 ? '浼佷笟鎶曡祫' :
+ scope.row.investType === 1 ? '鏀垮簻鎶曡祫' :
+ scope.row.investType === 2 ? '澶栧晢鎶曡祫' :
+ scope.row.investType === 3 ? '澧冨鎶曡祫' :
+ '鏈煡绫诲瀷'
+ }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handlePlanRecord(scope.row)"
+ >鏌ョ湅</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ >淇敼</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ >鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getList"
+ />
+ </div>
+</template>
+
+<script>
+import { getList, getRecord, delRecord, addRecord, updateRecord } from "@/api/projectPlan/index";
+
+export default {
+ name: "index",
+ data() {
+ return {
+ // 閬僵灞�
+ loading: true,
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ // 鎬绘潯鏁�
+ total: 0,
+ // 椤圭洰璁″垝璁板綍琛ㄦ牸鏁版嵁
+ recordList: [],
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ },
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+ }
+ };
+ },
+ created() {
+ this.getList();
+ },
+ methods: {
+ /** 鏌ヨ椤圭洰璁″垝璁板綍鍒楄〃 */
+ getList() {
+ this.loading = true;
+ getList(this.queryParams).then(response => {
+ this.recordList = response.data;
+ this.total = response.total;
+ this.loading = false;
+ });
+ },
+ // 鍙栨秷鎸夐挳
+ cancel() {
+ this.open = false;
+ this.reset();
+ },
+ // 琛ㄥ崟閲嶇疆
+ reset() {
+ this.form = {
+ id: null,
+ projectInfoId: null,
+ planId: null,
+ engineeringInfoId: null,
+ planTime: null,
+ planTimeFlag: null,
+ createTime: null,
+ reportStatus: null,
+ actualInvest: null
+ };
+ this.resetForm("form");
+ },
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuery() {
+ this.queryParams.pageNum = 1;
+ this.getList();
+ },
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.resetForm("queryForm");
+ this.handleQuery();
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange(selection) {
+ this.ids = selection.map(item => item.id)
+ this.single = selection.length!==1
+ this.multiple = !selection.length
+ },
+ /** 鏂板鎸夐挳鎿嶄綔 */
+ handleAdd() {
+ this.reset();
+ 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', {
+ ...this.queryParams
+ }, `record_${new Date().getTime()}.xlsx`)
+ },
+ /** 鏌ョ湅椤圭洰璁″垝璁板綍 */
+ handlePlanRecord(row) {
+ this.$router.push({
+ path: '/projectManage/progressRecord',
+ query: {
+ data: JSON.stringify(row)
+ }
+ })
+ }
+ }
+};
+</script>
diff --git a/src/views/projectManage/progress/progressRecord.vue b/src/views/projectManage/progress/progressRecord.vue
new file mode 100644
index 0000000..3c2eafe
--- /dev/null
+++ b/src/views/projectManage/progress/progressRecord.vue
@@ -0,0 +1,277 @@
+<template>
+ <div class="app-container">
+ <el-container>
+ <el-header v-show="planRecordData && planRecordData.projectName" class="header-title">椤圭洰鍚嶇О锛歿{ planRecordData.projectName }}</el-header>
+ <h4 v-show="planRecordData && planRecordData.projectCode" style="text-align: center">椤圭洰浠ｇ爜锛歿{ planRecordData.projectCode }}</h4>
+ <el-main>
+ <el-card shadow="hover">
+ <el-row :gutter="20">
+ <div style="margin-bottom: 10px">
+ <el-link style="font-size: 20px; font-weight: bold;" @click="activeTab = 'month'">鏈堝害璁″垝/</el-link>
+ <el-link style="font-size: 20px; font-weight: bold;" @click="activeTab ='season'">瀛ｅ害璁″垝/</el-link>
+ <el-link style="font-size: 20px; font-weight: bold;" @click="activeTab = 'year'">骞村害璁″垝</el-link>
+ </div>
+ <el-col :span="24" class="mb-4" style="margin-top: 20px" v-if="activeTab === 'month'">
+ <div v-for="(item, index) in monthProgress">
+ <div style="margin-bottom: 10px">
+ <span style="font-size: 18px;">{{ item.planTime }}{{ item.planTimeFlag === 0 ? '鏈堝害' : item.planTimeFlag === 1 ? '瀛ｅ害' : '骞村害' }}</span>
+ <el-table :data="item.planInfoList" 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="title" label="浜嬮」鍚嶇О" align="center" />
+ <el-table-column prop="progressStatus" label="杩涘害鎯呭喌" align="center">
+ <template slot-scope="scope">
+ {{ scope.row.progressStatus === 0 ? '鏈畬鎴�' : scope.row.progressStatus === 1 ? '寰呭鏍�' : scope.row.progressStatus === 2 ? '宸查┏鍥�' : '宸插畬鎴�'}}
+ </template>
+ </el-table-column>
+ <el-table-column prop="startTime" label="璁″垝寮�濮嬫椂闂�" align="center" />
+ <el-table-column prop="endTime" label="璁″垝瀹屾垚鏃堕棿" align="center" />
+ <el-table-column fixed="right" label="鎿嶄綔" align="center">
+ <template slot-scope="scope">
+ <el-button type="primary" size="small" :disabled="scope.row.progressStatus === 1 || scope.row.progressStatus === 3" @click="handleProgressReport(scope.row)">杩涘害涓婃姤</el-button>
+ <el-button type="primary" size="small" @click="handleCheckProgress(scope.row)">鏌ョ湅</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
+ </el-col>
+ <el-col :span="24" class="mb-4" style="margin-top: 20px" v-if="activeTab === 'season'" >
+ <div v-for="(item, index) in seasonProgress">
+ <div style="margin-bottom: 10px">
+ <span style="font-size: 18px;">{{ item.planTime }}{{ item.planTimeFlag === 0 ? '鏈堝害' : item.planTimeFlag === 1 ? '瀛ｅ害' : '骞村害' }}</span>
+ <el-table :data="item.planInfoList" 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="title" label="浜嬮」鍚嶇О" align="center" />
+ <el-table-column prop="progressStatus" label="杩涘害鎯呭喌" align="center">
+ <template slot-scope="scope">
+ {{ scope.row.progressStatus === 0 ? '鏈畬鎴�' : scope.row.progressStatus === 1 ? '寰呭鏍�' : scope.row.progressStatus === 2 ? '宸查┏鍥�' : '宸插畬鎴�'}}
+ </template>
+ </el-table-column>
+ <el-table-column prop="startTime" label="璁″垝寮�濮嬫椂闂�" align="center" />
+ <el-table-column prop="endTime" label="璁″垝瀹屾垚鏃堕棿" align="center" />
+ <el-table-column fixed="right" label="鎿嶄綔" align="center">
+ <template slot-scope="scope">
+ <el-button type="primary" size="small" :disabled="scope.row.progressStatus === 1 || scope.row.progressStatus === 3" @click="handleProgressReport(scope.row)">杩涘害涓婃姤</el-button>
+ <el-button type="primary" size="small" @click="handleCheckProgress(scope.row)">鏌ョ湅</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
+ </el-col>
+ <el-col :span="24" class="mb-4" style="margin-top: 20px" v-if="activeTab === 'year'">
+ <div v-for="(item, index) in yearProgress">
+ <div style="margin-bottom: 10px">
+ <span style="font-size: 18px;">{{ item.planTime }}{{ item.planTimeFlag === 0 ? '鏈堝害' : item.planTimeFlag === 1 ? '瀛ｅ害' : '骞村害' }}</span>
+ <el-table :data="item.planInfoList" 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="title" label="浜嬮」鍚嶇О" align="center" />
+ <el-table-column prop="progressStatus" label="杩涘害鎯呭喌" align="center">
+ <template slot-scope="scope">
+ {{ scope.row.progressStatus === 0 ? '鏈畬鎴�' : scope.row.progressStatus === 1 ? '寰呭鏍�' : scope.row.progressStatus === 2 ? '宸查┏鍥�' : '宸插畬鎴�'}}
+ </template>
+ </el-table-column>
+ <el-table-column prop="startTime" label="璁″垝寮�濮嬫椂闂�" align="center" />
+ <el-table-column prop="endTime" label="璁″垝瀹屾垚鏃堕棿" align="center" />
+ <el-table-column fixed="right" label="鎿嶄綔" align="center">
+ <template slot-scope="scope">
+ <el-button type="primary" size="small" :disabled="scope.row.progressStatus === 1 || scope.row.progressStatus === 3" @click="handleProgressReport(scope.row)">杩涘害涓婃姤</el-button>
+ <el-button type="primary" size="small" @click="handleCheckProgress(scope.row)">鏌ョ湅</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
+ </el-col>
+ <div style="margin-bottom: 10px">
+ <h1 style="font-size: 20px; font-weight: bold;">绔ｅ伐鎶ュ憡</h1>
+ <div style="display: flex; justify-content: center; align-items: center;">
+ <el-upload
+ class="upload-demo"
+ drag
+ action="https://jsonplaceholder.typicode.com/posts/"
+ multiple>
+ <i class="el-icon-upload"></i>
+ <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
+ <div class="el-upload__tip" slot="tip">鍙兘涓婁紶jpg/png鏂囦欢锛屼笖涓嶈秴杩�500kb</div>
+ </el-upload>
+ </div>
+ </div>
+ <div style="margin-bottom: 10px">
+ <h1 style="font-size: 20px; font-weight: bold;">鎯呭喌璇存槑</h1>
+ <div style="display: flex; justify-content: center; align-items: center;">
+ <el-upload
+ class="upload-demo"
+ drag
+ action="https://jsonplaceholder.typicode.com/posts/"
+ multiple>
+ <i class="el-icon-upload"></i>
+ <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
+ <div class="el-upload__tip" slot="tip">鍙兘涓婁紶jpg/png鏂囦欢锛屼笖涓嶈秴杩�500kb</div>
+ </el-upload>
+ </div>
+ </div>
+ </el-row>
+
+ <el-dialog :title=" checkFlag ? '杩涘害鏌ョ湅' : '杩涘害涓婃姤' " :visible.sync="dialogFormVisible" custom-class="custom-dialog">
+ <el-form :model="progressReportData">
+ <el-form-item label="鎶ュ憡鏈燂細" :label-width="formLabelWidth">
+ <el-input :value="progressReportData.planTime + (progressReportData.planTimeFlag === 0 ? '鏈堝害' : progressReportData.planTimeFlag === 1 ? '瀛ｅ害' : '骞村害')" readonly />
+ </el-form-item>
+ <el-form-item label="璁″垝浜嬮」锛�" :label-width="formLabelWidth">
+ <el-input v-model="progressReportData.title" readonly />
+ </el-form-item>
+ <el-form-item label="璁″垝鏃堕棿锛�" :label-width="formLabelWidth">
+ <el-date-picker v-model="progressReportData.startTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="small" style="width: 130px" readonly/>
+ 鑷�
+ <el-date-picker v-model="progressReportData.endTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="small" style="width: 130px" readonly/>
+ </el-form-item>
+ <el-form-item label="瀹為檯瀹屾垚鏃堕棿锛�" :label-width="formLabelWidth">
+ <el-date-picker v-model="progressReportData.actualStartTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="small" style="width: 130px" :readonly="checkFlag"/>
+ 鑷�
+ <el-date-picker v-model="progressReportData.actualEndTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="small" style="width: 130px" :readonly="checkFlag"/>
+ </el-form-item>
+ <el-form-item label="杩涘害鎯呭喌锛�" :label-width="formLabelWidth">
+ <el-input type="textarea" v-model="progressReportData.progressStatus" placeholder="璇疯緭鍏�" rows="3" :readonly="checkFlag" />
+ </el-form-item>
+ <el-form-item label="宸ョ▼杩涘害闄勪欢锛�" :label-width="formLabelWidth">
+ <el-upload
+ class="upload-demo"
+ drag
+ action="https://jsonplaceholder.typicode.com/posts/"
+ multiple
+ :disabled="checkFlag" >
+ <i class="el-icon-upload"></i>
+ <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
+ <div class="el-upload__tip" slot="tip">鍙兘涓婁紶jpg/png鏂囦欢锛屼笖涓嶈秴杩�500kb</div>
+ </el-upload>
+ </el-form-item>
+ <el-form-item label="鎴鏈姤鍛婂畬鎴愭姇璧勶細" :label-width="formLabelWidth">
+ <el-input v-model="progressReportData.actualInvest" type="number" :readonly="checkFlag" />
+ </el-form-item>
+ <el-form-item label="涓婄骇瀹℃牳锛�" :label-width="formLabelWidth">
+ <el-input :value="progressReportData.departmentExamine === 0 ? '鍚屾剰' : progressReportData.departmentExamine === 1 ? '椹冲洖' : '鏈鏍�'" readonly />
+ </el-form-item>
+ <el-form-item label="涓婄骇鎵瑰锛�" :label-width="formLabelWidth">
+ <el-input v-model="progressReportData.departmentApproval" readonly />
+ </el-form-item>
+ <el-form-item label="涓婄骇鎵瑰鍥炲锛�" :label-width="formLabelWidth">
+ <el-input type="textarea" v-model="progressReportData.departmentApprovalReply" placeholder="璇疯緭鍏�" rows="3" :readonly="checkFlag" />
+ </el-form-item>
+ <el-form-item label="涓荤閮ㄩ棬瀹℃牳锛�" :label-width="formLabelWidth">
+ <el-input :value="progressReportData.manageExamine === 0 ? '鍚屾剰' : progressReportData.manageExamine === 1 ? '椹冲洖' : '鏈鏍�'" readonly />
+ </el-form-item>
+ <el-form-item label="涓荤閮ㄩ棬瀹℃牳鎵瑰锛�" :label-width="formLabelWidth">
+ <el-input v-model="progressReportData.manageApproval" readonly />
+ </el-form-item>
+ <el-form-item label="涓荤閮ㄩ棬鎵瑰鍥炲锛�" :label-width="formLabelWidth">
+ <el-input type="textarea" v-model="progressReportData.manageApprovalReply" placeholder="璇疯緭鍏�" rows="3" :readonly="checkFlag" />
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="handleRecordSubmit" v-if="!checkFlag">涓� 鎶�</el-button>
+ <el-button @click="dialogFormVisible = false">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+ </el-card>
+ </el-main>
+ </el-container>
+ </div>
+</template>
+
+<script>
+import { getProgressInfoList, getProgressReport, recordSubmit } from "@/api/projectManage/progress/index";
+
+export default {
+ name: "progressRecord",
+ data() {
+ return {
+ // 鎺ユ敹浼犻�掕繃鏉ョ殑椤圭洰璁″垝鏁版嵁
+ planRecordData: {},
+ monthProgress: [],
+ seasonProgress: [],
+ yearProgress: [],
+ activeTab: "month", // 榛樿鏄剧ず鏈堝害璁″垝
+
+ dialogFormVisible: false,
+ // 鏌ョ湅鏄剧ず
+ checkFlag: false,
+ progressReportData: {},
+ formLabelWidth: '150px'
+ }
+ },
+ methods: {
+ search() {
+ this.getPlanRecordData()
+ },
+ // 鑾峰彇浼犻�掕繃鏉ョ殑椤圭洰璁″垝璇︽儏
+ getPlanRecordData() {
+ // 浠庢煡璇㈠弬鏁颁腑鑾峰彇鏁版嵁
+ if (this.$route.query.data) {
+ this.planRecordData = JSON.parse(this.$route.query.data);
+ this.getProgressInfoList(this.planRecordData.id);
+ }
+ },
+ // 鑾峰彇椤圭洰杩涘害璁″垝椤�
+ getProgressInfoList(id) {
+ getProgressInfoList(id).then(res => {
+ this.monthProgress = res.data.monthProgress;
+ this.seasonProgress = res.data.seasonProgress;
+ this.yearProgress = res.data.yearProgress;
+ })
+ },
+ // 杩涘害涓婃姤
+ handleProgressReport(row) {
+ this.dialogFormVisible = true;
+ getProgressReport(row.id).then(res => {
+ this.progressReportData = res.data;
+ })
+ },
+ // 涓婃姤鎻愪氦
+ handleRecordSubmit() {
+ recordSubmit(this.progressReportData).then(res => {
+ this.dialogFormVisible = false;
+ this.$message.success('涓婃姤鎴愬姛');
+ this.search();
+ })
+ },
+ // 鏌ョ湅杩涘害
+ handleCheckProgress(row) {
+ this.dialogFormVisible = true;
+ this.checkFlag = true;
+ getProgressReport(row.id).then(res => {
+ this.progressReportData = res.data;
+ })
+ }
+ },
+ created() {
+ this.search();
+ },
+};
+</script>
+
+<style scoped>
+.header-title {
+ font-size: 24px; /* 鏍规嵁闇�瑕佽皟鏁村瓧浣撳ぇ灏� */
+ text-align: center; /* 灞呬腑瀵归綈 */
+ line-height: 64px; /* 濡傛灉闇�瑕佷笌 header 楂樺害瀵归綈 */
+}
+
+.custom-dialog {
+ max-height: 70vh; /* 璁剧疆鏈�澶ч珮搴� */
+ overflow-y: auto; /* 鍏佽鍨傜洿婊氬姩 */
+}
+</style>
+
--
Gitblit v1.8.0