From d600d48fc36767c50d5b0ac2f997e35895e4ff4e Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" Date: Tue, 13 Jan 2026 20:24:04 +0800 Subject: [PATCH] no message --- .../src/jeecg/components/JSelectMultiple.vue | 1 + src/views/agvTask/TesAgv.data.ts | 30 ++++++----- src/views/agvTask/TesAgvList.vue | 1 + src/views/receive/asn/AsnList.vue | 26 ++++++---- src/views/shipping/Pick.data.ts | 9 ++++ src/views/shipping/PickList.vue | 51 ++++++++----------- src/views/shipping/components/PickForm.vue | 12 ++++- 7 files changed, 73 insertions(+), 57 deletions(-) diff --git a/src/components/Form/src/jeecg/components/JSelectMultiple.vue b/src/components/Form/src/jeecg/components/JSelectMultiple.vue index 3e7dab9..9111efa 100644 --- a/src/components/Form/src/jeecg/components/JSelectMultiple.vue +++ b/src/components/Form/src/jeecg/components/JSelectMultiple.vue @@ -123,6 +123,7 @@ }); function onChange(selectedValue) { + console.log('onChange', selectedValue); if (props.triggerChange) { emit('change', selectedValue.join(props.spliter)); emit('update:value', selectedValue.join(props.spliter)); diff --git a/src/views/agvTask/TesAgv.data.ts b/src/views/agvTask/TesAgv.data.ts index f24ccec..9905fa9 100644 --- a/src/views/agvTask/TesAgv.data.ts +++ b/src/views/agvTask/TesAgv.data.ts @@ -17,13 +17,25 @@ export const columns: BasicColumn[] = [ { title: '容器', align: "center", - width: '120px', + width: '100px', dataIndex: 'carrierCode' }, + { + title: '柜号', + align: "center", + width: '100px', + dataIndex: 'conNo' + }, + { + title: '物料', + align: "center", + width: '100px', + dataIndex: 'itemId_dictText' + }, { title: '业务类型', align: "center", - width: '120px', + width: '100px', dataIndex: 'type_dictText' }, { @@ -56,18 +68,8 @@ export const columns: BasicColumn[] = [ width: '130px', dataIndex: 'endCode' }, - { - title: '优先级', - align: "center", - width: '60px', - dataIndex: 'priority' - }, - { - title: '供应商', - align: 'center', - width: '90px', - dataIndex: 'agvVendor_dictText', - }, + + { title: '返回报文', align: "center", diff --git a/src/views/agvTask/TesAgvList.vue b/src/views/agvTask/TesAgvList.vue index 14dc61e..0a551e6 100644 --- a/src/views/agvTask/TesAgvList.vue +++ b/src/views/agvTask/TesAgvList.vue @@ -110,6 +110,7 @@ const formRef = ref(); const queryParam = reactive({ agvVendor: 'TES', + status_MultiString:'2' }); const registerModal = ref(); const registerResendModal = ref(); diff --git a/src/views/receive/asn/AsnList.vue b/src/views/receive/asn/AsnList.vue index 5738853..eac4441 100644 --- a/src/views/receive/asn/AsnList.vue +++ b/src/views/receive/asn/AsnList.vue @@ -16,12 +16,21 @@ - - + + + + + + + + + + + @@ -35,14 +44,6 @@ - - - - - - - - @@ -129,7 +130,9 @@ const fieldPickers = reactive({}); const formRef = ref(); - const queryParam = reactive({}); + const queryParam = reactive({ + status_MultiString: '1,3,6', // 默认查询已创建、收货完成、已扫描 + }); const { createMessage } = useMessage(); //注册model const [registerModal, { openModal }] = useModal(); @@ -160,6 +163,7 @@ console.error('日期范围处理错误:', error); } } + for (let key in fieldPickers) { if (newQueryParam[key] && fieldPickers[key]) { newQueryParam[key] = getDateByPicker(newQueryParam[key], fieldPickers[key]); diff --git a/src/views/shipping/Pick.data.ts b/src/views/shipping/Pick.data.ts index 637cc17..ad9c57b 100644 --- a/src/views/shipping/Pick.data.ts +++ b/src/views/shipping/Pick.data.ts @@ -27,6 +27,15 @@ export const columns: BasicColumn[] = [ return render.renderTip(text); }, }, + { + title: '柜号', + align: 'center', + dataIndex: 'conNo', + width: '120px', + customRender: ({ text }) => { + return render.renderTip(text); + }, + }, { title: '订单状态', align: 'center', diff --git a/src/views/shipping/PickList.vue b/src/views/shipping/PickList.vue index 177d858..0dcf5c4 100644 --- a/src/views/shipping/PickList.vue +++ b/src/views/shipping/PickList.vue @@ -6,8 +6,8 @@ - - + + @@ -16,12 +16,20 @@ - - + + + + + + + + + + @@ -35,14 +43,6 @@ - - - - - - - - @@ -139,18 +139,7 @@ import { useModal } from '/@/components/Modal'; import PickModal from './components/PickModal.vue'; import { columns } from './Pick.data'; - import { - list, - deleteOne, - batchDelete, - getImportUrl, - getExportUrl, - allocatePick, - cancelAllocate, - pickTask, - pickBack, - closePick, - } from './Pick.api'; + import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, allocatePick, cancelAllocate, pickTask, pickBack, closePick } from './Pick.api'; import { useMessage } from '/@/hooks/web/useMessage'; import { getDateByPicker } from '/@/utils'; import { JInputTypeEnum } from '@/enums/cpteEnum'; @@ -160,7 +149,9 @@ const fieldPickers = reactive({}); const formRef = ref(); - const queryParam = reactive({}); + const queryParam = reactive({ + status_MultiString: '1,2,3,4,5', // 默认查询已创建、部分分配、已分配、部分拣货 + }); //注册model const [registerModal, { openModal }] = useModal(); const { createMessage } = useMessage(); @@ -334,7 +325,6 @@ } } - /** * 关单事件 */ @@ -342,10 +332,10 @@ async function handleClosePick() { // 选中的数据中状态有4、5 返回true,否则返回false - const validStatuses = [4, 5]; + const validStatuses = [1, 4, 5]; const allValidStatus = selectedRows.value.every((row: any) => validStatuses.includes(row.status)); if (!allValidStatus) { - return createMessage.error('【部分拣货、拣货完成】状态的出库单才允许关单'); + return createMessage.error('【已创建、部分拣货、拣货完成】状态的出库单才允许关单'); } if (closePick_loading.value) { return; @@ -363,15 +353,14 @@ } } - /** * 编辑事件 */ function handleEdit(record: Recordable) { let showFooter = true; - if (record.status > 1) { + /* if (record.status > 1) { showFooter = false; - } + }*/ openModal(true, { record, isUpdate: true, diff --git a/src/views/shipping/components/PickForm.vue b/src/views/shipping/components/PickForm.vue index 4d63908..bcd71c7 100644 --- a/src/views/shipping/components/PickForm.vue +++ b/src/views/shipping/components/PickForm.vue @@ -5,7 +5,7 @@ - + @@ -50,6 +50,14 @@ + + + + + + + +