From 055d2e411a01c59dcb4fd565e69b42de41d2031b Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 17 Oct 2024 17:21:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=89=B9=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../saleShipmentMain.data.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts index b9117e79d..823244b3a 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts @@ -314,9 +314,9 @@ export const SaleShipmentDetailRules = reactive({ fromLocationCode: [ { required: true, message: '请选择客户库位', trigger: 'blur' } ], - batch: [ - { required: true, message: '请输入批次', trigger: 'blur' } - ], + // batch: [ + // { required: true, message: '请输入批次', trigger: 'blur' } + // ], qty: [ { required: true, message: '请输入开票数量', trigger: 'blur' } ], @@ -405,11 +405,11 @@ export const SaleShipmentDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '批次', - field: 'batch', - sort: 'custom', - }, + // { + // label: '批次', + // field: 'batch', + // sort: 'custom', + // }, { label: '客户库位', field: 'fromLocationCode', From c9de890a00a883f7d523c333db3942ffa2679b2d Mon Sep 17 00:00:00 2001 From: lidm0086 Date: Thu, 17 Oct 2024 19:48:41 +0800 Subject: [PATCH 2/4] HL-6188 --- .../deliversettlementManage/saleShipmentMainRequest/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue index 105c38110..b699c0671 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue @@ -350,7 +350,7 @@ const openForm = (type: string, row?: any) => { const inputNumberChange = (field, val,row, index) => { if(field=='qty'){ if(row['subSettleQty']!=null&&row['qty']>row['subSettleQty']){ - message.error(`${row['itemCode']}物料开票数量${row['qty']}大于库存数量${row['subSettleQty']}`) + message.error(`${row['itemCode']}物料开票数量${row['qty']}大于销售订单数量${row['subSettleQty']}`) } } console.log('inputNumberChange',field, val,row, index) @@ -365,7 +365,7 @@ const submitForm = async (formType, submitData) => { tableData.value.forEach(item=>{ if(item['subSettleQty']!=null&&item['qty']>item['subSettleQty']){ flag = false - message.error(`${item['itemCode']}物料开票数量${item['qty']}大于库存数量${item['subSettleQty']}`) + message.error(`${item['itemCode']}物料开票数量${item['qty']}大于销售订单数量${item['subSettleQty']}`) } }) if(!flag){ From e0eb540f5c0fb9911a3d08d6e7bb0ef1f0bff7da Mon Sep 17 00:00:00 2001 From: lidm0086 Date: Fri, 18 Oct 2024 09:11:21 +0800 Subject: [PATCH 3/4] =?UTF-8?q?HL-6188=20=E6=9C=80=E5=A4=A7=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E4=B8=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliversettlementManage/saleShipmentMainRequest/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue index b699c0671..f62134b2b 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue @@ -350,7 +350,7 @@ const openForm = (type: string, row?: any) => { const inputNumberChange = (field, val,row, index) => { if(field=='qty'){ if(row['subSettleQty']!=null&&row['qty']>row['subSettleQty']){ - message.error(`${row['itemCode']}物料开票数量${row['qty']}大于销售订单数量${row['subSettleQty']}`) + message.error(`${row['itemCode']}物料开票数量${row['qty']},最大数量为${row['subSettleQty']}`) } } console.log('inputNumberChange',field, val,row, index) @@ -365,7 +365,7 @@ const submitForm = async (formType, submitData) => { tableData.value.forEach(item=>{ if(item['subSettleQty']!=null&&item['qty']>item['subSettleQty']){ flag = false - message.error(`${item['itemCode']}物料开票数量${item['qty']}大于销售订单数量${item['subSettleQty']}`) + message.error(`${item['itemCode']}物料开票数量${item['qty']},最大数量为${item['subSettleQty']}`) } }) if(!flag){ From 40cfcddfd87ce4863f7530cf54256fa32b1d7556 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 18 Oct 2024 09:30:10 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8F=AB=E6=96=99=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=95=B4=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../labelManage/callmaterials/callmaterials.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts index caa6225a8..1feed5668 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts @@ -146,7 +146,7 @@ export const Callmaterials = useCrudSchemas(reactive([ componentProps: { style: {width:'100%'}, min: 0, - precision: 6 + precision: 0 } } },