From 64e4586748cc0a2ba8594d05b9545fc66adc25b0 Mon Sep 17 00:00:00 2001 From: hyy Date: Wed, 12 Jun 2024 12:34:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=97=A8=E5=BA=97=E6=97=B6=20=E6=8A=A5=E9=94=99=E2=80=9C?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=BAid=E4=B8=8D=E8=83=BD=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E2=80=9D=20=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/controller/admin/storeshop/vo/StoreShopBaseVO.java | 2 +- yshop-drink-vue3/src/views/mall/store/shop/ShopForm.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/yshop-drink-boot3/yshop-module-mall/yshop-module-store-biz/src/main/java/co/yixiang/yshop/module/store/controller/admin/storeshop/vo/StoreShopBaseVO.java b/yshop-drink-boot3/yshop-module-mall/yshop-module-store-biz/src/main/java/co/yixiang/yshop/module/store/controller/admin/storeshop/vo/StoreShopBaseVO.java index ead713f..08ce3e5 100644 --- a/yshop-drink-boot3/yshop-module-mall/yshop-module-store-biz/src/main/java/co/yixiang/yshop/module/store/controller/admin/storeshop/vo/StoreShopBaseVO.java +++ b/yshop-drink-boot3/yshop-module-mall/yshop-module-store-biz/src/main/java/co/yixiang/yshop/module/store/controller/admin/storeshop/vo/StoreShopBaseVO.java @@ -76,7 +76,7 @@ public class StoreShopBaseVO { private List adminId; @Schema(description = "打印机id", required = true, example = "5596") - @NotNull(message = "打印机id不能为空") + //@NotNull(message = "打印机id不能为空") private String uniprintId; @Schema(description = "营业开始时间", required = true) diff --git a/yshop-drink-vue3/src/views/mall/store/shop/ShopForm.vue b/yshop-drink-vue3/src/views/mall/store/shop/ShopForm.vue index 474cec7..8f1b19c 100644 --- a/yshop-drink-vue3/src/views/mall/store/shop/ShopForm.vue +++ b/yshop-drink-vue3/src/views/mall/store/shop/ShopForm.vue @@ -133,7 +133,7 @@ const formRules = reactive({ notice: [{ required: true, message: '公告不能为空', trigger: 'blur' }], status: [{ required: true, message: '是否营业:0=否,1=是不能为空', trigger: 'blur' }], adminId: [{ required: true, message: '管理员id不能为空', trigger: 'blur' }], - uniprintId: [{ required: true, message: '打印机id不能为空', trigger: 'blur' }], + //uniprintId: [{ required: true, message: '打印机id不能为空', trigger: 'blur' }], startTime: [{ required: true, message: '营业开始时间不能为空', trigger: 'blur' }], endTime: [{ required: true, message: '营业结束时间不能为空', trigger: 'blur' }] }) @@ -155,7 +155,7 @@ const open = async (type: string, id?: number) => { formType.value = type resetForm() getList() - getPrintList() + //getPrintList() // 修改时，设置数据 if (id) { formLoading.value = true From 73e2d7a0588df99219d0dab88f5c1b9d2f4bd8c3 Mon Sep 17 00:00:00 2001 From: hyy Date: Wed, 12 Jun 2024 12:34:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=20=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=20=E8=90=A5=E4=B8=9A=E6=97=B6=E9=97=B4=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=88=90=E6=97=A5=E6=9C=9F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yshop-drink-vue3/src/utils/formatTime.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/yshop-drink-vue3/src/utils/formatTime.ts b/yshop-drink-vue3/src/utils/formatTime.ts index 134a986..0b150c4 100644 --- a/yshop-drink-vue3/src/utils/formatTime.ts +++ b/yshop-drink-vue3/src/utils/formatTime.ts @@ -202,13 +202,24 @@ export function dateFormatter(_row: any, _column: TableColumnCtx, cellValue } /** - * element plus 的时间 Formatter 实现，使用 YYYY-MM-DD 格式 + * element plus 的时间 Formatter 实现，使用 HH:mm:ss 格式 * * @param row 行数据 * @param column 字段 * @param cellValue 字段值 */ export function dateFormatter2(_row: any, _column: TableColumnCtx, cellValue: any): string { + return cellValue ? formatDate(cellValue, 'HH:mm:ss') : '' +} + +/** + * element plus 的时间 Formatter 实现，使用 YYYY-MM-DD 格式 + * + * @param row 行数据 + * @param column 字段 + * @param cellValue 字段值 + */ +export function dateFormatter3(_row: any, _column: TableColumnCtx, cellValue: any): string { return cellValue ? formatDate(cellValue, 'YYYY-MM-DD') : '' }