快乐的昕的电脑
2025-10-16 74c3a9d6fecf54c566752ea8a9b98d7c4beb62bf
数据库字段做映射
已修改1个文件
42 ■■■■ 文件已修改
components/WorkOrderPrint.vue 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
components/WorkOrderPrint.vue
@@ -37,17 +37,17 @@
                            </tr>
                            <!-- 历史报工记录行 -->
                            <tr v-for="(r, idx) in reportingHistory" :key="idx">
                                <td>{{ r.time }}</td>
                                <td>{{ r.staff || '-' }}</td>
                                <td>{{ r.orderNo || '-' }}</td>
                                <td>{{ r.productName || '-' }}</td>
                                <td>{{ r.planQty }}</td>
                                <td>{{ r.machineNo || '-' }}</td>
                                <td>{{ r.initialValue }}</td>
                                <td>{{ r.productionCount }}</td>
                                <td>{{ r.totalProduction }}</td>
                                <td>{{ r.defective }}</td>
                                <td>{{ r.good }}</td>
                                <td>{{ r.bgDate }}</td><!--时间-->
                                <td>{{ r.staff || '-' }}</td><!--报工人-->
                                <td>{{ r.orderNo || '-' }}</td><!--工单号-->
                                <td>{{ order.daa003 || '-' }}</td><!--产品名称-->
                                <td>{{ planQtyDisplay }}</td><!--计划生产数-->
                                <td>{{ r.machineNo || '-' }}</td><!--机台号-->
                                <td>{{ r.initialValue }}</td><!--初始采集数-->
                                <td>{{ r.productionCount }}</td><!--报工时采集数-->
                                <td>{{ r.totalProduction }}</td><!--报工数(计算)-->
                                <td>{{ r.BfQty }}</td><!--不良数-->
                                <td>{{ r.OkQty }}</td><!--良品数(计算)-->
                            </tr>
                            <tr v-if="!reportingHistory.length">
                                <td colspan="11" class="no-data">暂无历史报工记录</td>
@@ -300,17 +300,15 @@
                    this.reportingHistory = list.map(r => {
                        // 依据你数据库字段做映射(下面字段名按常见命名举例,需要按实际改)
                        return {
                            time: r.bgDate || r.startTime || r.createTime || '',        // 开始时间
                            staff: (r.staffNo ? (r.staffNo + ' ' + (r.staffName || '')) : (r.staffName || '')),
                            orderNo: r.billNo || this.orderNo,
                            productName: r.daa003 || this.order?.daa003,
                            planQty: this.planQtyDisplay,
                            machineNo: r.machineNo || this.machineNo,
                            initialValue: r.initialValue ?? 0,
                            productionCount: r.productionCount ?? r.todayOutput ?? 0,
                            totalProduction: r.kgQty ?? r.totalProduction ?? 0,
                            good: r.sQuantity ?? r.okQty ?? 0,
                            defective: r.ngQty
                            bgDate: r.bgDate || '', // 报工时间
                            staff: (r.staffNo ? (r.staffNo + ' ' + (r.staffName || '')) : (r.staffName || '')),//报工人
                            orderNo: r.billNo,//工单号
                            machineNo: r.MachineNo ,//机台号
                            initialValue: r.CsQty ?? 0,//初始采集数
                            productionCount: r.CjQty ?? 0,//报工时采集数
                            totalProduction: (r.CjQty - r.CsQty) ?? 0,//报工数(计算)
                            BfQty: r.BfQty ?? 0,//不良数
                            OkQty: r.OkQty ?? 0//良品数(计算)
                        }
                    });
                }).catch(() => { this.reportingHistory = []; });