From bd63da40b4f5a5130bbb73fc654e7aaa25cacce6 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期二, 10 十二月 2024 18:11:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/projectManage/plan/planInfo.vue |   31 ++++++++++++++++++++-----------
 1 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/views/projectManage/plan/planInfo.vue b/src/views/projectManage/plan/planInfo.vue
index bf620a5..310c175 100644
--- a/src/views/projectManage/plan/planInfo.vue
+++ b/src/views/projectManage/plan/planInfo.vue
@@ -22,12 +22,17 @@
                 </el-table-column>
                 <el-table-column prop="startTime" label="璁″垝寮�濮嬫椂闂�" width="160" align="center">
                   <template #default="scope">
-                    <el-date-picker v-model="scope.row.startTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="small" style="width: 130px" />
+                    <el-date-picker v-model="scope.row.startTime"
+                                    type="date"
+                                    placeholder="閫夋嫨鏃ユ湡"
+                                    size="small"
+                                    style="width: 130px"
+                                    value-format="yyyy-MM-dd HH:mm:ss"/>
                   </template>
                 </el-table-column>
                 <el-table-column prop="endTime" label="璁″垝瀹屾垚鏃堕棿" width="160" align="center">
                   <template #default="scope">
-                    <el-date-picker v-model="scope.row.endTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="small" style="width: 130px" />
+                    <el-date-picker v-model="scope.row.endTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="small" style="width: 130px" value-format="yyyy-MM-dd HH:mm:ss"/>
                   </template>
                 </el-table-column>
                 <el-table-column :label="planInfoData.planTimeFlag === 0 ? '鏈堝害' : planInfoData.planTimeFlag === 1 ? '瀛e害' : '骞村害' " width="100" align="center">
@@ -45,7 +50,7 @@
               </el-table>
               <div style="display: flex; align-items: center;">
                 <h1 style="margin: 0;">
-                  鎴鏈鍒掕繘搴﹀畬鎴愭姇璧勶紙涓囧厓锛夛細
+                  璁″垝鎶曡祫閲戦锛堜竾鍏冿級锛�
                 </h1>
                 <el-input
                   placeholder="璇疯緭鍏ユ姇璧勯噾棰�"
@@ -72,7 +77,7 @@
 import { getPlanInfoData, addPlanInfo, savePlanInfo } from "@/api/projectPlan/index";
 
 export default {
-  name: "PlanInfo",
+  name: "planInfo",
   data() {
     return {
       loading: true,
@@ -96,7 +101,9 @@
       }
     }
   },
-
+  created() {
+    this.getProjectInfoData();
+  },
   methods: {
     // 椤甸潰鍔犺浇
     search() {
@@ -106,7 +113,12 @@
     getProjectInfoData() {
       // 浠庢煡璇㈠弬鏁颁腑鑾峰彇鏁版嵁
       this.projectInfoData = this.$route.query.projectInfoData
-      this.planInfoData = this.$route.query.data
+      this.planInfoData.id = this.$route.query.id;
+      this.planInfoData.projectName = this.$route.query.projectName;
+      this.planInfoData.projectCode = this.$route.query.projectCode;
+      this.planInfoData.planTime = this.$route.query.planTime;
+      this.planInfoData.planTimeFlag = this.$route.query.planTimeFlag;
+      this.planInfoData.managerFlag = this.$route.query.managerFlag;
       this.search();
     },
     // 鑾峰彇椤圭洰璁″垝椤�
@@ -139,6 +151,7 @@
       }
       addPlanInfo(this.addData).then(response => {
         this.handlePlanRecord()
+        this.$message.success('涓婃姤鎴愬姛');
       })
     },
     // 閲嶇疆褰撳墠琛屾暟鎹�
@@ -160,8 +173,7 @@
     // 淇濆瓨褰撳墠琛屾暟鎹�
     handleSave(index) {
       this.tableData[index].projectPlanRecordId = this.projectInfoData.id;
-      savePlanInfo(this.tableData[index]).then(response => {
-        this.search();
+      savePlanInfo(this.tableData[index], this.planInfoData.id).then(response => {
         this.$message.success('淇濆瓨鎴愬姛');
       });
     },
@@ -174,9 +186,6 @@
         }
       })
     }
-  },
-  created() {
-    this.getProjectInfoData();
   },
 };
 </script>

--
Gitblit v1.8.0