diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index c139a98..7505ab6 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -208,6 +208,7 @@ export default { Replenishment_Number: '可补数量', Summary_Receiver: '接收人', + different: '请输入不同接收人', Summary_Password: '口令', screen: '筛选', Summary_PleaseInputNumber: '请输入数量', diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index a874a5f..a54fae6 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -256,6 +256,7 @@ export default { InventoryPleaseScan: 'Please scan No.', InventoryFinish: 'Finish', collecting: 'Please enter the collecting doc No', + different: 'Please enter a different recipient', MaterialCount: 'Stocktaking by MAT', InventoryNumber: 'Inventory number', DocumentScanned: 'Document scanned', diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index f1049bb..9b116da 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -150,7 +150,7 @@ export default class LoginPage extends BasePage { console.log('image', this.image); console.log('Version////', this.Version); } - Version = '1.0.15'; + Version = '1.0.16'; compareVersion(version1: any, version2: any) { //如果version1 大 会返回1 &&& 如果version2 大 会返回 -1 const newVersion1 = `${version1}`.split('.').length < 3 ? `${version1}`.concat('.0') : `${version1}`; diff --git a/src/pages/raw/handover/aggregating/order.vue b/src/pages/raw/handover/aggregating/order.vue index e5a65b1..9e16e3d 100644 --- a/src/pages/raw/handover/aggregating/order.vue +++ b/src/pages/raw/handover/aggregating/order.vue @@ -196,6 +196,10 @@ export default class AggregatingOrder extends BasePage { if (model.orderList.length === 0) { this.customToast(this.$t('message.Pi_tip4') as string); } else { + if (this.submitForm.receiverName == session.loginName) { + this.customToast(this.$t('message.different') as string); + return; + } await auth.checkPassword({ rfPwd: this.submitForm.password, factoryCode: session.factoryCode as string, diff --git a/src/pages/raw/handover/aggregating/summary.vue b/src/pages/raw/handover/aggregating/summary.vue index fa3e309..fb0cc0b 100644 --- a/src/pages/raw/handover/aggregating/summary.vue +++ b/src/pages/raw/handover/aggregating/summary.vue @@ -231,6 +231,10 @@ export default class AggregatingSummary extends BasePage { if (this.model.aggregateList.length === 0) { this.customToast(this.$t('message.Pi_tip4') as string); } else { + if (this.submitForm.receiverName == session.loginName) { + this.customToast(this.$t('message.different') as string); + return; + } await auth.checkPassword({ rfPwd: this.submitForm.password, factoryCode: session.factoryCode as string, diff --git a/src/pages/raw/handover/picking/BySummary.vue b/src/pages/raw/handover/picking/BySummary.vue index daa50be..e5e1834 100644 --- a/src/pages/raw/handover/picking/BySummary.vue +++ b/src/pages/raw/handover/picking/BySummary.vue @@ -306,6 +306,12 @@ export default class RawReceiptDetail extends BasePage { async onAggregate() { await this.model.queryProOrder(this.model.formParams); await this.model.queryProOrderResult(this.model.NEWparams); + // if (this.model.proOrderResultList.length == 0) { + // this.some = {}; + // this.LocationList = []; + // this.wlCode = ''; + // return; + // } const orderOutIdList = this.model.proOrderResultList.map((_: any) => _.orderOutId); const params = { factoryCode: session.factoryCode, diff --git a/src/pages/raw/handover/virtual/summary.vue b/src/pages/raw/handover/virtual/summary.vue index c4f71dd..3129dc9 100644 --- a/src/pages/raw/handover/virtual/summary.vue +++ b/src/pages/raw/handover/virtual/summary.vue @@ -250,6 +250,10 @@ export default class VirtualSummary extends BasePage { this.customToast(this.$t('message.Summary_PleaseInputNumber') as string); return; } + if (this.submitForm.receiverName == session.loginName) { + this.customToast(this.$t('message.different') as string); + return; + } let res = await auth.checkPassword({ rfPwd: this.submitForm.password, factoryCode: session.factoryCode as string,