diff --git a/src/views/processManagement/bathRefine/addQuantity.vue b/src/views/processManagement/bathRefine/addQuantity.vue index d7a60e1..3e361a9 100644 --- a/src/views/processManagement/bathRefine/addQuantity.vue +++ b/src/views/processManagement/bathRefine/addQuantity.vue @@ -65,7 +65,7 @@ export default { tip: false, simplePage: true, searchShow: true, - searchMenuSpan: 6, + searchMenuSpan: 12, searchIcon: true, searchIndex: 3, tree: false, diff --git a/src/views/processManagement/bathRefine/components/periodicalBatch.vue b/src/views/processManagement/bathRefine/components/periodicalBatch.vue index 75031f5..9017c38 100644 --- a/src/views/processManagement/bathRefine/components/periodicalBatch.vue +++ b/src/views/processManagement/bathRefine/components/periodicalBatch.vue @@ -71,7 +71,7 @@ export default { tip: false, simplePage: true, searchShow: true, - searchMenuSpan: 6, + searchMenuSpan: 12, searchIcon: true, searchIndex: 3, tree: false, diff --git a/src/views/processManagement/components/inPlantMaintenance.vue b/src/views/processManagement/components/inPlantMaintenance.vue index 0500fe0..6c848ee 100644 --- a/src/views/processManagement/components/inPlantMaintenance.vue +++ b/src/views/processManagement/components/inPlantMaintenance.vue @@ -62,9 +62,9 @@ export default { tip: false, simplePage: true, searchShow: true, - searchMenuSpan: 12, + searchMenuSpan: 6, searchIcon: true, - searchIndex: 3, + searchIndex: 3, tree: false, border: true, index: true, diff --git a/src/views/productionSchedulingPlan/schedulingDashboard/container.vue b/src/views/productionSchedulingPlan/schedulingDashboard/container.vue index d580d40..9a445f6 100644 --- a/src/views/productionSchedulingPlan/schedulingDashboard/container.vue +++ b/src/views/productionSchedulingPlan/schedulingDashboard/container.vue @@ -182,7 +182,7 @@
- {{ order.releaseDate }} + {{ order.receiveTime }} {{ order.batchNo }} {{ order.productIdent }} @@ -1093,7 +1093,7 @@ export default { productIdent: firstTask.productIdent, priorityAps: firstTask.priorityAps, teamMembers: firstTask.teamMembers, - releaseDate: firstTask.releaseDate, // 假设这里存在 + receiveTime: firstTask.receiveTime, // 假设这里存在 cardNo: firstTask.cardNo, }); } @@ -1150,16 +1150,16 @@ export default { }); console.log(909090, tasks); // >>>>>>>>>> 新增排序逻辑 <<<<<<<<<< - // 1. 对 orders 按 releaseDate 升序 - orders.sort((a, b) => new Date(a.releaseDate) - new Date(b.releaseDate)); + // 1. 对 orders 按 receiveTime 升序 + orders.sort((a, b) => new Date(a.receiveTime) - new Date(b.receiveTime)); - // 2. 构建 woCode 到 releaseDate 的映射 + // 2. 构建 woCode 到 receiveTime 的映射 const woReleaseMap = {}; orders.forEach(order => { - woReleaseMap[order.woCode] = order.releaseDate; + woReleaseMap[order.woCode] = order.receiveTime; }); - // 3. 对 tasks 按其所属订单的 releaseDate 升序 + // 3. 对 tasks 按其所属订单的 receiveTime 升序 tasks.sort((a, b) => { const dateA = new Date(woReleaseMap[a.woCode] || '1970-01-01'); const dateB = new Date(woReleaseMap[b.woCode] || '1970-01-01');