diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index bd7ca58..7a8020b 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -532,5 +532,6 @@ export default { Pleasedefects: '请扫描缺陷', PleaseResponsibleArea: '请扫描责任区域', RegionName: '区域名称', + Cannotvirtual: '不能大于虚拟库存', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index e98247c..fd4307c 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -531,5 +531,6 @@ export default { Note: 'Note', Pleasedefects: 'Please scan for defects', PleaseResponsibleArea: 'Please scan the responsible area', + Cannotvirtual: 'Cannot be greater than virtual inventory', }, }; diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts index e4538ad..53e37e2 100644 --- a/src/i18n/lang/ru.ts +++ b/src/i18n/lang/ru.ts @@ -531,5 +531,6 @@ export default { Note: 'Примечание', Pleasedefects: 'Ошибка сканирования', PleaseResponsibleArea: 'область ответственности сканирования', + Cannotvirtual: 'не больше виртуальной памяти', }, }; diff --git a/src/pages/raw/handover/virtual/summary.vue b/src/pages/raw/handover/virtual/summary.vue index 2ba3133..2ff1dc1 100644 --- a/src/pages/raw/handover/virtual/summary.vue +++ b/src/pages/raw/handover/virtual/summary.vue @@ -30,8 +30,8 @@ - - {{ $t('message.dn_Confirm') }} + + {{ $t('message.po_Return') }} @@ -173,6 +173,13 @@ export default class VirtualSummary extends BasePage { }); return; } + if (parseFloat(this.nextNum) > this.model.proOrderResultList[this.itemIndex].virtualAmount) { + uni.showToast({ + title: this.$t('message.Cannotvirtual') as any, + image: '/static/icons/icon-52.png', + }); + return; + } this.model.proOrderResultList[this.itemIndex].hvAmount = this.nextNum; this.show = !this.show; } @@ -188,11 +195,19 @@ export default class VirtualSummary extends BasePage { if (e.data.length != this.model.proOrderResultList.length) { let index = e.data[e.data.length - 1].index; let num: any = parseFloat(this.model.proOrderResultList[index].amount) - parseFloat(this.model.proOrderResultList[index].totalMoAmount); - this.model.proOrderResultList[index].hvAmount = num; + if (num > parseFloat(this.model.proOrderResultList[index].virtualAmount)) { + this.model.proOrderResultList[index].hvAmount = parseFloat(this.model.proOrderResultList[index].virtualAmount); + } else { + this.model.proOrderResultList[index].hvAmount = num; + } } else { this.model.proOrderResultList.forEach((item: any) => { let num: any = parseFloat(item.amount) - parseFloat(item.totalMoAmount); - item.hvAmount = num; + if (num > item.virtualAmount) { + item.hvAmount = item.virtualAmount; + } else { + item.hvAmount = num; + } }); } }