From b768760591c0761bdcc3eda9f85dafa11c072444 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 29 十一月 2024 14:44:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectManage/plan/planInfo.vue | 2 +-
src/views/projectManage/progress/progressRecord.vue | 17 +++++++++++++----
src/views/projectManage/plan/planInfoCheck.vue | 5 +++--
src/api/projectManage/progress/index.js | 9 +++++++++
4 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/api/projectManage/progress/index.js b/src/api/projectManage/progress/index.js
index ade3e9b..63e83f8 100644
--- a/src/api/projectManage/progress/index.js
+++ b/src/api/projectManage/progress/index.js
@@ -50,6 +50,15 @@
})
}
+// 瀹℃壒
+export function examine(data) {
+ return request({
+ url: '/api/project-plan-progress-report/examine',
+ method: 'post',
+ data: data
+ })
+}
+
// 淇濆瓨绔ｅ伐鎶ュ憡銆佹儏鍐佃鏄庨檮浠�
export function saveProjectProgressFileLists(data) {
return request({
diff --git a/src/views/projectManage/plan/planInfo.vue b/src/views/projectManage/plan/planInfo.vue
index 0644e12..47f9ae0 100644
--- a/src/views/projectManage/plan/planInfo.vue
+++ b/src/views/projectManage/plan/planInfo.vue
@@ -77,7 +77,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 73cb549..60dc8fd 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; margin-left: 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">
@@ -160,7 +161,7 @@
import { getPlanInfoData, delayPlanInfo, getDepartmentApproval, getPlanLog, replyExamine, saveExamine } from "@/api/projectPlan/index";
export default {
- name: "PlanInfoCheck",
+ name: "planInfoCheck",
data() {
return {
loading: true,
@@ -255,7 +256,7 @@
},
/** 杩斿洖椤圭洰璁″垝璁板綍 */
handlePlanRecord() {
- this.$router.push({
+ this.$router.replace({
path: '/projectManage/planRecord',
query: {
data: this.projectInfoData
diff --git a/src/views/projectManage/progress/progressRecord.vue b/src/views/projectManage/progress/progressRecord.vue
index 54a0e4d..c07558c 100644
--- a/src/views/projectManage/progress/progressRecord.vue
+++ b/src/views/projectManage/progress/progressRecord.vue
@@ -153,6 +153,7 @@
<el-select v-if="projectInfoData.managerFlag" v-model="progressReportData.departmentExamine" placeholder="璇烽�夋嫨" size="small" clearable>
<el-option label="鍚屾剰" :value="0"></el-option>
<el-option label="椹冲洖" :value="1"></el-option>
+ <el-option label="璇烽�夋嫨" :value="null"></el-option>
</el-select>
</el-form-item>
<el-form-item label="涓婄骇鎵瑰锛�" :label-width="formLabelWidth">
@@ -166,6 +167,7 @@
<el-form-item label="涓荤閮ㄩ棬瀹℃牳锛�" :label-width="formLabelWidth">
<el-input v-if="!projectInfoData.managerFlag" :value="progressReportData.manageExamine === 0 ? '鍚屾剰' : progressReportData.manageExamine === 1 ? '椹冲洖' : '鏈鏍�'" readonly />
<el-select v-if="projectInfoData.managerFlag" v-model="progressReportData.manageExamine" placeholder="璇烽�夋嫨" size="small" clearable>
+ <el-option label="璇烽�夋嫨" :value="null"></el-option>
<el-option label="鍚屾剰" :value="0"></el-option>
<el-option label="椹冲洖" :value="1"></el-option>
</el-select>
@@ -181,7 +183,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="handleRecordSubmit" v-if="!checkFlag && !projectInfoData.managerFlag">涓� 鎶�</el-button>
- <el-button type="primary" @click="handleRecordSubmit" v-if="projectInfoData.managerFlag">瀹� 鎵�</el-button>
+ <el-button type="primary" @click="handleExamine" v-if="projectInfoData.managerFlag">瀹� 鎵�</el-button>
<el-button @click="handleCancel">鍙� 娑�</el-button>
</div>
</el-dialog>
@@ -192,11 +194,11 @@
</template>
<script>
-import { getProgressInfoList, getProgressReport, recordSubmit, saveProjectProgressFileLists, getProjectProgressForm } from "@/api/projectManage/progress/index";
+import { getProgressInfoList, getProgressReport, recordSubmit, saveProjectProgressFileLists, getProjectProgressForm, examine } from "@/api/projectManage/progress/index";
import progressRecord from "./progressRecord.vue";
export default {
- name: "ProgressRecord",
+ name: "progressRecord",
computed: {
progressRecord() {
return progressRecord
@@ -258,7 +260,6 @@
this.dialogFormVisible = true;
getProgressReport(row.id).then(res => {
this.progressReportData = res.data;
- console.log(this.progressReportData)
})
},
// 涓婃姤鎻愪氦
@@ -269,6 +270,14 @@
this.search();
})
},
+ // 瀹℃壒
+ handleExamine() {
+ examine(this.progressReportData).then(res => {
+ this.dialogFormVisible = false;
+ this.$message.success('瀹℃壒鎴愬姛');
+ this.search();
+ })
+ },
// 鏌ョ湅杩涘害
handleCheckProgress(row) {
this.dialogFormVisible = true;
--
Gitblit v1.8.0