diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index 441c52f..70dbbf7 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -541,5 +541,6 @@ export default { LocalDNreceiving: '本地DN收货', SOdelivery: 'SO 发货', SONO: 'SO单号', + Closecount: '是否关闭盘点单', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 79039d0..c110fec 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -540,5 +540,6 @@ export default { LocalDNreceiving: 'Local DN receiving', SOdelivery: 'SO delivery', SONO: 'SO NO', + Closecount: 'Close the count sheet?', }, }; diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts index a0fe898..6e4bead 100644 --- a/src/i18n/lang/ru.ts +++ b/src/i18n/lang/ru.ts @@ -540,5 +540,6 @@ export default { LocalDNreceiving: 'локальный получатель DN', SOdelivery: 'SO отгрузка', SONO: 'SO NO', + Closecount: 'Закрыты ли инвентарные ведомости?', }, }; diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index 92ca5cb..c7f71f9 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -171,7 +171,7 @@ export default class LoginPage extends BasePage { console.log('......', server.serverAddress); if (server.serverAddress.includes('https://eurmom.haier.net')) { //修改俄罗斯版本号 - this.Version = '1.1.15'; + this.Version = '1.1.16'; } else { this.Version = '1.0.46'; } diff --git a/src/pages/raw/Semi-finished/Semi-finished-inventory/index.vue b/src/pages/raw/Semi-finished/Semi-finished-inventory/index.vue index 6285df8..1334341 100644 --- a/src/pages/raw/Semi-finished/Semi-finished-inventory/index.vue +++ b/src/pages/raw/Semi-finished/Semi-finished-inventory/index.vue @@ -172,12 +172,21 @@ export default class rawMaterialInventory extends BasePage { } //点击完成 async checkRawOrderComplete() { - await model.checkRawOrderComplete(this.pddNo); - if (this.model.code == '1') { - uni.showToast({ title: this.$t('message.Warehouse_Tip9') as any }); - this.empty(); - this.pddNo = ''; - } + uni.showModal({ + title: this.$t('message.Closecount') as string, + success: async (res) => { + if (res.confirm) { + await model.checkRawOrderComplete(this.pddNo); + if (this.model.code == '1') { + uni.showToast({ title: this.$t('message.Warehouse_Tip9') as any }); + this.empty(); + this.pddNo = ''; + } + } else if (res.cancel) { + return; + } + }, + }); } //返回 back() {