Browse Source

pms 日报 分配任务页面 同时显示施工设备的 名称和编码

zhangcl 2 weeks ago
parent
commit
ccf1e6813e
1 changed files with 18 additions and 12 deletions
  1. 18 12
      src/views/pms/iotprojecttask/IotProjectTaskForm.vue

+ 18 - 12
src/views/pms/iotprojecttask/IotProjectTaskForm.vue

@@ -2008,28 +2008,34 @@ const validateAllRows = (): boolean => {
 const formatDevicesForForm = (deviceIds: number[]) => {
   if (!deviceIds || deviceIds.length === 0) return '';
 
-  const deviceNames = deviceIds
-    .map(id => deviceMap.value[id]?.deviceCode)
-    .filter(name => name !== undefined && name !== '');
+  const deviceInfos = deviceIds
+     .map(id => {
+       const device = deviceMap.value[id];
+       return device ? `${device.deviceCode}-${device.deviceName}` : '';
+     })
+     .filter(info => info !== '');
 
-  if (deviceNames.length === 0) return '';
+   if (deviceInfos.length === 0) return '';
 
-  if (deviceNames.length > 2) {
-    return `${deviceNames[0]}, ${deviceNames[1]}...`;
-  }
+   if (deviceInfos.length > 2) {
+     return `${deviceInfos[0]}, ${deviceInfos[1]}...`;
+   }
 
-  return deviceNames.join(', ');
+   return deviceInfos.join(', ');
 };
 
 // 获取所有设备名称(用于表单的tooltip)
 const getAllDeviceNamesForForm = (deviceIds: number[]) => {
   if (!deviceIds || deviceIds.length === 0) return '无设备';
 
-  const deviceNames = deviceIds
-    .map(id => deviceMap.value[id]?.deviceCode || '未知设备')
-    .filter(name => name !== '未知设备');
+  const deviceInfos = deviceIds
+     .map(id => {
+       const device = deviceMap.value[id];
+       return device ? `${device.deviceCode}-${device.deviceName}` : '未知设备';
+     })
+     .filter(info => info !== '未知设备');
 
-  return deviceNames.join(', ') || '无有效设备';
+   return deviceInfos.join(', ') || '无有效设备';
 };
 
 // 格式化责任人显示(用于表单)