From 5bf4ddac66ae1f62a0fffd8ba6b434db60a89d30 Mon Sep 17 00:00:00 2001 From: zelian_wu Date: Wed, 26 Jun 2024 15:30:19 +0800 Subject: [PATCH] 2024/06/20 --- src/api/shipment/box.js | 1 + src/api/shipment/index.js | 1 + src/api/shipment/roll.js | 1 + .../modules/finshProduct/outWarehouse.vue | 178 +++++++----------- .../finshProduct/outWarehouse/shipmentBox.vue | 106 +++++------ src/views/modules/label/print_icon.js | 2 + .../modules/label/print_shipment_box_label.js | 45 ++--- .../label/print_shipment_inner_label.js | 28 +-- .../label/print_shipment_packing_box_label.js | 50 +++-- 9 files changed, 179 insertions(+), 233 deletions(-) diff --git a/src/api/shipment/box.js b/src/api/shipment/box.js index 77a0976..25508d7 100644 --- a/src/api/shipment/box.js +++ b/src/api/shipment/box.js @@ -5,5 +5,6 @@ export const getShipmentBoxList = (data)=>createAPI('/shipment/box/list','post', export const addShipmentBox = (data)=>createAPI('/shipment/box/add','post',data) export const removeShipmentBox = (data)=>createAPI('/shipment/box/remove','post',data) +export const printShipmentBox = (data)=>createAPI('/shipment/box/print','post',data) export const updateShipmentBox = (data)=>createAPI('/shipment/box/update','post',data) export const updateShipmentBoxStatus = (data)=>createAPI('/shipment/box/update/status','post',data) diff --git a/src/api/shipment/index.js b/src/api/shipment/index.js index a6a54ba..3614675 100644 --- a/src/api/shipment/index.js +++ b/src/api/shipment/index.js @@ -4,5 +4,6 @@ export const getShipmentList = (data) => createAPI( '/shipment/list','post', dat export const getShipmentPage = (data) => createAPI( `/shipment/list/${data.no}/${data.size}`,'post',data) +export const printShipment = (data)=>createAPI('/shipment/print','post',data) export const endShipment = (data) => createAPI( `/shipment/end`,'post',data) diff --git a/src/api/shipment/roll.js b/src/api/shipment/roll.js index 947cc6a..927e7ed 100644 --- a/src/api/shipment/roll.js +++ b/src/api/shipment/roll.js @@ -3,4 +3,5 @@ import {createAPI} from '../../utils/httpRequest' export const getShipmentRollDataList = (data) => createAPI(`/shipment/roll/list`,'post',data) export const saveShipmentRollData = (data) => createAPI(`/shipment/roll/add`,'post',data) export const removeShipmentRollData = (data) => createAPI(`/shipment/roll/remove`,'post',data) +export const printShipmentRoll = (data) => createAPI(`/shipment/roll/print`,'post',data) export const getShipmentRollAllData = (data) => createAPI(`/shipment/roll/all`,'post',data) diff --git a/src/views/modules/finshProduct/outWarehouse.vue b/src/views/modules/finshProduct/outWarehouse.vue index eca97e7..b2c27b7 100644 --- a/src/views/modules/finshProduct/outWarehouse.vue +++ b/src/views/modules/finshProduct/outWarehouse.vue @@ -1,6 +1,6 @@