diff --git a/klp-ui/src/components/HomeModules/StatisticGroup.vue b/klp-ui/src/components/HomeModules/StatisticGroup.vue index 682034c0..a2f75f9e 100644 --- a/klp-ui/src/components/HomeModules/StatisticGroup.vue +++ b/klp-ui/src/components/HomeModules/StatisticGroup.vue @@ -100,7 +100,7 @@ export default { // 顺序请求:前一个请求完成后,再执行下一个 const productRes = await listProduct({ pageSize: 10, pageNum: 1 }); const rawMaterialRes = await listRawMaterial({ pageSize: 10, pageNum: 1 }); - const materialCoilRes = await listMaterialCoil({ pageSize: 10, pageNum: 1, dataType: 1 }); + const materialCoilRes = await listMaterialCoil({ pageSize: 10, pageNum: 1, dataType: 1, status: 1 }); const equipmentRes = await listEquipmentManagement({ pageSize: 1, pageNum: 1, status: 'in_service' }); const orderRes = await listOrder({ pageSize: 1, pageNum: 1 }); const customerRes = await listCustomer({ pageSize: 1, pageNum: 1 }); diff --git a/klp-ui/src/views/wms/coil/typing.vue b/klp-ui/src/views/wms/coil/typing.vue index f0194bd9..96ce964a 100644 --- a/klp-ui/src/views/wms/coil/typing.vue +++ b/klp-ui/src/views/wms/coil/typing.vue @@ -629,7 +629,7 @@ export default { materialType: this.currentInfo.materialType, // 不复制 itemType 和 itemId,让它们由 materialType 自动决定 itemType, - itemId: null, + itemId: this.currentInfo.itemId, grossWeight: parseFloat(this.currentInfo.grossWeight) || null, netWeight: parseFloat(this.currentInfo.netWeight) || null, warehouseId: this.currentInfo.warehouseId, @@ -638,7 +638,7 @@ export default { }; // materialType 会触发 watch,自动设置 itemType 并加载物品列表 - this.$message.success('已复制当前信息'); + this.$message.success('已复制当前信息,包含' + this.currentInfo.materialType + '的相关信息, 请根据需要修改'); }, // 保存更新 diff --git a/klp-ui/src/views/wms/report/zha.vue b/klp-ui/src/views/wms/report/zha.vue index 430a6aea..0223b740 100644 --- a/klp-ui/src/views/wms/report/zha.vue +++ b/klp-ui/src/views/wms/report/zha.vue @@ -201,7 +201,11 @@ export default { }), ]).then(([res1, res2, res3, res4]) => { console.log(res1, res2, res3, res4) - this.list = [...res1.rows, ...res2.rows, ...res3.rows, ...res4.rows] + const list = [...res1.rows, ...res2.rows, ...res3.rows, ...res4.rows] + // 按照createTime 降序排序 + this.list = list.sort( + (a, b) => new Date(b.createTime) - new Date(a.createTime) + ) this.loading = false }) // listPendingAction({