diff --git a/common/style/layout.styl b/common/style/layout.styl index 6a58489..092d3f7 100644 --- a/common/style/layout.styl +++ b/common/style/layout.styl @@ -46,8 +46,10 @@ uni-button:after { margin-bottom: 20rpx; } .filter_label { - display: block; - line-height: 80rpx; + display: flex; + align-items: center; + height 80rpx; + line-height: 25rpx; font-size: 28rpx; color: #323232; font-weight: bold; @@ -283,8 +285,12 @@ uni-button:after { border-radius: 10rpx; } .button-primary { + display: flex; + align-items: center; + justify-content: center; font-size: 34rpx; - line-height: 88rpx; + line-height: 26rpx; + height: 88rpx; color: #fff; text-align: center; letter-spacing: 4rpx; diff --git a/locale/en.json b/locale/en.json new file mode 100644 index 0000000..950a9ad --- /dev/null +++ b/locale/en.json @@ -0,0 +1,89 @@ +{ + "utils.loading": "Loading...", + "uni.dataSelect.placeholder": "Please select", + "uni.dataSelect.emptyTips": "No options available", + "utils.read-more": "Read more", + "utils.no-more": "No more", + "button.confirm": "OK", + "button.cancel": "Cancel", + "button.empty": "Empty", + "button.search": "Query", + "login.username": "User name", + "login.password": "Password", + "login.remember": "Remember username", + "login.settings": "Settings", + "login.upgrade": "Upgrade version", + "login.login": "Login", + "login.text1": "Welcome to", + "login.text2": "Hengshen WMS handheld system!", + "setting.language": "language", + "setting.server": "server address", + "setting.refresh": "Refresh time", + "setting.language-change-confirm": "Applying this setting will restart the app", + "upgrade.new-version": "Discovering new versions", + "upgrade.text1": "The Hengshen WMS handheld system has a new version, upgrade to the latest version, and enjoy richer, more stable, and faster functions and experiences!", + "upgrade.text2": "Installation package download in progress, please wait", + "upgrade.upgrade-now": "Upgrade now", + "home.title": "home page", + "home.message": "Welcome to the Hengshen WMS handheld system!", + "home.exit": "Exit", + "nav.rk": "Warehouse management", + "nav.wlzprk": "Material group storage", + "nav.hgzrk": "qualified storage", + "nav.ktprk": "Empty tray storage", + "nav.ck": "Outbound management", + "nav.ktpck": "Empty pallet outbound", + "nav.ckqr": "Outbound confirmation", + "nav.djck": "Document outbound", + "nav.kcck": "Inventory outflow", + "nav.cxwl": "Query materials", + "nav.djlb": "List of Documents", + "nav.kclb": "Inventory List", + "filter.wl": "Material", + "filter.wlbm": "Material code", + "filter.wlmc": "Material name", + "filter.wlgg": "Material specification", + "filter.unit": "Unit", + "filter.wldz": "Single material weight", + "filter.wlpc": "Material batch", + "filter.wlsl": "Material quantity", + "filter.zjbm": "Vehicle code", + "filter.ckbm": "Warehouse code", + "filter.hgzbm": "Qualified code", + "filter.ddh": "Order code", + "filter.ydxx": "Source order", + "filter.tplx": "Tray type", + "filter.cksl": "Outbound quantity", + "filter.ckd": "Outbound point", + "filter.ckdlx": "Outbound order type", + "filter.ck": "Warehouse", + "filter.kwbm": "Location code", + "filter.ckkc": "Outbound inventory", + "filter.djbm": "Document code", + "filter.djlx": "Document type", + "filter.remark": "Remark", + "filter.cjsj": "Creation time", + "filter.cjr": "Creator", + "filter.sqsl": "Quantity", + "filter.jhsl": "Planned quantity", + "filter.yfpsl": "Allocated quantity", + "filter.pcsn": "Batch", + "filter.ck": "Warehouse", + "filter.cj": "Workshop", + "filter.kcsl": "Inventory quantity", + "btn.cancle": "Clear", + "btn.search": "Query", + "btn.confirm": "Confirm", + "btn.zpqr": "Group confirmation", + "btn.tpkck": "Tray warehouse outbound", + "btn.smckqr": "Scan code for outbound confirmation", + "btn.ckqr": "Outbound confirmation", + "more.ckgd": "See more", + "more.jzz": "Loading", + "more.mygd": "No more", + "text.ddtp": "Stacking trays", + "text.lx": "Workbin", + "text.tpk": "Tray storage", + "text.lxk": "Material box warehouse", + "text.cj": "workshop" +} \ No newline at end of file diff --git a/locale/es.json b/locale/es.json new file mode 100644 index 0000000..38748bf --- /dev/null +++ b/locale/es.json @@ -0,0 +1,89 @@ +{ + "utils.loading": "Carga...", + "uni.dataSelect.placeholder": "Por favor, elija", + "uni.dataSelect.emptyTips": "Sin opciones", + "utils.read-more": "Ver más", + "utils.no-more": "No hay más", + "button.confirm": "Determinar", + "button.cancel": "Cancelación", + "button.empty": "Vaciado", + "button.search": "Consulta", + "login.username": "Usuarios", + "login.password": "Contraseña", + "login.remember": "Recuerda a los usuarios", + "login.settings": "Configuración", + "login.upgrade": "Versión actualizada", + "login.login": "Iniciar sesión", + "login.text1": "Bienvenidos", + "login.text2": "al sistema portátil hengsen WMS！", + "setting.language": "Idiomas", + "setting.server": "Servidores", + "setting.refresh": "", + "setting.language-change-confirm": "Aplicar esta configuración reiniciará la aplicación", + "upgrade.new-version": "Descubrir una nueva versión", + "upgrade.text1": "¡¡ el sistema portátil hengsen WMS tiene una nueva versión, se actualiza a la última versión y disfruta de funciones y experiencias más ricas, estables y rápidas!", + "upgrade.text2": "Descarga del paquete de instalación, por favor espere", + "upgrade.upgrade-now": "Actualización inmediata", + "home.title": "Página de inicio", + "home.message": "¡¡ Bienvenidos al sistema portátil hengsen wms!", + "home.exit": "Salida", + "nav.rk": "Gestión del almacenamiento", + "nav.wlzprk": "Almacenamiento de grupos de materiales", + "nav.hgzrk": "Almacenamiento de certificados", + "nav.ktprk": "Almacenamiento de paletas vacías", + "nav.ck": "Gestión de la salida del almacén", + "nav.ktpck": "Bandeja vacía fuera del almacén", + "nav.ckqr": "Confirmación de la salida del almacén", + "nav.djck": "Los documentos salen del almacén", + "nav.kcck": "Salida de inventario", + "nav.cxwl": "Consulta de materiales", + "nav.djlb": "Lista de documentos", + "nav.kclb": "Lista de inventario", + "filter.wl": "Material", + "filter.wlbm": "Codificación de materiales", + "filter.wlmc": "Nombre del material", + "filter.wlgg": "Especificaciones de materiales", + "filter.unit": "Unidades", + "filter.wldz": "Peso de la factura de materiales", + "filter.wlpc": "Lotes de materiales", + "filter.wlsl": "Cantidad de materiales", + "filter.zjbm": "Codificación del vehículo", + "filter.ckbm": "Código del almacén", + "filter.hgzbm": "Código del certificado de conformidad", + "filter.ddh": "Número de pedido", + "filter.ydxx": "Información de la lista de fuentes", + "filter.tplx": "Tipo de bandeja", + "filter.cksl": "Número de salidas", + "filter.ckd": "Punto de salida", + "filter.ckdlx": "Tipo de orden de salida", + "filter.ck": "Almacén", + "filter.kwbm": "Codificación de la biblioteca", + "filter.ckkc": "Inventario de salida", + "filter.djbm": "Código del documento", + "filter.djlx": "Tipo de documento", + "filter.remark": "Nota", + "filter.cjsj": "Tiempo de creación", + "filter.cjr": "Creador", + "filter.sqsl": "Número de solicitudes", + "filter.jhsl": "Número de planes", + "filter.yfpsl": "Cantidad asignada", + "filter.pcsn": "Número de lote", + "filter.ck": "Almacén", + "filter.cj": "Taller", + "filter.kcsl": "Cantidad de inventario", + "btn.cancle": "Vaciado", + "btn.search": "Consulta", + "btn.confirm": "Confirmación", + "btn.zpqr": "Confirmación del disco de grupo", + "btn.tpkck": "El almacén de paletas sale del almacén", + "btn.smckqr": "Escanear el Código para confirmar la salida del almacén", + "btn.ckqr": "Confirmación de la salida del almacén", + "more.ckgd": "Ver más", + "more.jzz": "En carga", + "more.mygd": "No hay más", + "text.ddtp": "Bandeja apilada", + "text.lx": "Caja de material", + "text.tpk": "Biblioteca de paletas", + "text.lxk": "Almacén de cajas de material", + "text.cj": "Taller" +} \ No newline at end of file diff --git a/locale/index.js b/locale/index.js new file mode 100644 index 0000000..36bfd33 --- /dev/null +++ b/locale/index.js @@ -0,0 +1,28 @@ + +import Vue from 'vue' +import VueI18n from 'vue-i18n' +import en from './en.json' +import enUni from './uni-app.en.json' +import zhHans from './zh-Hans.json' +import zhUni from './uni-app.zh-Hans.json' +import es from './es.json' +import esUni from './uni-app.es.json' + +Vue.use(VueI18n) + +const messages = { + 'en': Object.assign(en, enUni), + 'zh-Hans': Object.assign(zhHans, zhUni), + 'es': Object.assign(es, esUni) +} + +let i18nConfig = { + silentTranslationWarn: true, + locale: uni.getLocale(), + messages +} + +const i18n = new VueI18n(i18nConfig) + +export default i18n + diff --git a/locale/uni-app.en.json b/locale/uni-app.en.json new file mode 100644 index 0000000..acb9998 --- /dev/null +++ b/locale/uni-app.en.json @@ -0,0 +1,36 @@ +{ + "common": { + "uni.app.quit": "Press again to exit the application", + "uni.async.error": "Connection to server timeout, click on screen to retry", + "uni.showActionSheet.cancel": "Cancel", + "uni.showToast.unpaired": "Please note that showToast and hideToast must be paired for use", + "uni.showLoading.unpaired": "Please note that showLoading and hideLoading must be paired for use", + "uni.showModal.cancel": "Cancel", + "uni.showModal.confirm": "Ok", + "uni.chooseImage.cancel": "Cancel", + "uni.chooseImage.sourceType.album": "Select from album", + "uni.chooseImage.sourceType.camera": "Capture", + "uni.chooseVideo.cancel": "Cancel", + "uni.chooseVideo.sourceType.album": "Select from album", + "uni.chooseVideo.sourceType.camera": "Capture", + "uni.previewImage.cancel": "Cancel", + "uni.previewImage.button.save": "Save image", + "uni.previewImage.save.success": "Successfully saved image to album", + "uni.previewImage.save.fail": "Saving image to album failed", + "uni.setClipboardData.success": "Content copied", + "uni.scanCode.title": "Scan Code", + "uni.scanCode.album": "Album", + "uni.scanCode.fail": "Recognition failed", + "uni.scanCode.flash.on": "Tap to illuminate", + "uni.scanCode.flash.off": "Tap to close", + "uni.startSoterAuthentication.authContent": "Fingerprint recognition in progress...", + "uni.picker.done": "Complete", + "uni.picker.cancel": "Cancel", + "uni.video.danmu": "Barrage", + "uni.video.volume": "Volume", + "uni.button.feedback.title": "Problem feedback", + "uni.button.feedback.send": "Send" + }, + "ios": {}, + "android": {} +} \ No newline at end of file diff --git a/locale/uni-app.es.json b/locale/uni-app.es.json new file mode 100644 index 0000000..b9dec07 --- /dev/null +++ b/locale/uni-app.es.json @@ -0,0 +1,36 @@ +{ + "common": { + "uni.app.quit": "Presione de nuevo para salir de la aplicación", + "uni.async.error": "Tiempo de conexión al servidor, haga clic en la pantalla para volver a intentarlo", + "uni.showActionSheet.cancel": "Cancelación", + "uni.showToast.unpaired": "请注意 showToast 与 hideToast 必须配对使用", + "uni.showLoading.unpaired": "请注意 showLoading 与 hideLoading 必须配对使用", + "uni.showModal.cancel": "Cancelación", + "uni.showModal.confirm": "Determinar", + "uni.chooseImage.cancel": "Cancelación", + "uni.chooseImage.sourceType.album": "从相册选择", + "uni.chooseImage.sourceType.camera": "拍摄", + "uni.chooseVideo.cancel": "Cancelación", + "uni.chooseVideo.sourceType.album": "从相册选择", + "uni.chooseVideo.sourceType.camera": "拍摄", + "uni.previewImage.cancel": "Cancelación", + "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": "Cancelación", + "uni.video.danmu": "弹幕", + "uni.video.volume": "音量", + "uni.button.feedback.title": "问题反馈", + "uni.button.feedback.send": "发送" + }, + "ios": {}, + "android": {} +} \ No newline at end of file diff --git a/locale/uni-app.zh-Hans.json b/locale/uni-app.zh-Hans.json new file mode 100644 index 0000000..78cfef2 --- /dev/null +++ b/locale/uni-app.zh-Hans.json @@ -0,0 +1,36 @@ +{ + "common": { + "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": {} +} \ No newline at end of file diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json new file mode 100644 index 0000000..66485e3 --- /dev/null +++ b/locale/zh-Hans.json @@ -0,0 +1,89 @@ +{ + "utils.loading": "加载中...", + "uni.dataSelect.placeholder": "请选择", + "uni.dataSelect.emptyTips": "无选项", + "utils.read-more": "查看更多", + "utils.no-more": "没有更多", + "button.confirm": "确定", + "button.cancel": "取消", + "button.empty": "清空", + "button.search": "查询", + "login.username": "用户名", + "login.password": "密码", + "login.remember": "记住用户名", + "login.settings": "设置", + "login.upgrade": "升级版本", + "login.login": "登录", + "login.text1": "欢迎来到", + "login.text2": "恒森WMS手持系统！", + "setting.language": "语言", + "setting.server": "服务器地址", + "setting.refresh": "刷新时间", + "setting.language-change-confirm": "应用此设置将重启App", + "upgrade.new-version": "发现新版本", + "upgrade.text1": "恒森WMS手持系统又有新版本了，升级到最新版本，享受更丰富、稳定、快速的功能和体验！", + "upgrade.text2": "安装包下载中，请稍后", + "upgrade.upgrade-now": "立即升级", + "home.title": "首页", + "home.message": "欢迎进入恒森WMS手持系统！", + "home.exit": "退出", + "nav.rk": "入库管理", + "nav.wlzprk": "物料组盘入库", + "nav.hgzrk": "合格证入库", + "nav.ktprk": "空托盘入库", + "nav.ck": "出库管理", + "nav.ktpck": "空托盘出库", + "nav.ckqr": "出库确认", + "nav.djck": "单据出库", + "nav.kcck": "库存出库", + "nav.cxwl": "查询物料", + "nav.djlb": "单据列表", + "nav.kclb": "库存列表", + "filter.wl": "物料", + "filter.wlbm": "物料编码", + "filter.wlmc": "物料名称", + "filter.wlgg": "物料规格", + "filter.unit": "单位", + "filter.wldz": "物料单重", + "filter.wlpc": "物料批次", + "filter.wlsl": "物料数量", + "filter.zjbm": "载具编码", + "filter.ckbm": "仓库编码", + "filter.hgzbm": "合格证编码", + "filter.ddh": "订单号", + "filter.ydxx": "源单信息", + "filter.tplx": "托盘类型", + "filter.cksl": "出库数量", + "filter.ckd": "出库点", + "filter.ckdlx": "出库单类型", + "filter.ck": "仓库", + "filter.kwbm": "库位编码", + "filter.ckkc": "出库库存", + "filter.djbm": "单据编码", + "filter.djlx": "单据类型", + "filter.remark": "备注", + "filter.cjsj": "创建时间", + "filter.cjr": "创建人", + "filter.sqsl": "申请数量", + "filter.jhsl": "计划数量", + "filter.yfpsl": "已分配数量", + "filter.pcsn": "批次号", + "filter.ck": "仓库", + "filter.cj": "车间", + "filter.kcsl": "库存数量", + "btn.cancle": "清空", + "btn.search": "查询", + "btn.confirm": "确认", + "btn.zpqr": "组盘确认", + "btn.tpkck": "托盘库出库", + "btn.smckqr": "扫码出库确认", + "btn.ckqr": "出库确认", + "more.ckgd": "查看更多", + "more.jzz": "加载中", + "more.mygd": "没有更多", + "text.ddtp": "堆叠托盘", + "text.lx": "料箱", + "text.tpk": "托盘库", + "text.lxk": "料箱库", + "text.cj": "车间" +} \ No newline at end of file diff --git a/main.js b/main.js index 1abc647..ad9c57c 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' @@ -28,6 +29,7 @@ Vue.directive('enterNumber', { import store from '@/vuex/store.js' const app = new Vue({ + i18n, ...App, store }) diff --git a/package.json b/package.json index 7542a27..5b22f08 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,6 @@ { "dependencies": { - "jsencrypt": "^3.2.1" + "jsencrypt": "^3.2.1", + "vue-i18n": "^10.0.5" } } diff --git a/pages/common/mater-list.vue b/pages/common/mater-list.vue index 14c9f5e..a3c5770 100644 --- a/pages/common/mater-list.vue +++ b/pages/common/mater-list.vue @@ -6,7 +6,7 @@ - 物料 + {{$t('filter.wl')}} @@ -18,15 +18,15 @@ - - - - - - - - - + + + + + + + + + @@ -48,9 +48,9 @@ - - - + + + @@ -74,9 +74,9 @@ reload: false, status: 'more', contentText: { - contentdown: '查看更多', - contentrefresh: '加载中', - contentnomore: '没有更多' + contentdown: this.$t('more.ckgd'), + contentrefresh: this.$t('more.jzz'), + contentnomore: this.$t('more.mygd') }, totalCount: 0, pageNum: 1, diff --git a/pages/entry/empty-tray-to-store.vue b/pages/entry/empty-tray-to-store.vue index 3a45503..706fc8f 100644 --- a/pages/entry/empty-tray-to-store.vue +++ b/pages/entry/empty-tray-to-store.vue @@ -5,28 +5,28 @@ - - 载具编码 + + {{$t('filter.zjbm')}} - + - - 托盘类型 + + {{$t('filter.tplx')}} - - + + - - + + @@ -44,7 +44,7 @@ return { title: '', val1: '', - options: [{text:'堆叠托盘', value:'22222222'},{text:'料箱',value: '11111111'}], + options: [{text:this.$t('text.ddtp'), value:'22222222'},{text:this.$t('text.lx'),value: '11111111'}], index: '', disabled: false }; diff --git a/pages/entry/mater-group-to-store.vue b/pages/entry/mater-group-to-store.vue index a039e8d..5377d94 100644 --- a/pages/entry/mater-group-to-store.vue +++ b/pages/entry/mater-group-to-store.vue @@ -5,83 +5,83 @@ - - 物料编码 + + {{$t('filter.wlbm')}} - + - - 物料名称 + + {{$t('filter.wlmc')}} - + - - 物料规格 + + {{$t('filter.wlgg')}} - + - - 单位 + + {{$t('filter.unit')}} - + - - 物料单重 + + {{$t('filter.wldz')}} - + - - 物料批次 + + {{$t('filter.wlpc')}} - + - - 物料数量 + + {{$t('filter.wlsl')}} - + - - 载具编码 + + {{$t('filter.zjbm')}} - + - - 仓库编码 + + {{$t('filter.ckbm')}} - + - + - - + + @@ -101,7 +101,8 @@ currentData: {}, options: [], index: '', - disabled: false + disabled: false, + locale: this.$i18n.locale }; }, onLoad (options) { @@ -136,7 +137,7 @@ }, toJump () { uni.navigateTo({ - url: '/pages/common/mater-list?title=查询物料' + url: '/pages/common/mater-list?title=' + this.$t('nav.cxwl') }) }, toEmpty () { diff --git a/pages/entry/qualified-to-store.vue b/pages/entry/qualified-to-store.vue index c5b2cd0..bc71029 100644 --- a/pages/entry/qualified-to-store.vue +++ b/pages/entry/qualified-to-store.vue @@ -5,10 +5,10 @@ - - 合格证编码 + + {{$t('filter.hgzbm')}} - + - - 载具编码 + + {{$t('filter.zjbm')}} - + @@ -28,58 +28,58 @@ - 订单号 - {{currentData.moNumber}} + {{$t('filter.ddh')}} + {{currentData.moNumber}} - 源单信息 - {{currentData.srcBillNo}} + {{$t('filter.ydxx')}} + {{currentData.srcBillNo}} - 物料编码 - {{currentData.material_code}} + {{$t('filter.wlbm')}} + {{currentData.material_code}} - 物料名称 - {{currentData.material_name}} + {{$t('filter.wlmc')}} + {{currentData.material_name}} - 物料规格 - {{currentData.material_spec}} + {{$t('filter.wlgg')}} + {{currentData.material_spec}} - 单位 - {{currentData.unit_name}} + {{$t('filter.unit')}} + {{currentData.unit_name}} - 单重 - + {{$t('filter.wldz')}} + - 批次 - + {{$t('filter.wlpc')}} + - 物料数量 - + {{$t('filter.wlsl')}} + - 仓库编码 + {{$t('filter.ckbm')}} - + - - + + diff --git a/pages/home/home.vue b/pages/home/home.vue index a527e3a..3be897f 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -1,15 +1,15 @@ @@ -82,9 +82,9 @@ reload: false, status: 'more', contentText: { - contentdown: '查看更多', - contentrefresh: '加载中', - contentnomore: '没有更多' + contentdown: this.$t('more.ckgd'), + contentrefresh: this.$t('more.jzz'), + contentnomore: this.$t('more.mygd') }, totalCount: 0, pageNum: 1, diff --git a/pages/outbound/bill-out-store.vue b/pages/outbound/bill-out-store.vue index ff18984..5e6d511 100644 --- a/pages/outbound/bill-out-store.vue +++ b/pages/outbound/bill-out-store.vue @@ -5,41 +5,41 @@ - - 出库单类型 + + {{$t('filter.ckdlx')}} - - + + - 单据编码 + {{$t('filter.djbm')}} {{currentData.code}} - 单据类型 + {{$t('filter.djlx')}} {{currentData.form_type}} - 创建时间 + {{$t('filter.cjsj')}} {{currentData.create_time}} - 创建人 + {{$t('filter.cjr')}} {{currentData.create_name}} - 物料编码 + {{$t('filter.wlbm')}} {{currentData.material_code}} - 单位 + {{$t('filter.unit')}} {{currentData.unit_name}} - 仓库 + {{$t('filter.ck')}} - + - 车间 + {{$t('filter.cj')}} - + @@ -51,16 +51,16 @@ - - - - - - - + + + + + + + @@ -81,8 +81,8 @@ - - + + @@ -104,9 +104,9 @@ currentData: {}, dataList: [], disabled: false, - options1: [{value: 'FStockPallet', text: '托盘库'}, {value: 'FStockId', text: '料箱库'}], + options1: [{value: 'FStockPallet', text: this.$t('text.tpk')}, {value: 'FStockId', text: this.$t('text.lxk')}], index1: '', - options2: [{value: 'A1', text: 'A1车间'}, {value: 'A2', text: 'A2车间'}, {value: 'A3', text: 'A3车间'}], + options2: [{value: 'A1', text: 'A1' + this.$t('text.cj')}, {value: 'A2', text: 'A2' + this.$t('text.cj')}, {value: 'A3', text: 'A3' + this.$t('text.cj')}], allCheck: false }; }, @@ -138,7 +138,7 @@ this.index = e if (e) { uni.navigateTo({ - url: '/pages/outbound/bill-list?title=单据列表&id=' + e + url: '/pages/outbound/bill-list?title=' + this.$t('nav.djlb') +'&id=' + e }) } }, diff --git a/pages/outbound/out-store-confirm.vue b/pages/outbound/out-store-confirm.vue index d97c820..4b37cc9 100644 --- a/pages/outbound/out-store-confirm.vue +++ b/pages/outbound/out-store-confirm.vue @@ -5,10 +5,10 @@ - - 载具编码 + + {{$t('filter.zjbm')}} - + @@ -17,8 +17,8 @@ - - + + diff --git a/pages/outbound/stock-list.vue b/pages/outbound/stock-list.vue index 1c507fb..4fc2abf 100644 --- a/pages/outbound/stock-list.vue +++ b/pages/outbound/stock-list.vue @@ -5,18 +5,18 @@ - - 仓库 + + {{$t('filter.ck')}} - - + + - - 物料编码 + + {{$t('filter.wlbm')}} - + @@ -26,12 +26,12 @@
物料编码物料名称物料规格单位物料单重物料批次物料数量载具编码仓库编码{{$t('filter.wlbm')}}{{$t('filter.wlmc')}}{{$t('filter.wlgg')}}{{$t('filter.unit')}}{{$t('filter.wldz')}}{{$t('filter.wlpc')}}{{$t('filter.wlsl')}}{{$t('filter.zjbm')}}{{$t('filter.ckbm')}}
- 物料名称 + {{$t('filter.wlmc')}} 计划数量申请数量库存数量出库数量已分配数量批次号单位{{$t('filter.jhsl')}}{{$t('filter.sqsl')}}{{$t('filter.kcsl')}}{{$t('filter.cksl')}}{{$t('filter.yfpsl')}}{{$t('filter.pcsn')}}{{$t('filter.unit')}}
- - - - - - + + + + + + @@ -50,9 +50,9 @@ - - - + + + @@ -70,7 +70,7 @@ return { title: '', val1: '', - options: [{value: 'FStockPallet', text: '托盘库'}, {value: 'FStockId', text: '料箱库'}], + options: [{value: 'FStockPallet', text: this.$t('text.tpk')}, {value: 'FStockId', text: this.$t('text.lxk')}], index: '', dataList: [], pkId: '', @@ -78,9 +78,9 @@ reload: false, status: 'more', contentText: { - contentdown: '查看更多', - contentrefresh: '加载中', - contentnomore: '没有更多' + contentdown: this.$t('more.ckgd'), + contentrefresh: this.$t('more.jzz'), + contentnomore: this.$t('more.mygd') }, totalCount: 0, pageNum: 1, diff --git a/pages/outbound/stock-out-store.vue b/pages/outbound/stock-out-store.vue index 701b4ac..c07e307 100644 --- a/pages/outbound/stock-out-store.vue +++ b/pages/outbound/stock-out-store.vue @@ -5,48 +5,48 @@ - - 仓库 + + {{$t('filter.ck')}} - + - 库位 - {{currentData.struct_code}} + {{$t('filter.kwbm')}} + {{currentData.struct_code}} - 载具编码 - {{currentData.vehicle_code}} + {{$t('filter.zjbm')}} + {{currentData.vehicle_code}} - 物料编码 - {{currentData.material_code}} + {{$t('filter.wlbm')}} + {{currentData.material_code}} - 批号 - {{currentData.pcsn}} + {{$t('filter.pcsn')}} + {{currentData.pcsn}} - 车间 + {{$t('filter.cj')}} - + - 出库库存 - + {{$t('filter.ckkc')}} + - - + + @@ -65,7 +65,7 @@ title: '', val1: '', currentData: {}, - options1: [{value: 'A1', text: 'A1车间'}, {value: 'A2', text: 'A2车间'}, {value: 'A3', text: 'A3车间'}], + options1: [{value: 'A1', text: 'A1' + this.$t('text.cj')}, {value: 'A2', text: 'A2' + this.$t('text.cj')}, {value: 'A3', text: 'A3' + this.$t('text.cj')}], disabled: false }; }, @@ -76,9 +76,9 @@ if (this.$store.getters.publicObj !== '') { this.currentData = this.$store.getters.publicObj if (this.currentData.stor_code === 'FStockPallet') { - this.val1 = '托盘库' + this.val1 = this.$t('text.tpk') } else if (this.currentData.stor_code === 'FStockId') { - this.val1 = '料箱库' + this.val1 = this.$t('text.lxk') } this.$store.dispatch('setPublicObj', '') } @@ -86,7 +86,7 @@ methods: { toJump () { uni.navigateTo({ - url: '/pages/outbound/stock-list?title=库存列表' + url: '/pages/outbound/stock-list?title=' + this.$t('nav.kclb') }) }, async _outStorageMaterConfirm () { @@ -120,10 +120,5 @@ diff --git a/pages/outbound/tray-out-store.vue b/pages/outbound/tray-out-store.vue index 08b22b0..e7af8d5 100644 --- a/pages/outbound/tray-out-store.vue +++ b/pages/outbound/tray-out-store.vue @@ -5,34 +5,34 @@ - - 托盘类型 + + {{$t('filter.tplx')}} - - + + - - 出库数量 + + {{$t('filter.cksl')}} - + - - 出库点 + + {{$t('filter.ckd')}} - - + + - - + + @@ -49,7 +49,7 @@ data() { return { title: '', - options1: [{text:'堆叠托盘', value:'22222222'},{text:'料箱',value: '11111111'}], + options1: [{text:this.$t('text.ddtp'), value:'22222222'},{text:this.$t('text.lx'),value: '11111111'}], index1: '', qty: '', options2: [], diff --git a/yarn.lock b/yarn.lock index 9370773..9d213b7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,7 +2,47 @@ # yarn lockfile v1 +"@intlify/core-base@10.0.5": + version "10.0.5" + resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-10.0.5.tgz#c4d992381f8c3a50c79faf67be3404b399c3be28" + integrity sha512-F3snDTQs0MdvnnyzTDTVkOYVAZOE/MHwRvF7mn7Jw1yuih4NrFYLNYIymGlLmq4HU2iIdzYsZ7f47bOcwY73XQ== + dependencies: + "@intlify/message-compiler" "10.0.5" + "@intlify/shared" "10.0.5" + +"@intlify/message-compiler@10.0.5": + version "10.0.5" + resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-10.0.5.tgz#4eeace9f4560020d5e5d77f32bed7755e71d8efd" + integrity sha512-6GT1BJ852gZ0gItNZN2krX5QAmea+cmdjMvsWohArAZ3GmHdnNANEcF9JjPXAMRtQ6Ux5E269ymamg/+WU6tQA== + dependencies: + "@intlify/shared" "10.0.5" + source-map-js "^1.0.2" + +"@intlify/shared@10.0.5": + version "10.0.5" + resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-10.0.5.tgz#1b46ca8b541f03508fe28da8f34e4bb85506d6bc" + integrity sha512-bmsP4L2HqBF6i6uaMqJMcFBONVjKt+siGluRq4Ca4C0q7W2eMaVZr8iCgF9dKbcVXutftkC7D6z2SaSMmLiDyA== + +"@vue/devtools-api@^6.5.0": + version "6.6.4" + resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.6.4.tgz#cbe97fe0162b365edc1dba80e173f90492535343" + integrity sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g== + jsencrypt@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/jsencrypt/-/jsencrypt-3.2.1.tgz#09766983cc760088ff26b12fe7e574252af97727" integrity sha512-k1sD5QV0KPn+D8uG9AdGzTQuamt82QZ3A3l6f7TRwMU6Oi2Vg0BsL+wZIQBONcraO1pc78ExMdvmBBJ8WhNYUA== + +source-map-js@^1.0.2: + version "1.2.1" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46" + integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA== + +vue-i18n@^10.0.5: + version "10.0.5" + resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-10.0.5.tgz#fdf4e6c7b669e80cfa3a12ed9625e2b46671cdf0" + integrity sha512-9/gmDlCblz3i8ypu/afiIc/SUIfTTE1mr0mZhb9pk70xo2csHAM9mp2gdQ3KD2O0AM3Hz/5ypb+FycTj/lHlPQ== + dependencies: + "@intlify/core-base" "10.0.5" + "@intlify/shared" "10.0.5" + "@vue/devtools-api" "^6.5.0"
仓库编码库位编码载具编码物料编码物料批次出库库存{{$t('filter.ckbm')}}{{$t('filter.kwbm')}}{{$t('filter.zjbm')}}{{$t('filter.wlbm')}}{{$t('filter.wlpc')}}{{$t('filter.ckkc')}}