From a4f44f5bd22f2090938df4188e9ef8a197d8668e Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 26 Dec 2023 11:17:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E7=AE=A1=E5=85=A5=E5=BA=93=E7=A9=BA?=
=?UTF-8?q?=E7=AE=A1=E5=87=BA=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
locale/en.json | 11 ++++++++-
locale/id.json | 11 ++++++++-
locale/zh-Hans.json | 11 ++++++++-
pages/ProductManage/EmptyPipeInStore.vue | 29 +++++++++++++----------
pages/ProductManage/EmptyPipeOutStore.vue | 24 ++++++++++---------
5 files changed, 59 insertions(+), 27 deletions(-)
diff --git a/locale/en.json b/locale/en.json
index 6a9c348..f7b0e8d 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -23,6 +23,7 @@
"button.upload-empty-shaft": "Upload empty shaft",
"button.scrap-foil-roll-down": "Scrap foil roll down",
"button.outbound-delivery": "Outbound delivery",
+ "button.storage-settings": "Storage settings",
"login.username": "User name",
"login.password": "Password",
"login.remember": "Remember username",
@@ -87,6 +88,8 @@
"filter.starting-point": "Starting point",
"filter.finishing-point": "Finishing point",
"filter.device": "Device",
+ "filter.material": "Material",
+ "filter.quantity": "Quantity",
"filter.air-shaft": "Air shaft",
"filter.vehicle-code": "Vehicle code",
"filter.last-roll-down": "Last roll down",
@@ -123,6 +126,12 @@
"grid.FRP-pipe-specifications": "FRP pipe specifications",
"grid.place": "Place",
"grid.delivery-completed": "Delivery completed",
+ "grid.material-name": "Material name",
"toast.point-not-empty": "The point cannot be empty",
- "toast.select-cache-point": "Please select a cache point"
+ "toast.select-cache-point": "Please select a cache point",
+ "toast.select-device": "Please select a device",
+ "toast.select-row": "Please select a row",
+ "toast.device-not-empty": "The device cannot be empty",
+ "toast.material-not-empty": "Material cannot be empty",
+ "toast.quantity-not-empty": "数量不能为空"
}
\ No newline at end of file
diff --git a/locale/id.json b/locale/id.json
index 13d53f9..3d760a8 100644
--- a/locale/id.json
+++ b/locale/id.json
@@ -23,6 +23,7 @@
"button.upload-empty-shaft": "Memuat naik shaft kosong",
"button.scrap-foil-roll-down": "Scrap foil roll down",
"button.outbound-delivery": "Pengiriman keluar",
+ "button.storage-settings": "Pengaturan penyimpanan",
"login.username": "Nama pengguna",
"login.password": "Sandi",
"login.remember": "Ingat nama pengguna",
@@ -89,6 +90,8 @@
"filter.starting-point": "Titik awal",
"filter.finishing-point": "Titik akhir",
"filter.device": "Peralatan",
+ "filter.material": "Material",
+ "filter.quantity": "Jumlah",
"filter.air-shaft": "Paksi inflasi",
"filter.vehicle-code": "Kode kendaraan",
"filter.last-roll-down": "Roll terakhir turun",
@@ -123,6 +126,12 @@
"grid.FRP-pipe-specifications": "Spesifikasi pipa FRP",
"grid.place": "Tempat",
"grid.delivery-completed": "Pengiriman selesai",
+ "grid.material-name": "Nama Material",
"toast.point-not-empty": "Titik tidak dapat kosong",
- "toast.select-cache-point": "Silakan pilih lokasi cache"
+ "toast.select-cache-point": "Silakan pilih lokasi cache",
+ "toast.select-device": "Silakan pilih perangkat",
+ "toast.select-row": "Silakan pilih baris",
+ "toast.device-not-empty": "Perangkat tidak dapat kosong",
+ "toast.material-not-empty": "Material tidak dapat kosong",
+ "toast.quantity-not-empty": "Kuantitas tidak dapat kosong"
}
\ No newline at end of file
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index 7999b1d..d37c936 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -23,6 +23,7 @@
"button.upload-empty-shaft": "上空轴",
"button.scrap-foil-roll-down": "废箔下卷",
"button.outbound-delivery": "出站配送",
+ "button.storage-settings": "入库设置",
"login.username": "用户名",
"login.password": "密码",
"login.remember": "记住用户名",
@@ -87,6 +88,8 @@
"filter.starting-point": "起点",
"filter.finishing-point": "起点",
"filter.device": "设备",
+ "filter.material": "物料",
+ "filter.quantity": "数量",
"filter.air-shaft": "气涨轴",
"filter.vehicle-code": "载具码",
"filter.last-roll-down": "末次下卷",
@@ -123,6 +126,12 @@
"grid.FRP-pipe-specifications": "FRP管规格",
"grid.place": "位置",
"grid.delivery-completed": "配送完成",
+ "grid.material-name": "物料名称",
"toast.point-not-empty": "点位不能为空",
- "toast.select-cache-point": "请选择缓存点位"
+ "toast.select-cache-point": "请选择缓存点位",
+ "toast.select-device": "请选择设备",
+ "toast.select-row": "请选择一行",
+ "toast.device-not-empty": "设备不能为空",
+ "toast.material-not-empty": "物料不能为空",
+ "toast.quantity-not-empty": "数量不能为空"
}
\ No newline at end of file
diff --git a/pages/ProductManage/EmptyPipeInStore.vue b/pages/ProductManage/EmptyPipeInStore.vue
index 99645c3..8f6180d 100644
--- a/pages/ProductManage/EmptyPipeInStore.vue
+++ b/pages/ProductManage/EmptyPipeInStore.vue
@@ -1,28 +1,28 @@
-
+
- 区域
+ {{$t('filter.area')}}
-
+
- 设备
+ {{$t('filter.device')}}
-
+
- 物料
+ {{$t('filter.material')}}
-
+
- 数量
+ {{$t('filter.quantity')}}
@@ -30,8 +30,8 @@
-
-
+
+
@@ -127,7 +127,8 @@
async _taskQuerydevice () {
if (!this.index2) {
uni.showToast({
- title: '请选择设备',
+ // title: '请选择设备',
+ title: this.$t('toast.select-device'),
icon: 'none'
})
return
@@ -142,7 +143,8 @@
this.disabled = true
if (!this.index2) {
uni.showToast({
- title: '设备不能为空',
+ // title: '设备不能为空',
+ title: this.$t('toast.device-not-empty'),
icon: 'none'
})
this.disabled = false
@@ -150,7 +152,8 @@
}
if (!this.index3) {
uni.showToast({
- title: '物料不能为空',
+ // title: '物料不能为空',
+ title: this.$t('toast.material-not-empty'),
icon: 'none'
})
this.disabled = false
diff --git a/pages/ProductManage/EmptyPipeOutStore.vue b/pages/ProductManage/EmptyPipeOutStore.vue
index 42dac6f..1aa0eb7 100644
--- a/pages/ProductManage/EmptyPipeOutStore.vue
+++ b/pages/ProductManage/EmptyPipeOutStore.vue
@@ -1,16 +1,16 @@
-
+
- 区域
+ {{$t('filter.area')}}
-
+
- 数量
+ {{$t('filter.quantity')}}
@@ -21,9 +21,9 @@
- | 设备 |
- 物料名称 |
- 数量 |
+ {{$t('filter.device')}} |
+ {{$t('grid.material-name')}} |
+ {{$t('filter.quantity')}} |
@@ -38,8 +38,8 @@
-
-
+
+
@@ -87,7 +87,8 @@
this.disabled = true
if (!this.pkId) {
uni.showToast({
- title: '请选择一行',
+ // title: '请选择一行',
+ title: this.$t('toast.select-row'),
icon: 'none'
})
this.disabled = false
@@ -95,7 +96,8 @@
}
if (!this.qty) {
uni.showToast({
- title: '请填写数量',
+ // title: '请填写数量',
+ title: this.$t('toast.quantity-not-empty'),
icon: 'none'
})
this.disabled = false