From 74eb8d9ced88925bb374022e7f6befc7882baf3a Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 26 Oct 2022 18:09:36 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E5=8D=95=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inventory/invCountOrder.js | 7 + src/api/inventory/invSpace.js | 8 + src/router/index.js | 3 - src/views/inventory/InvSpaceManage.vue | 1 - src/views/inventory/addCountOrder.vue | 438 +++++++++++++++++++++ src/views/inventory/invCountOrderAudit.vue | 1 - src/views/inventory/invCountOrderNew.vue | 76 ++-- 7 files changed, 504 insertions(+), 30 deletions(-) create mode 100644 src/views/inventory/addCountOrder.vue diff --git a/src/api/inventory/invCountOrder.js b/src/api/inventory/invCountOrder.js index 9595d65..497425c 100644 --- a/src/api/inventory/invCountOrder.js +++ b/src/api/inventory/invCountOrder.js @@ -24,3 +24,10 @@ export function getCountOrderDetailList(params) { }); } +export function saveCountOrder(data) { + return axios({ + url: "/invCount/order/saveCountOrder", + method: "post", + data: data + }); +} diff --git a/src/api/inventory/invSpace.js b/src/api/inventory/invSpace.js index 442596e..9909d4a 100644 --- a/src/api/inventory/invSpace.js +++ b/src/api/inventory/invSpace.js @@ -23,3 +23,11 @@ export function deleteSpace(data) { data: data }) } + +export function getSpaceCodeList(params) { + return axios({ + url: "/spms/inv/space/getSpaceCodeList", + method: "get", + params: params + }) +} diff --git a/src/router/index.js b/src/router/index.js index a9335c6..854df60 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -828,8 +828,6 @@ export const asyncRouterMap = [ authRule: ["warehouse/onHand"] } }, - - { path: "stockCode", name: "库存明细", @@ -839,7 +837,6 @@ export const asyncRouterMap = [ authRule: ["warehouse/stockCode"] } }, - ] }, diff --git a/src/views/inventory/InvSpaceManage.vue b/src/views/inventory/InvSpaceManage.vue index 2abebd7..2d6838e 100644 --- a/src/views/inventory/InvSpaceManage.vue +++ b/src/views/inventory/InvSpaceManage.vue @@ -199,7 +199,6 @@ import {filterSubByInv} from "@/api/basic/invSubWarehouse"; import {userInfo} from "@/api/auth/login"; import {isBlank} from "@/utils/strUtil"; import {getInvSpaceList, saveSpace, deleteSpace} from "@/api/inventory/invSpace"; -import ThrInvProducts from "@/views/thrsys/ThrInvProducts"; export default { data() { diff --git a/src/views/inventory/addCountOrder.vue b/src/views/inventory/addCountOrder.vue new file mode 100644 index 0000000..5a7bdb4 --- /dev/null +++ b/src/views/inventory/addCountOrder.vue @@ -0,0 +1,438 @@ + + + + diff --git a/src/views/inventory/invCountOrderAudit.vue b/src/views/inventory/invCountOrderAudit.vue index a35d2bc..0ff540e 100644 --- a/src/views/inventory/invCountOrderAudit.vue +++ b/src/views/inventory/invCountOrderAudit.vue @@ -1,4 +1,3 @@ -invCountOrderNew.vue @@ -109,6 +122,7 @@ import {filterUplLocInv} from "@/api/basic/invWarehouse"; import {filterSubByInv} from "@/api/basic/invSubWarehouse"; import {userInfo} from "@/api/auth/login"; import {isBlank} from "@/utils/strUtil"; +import addCountOrder from "./addCountOrder"; export default { data() { @@ -117,6 +131,7 @@ export default { invWarehouseCode: null, invStorageCode: null, invSpaceCode: null, + status: 0, page: 1, limit: 20, customerId: null @@ -134,6 +149,8 @@ export default { 1: "未审核", 2: "已审核" }, + addCountOrderVisible: false, + }; }, methods: { @@ -145,6 +162,7 @@ export default { customerId: null, invWarehouseCode: null, invStorageCode: null, + status: 0, page: 1, limit: 20, }; @@ -163,15 +181,36 @@ export default { getList() { this.loading = true; this.filterQuery.customerId = store.getters.customerId; + getCountOrderList(this.filterQuery).then((res) => { + this.loading = false; + if (res.code === 20000) { + this.list = res.data.list || []; + this.total = res.data.total || 0; + } else { + this.list = []; + this.total = 0; + } + }).catch((error) => { + this.loading = false; + this.list = []; + this.total = 0; + }) }, deleteOrders(data) { this.loading = true; - let query = { + let params = { id: data, } + deleteCountOrder(params).then((res) => { + if (res.code === 20000) { + this.$message.success("删除成功！"); + this.getList(); + } else { + this.$message.error(res.data.message); + } + }) }, - deleteDialog(rowId) { this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", { confirmButtonText: "确定", @@ -215,27 +254,16 @@ export default { }, addCountOrder() { - + this.addCountOrderVisible = true; + }, + closeAddDialog() { + this.addCountOrderVisible = false; + this.getList(); }, }, - filters: { - statusFilterType(status) { - const statusMap = { - false: "success", - true: "danger", - }; - return statusMap[status]; - } - , - } - , - mounted() { - document.body.ondrop = function (event) { - event.preventDefault(); - event.stopPropagation(); - }; - } - , + components: { + addCountOrder + }, created() { this.getStorage(); let query = this.$route.query; @@ -254,10 +282,8 @@ export default { } }).catch((error) => { }); - } - , -} -; + }, +};