From 351c66086b8b10fa8dd74641feda75a7157893a7 Mon Sep 17 00:00:00 2001 From: houjunxiang Date: Thu, 8 Jan 2026 16:12:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=BD=92=E5=BA=93=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- defaultBaseUrl.js | 2 +- pages/sampleWarehouse/returnToStock/index.vue | 1 + pages/sampleWarehouse/sampleSearch/index.vue | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/defaultBaseUrl.js b/defaultBaseUrl.js index e9ab9b3..3ae432c 100644 --- a/defaultBaseUrl.js +++ b/defaultBaseUrl.js @@ -6,7 +6,7 @@ const upgradeBaseUrl = isDev? 'http://172.17.19.29:48080/admin-api':'http://172 const websocketUrl = isDev ? 'ws://172.17.19.11:30330' : 'ws://172.17.19.11:30330' // 公司测试环境 -// const BaseUrl = isDev ? 'http://192.168.26.116:888/admin-api' : 'http://192.168.26.116:888/admin-api' +// const BaseUrl = isDev ? 'http://192.168.26.163:48080/admin-api' : 'http://192.168.26.116:888/admin-api' // const upgradeBaseUrl = isDev ? 'http://192.168.26.116:888/admin-api' : 'http://192.168.26.116:888/admin-api' // const websocketUrl = isDev ? 'ws://192.168.26.116:888/ws' : 'ws://192.168.26.116:888/ws' diff --git a/pages/sampleWarehouse/returnToStock/index.vue b/pages/sampleWarehouse/returnToStock/index.vue index 0918a3a..d1d7379 100644 --- a/pages/sampleWarehouse/returnToStock/index.vue +++ b/pages/sampleWarehouse/returnToStock/index.vue @@ -90,6 +90,7 @@ function handleReturnToStock() { icon: 'none' }) if (res.isPrint == 1) { + res.returnTime = nx.$dayjs(res.returnTime).format('YYYY-MM-DD') // 执行打印 nx.$print.print({ ...res, printTemplate: 'returnLabel' }) } diff --git a/pages/sampleWarehouse/sampleSearch/index.vue b/pages/sampleWarehouse/sampleSearch/index.vue index 0e7c904..26e1b77 100644 --- a/pages/sampleWarehouse/sampleSearch/index.vue +++ b/pages/sampleWarehouse/sampleSearch/index.vue @@ -124,6 +124,7 @@ async function getSampleDetail() { let btnLoading = ref(false) function handlePrint() { btnLoading.value = true + sampleData.value.returnTime = nx.$dayjs(sampleData.value.returnTime).format('YYYY-MM-DD') nx.$print.print({ ...sampleData.value, printTemplate: 'returnLabel' }) btnLoading.value = false }