From f3552f79dd512e05169e7decbb387b8169b17c4d Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Wed, 20 Jul 2022 09:20:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=BA=9B=E6=97=A5?=
=?UTF-8?q?=E5=BF=97=EF=BC=8C=E8=B0=83=E6=95=B4=E8=8E=B7=E5=8F=96=E7=AC=AC?=
=?UTF-8?q?=E4=B8=89=E6=96=B9=E5=8D=95=E6=8D=AE=EF=BC=8C=E7=AC=AC=E4=B8=89?=
=?UTF-8?q?=E6=96=B9=E5=BA=93=E5=AD=98=E4=BA=A7=E5=93=81=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/inventory/onHand.js | 2 +-
src/views/basic/UdiInfoManage.vue | 23 +++++++++++++++++++++--
src/views/thrsys/thrOrderNew.vue | 14 ++------------
3 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/src/api/inventory/onHand.js b/src/api/inventory/onHand.js
index e2093b2..35737c7 100644
--- a/src/api/inventory/onHand.js
+++ b/src/api/inventory/onHand.js
@@ -2,7 +2,7 @@ import axios from "../../utils/axios";
export function getOnhands(query) {
return axios({
- url: "/udiwms/inv/getOnHand",
+ url: "/udiwms/inv/getInvProducts",
method: "get",
params: query
});
diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue
index 2449ab3..7189553 100644
--- a/src/views/basic/UdiInfoManage.vue
+++ b/src/views/basic/UdiInfoManage.vue
@@ -684,6 +684,24 @@
+
+
+
+
+
+
+
@@ -841,8 +859,8 @@ export default {
isLock: null,
isAdavence: null,
allowNoBatch: null,
- allowNoExpire:null,
- allowNoProduct:null,
+ allowNoExpire: null,
+ allowNoProduct: null,
},
defaultSys: null,
isImport: false,
@@ -1371,6 +1389,7 @@ export default {
border-radius: 4px;
flex-wrap: wrap;
}
+
.el-table .cell.el-tooltip {
white-space: pre-wrap;
}
diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue
index f93f5b8..570a5dc 100644
--- a/src/views/thrsys/thrOrderNew.vue
+++ b/src/views/thrsys/thrOrderNew.vue
@@ -326,26 +326,16 @@