diff --git a/common/style/layout.styl b/common/style/layout.styl index 6caceeb..d59c00e 100644 --- a/common/style/layout.styl +++ b/common/style/layout.styl @@ -537,4 +537,11 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] { } .mini-btn { margin-right: 0; +} +.ftsize1 { + font-size 20rpx + background #fff + border-color #ff6a00 + color #ff6a00 + margin-top: 10rpx } \ No newline at end of file diff --git a/common/style/mixin.styl b/common/style/mixin.styl index f564d40..007fd97 100644 --- a/common/style/mixin.styl +++ b/common/style/mixin.styl @@ -1,4 +1,7 @@ $red = #ff6a00 +$red1 = #ff6800 +$red2 = #ff9856 +$red3 = #ff6a00 $green = #6CBE8B $yellow = #E9B451 $blue = #6798ef diff --git a/locale/en.json b/locale/en.json index b1678f0..436d259 100644 --- a/locale/en.json +++ b/locale/en.json @@ -8,6 +8,20 @@ "button.cancel": "取消", "button.clear": "清空", "button.search": "查询", + "button.confirm-quhuo": "确认取货", + "button.scan-add": "扫码插入", + "button.add-row": "插入行", + "button.del-row": "删除行", + "button.copy-row": "复制行", + "button.material-bind": "物料绑定", + "button.empty-vehicle-bind": "空载具绑定", + "button.lock": "锁定", + "button.unlock": "解锁", + "button.confirm-down-material": "确认下料", + "button.reissue": "重新下发", + "button.force-complete": "强制完成", + "button.enter": "进入", + "button.quit": "退出", "login.username": "用户名", "login.password": "密码", "login.remember": "记住用户名", @@ -15,26 +29,61 @@ "login.upgrade": "升级版本", "login.login": "登录", "login.text1": "欢迎来到", - "login.text2": "海亮铜箔手持系统！", + "login.text2": "东丽WMS手持系统！", "setting.language": "语言", "setting.server": "服务器地址", "setting.refresh": "刷新时间", "setting.customer-label-printing": "客户标签打印", "setting.language-change-confirm": "应用此设置将重启App", "upgrade.new-version": "发现新版本", - "upgrade.text1": "海亮铜箔又有新版本了，升级到最新版本，享受更丰富、稳定、快速的功能和体验！", + "upgrade.text1": "又有新版本了，升级到最新版本，享受更丰富、稳定、快速的功能和体验！", "upgrade.text2": "安装包下载中，请稍后", "upgrade.upgrade-now": "立即升级", "home.title": "首页", - "home.message": "欢迎进入铜箔手持系统！", + "home.message": "欢迎进入东丽WMS手持系统！", "home.exit": "退出", - "menu.production-management": "生产管理", + "menu.kw-management": "库位管理", + "menu.man-get-goods": "人工取货", + "menu.man-load-goods": "人工放货", + "menu.kc-manage": "库存锁定/解锁", + "menu.line-management": "产线管理", + "menu.line-call-mater": "产线叫料", + "menu.line-down-mater": "产线下料", + "menu.task-management": "任务管理", + "menu.work-manage": "作业管理", + "menu.fixedpoint-work": "定点作业", + "menu.inout-area-mark": "进出区域登记", "filter.area": "区域", "filter.point": "点位", - "filter.quantity": "数量", "filter.type": "类型", + "filter.material": "物料", + "filter.wltype": "物料类型", + "filter.material-use-number": "用料数量", + "filter.callmater-pallet-number": "叫料托盘数", + "filter.send-area": "送往区域", + "filter.vehicle-code": "载具编码", + "filter.start-point": "起点", + "filter.end-point": "终点", + "filter.start-area": "起点区域", + "filter.end-area": "终点区域", + "filter.control-area": "管制区域", "grid.number": "序号", + "grid.roll-number": "卷号", + "grid.material-code": "物料编码", + "grid.material-name": "物料名称", + "grid.quantity": "数量", + "grid.unit": "单位", + "grid.status": "状态", + "grid.point": "点位", "grid.select": "选择", + "grid.task-number": "任务号", + "grid.start-point": "起点", + "grid.end-point": "终点", + "grid.vehicle-code": "载具号", + "grid.enter-time": "进入时间", + "grid.enter-man": "进入人", + "grid.enter-area": "进入区域", + "filter.wltype": "Material Type", "toast.select-row": "请选择一行", "toast.device-not-empty": "设备不能为空", "toast.material-not-empty": "物料不能为空", diff --git a/locale/index.js b/locale/index.js index a12d06a..0814cea 100644 --- a/locale/index.js +++ b/locale/index.js @@ -1,11 +1,16 @@ import en from './en.json' import zhHans from './zh-Hans.json' -import id from './id.json' +import jp from './jp.json' +// const messages = { +// 'en': Object.assign(en, en1), +// 'zh-Hans': Object.assign(zhHans, zhHans1), +// 'jp': Object.assign(jp, jp1) +// } const messages = { - 'en': Object.assign(en, en1), - 'zh-Hans': Object.assign(zhHans, zhHans1), - 'id': Object.assign(id, id1) + 'en': en, + 'zh-Hans': zhHans, + 'jp': jp } let i18nConfig = { diff --git a/locale/jp.json b/locale/jp.json index b1678f0..07a245f 100644 --- a/locale/jp.json +++ b/locale/jp.json @@ -1,45 +1,94 @@ { - "utils.loading": "加载中...", - "uni.dataSelect.placeholder": "请选择", - "uni.dataSelect.emptyTips": "无选项", - "utils.read-more": "查看更多", - "utils.no-more": "没有更多", - "button.confirm": "确定", - "button.cancel": "取消", - "button.clear": "清空", - "button.search": "查询", - "login.username": "用户名", - "login.password": "密码", - "login.remember": "记住用户名", - "login.settings": "设置", - "login.upgrade": "升级版本", - "login.login": "登录", - "login.text1": "欢迎来到", - "login.text2": "海亮铜箔手持系统！", - "setting.language": "语言", - "setting.server": "服务器地址", - "setting.refresh": "刷新时间", - "setting.customer-label-printing": "客户标签打印", - "setting.language-change-confirm": "应用此设置将重启App", - "upgrade.new-version": "发现新版本", - "upgrade.text1": "海亮铜箔又有新版本了，升级到最新版本，享受更丰富、稳定、快速的功能和体验！", - "upgrade.text2": "安装包下载中，请稍后", - "upgrade.upgrade-now": "立即升级", - "home.title": "首页", - "home.message": "欢迎进入铜箔手持系统！", - "home.exit": "退出", - "menu.production-management": "生产管理", - "filter.area": "区域", - "filter.point": "点位", - "filter.quantity": "数量", - "filter.type": "类型", - "grid.number": "序号", - "grid.select": "选择", - "toast.select-row": "请选择一行", - "toast.device-not-empty": "设备不能为空", - "toast.material-not-empty": "物料不能为空", - "toast.quantity-not-empty": "数量不能为空", - "toast.scan-wooden-box-code": "请扫木箱码", - "select.coaster": "小托盘", + "utils.loading": "ロード中..", + "uni.dataSelect.placeholder": "選択してください", + "uni.dataSelect.emptyTips": "オプションなし", + "utils.read-more": "詳細を表示", + "utils.no-more": "これ以上ない", + "button.confirm": "を選択して、", + "button.cancel": "キャンセル", + "button.clear": "クリアランス", + "button.search": "クエリー＃クエリー＃", + "button.confirm-quhuo": "引取確認", + "button.scan-add": "スイープコード挿入", + "button.add-row": "行の挿入", + "button.del-row": "行の削除", + "button.copy-row": "行のコピー", + "button.material-bind": "品目バインディング", + "button.empty-vehicle-bind": "ダミーバインド", + "button.lock": "ロック＃ロック＃", + "button.unlock": "ロック解除", + "button.confirm-down-material": "原料投入の確認", + "button.reissue": "再送", + "button.force-complete": "強制完了", + "button.enter": "に入る", + "button.quit": "終了", + "login.username": "ユーザー名", + "login.password": "パスワード", + "login.remember": "ユーザー名を記憶する", + "login.settings": "設定＃セッテイ＃", + "login.upgrade": "バージョンのアップグレード", + "login.login": "ログイン＃ログイン＃", + "login.text1": "ようこそ", + "login.text2": "東レのWSSハンドヘルドシステム！", + "setting.language": "言語", + "setting.server": "サーバアドレス", + "setting.refresh": "リフレッシュ時間", + "setting.customer-label-printing": "顧客ラベル印刷", + "setting.language-change-confirm": "この設定を適用するとAppが再起動されます", + "upgrade.new-version": "新しいバージョンの検出", + "upgrade.text1": "また新しいバージョンがあり、最新バージョンにアップグレードして、より豊富で安定した、迅速な機能と体験を楽しむことができます！", + "upgrade.text2": "インストールパッケージのダウンロード中、しばらくお待ちください", + "upgrade.upgrade-now": "今すぐアップグレード", + "home.title": "トップページ", + "home.message": "東レのWSSハンドヘルドシステムへようこそ！", + "home.exit": "終了", + "menu.kw-management": "ライブラリビット管理", + "menu.man-get-goods": "手動による集荷", + "menu.man-load-goods": "手動で荷を下ろす", + "menu.kc-manage": "在庫ロック/ロック解除", + "menu.line-management": "生産ライン管理", + "menu.line-call-mater": "ラインフィード", + "menu.line-down-mater": "ラインダウン", + "menu.task-management": "タスク管理", + "menu.work-manage": "ジョブ管理", + "menu.fixedpoint-work": "ポインティングジョブ", + "menu.inout-area-mark": "入退場区域登録", + "filter.area": "領域", + "filter.point": "ポイント", + "filter.type": "を選択してオプションを設定します。", + "filter.material": "品目", + "filter.wltype": "品目タイプ", + "filter.material-use-number": "材料使用量", + "filter.callmater-pallet-number": "フィードトレイ数", + "filter.send-area": "搬送エリア", + "filter.vehicle-code": "キャリアコード", + "filter.start-point": "開始点", + "filter.end-point": "終点", + "filter.start-area": "始点領域", + "filter.end-area": "終点領域", + "filter.control-area": "管制区域", + "grid.number": "シーケンス番号", + "grid.roll-number": "ボリューム番号", + "grid.material-code": "品目コード", + "grid.material-name": "品目名", + "grid.quantity": "数量", + "grid.unit": "単位", + "grid.status": "ステータス", + "grid.point": "ポイント", + "grid.select": "せんたく", + "grid.task-number": "タスク番号", + "grid.start-point": "開始点", + "grid.end-point": "終点", + "grid.vehicle-code": "キャリア番号", + "grid.enter-time": "にゅうりょくじかん", + "grid.enter-man": "入場者", + "grid.enter-area": "ゾーンに入る", + "grid.wltype": "品目タイプ", + "toast.select-row": "行を選択してください", + "toast.device-not-empty": "デバイスを空にすることはできません", + "toast.material-not-empty": "品目を空にすることはできません", + "toast.quantity-not-empty": "数量は空にできません", + "toast.scan-wooden-box-code": "木箱のコードを掃いてください", + "select.coaster": "ミニトレイ", "unit.minute": "分" } \ No newline at end of file diff --git a/locale/uni-app.jp.json b/locale/uni-app.jp.json index c0751fc..6fbc4f6 100644 --- a/locale/uni-app.jp.json +++ b/locale/uni-app.jp.json @@ -1,35 +1,35 @@ { "common": { - "uni.app.quit": "Tekan lagi untuk keluar dari aplikasi", - "uni.async.error": "Sambungan ke timeout server, klik pada layar untuk mencoba lagi", - "uni.showActionSheet.cancel": "Batalkan", - "uni.showToast.unpaired": "Silakan perhatikan bahwa showToast dan hideToast harus dipasang untuk digunakan", - "uni.showLoading.unpaired": "Silakan perhatikan bahwa ShowLoading dan hideLoading harus dipasang untuk digunakan", - "uni.showModal.cancel": "Batalkan", - "uni.showModal.confirm": "OK", - "uni.chooseImage.cancel": "Batalkan", - "uni.chooseImage.sourceType.album": "Pilih dari album", - "uni.chooseImage.sourceType.camera": "Kamera", - "uni.chooseVideo.cancel": "Batalkan", - "uni.chooseVideo.sourceType.album": "Pilih dari album", - "uni.chooseVideo.sourceType.camera": "Kamera", - "uni.previewImage.cancel": "Batalkan", - "uni.previewImage.button.save": "Simpan Gambar", - "uni.previewImage.save.success": "Gambar yang disimpan dengan sukses ke album", - "uni.previewImage.save.fail": "Tidak dapat menyimpan gambar ke album", - "uni.setClipboardData.success": "Kandungan disalin", - "uni.scanCode.title": "Memindai kode", - "uni.scanCode.album": "Daftar Trek", - "uni.scanCode.fail": "Pengenalan gagal", - "uni.scanCode.flash.on": "Sentuh dipecahkan", - "uni.scanCode.flash.off": "Tap untuk ditutup", - "uni.startSoterAuthentication.authContent": "Pengenalan sidik jari...", - "uni.picker.done": "Selesai", - "uni.picker.cancel": "Batalkan", - "uni.video.danmu": "Percakapan peluru", - "uni.video.volume": "Volume", - "uni.button.feedback.title": "Balasan masalah", - "uni.button.feedback.send": "kirim" + "uni.app.quit": "もう一度押すとアプリケーションを終了します", + "uni.async.error": "接続サーバーのタイムアウト、画面をクリックして再試行", + "uni.showActionSheet.cancel": "キャンセル", + "uni.showToast.unpaired": "showToastとhideToastはペアで使用する必要がありますので注意してください", + "uni.showLoading.unpaired": "showLoadingとhideLoadingはペアで使用する必要がありますので注意してください", + "uni.showModal.cancel": "キャンセル", + "uni.showModal.confirm": "を選択して、", + "uni.chooseImage.cancel": "キャンセル", + "uni.chooseImage.sourceType.album": "アルバムから選択", + "uni.chooseImage.sourceType.camera": "撮影する", + "uni.chooseVideo.cancel": "キャンセル", + "uni.chooseVideo.sourceType.album": "アルバムから選択", + "uni.chooseVideo.sourceType.camera": "撮影する", + "uni.previewImage.cancel": "キャンセル", + "uni.previewImage.button.save": "画像を保存", + "uni.previewImage.save.success": "アルバムへの画像の保存に成功しました", + "uni.previewImage.save.fail": "画像をアルバムに保存できませんでした", + "uni.setClipboardData.success": "コンテンツがコピーされました", + "uni.scanCode.title": "スイープコード", + "uni.scanCode.album": "アルバム冊", + "uni.scanCode.fail": "認識に失敗しました", + "uni.scanCode.flash.on": "そっと照らす", + "uni.scanCode.flash.off": "ワンタッチオフ", + "uni.startSoterAuthentication.authContent": "指紋認識中..", + "uni.picker.done": "完了", + "uni.picker.cancel": "キャンセル", + "uni.video.danmu": "弾幕", + "uni.video.volume": "音量", + "uni.button.feedback.title": "もんだいフィードバック", + "uni.button.feedback.send": "送信" }, "ios": {}, "android": {} diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json index e945eb1..a43c8b3 100644 --- a/locale/zh-Hans.json +++ b/locale/zh-Hans.json @@ -10,7 +10,7 @@ "button.search": "查询", "button.confirm-quhuo": "确认取货", "button.scan-add": "扫码插入", - "button.scan-row": "插入行", + "button.add-row": "插入行", "button.del-row": "删除行", "button.copy-row": "复制行", "button.material-bind": "物料绑定", @@ -57,6 +57,7 @@ "filter.point": "点位", "filter.type": "类型", "filter.material": "物料", + "filter.wltype": "物料类型", "filter.material-use-number": "用料数量", "filter.callmater-pallet-number": "叫料托盘数", "filter.send-area": "送往区域", @@ -82,6 +83,7 @@ "grid.enter-time": "进入时间", "grid.enter-man": "进入人", "grid.enter-area": "进入区域", + "grid.wltype": "物料类型", "toast.select-row": "请选择一行", "toast.device-not-empty": "设备不能为空", "toast.material-not-empty": "物料不能为空", diff --git a/main.js b/main.js index dd5f2e7..a20d106 100644 --- a/main.js +++ b/main.js @@ -1,5 +1,6 @@ import App from './App' import Vue from 'vue' +import i18n from './locale/index.js' Vue.config.productionTip = false App.mpType = 'app' @@ -32,6 +33,7 @@ Vue.prototype.$getStatusText = function(statusMap, status) { import store from '@/vuex/store.js' const app = new Vue({ + i18n, ...App, store }) diff --git a/pages.json b/pages.json index 63d6c6b..22b5724 100644 --- a/pages.json +++ b/pages.json @@ -11,13 +11,19 @@ "style": { "navigationStyle": "custom" } - } + } ,{ "path" : "pages/login/setup", "style": { "navigationStyle": "custom" } } + ,{ + "path" : "pages/login/setup2", + "style": { + "navigationStyle": "custom" + } + } ,{ "path" : "pages/login/upgrade", "style": { diff --git a/pages/ftdl/fixedpoint-work.vue b/pages/ftdl/fixedpoint-work.vue index e72e29f..c584f6a 100644 --- a/pages/ftdl/fixedpoint-work.vue +++ b/pages/ftdl/fixedpoint-work.vue @@ -6,41 +6,45 @@ - 起点区域 + + {{$t('filter.start-area')}} - + - 起点 + + {{$t('filter.start-point')}} - + - 终点区域 + + {{$t('filter.end-area')}} - + - 终点 + + {{$t('filter.end-point')}} - + - - + + diff --git a/pages/ftdl/inout-area-mark.vue b/pages/ftdl/inout-area-mark.vue index 20a18d5..1172288 100644 --- a/pages/ftdl/inout-area-mark.vue +++ b/pages/ftdl/inout-area-mark.vue @@ -6,10 +6,11 @@ - 管制区域 + + {{$t('filter.control-area')}} - + @@ -18,10 +19,14 @@ - + + + + + @@ -38,9 +43,12 @@ - + + + + diff --git a/pages/ftdl/kc-manage.vue b/pages/ftdl/kc-manage.vue index b84542f..1c10bb9 100644 --- a/pages/ftdl/kc-manage.vue +++ b/pages/ftdl/kc-manage.vue @@ -6,15 +6,17 @@ - 区域 + + {{$t('filter.area')}} - + - 点位 + + {{$t('filter.point')}} - 物料 + + {{$t('filter.material')}} @@ -37,13 +40,20 @@ - + + + + + + + + @@ -64,10 +74,12 @@ - - + + + + diff --git a/pages/ftdl/line-call-mater.vue b/pages/ftdl/line-call-mater.vue index 44acaf2..61c6685 100644 --- a/pages/ftdl/line-call-mater.vue +++ b/pages/ftdl/line-call-mater.vue @@ -6,7 +6,8 @@ - 区域 + + {{$t('filter.area')}} - 物料 + + {{$t('filter.material')}} - + - 用料数量 + + {{$t('filter.material-use-number')}} @@ -33,18 +36,21 @@ {{unit}} - - 叫料托盘数 + + + {{$t('filter.callmater-pallet-number')}} - + - - + + + diff --git a/pages/ftdl/line-down-mater.vue b/pages/ftdl/line-down-mater.vue index 793245a..f31f7d7 100644 --- a/pages/ftdl/line-down-mater.vue +++ b/pages/ftdl/line-down-mater.vue @@ -6,7 +6,8 @@ - 点位 + + {{$t('filter.point')}} - - 送往区域 + + + {{$t('filter.send-area')}} - + - - - - - - - - - - - - - + + + + @@ -44,12 +36,18 @@
序号{{$t('grid.number')}}{{$t('grid.enter-time')}}{{$t('grid.enter-man')}}{{$t('grid.enter-area')}}
状态{{$t('grid.status')}}{{$t('grid.point')}}{{$t('grid.material-code')}}{{$t('grid.material-name')}}{{$t('grid.quantity')}}{{$t('grid.unit')}}{{$t('grid.roll-number')}}
- + + + + + + + @@ -67,9 +65,8 @@ - - - + + diff --git a/pages/ftdl/man-get-goods.vue b/pages/ftdl/man-get-goods.vue index 063e214..e86c35e 100644 --- a/pages/ftdl/man-get-goods.vue +++ b/pages/ftdl/man-get-goods.vue @@ -6,7 +6,8 @@ - 点位 + + {{$t('filter.point')}} - + + + + + + + @@ -45,9 +52,12 @@ - + + + + diff --git a/pages/ftdl/man-load-goods.vue b/pages/ftdl/man-load-goods.vue index 4c50e82..4610725 100644 --- a/pages/ftdl/man-load-goods.vue +++ b/pages/ftdl/man-load-goods.vue @@ -6,7 +6,8 @@ - 点位 + + {{$t('filter.point')}} - - - - - - - - - - - - - + + + + @@ -37,12 +28,18 @@
序号{{$t('grid.number')}}{{$t('grid.roll-number')}}{{$t('grid.material-code')}}{{$t('grid.material-name')}}{{$t('grid.quantity')}}{{$t('grid.unit')}}
序号{{$t('grid.number')}}{{$t('grid.roll-number')}}{{$t('grid.material-code')}}{{$t('grid.material-name')}}{{$t('grid.quantity')}}{{$t('grid.unit')}}
- + + + + + + + @@ -60,10 +57,12 @@ - - + + + + diff --git a/pages/ftdl/mater-list0.vue b/pages/ftdl/mater-list0.vue index eea9fbb..6a8e715 100644 --- a/pages/ftdl/mater-list0.vue +++ b/pages/ftdl/mater-list0.vue @@ -6,18 +6,20 @@ - 物料 + + {{$t('filter.material')}} - - 物料类型 + + + {{$t('filter.wltype')}} - + @@ -26,10 +28,14 @@
序号{{$t('grid.number')}}{{$t('grid.roll-number')}}{{$t('grid.material-code')}}{{$t('grid.material-name')}}{{$t('grid.quantity')}}{{$t('grid.unit')}}
- + + + + + @@ -46,9 +52,12 @@ - + + + + diff --git a/pages/ftdl/work-manage.vue b/pages/ftdl/work-manage.vue index d08d56d..bd572ec 100644 --- a/pages/ftdl/work-manage.vue +++ b/pages/ftdl/work-manage.vue @@ -5,8 +5,9 @@ - - 载具编码 + + + {{$t('filter.vehicle-code')}} - + + + + + + @@ -43,9 +49,12 @@ - + + + + diff --git a/pages/home/home.vue b/pages/home/home.vue index 3d88589..1f61142 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -1,15 +1,16 @@
物料编码{{$t('grid.material-code')}}{{$t('grid.material-name')}}{{$t('grid.unit')}}{{$t('grid.wltype')}}
任务号{{$t('grid.task-number')}}{{$t('grid.start-point')}}{{$t('grid.end-point')}}{{$t('grid.status')}}{{$t('grid.vehicle-code')}}