From 69b01c1de544bdaedfa12aaf13600239dabbcb3c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 29 十一月 2024 16:51:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectManage/progress/progressRecord.vue | 76 +++++++++++++++++++++++++-------------
1 files changed, 50 insertions(+), 26 deletions(-)
diff --git a/src/views/projectManage/progress/progressRecord.vue b/src/views/projectManage/progress/progressRecord.vue
index 566a7e9..c07558c 100644
--- a/src/views/projectManage/progress/progressRecord.vue
+++ b/src/views/projectManage/progress/progressRecord.vue
@@ -31,8 +31,9 @@
<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>
+ <el-button v-if="!projectInfoData.managerFlag" type="primary" size="small" :disabled="scope.row.progressStatus === 1 || scope.row.progressStatus === 3" @click="handleProgressReport(scope.row)">杩涘害涓婃姤</el-button>
+ <el-button v-if="!projectInfoData.managerFlag" type="primary" size="small" @click="handleCheckProgress(scope.row)">鏌ョ湅</el-button>
+ <el-button v-if="projectInfoData.managerFlag" type="primary" size="small" @click="handleCheckProgress(scope.row)">瀹℃牳</el-button>
</template>
</el-table-column>
</el-table>
@@ -59,8 +60,9 @@
<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>
+ <el-button v-if="!projectInfoData.managerFlag" type="primary" size="small" :disabled="scope.row.progressStatus === 1 || scope.row.progressStatus === 3" @click="handleProgressReport(scope.row)">杩涘害涓婃姤</el-button>
+ <el-button v-if="!projectInfoData.managerFlag" type="primary" size="small" @click="handleCheckProgress(scope.row)">鏌ョ湅</el-button>
+ <el-button v-if="projectInfoData.managerFlag" type="primary" size="small" @click="handleCheckProgress(scope.row)">瀹℃牳</el-button>
</template>
</el-table-column>
</el-table>
@@ -87,8 +89,9 @@
<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>
+ <el-button v-if="!projectInfoData.managerFlag" type="primary" size="small" :disabled="scope.row.progressStatus === 1 || scope.row.progressStatus === 3" @click="handleProgressReport(scope.row)">杩涘害涓婃姤</el-button>
+ <el-button v-if="!projectInfoData.managerFlag" type="primary" size="small" @click="handleCheckProgress(scope.row)">鏌ョ湅</el-button>
+ <el-button v-if="projectInfoData.managerFlag" type="primary" size="small" @click="handleCheckProgress(scope.row)">瀹℃牳</el-button>
</template>
</el-table-column>
</el-table>
@@ -130,42 +133,57 @@
<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.actualStartTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="small" style="width: 130px" :readonly="checkFlag && projectInfoData.managerFlag"/>
鑷�
- <el-date-picker v-model="progressReportData.actualEndTime" 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 && projectInfoData.managerFlag"/>
</el-form-item>
<el-form-item label="杩涘害鎯呭喌锛�" :label-width="formLabelWidth">
- <el-input type="textarea" v-model="progressReportData.progressStatus" placeholder="璇疯緭鍏�" rows="3" :readonly="checkFlag" />
+ <el-input type="textarea" v-model="progressReportData.progressStatus" placeholder="璇疯緭鍏�" rows="3" :readonly="checkFlag && projectInfoData.managerFlag" />
</el-form-item>
- <el-form-item prop="fileList" label="宸ョ▼杩涘害闄勪欢锛�" :label-width="formLabelWidth">
+ <el-form-item label="宸ョ▼杩涘害闄勪欢锛�" :label-width="formLabelWidth">
<file-upload v-model="progressReportData.fileList"
:fileType="accept"
:isShowTip="false"/>
</el-form-item>
<el-form-item label="鎴鏈姤鍛婂畬鎴愭姇璧勶細" :label-width="formLabelWidth">
- <el-input v-model="progressReportData.actualInvest" type="number" :readonly="checkFlag" />
+ <el-input v-model="progressReportData.actualInvest" type="number" :readonly="checkFlag && projectInfoData.managerFlag" />
</el-form-item>
<el-form-item label="涓婄骇瀹℃牳锛�" :label-width="formLabelWidth">
- <el-input :value="progressReportData.departmentExamine === 0 ? '鍚屾剰' : progressReportData.departmentExamine === 1 ? '椹冲洖' : '鏈鏍�'" readonly />
+ <el-input v-if="!projectInfoData.managerFlag" :value="progressReportData.departmentExamine === 0 ? '鍚屾剰' : progressReportData.departmentExamine === 1 ? '椹冲洖' : '鏈鏍�'" readonly />
+ <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">
- <el-input v-model="progressReportData.departmentApproval" readonly />
+ <el-input v-if="!projectInfoData.managerFlag" v-model="progressReportData.departmentApproval" readonly />
+ <el-input v-if="projectInfoData.managerFlag" v-model="progressReportData.departmentApproval" />
</el-form-item>
<el-form-item label="涓婄骇鎵瑰鍥炲锛�" :label-width="formLabelWidth">
- <el-input type="textarea" v-model="progressReportData.departmentApprovalReply" placeholder="璇疯緭鍏�" rows="3" :readonly="checkFlag" />
+ <el-input v-if="!projectInfoData.managerFlag" type="textarea" v-model="progressReportData.departmentApprovalReply" placeholder="璇疯緭鍏�" rows="3" />
+ <el-input v-if="projectInfoData.managerFlag" 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-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>
</el-form-item>
<el-form-item label="涓荤閮ㄩ棬瀹℃牳鎵瑰锛�" :label-width="formLabelWidth">
- <el-input v-model="progressReportData.manageApproval" readonly />
+ <el-input v-if="!projectInfoData.managerFlag" v-model="progressReportData.manageApproval" readonly />
+ <el-input v-if="projectInfoData.managerFlag" v-model="progressReportData.manageApproval" />
</el-form-item>
<el-form-item label="涓荤閮ㄩ棬鎵瑰鍥炲锛�" :label-width="formLabelWidth">
- <el-input type="textarea" v-model="progressReportData.manageApprovalReply" placeholder="璇疯緭鍏�" rows="3" :readonly="checkFlag" />
+ <el-input v-if="!projectInfoData.managerFlag" type="textarea" v-model="progressReportData.manageApprovalReply" placeholder="璇疯緭鍏�" rows="3" />
+ <el-input v-if="projectInfoData.managerFlag" 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 type="primary" @click="handleRecordSubmit" v-if="!checkFlag && !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>
@@ -176,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
@@ -215,16 +233,14 @@
},
methods: {
search() {
- this.getProjectInfoData()
this.getProjectProgressForm(this.projectInfoData.id);
+ this.getProgressInfoList(this.projectInfoData.id);
},
// 鑾峰彇浼犻�掕繃鏉ョ殑椤圭洰璁″垝璇︽儏
getProjectInfoData() {
// 浠庢煡璇㈠弬鏁颁腑鑾峰彇鏁版嵁
- if (this.$route.query.data) {
- this.projectInfoData = JSON.parse(this.$route.query.data);
- this.getProgressInfoList(this.projectInfoData.id);
- }
+ this.projectInfoData = this.$route.query.data;
+ this.search();
},
getProjectProgressForm(id) {
getProjectProgressForm(id).then(res => {
@@ -254,6 +270,14 @@
this.search();
})
},
+ // 瀹℃壒
+ handleExamine() {
+ examine(this.progressReportData).then(res => {
+ this.dialogFormVisible = false;
+ this.$message.success('瀹℃壒鎴愬姛');
+ this.search();
+ })
+ },
// 鏌ョ湅杩涘害
handleCheckProgress(row) {
this.dialogFormVisible = true;
@@ -278,7 +302,7 @@
}
},
created() {
- this.search();
+ this.getProjectInfoData()
},
};
</script>
--
Gitblit v1.8.0