From 17e1ee22b7a82665db66a6987ae89f1336a14193 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 30 Aug 2024 17:21:21 +0800 Subject: [PATCH] =?UTF-8?q?8/30=20=E6=8D=9F=E8=80=97=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/{IoDestroyLog.js => IoDestroy.js} | 10 + src/api/collect/collectOrder.js | 12 +- src/views/collect/IoCreateOrder.vue | 14 +- src/views/collect/IoDestroyLog.vue | 13 +- src/views/collect/IoDestroyOrder.vue | 928 +++++++----------- src/views/collect/IoDestroyOrder1.vue | 648 ++++++++++++ src/views/collect/IoSplitFifoCodePanel.vue | 29 +- src/views/collect/PanelDestroyCodeDetail.vue | 430 ++++++++ src/views/collect/destroyOutDialog.vue | 141 +++ 9 files changed, 1644 insertions(+), 581 deletions(-) rename src/api/collect/{IoDestroyLog.js => IoDestroy.js} (76%) create mode 100644 src/views/collect/IoDestroyOrder1.vue create mode 100644 src/views/collect/PanelDestroyCodeDetail.vue create mode 100644 src/views/collect/destroyOutDialog.vue diff --git a/src/api/collect/IoDestroyLog.js b/src/api/collect/IoDestroy.js similarity index 76% rename from src/api/collect/IoDestroyLog.js rename to src/api/collect/IoDestroy.js index fe7863e6..c4626b2b 100644 --- a/src/api/collect/IoDestroyLog.js +++ b/src/api/collect/IoDestroy.js @@ -24,3 +24,13 @@ export function getCodeList(query) { params: query }); } + + + +export function destroyOut(query) { + return axios({ + url: "/udiwms/collect/fifo/desOrder/destroyOut", + method: "post", + data: query + }); +} diff --git a/src/api/collect/collectOrder.js b/src/api/collect/collectOrder.js index 56f75364..d8c5680d 100644 --- a/src/api/collect/collectOrder.js +++ b/src/api/collect/collectOrder.js @@ -140,4 +140,14 @@ export function orderTop(query) { method: "post", data: query }); -} \ No newline at end of file +} + + + +export function getSplitCode(query) { + return axios({ + url: "/udiwms/ioSplit/collect/auto/code/filter", + method: "get", + params: query + }); +} diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue index 6af34fe2..5cc451b5 100644 --- a/src/views/collect/IoCreateOrder.vue +++ b/src/views/collect/IoCreateOrder.vue @@ -26,12 +26,12 @@ - - + + + + + + @@ -530,7 +530,7 @@ export default { isSuccess: false, result: "", scanResultType: "success", - msgTip: "当前工位存量提醒:", + msgTip: "当前上货产品的总量:", splitType: null, rowData: {}, curWorkPlace: null, diff --git a/src/views/collect/IoDestroyLog.vue b/src/views/collect/IoDestroyLog.vue index aeee3c9a..69273443 100644 --- a/src/views/collect/IoDestroyLog.vue +++ b/src/views/collect/IoDestroyLog.vue @@ -631,7 +631,7 @@ - + @@ -657,9 +657,8 @@ import { } from "@/utils/customConfig"; import {convertDate} from "@/utils/date"; import {isBlank} from "@/utils/strUtil"; -import {getCodeList} from "@/api/inout/code"; import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace' -import { desOrderPage,getBizDetailList } from '@/api/collect/IoDestroyLog' +import { desOrderPage,getBizDetailList,getCodeList } from '@/api/collect/IoDestroy' export default { name: "IoDestroyLog", @@ -1067,7 +1066,7 @@ export default { this.codeQuery.page = 1; this.resultQuery.page = 1; this.getBizDetailList(); - // this.getCodeList(); + // this.getCodeDetailList(); }, onBizReset() { this.bizQuery = { @@ -1117,13 +1116,13 @@ export default { page: 1, limit: 10 }; - this.getCodeList(); + // this.getCodeDetailList(); }, onCodeSubmit() { this.codeQuery.page = 1; - this.getCodeList(); + // this.getCodeDetailList(); }, - getCodeList() { + getCodeDetailList() { if (isBlank(this.currentRow.billNo)) { this.$message.error("请先选择需要查询的单据!") return; diff --git a/src/views/collect/IoDestroyOrder.vue b/src/views/collect/IoDestroyOrder.vue index 40c3bade..8a999e30 100644 --- a/src/views/collect/IoDestroyOrder.vue +++ b/src/views/collect/IoDestroyOrder.vue @@ -1,616 +1,414 @@ diff --git a/src/views/collect/IoDestroyOrder1.vue b/src/views/collect/IoDestroyOrder1.vue new file mode 100644 index 00000000..7e1420de --- /dev/null +++ b/src/views/collect/IoDestroyOrder1.vue @@ -0,0 +1,648 @@ + + + + + + + + + diff --git a/src/views/collect/IoSplitFifoCodePanel.vue b/src/views/collect/IoSplitFifoCodePanel.vue index e97d96b2..3837a8c6 100644 --- a/src/views/collect/IoSplitFifoCodePanel.vue +++ b/src/views/collect/IoSplitFifoCodePanel.vue @@ -445,6 +445,22 @@ > + + + + + + @@ -457,6 +473,7 @@ import {getInvListByUserOptimize} from "@/api/system/invWarehouse"; import { getBasicUnitMaintainsOptimize } from '@/api/basic/basicUnitMaintain' import { listPage } from '@/api/basic/workPlace/sysWorkplaceManage' import ioSplitFifoCodeRemindSetDialog from "./ioSplitFifoCodeRemindSetDialog.vue"; +import destroyOutDialog from "./destroyOutDialog.vue"; export default { name: "IoSplitFifoCodePanel", @@ -521,11 +538,12 @@ export default { resultDetailLoading: false, resultDetailList: [], addInvRemindSetDialogVisible: false, + destroyOutDialogVisible: false, prescribeData: {}, } }, - components: {ioSplitFifoCodeRemindSetDialog}, + components: {ioSplitFifoCodeRemindSetDialog,destroyOutDialog}, methods: { //界面配置相关------------ @@ -665,6 +683,15 @@ export default { this.addInvRemindSetDialogVisible = false; this.getList(); }, + //损耗出库 + destroyOut(_this,row){ + _this.prescribeData = row + _this.destroyOutDialogVisible = true; + }, + closeDialog(){ + this.destroyOutDialogVisible = false + this.getList() + } }, created() { diff --git a/src/views/collect/PanelDestroyCodeDetail.vue b/src/views/collect/PanelDestroyCodeDetail.vue new file mode 100644 index 00000000..6d2aff13 --- /dev/null +++ b/src/views/collect/PanelDestroyCodeDetail.vue @@ -0,0 +1,430 @@ + + + + + diff --git a/src/views/collect/destroyOutDialog.vue b/src/views/collect/destroyOutDialog.vue new file mode 100644 index 00000000..b0da5b31 --- /dev/null +++ b/src/views/collect/destroyOutDialog.vue @@ -0,0 +1,141 @@ + + + + +