From d2eaa00bbee1fb2d081a8767d888efe77186cb7e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 29 十一月 2024 04:00:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/views/projectManage/plan/planInfo.vue b/src/views/projectManage/plan/planInfo.vue
index 9608965..bf620a5 100644
--- a/src/views/projectManage/plan/planInfo.vue
+++ b/src/views/projectManage/plan/planInfo.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
     <el-container>
-      <el-header v-show="planRecordData && planRecordData.projectName" class="header-title">椤圭洰鍚嶇О锛歿{ planRecordData.projectName }} {{ planRecordData.planTimeFlag === 0 ? '(鏈堝害璁″垝)' : planRecordData.planTimeFlag === 1 ? '(瀛e害璁″垝)' : '(骞村害璁″垝)' }}</el-header>
-      <h4 v-show="planRecordData && planRecordData.projectCode" style="text-align: center">椤圭洰浠g爜锛歿{ planRecordData.projectCode }}</h4>
+      <el-header class="header-title">椤圭洰鍚嶇О锛歿{ planInfoData.projectName }} ({{planInfoData.planTime}} {{ planInfoData.planTimeFlag === 0 ? '鏈堝害璁″垝' : planInfoData.planTimeFlag === 1 ? '瀛e害璁″垝' : '骞村害璁″垝' }})</el-header>
+      <h4 style="text-align: center">椤圭洰浠g爜锛歿{ planInfoData.projectCode }}</h4>
       <el-main>
         <el-card shadow="hover">
           <el-row :gutter="20">
@@ -30,9 +30,9 @@
                     <el-date-picker v-model="scope.row.endTime" type="date" placeholder="閫夋嫨鏃ユ湡" size="small" style="width: 130px" />
                   </template>
                 </el-table-column>
-                <el-table-column :label="planRecordData.planTimeFlag === 0 ? '鏈堝害' : planRecordData.planTimeFlag === 1 ? '瀛e害' : '骞村害' " width="100" align="center">
+                <el-table-column :label="planInfoData.planTimeFlag === 0 ? '鏈堝害' : planInfoData.planTimeFlag === 1 ? '瀛e害' : '骞村害' " width="100" align="center">
                   <template #default="scope">
-                    <span>{{ planRecordData.planTime }}{{ planRecordData.planTimeFlag === 0 ? '鏈堝害' : planRecordData.planTimeFlag === 1 ? '瀛e害' : '骞村害' }}</span>
+                    <span>{{ planInfoData.planTime }}{{ planInfoData.planTimeFlag === 0 ? '鏈堝害' : planInfoData.planTimeFlag === 1 ? '瀛e害' : '骞村害' }}</span>
                   </template>
                 </el-table-column>
                 <el-table-column fixed="right" label="鎿嶄綔" align="center">
@@ -72,12 +72,12 @@
 import { getPlanInfoData, addPlanInfo, savePlanInfo } from "@/api/projectPlan/index";
 
 export default {
-  name: "planInfo",
+  name: "PlanInfo",
   data() {
     return {
       loading: true,
       // 鎺ユ敹浼犻�掕繃鏉ョ殑椤圭洰璁″垝鏁版嵁
-      planRecordData: {},
+      projectInfoData: {},
       planInfoData: {},
       tableData: [
         {
@@ -103,9 +103,9 @@
       this.getPlanInfoData(this.planInfoData.id);
     },
     // 鑾峰彇浼犻�掕繃鏉ョ殑椤圭洰璁″垝璇︽儏
-    getPlanRecordData() {
+    getProjectInfoData() {
       // 浠庢煡璇㈠弬鏁颁腑鑾峰彇鏁版嵁
-      this.planRecordData = this.$route.query.planRecordData
+      this.projectInfoData = this.$route.query.projectInfoData
       this.planInfoData = this.$route.query.data
       this.search();
     },
@@ -159,7 +159,7 @@
     },
     // 淇濆瓨褰撳墠琛屾暟鎹�
     handleSave(index) {
-      this.tableData[index].projectPlanRecordId = this.planRecordData.id;
+      this.tableData[index].projectPlanRecordId = this.projectInfoData.id;
       savePlanInfo(this.tableData[index]).then(response => {
         this.search();
         this.$message.success('淇濆瓨鎴愬姛');
@@ -170,13 +170,13 @@
       this.$router.push({
         path: '/projectManage/planRecord',
         query: {
-          data: this.planRecordData
+          data: this.projectInfoData
         }
       })
     }
   },
   created() {
-    this.getPlanRecordData();
+    this.getProjectInfoData();
   },
 };
 </script>

--
Gitblit v1.8.0