From bdd800a80035b35348a1f2ffa9866cb1a13d30c9 Mon Sep 17 00:00:00 2001
From: "JinLu.Yin" <411641505@qq.com>
Date: Fri, 23 Sep 2022 14:30:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=85=A5=E5=BA=93=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/stockSelect/single.vue | 4 +-
src/views/mes/wm/issue/line.vue | 2 +
src/views/mes/wm/productrecpt/index.vue | 55 +++-
src/views/mes/wm/productrecpt/line.vue | 358 ++++++++----------------
4 files changed, 178 insertions(+), 241 deletions(-)
diff --git a/src/components/stockSelect/single.vue b/src/components/stockSelect/single.vue
index 963d72c..e625639 100644
--- a/src/components/stockSelect/single.vue
+++ b/src/components/stockSelect/single.vue
@@ -206,6 +206,7 @@ export default {
vendorCode: null,
vendorName: null,
vendorNick: null,
+ workorderId: this.workorderId,
quantityOnhand: null,
expireDate: null,
},
@@ -221,7 +222,8 @@ export default {
locationId: null,
locationCode: null,
areaId: null,
- areaCode: null
+ areaCode: null,
+ workorderId: null,
},
created() {
this.getList();
diff --git a/src/views/mes/wm/issue/line.vue b/src/views/mes/wm/issue/line.vue
index 2601ed9..b1a4ac4 100644
--- a/src/views/mes/wm/issue/line.vue
+++ b/src/views/mes/wm/issue/line.vue
@@ -55,6 +55,7 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
+ v-if="optType != 'view'"
v-hasPermi="['mes:wm:issueheader:edit']"
>修改
删除
diff --git a/src/views/mes/wm/productrecpt/index.vue b/src/views/mes/wm/productrecpt/index.vue
index 984f892..7430a17 100644
--- a/src/views/mes/wm/productrecpt/index.vue
+++ b/src/views/mes/wm/productrecpt/index.vue
@@ -87,9 +87,9 @@
-
-
-
+
+
+
@@ -158,7 +158,7 @@
-
+
@@ -166,11 +166,21 @@
-
+
+
+
+
+
+
+
@@ -219,6 +229,10 @@
+ 物料信息
+
+
+