From d9a2d9268f27d1061e5a4fd954cef1989e4765ff Mon Sep 17 00:00:00 2001 From: hou <1601990943@qq.com> Date: Fri, 26 Nov 2021 14:50:55 +0800 Subject: [PATCH] no message --- src/i18n/lang/cn.ts | 32 +- src/i18n/lang/en.ts | 32 +- src/pages/raw/commission/entrant/index.vue | 343 ++++++++++++++++++++ src/pages/raw/commission/goOut/index.vue | 349 +++++++++++++++++++++ 4 files changed, 724 insertions(+), 32 deletions(-) diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index 439bff4..b9fa899 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -203,23 +203,23 @@ export default { InventoryPleaseScan: "请扫描单号", InventoryFinish: "完成", - // 委外-入库 - CommissionEntrant:'委外入库', - CommissionedSingleNumber:'单号', - CommissionedMaterielNo:'物料号', - CommissionedMaterielDesc:'物料描述', - CommissionedDemandData:'需求数据', - CommissionedCumulativeData:'累计数据', - CommissionedLocation:'库位', - CommissionedThisNumber:'本次数量', - CommissionedNumber:'入库数量', - CommissionedEntrantDetails:'入库明细', - CommissionedReceiptQuantity:'收货数量', + // 委外-入库 + CommissionEntrant: "委外入库", + CommissionedSingleNumber: "单号", + CommissionedMaterielNo: "物料号", + CommissionedMaterielDesc: "物料描述", + CommissionedDemandData: "需求数据", + CommissionedCumulativeData: "累计数据", + CommissionedLocation: "库位", + CommissionedThisNumber: "本次数量", + CommissionedNumber: "入库数量", + CommissionedEntrantDetails: "入库明细", + CommissionedReceiptQuantity: "收货数量", - // 委外-出库 - CommissionGoOut:'委外出库', - CommissionedGoOutDetails:'出库明细', - CommissionedGoOutNumber:'出库数量', + // 委外-出库 + CommissionGoOut: "委外出库", + CommissionedGoOutDetails: "出库明细", + CommissionedGoOutNumber: "出库数量", //移库 Warehouse_QueryCriteria: "查询条件", Warehouse_TransferOrderNo: "移库单号", diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 4867625..2105000 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -208,22 +208,22 @@ export default { InventoryFinish: "Finish", // 委外-入库 - CommissionEntrant:"委外入库", - CommissionedSingleNumber:"单号", - CommissionedMaterielNo:"物料号", - CommissionedMaterielDesc:"物料描述", - CommissionedDemandData:"需求数据", - CommissionedCumulativeData:"累计数据", - CommissionedLocation:"库位", - CommissionedThisNumber:"本次数量", - CommissionedNumber:"入库数量", - CommissionedEntrantDetails:"入库明细", - CommissionedReceiptQuantity:"收货数量", - - // 委外-出库 - CommissionGoOut:"委外出库", - CommissionedGoOutDetails:"出库明细", - CommissionedGoOutNumber:"出库数量", + CommissionEntrant: "委外入库", + CommissionedSingleNumber: "单号", + CommissionedMaterielNo: "物料号", + CommissionedMaterielDesc: "物料描述", + CommissionedDemandData: "需求数据", + CommissionedCumulativeData: "累计数据", + CommissionedLocation: "库位", + CommissionedThisNumber: "本次数量", + CommissionedNumber: "入库数量", + CommissionedEntrantDetails: "入库明细", + CommissionedReceiptQuantity: "收货数量", + + // 委外-出库 + CommissionGoOut: "委外出库", + CommissionedGoOutDetails: "出库明细", + CommissionedGoOutNumber: "出库数量", //移库 Warehouse_QueryCriteria: "Query criteria", diff --git a/src/pages/raw/commission/entrant/index.vue b/src/pages/raw/commission/entrant/index.vue index 845b920..c2bd44b 100644 --- a/src/pages/raw/commission/entrant/index.vue +++ b/src/pages/raw/commission/entrant/index.vue @@ -11,6 +11,7 @@ {{ $t("message.dn_ReceivingGoods") }} +<<<<<<< HEAD @@ -22,6 +23,96 @@ @search="query" :show-action="false" > +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{$t('message.product_add')}} + + + + + + + {{ $t("message.CommissionedLocation") }} + {{ $t("message.CommissionedGoOutNumber") }} + {{ $t("message.operation") }} + + + {{ item.locationCode }} + {{ item.scanAmount }} + + + {{ $t("message.product_Delete") }} + + + + +>>>>>>> 74ef32f2cb5f9041e0e6ce27215dabf1d9c4b846 查询 @@ -122,6 +213,7 @@ +<<<<<<< HEAD 收货明细 @@ -129,12 +221,26 @@ 返回 +======= + + {{ + $t('message.CommissionedGoOutDetails') + }} + + + + {{ $t('message.product_Upload') }} + + + {{ $t('message.po_Return') }} +>>>>>>> 74ef32f2cb5f9041e0e6ce27215dabf1d9c4b846 diff --git a/src/pages/raw/commission/goOut/index.vue b/src/pages/raw/commission/goOut/index.vue index 943f6ad..457620b 100644 --- a/src/pages/raw/commission/goOut/index.vue +++ b/src/pages/raw/commission/goOut/index.vue @@ -11,6 +11,7 @@ {{ $t("message.dn_ReceivingGoods") }} +<<<<<<< HEAD @@ -94,6 +95,113 @@ :border="border" class="input" /> +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{$t('message.product_add')}} + + + + + + + {{ $t("message.CommissionedLocation") }} + {{ $t("message.CommissionedGoOutNumber") }} + {{ $t("message.operation") }} + + + {{ item.locationCode }} + {{ item.scanAmount }} + + + {{ $t("message.product_Delete") }} + + + + +>>>>>>> 74ef32f2cb5f9041e0e6ce27215dabf1d9c4b846 @@ -122,6 +230,7 @@ +<<<<<<< HEAD 收货明细 @@ -129,12 +238,26 @@ 返回 +======= + + {{ + $t('message.CommissionedGoOutDetails') + }} + + + + {{ $t('message.product_Upload') }} + + + {{ $t('message.po_Return') }} +>>>>>>> 74ef32f2cb5f9041e0e6ce27215dabf1d9c4b846