From b86029a981de5ecb2d06cc922c270ead04ab303e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Tue, 29 Aug 2023 09:48:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=AD=97=E6=AE=B5=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/inventory/DeptDeviceDetail.vue | 6 +-
src/views/inventory/DeviceModelDetail.vue | 2 +-
.../inventory/DeviceReceiveOrderAudit.vue | 2 +-
.../DeviceReceiveOrderAuditMoify.vue | 4 +-
.../inventory/DeviceReceiveOrderCompleted.vue | 2 +-
.../inventory/DeviceReceiveOrderModify.vue | 95 +++++++++++--------
src/views/inventory/DeviceReceiveOrderNew.vue | 2 +-
7 files changed, 62 insertions(+), 51 deletions(-)
diff --git a/src/views/inventory/DeptDeviceDetail.vue b/src/views/inventory/DeptDeviceDetail.vue
index ac59cc19..71a78672 100644
--- a/src/views/inventory/DeptDeviceDetail.vue
+++ b/src/views/inventory/DeptDeviceDetail.vue
@@ -68,8 +68,8 @@
-
-
+
@@ -131,7 +131,7 @@
@row-click="listClick"
border>
-
+
diff --git a/src/views/inventory/DeviceModelDetail.vue b/src/views/inventory/DeviceModelDetail.vue
index 1f2b0aa3..159c7361 100644
--- a/src/views/inventory/DeviceModelDetail.vue
+++ b/src/views/inventory/DeviceModelDetail.vue
@@ -14,7 +14,7 @@
-
+
diff --git a/src/views/inventory/DeviceReceiveOrderAudit.vue b/src/views/inventory/DeviceReceiveOrderAudit.vue
index b22fa423..8c07e944 100644
--- a/src/views/inventory/DeviceReceiveOrderAudit.vue
+++ b/src/views/inventory/DeviceReceiveOrderAudit.vue
@@ -115,7 +115,7 @@
-
+
diff --git a/src/views/inventory/DeviceReceiveOrderAuditMoify.vue b/src/views/inventory/DeviceReceiveOrderAuditMoify.vue
index b6dedb25..ae635fba 100644
--- a/src/views/inventory/DeviceReceiveOrderAuditMoify.vue
+++ b/src/views/inventory/DeviceReceiveOrderAuditMoify.vue
@@ -3,7 +3,7 @@
审核通过
- 审核拒绝
+ 测回草稿
@@ -58,7 +58,7 @@
height="300">
-
+
diff --git a/src/views/inventory/DeviceReceiveOrderCompleted.vue b/src/views/inventory/DeviceReceiveOrderCompleted.vue
index 1faeb192..b20680b3 100644
--- a/src/views/inventory/DeviceReceiveOrderCompleted.vue
+++ b/src/views/inventory/DeviceReceiveOrderCompleted.vue
@@ -98,7 +98,7 @@
-
+
diff --git a/src/views/inventory/DeviceReceiveOrderModify.vue b/src/views/inventory/DeviceReceiveOrderModify.vue
index 89a6db31..44345abd 100644
--- a/src/views/inventory/DeviceReceiveOrderModify.vue
+++ b/src/views/inventory/DeviceReceiveOrderModify.vue
@@ -77,20 +77,47 @@
-
-
- 选入设备
+
+
+
+
+
+
+
+
+ 扫码添加
-
+
+
+
+ 选入设备
+
+
+
+
+
-
+
@@ -128,7 +155,7 @@
减一
+ @click.native="deleteOrderDetail(scope.$index, scope.row)">删除
保存
@@ -154,20 +181,6 @@
:append-to-body='true'
>
-
-
-
-
-
@@ -175,8 +188,8 @@
-
-
+
+
@@ -219,7 +232,7 @@
ref="multipleTable">
-
+
@@ -251,19 +264,6 @@
:append-to-body='true'
>
-
-
-
-
-
@@ -271,8 +271,8 @@
-
-
+
+
@@ -314,7 +314,7 @@
-
+
@@ -539,12 +539,23 @@ export default {
this.$refs.inputRef.select();
},
addCode() {
+ let message = this.verifyOrder(1);
+ if (!isBlank(message)) {
+ this.$message.warning(message);
+ return;
+ }
+
if (isBlank(this.formData.code)) {
this.$message.warning("请扫描或输入UDI码");
return;
}
- this.queryInvProductsList()
- this.queryProductsList()
+
+ if (isBlank(this.formData.orderId)) {
+ this.saveOrder(this.formData.code);
+ } else {
+ this.addScanCode();
+ }
+
},
verifyOrder(obj) {
if (isBlank(this.formData.fromDeptCode)) {
@@ -624,7 +635,7 @@ export default {
},
deleteOrderDetail(index, row) {
if (row.count === 1) {
- this.$confirm('此产品登记数量为1，减一后将删除此产品登记记录，是否继续?', '提示', {
+ this.$confirm('此操作将删除此产品登记记录，是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
diff --git a/src/views/inventory/DeviceReceiveOrderNew.vue b/src/views/inventory/DeviceReceiveOrderNew.vue
index 5909753d..597b352b 100644
--- a/src/views/inventory/DeviceReceiveOrderNew.vue
+++ b/src/views/inventory/DeviceReceiveOrderNew.vue
@@ -109,7 +109,7 @@
-
+