From b335935f9a020df1b22ca8c33c03ac13dd0c1265 Mon Sep 17 00:00:00 2001 From: yangzifeng <2547435354@qq.com> Date: Thu, 22 Jan 2026 17:12:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=8D=95=EF=BC=8C=E6=89=93=E5=8D=B0=E5=8D=95=E6=8D=AE=EF=BC=8C?= =?UTF-8?q?=20=E5=AE=8C=E6=88=90=E5=87=BA=E5=BA=93=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wisdom/outbound.js | 37 + src/components/printBill/bill.vue | 6 +- src/components/storageBill/bill.vue | 4 +- src/views/wisdom/outbound/index.vue | 2065 ++++++++++++++++----------- src/views/wisdom/stock/index.vue | 3 +- 5 files changed, 1298 insertions(+), 817 deletions(-) diff --git a/src/api/wisdom/outbound.js b/src/api/wisdom/outbound.js index b78702a..dba966e 100644 --- a/src/api/wisdom/outbound.js +++ b/src/api/wisdom/outbound.js @@ -9,6 +9,43 @@ export function addOutbound(data) { }); } +// 一键出库 +export function recordFinish(data) { + return request({ + url: '/wisdom/record/out/finish', + method: 'post', + data: data + }) +} + +// 撤销出库 +export function backoutRecord(data) { + return request({ + url: '/wisdom/record/out/rollback', + method: 'post', + data: data + }) +} + +// 一键删除预出库 +export function recordRemove(data) { + return request({ + url: '/wisdom/record/out/delete', + method: 'delete', + data: data + }) +} + + + + + + + + + + + //出库记录列表 export function listOutbound(data) { return request({ diff --git a/src/components/printBill/bill.vue b/src/components/printBill/bill.vue index 1441762..2506cff 100644 --- a/src/components/printBill/bill.vue +++ b/src/components/printBill/bill.vue @@ -11,13 +11,13 @@ {{isRuKu ? '入库类型：' : '出库类型：'}} - {{ isRuKu ? billAllObj[0]?.rkTypeName : billAllObj[0]?.ckTypeName }} + {{ billAllObj[0]?.operationTypeName }} {{isRuKu ? '入库日期：' : '出库日期：'}} - {{ isRuKu ? parseTime(billAllObj[0]?.rkTime, '{y}-{m}-{d} {h}:{i}:{s}') : parseTime(billAllObj[0]?.lyTime, '{y}-{m}-{d} {h}:{i}:{s}') }} + {{ parseTime(billAllObj[0]?.operationTime, '{y}-{m}-{d} {h}:{i}:{s}') }} 单据号： - {{ isRuKu ? billAllObj[0]?.billNo : billAllObj[0]?.billNoCk }} + {{ billAllObj[0]?.billNo }} 供应商名称： {{ billAllObj[0]?.gysMc }} 施工队： diff --git a/src/components/storageBill/bill.vue b/src/components/storageBill/bill.vue index 8dbc5b9..2b45b68 100644 --- a/src/components/storageBill/bill.vue +++ b/src/components/storageBill/bill.vue @@ -11,9 +11,9 @@ {{isRuKu ? '入库类型' : '出库类型'}} - {{ isRuKu ? billAllObj[0]?.operationTypeName : billAllObj[0]?.ckTypeName }} + {{ billAllObj[0]?.operationTypeName }} {{isRuKu ? '入库日期' : '出库日期'}} - {{ isRuKu ? parseTime(billAllObj[0]?.operationTime, '{y}-{m}-{d} {h}:{i}:{s}') : parseTime(billAllObj[0]?.lyTime, '{y}-{m}-{d} {h}:{i}:{s}') }} + {{ parseTime(billAllObj[0]?.operationTime, '{y}-{m}-{d} {h}:{i}:{s}') }} 订单编号 diff --git a/src/views/wisdom/outbound/index.vue b/src/views/wisdom/outbound/index.vue index a3d7b4b..f1638ce 100644 --- a/src/views/wisdom/outbound/index.vue +++ b/src/views/wisdom/outbound/index.vue @@ -2,8 +2,13 @@
- - + + + /> @@ -26,84 +31,138 @@ /> - - - - - - + + + + + - 搜索 + 搜索 重置 - - 新增出库 - - - 导出 - - - + + 新增出库 + + + 导出 + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - - + + 打印单据 + v-hasPermi="['wisdom:bill:print']" + >打印单据 - + + 生成调度任务 + + 生成调度任务 + @click="handleOneClickWarehousing" + >一键出库 + + + 一键撤销 + + + 一键删除 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -
- -
- - - + + - - - + + - - + + - - + + - - + + - - + - + - - - + + + - - - + + - + - + - 查询 + 查询 - - - + + + - - + + - - - - + + + - - - + + + - + - + - - + - - - - + + + + - - - - - - - + + + + + + + - - - - - -
- - - - - - - - - - -
+ +
+ + + + + + + + + +
- - - - - - + + + + + + - - + + - - - + + + + + + + + - - - + + + + + + + + + + +
+ +
+ Preview Image - + - - - - - - - - - + + + + + 仅立库 立库+AGV - - - - + + - + - - + +
- - diff --git a/src/views/wisdom/stock/index.vue b/src/views/wisdom/stock/index.vue index dcad41d..c12aca7 100644 --- a/src/views/wisdom/stock/index.vue +++ b/src/views/wisdom/stock/index.vue @@ -322,7 +322,7 @@ import { moveRecord, } from "@/api/wisdom/bill"; -import { editStock, printTag, listStock } from "@/api/wisdom/stock"; +import { listStock, editStock, printTag } from "@/api/wisdom/stock"; import { warehousingDict } from "@/api/information/warehousingtype"; //入库类型 import { materialtypeDict } from "@/api/information/materialtype"; //物资类型 import { warehouseAll } from "@/api/information/warehouseinfo"; //所属仓库 @@ -503,7 +503,6 @@ function handlePrintTag() { proxy.$modal.msgError("请选择打印机编号"); return } - // let newArr = new Array(); for (let i = 0; i < printList.value.length; i++) { printList.value[i].printer = printNum.value }