yanghao 6 giorni fa
parent
commit
0acc837d40

+ 9 - 1
src/views/pms/device/DeviceBasicInfo.vue

@@ -108,6 +108,14 @@ const displayDate = (value?: number | string | Date) => {
   return value ? formatDate(value as Date, 'YYYY-MM-DD') : '-'
 }
 
+// 四舍五入保留两位小数,非数字返回原样(交给 displayValue 兜底显示 '-')
+const formatAmount = (value?: string | number | null) => {
+  if (value === null || value === undefined || value === '') return value
+  const num = Number(value)
+  if (Number.isNaN(num)) return value
+  return num.toFixed(2)
+}
+
 const manufactureFields = computed<DisplayField[]>(() => [
   {
     label: '制造商',
@@ -172,7 +180,7 @@ const financeFields = computed<DisplayField[]>(() => [
   },
   {
     label: '每月折旧金额',
-    value: displayValue(props.device.monthAmount)
+    value: displayValue(formatAmount(props.device.monthAmount))
   },
   {
     label: '总折旧月份',

+ 3 - 3
src/views/pms/stat/rykb/rydeviceList.vue

@@ -124,9 +124,9 @@ onMounted(() => {
         class="device-list-table"
         @row-click="handleRowClick">
         <el-table-column prop="projectDeptName" label="项目部" align="center" />
-        <el-table-column prop="teamCount" label="队伍数量" width="72" align="center" />
-        <el-table-column prop="cumulativeDays" label="累计天数" width="72" align="center" />
-        <el-table-column prop="constructionDays" label="施工天数" width="72" align="center" />
+        <el-table-column prop="teamCount" label="队伍数量" align="center" />
+        <el-table-column prop="cumulativeDays" label="累计天数" align="center" />
+        <el-table-column prop="constructionDays" label="施工天数" align="center" />
         <!-- <el-table-column label="注气量(万方)" min-width="150" align="center">
           <template #default="{ row }">
             {{ formatGasInjection(row.gasInjection) }}