diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index 9f3623a..2cd097f 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -484,12 +484,15 @@ export default { ScanBoxCode: '请先扫描箱码', STOTransfers: 'STO 调拨', STOoutbound: 'STO 出库', + STOStorage: 'STO 入库', DNLine: 'DN行项目', STOInventoryOrderNo: 'STO单号', STOLine: 'STO行项目', OutboundNum: '出库数量', + StorageNum: '入库数量', DeliveryLoc: '出库地点', AllThem: '请全部出库', submitted: '还有数据没提交 是否重新查询', + StorageLocation: '入库地点', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 585e97d..2c441d5 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -484,12 +484,15 @@ export default { ScanBoxCode: 'Please scan the box code first', STOTransfers: 'STO Transfers', STOoutbound: 'STO Outbound', - DNLine: 'DNRowItem', + STOStorage: 'STO Storage', + DNLine: 'DNItem', STOInventoryOrderNo: 'STO Order', STOLine: 'STORowItem', - OutboundNum: 'Outbound QTY', + OutboundNum: 'total', + StorageNum: 'total', DeliveryLoc: 'Delivery Loc', AllThem: 'All of them, please', submitted: 'There is data not submitted whether to re-query', + StorageLocation: 'Storage Loc', }, }; diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts index 15d2e8e..7897201 100644 --- a/src/i18n/lang/ru.ts +++ b/src/i18n/lang/ru.ts @@ -89,7 +89,7 @@ export default { po_Return: 'Вернуть', po_MaterielNo: 'код', Materiel: 'MAT', - po_MaterielDes: 'описание МАТ', + po_MaterielDes: 'описыва', returned: 'Количество возвратов', returneds: 'Количество возвратов', quantity: 'Совокупное количество возвратов', @@ -355,7 +355,7 @@ export default { product_Delete: 'Удалить', product_Empty: 'Пустой', product_AllSelect: 'Выбрать все', - product_add: 'Добавлять', + product_add: 'добавля', product_Confirm: 'Подтверждать', product_Upload: 'Представлять на рассмотрение', product_Tip1: 'Лок не может быть пустым', @@ -441,7 +441,7 @@ export default { Operation: 'Оператор.', StorageTime: 'Время входа в хранилище', spareGoods: 'Доставка запчастей', - matcode: 'Кодирование вещества', + matcode: 'ярд', Quantity: 'Количество спроса', scanningContainer: 'Сначала просканируйте код контейнера', Pi_tipqty: 'Пожалуйста, убедитесь, что равняется количеству спроса', @@ -484,12 +484,15 @@ export default { ScanBoxCode: 'Сначала просканируйте ящики', STOTransfers: 'STO отпускн', STOoutbound: 'STO На продаж', - DNLine: 'DNСтрокаItem', + STOStorage: 'STO На склад', + DNLine: 'Строка', STOInventoryOrderNo: 'STO Заказ', - STOLine: 'STOСтрокаItem', - OutboundNum: 'На продаж количеств', - DeliveryLoc: 'Место выхода', + STOLine: 'STOСтрока', + OutboundNum: 'совокупн', + StorageNum: 'совокупн', + DeliveryLoc: 'банк', AllThem: 'Все из библиотеки, пожалуйста', submitted: 'Есть также данные, которые не были представлены для повторного запроса', + StorageLocation: 'Вход.', }, }; diff --git a/src/pages.json b/src/pages.json index 9f71bcc..14b7dee 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1178,6 +1178,14 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, + { + "path": "pages/raw/STO/STO-Storage/index", + "style": { + "navigationBarTitleText": "STO调拨入库", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, { "path": "pages/demo/index", "style": { diff --git a/src/pages/raw/STO/STO-Outbound/index.vue b/src/pages/raw/STO/STO-Outbound/index.vue index 7ed5d7c..b7db08f 100644 --- a/src/pages/raw/STO/STO-Outbound/index.vue +++ b/src/pages/raw/STO/STO-Outbound/index.vue @@ -261,6 +261,10 @@ export default class dnReceiptDom extends BasePage { if (isTrue) { await this.model.SubmitList(this.SunmitList); if (this.model.SubCode == 1) { + uni.showToast({ + title: this.$t('message.success') as string, + image: '/static/icons/icon-51.png', + }); this.empty(); } } diff --git a/src/pages/raw/STO/STO storage/config.ts b/src/pages/raw/STO/STO-Storage/config.ts similarity index 100% rename from src/pages/raw/STO/STO storage/config.ts rename to src/pages/raw/STO/STO-Storage/config.ts diff --git a/src/pages/raw/STO/STO storage/index.vue b/src/pages/raw/STO/STO-Storage/index.vue similarity index 96% rename from src/pages/raw/STO/STO storage/index.vue rename to src/pages/raw/STO/STO-Storage/index.vue index 7ed5d7c..981ae2d 100644 --- a/src/pages/raw/STO/STO storage/index.vue +++ b/src/pages/raw/STO/STO-Storage/index.vue @@ -5,7 +5,7 @@ - {{ $t('message.STOoutbound') }} + {{ $t('message.STOStorage') }} @@ -54,22 +54,22 @@ {{ TheItem.materialDesc }} - + {{ $t('message.plan') }} - {{ $t('message.OutboundNum') }} + {{ $t('message.StorageNum') }} - {{ $t('message.DeliveryLoc') }} - {{ TheItem.deliveryRegion }} + {{ $t('message.StorageLocation') }} + {{ TheItem.receiveRegion }} @@ -128,7 +128,7 @@ export default class dnReceiptDom extends BasePage { LocList: any = []; Loc: any = {}; async QueryLoc() { - await this.model.QueryLoc(this.TheItem.deliveryRegion); + await this.model.QueryLoc(this.TheItem.receiveRegion); this.LocList = this.model.LocList; this.Loc = this.model.LocList[0]; } @@ -261,6 +261,10 @@ export default class dnReceiptDom extends BasePage { if (isTrue) { await this.model.SubmitList(this.SunmitList); if (this.model.SubCode == 1) { + uni.showToast({ + title: this.$t('message.success') as string, + image: '/static/icons/icon-51.png', + }); this.empty(); } } diff --git a/src/pages/raw/STO/STO storage/model.ts b/src/pages/raw/STO/STO-Storage/model.ts similarity index 83% rename from src/pages/raw/STO/STO storage/model.ts rename to src/pages/raw/STO/STO-Storage/model.ts index b12cad3..2af7530 100644 --- a/src/pages/raw/STO/STO storage/model.ts +++ b/src/pages/raw/STO/STO-Storage/model.ts @@ -7,16 +7,16 @@ import { session } from '@/store/modules/session'; namespaced: true, dynamic: true, store, - name: 'raw.STO.STO-Outbound.index', + name: 'raw.STO.STO-Storage.index', }) export class ReceiptModule extends VuexModule { - //俄罗斯 STO出库 扫描DN单号 + //俄罗斯 STO入库 扫描DN单号 dnNoList: any = []; DnLineList: any = []; @MutationAction async QuerydnNo(dnNo: any) { console.log('dnNo', dnNo); - const res: any = await http.post(url.auth.query.dnNo, { + const res: any = await http.post(url.auth.query.findStoDnReceiveInfo, { factoryCode: session.factoryCode, loginName: session.loginName, dnNo, @@ -32,7 +32,7 @@ export class ReceiptModule extends VuexModule { }); return { dnNoList, DnLineList }; } - //俄罗斯 STO出库 查询库位 + //俄罗斯 STO入库 查询库位 LocList: any = []; @MutationAction async QueryLoc(sendSpot: any) { @@ -52,11 +52,11 @@ export class ReceiptModule extends VuexModule { }); return { LocList }; } - //俄罗斯 出库提交 + //俄罗斯 入库提交 SubCode: any = ''; @MutationAction async SubmitList(list: any) { - const res: any = await http.post(url.auth.query.russia, list); + const res: any = await http.post(url.auth.query.stoDnReceiveConfirm, list); const SubCode = res.code; return { SubCode }; } diff --git a/src/utils/url.ts b/src/utils/url.ts index 1a1b67d..7849daa 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -31,8 +31,10 @@ export const url = { barcode: '/wmspda/bl/getOdsRawStorageSnNew', queryContainer: '/wmspda/material/orderin/queryContainer', dnNo: '/wmspda/fg/findStoDnInfo/russia', + findStoDnReceiveInfo: '/wmspda/fg/findStoDnReceiveInfo/russia', queryByFactoryCodeAndWorkAreaCode: '/wmspda/fg/queryByFactoryCodeAndWorkAreaCode', russia: '/wmspda/fg/stoDnConfirm/russia', + stoDnReceiveConfirm: '/wmspda/fg/stoDnReceiveConfirm/russia', }, systime: '/wmspda/auth/systime', userInfo: '/wmspda/auth/userinfo',