From 41a73f66d30a9bdd854d3998f8975bb3685feeab Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期四, 28 十一月 2024 21:04:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/projectManage/plan/planInfoCheck.vue |   36 ++++++++++++++++++++++--------------
 1 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/views/projectManage/plan/planInfoCheck.vue b/src/views/projectManage/plan/planInfoCheck.vue
index a80c565..08a6087 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">
@@ -16,7 +17,7 @@
                 </el-table-column>
                 <el-table-column prop="taskName" label="浜嬮」鍚嶇О" width="500" align="center">
                   <template #default="scope">
-                    <el-input type="textarea" v-model="scope.row.title" placeholder="璇疯緭鍏�" rows="3" />
+                    <el-input type="textarea" v-model="scope.row.title" placeholder="璇疯緭鍏�" rows="3" readonly />
                   </template>
                 </el-table-column>
                 <el-table-column prop="startTime" label="璁″垝寮�濮嬫椂闂�" width="160" align="center">
@@ -43,7 +44,7 @@
               </el-table>
               <div style="display: flex; align-items: center;">
                 <h1 style="margin: 0;">
-                  鎴鏈鍒掕繘搴﹀畬鎴愭姇璧勶紙涓囧厓锛夛細
+                  璁″垝鎶曡祫閲戦锛堜竾鍏冿級锛�
                 </h1>
                 <el-input
                   placeholder="璇疯緭鍏ユ姇璧勯噾棰�"
@@ -51,7 +52,8 @@
                   v-model="actualInvest"
                   clearable
                   :type="number"
-                  @input="handleInput">
+                  @input="handleInput"
+                  readonly>
                 </el-input>
               </div>
 
@@ -85,12 +87,12 @@
                 <el-table-column prop="manageApproval" label="鎵瑰鍐呭" width="160" align="center" />
                 <el-table-column prop="manageApprovalReply" label="鎵瑰鍥炲" width="160" align="center">
                   <template #default="scope">
-                    <el-input type="textarea" v-model="scope.row.departmentApprovalReply" placeholder="璇疯緭鍏�" rows="3" />
+                    <el-input type="textarea" v-model="scope.row.manageApprovalReply" 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" @click="handleReply(scope.$index)">鍥炲</el-button>
                     <el-button size="small" type="danger" @click="handleReset(scope.$index)">閲嶇疆</el-button>
                   </template>
                 </el-table-column>
@@ -133,7 +135,7 @@
 </template>
 
 <script>
-import { getPlanInfoData, delayPlanInfo, getDepartmentApproval, getPlanLog } from "@/api/projectPlan/index";
+import { getPlanInfoData, delayPlanInfo, getDepartmentApproval, getPlanLog, replyDepartmentApproval } from "@/api/projectPlan/index";
 
 export default {
   name: "planInfoCheck",
@@ -176,9 +178,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();
     },
@@ -206,6 +206,14 @@
         this.departmentApprovalData = response.data;
       });
     },
+    // 鍥炲
+    handleReply(index) {
+      replyDepartmentApproval(this.departmentApprovalData[index]).then(response => {
+        this.$message.success('鍥炲鎴愬姛');
+        this.search()
+      });
+    },
+
     // 鑾峰彇璁″垝鏃ュ織
     getPlanLog(projectPlanRecordId) {
       getPlanLog(projectPlanRecordId).then(response => {
@@ -218,15 +226,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();

--
Gitblit v1.8.0