From 1deef31cb0d5cc8967f394aca4aeaa2340b0b19c Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Tue, 5 Nov 2024 09:03:31 +0800 Subject: [PATCH 1/4] =?UTF-8?q?tag=E5=A4=9A=E4=B8=AA=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E4=B8=8B=E7=9A=84=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DictTag/src/DictTag.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/DictTag/src/DictTag.vue b/src/components/DictTag/src/DictTag.vue index beeb61457..a5115d043 100644 --- a/src/components/DictTag/src/DictTag.vue +++ b/src/components/DictTag/src/DictTag.vue @@ -65,7 +65,7 @@ export default defineComponent({ return ( dictDataList.map(item => { return Date: Tue, 5 Nov 2024 10:05:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?HL-6311=20=E5=B7=B2=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverContainerRecordMain.data.ts | 13 +++-- .../scrapContainerMainRequest.data.ts | 56 +++++++++---------- 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/deliverContainerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/deliverContainerRecordMain.data.ts index ab4b00f7d..b1e354b59 100644 --- a/src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/deliverContainerRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/deliverContainerRecordMain.data.ts @@ -27,12 +27,12 @@ export const ContainerRecordMain = useCrudSchemas(reactive([ width: 200 }, }, - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - isSearch: true, - }, + // { + // label: '申请单号', + // field: 'requestNumber', + // sort: 'custom', + // isSearch: true, + // }, { label: '类型', field: 'type', @@ -185,6 +185,7 @@ export const ContainerRecordMain = useCrudSchemas(reactive([ label: '操作', field: 'action', isForm: false, + isTable: false, table: { width: 150, fixed: 'right' diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts index 09323ee79..73a23d34c 100644 --- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts @@ -510,46 +510,46 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ // } // } // }, - // { - // label: '从库存状态', - // field: 'fromInventoryStatus', - // dictType: DICT_TYPE.INVENTORY_STATUS, - // dictClass: 'string', - // isForm: false, - // isTableForm: false, - // isTable: false, - // sort: 'custom', - // table: { - // width: 150 - // }, - // tableForm: { - // disabled: true, - // type: 'Select' - // }, - // }, - // { - // label: '从数量', - // field: 'fromQty', - // sort: 'custom', - // tableForm: { - // disabled: true, - // }, - // }, { label: '库存状态', - field: 'toInventoryStatus', + field: 'fromInventoryStatus', dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', + isForm: false, + isTableForm: false, isTable: true, sort: 'custom', table: { width: 150 }, tableForm: { - type: 'Select', - disabled: true + disabled: true, + type: 'Select' }, }, + // { + // label: '从数量', + // field: 'fromQty', + // sort: 'custom', + // tableForm: { + // disabled: true, + // }, + // }, + // { + // label: '库存状态', + // field: 'toInventoryStatus', + // dictType: DICT_TYPE.INVENTORY_STATUS, + // dictClass: 'string', + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // tableForm: { + // type: 'Select', + // disabled: true + // }, + // }, { label: '数量', field: 'toQty', From 79f02dff9ffa590d7f31905102e25cd34a3219da Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Tue, 5 Nov 2024 11:38:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?HL-6343=20=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorychange/inventorychangeRequestMain/index.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue index b180eb5ec..701224f34 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue @@ -483,10 +483,11 @@ const submitForm = async (formType, submitData) => { // formRef.value.formLoading = false // return message.warning('包装号1重复') // } - if (duplicateItems.length>0) { - formRef.value.formLoading = false - return message.warning('物料代码重复') - } + // if (duplicateItems.length>0) { + // formRef.value.formLoading = false + // return message.warning('物料代码重复') + + // } data.subList.forEach(obj => { if(obj.toQty == 0){ message.error(`到数量不能为0!`) From bf3f23b1cd6940156aebc8ebb38890e3518512ed Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Tue, 5 Nov 2024 11:40:19 +0800 Subject: [PATCH 4/4] HL-6360 --- .../inventorymoveRequestMain/inventorymoveRequestMain.data.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index 73a2c0bfe..19b18d4e2 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -653,13 +653,11 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( form: { component: 'InputNumber', componentProps: { - min: 0, precision: 6 } }, tableForm: { type: 'InputNumber', - min: 0, precision: 6 } },