diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index c1d5368..531d313 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -578,5 +578,6 @@ export default { stoPcPleaseInput: '请输入批次号', FactorySTOoutbound: '工厂间STO 出库', FactorySTOStorage: '工厂间STO 入库', + ConfirmPosting: '确认过账?', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index e7362e4..4a24849 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -580,5 +580,6 @@ export default { stoPcPleaseInput: 'Please input batch No', FactorySTOoutbound: 'STO outbound between factories', FactorySTOStorage: 'STO storage between factories', + ConfirmPosting: 'Confirm posting?', }, }; diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts index b42918c..e6ec751 100644 --- a/src/i18n/lang/ru.ts +++ b/src/i18n/lang/ru.ts @@ -575,5 +575,6 @@ export default { stoPcPleaseInput: 'Please input batch No', FactorySTOoutbound: 'Заводское хранилище STO', FactorySTOStorage: 'Заводское хранилище СТО', + ConfirmPosting: 'Подтвердить счет?', }, }; diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index 226fbce..af830eb 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -171,9 +171,9 @@ export default class LoginPage extends BasePage { console.log('......', server.serverAddress); if (server.serverAddress.includes('https://eurmom.haier.net')) { //修改俄罗斯版本号 - this.Version = '1.1.39'; + this.Version = '1.1.40'; } else { - this.Version = '1.0.52'; + this.Version = '1.0.53'; } console.log('////', this.Version); } diff --git a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue index 9a35301..ffe69e2 100644 --- a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue +++ b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue @@ -243,6 +243,8 @@ export default class stoOutboundDom extends BasePage { } uni.showModal({ title: this.$t('message.ConfirmPosting') as string, + confirmText: this.$t('message.workArea_Confirm') as string, + cancelText: this.$t('message.Cancel') as string, success: async (res) => { if (res.confirm) { let params = { diff --git a/src/pages/product/outbound/stoOutbound/RUSDN-delivergoods.vue b/src/pages/product/outbound/stoOutbound/RUSDN-delivergoods.vue index 10be838..dd459e3 100644 --- a/src/pages/product/outbound/stoOutbound/RUSDN-delivergoods.vue +++ b/src/pages/product/outbound/stoOutbound/RUSDN-delivergoods.vue @@ -244,6 +244,8 @@ export default class stoOutboundDom extends BasePage { } uni.showModal({ title: this.$t('message.ConfirmPosting') as string, + confirmText: this.$t('message.workArea_Confirm') as string, + cancelText: this.$t('message.Cancel') as string, success: async (res) => { if (res.confirm) { let params = { diff --git a/src/pages/product/outbound/stoOutbound/TaiDN-delivergoods.vue b/src/pages/product/outbound/stoOutbound/TaiDN-delivergoods.vue index 959c797..ffc4160 100644 --- a/src/pages/product/outbound/stoOutbound/TaiDN-delivergoods.vue +++ b/src/pages/product/outbound/stoOutbound/TaiDN-delivergoods.vue @@ -246,6 +246,8 @@ export default class stoOutboundDom extends BasePage { } uni.showModal({ title: this.$t('message.ConfirmPosting') as string, + confirmText: this.$t('message.workArea_Confirm') as string, + cancelText: this.$t('message.Cancel') as string, success: async (res) => { if (res.confirm) { let params = { diff --git a/src/pages/raw/LineSide/LineSide-inventory/index.vue b/src/pages/raw/LineSide/LineSide-inventory/index.vue index 213e03f..9667433 100644 --- a/src/pages/raw/LineSide/LineSide-inventory/index.vue +++ b/src/pages/raw/LineSide/LineSide-inventory/index.vue @@ -184,6 +184,8 @@ export default class rawMaterialInventory extends BasePage { async checkRawOrderComplete() { uni.showModal({ title: this.$t('message.Closecount') as string, + confirmText: this.$t('message.workArea_Confirm') as string, + cancelText: this.$t('message.Cancel') as string, success: async (res) => { if (res.confirm) { await model.checkRawOrderComplete(this.pddNo); 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 b692557..947e811 100644 --- a/src/pages/raw/Semi-finished/Semi-finished-inventory/index.vue +++ b/src/pages/raw/Semi-finished/Semi-finished-inventory/index.vue @@ -185,6 +185,8 @@ export default class rawMaterialInventory extends BasePage { async checkRawOrderComplete() { uni.showModal({ title: this.$t('message.Closecount') as string, + confirmText: this.$t('message.workArea_Confirm') as string, + cancelText: this.$t('message.Cancel') as string, success: async (res) => { if (res.confirm) { await model.checkRawOrderComplete(this.pddNo); diff --git a/src/pages/raw/commission/entrant/index.vue b/src/pages/raw/commission/entrant/index.vue index 48004ce..2a27c45 100644 --- a/src/pages/raw/commission/entrant/index.vue +++ b/src/pages/raw/commission/entrant/index.vue @@ -13,7 +13,7 @@ {{ $t('message.dn_OddNumbers') }} - + {{ $t('message.Query') }} @@ -110,6 +110,7 @@ export default class dnReceiptDom extends BasePage { materialList: any = []; // 当前被选择中原材料 every: any = {}; + isfocus = true; everyIndex: any = ''; value = ''; headers = DNheader; @@ -187,37 +188,47 @@ export default class dnReceiptDom extends BasePage { this.customToast(this.$t('message.Commission_tips1') as any); return; } - await this.model.subcDnInfo(this.form.documentNo); - if (model.code == '1') { - if (this.model.orderInInfoList.length == 0) { - this.empty(); - return; + try { + await this.model.subcDnInfo(this.form.documentNo); + if (model.code == '1') { + if (this.model.orderInInfoList.length == 0) { + this.empty(); + return; + } + uni.showToast({ + //icon: 'success', + title: this.$t('message.successful') as any, + duration: 2000, + image: '/static/icons/icon-51.png', + }); + let list: any = uni.getStorageSync('list'); + uni.removeStorageSync('list'); + this.material = JSON.parse(list); + this.DNReceivingList = JSON.parse(list); + this.DNReceivingList.forEach((item: any) => { + item.wllist = []; + }); + this.poList = [...this.DNReceivingList]; //结构 + let arr = this.removeDuplicates(this.poList, 'poNo'); + // 组装下拉结构 + arr.forEach((item: any) => { + item.label = item.poNo; + item.value = item.poNo; + }); + this.poList = arr; + // 自动化流程改造测试 + this.poListChoice({ + pickerName: this.poList.find(() => true), + }); + } + } catch { + if (this.poList.length == 0) { + this.form.documentNo = ''; + this.isfocus = false; + this.$nextTick(() => { + this.isfocus = true; + }); } - uni.showToast({ - //icon: 'success', - title: this.$t('message.successful') as any, - duration: 2000, - image: '/static/icons/icon-51.png', - }); - let list: any = uni.getStorageSync('list'); - uni.removeStorageSync('list'); - this.material = JSON.parse(list); - this.DNReceivingList = JSON.parse(list); - this.DNReceivingList.forEach((item: any) => { - item.wllist = []; - }); - this.poList = [...this.DNReceivingList]; //结构 - let arr = this.removeDuplicates(this.poList, 'poNo'); - // 组装下拉结构 - arr.forEach((item: any) => { - item.label = item.poNo; - item.value = item.poNo; - }); - this.poList = arr; - // 自动化流程改造测试 - this.poListChoice({ - pickerName: this.poList.find(() => true), - }); } } // 去除重复 方法 @@ -431,6 +442,10 @@ export default class dnReceiptDom extends BasePage { } else if (res.data.code == '0' && res.data.list == null) { this.empty(); this.form.documentNo = ''; + this.isfocus = false; + this.$nextTick(() => { + this.isfocus = true; + }); } }, }); diff --git a/src/pages/raw/handover/feeding/create.vue b/src/pages/raw/handover/feeding/create.vue index 408d4e2..6357b2b 100644 --- a/src/pages/raw/handover/feeding/create.vue +++ b/src/pages/raw/handover/feeding/create.vue @@ -236,6 +236,8 @@ export default class RawReceiptDetail extends BasePage { console.log(e); uni.showModal({ title: this.$t('message.product_Delete') as any, + confirmText: this.$t('message.workArea_Confirm') as string, + cancelText: this.$t('message.Cancel') as string, success: (res: any) => { if (res.confirm) { this.List.splice(e.contentIndex, 1);