src/views/productionManagement/productionOrder/components/MaterialLedgerDialog.vue
@@ -189,7 +189,20 @@ const currentMaterialSelectRowIndex = ref(-1); let materialTempId = 0; const createMaterialRow = (row = {}) => ({ const getDefaultBatchNo = batchNoList => { if (!Array.isArray(batchNoList) || batchNoList.length === 0) return []; return [batchNoList[0]]; }; const createMaterialRow = (row = {}) => { const batchNoList = Array.isArray(row.batchNoList) ? row.batchNoList : []; const batchNo = row.batchNo ? typeof row.batchNo === "string" ? row.batchNo.split(",") : row.batchNo : getDefaultBatchNo(batchNoList); return { tempId: row.id || `temp_${++materialTempId}`, id: row.id, processId: row.processId || row.technologyOperationId, @@ -202,13 +215,10 @@ demandedQuantity: Number(row.requiredQty ?? row.demandedQuantity ?? 0), unit: row.unit || "", pickQty: Number(row.pickQty ?? row.pickQuantity ?? row.requiredQty ?? row.demandedQuantity ?? 0), batchNo: row.batchNo ? typeof row.batchNo === "string" ? row.batchNo.split(",") : row.batchNo : [], batchNoList: row.batchNoList || [], }); batchNo, batchNoList, }; }; const getProcessOptions = async () => { if (!props.orderRow?.id) return; @@ -329,7 +339,8 @@ product.materialName || product.productName || product.name || ""; row.materialModel = product.materialModel || product.model || ""; row.unit = product.unit || product.measureUnit || ""; row.batchNoList = product.batchNoList; row.batchNoList = Array.isArray(product.batchNoList) ? product.batchNoList : []; row.batchNo = getDefaultBatchNo(row.batchNoList); currentMaterialSelectRowIndex.value = -1; materialProductDialogVisible.value = false; }; src/views/productionManagement/productionTraceability/index.vue
@@ -132,8 +132,8 @@ <el-descriptions-item label="生产工单号">{{ detailData.workOrder.workOrderNo || '-' }}</el-descriptions-item> <el-descriptions-item label="计划数量">{{ detailData.workOrder.planQuantity || 0 }}</el-descriptions-item> <el-descriptions-item label="完成数量">{{ detailData.workOrder.completeQuantity || 0 }}</el-descriptions-item> <el-descriptions-item label="实际开始时间">{{ parseTime(detailData.workOrder.actualStartTime) || '-' }}</el-descriptions-item> <el-descriptions-item label="实际结束时间">{{ parseTime(detailData.workOrder.actualEndTime) || '-' }}</el-descriptions-item> <el-descriptions-item label="实际开始时间">{{ parseTime(detailData.workOrder.actualStartTime, '{y}-{m}-{d}') || '-' }}</el-descriptions-item> <el-descriptions-item label="实际结束时间">{{ parseTime(detailData.workOrder.actualEndTime, '{y}-{m}-{d}') || '-' }}</el-descriptions-item> <!-- <el-descriptions-item label="完成进度"> <el-progress :percentage="detailData.workOrder.completionStatus >= 100 ? 100 : (detailData.workOrder.completionStatus || 0)" :color="customColors(detailData.workOrder.completionStatus)" @@ -230,10 +230,10 @@ :key="record.id" class="quality-record-block"> <div class="detail-section"> <h3 class="section-title">检测记录 {{ index + 1 }} - {{ parseTime(record.createTime) }}</h3> <h3 class="section-title">检测记录 {{ index + 1 }} - {{ parseTime(record.createTime, '{y}-{m}-{d}') }}</h3> <el-descriptions :column="3" border> <el-descriptions-item label="检测日期">{{ parseTime(record.createTime) || '-' }}</el-descriptions-item> <el-descriptions-item label="检测日期">{{ parseTime(record.createTime, '{y}-{m}-{d}') || '-' }}</el-descriptions-item> <el-descriptions-item label="报工单号">{{ record.reportNo || '-' }}</el-descriptions-item> <el-descriptions-item label="检验员">{{ record.userName || '-' }}</el-descriptions-item> <el-descriptions-item label="产品名称">{{ record.productName || '-' }}</el-descriptions-item>
