From c7c7c9aefa9985041e08a85a1fe3404948812055 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期五, 29 十一月 2024 12:58:49 +0800
Subject: [PATCH] 进度审批

---
 src/views/projectManage/progress/progressRecord.vue |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

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