From c9e4f749dfd74f316f6234ba6b12b6bffe7b4127 Mon Sep 17 00:00:00 2001 From: siontion Date: Wed, 28 Feb 2024 11:02:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=20?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 采购订单 列表页搜索 --- .../heli/dal/mysql/purchaseorder/PurchaseOrderMapper.java | 2 +- .../mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseorder/PurchaseOrderMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseorder/PurchaseOrderMapper.java index 7930413a..e24ee345 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseorder/PurchaseOrderMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseorder/PurchaseOrderMapper.java @@ -37,7 +37,7 @@ public interface PurchaseOrderMapper extends BaseMapperX { query.like(!StringUtils.isEmpty(reqVO.getPurchaseNo()), PurchaseOrderDO::getPurchaseNo, reqVO.getPurchaseNo()) .like(!StringUtils.isEmpty(reqVO.getSupplierName()), "s.name", reqVO.getSupplierName()) .like(!StringUtils.isEmpty(reqVO.getMaterialPlanNo()), "m.project_material_plan_no", reqVO.getMaterialPlanNo()) - .apply(reqVO.getCreateTime() != null, "DATE_FORMAT(t.create_time,'%Y-%m-%d') = {0}", reqVO.getCreateTime()) + .apply(!StringUtils.isEmpty(reqVO.getCreateTime()), "DATE_FORMAT(t.create_time,'%Y-%m-%d') = {0}", reqVO.getCreateTime()) .eq(reqVO.getStatus() != null, PurchaseOrderDO::getStatus, reqVO.getStatus()) .eq(reqVO.getPurchaseType() != null, PurchaseOrderDO::getPurchaseType, reqVO.getPurchaseType()) .eq(reqVO.getGoodsType() != null, PurchaseOrderDO::getGoodsType, reqVO.getGoodsType()) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue index 49d1e042..f451866a 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue @@ -168,7 +168,7 @@ const queryParams = reactive({ auditTime: [], description: undefined, creator: undefined, - createTime: [] + createTime: undefined }) const queryFormRef = ref() // 搜索的表单 const exportLoading = ref(false) // 导出的加载中 @@ -189,7 +189,7 @@ const getList = async () => { /** 搜索按钮操作 */ const handleQuery = () => { queryParams.pageNo = 1 - if(queryParams.createTime !== "Invalid Date"){ + if(queryParams.createTime !== "Invalid Date" && queryParams.createTime !== ""){ queryParams.createTime= formatDate(queryParams.createTime, 'YYYY-MM-DD') } getList()