From 767baeb7d512a1670976f0c6e115d5a1d4dc04ae Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Thu, 31 Oct 2024 11:51:28 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=EF=BC=8C=E6=A0=87=E7=AD=BE=E4=BF=A1=E6=81=AF=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=9A=90=E8=97=8F=20=20YT-569?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/inventoryManage/balance/index.vue | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index 7ef12fb88..82b8fc876 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -250,17 +250,17 @@ const handleSelectionPoint = async () => { } // 列表-操作按钮 const butttondata = [ - { - label: '标签信息', - name: 'bqxx', - hide: false, - type: 'primary', - icon: '', - color: '', - link: true, - float: 'right', - hasPermi: '' - }, + // { + // label: '标签信息', + // name: 'bqxx', + // hide: false, + // type: 'primary', + // icon: '', + // color: '', + // link: true, + // float: 'right', + // hasPermi: '' + // }, defaultButtons.mainListPointBtn(null) // 标签打印 // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除 From 5188b68c1e8c369395bfd8999391349a40bc8cac Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Thu, 31 Oct 2024 13:11:16 +0800 Subject: [PATCH 2/5] =?UTF-8?q?YT-582=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=EF=BC=8C=E6=98=AF=E5=90=A6=E7=9B=B4=E6=8E=A5=E7=94=9F?= =?UTF-8?q?=E6=88=90=E8=AE=A1=E5=88=92=E5=BC=80=E5=85=B3=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=85=B3=EF=BC=8C=E6=89=B9=E6=AC=A1=E5=BA=94=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=97=A5=E6=9C=9F=EF=BC=8C=E5=BA=94=E5=8F=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceiptRequestMain.data.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index 05419185b..5522488a9 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -530,7 +530,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive }, form: { component: 'Switch', - value: requestsettingData.directCreateRecord, + value: 'FALSE', componentProps: { inactiveValue: 'FALSE', activeValue: 'TRUE' @@ -804,9 +804,9 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive Date: Thu, 31 Oct 2024 14:13:37 +0800 Subject: [PATCH 3/5] =?UTF-8?q?YT-592=E9=87=87=E8=B4=AD=E6=8D=A2=E8=B4=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=E8=AE=A1=E9=87=8F=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseBarterRecord/purchaseBarterRecordMain.data.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts index d7ce5ff33..f68daaa9e 100644 --- a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts @@ -66,6 +66,8 @@ export const PurchaseBarterRecordDetail = useCrudSchemas(reactive( field: 'uom', sort: 'custom', isSearch: false, + dictType: DICT_TYPE.UOM, + dictClass: 'string', }, { label: '批次', From 75c9ac713afe756d44d4015f78a1809d44a6e16a Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Thu, 31 Oct 2024 14:44:31 +0800 Subject: [PATCH 4/5] =?UTF-8?q?YT-593=E9=87=87=E8=B4=AD=E6=8D=A2=E8=B4=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2=E7=8A=B6=E6=80=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseBarterRecord/purchaseBarterRecordMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts index f68daaa9e..d26cfcc86 100644 --- a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRecord/purchaseBarterRecordMain.data.ts @@ -26,7 +26,7 @@ export const PurchaseBarterRecordMain = useCrudSchemas(reactive([ label: '状态', field: 'status', sort: 'custom', - isSearch: true, + isSearch: false, isForm: false, dictType: DICT_TYPE.REQUEST_STATUS, dictClass: 'string', From 6e31ca6545f632dc3bcb18da4adac1c737c93c38 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Thu, 31 Oct 2024 15:29:36 +0800 Subject: [PATCH 5/5] =?UTF-8?q?YT-595=E9=9A=94=E7=A6=BB=E8=BD=AC=E5=90=88?= =?UTF-8?q?=E6=A0=BC=EF=BC=8C=E6=96=B0=E5=A2=9E=EF=BC=8C=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9=E7=BC=96?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRequestMain/index.vue | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index ce08198d0..9bb29c449 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -384,6 +384,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['fromLocationCode'] = item['locationCode'] newRow['uom'] = item['uom'] newRow['qty'] = item['qty'] + newRow['inventoryQty'] = item['qty'] if(routeName.value == 'NoktoholdRequestMain'){ newRow['toInventoryStatus'] = "HOLD" }else if ( routeName.value == 'HoldtookRequestMain') { @@ -606,11 +607,11 @@ const buttonTableClick = async (val, row) => { /** 添加/修改操作 */ const formRef = ref() const openForm =async (type: string, row?: number) => { - InventorymoveRequestDetail.allSchemas.tableFormColumns.forEach(item=>{ - if(item.field == 'qty'){ - item.tableForm.disabled = routeName.value == "HoldtookRequestMain" - } - }) + // InventorymoveRequestDetail.allSchemas.tableFormColumns.forEach(item=>{ + // if(item.field == 'qty'){ + // item.tableForm.disabled = routeName.value == "HoldtookRequestMain" + // } + // }) tableData.value = [] // 重置明细数据 formRef.value.open(type, row) } @@ -768,6 +769,13 @@ const submitForm = async (formType, submitData) => { } formRef.value.formLoading = true try { + const cmdExists = data.subList.some(filter => + parseFloat(filter.inventoryQty) < parseFloat(filter.qty) + ); + if(cmdExists){ + message.warning("数量不能大于库存数量") + return + } if (formType === 'create') { await InventorymoveRequestMainApi.createInventorymoveRequestMain(data) message.success(t('common.createSuccess'))