From 9b91c96d007ca488ffe8eaf202bbbfef954db570 Mon Sep 17 00:00:00 2001 From: guoshuang Date: Wed, 18 Jan 2023 15:38:33 +0800 Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E4=BF=84=E7=BD=97=E6=96=AF?= =?UTF-8?q?=E4=B8=8D=E8=89=AF=E5=93=81=E4=B8=8B=E7=BA=BF=EF=BC=8C=E5=8D=8A?= =?UTF-8?q?=E6=88=90=E5=93=81=E5=88=A4=E5=BA=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/lang/cn.ts | 1 + src/i18n/lang/en.ts | 1 + src/i18n/lang/ru.ts | 1 + src/pages/login/login/index.vue | 2 +- .../raw/LineSide/rejectsOffline/index.vue | 22 +++++++++-- .../semifinished-wasteJudgment/index.vue | 38 +++++++++++++++++-- 6 files changed, 57 insertions(+), 8 deletions(-) diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index d5ba0e0..64df09d 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -550,5 +550,6 @@ export default { Nozonename: '没有区域名称', isdeffrent: '容器码的物料与选择的物料不相同', Notcompleted: '物料没有收货完成', + ScrapLocation: '报废位置', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index ed865b3..6bb56d1 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -549,5 +549,6 @@ export default { Nozonename: 'No zone name', isdeffrent: 'The material with container code is different from the selected material', Notcompleted: 'material has not been received', + ScrapLocation: 'Scrap location', }, }; diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts index b9a3b11..26d3a6d 100644 --- a/src/i18n/lang/ru.ts +++ b/src/i18n/lang/ru.ts @@ -549,5 +549,6 @@ export default { Nozonename: 'Нет названия региона', isdeffrent: 'Материал кода контейнера отличается от выбранного материала.', Notcompleted: 'Материалы пока не получены', + ScrapLocation: 'участок списания', }, }; diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index 2f4f6b1..f02070f 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.25'; + this.Version = '1.1.26'; } else { this.Version = '1.0.49'; } diff --git a/src/pages/raw/LineSide/rejectsOffline/index.vue b/src/pages/raw/LineSide/rejectsOffline/index.vue index 869ff56..c1d917c 100644 --- a/src/pages/raw/LineSide/rejectsOffline/index.vue +++ b/src/pages/raw/LineSide/rejectsOffline/index.vue @@ -40,8 +40,9 @@ - - + + + @@ -109,6 +110,20 @@ export default class productCheckReceipt extends BasePage { dockName: any = ''; wl: any = {}; Some: any = {}; + ScrapLocation = [ + { + label: 'CA', + value: 'CA', + }, + { + label: 'DA', + value: 'DA', + }, + { + label: 'FA', + value: 'FA', + }, + ]; //选择目标库位回调函数 bookTypeChange(e: any) { this.form.aimWl = e.pickerName; @@ -117,6 +132,7 @@ export default class productCheckReceipt extends BasePage { //页面初始化 async onReady() { // + this.form.aimWl = this.ScrapLocation[0]; } //条码查询 async query() { @@ -207,7 +223,7 @@ export default class productCheckReceipt extends BasePage { barcode: this.form.order3, reason: this.Some.reason, reasonDesc: this.reasonList.dicName, - responsibleUser: this.Some.responsibleUser, + responsibleUser: this.form.aimWl.value, responsibleProcess: this.Some.responsibleProcess, responsibleAreaName: this.ProcessList.dicName, add2: this.Some.Note, diff --git a/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue b/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue index 6dc25ee..c269a4a 100644 --- a/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue +++ b/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue @@ -37,8 +37,10 @@ - - + + + @@ -74,6 +76,10 @@ import { BasePage } from '@/components/base/page'; import model from './model'; import jPicker from '@/components/J-Picker/jPicker.vue'; import { session } from '@/store/modules/session'; +interface OptionType { + label: string; + value: string; +} @Component({ components: { jPicker, @@ -91,6 +97,30 @@ export default class KanDanHandOver extends BasePage { reasonList: any = {}; ProcessList: any = {}; Note = ''; + form = { + aimWl: {} as OptionType, + }; + ScrapLocation = [ + { + label: 'CA', + value: 'CA', + }, + { + label: 'DA', + value: 'DA', + }, + { + label: 'FA', + value: 'FA', + }, + ]; + bookTypeChange(e: any) { + this.form.aimWl = e.pickerName; + } + async onReady() { + // + this.form.aimWl = this.ScrapLocation[0]; + } async query() { if (this.barcode == '' || this.barcode.length == 0) { this.customToast(this.$t('message.barcode') as string); @@ -180,7 +210,7 @@ export default class KanDanHandOver extends BasePage { locCode: this.every.locCode, reason: this.reason, reasonDesc: this.reasonList.dicName, - responsibleUser: this.responsibleUser, + responsibleUser: this.form.aimWl.value, responsibleProcess: this.responsibleProcess, responsibleAreaName: this.ProcessList.dicName, add2: this.Note, @@ -191,7 +221,7 @@ export default class KanDanHandOver extends BasePage { this.barcode = ''; this.every = {}; this.reason = ''; - this.responsibleUser = ''; + //this.responsibleUser = ''; this.responsibleProcess = ''; this.Note = ''; this.reasonList = {};