diff --git a/locale/en.json b/locale/en.json index be7bf96..d0c4810 100644 --- a/locale/en.json +++ b/locale/en.json @@ -59,6 +59,7 @@ "button.warehousing": "Warehousing", "button.save": "Save", "button.outstore-confirm": "Outbound Confirmation", + "button.verify": "Verify", "login.username": "Username", "login.password": "Password", "login.remember": "Remember username", @@ -161,6 +162,7 @@ "filter.customer-number": "Customer number", "filter.product-thickness": "Product thickness", "filter.material-type": "Material type", + "filter.outer-label-code": "Outer Carton Label Code", "grid.number": "Serial number", "grid.select": "Select", "grid.work-order-number": "Work order number", @@ -253,6 +255,8 @@ "toast.material-not-empty": "The material cannot be empty", "toast.quantity-not-empty": "The quantity cannot be empty", "toast.scan-wooden-box-code": "Please scan the wooden box code", + "toast.prompt": "Prompt", + "toast.sure-perform-operation": "Are you sure you want to perform this operation?", "select.coaster": "Small pallet", "select.large-tray": "Large pallet", "select.lualified-products": "Qualified products", diff --git a/locale/id.json b/locale/id.json index 368dd74..3777d23 100644 --- a/locale/id.json +++ b/locale/id.json @@ -59,6 +59,7 @@ "button.warehousing": "Perdagangan", "button.save": "Simpan", "button.outstore-confirm": "Konfirmasi Deposit", + "button.verify": "Verifikasi", "login.username": "Nama pengguna", "login.password": "Kata sandi", "login.remember": "Ingat nama pengguna", @@ -161,6 +162,7 @@ "filter.customer-number": "Nomor pelanggan", "filter.product-thickness": "Ketebalan produk", "filter.material-type": "Jenis bahan", + "filter.outer-label-code": "Kode Label Karton Luar", "grid.number": "Nomor urut", "grid.select": "Pilih", "grid.work-order-number": "Nomor pesanan kerja", @@ -253,6 +255,8 @@ "toast.material-not-empty": "Bahan tidak boleh kosong", "toast.quantity-not-empty": "Jumlah tidak boleh kosong", "toast.scan-wooden-box-code": "Silakan scan kode kotak kayu", + "toast.prompt": "Petunjuk", + "toast.sure-perform-operation": "Apakah Anda yakin ingin melakukan operasi ini?", "select.coaster": "Palet kecil", "select.large-tray": "Palet besar", "select.lualified-products": "Produk layak", diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json index d0ce316..23d769e 100644 --- a/locale/zh-Hans.json +++ b/locale/zh-Hans.json @@ -59,6 +59,7 @@ "button.warehousing": "入库", "button.save": "保存", "button.outstore-confirm": "出库确认", + "button.verify": "校验", "login.username": "用户名", "login.password": "密码", "login.remember": "记住用户名", @@ -161,6 +162,7 @@ "filter.customer-number": "客户编号", "filter.product-thickness": "产品厚度", "filter.material-type": "物料类型", + "filter.outer-label-code": "外箱标签码", "grid.number": "序号", "grid.select": "选择", "grid.work-order-number": "工单号", @@ -253,6 +255,8 @@ "toast.material-not-empty": "物料不能为空", "toast.quantity-not-empty": "数量不能为空", "toast.scan-wooden-box-code": "请扫木箱码", + "toast.prompt": "提示", + "toast.sure-perform-operation": "确定要执行此操作吗？", "select.coaster": "小托盘", "select.large-tray": "大托盘", "select.lualified-products": "合格品", diff --git a/pages.json b/pages.json index 41d187d..9b3eaf9 100644 --- a/pages.json +++ b/pages.json @@ -472,6 +472,13 @@ "navigationStyle": "custom" } + }, + { + "path" : "pages/SecondPhase/ThreeCodeToOne", + "style" : + { + "navigationStyle": "custom" + } } ], "globalStyle": { diff --git a/pages/SecondPhase/BoxReturn.vue b/pages/SecondPhase/BoxReturn.vue index c0f2ae1..de24613 100644 --- a/pages/SecondPhase/BoxReturn.vue +++ b/pages/SecondPhase/BoxReturn.vue @@ -64,7 +64,7 @@ if (!this.val1 || !this.val2) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._boxReturn() } diff --git a/pages/SecondPhase/DeliveryUnbindConfirm.vue b/pages/SecondPhase/DeliveryUnbindConfirm.vue index 504df3a..79c960d 100644 --- a/pages/SecondPhase/DeliveryUnbindConfirm.vue +++ b/pages/SecondPhase/DeliveryUnbindConfirm.vue @@ -158,7 +158,7 @@ if (this.dataList.length === 0) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._twoPdaOutConfirm() } diff --git a/pages/SecondPhase/EmptyBoxInStore.vue b/pages/SecondPhase/EmptyBoxInStore.vue index 1872e98..6a91156 100644 --- a/pages/SecondPhase/EmptyBoxInStore.vue +++ b/pages/SecondPhase/EmptyBoxInStore.vue @@ -71,7 +71,7 @@ if (!this.val2 || !this.val3) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._twoPdaBoxIn() } diff --git a/pages/SecondPhase/EmptyBoxOutStore.vue b/pages/SecondPhase/EmptyBoxOutStore.vue index e578dba..fd10d39 100644 --- a/pages/SecondPhase/EmptyBoxOutStore.vue +++ b/pages/SecondPhase/EmptyBoxOutStore.vue @@ -139,7 +139,7 @@ if (!this.checkArr.length) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._twoPdaVehicleIn() } diff --git a/pages/SecondPhase/EmptyVehicleInStore.vue b/pages/SecondPhase/EmptyVehicleInStore.vue index 9a424d2..c05be5f 100644 --- a/pages/SecondPhase/EmptyVehicleInStore.vue +++ b/pages/SecondPhase/EmptyVehicleInStore.vue @@ -66,7 +66,7 @@ if (!this.val1 || !this.val2 || !this.index) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._twoPdaVehicleIn() } diff --git a/pages/SecondPhase/ManMaintain.vue b/pages/SecondPhase/ManMaintain.vue index 7798a52..cd5987f 100644 --- a/pages/SecondPhase/ManMaintain.vue +++ b/pages/SecondPhase/ManMaintain.vue @@ -57,7 +57,7 @@ if (!this.val1) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._updatePackagePoint() } diff --git a/pages/SecondPhase/SubRollPackUnbind.vue b/pages/SecondPhase/SubRollPackUnbind.vue index 4f41690..7600898 100644 --- a/pages/SecondPhase/SubRollPackUnbind.vue +++ b/pages/SecondPhase/SubRollPackUnbind.vue @@ -16,7 +16,7 @@ - + @@ -50,7 +50,7 @@ if (!this.val1) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._toEndSub() } diff --git a/pages/SecondPhase/ThreeCodeToOne.vue b/pages/SecondPhase/ThreeCodeToOne.vue new file mode 100644 index 0000000..b8a0e7a --- /dev/null +++ b/pages/SecondPhase/ThreeCodeToOne.vue @@ -0,0 +1,97 @@ + + + \ No newline at end of file diff --git a/pages/SecondPhase/finished/BoxWeight.vue b/pages/SecondPhase/finished/BoxWeight.vue index 7daedcb..56fe1e0 100644 --- a/pages/SecondPhase/finished/BoxWeight.vue +++ b/pages/SecondPhase/finished/BoxWeight.vue @@ -80,7 +80,7 @@ if (!this.val1 || !this.val2) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._saveBoxInfo() } diff --git a/pages/SecondPhase/finished/ReturnToStore.vue b/pages/SecondPhase/finished/ReturnToStore.vue index 979242d..77bca46 100644 --- a/pages/SecondPhase/finished/ReturnToStore.vue +++ b/pages/SecondPhase/finished/ReturnToStore.vue @@ -66,7 +66,7 @@ if (!this.index || !this.val1 || !this.val2) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._twoPdaReturnIn() } diff --git a/pages/SecondPhase/finished/abnorToStore.vue b/pages/SecondPhase/finished/abnorToStore.vue index d9d1976..1e2ec4a 100644 --- a/pages/SecondPhase/finished/abnorToStore.vue +++ b/pages/SecondPhase/finished/abnorToStore.vue @@ -75,7 +75,7 @@ if (!this.index || !this.val1 || !this.val2 || !this.val3) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._twoPdaReback() } diff --git a/pages/SecondPhase/kmxk/EmptyBoxIntoStore.vue b/pages/SecondPhase/kmxk/EmptyBoxIntoStore.vue index e6d26f4..1d2bdd5 100644 --- a/pages/SecondPhase/kmxk/EmptyBoxIntoStore.vue +++ b/pages/SecondPhase/kmxk/EmptyBoxIntoStore.vue @@ -60,7 +60,7 @@ if (!this.val2 || !this.val3) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._boxIn() } diff --git a/pages/SecondPhase/kmxk/EmptyBoxSave.vue b/pages/SecondPhase/kmxk/EmptyBoxSave.vue index f4c1445..6089cfb 100644 --- a/pages/SecondPhase/kmxk/EmptyBoxSave.vue +++ b/pages/SecondPhase/kmxk/EmptyBoxSave.vue @@ -63,7 +63,7 @@ if (!this.val2 || !this.val3) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._updateWeight() } diff --git a/pages/SecondPhase/kmxk/PointSave.vue b/pages/SecondPhase/kmxk/PointSave.vue index 4251e7d..5e3bc51 100644 --- a/pages/SecondPhase/kmxk/PointSave.vue +++ b/pages/SecondPhase/kmxk/PointSave.vue @@ -88,7 +88,7 @@ if (!this.val2 || !this.val3) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._updatePoint() } diff --git a/pages/SecondPhase/lvt/EmptyBox.vue b/pages/SecondPhase/lvt/EmptyBox.vue index 07f244b..4f1f504 100644 --- a/pages/SecondPhase/lvt/EmptyBox.vue +++ b/pages/SecondPhase/lvt/EmptyBox.vue @@ -33,7 +33,7 @@ {{$t('filter.box-no')}} - 木箱料号 + {{$t('filter.box-type')}} {{$t('filter.wooden-box-description')}} {{$t('filter.max-sub-num')}} {{$t('grid.wooden-box-length')}} diff --git a/pages/SecondPhase/point/ErrorOutUnlock.vue b/pages/SecondPhase/point/ErrorOutUnlock.vue index fe594a5..32f5176 100644 --- a/pages/SecondPhase/point/ErrorOutUnlock.vue +++ b/pages/SecondPhase/point/ErrorOutUnlock.vue @@ -62,7 +62,7 @@ if (!this.val1 && !this.val2) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._abnormalOut() } diff --git a/pages/SecondPhase/point/ManPass.vue b/pages/SecondPhase/point/ManPass.vue index 07c1705..c47a8d8 100644 --- a/pages/SecondPhase/point/ManPass.vue +++ b/pages/SecondPhase/point/ManPass.vue @@ -58,7 +58,7 @@ if (!this.index) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._confirmPass() } diff --git a/pages/SecondPhase/point/PointManage.vue b/pages/SecondPhase/point/PointManage.vue index 95c9991..8bcbe68 100644 --- a/pages/SecondPhase/point/PointManage.vue +++ b/pages/SecondPhase/point/PointManage.vue @@ -77,7 +77,7 @@ if (!this.val1 || !this.val2) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._pointOperate(type) } diff --git a/pages/SecondPhase/production/BakeDetail.vue b/pages/SecondPhase/production/BakeDetail.vue index 556794f..61da3db 100644 --- a/pages/SecondPhase/production/BakeDetail.vue +++ b/pages/SecondPhase/production/BakeDetail.vue @@ -195,7 +195,7 @@ if (!this.val1 || !this.val2) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._inCoolIvt() } @@ -227,7 +227,7 @@ this.disabled2 = false }, async handleConfirm2 () { - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this.modalToSure() } diff --git a/pages/SecondPhase/production/BakeProcess.vue b/pages/SecondPhase/production/BakeProcess.vue index ea62a5e..85751ad 100644 --- a/pages/SecondPhase/production/BakeProcess.vue +++ b/pages/SecondPhase/production/BakeProcess.vue @@ -161,7 +161,7 @@ if ((!this.val1 || !this.val2) && type === '2') { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { if (type === '1') { this._ovenInAndOut1(type) diff --git a/pages/SecondPhase/production/ControlPoint.vue b/pages/SecondPhase/production/ControlPoint.vue index 1d1cd15..16dcc4b 100644 --- a/pages/SecondPhase/production/ControlPoint.vue +++ b/pages/SecondPhase/production/ControlPoint.vue @@ -68,7 +68,7 @@ if (!this.val1 && !this.index1) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._updatePackageInfo() } diff --git a/pages/SecondPhase/production/ManmadeBake.vue b/pages/SecondPhase/production/ManmadeBake.vue index d07a0c5..2bd9f17 100644 --- a/pages/SecondPhase/production/ManmadeBake.vue +++ b/pages/SecondPhase/production/ManmadeBake.vue @@ -104,7 +104,7 @@ if (!this.val1 || !this.val2 || !this.val5) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._handleBakingovenInAndOut1(type) } @@ -153,7 +153,7 @@ if (!this.val1 || !this.val2) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._handleBakingcheckConfirm() } diff --git a/pages/SecondPhase/production/MjMake.vue b/pages/SecondPhase/production/MjMake.vue index c094019..d0bc691 100644 --- a/pages/SecondPhase/production/MjMake.vue +++ b/pages/SecondPhase/production/MjMake.vue @@ -59,7 +59,7 @@ if (!this.val1 || !this.index) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._bakingReBake() } diff --git a/pages/SecondPhase/production/MjWeight.vue b/pages/SecondPhase/production/MjWeight.vue index e04123a..89ce7c2 100644 --- a/pages/SecondPhase/production/MjWeight.vue +++ b/pages/SecondPhase/production/MjWeight.vue @@ -60,7 +60,7 @@ if (!this.val1 || !this.val2) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._confirmWeight() } diff --git a/pages/SecondPhase/production/PrintTable.vue b/pages/SecondPhase/production/PrintTable.vue index 6676e5e..cea0eca 100644 --- a/pages/SecondPhase/production/PrintTable.vue +++ b/pages/SecondPhase/production/PrintTable.vue @@ -77,7 +77,7 @@ if (!this.val1 || !this.index1 || !this.index2) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._printTable() } diff --git a/pages/SecondPhase/production/SboProcess.vue b/pages/SecondPhase/production/SboProcess.vue index 3db39cb..de1ece1 100644 --- a/pages/SecondPhase/production/SboProcess.vue +++ b/pages/SecondPhase/production/SboProcess.vue @@ -183,7 +183,7 @@ if (!this.val2 && type === '7') { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { if (type === '5') { this._confirmBlanking() @@ -254,7 +254,7 @@ this.type = '' return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._rawScrollDowm(type) } diff --git a/pages/SecondPhase/production/ZjCheck.vue b/pages/SecondPhase/production/ZjCheck.vue index 6e9fa34..303cbce 100644 --- a/pages/SecondPhase/production/ZjCheck.vue +++ b/pages/SecondPhase/production/ZjCheck.vue @@ -57,7 +57,7 @@ if (!this.val1) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._updatePackageInfo() } diff --git a/pages/SecondPhase/production/ZjInStore.vue b/pages/SecondPhase/production/ZjInStore.vue index c05def6..23ed577 100644 --- a/pages/SecondPhase/production/ZjInStore.vue +++ b/pages/SecondPhase/production/ZjInStore.vue @@ -122,7 +122,7 @@ if (!this.arr1.length) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._zjInBoundConfirm() } diff --git a/pages/SecondPhase/slitting/AGVPass.vue b/pages/SecondPhase/slitting/AGVPass.vue index 81ad1a3..88090d9 100644 --- a/pages/SecondPhase/slitting/AGVPass.vue +++ b/pages/SecondPhase/slitting/AGVPass.vue @@ -46,7 +46,7 @@ if (!this.val1) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._AGVPass() } diff --git a/pages/SecondPhase/slitting/BaitRoll.vue b/pages/SecondPhase/slitting/BaitRoll.vue index 20b9b46..babe08b 100644 --- a/pages/SecondPhase/slitting/BaitRoll.vue +++ b/pages/SecondPhase/slitting/BaitRoll.vue @@ -148,7 +148,7 @@ if (!this.index1 ||!this.index2 || !this.index3 || (!this.upL && !this.upR)) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._downBait() } diff --git a/pages/SecondPhase/slitting/CallShaft.vue b/pages/SecondPhase/slitting/CallShaft.vue index 9c171cd..10ee507 100644 --- a/pages/SecondPhase/slitting/CallShaft.vue +++ b/pages/SecondPhase/slitting/CallShaft.vue @@ -168,7 +168,7 @@ if (!this.index2 || (!this.upL && !this.upR && !this.lowL && !this.lowR)) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._forcedFeedShaft() } diff --git a/pages/SecondPhase/slitting/Cutaxis.vue b/pages/SecondPhase/slitting/Cutaxis.vue index bcc89d7..b031e48 100644 --- a/pages/SecondPhase/slitting/Cutaxis.vue +++ b/pages/SecondPhase/slitting/Cutaxis.vue @@ -140,7 +140,7 @@ if (!this.index || !this.dataList.length) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._downShafts() } diff --git a/pages/SecondPhase/slitting/DoInitShaft.vue b/pages/SecondPhase/slitting/DoInitShaft.vue index e72b3da..779d2f6 100644 --- a/pages/SecondPhase/slitting/DoInitShaft.vue +++ b/pages/SecondPhase/slitting/DoInitShaft.vue @@ -69,7 +69,7 @@ if (!this.index) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._doInitShaftPoint() } diff --git a/pages/SecondPhase/slitting/PaperBind.vue b/pages/SecondPhase/slitting/PaperBind.vue index f837e68..75426e7 100644 --- a/pages/SecondPhase/slitting/PaperBind.vue +++ b/pages/SecondPhase/slitting/PaperBind.vue @@ -122,7 +122,7 @@ if (!this.dataList.length) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._operateIvt(type) } diff --git a/pages/SecondPhase/slitting/RollCacheManage.vue b/pages/SecondPhase/slitting/RollCacheManage.vue index 068479a..22b80f5 100644 --- a/pages/SecondPhase/slitting/RollCacheManage.vue +++ b/pages/SecondPhase/slitting/RollCacheManage.vue @@ -65,7 +65,7 @@ if (!this.val1) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._rollCacheManage(type) } diff --git a/pages/SecondPhase/slitting/ShaftSave.vue b/pages/SecondPhase/slitting/ShaftSave.vue index 0da3c40..ba3504b 100644 --- a/pages/SecondPhase/slitting/ShaftSave.vue +++ b/pages/SecondPhase/slitting/ShaftSave.vue @@ -45,7 +45,7 @@ if (!this.val1) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._shaftMaintenanceInventory(type) } diff --git a/pages/SecondPhase/slitting/SlittingCutting2.vue b/pages/SecondPhase/slitting/SlittingCutting2.vue index e2ec9ca..58fd690 100644 --- a/pages/SecondPhase/slitting/SlittingCutting2.vue +++ b/pages/SecondPhase/slitting/SlittingCutting2.vue @@ -191,7 +191,7 @@ if (!this.index || !this.dataList.length) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._downRolls2() } diff --git a/pages/SecondPhase/slitting/SlittingFeeding.vue b/pages/SecondPhase/slitting/SlittingFeeding.vue index e159802..a5095e5 100644 --- a/pages/SecondPhase/slitting/SlittingFeeding.vue +++ b/pages/SecondPhase/slitting/SlittingFeeding.vue @@ -327,7 +327,7 @@ if (!this.val1) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._feedingVehicleReturn(type) } diff --git a/pages/SecondPhase/slitting/StockingArea.vue b/pages/SecondPhase/slitting/StockingArea.vue index 6047eda..a463ebd 100644 --- a/pages/SecondPhase/slitting/StockingArea.vue +++ b/pages/SecondPhase/slitting/StockingArea.vue @@ -57,7 +57,7 @@ if (!this.val1 || !this.val2) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._doStockAreaBinding() } @@ -80,7 +80,7 @@ if (!this.val1) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._doStockAreaUnbinding() } @@ -103,7 +103,7 @@ if (!this.val1 || !this.val2) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._instorStock(type) } diff --git a/pages/SecondPhase/slitting/SubRollWeight.vue b/pages/SecondPhase/slitting/SubRollWeight.vue index 84e24f7..9d72dca 100644 --- a/pages/SecondPhase/slitting/SubRollWeight.vue +++ b/pages/SecondPhase/slitting/SubRollWeight.vue @@ -87,7 +87,7 @@ if (!this.val1 || (!this.val2 && !this.val3)) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._doSubRollWeightBinding() } diff --git a/pages/SecondPhase/slitting/TubeStock.vue b/pages/SecondPhase/slitting/TubeStock.vue index 5d4b0f7..0c04a6e 100644 --- a/pages/SecondPhase/slitting/TubeStock.vue +++ b/pages/SecondPhase/slitting/TubeStock.vue @@ -149,7 +149,7 @@ if (this.val1 || !this.index1 || !this.index2) { return } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") + const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) if (isConfirmed) { this._moveStock() } diff --git a/pages/home/home.vue b/pages/home/home.vue index 8bca848..9bb8155 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -95,11 +95,11 @@ this.show = true this.secM = e.sonTree this.icon = e.path - this.title = e.title + this.title = e[this.$langPre.computedProp('title')] } }, toPage2 (e) { - let url = e.path + '?title=' + e.title + let url = e.path + '?title=' + e[this.$langPre.computedProp('title')] uni.redirectTo({ url: url }) diff --git a/utils/getData3.js b/utils/getData3.js index 7e4e56f..97d1d8b 100644 --- a/utils/getData3.js +++ b/utils/getData3.js @@ -627,4 +627,11 @@ export const packagerelation = (sn, cname, cn, cd, product, desc, weight, think, thickness: think, material_type: type } +}) +/** + * 三码合一校验（二期打包间管理-三码合一） + */ +export const checkCode = (ncode, gcode, bcode, ccode) => request({ + url:'api/pdmBiSubpackagerelation/checkCode', + data: {nb_code: ncode, gb_code: gcode, box_code: bcode, customer_code: ccode} }) \ No newline at end of file diff --git a/utils/mork2.js b/utils/mork2.js index b5828fb..a31c8a2 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -58,7 +58,8 @@ export const allAuthority = () => { {menu_id: '1', zh_title: '装箱口木箱回库', path: '/pages/SecondPhase/BoxReturn'}, {menu_id: '1', zh_title: '人工点维护', path: '/pages/SecondPhase/ManMaintain'}, {menu_id: '1', zh_title: '包装关系维护', path: '/pages/SecondPhase/PackRelation'}, - {menu_id: '1', zh_title: '客户标签打印', path: '/pages/SecondPhase/CustomerLabelPrint'} + {menu_id: '1', zh_title: '客户标签打印', path: '/pages/SecondPhase/CustomerLabelPrint'}, + {menu_id: '1', zh_title: '三码合一', path: '/pages/SecondPhase/ThreeCodeToOne'} ]}, {menu_id: '6', path: 'RF04', zh_title: '点位管理', sonTree: [ {menu_id: '1', zh_title: '点位管理', path: '/pages/SecondPhase/point/PointManage'},