From 4e8237a96818a043bcfc3cf76827747be9a72219 Mon Sep 17 00:00:00 2001
From: hou <1601990943@qq.com>
Date: Wed, 22 Jun 2022 15:33:26 +0800
Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E4=BF=84=E7=BD=97=E6=96=AF?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A2=86=E7=94=A8=E5=80=9F=E7=94=A8=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD?=
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 +
.../raw/warehouse/RUS-rowCollect/config.ts | 42 +++-
.../raw/warehouse/RUS-rowCollect/index.vue | 221 +++++++++++++++---
.../raw/warehouse/RUS-rowCollect/model.ts | 39 ++--
.../raw/warehouse/RUS-rowScrap/index.vue | 58 ++++-
src/pages/raw/warehouse/RUS-rowScrap/model.ts | 4 +
src/pages/raw/warehouse/rowScrap/index.vue | 4 +-
8 files changed, 296 insertions(+), 74 deletions(-)
diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts
index 65f802f..64126fb 100644
--- a/src/i18n/lang/cn.ts
+++ b/src/i18n/lang/cn.ts
@@ -493,5 +493,6 @@ export default {
matcode: '物料编码',
Quantity: '需求数量',
scanningContainer: '请先扫描容器码',
+ Pi_tipqty: '请确保等于需求数量',
},
};
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index f93d73a..db82384 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -500,5 +500,6 @@ export default {
matcode: 'Mat code',
Quantity: 'Request',
scanningContainer: 'Please scan the container code first',
+ Pi_tipqty: 'Please make sure it is equal to the required quantity',
},
};
diff --git a/src/pages/raw/warehouse/RUS-rowCollect/config.ts b/src/pages/raw/warehouse/RUS-rowCollect/config.ts
index e766571..95c5f4d 100644
--- a/src/pages/raw/warehouse/RUS-rowCollect/config.ts
+++ b/src/pages/raw/warehouse/RUS-rowCollect/config.ts
@@ -30,16 +30,38 @@ export const headers = [
label: vm.$t('message.product_costCenter'),
key: 'costCenter',
},
+];
+export const RUSdetailHeader = [
+ {
+ label: vm.$t('message.Warehouse_OrderNo'),
+ key: 'orderNo', //单号
+ width: 270,
+ },
+ {
+ label: vm.$t('message.po_MaterielNo'),
+ key: 'productCode', //物料号
+ width: 270,
+ },
+ {
+ label: vm.$t('message.po_MaterielDes'),
+ key: 'productDescZh', //物料描述
+ width: 520,
+ },
+ {
+ label: vm.$t('message.Container'),
+ key: 'barCode', //物料描述
+ width: 400,
+ },
+ {
+ label: vm.$t('message.dn_Number'),
+ key: 'qty', //数量
+ },
+ {
+ label: vm.$t('message.Warehouse_OriginalLocation'),
+ key: 'originWl', //原库位
+ },
// {
- // label: '库存地点',
- // key: 'wkposCode',
- // },
- // {
- // label: '校验状态',
- // key: 'checkResult',
- // },
- // {
- // label: '看单号',
- // key: 'kdOrderNo',
+ // label: vm.$t('message.Warehouse_TargetLocation'),
+ // key: 'aimWl', //目标库位
// },
];
diff --git a/src/pages/raw/warehouse/RUS-rowCollect/index.vue b/src/pages/raw/warehouse/RUS-rowCollect/index.vue
index b6d1873..6e68e1c 100644
--- a/src/pages/raw/warehouse/RUS-rowCollect/index.vue
+++ b/src/pages/raw/warehouse/RUS-rowCollect/index.vue
@@ -26,10 +26,6 @@
-
-
-
-
@@ -38,10 +34,34 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('message.Container') }}:
+
+
+
+
+
+ {{ $t('message.product_add') }}
+
+
+
+
+
+
{{ $t('message.po_Return') }}
@@ -53,8 +73,8 @@
-