diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 0ec9990..d585702 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -230,7 +230,7 @@ export default { return_Tip4: 'Return Qty cannot be greater than total Qty', quantitys: 'Cannot be greater than the quantity to be returned', actual: 'The actual returned quantity is not equal to the quantity to be returned', - receiveAStation: 'Receiving station', + receiveAStation: 'Receiving', //库内主菜单 Warehouse: 'FG WH', @@ -255,14 +255,14 @@ export default { InventoryTotalNumber: 'Total', create: 'create', open: 'open', - materialName: 'materialName', + materialName: 'material', Enable: 'The memory function is enabled', Closerepository: 'The memory function is disabled', - quantityNum: 'The loading quantity', - recommended: 'RecommendedLoc', + quantityNum: 'Qty', + recommended: 'Lock', materialCode: 'Please enter the material number', receive: 'receiveLoc', - Production: 'Production orders', + Production: 'Order', InventoryPleaseScan: 'Please scan No.', InventoryFinish: 'Finish', collecting: 'Please enter the collecting doc No', @@ -393,6 +393,7 @@ export default { product_Location: 'Loc', succeeded: 'Scan back succeeded', product_barCode: 'Barcode', + barCode: 'Bar code', sweepBarCode: 'Barcode', QuantityReturned: 'Quantity returned', product_TransferCar: 'Transfer vehicle', diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index 66b1488..129f19d 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -150,7 +150,7 @@ export default class LoginPage extends BasePage { console.log('image', this.image); console.log('Version////', this.Version); } - Version = '1.0.19'; + Version = '1.0.20'; compareVersion(version1: any, version2: any) { //如果version1 大 会返回1 &&& 如果version2 大 会返回 -1 const newVersion1 = `${version1}`.split('.').length < 3 ? `${version1}`.concat('.0') : `${version1}`; diff --git a/src/pages/raw/handover/feeding/create.vue b/src/pages/raw/handover/feeding/create.vue index 082f398..fbd0f73 100644 --- a/src/pages/raw/handover/feeding/create.vue +++ b/src/pages/raw/handover/feeding/create.vue @@ -75,12 +75,12 @@ {{ $t('message.Query') }} - + - {{ $t('message.workArea_Confirm') }} + {{ $t('message.workArea_Confirm') }}
@@ -218,6 +218,13 @@ export default class RawReceiptDetail extends BasePage { }); } async onSubmit() { + if (this.List.length == 0) { + uni.showToast({ + title: this.$t('message.Pi_tip4') as any, + image: '/static/icons/icon-52.png', + }); + return; + } this.List.forEach((item: any) => { item.factoryCode = this.session.factoryCode; item.loginName = this.session.loginName;