diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index dc9c8c5..bd7ca58 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -527,8 +527,10 @@ export default { Relationship: 'BOM关系外生产扣料', Insufficient: '源容器不足', defect: '缺陷', + DefectName: '缺陷名', Note: '备注', Pleasedefects: '请扫描缺陷', PleaseResponsibleArea: '请扫描责任区域', + RegionName: '区域名称', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 40a4f91..e98247c 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -527,6 +527,7 @@ export default { Relationship: 'External Mat', Insufficient: 'Insufficient source container', defect: 'defects', + DefectName: 'Defect Name', Note: 'Note', Pleasedefects: 'Please scan for defects', PleaseResponsibleArea: 'Please scan the responsible area', diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts index 4083a13..e4538ad 100644 --- a/src/i18n/lang/ru.ts +++ b/src/i18n/lang/ru.ts @@ -527,6 +527,7 @@ export default { Relationship: 'производственные вычеты', Insufficient: 'недостаточная емкость источника', defect: 'Дефект', + DefectName: 'наименование дефекта', Note: 'Примечание', Pleasedefects: 'Ошибка сканирования', PleaseResponsibleArea: 'область ответственности сканирования', diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index dfb6820..f1dd75f 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -163,7 +163,7 @@ export default class LoginPage extends BasePage { console.log('......', server.serverAddress); if (server.serverAddress.includes('https://eurmom.haier.net')) { //修改俄罗斯版本号 - this.Version = '1.1.5'; + this.Version = '1.1.6'; } else { this.Version = '1.0.37'; } diff --git a/src/pages/raw/LineSide/rejectsOffline/index.vue b/src/pages/raw/LineSide/rejectsOffline/index.vue index b92ceea..03df42e 100644 --- a/src/pages/raw/LineSide/rejectsOffline/index.vue +++ b/src/pages/raw/LineSide/rejectsOffline/index.vue @@ -36,6 +36,9 @@ + + + @@ -45,6 +48,9 @@ + + + @@ -134,7 +140,7 @@ export default class productCheckReceipt extends BasePage { return; } await this.model.checkDicCode(this.Some.reason); - if (this.model.code == '0') { + if (this.model.code == '1') { uni.showToast({ title: this.$t('message.successful') as string, duration: 2000, @@ -149,7 +155,7 @@ export default class productCheckReceipt extends BasePage { return; } await this.model.checkDicCode(this.Some.responsibleProcess); - if (this.model.code == '0') { + if (this.model.code == '1') { uni.showToast({ title: this.$t('message.successful') as string, duration: 2000, @@ -207,6 +213,8 @@ export default class productCheckReceipt extends BasePage { }); this.Some = {}; this.form.order3 = ''; + this.reasonList = {}; + this.ProcessList = {}; } } } diff --git a/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue b/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue index 47094e2..2943bdf 100644 --- a/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue +++ b/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue @@ -33,6 +33,9 @@ + + + @@ -42,6 +45,9 @@ + + + @@ -106,7 +112,7 @@ export default class KanDanHandOver extends BasePage { return; } await this.model.checkDicCode(this.reason); - if (this.model.code == '0') { + if (this.model.code == '1') { uni.showToast({ title: this.$t('message.successful') as string, duration: 2000, @@ -121,7 +127,7 @@ export default class KanDanHandOver extends BasePage { return; } await this.model.checkDicCode(this.responsibleProcess); - if (this.model.code == '0') { + if (this.model.code == '1') { uni.showToast({ title: this.$t('message.successful') as string, duration: 2000, @@ -180,6 +186,8 @@ export default class KanDanHandOver extends BasePage { this.responsibleUser = ''; this.responsibleProcess = ''; this.Note = ''; + this.reasonList = {}; + this.ProcessList = {}; } } }