From d999c34d8522cde64442676878f1b87e66f5afbb Mon Sep 17 00:00:00 2001 From: hou <1601990943@qq.com> Date: Sat, 12 Mar 2022 16:45:48 +0800 Subject: [PATCH] =?UTF-8?q?dam-7=20feat=20=20=E8=99=9A=E6=8B=9F=E4=BA=A4?= =?UTF-8?q?=E6=8E=A5=20=20=E8=87=AA=E5=8A=A8=E5=B8=A6=E5=87=BA=E6=95=B0?= =?UTF-8?q?=E9=87=8F?= 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/pages/raw/handover/virtual/config.ts | 5 ++ src/pages/raw/handover/virtual/index.vue | 96 ++-------------------- src/pages/raw/handover/virtual/summary.vue | 14 +++- 5 files changed, 28 insertions(+), 89 deletions(-) diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index f774fc0..cef1beb 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -46,6 +46,7 @@ export default { workArea_Selelct: '请选择', workArea_Warehouse: '仓库', workArea_WarehouseName: '仓库名称', + inventory: '虚拟库存', workArea_RegionName: '区域名称', workArea_WorkAreaName: '工作区名称', workArea_WarehouseClassify: '仓库类', diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 267023c..0b69756 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -19,6 +19,7 @@ export default { request_Tip6: 'Server internal error', request_Tip7: 'Service not implemented', request_Tip8: 'Gateway error', + inventory: 'inventory', request_Tip9: 'Service Unavailable', request_Tip10: 'Gateway timeout', request_Tip11: 'HTTP version is not supported', diff --git a/src/pages/raw/handover/virtual/config.ts b/src/pages/raw/handover/virtual/config.ts index f01bb47..d7fe190 100644 --- a/src/pages/raw/handover/virtual/config.ts +++ b/src/pages/raw/handover/virtual/config.ts @@ -94,6 +94,7 @@ export const summaryHeaders = [ { label: vm.$t('message.Summary_QuantityOfThisHandover'), key: 'hvAmount', + width: 300, }, { label: vm.$t('message.Pi_CumulativePickingQuantity'), @@ -121,6 +122,10 @@ export const summaryHeaders = [ label: vm.$t('message.po_Location'), key: 'wkposCode', }, + { + label: vm.$t('message.inventory'), + key: 'virtualAmount', + }, ]; /** diff --git a/src/pages/raw/handover/virtual/index.vue b/src/pages/raw/handover/virtual/index.vue index 89239d9..c7ef253 100644 --- a/src/pages/raw/handover/virtual/index.vue +++ b/src/pages/raw/handover/virtual/index.vue @@ -12,108 +12,30 @@ - + - - - - + + - - + + - - + + - - - + + diff --git a/src/pages/raw/handover/virtual/summary.vue b/src/pages/raw/handover/virtual/summary.vue index b957496..f9196d1 100644 --- a/src/pages/raw/handover/virtual/summary.vue +++ b/src/pages/raw/handover/virtual/summary.vue @@ -8,7 +8,7 @@ - + @@ -165,7 +165,17 @@ export default class VirtualSummary extends BasePage { this.submitForm.receiver = this.submitForm.receiverName; this.submitForm.receiverName = userName; } - + //选中其中某一行数据 + ClickHandover(e: any) { + console.log(e); + let item = e.data[e.data.length - 1].lineData; + let num: any = parseFloat(item.amount) - parseFloat(item.totalMoAmount); + if (num > item.virtualAmount) { + this.amountForm.amount = item.virtualAmount; + } else { + this.amountForm.amount = num; + } + } /** * 确认 */