From 9b61dab6c62953cb6d01d796c8b06d5f1d1d93aa Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" <925258474@qq.com> Date: Sun, 27 Apr 2025 17:34:46 +0800 Subject: [PATCH] no message --- .../api/business/wms/shipping/shipping-api.ts | 18 +++++++ .../business/wms/receive/asn/asn-list.vue | 2 +- .../wms/receive/asnTask/asn-task-list.vue | 2 +- .../business/wms/shipping/pick/pick-form.vue | 11 +--- .../business/wms/shipping/pick/pick-list.vue | 49 ++++++++++++----- .../shipping/pick/shipping-detail-list.vue | 53 ++++++++++++++++++- .../shipping/pickDetail/pick-detail-form.vue | 9 +--- 7 files changed, 109 insertions(+), 35 deletions(-) create mode 100644 nc_wms_web/src/api/business/wms/shipping/shipping-api.ts diff --git a/nc_wms_web/src/api/business/wms/shipping/shipping-api.ts b/nc_wms_web/src/api/business/wms/shipping/shipping-api.ts new file mode 100644 index 0000000..f7f6f16 --- /dev/null +++ b/nc_wms_web/src/api/business/wms/shipping/shipping-api.ts @@ -0,0 +1,18 @@ +/** + * 入库明细 api 封装 + * + * @Author: 霍锦 + * @Date: 2025-03-26 15:16:28 + * @Copyright 友仓 + */ +import {postRequest} from '/@/lib/axios'; + +export const shippingApi = { + + /** + * 分配明细 @author 霍锦 + */ + allocationPickDetail: (param: any) => { + return postRequest('/shipping/allocationPickDetail', param); + }, +}; diff --git a/nc_wms_web/src/views/business/wms/receive/asn/asn-list.vue b/nc_wms_web/src/views/business/wms/receive/asn/asn-list.vue index 23bcb1e..4221859 100644 --- a/nc_wms_web/src/views/business/wms/receive/asn/asn-list.vue +++ b/nc_wms_web/src/views/business/wms/receive/asn/asn-list.vue @@ -19,7 +19,7 @@ 全部 已创建 - 部分入库 + 入库中 已完成 diff --git a/nc_wms_web/src/views/business/wms/receive/asnTask/asn-task-list.vue b/nc_wms_web/src/views/business/wms/receive/asnTask/asn-task-list.vue index 95df41f..0381f91 100644 --- a/nc_wms_web/src/views/business/wms/receive/asnTask/asn-task-list.vue +++ b/nc_wms_web/src/views/business/wms/receive/asnTask/asn-task-list.vue @@ -12,7 +12,7 @@
关键字： - + 搜索 重置
diff --git a/nc_wms_web/src/views/business/wms/shipping/pick/pick-form.vue b/nc_wms_web/src/views/business/wms/shipping/pick/pick-form.vue index 4b1d712..d76401a 100644 --- a/nc_wms_web/src/views/business/wms/shipping/pick/pick-form.vue +++ b/nc_wms_web/src/views/business/wms/shipping/pick/pick-form.vue @@ -24,8 +24,8 @@ - + + @@ -140,13 +140,6 @@ const rules = { }; -//选择客户 -function changeCustomerSelect(selectValue: any) { - if (selectValue) { - form.customerId = selectValue.customerId; - } -} - //选择收货单位 function changeAddressSelect(selectValue: any) { if (selectValue) { diff --git a/nc_wms_web/src/views/business/wms/shipping/pick/pick-list.vue b/nc_wms_web/src/views/business/wms/shipping/pick/pick-list.vue index 3dd13c2..01840f7 100644 --- a/nc_wms_web/src/views/business/wms/shipping/pick/pick-list.vue +++ b/nc_wms_web/src/views/business/wms/shipping/pick/pick-list.vue @@ -10,21 +10,38 @@ - + + + + + + + + 全部 + 已创建 + 分配中 + 已分配 + 拣货中 + 已完成 + - - - 查询 - - - - 重置 - + + + + 查询 + + + + 重置 + + @@ -159,6 +176,8 @@ import {pickApi} from '/@/api/business/wms/shipping/pick/pick-api'; import {pickDetailApi} from '/@/api/business/wms/shipping/pickDetail/pick-detail-api' import {TABLE_ID_CONST} from "/@/constants/support/table-id-const"; import {useRoute, useRouter} from "vue-router"; +import SmartEnumSelect from "/@/components/framework/smart-enum-select/index.vue"; +import {PICK_ORDER_STATUS_ENUM} from "/@/api/business/wms/shipping/pick/pick-const"; // ---------------------------- 表格列 ---------------------------- @@ -300,6 +319,8 @@ const totals = computed(() => { const queryFormState = { customerNumber: undefined, //客户订单号 + status: undefined,//状态 + orderType: undefined,//订单类型 pageNum: 1, pageSize: 10, }; @@ -417,7 +438,7 @@ async function requestBatchDelete() { SmartLoading.show(); const response = await pickApi.batchDelete(selectedRowKeyList.value); console.log(response) - const {error, success} = JSON.parse(response.msg); + const {error, success} = JSON.parse(response.data); if (success) { message.success(success); } diff --git a/nc_wms_web/src/views/business/wms/shipping/pick/shipping-detail-list.vue b/nc_wms_web/src/views/business/wms/shipping/pick/shipping-detail-list.vue index bca7d8d..dfff34b 100644 --- a/nc_wms_web/src/views/business/wms/shipping/pick/shipping-detail-list.vue +++ b/nc_wms_web/src/views/business/wms/shipping/pick/shipping-detail-list.vue @@ -12,7 +12,7 @@
关键字： - + 搜索 重置 @@ -35,6 +35,14 @@ 批量移除 + + + 分配明细 +
@@ -100,6 +108,7 @@ import {smartSentry} from '/@/lib/smart-sentry'; import {TABLE_ID_CONST} from "/@/constants/support/table-id-const"; import TableOperator from '/@/components/support/table-operator/index.vue'; import {pickDetailApi} from "/@/api/business/wms/shipping/pickDetail/pick-detail-api"; +import {shippingApi} from '/@/api/business/wms/shipping/shipping-api' import PICKDetailForm from "/@/views/business/wms/shipping/pickDetail/pick-detail-form.vue"; import {message, Modal} from "ant-design-vue"; import {SmartLoading} from '/@/components/framework/smart-loading'; @@ -153,7 +162,7 @@ const defaultQueryForm = { pageNum: 1, pageSize: PAGE_SIZE, pickId: 0, - keyword: undefined, + keywords: undefined, } // 查询表单 @@ -281,6 +290,46 @@ async function requestBatchDelete() { } } +//批量分配明细 +function confirmAllocationPickDetail() { + Modal.confirm({ + title: '提示', + content: '确定要批量分配这些数据吗?', + okText: '分配', + okType: 'danger', + onOk() { + requestAllocationPickDetail(); + }, + cancelText: '取消', + onCancel() { + }, + }); +} + +//请求批量分配明细 +async function requestAllocationPickDetail() { + try { + SmartLoading.show(); + const response = await shippingApi.allocationPickDetail({ + pickId: props.pickId, + pickDetailIds: selectedRowKeyList.value + }); + const {error, success} = JSON.parse(response.data); + if (error) { + message.error(error); + } + if (success) { + message.success(success); + } + await queryData(); + selectedRowKeyList.value=[]; + } catch (e) { + smartSentry.captureError(e); + } finally { + SmartLoading.hide(); + } +} + watch( () => props.pickId, (value) => { diff --git a/nc_wms_web/src/views/business/wms/shipping/pickDetail/pick-detail-form.vue b/nc_wms_web/src/views/business/wms/shipping/pickDetail/pick-detail-form.vue index ca80977..4b53ead 100644 --- a/nc_wms_web/src/views/business/wms/shipping/pickDetail/pick-detail-form.vue +++ b/nc_wms_web/src/views/business/wms/shipping/pickDetail/pick-detail-form.vue @@ -17,7 +17,7 @@ - + @@ -73,13 +73,6 @@ function onClose() { visibleFlag.value = false; } -//选择物料 -function changeItemSelect(selectValue: any) { - if (selectValue) { - form.itemId = selectValue.itemId; - } -} - // 获取当前日期并去除符号作为批次 function getCurrentDateWithoutSymbols() { const now = new Date();