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 @@