From c7e52782a3caa22b086ad7bbaf9f81b6d3b7c4a3 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Tue, 17 Dec 2024 16:29:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/en-US.ts | 2 ++ src/locales/zh-CN.ts | 1 + .../supplierdeliver/purchasePlanMain/index.vue | 14 +++++++------- .../supplierinvoiceRequestMainDifference.data.ts | 8 ++++---- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index fc0cb56e1..3ab92f9ba 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -1601,6 +1601,8 @@ export default { 通用维修备件:'General maintenance spare parts', '周转箱(周转包装)':'Turnover box (turnover packing)', '外购件':'Outside purchased parts', + '请填供应商信息!':'Please fill in the supplier information!', + }, diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 076ab279b..4541510d0 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1599,6 +1599,7 @@ export default { 通用维修备件:'通用维修备件', '周转箱(周转包装)':'周转箱(周转包装)', '外购件':'外购件', + '请填供应商信息!':'请填供应商信息!', // 自制备件:'', // 自制备件:'', // 自制备件:'', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index aadad7310..303929f8b 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -127,13 +127,6 @@ import { usePageLoading } from '@/hooks/web/usePageLoading' const { loadStart, loadDone } = usePageLoading() const { wsCache } = useCache() const language = wsCache.get('lang') - const announcements = ref([]) - if('en-US'==language){ - announcements.value = ["1. The total number of data items of the quantity of goods in the template does not exceed 1000 data (row × column).","2. All data content in the template is in text format, and formula content cannot be used as import data","3. The delivery date is in YYYY-MM-DD format, no hours, minutes and seconds are required"] - - }else{ - announcements.value = ["1. 模板中要货数量数据项总数不超过1000个数据(行×列)","2. 模板中全部数据内容格式为文本格式,不能使用公式内容作为导入数据","3. 要货日期为YYYY-MM-DD格式,不需填写时分秒"] - } // 要货计划 defineOptions({ name: 'PurchasePlanMain' }) @@ -909,7 +902,14 @@ const handleSelectionPublish = async ()=>{ /** 导入 */ const importFormRef = ref() + const announcements = ref([]) const handleImport = () => { + if('en-US'==language){ + announcements.value = ["1.The total number of data items of the quantity of goods in the template does not exceed 1000 data (row × column)","2. All data content in the template is in text format, and formula content cannot be used as import data","3. The delivery date is in YYYY-MM-DD format, no hours, minutes and seconds are required"] + + }else{ + announcements.value = ["1. 模版中要货数量数据项总数不超过1000个数据(行×列)","2. 模板中全部数据内容格式为文本格式,不能使用公式内容作为导入数据","3. 要货日期为YYYY-MM-DD格式,不需填写时分秒"] + } importFormRef.value.open() } diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts index ef5b2529a..f40ca677f 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts @@ -1939,12 +1939,12 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive