diff --git a/locale/en.json b/locale/en.json
index 856bdc5..f7b0e8d 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -5,9 +5,25 @@
"utils.read-more": "Read more",
"utils.no-more": "No more",
"button.confirm": "OK",
+ "button.cancel": "Cancel",
"button.search": "Query",
"button.confirm-receipt": "Confirm receipt",
"button.confirm-outbound": "Confirm outbound",
+ "button.empty-shaft-return": "Empty shaft return",
+ "button.through-shaft-confirm": "Through shaft confirm",
+ "button.pull-shaft-confirm": "Pull shaft confirm",
+ "button.overlap-shaft-confirm": "Overlap shaft confirm",
+ "button.manual-call": "Manual call",
+ "button.call": "Call",
+ "button.vehicle-lateral-movement": "Vehicle lateral movement",
+ "button.call-vehicle": "Call vehicle",
+ "button.delivery-check": "Delivery check",
+ "button.delivery-confirm": "Delivery confirm",
+ "button.vehicle-return": "Vehicle return",
+ "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",
@@ -39,8 +55,8 @@
"menu.splitting-management": "Splitting management",
"menu.cutting-and-feeding": "Cutting and feeding",
"menu.hollow-shaft-sleeve": "Hollow shaft sleeve",
- "menu.empty-axis-delivery": "Empty axis delivery",
- "menu.empty-axis-entry-station": "Empty axis entry station",
+ "menu.empty-shaft-delivery": "Empty shaft delivery",
+ "menu.empty-shaft-entry-station": "Empty shaft entry station",
"menu.subroll-outbound": "Subroll Outbound",
"menu.point-management": "Point management",
"menu.abnormal-outbound-unlocking": "Abnormal outbound unlocking",
@@ -58,8 +74,8 @@
"menu.in-stock-management": "In stock management",
"menu.inventory-management": "Inventory management",
"menu.vehicle-management": "Vehicle management",
- "menu.empty-tool-storage": "Empty tool storage",
- "menu.empty-tools-leaving-the-warehouse": "Empty tools leaving the warehouse",
+ "menu.empty-vehicle-entering-the-warehouse": "Empty vehicle entering the warehouse",
+ "menu.empty-vehicle-leaving-the-warehouse": "Empty vehicle leaving the warehouse",
"menu.print-management": "Print management",
"menu.customer-label-printing": "Customer label printing",
"menu.scheduling-management": "Scheduling management",
@@ -69,8 +85,20 @@
"filter.point": "Point",
"filter.mother-roll": "Mother roll",
"filter.state": "State",
+ "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",
+ "filter.cache-point": "Cache point",
+ "grid.number": "No.",
+ "grid.select": "Select",
"grid.work-order-number": "Work order number",
"grid.mother-roll-number": "Mother roll number",
+ "grid.sub-roll-number": "Sub roll number",
"grid.start-time": "Start time",
"grid.end-time": "End time",
"grid.machine-code": "Machine code",
@@ -84,5 +112,26 @@
"grid.product-description": "Product description",
"grid.in-oven-time": "In oven time",
"grid.out-oven-time": "Out oven time",
- "grid.is-it-baked": "Is it baked"
+ "grid.is-it-baked": "Is it baked",
+ "grid.split-group": "Split group",
+ "grid.production-sequence": "Production sequence",
+ "grid.date-of-manufacture": "Date of manufacture",
+ "grid.order-number": "Order No.",
+ "grid.paper-FRP-tube": "Paper tube/FRP tube",
+ "grid.paper-tube-material-code": "Paper tube material code",
+ "grid.paper-tube-material-description": "Paper tube material description",
+ "grid.paper-tube-specifications": "Paper tube specifications",
+ "grid.FRP-pipe-material-code": "FRP pipe material code",
+ "grid.FRP-pipe-material-description": "FRP pipe material description",
+ "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-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 a6802dc..3d760a8 100644
--- a/locale/id.json
+++ b/locale/id.json
@@ -5,9 +5,25 @@
"utils.read-more": "Lihat lebih",
"utils.no-more": "Tidak lagi",
"button.confirm": "OK",
+ "button.cancel": "Batalkan",
"button.search": "pertanyaan",
"button.confirm-receipt": "Konfirmasi penerimaan",
"button.confirm-outbound": "Konfirmasi keluar",
+ "button.empty-shaft-return": "Kembali shaft kosong",
+ "button.through-shaft-confirm": "Melalui konfirmasi shaft",
+ "button.pull-shaft-confirm": "Pull shaft konfirmasi",
+ "button.overlap-shaft-confirm": "Konfirmasi paksi Overlap",
+ "button.manual-call": "Panggilan manual",
+ "button.call": "Panggilan",
+ "button.vehicle-lateral-movement": "Gerakan lateral kendaraan",
+ "button.call-vehicle": "Panggil kendaraan",
+ "button.delivery-check": "Verifikasi pengiriman",
+ "button.delivery-confirm": "Konfirmasi pengiriman",
+ "button.vehicle-return": "Kembali kendaraan",
+ "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",
@@ -39,8 +55,8 @@
"menu.splitting-management": "Manajemen pembagian",
"menu.cutting-and-feeding": "Memotong dan memberi makan",
"menu.hollow-shaft-sleeve": "Lengan peluru kosong",
- "menu.empty-axis-delivery": "Pengiriman paksi kosong",
- "menu.empty-axis-entry-station": "Stasiun masukan paksi kosong",
+ "menu.empty-shaft-delivery": "Pengiriman shaft kosong",
+ "menu.empty-shaft-entry-station": "Stasiun masuk shaft kosong",
"menu.subroll-outbound": "Subroll Keluar",
"menu.point-management": "Manajemen titik",
"menu.abnormal-outbound-unlocking": "Pembukaan keluar tidak normal",
@@ -58,19 +74,31 @@
"menu.in-stock-management": "Dalam manajemen saham",
"menu.inventory-management": "Manajemen inventori",
"menu.vehicle-management": "Manajemen kendaraan",
- "menu.empty-tool-storage": "Penyimpanan alat kosong",
- "menu.empty-tools-leaving-the-warehouse": "Alat kosong meninggalkan gudang",
+ "menu.empty-vehicle-entering-the-warehouse": "Kendaraan kosong masuk ke gudang",
+ "menu.empty-vehicle-leaving-the-warehouse": "Kendaraan kosong meninggalkan gudang",
"menu.print-management": "Manajemen Cetak",
"menu.customer-label-printing": "Cetakan label pelanggan",
"menu.scheduling-management": "Manajemen jadwal",
"menu.task-management": "Manajemen tugas",
"menu.rgv-status-query": "Pertanyaan status RGV",
"filter.area": "Daerah",
+ "grid.number": "Nomor",
+ "grid.select": "Pilihan",
"filter.point": "Posisi titik",
"filter.mother-roll": "Mother roll",
"filter.state": "Keadaan",
+ "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",
+ "filter.cache-point": "Titik Cache",
"grid.work-order-number": "Nomor urutan kerja",
- "grid.mother-roll-number": "Nomor Roll Ibu",
+ "grid.mother-roll-number": "Nomor roll ibu",
+ "grid.sub-roll-number": "Nomor sub roll",
"grid.start-time": "Waktu awal",
"grid.end-time": "Waktu akhir",
"grid.machine-code": "Koding mesin",
@@ -84,5 +112,26 @@
"grid.product-description": "Deskripsi Produk",
"grid.in-oven-time": "Waktunya memasuki oven",
"grid.out-oven-time": "Waktunya meninggalkan oven",
- "grid.is-it-baked": "Apakah sudah dipanggang"
+ "grid.is-it-baked": "Apakah sudah dipanggang",
+ "grid.split-group": "Grup pembagian",
+ "grid.production-sequence": "Jujukan produksi",
+ "grid.date-of-manufacture": "Tarikh produksi",
+ "grid.order-number": "Nomor perintah",
+ "grid.paper-FRP-tube": "Tuba kertas/Tuba FRP",
+ "grid.paper-tube-material-code": "Kode bahan tub kertas",
+ "grid.paper-tube-material-description": "Deskripsi material tabung kertas",
+ "grid.paper-tube-specifications": "Spesifikasi tabung kertas",
+ "grid.FRP-pipe-material-code": "Kode bahan pipa FRP",
+ "grid.FRP-pipe-material-description": "Deskripsi bahan pipa FRP",
+ "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-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 b6b55fe..d37c936 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -5,9 +5,25 @@
"utils.read-more": "查看更多",
"utils.no-more": "没有更多",
"button.confirm": "确定",
+ "button.cancel": "取消",
"button.search": "查询",
"button.confirm-receipt": "确认入库",
"button.confirm-outbound": "确认出库",
+ "button.empty-shaft-return": "空轴送回",
+ "button.through-shaft-confirm": "穿轴确认",
+ "button.pull-shaft-confirm": "拔轴确认",
+ "button.overlap-shaft-confirm": "套轴确认",
+ "button.manual-call": "人工呼叫",
+ "button.call": "呼叫",
+ "button.vehicle-lateral-movement": "载具横移",
+ "button.call-vehicle": "呼叫载具",
+ "button.delivery-check": "配送校验",
+ "button.delivery-confirm": "配送确认",
+ "button.vehicle-return": "载具送回",
+ "button.upload-empty-shaft": "上空轴",
+ "button.scrap-foil-roll-down": "废箔下卷",
+ "button.outbound-delivery": "出站配送",
+ "button.storage-settings": "入库设置",
"login.username": "用户名",
"login.password": "密码",
"login.remember": "记住用户名",
@@ -39,8 +55,8 @@
"menu.splitting-management": "分切管理",
"menu.cutting-and-feeding": "分切上料",
"menu.hollow-shaft-sleeve": "空轴套管",
- "menu.empty-axis-delivery": "空轴配送",
- "menu.empty-axis-entry-station": "空轴进站",
+ "menu.empty-shaft-delivery": "空轴配送",
+ "menu.empty-shaft-entry-station": "空轴进站",
"menu.subroll-outbound": "子卷出站",
"menu.point-management": "点位管理",
"menu.abnormal-outbound-unlocking": "异常出库解锁",
@@ -58,8 +74,8 @@
"menu.in-stock-management": "在库管理",
"menu.inventory-management": "盘点管理",
"menu.vehicle-management": "载具管理",
- "menu.empty-tool-storage": "空载具入库",
- "menu.empty-tools-leaving-the-warehouse": "空载具出库",
+ "menu.empty-vehicle-entering-the-warehouse": "空载具入库",
+ "menu.empty-vehicle-leaving-the-warehouse": "空载具出库",
"menu.print-management": "打印管理",
"menu.customer-label-printing": "客户标签打印",
"menu.scheduling-management": "调度管理",
@@ -69,8 +85,20 @@
"filter.point": "点位",
"filter.mother-roll": "母卷",
"filter.state": "状态",
+ "filter.starting-point": "起点",
+ "filter.finishing-point": "起点",
+ "filter.device": "设备",
+ "filter.material": "物料",
+ "filter.quantity": "数量",
+ "filter.air-shaft": "气涨轴",
+ "filter.vehicle-code": "载具码",
+ "filter.last-roll-down": "末次下卷",
+ "filter.cache-point": "缓存点位",
+ "grid.number": "序号",
+ "grid.select": "选择",
"grid.work-order-number": "工单号",
"grid.mother-roll-number": "母卷号",
+ "grid.sub-roll-number": "子卷号",
"grid.start-time": "开始时间",
"grid.end-time": "结束时间",
"grid.machine-code": "机台编码",
@@ -84,5 +112,26 @@
"grid.product-description": "产品描述",
"grid.in-oven-time": "入烘箱时间",
"grid.out-oven-time": "出烘箱时间",
- "grid.is-it-baked": "是否烘烤"
+ "grid.is-it-baked": "是否烘烤",
+ "grid.split-group": "分切组",
+ "grid.production-sequence": "生产顺序",
+ "grid.date-of-manufacture": "生产日期",
+ "grid.order-number": "订单号",
+ "grid.paper-FRP-tube": "纸筒/FRP管",
+ "grid.paper-tube-material-code": "纸筒物料编码",
+ "grid.paper-tube-material-description": "纸筒物料描述",
+ "grid.paper-tube-specifications": "纸筒规格",
+ "grid.FRP-pipe-material-code": "FRP管物料编码",
+ "grid.FRP-pipe-material-description": "FRP管物料描述",
+ "grid.FRP-pipe-specifications": "FRP管规格",
+ "grid.place": "位置",
+ "grid.delivery-completed": "配送完成",
+ "grid.material-name": "物料名称",
+ "toast.point-not-empty": "点位不能为空",
+ "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
diff --git a/pages/ProductManage/SlittingFeeding.vue b/pages/ProductManage/SlittingFeeding.vue
index f0d78ff..4c65aa6 100644
--- a/pages/ProductManage/SlittingFeeding.vue
+++ b/pages/ProductManage/SlittingFeeding.vue
@@ -1,17 +1,17 @@
-
+
- 区域
+ {{$t('filter.area')}}
-
+
- 点位
+ {{$t('filter.point')}}
- 母卷号
+ {{$t('filter.mother-roll')}}
- | 序号 |
- 母卷号 |
- 子卷号 |
- 机台编号 |
- 分切组 |
- 生产顺序 |
- 生产日期 |
- 订单号 |
- 纸筒/FRP管 |
- 纸筒物料编码 |
- 纸筒物料描述 |
- 纸筒规格 |
- FRP管物料编码 |
- FRP管物料描述 |
- FRP管规格 |
+ {{$t('grid.number')}} |
+ {{$t('grid.mother-roll-number')}} |
+ {{$t('grid.sub-roll-number')}} |
+ {{$t('grid.machine-code')}} |
+ {{$t('grid.split-group')}} |
+ {{$t('grid.production-sequence')}} |
+ {{$t('grid.date-of-manufacture')}} |
+ {{$t('grid.order-number')}} |
+ {{$t('grid.paper-FRP-tube')}} |
+ {{$t('grid.paper-tube-material-code')}} |
+ {{$t('grid.paper-tube-material-description')}} |
+ {{$t('grid.paper-tube-specifications')}} |
+ {{$t('grid.FRP-pipe-material-code')}} |
+ {{$t('grid.FRP-pipe-material-description')}} |
+ {{$t('grid.FRP-pipe-specifications')}} |
@@ -77,15 +77,15 @@
-
-
-
-
+
+
+
+
- 起点
+ {{$t('filter.starting-point')}}
- 母卷号
+ {{$t('filter.mother-roll')}}
- 终点
+ {{$t('filter.finishing-point')}}
-
-
+
+
@@ -141,9 +141,9 @@
reload: false,
status: 'more',
contentText: {
- contentdown: '查看更多',
- contentrefresh: '加载中',
- contentnomore: '没有更多'
+ contentdown: this.$t('utils.read-more'),
+ contentrefresh: this.$t('utils.loading'),
+ contentnomore: this.$t('utils.no-more')
},
totalCount: 0,
pageNum: 1,
@@ -319,9 +319,10 @@
diff --git a/pages/ProductManage/ZjCasing.vue b/pages/ProductManage/ZjCasing.vue
index 277c881..83bf010 100644
--- a/pages/ProductManage/ZjCasing.vue
+++ b/pages/ProductManage/ZjCasing.vue
@@ -1,25 +1,25 @@
-
+
- 区域
+ {{$t('filter.area')}}
-
+
- 设备
+ {{$t('filter.device')}}
-
+
- 子卷号
+ {{$t('filter.mother-roll')}}
- 点位
+ {{$t('filter.point')}}
- 气涨轴
+ {{$t('filter.air-shaft')}}
- | 序号 |
- 选择 |
- 子卷号 |
- 机台编号 |
- 分切组 |
- 生产顺序 |
- 生产日期 |
- 纸筒/FRP管 |
- 纸筒物料编码 |
- 纸筒物料描述 |
- 纸筒规格 |
- FRP管物料编码 |
- FRP管物料描述 |
- FRP管规格 |
- 订单号 |
+ {{$t('grid.number')}} |
+ {{$t('grid.select')}} |
+ {{$t('grid.sub-roll-number')}} |
+ {{$t('grid.machine-code')}} |
+ {{$t('grid.split-group')}} |
+ {{$t('grid.production-sequence')}} |
+ {{$t('grid.date-of-manufacture')}} |
+ {{$t('grid.paper-FRP-tube')}} |
+ {{$t('grid.paper-tube-material-code')}} |
+ {{$t('grid.paper-tube-material-description')}} |
+ {{$t('grid.paper-tube-specifications')}} |
+ {{$t('grid.FRP-pipe-material-code')}} |
+ {{$t('grid.FRP-pipe-material-description')}} |
+ {{$t('grid.FRP-pipe-specifications')}} |
+ {{$t('grid.order-number')}} |
@@ -95,10 +95,10 @@
-
-
-
-
+
+
+
+
@@ -128,9 +128,9 @@
reload: false,
status: 'more',
contentText: {
- contentdown: '查看更多',
- contentrefresh: '加载中',
- contentnomore: '没有更多'
+ contentdown: this.$t('utils.read-more'),
+ contentrefresh: this.$t('utils.loading'),
+ contentnomore: this.$t('utils.no-more')
},
totalCount: 0,
pageNum: 1,
diff --git a/pages/ProductManage/ZjDelivery.vue b/pages/ProductManage/ZjDelivery.vue
index 9549b07..0ecf2c8 100644
--- a/pages/ProductManage/ZjDelivery.vue
+++ b/pages/ProductManage/ZjDelivery.vue
@@ -1,17 +1,17 @@
-
+
- 区域
+ {{$t('filter.area')}}
- 设备
+ {{$t('filter.device')}}
@@ -19,7 +19,7 @@
- 气涨轴
+ {{$t('filter.air-shaft')}}
- 载具码
+ {{$t('filter.vehicle-code')}}
- 起点
+ {{$t('filter.starting-point')}}
- | 序号 |
- 选择 |
- 气涨轴 |
- 机台编号 |
- 分切组 |
- 生产顺序 |
- 生产日期 |
- 子卷号 |
- 纸筒/FRP管 |
- 纸筒物料编码 |
- 纸筒物料描述 |
- 纸筒规格 |
- FRP管物料编码 |
- FRP管物料描述 |
- FRP管规格 |
- 订单号 |
+ {{$t('grid.number')}} |
+ {{$t('grid.select')}} |
+ {{$t('filter.air-shaft')}} |
+ {{$t('grid.machine-code')}} |
+ {{$t('grid.split-group')}} |
+ {{$t('grid.production-sequence')}} |
+ {{$t('grid.date-of-manufacture')}} |
+ {{$t('grid.sub-roll-number')}} |
+ {{$t('grid.paper-FRP-tube')}} |
+ {{$t('grid.paper-tube-material-code')}} |
+ {{$t('grid.paper-tube-material-description')}} |
+ {{$t('grid.paper-tube-specifications')}} |
+ {{$t('grid.FRP-pipe-material-code')}} |
+ {{$t('grid.FRP-pipe-material-description')}} |
+ {{$t('grid.FRP-pipe-specifications')}} |
+ {{$t('grid.order-number')}} |
@@ -96,12 +96,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/pages/ProductManage/ZjInStore.vue b/pages/ProductManage/ZjInStore.vue
index 2d059b3..4bde823 100644
--- a/pages/ProductManage/ZjInStore.vue
+++ b/pages/ProductManage/ZjInStore.vue
@@ -1,24 +1,24 @@
-
+
- 区域
+ {{$t('filter.area')}}
- 设备
+ {{$t('filter.device')}}
- 点位
+ {{$t('filter.point')}}
@@ -29,16 +29,16 @@
- | 序号 |
- 气涨轴 |
- 子卷号 |
- 机台编号 |
- 分切组 |
- 位置 |
- 配送完成 |
- 生产顺序 |
- 生产日期 |
- 订单号 |
+ {{$t('grid.number')}} |
+ {{$t('filter.air-shaft')}} |
+ {{$t('grid.sub-roll-number')}} |
+ {{$t('grid.machine-code')}} |
+ {{$t('grid.split-group')}} |
+ {{$t('grid.place')}} |
+ {{$t('grid.delivery-completed')}} |
+ {{$t('grid.production-sequence')}} |
+ {{$t('grid.grid.date-of-manufacture')}} |
+ {{$t('grid.order-number')}} |
@@ -60,8 +60,8 @@
-
-
+
+
diff --git a/pages/ProductManage/ZjOutStore.vue b/pages/ProductManage/ZjOutStore.vue
index 8ac9d23..61cad8b 100644
--- a/pages/ProductManage/ZjOutStore.vue
+++ b/pages/ProductManage/ZjOutStore.vue
@@ -1,24 +1,24 @@
-
+
- 区域
+ {{$t('filter.area')}}
- 设备
+ {{$t('filter.device')}}
- 点位
+ {{$t('filter.point')}}
@@ -29,7 +29,7 @@
- 末次下卷
+ {{$t('filter.last-roll-down')}}
@@ -38,22 +38,22 @@
- | 序号 |
- 选择 |
- 气涨轴 |
- 子卷号 |
- 机台编号 |
- 分切组 |
- 生产顺序 |
- 生产日期 |
- 纸筒/FRP管 |
- 纸筒物料编码 |
- 纸筒物料描述 |
- 纸筒规格 |
- FRP管物料编码 |
- FRP管物料描述 |
- FRP管规格 |
- 订单号 |
+ {{$t('grid.number')}} |
+ {{$t('grid.select')}} |
+ {{$t('filter.air-shaft')}} |
+ {{$t('grid.sub-roll-number')}} |
+ {{$t('grid.machine-code')}} |
+ {{$t('grid.split-group')}} |
+ {{$t('grid.production-sequence')}} |
+ {{$t('grid.grid.date-of-manufacture')}} |
+ {{$t('grid.paper-FRP-tube')}} |
+ {{$t('grid.paper-tube-material-code')}} |
+ {{$t('grid.paper-tube-material-description')}} |
+ {{$t('grid.paper-tube-specifications')}} |
+ {{$t('grid.FRP-pipe-material-code')}} |
+ {{$t('grid.FRP-pipe-material-description')}} |
+ {{$t('grid.FRP-pipe-specifications')}} |
+ {{$t('grid.order-number')}} |
@@ -81,29 +81,29 @@
-
-
-
-
+
+
+
+
- 区域
+ {{$t('filter.area')}}
- 缓存点位
+ {{$t('filter.cache-point')}}
- 查询
+ {{$t('button.search')}}
-
-
+
+
@@ -206,7 +206,8 @@
this.disabled1 = true
if (!this.index1) {
uni.showToast({
- title: '点位不能为空',
+ // title: '点位不能为空',
+ title: this.$t('toast.point-not-empty'),
icon: 'none'
})
this.disabled1 = false
@@ -237,7 +238,8 @@
this.disabled3 = true
if (!this.index1) {
uni.showToast({
- title: '点位不能为空',
+ // title: '点位不能为空',
+ title: this.$t('toast.point-not-empty'),
icon: 'none'
})
this.disabled3 = false
@@ -287,7 +289,8 @@
this.disabled2 = true
if (!this.index4) {
uni.showToast({
- title: '请选择缓存点位',
+ // title: '请选择缓存点位',
+ title: this.$t('toast.select-cache-point'),
icon: 'none'
})
this.disabled2 = false
diff --git a/pages/WarehouseManage/SemifinishedInStore.vue b/pages/WarehouseManage/SemifinishedInStore.vue
index 712e2c7..fbc7bce 100644
--- a/pages/WarehouseManage/SemifinishedInStore.vue
+++ b/pages/WarehouseManage/SemifinishedInStore.vue
@@ -26,7 +26,7 @@
{{$t('filter.state')}}
-
+
diff --git a/pages/home/home.vue b/pages/home/home.vue
index b8c49a1..27c97a6 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -50,7 +50,6 @@
async _authority () {
let res = await authority()
this.menuList = [...res.sonTree]
-
},
toPage1 (e) {
if (e.sonTree.length > 0) {
diff --git a/utils/getData2.js b/utils/getData2.js
index 22d1861..0778f47 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -46,8 +46,8 @@ export const authority = () => {
{'menu_id': '3', 'path': 'RF03', 'name': i18n.tc('menu.splitting-management'), 'sonTree': [
{'menu_id': '1', 'name': i18n.tc('menu.cutting-and-feeding'), 'path': '/pages/ProductManage/SlittingFeeding'},
{'menu_id': '2', 'name': i18n.tc('menu.hollow-shaft-sleeve'), 'path': '/pages/ProductManage/ZjCasing'},
- {'menu_id': '3', 'name': i18n.tc('menu.empty-axis-delivery'), 'path': '/pages/ProductManage/ZjDelivery'},
- {'menu_id': '4', 'name': i18n.tc('menu.empty-axis-entry-station'), 'path': '/pages/ProductManage/ZjInStore'},
+ {'menu_id': '3', 'name': i18n.tc('menu.empty-shaft-delivery'), 'path': '/pages/ProductManage/ZjDelivery'},
+ {'menu_id': '4', 'name': i18n.tc('menu.empty-shaft-entry-station'), 'path': '/pages/ProductManage/ZjInStore'},
{'menu_id': '5', 'name': i18n.tc('menu.subroll-outbound'), 'path': '/pages/ProductManage/ZjOutStore'},
]},
{'menu_id': '4', 'path': 'RF04', 'name': i18n.tc('menu.point-management'), 'sonTree': [
@@ -71,8 +71,8 @@ export const authority = () => {
{'menu_id': '1', 'name': i18n.tc('menu.inventory-management'), 'path': '/pages/WarehouseManage/CheckList'},
]},
{'menu_id': '8', 'path': 'RF08', 'name': i18n.tc('menu.vehicle-management'), 'sonTree': [
- {'menu_id': '1', 'name': i18n.tc('menu.empty-tool-storage'), 'path': '/pages/WarehouseManage/EmptyInStore'},
- {'menu_id': '2', 'name': i18n.tc('menu.empty-tools-leaving-the-warehouse'), 'path': '/pages/WarehouseManage/EmptyOutStore'},
+ {'menu_id': '1', 'name': i18n.tc('menu.menu.empty-vehicle-entering-the-warehouse'), 'path': '/pages/WarehouseManage/EmptyInStore'},
+ {'menu_id': '2', 'name': i18n.tc('menu.empty-vehicle-leaving-the-warehouse'), 'path': '/pages/WarehouseManage/EmptyOutStore'},
]},
{'menu_id': '9', 'path': 'RF09', 'name': i18n.tc('menu.print-management'), 'sonTree': [
{'menu_id': '1', 'name': i18n.tc('menu.customer-label-printing'), 'path': '/pages/WarehouseManage/CustomerLabelPrint'},