From f8249576d14b80387b9159595936ad85a15715b1 Mon Sep 17 00:00:00 2001 From: yf <770153798@qq.com> Date: Mon, 16 Dec 2024 15:33:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=9A=E8=AF=AD=E8=A8=80=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hangtag-ui/hangtag-ui-front/src/locales/en.ts | 5 ++++- hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts | 3 +++ .../src/views/oms/order/createorder/index.vue | 8 ++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/hangtag-ui/hangtag-ui-front/src/locales/en.ts b/hangtag-ui/hangtag-ui-front/src/locales/en.ts index 8d9c48d..fcae61e 100644 --- a/hangtag-ui/hangtag-ui-front/src/locales/en.ts +++ b/hangtag-ui/hangtag-ui-front/src/locales/en.ts @@ -661,7 +661,10 @@ export default { "labelColOrderQty": "Order Quantity", "tipsDuplicateSkipped": "Duplicate products skipped.", "tipsAppendSuccess": "Added successfully.", - "btnAddSku": "Add SKU" + "btnAddSku": "Add SKU", + "tipsSkuError1": 'The SKU of the ', // The SKU of the + "tipsSkuError2": 'cannot be left blank.', //cannot be left blank. + "tipsSkuError3": 'Please review', //Please review }, "productDialogList": { "title": "Product List", diff --git a/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts b/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts index 0e31e67..5cfd663 100644 --- a/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts +++ b/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts @@ -658,6 +658,9 @@ export default { tipsDuplicateSkipped: '已跳过重复产品', tipsAppendSuccess: '添加成功', btnAddSku: '添加SKU', + tipsSkuError1: 'SKU中 ', // The SKU of the + tipsSkuError2: '不能为空', //cannot be left blank. + tipsSkuError3: '请批稿', //Please review }, productDialogList:{ title: '产品列表', diff --git a/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue b/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue index 528df4f..757dc9b 100644 --- a/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue +++ b/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue @@ -664,17 +664,17 @@ const submitPreHandler = (showMsg = true) => { tableData.forEach((item, index) => { if (!item.productSkuList || item.productSkuList.length === 0) { - const t = `The SKU of the "${item.productName}" in row ${index + 1} cannot be left blank.`; + const msg = `${ t("createOrder.tipsSkuError1")} "${item.productName}" ${index + 1} ${t("createOrder.tipsSkuError2")}`; if (showMsg) { - useMessage().warning(t) + useMessage().warning(msg) } - reject(t) + reject(msg) return; } item.productSkuList.forEach((item2, i2) => { console.log("item2",item2) if (item2.productTemplateType === '1' && !item2.previewImage) { - const t = ` Please review row${index + 1} ‘${item.productName}’SKU ${i2 + 1}`; + const t = `${("createOrder.tipsSkuError3")} ${index + 1} ‘${item.productName}’SKU ${i2 + 1}`; if (showMsg) { useMessage().warning(t) }