快乐的昕的电脑
2025-11-24 19d6d3e4e4d807237fff95bc08dae2a4c00fdced
components/WorkOrderPrint.vue
@@ -22,13 +22,14 @@
                                <th>工单号</th>
                                <th>产品名称</th>
                                <th>计划生产数</th>
                                <th>未报工数量</th> <!-- 新增 -->
                                <th>未报工数量</th>
                                <th>机台号</th>
                                <th>初始采集数</th>
                                <th>报工时采集数</th>
                                <th>基于数采的报工数</th>
                                <th>不良数</th>
                                <th>良品数(计算)</th>
                                <th>报工类型</th> <!-- 新增 -->
                            </tr>
                        </thead>
                        <tbody>
@@ -45,6 +46,9 @@
                                <td>{{ order.currentCjNum - order.initCjNum }}</td>
                                <td>{{ realTimeDefectiveCount }}</td>
                                <td>{{ realTimeOkCount }}</td>
                                <td>
                                    {{ order.daa018 === '开工' ? '生产报工' : '调机报工' }}
                                </td>
                            </tr>
                        </tbody>
                    </table>
@@ -67,6 +71,7 @@
                                <th>报工数(计算)</th>
                                <th>不良数</th>
                                <th>良品数(计算)</th>
                                <th>报工类型</th> <!-- 新增 -->
                            </tr>
                        </thead>
                        <tbody>
@@ -82,9 +87,10 @@
                                <td>{{ r.totalProduction }}</td>
                                <td>{{ r.BfQty }}</td>
                                <td>{{ r.OkQty }}</td>
                                <td>{{ r.reportType || '-' }}</td> <!-- 新增 -->
                            </tr>
                            <tr v-if="!reportingHistory.length">
                                <td colspan="11" class="no-data">暂无历史报工记录</td>
                                <td colspan="12" class="no-data">暂无历史报工记录</td>
                            </tr>
                        </tbody>
                    </table>
@@ -399,7 +405,8 @@
                            productionCount: r.cjQty ?? 0,//报工时采集数
                            totalProduction: (r.cjQty - r.csQty) ?? 0,//报工数(计算)
                            BfQty: r.bfQty,//不良数
                            OkQty: r.okQty//良品数(计算)
                            OkQty: r.okQty,//良品数(计算)
                            reportType:r.remark //报工类型
                        }
                    });
                }).catch(() => { this.reportingHistory = []; });
@@ -703,7 +710,8 @@
            border: 1px solid #555;
            padding: 6px 8px;
            text-align: center;
            white-space: nowrap;
            white-space: normal; /*允许换行*/
            word-break: break-all; /*长单词 /数字也换行*/
        }
    .status-section {