diff --git a/src/api/basic/udiInfo.js b/src/api/basic/udiInfo.js new file mode 100644 index 0000000..86b9edc --- /dev/null +++ b/src/api/basic/udiInfo.js @@ -0,0 +1,26 @@ +import axios from "../../utils/axios"; + +export function getUdiInfos(query) { + return axios({ + url: "/udiwms/udiinfo/filterUdi", + method: "get", + params: query + }); +} +export function filterCompany(query) { + return axios({ + url: "/udiwms/udiinfo/filterCompany", + method: "get", + params: query + }); +} + +export function filterByUuid(query) { + return axios({ + url: "/udiwms/udiinfo/local/filterByUuid", + method: "get", + params: query + }); +} + + diff --git a/src/api/erp/udiRelevance.js b/src/api/erp/udiRelevance.js index 4ea48b0..318cf9b 100644 --- a/src/api/erp/udiRelevance.js +++ b/src/api/erp/udiRelevance.js @@ -70,6 +70,13 @@ export function combineUdi(query) { }); } +export function combineAllUdi(query) { + return axios({ + url: "/udi/udirel/combineAll", + method: "get", + params: query + }); +} export function deletetUdiInfos(query) { return axios({ diff --git a/src/api/warehouse/InvProducts.js b/src/api/warehouse/InvProducts.js new file mode 100644 index 0000000..34996d1 --- /dev/null +++ b/src/api/warehouse/InvProducts.js @@ -0,0 +1,28 @@ +import axios from "../../utils/axios"; + + +export function filterProducts(query) { + return axios({ + url: "/udims/inv/products/filter", + method: "get", + params: query + }); +} + +export function filterDetailProducts(query) { + return axios({ + url: "/udims/inv/products/filterDetail", + method: "get", + params: query + }); +} + +export function deleteProducts(query) { + return axios( + { + url: "/udims/inv/products/delete", + method: "post", + data: query + } + ) +} diff --git a/src/assets/login.jpg b/src/assets/login.jpg index a7c946b..c1cc031 100644 Binary files a/src/assets/login.jpg and b/src/assets/login.jpg differ diff --git a/src/router/index.js b/src/router/index.js index 4c60bef..e8de829 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -39,6 +39,7 @@ import inout from "../views/warehouse/ioFinishOrder.vue"; import udiTrace from "../views/warehouse/udiTrace.vue"; import ioUdiTrace from "../views/warehouse/ioUdiTrace.vue"; import codeNeedRl from "../views/warehouse/codeNeedRl.vue"; +import invProducts from "../views/warehouse/InvProducts.vue"; import company from "../views/warehouse/company.vue"; @@ -555,7 +556,7 @@ export const asyncRouterMap = [ { path: "ioNew", component: ioNew, - name: "新增单据", + name: "新增扫码单据", meta: { authRule: ["inout/ioNew"] }, @@ -589,12 +590,22 @@ export const asyncRouterMap = [ { path: "udiTrace", - name: "UDI码追溯", + name: "UDI流向查询", component: ioUdiTrace, meta: { authRule: ["inout/udiTrace"] } }, + + { + path: "invProducts", + name: "库存查询", + component: invProducts, + meta: { + authRule: ["inout/invProducts"] + } + }, + { path: "codeNeedRl", name: "UDI码关联关系", @@ -606,7 +617,7 @@ export const asyncRouterMap = [ { path: "errorOrder", component: errorOrder, - name: "异常单据", + name: "异常扫码单据", meta: { authRule: ["inout/errorOrder"] }, diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 00f8604..ea5eab5 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,9 +1,9 @@ - - \ No newline at end of file + diff --git a/src/views/warehouse/InvProducts.vue b/src/views/warehouse/InvProducts.vue new file mode 100644 index 0000000..c8694aa --- /dev/null +++ b/src/views/warehouse/InvProducts.vue @@ -0,0 +1,273 @@ + + + + + diff --git a/src/views/warehouse/InvProductsDetail.vue b/src/views/warehouse/InvProductsDetail.vue new file mode 100644 index 0000000..8e0f3ad --- /dev/null +++ b/src/views/warehouse/InvProductsDetail.vue @@ -0,0 +1,177 @@ + + + + + + diff --git a/src/views/warehouse/ioErrorOrder.vue b/src/views/warehouse/ioErrorOrder.vue index 4c92bf4..c72f331 100644 --- a/src/views/warehouse/ioErrorOrder.vue +++ b/src/views/warehouse/ioErrorOrder.vue @@ -246,6 +246,7 @@ fromCorpId: "", fromCorp: "", }, + curOrderId: null, idQuery: { id: "", }, @@ -306,6 +307,7 @@ handleUnitClick(row) { this.curIndex = row.id; this.dialogTableVisible = true; + this.curOrderId = row.orderId; }, closeDetailDialog(val) { this.codeDetailVisible = false; @@ -335,7 +337,8 @@ console.log(row.id); this.unitUpdateQuery.id = this.curIndex; this.unitUpdateQuery.fromCorp = row.name; - this.unitUpdateQuery.fromCorpId = row.unitid; + this.unitUpdateQuery.fromCorpId = row.unitId; + this.unitUpdateQuery.orderId = this.curOrderId; updateUnit(this.unitUpdateQuery) .then((response) => { this.dialogTableVisible = false; diff --git a/src/views/warehouse/ioFinishOrder.vue b/src/views/warehouse/ioFinishOrder.vue index 8697472..20a7229 100644 --- a/src/views/warehouse/ioFinishOrder.vue +++ b/src/views/warehouse/ioFinishOrder.vue @@ -676,7 +676,7 @@ console.log(row.id); this.unitUpdateQuery.id = this.curIndex; this.unitUpdateQuery.fromCorp = row.name; - this.unitUpdateQuery.fromCorpId = row.unitid; + this.unitUpdateQuery.fromCorpId = row.unitId; this.unitUpdateQuery.orderId = this.curOrderId; updateUnit(this.unitUpdateQuery) .then((response) => { diff --git a/src/views/warehouse/ioNewOrder.vue b/src/views/warehouse/ioNewOrder.vue index 884cd15..032d60a 100644 --- a/src/views/warehouse/ioNewOrder.vue +++ b/src/views/warehouse/ioNewOrder.vue @@ -238,6 +238,7 @@ idQuery: { id: "", }, + curOrderId: null, list: [], adId: [], busTypes: [], @@ -296,6 +297,7 @@ handleUnitClick(row) { this.curIndex = row.id; this.dialogTableVisible = true; + this.curOrderId = row.orderId; }, closeDetailDialog(val) { this.codeDetailVisible = false; @@ -316,7 +318,8 @@ console.log(row.id); this.unitUpdateQuery.id = this.curIndex; this.unitUpdateQuery.fromCorp = row.name; - this.unitUpdateQuery.fromCorpId = row.unitid; + this.unitUpdateQuery.fromCorpId = row.unitId; + this.unitUpdateQuery.orderId = this.curOrderId; updateUnit(this.unitUpdateQuery) .then((response) => { this.dialogTableVisible = false;