修复产量报表字段映射:添加前端兼容字段(date/quantity/runTime/cuttingTime/dataStatus),产量列直接显示数值

main
haoliang 4 days ago
parent ee0b5da1c1
commit 667e215322

@ -45,7 +45,7 @@
<el-table-column prop="date" label="日期"/>
<el-table-column prop="machineName" label="机床"/>
<el-table-column prop="programName" label="程序名" show-overflow-tooltip/>
<el-table-column label="产量" align="center"><template #default="{row}">{{row.dataStatus==='data_missing'?'-':row.quantity}}</template></el-table-column>
<el-table-column label="产量" align="center"><template #default="{row}">{{row.quantity ?? '-'}}</template></el-table-column>
<el-table-column prop="runTime" label="运行时间" align="center"/>
<el-table-column prop="cuttingTime" label="切削时间" align="center"/>
<el-table-column label="日状态" align="center"><template #default="{row}"><el-tag :type="row.dataStatus==='normal'?'info':row.dataStatus==='offline'?'danger':'warning'" size="small">{{row.dataStatus==='normal'?'正常':row.dataStatus==='offline'?'离线':'缺失'}}</el-tag></template></el-table-column>

@ -18,5 +18,13 @@ namespace CncModels.Dto.Production
public decimal? TotalCuttingTime { get; set; }
public decimal? TotalCycleTime { get; set; }
public int? WorkerId { get; set; }
// 前端兼容字段(序列化时填充)
public string date => ProductionDate.ToString("yyyy-MM-dd");
public decimal quantity => TotalQuantity;
public decimal? runTime => TotalRunTime;
public decimal? cuttingTime => TotalCuttingTime;
public string dataStatus => TotalQuantity > 0 ? "normal" : "data_missing";
public bool isAdjusted => false;
}
}

Loading…
Cancel
Save