From 6c1339299850e9db3d92d94ce19dd0e77c4c50f2 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Mon, 2 Feb 2026 11:31:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/planMange/dailyPlan/edit.vue    | 20 +++--
 src/views/planMange/monthlyPlan/config.js | 96 +++++++++++------------
 src/views/planMange/monthlyPlan/edit.vue  | 16 ++--
 3 files changed, 71 insertions(+), 61 deletions(-)

diff --git a/src/views/planMange/dailyPlan/edit.vue b/src/views/planMange/dailyPlan/edit.vue
index 0c8102a..1a0eaf1 100644
--- a/src/views/planMange/dailyPlan/edit.vue
+++ b/src/views/planMange/dailyPlan/edit.vue
@@ -934,11 +934,21 @@ watch(
     { immediate: true },
 )
 
-onMounted(() => {
-    if (route.query.id) {
-        getDetail()
-    }
-})
+watch(
+    () => route.query.id,
+    (newId) => {
+        if (newId) {
+            getDetail()
+        }
+    },
+    { immediate: true },
+)
+
+// onMounted(() => {
+//     if (route.query.id) {
+//         getDetail()
+//     }
+// })
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/planMange/monthlyPlan/config.js b/src/views/planMange/monthlyPlan/config.js
index 594bd6e..56d7d94 100644
--- a/src/views/planMange/monthlyPlan/config.js
+++ b/src/views/planMange/monthlyPlan/config.js
@@ -8,51 +8,51 @@ export const buildFormColumns = (
     businessTypeOptions,
     riskLevelOptions,
 ) => [
-    {
-        type: 'month',
-        prop: 'monthlyPlan',
-        placeholder: '请选择月份',
-        defaultValue: dayjs().format('YYYY-MM'), // 默认当前月份
-    },
-    {
-        type: 'select',
-        prop: 'inspectionStationId',
-        placeholder: '请选择运检站',
-        options: inspectionStationOptions.map((item) => ({
-            label: item.value,
-            value: item.id,
-        })),
-    },
-    {
-        type: 'input',
-        prop: 'keyWord',
-        placeholder: '请输入关键字',
-    },
-    {
-        type: 'select',
-        prop: 'planMajorId',
-        placeholder: '请选择专业',
-        options: majorOptions.map((item) => ({
-            label: item.planMajorName,
-            value: item.planMajorId,
-        })),
-    },
-    {
-        type: 'select',
-        prop: 'businessTypeId',
-        placeholder: '请选择业务类型',
-        options: businessTypeOptions.map((item) => ({
-            label: item.planMajorName,
-            value: item.planMajorId,
-        })),
-    },
-    {
-        type: 'select',
-        prop: 'riskLevel',
-        placeholder: '请选择风险等级',
-        options: riskLevelOptions,
-    },
-]
+        {
+            type: 'month',
+            prop: 'monthlyPlan',
+            placeholder: '请选择月份',
+            defaultValue: dayjs().format('YYYY-MM'), // 默认当前月份
+        },
+        {
+            type: 'select',
+            prop: 'inspectionStationId',
+            placeholder: '请选择运检站',
+            options: inspectionStationOptions.map((item) => ({
+                label: item.value,
+                value: item.id,
+            })),
+        },
+        {
+            type: 'input',
+            prop: 'keyWord',
+            placeholder: '请输入关键字',
+        },
+        {
+            type: 'select',
+            prop: 'planMajorId',
+            placeholder: '请选择专业',
+            options: majorOptions.map((item) => ({
+                label: item.planMajorName,
+                value: item.planMajorId,
+            })),
+        },
+        {
+            type: 'select',
+            prop: 'businessTypeId',
+            placeholder: '请选择业务类型',
+            options: businessTypeOptions.map((item) => ({
+                label: item.planMajorName,
+                value: item.planMajorId,
+            })),
+        },
+        {
+            type: 'select',
+            prop: 'riskLevel',
+            placeholder: '请选择风险等级',
+            options: riskLevelOptions,
+        },
+    ]
 
 // 月计划列表表格列
 export const tableColumns = [
@@ -71,7 +71,7 @@ export const tableColumns = [
         prop: 'planPersonnel',
         label: '计划投入管理人员数量',
         formatter: (row) => {
-            return row.personneltList?.length || ''
+            return row.personneltList?.length || 0
         },
     },
 
@@ -84,7 +84,7 @@ export const tableColumns = [
         formatter: (row) => {
             return (
                 (dayjs(row.plannedEndTime).diff(dayjs(row.plannedStartTime), 'day') + 1) *
-                    row.planSkilledWorkerDay || ''
+                row.planSkilledWorkerDay || 0
             )
         },
     },
@@ -96,7 +96,7 @@ export const tableColumns = [
         formatter: (row) => {
             return (
                 (dayjs(row.plannedEndTime).diff(dayjs(row.plannedStartTime), 'day') + 1) *
-                    row.planAuxiliaryWorkerDay || ''
+                row.planAuxiliaryWorkerDay || 0
             )
         },
     },
diff --git a/src/views/planMange/monthlyPlan/edit.vue b/src/views/planMange/monthlyPlan/edit.vue
index 1225403..dc976b9 100644
--- a/src/views/planMange/monthlyPlan/edit.vue
+++ b/src/views/planMange/monthlyPlan/edit.vue
@@ -1035,14 +1035,14 @@ const getDetail = async () => {
         formData.value.planMajorId = data.planMajorId
         formData.value.businessTypeId = data.businessTypeId
         formData.value.planCategoryId = data.planCategoryId
-        formData.value.towerBaseNumber = data.towerBaseNumber || ''
-        formData.value.planCarNum = data.planCarNum || ''
-        formData.value.planSkilledWorkerNum = data.planSkilledWorkerNum || ''
-        formData.value.planAuxiliaryWorkerNum = data.planAuxiliaryWorkerNum || ''
-        formData.value.planAuxiliaryWorkerDay = data.planAuxiliaryWorkerDay || ''
-        formData.value.planSkilledWorkerDay = data.planSkilledWorkerDay || ''
-        formData.value.planSubCarNum = data.planSubCarNum || ''
-        formData.value.actualWorkingDay = data.actualWorkingDay || ''
+        formData.value.towerBaseNumber = data.towerBaseNumber
+        formData.value.planCarNum = data.planCarNum
+        formData.value.planSkilledWorkerNum = data.planSkilledWorkerNum
+        formData.value.planAuxiliaryWorkerNum = data.planAuxiliaryWorkerNum
+        formData.value.planAuxiliaryWorkerDay = data.planAuxiliaryWorkerDay
+        formData.value.planSkilledWorkerDay = data.planSkilledWorkerDay
+        formData.value.planSubCarNum = data.planSubCarNum
+        formData.value.actualWorkingDay = data.actualWorkingDay
         formData.value.riskLevel = data.riskLevel
 
         // 2. 从后端返回的数据更新路由参数字段（如果后端返回了这些字段）