commit：修复设备巡检保养

@@ -124,8 +124,8 @@
                   v-model:value="record.checkPlanId"
                   v-model:value="record.checkPlanId"
                   :options="planOptions"
                   :options="planOptions"
                   :disabled="isViewMode"
                   :disabled="isViewMode"
-                  :fieldNames="{ label: 'name', value: 'id' }"
                   placeholder="请选择"
                   placeholder="请选择"
+                  @change="(value) => handleCheckPlanChange(value, record)"
                 />
                 />
               </div>
               </div>
             </template>
             </template>
@@ -264,7 +264,19 @@ const visible = ref(props.visible);
 const isViewMode = ref(props.isViewMode);
 const isViewMode = ref(props.isViewMode);
 const modalTitle = ref(props.modalTitle);
 const modalTitle = ref(props.modalTitle);
 const form = ref({ ...props.initialData.form });
 const form = ref({ ...props.initialData.form });
-const tableData = ref([...props.initialData.tableData]);
+const normalizeDetailRow = (row: any) => {
+  const deviceInfo = row?.tkDeviceAccountDTO || row?.deviceInfo;
+  const checkDeviceId = row?.checkDeviceId ?? deviceInfo?.id;
+  const deviceCode = row?.deviceCode ?? deviceInfo?.code;
+  const deviceName = row?.deviceName ?? deviceInfo?.name;
+  return {
+    ...row,
+    checkDeviceId,
+    deviceCode,
+    deviceName,
+  };
+};
+const tableData = ref((props.initialData.tableData || []).map(normalizeDetailRow));
 const emit = defineEmits(['update:visible', 'submit']);
 const emit = defineEmits(['update:visible', 'submit']);
 const deviceVisible = ref(false);
 const deviceVisible = ref(false);
 const deviceSearchInfo = reactive<Recordable>({ code: '', name: '' });
 const deviceSearchInfo = reactive<Recordable>({ code: '', name: '' });
@@ -308,6 +320,13 @@ watch(
   }
   }
 );
 );
 
 
+watch(
+  () => props.modalTitle,
+  (newVal) => {
+    modalTitle.value = newVal;
+  }
+);
+
 // 监听 visible 的变化并通知父组件
 // 监听 visible 的变化并通知父组件
 watch(
 watch(
   () => visible.value,
   () => visible.value,
@@ -321,7 +340,7 @@ watch(
   () => props.initialData,
   () => props.initialData,
   (newVal) => {
   (newVal) => {
     form.value = { ...newVal.form };
     form.value = { ...newVal.form };
-    tableData.value = [...newVal.tableData];
+    tableData.value = (newVal.tableData || []).map(normalizeDetailRow);
   },
   },
   { deep: true }
   { deep: true }
 );
 );
@@ -336,12 +355,23 @@ const fetchAgeOptions = async () => {
     const response = await getLedgerList({ page: 1, pageSize: 999 }); // 调用接口
     const response = await getLedgerList({ page: 1, pageSize: 999 }); // 调用接口
     const response1 = await getPlanList({ page: 1, pageSize: 999, type: 'INSPECTION' }); // 调用接口
     const response1 = await getPlanList({ page: 1, pageSize: 999, type: 'INSPECTION' }); // 调用接口
     Options.value = response.items || [];
     Options.value = response.items || [];
-    planOptions.value = response1.items || [];
+    planOptions.value =
+      response1.items?.map((item: any) => ({
+        ...item,
+        label: item?.name,
+        value: item?.id,
+        planDetails: item?.planDetails,
+      })) || [];
   } catch (error) {
   } catch (error) {
     console.error('失败:', error);
     console.error('失败:', error);
   }
   }
 };
 };
 
 
+const handleCheckPlanChange = (checkPlanId: any, record: any) => {
+  const selected = planOptions.value?.find((item: any) => item?.value === checkPlanId);
+  record.planDetails = selected?.planDetails || '';
+};
+
 const getDeviceLabel = (record: any) => {
 const getDeviceLabel = (record: any) => {
   const code = record?.deviceCode;
   const code = record?.deviceCode;
   const name = record?.deviceName;
   const name = record?.deviceName;
@@ -374,6 +404,12 @@ const handleDeviceOk = () => {
   activeDeviceRecord.value.checkDeviceId = selectedDevice.value.id;
   activeDeviceRecord.value.checkDeviceId = selectedDevice.value.id;
   activeDeviceRecord.value.deviceCode = selectedDevice.value.code;
   activeDeviceRecord.value.deviceCode = selectedDevice.value.code;
   activeDeviceRecord.value.deviceName = selectedDevice.value.name;
   activeDeviceRecord.value.deviceName = selectedDevice.value.name;
+  activeDeviceRecord.value.tkDeviceAccountDTO = {
+    ...(activeDeviceRecord.value.tkDeviceAccountDTO || {}),
+    id: selectedDevice.value.id,
+    code: selectedDevice.value.code,
+    name: selectedDevice.value.name,
+  };
   deviceVisible.value = false;
   deviceVisible.value = false;
 };
 };
 
 

@@ -90,7 +90,7 @@
       :initial-data="initialData"
       :initial-data="initialData"
       :is-view-mode="isViewMode"
       :is-view-mode="isViewMode"
       @submit="handleSubmit"
       @submit="handleSubmit"
-      :title="modalTitle"
+      :modal-title="modalTitle"
     />
     />
   </div>
   </div>
 </template>
 </template>

@@ -306,6 +306,13 @@ watch(
   }
   }
 );
 );
 
 
+watch(
+  () => props.modalTitle,
+  (newVal) => {
+    modalTitle.value = newVal;
+  }
+);
+
 // 监听 visible 的变化并通知父组件
 // 监听 visible 的变化并通知父组件
 watch(
 watch(
   () => visible.value,
   () => visible.value,

@@ -46,7 +46,7 @@
       v-model:visible="modalVisible"
       v-model:visible="modalVisible"
       :initial-data="initialData"
       :initial-data="initialData"
       :is-view-mode="isViewMode"
       :is-view-mode="isViewMode"
-      :title="modalTitle"
+      :modal-title="modalTitle"
       @submit="handleSubmit"
       @submit="handleSubmit"
     />
     />
   </div>
   </div>

@@ -99,7 +99,6 @@
                 v-model:value="record.checkPlanId"
                 v-model:value="record.checkPlanId"
                 :options="planOptions"
                 :options="planOptions"
                 :disabled="isViewMode"
                 :disabled="isViewMode"
-                :fieldNames="{ label: 'name', value: 'id' }"
                 placeholder="请选择"
                 placeholder="请选择"
                 @change="(value) => handleCheckPlanChange(value, record)"
                 @change="(value) => handleCheckPlanChange(value, record)"
               />
               />
@@ -222,7 +221,19 @@ const statusOptions = [
   { label: t('inspection.servicePlan.STOP'), value: 'STOP' },
   { label: t('inspection.servicePlan.STOP'), value: 'STOP' },
 ];
 ];
 const form = ref({ ...props.initialData.form });
 const form = ref({ ...props.initialData.form });
-const tableData = ref([...props.initialData.tableData]);
+const normalizeDetailRow = (row: any) => {
+  const deviceInfo = row?.deviceInfo || row?.tkDeviceAccountDTO;
+  const deviceId = row?.deviceId ?? deviceInfo?.id;
+  const deviceCode = row?.deviceCode ?? deviceInfo?.code;
+  const deviceName = row?.deviceName ?? deviceInfo?.name;
+  return {
+    ...row,
+    deviceId,
+    deviceCode,
+    deviceName,
+  };
+};
+const tableData = ref((props.initialData.tableData || []).map(normalizeDetailRow));
 const emit = defineEmits(['update:visible', 'submit']);
 const emit = defineEmits(['update:visible', 'submit']);
 onMounted(() => {
 onMounted(() => {
   fetchAgeOptions();
   fetchAgeOptions();
@@ -261,22 +272,39 @@ const fetchAgeOptions = async () => {
     const response = await getLedgerList({ page: 1, pageSize: 999 }); // 调用接口
     const response = await getLedgerList({ page: 1, pageSize: 999 }); // 调用接口
     const response1 = await getPlanList({ page: 1, pageSize: 999, type: 'MAINTENANCE' }); // 调用接口
     const response1 = await getPlanList({ page: 1, pageSize: 999, type: 'MAINTENANCE' }); // 调用接口
     Options.value = response.items || [];
     Options.value = response.items || [];
-    planOptions.value = response1.items || [];
+    planOptions.value =
+      response1.items?.map((item: any) => ({
+        ...item,
+        label: item?.name,
+        value: item?.id,
+        planDetails: item?.planDetails,
+      })) || [];
   } catch (error) {
   } catch (error) {
     console.error('失败:', error);
     console.error('失败:', error);
   }
   }
 };
 };
 
 
 const handleCheckPlanChange = (checkPlanId: any, record: any) => {
 const handleCheckPlanChange = (checkPlanId: any, record: any) => {
-  const selected = planOptions.value?.find((item: any) => item?.id === checkPlanId);
+  const selected = planOptions.value?.find((item: any) => item?.value === checkPlanId);
   record.preserveDetail = selected?.planDetails || '';
   record.preserveDetail = selected?.planDetails || '';
 };
 };
 
 
 const getDeviceLabel = (record: any) => {
 const getDeviceLabel = (record: any) => {
   const code = record?.deviceCode;
   const code = record?.deviceCode;
   const name = record?.deviceName;
   const name = record?.deviceName;
-  if (code && name) return `${code} / ${name}`;
-  return name || code || '';
+  if (code || name) {
+    if (code && name) return `${code} / ${name}`;
+    return name || code || '';
+  }
+
+  const deviceId = record?.deviceId;
+  if (!deviceId) return '';
+
+  const matched = Options.value?.find((item: any) => item?.id === deviceId);
+  const matchedCode = matched?.code;
+  const matchedName = matched?.name;
+  if (matchedCode && matchedName) return `${matchedCode} / ${matchedName}`;
+  return matchedName || matchedCode || '';
 };
 };
 
 
 const goChooseDevice = (record: any) => {
 const goChooseDevice = (record: any) => {
@@ -304,6 +332,12 @@ const handleDeviceOk = () => {
   activeDeviceRecord.value.deviceId = selectedDevice.value.id;
   activeDeviceRecord.value.deviceId = selectedDevice.value.id;
   activeDeviceRecord.value.deviceCode = selectedDevice.value.code;
   activeDeviceRecord.value.deviceCode = selectedDevice.value.code;
   activeDeviceRecord.value.deviceName = selectedDevice.value.name;
   activeDeviceRecord.value.deviceName = selectedDevice.value.name;
+  activeDeviceRecord.value.deviceInfo = {
+    ...(activeDeviceRecord.value.deviceInfo || {}),
+    id: selectedDevice.value.id,
+    code: selectedDevice.value.code,
+    name: selectedDevice.value.name,
+  };
   deviceVisible.value = false;
   deviceVisible.value = false;
 };
 };
 
 
@@ -326,6 +360,13 @@ watch(
   }
   }
 );
 );
 
 
+watch(
+  () => props.modalTitle,
+  (newVal) => {
+    modalTitle.value = newVal;
+  }
+);
+
 // 监听 visible 的变化并通知父组件
 // 监听 visible 的变化并通知父组件
 watch(
 watch(
   () => visible.value,
   () => visible.value,
@@ -339,7 +380,7 @@ watch(
   () => props.initialData,
   () => props.initialData,
   (newVal) => {
   (newVal) => {
     form.value = { ...newVal.form };
     form.value = { ...newVal.form };
-    tableData.value = [...newVal.tableData];
+    tableData.value = (newVal.tableData || []).map(normalizeDetailRow);
   },
   },
   { deep: true }
   { deep: true }
 );
 );

@@ -90,7 +90,7 @@
       :initial-data="initialData"
       :initial-data="initialData"
       :is-view-mode="isViewMode"
       :is-view-mode="isViewMode"
       @submit="handleSubmit"
       @submit="handleSubmit"
-      :title="modalTitle"
+      :modal-title="modalTitle"
     />
     />
   </div>
   </div>
 </template>
 </template>

@@ -97,7 +97,6 @@
                 v-model:value="record.status"
                 v-model:value="record.status"
                 :options="defaultOptions"
                 :options="defaultOptions"
                 :disabled="isViewMode"
                 :disabled="isViewMode"
-                :field-names="{ label: 'name', value: 'id' }"
                 placeholder="请选择"
                 placeholder="请选择"
               />
               />
             </div>
             </div>
@@ -352,6 +351,13 @@ watch(
   }
   }
 );
 );
 
 
+watch(
+  () => props.modalTitle,
+  (newVal) => {
+    modalTitle.value = newVal;
+  }
+);
+
 // 监听 visible 的变化并通知父组件
 // 监听 visible 的变化并通知父组件
 watch(
 watch(
   () => visible.value,
   () => visible.value,

@@ -55,7 +55,7 @@
       v-model:visible="modalVisible"
       v-model:visible="modalVisible"
       :initial-data="initialData"
       :initial-data="initialData"
       :is-view-mode="isViewMode"
       :is-view-mode="isViewMode"
-      :title="modalTitle"
+      :modal-title="modalTitle"
       @submit="handleSubmit"
       @submit="handleSubmit"
     />
     />
   </div>
   </div>