From 2f782b84de65a71db1ceff7fc9677412b26b7cae Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 28 Aug 2024 08:55:21 +0800 Subject: [PATCH 01/12] =?UTF-8?q?HL-5696=E8=A3=85=E9=85=8D=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5=E7=94=B3=E8=AF=B7&=E9=A2=84=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E7=94=B3=E8=AF=B7&=E5=88=B6=E5=93=81?= =?UTF-8?q?=E5=9B=9E=E6=94=B6=E7=94=B3=E8=AF=B7&=E9=9A=94=E7=A6=BB?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E7=94=B3=E8=AF=B7&=E5=88=B6=E5=93=81?= =?UTF-8?q?=E5=AD=90=E4=BB=B6=E6=8A=A5=E5=BA=9F=E7=94=B3=E8=AF=B7&?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7=E7=94=B3=E8=AF=B7&?= =?UTF-8?q?=E6=88=90=E5=93=81=E5=8F=91=E8=BF=90=E7=94=B3=E8=AF=B7&?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=98=E6=9B=B4=E7=AE=A1=E7=90=86=E7=AD=89?= =?UTF-8?q?=E4=B8=8E=E4=BA=A7=E6=88=90=E5=93=81/=E5=8D=8A=E6=88=90?= =?UTF-8?q?=E5=93=81=E6=95=B0=E9=87=8F=E6=9C=89=E5=85=B3=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E5=85=A8=E9=83=A8=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=B0=8F=E6=95=B0=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain.data.ts | 4 ++-- .../deliver/deliverRequestMain/deliverRequestMain.data.ts | 4 ++-- .../deliverplan/deliverPlanMain/deliverPlanMain.data.ts | 8 ++++---- .../saleShipmentMainRequest/index.vue | 1 + .../stockup/stockupMainRequest/stockupMainRequest.data.ts | 2 +- .../productreceiptRequestMain.data.ts | 4 ++-- .../productreceiptAssembleRequestMain.data.ts | 4 ++-- .../productreceiptscrapRequestMain.data.ts | 4 ++-- .../productscrapRequestMain.data.ts | 4 ++-- 9 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index 468dd88ff..5fd6e2874 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -952,13 +952,13 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive component: 'InputNumber', componentProps: { min: 0, - precision: 6 + // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + // precision: 6 } }, { diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index bbedb984b..7dd946ebd 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -867,13 +867,13 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, - precision: 6 + // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + // precision: 6 } }, { diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts index 4070f3ffd..a06a17264 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts @@ -658,13 +658,13 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, - precision: 6 + // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + // precision: 6 } }, { @@ -966,13 +966,13 @@ export const DeliverPlanDetailRequest = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, - precision: 6 + // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + // precision: 6 } }, { diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue index 8627afac5..ff92dd48c 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue @@ -97,6 +97,7 @@ import Detail from '@/components/Detail/src/Detail.vue' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' const { loadStart, loadDone } = usePageLoading() +// 结算出库申请 defineOptions({ name: 'SaleShipmentMain' }) const message = useMessage() // 消息弹窗 diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts index a0e70bc4b..0b00dfad2 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts @@ -742,7 +742,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ tableForm: { type: 'InputNumber', min: 0, - precision: 6 + // precision: 6 }, }, { diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index 94ceaf6d2..0a56b4c7f 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -1086,13 +1086,13 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive component: 'InputNumber', componentProps: { min: 0, - precision: 6 + // precision: 6 }, }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + // precision: 6 } }, { diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index c9aa9a4e1..4cc0bf7ac 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -1096,13 +1096,13 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive component: 'InputNumber', componentProps: { min: 0, - precision: 6 + // precision: 6 }, }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + // precision: 6 } }, { diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts index 7e2174154..6c5473e33 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts @@ -1172,13 +1172,13 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive component: 'InputNumber', componentProps: { min: 0, - precision: 6 + // precision: 6 }, }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + // precision: 6 } }, { diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index d88934572..7ac70b0c6 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -943,14 +943,14 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, - precision: 6 + // precision: 6 }, }, tableForm: { type: 'InputNumber', default:1, min: 0, - precision: 6 + // precision: 6 } }, { From 10f9d5b8e8d3a9917502017e289cfaea7367c7af Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 28 Aug 2024 09:11:25 +0800 Subject: [PATCH 02/12] =?UTF-8?q?HL-5696=E8=B7=9F=E5=8F=B2=E5=90=8F?= =?UTF-8?q?=E6=B2=9F=E9=80=9A=E5=90=8E=EF=BC=8C=E8=AE=BE=E7=BD=AE=E6=9C=80?= =?UTF-8?q?=E5=A4=A7=E6=95=B0=E4=B8=BA9999=EF=BC=8C=E6=AF=8F=E6=AC=A1?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=B8=8D=E8=83=BD=E8=B6=85=E8=BF=879999?= =?UTF-8?q?=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain.data.ts | 2 ++ .../deliver/deliverRequestMain/deliverRequestMain.data.ts | 2 ++ .../deliverplan/deliverPlanMain/deliverPlanMain.data.ts | 4 ++++ .../stockup/stockupMainRequest/stockupMainRequest.data.ts | 1 + .../productreceiptRequestMain.data.ts | 2 ++ .../productreceiptAssembleRequestMain.data.ts | 2 ++ .../productreceiptscrapRequestMain.data.ts | 2 ++ .../productscrapRequestMain/productscrapRequestMain.data.ts | 2 ++ 8 files changed, 17 insertions(+) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index 5fd6e2874..d255a9fa8 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -952,12 +952,14 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive component: 'InputNumber', componentProps: { min: 0, + max:9999, // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, + max:9999, // precision: 6 } }, diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index 7dd946ebd..2cdfb6bb1 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -867,12 +867,14 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, + max:9999, // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, + max:9999, // precision: 6 } }, diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts index a06a17264..8c8b5c11c 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts @@ -658,12 +658,14 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, + max:9999, // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, + max:9999, // precision: 6 } }, @@ -966,12 +968,14 @@ export const DeliverPlanDetailRequest = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, + max:9999, // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, + max:9999, // precision: 6 } }, diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts index 0b00dfad2..515fe5a9d 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts @@ -742,6 +742,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ tableForm: { type: 'InputNumber', min: 0, + max:9999, // precision: 6 }, }, diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index 0a56b4c7f..ab50c9af8 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -1086,12 +1086,14 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive component: 'InputNumber', componentProps: { min: 0, + max:9999, // precision: 6 }, }, tableForm: { type: 'InputNumber', min: 0, + max:9999, // precision: 6 } }, diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index 4cc0bf7ac..ab2d2ee8b 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -1096,12 +1096,14 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive component: 'InputNumber', componentProps: { min: 0, + max:9999, // precision: 6 }, }, tableForm: { type: 'InputNumber', min: 0, + max:9999, // precision: 6 } }, diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts index 6c5473e33..951cf42af 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts @@ -1172,12 +1172,14 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive component: 'InputNumber', componentProps: { min: 0, + max:9999, // precision: 6 }, }, tableForm: { type: 'InputNumber', min: 0, + max:9999, // precision: 6 } }, diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index 7ac70b0c6..839122910 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -943,6 +943,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, + max:9999, // precision: 6 }, }, @@ -950,6 +951,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ type: 'InputNumber', default:1, min: 0, + max:9999, // precision: 6 } }, From fd3a876fe4a266e507ed66183668a1573b969848 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 28 Aug 2024 10:13:08 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=87=BA=E5=BA=93-?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=82=E6=95=B0customerCode=E5=A4=A7?= =?UTF-8?q?=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../saleShipmentMainRequest/saleShipmentMain.data.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts index cacd6c7b1..b9117e79d 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts @@ -361,7 +361,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive([ isMainValue: false }, { - key: 'customer_code', + key: 'customerCode', value: 'customerCode', isMainValue: true }] @@ -381,7 +381,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive([ isMainValue: false }, { - key: 'customer_code', + key: 'customerCode', value: 'customerCode', isMainValue: true }] From d29f6266fede631ad382063e55633ae96f47fb35 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 28 Aug 2024 10:28:55 +0800 Subject: [PATCH 04/12] =?UTF-8?q?HL-5696=E8=A3=85=E9=85=8D=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5=E7=94=B3=E8=AF=B7&=E9=A2=84=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E7=94=B3=E8=AF=B7&=E5=88=B6=E5=93=81?= =?UTF-8?q?=E5=9B=9E=E6=94=B6=E7=94=B3=E8=AF=B7&=E9=9A=94=E7=A6=BB?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E7=94=B3=E8=AF=B7&=E5=88=B6=E5=93=81?= =?UTF-8?q?=E5=AD=90=E4=BB=B6=E6=8A=A5=E5=BA=9F=E7=94=B3=E8=AF=B7&?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7=E7=94=B3=E8=AF=B7&?= =?UTF-8?q?=E6=88=90=E5=93=81=E5=8F=91=E8=BF=90=E7=94=B3=E8=AF=B7&?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=98=E6=9B=B4=E7=AE=A1=E7=90=86=E7=AD=89?= =?UTF-8?q?=E4=B8=8E=E4=BA=A7=E6=88=90=E5=93=81/=E5=8D=8A=E6=88=90?= =?UTF-8?q?=E5=93=81=E6=95=B0=E9=87=8F=E6=9C=89=E5=85=B3=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E5=85=A8=E9=83=A8=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=B0=8F=E6=95=B0=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionplan/productionMain/productionMain.data.ts | 6 ++++-- .../productionMainAssemble/productionMainAssemble.data.ts | 6 ++++-- .../productionMainAssembleSparePart.data.ts | 6 ++++-- .../productionMainPredictSparePart.data.ts | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index 5042e58f1..76e26ea30 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -840,13 +840,15 @@ export const ProductionDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 }, }, { diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts index e4b002ef2..7b43f9b8d 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts @@ -839,13 +839,15 @@ export const ProductionDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 }, }, { diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts index 81391162f..de69f82d7 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts @@ -804,13 +804,15 @@ export const ProductionDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 }, }, { diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts index 47012f6f5..11019d913 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts @@ -792,13 +792,15 @@ export const ProductionDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 }, }, { From 66786ec7662a9523021d4a0451a8c872014914a3 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 28 Aug 2024 13:15:37 +0800 Subject: [PATCH 05/12] =?UTF-8?q?HL-5696=E8=A3=85=E9=85=8D=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5=E7=94=B3=E8=AF=B7&=E9=A2=84=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E7=94=B3=E8=AF=B7&=E5=88=B6=E5=93=81?= =?UTF-8?q?=E5=9B=9E=E6=94=B6=E7=94=B3=E8=AF=B7&=E9=9A=94=E7=A6=BB?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E7=94=B3=E8=AF=B7&=E5=88=B6=E5=93=81?= =?UTF-8?q?=E5=AD=90=E4=BB=B6=E6=8A=A5=E5=BA=9F=E7=94=B3=E8=AF=B7&?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7=E7=94=B3=E8=AF=B7&?= =?UTF-8?q?=E6=88=90=E5=93=81=E5=8F=91=E8=BF=90=E7=94=B3=E8=AF=B7&?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=98=E6=9B=B4=E7=AE=A1=E7=90=86=E7=AD=89?= =?UTF-8?q?=E4=B8=8E=E4=BA=A7=E6=88=90=E5=93=81/=E5=8D=8A=E6=88=90?= =?UTF-8?q?=E5=93=81=E6=95=B0=E9=87=8F=E6=9C=89=E5=85=B3=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E5=85=A8=E9=83=A8=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=B0=8F=E6=95=B0=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain.data.ts | 6 ++++-- .../deliverRequestMain/deliverRequestMain.data.ts | 6 ++++-- .../deliverPlanMain/deliverPlanMain.data.ts | 12 ++++++++---- .../stockupMainRequest/stockupMainRequest.data.ts | 3 ++- .../productionMain/productionMain.data.ts | 6 ++++-- .../productionMainAssemble.data.ts | 6 ++++-- .../productionMainAssembleSparePart.data.ts | 6 ++++-- .../productionMainPredictSparePart.data.ts | 6 ++++-- .../productreceiptRequestMain.data.ts | 6 ++++-- .../productreceiptAssembleRequestMain.data.ts | 6 ++++-- .../productreceiptscrapRequestMain.data.ts | 6 ++++-- .../productscrapRequestMain.data.ts | 6 ++++-- 12 files changed, 50 insertions(+), 25 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index 468dd88ff..d255a9fa8 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -952,13 +952,15 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 } }, { diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index bbedb984b..2cdfb6bb1 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -867,13 +867,15 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 } }, { diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts index 4070f3ffd..8c8b5c11c 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts @@ -658,13 +658,15 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 } }, { @@ -966,13 +968,15 @@ export const DeliverPlanDetailRequest = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 } }, { diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts index a0e70bc4b..515fe5a9d 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts @@ -742,7 +742,8 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 }, }, { diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index 5042e58f1..76e26ea30 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -840,13 +840,15 @@ export const ProductionDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 }, }, { diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts index e4b002ef2..7b43f9b8d 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts @@ -839,13 +839,15 @@ export const ProductionDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 }, }, { diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts index 81391162f..de69f82d7 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts @@ -804,13 +804,15 @@ export const ProductionDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 }, }, { diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts index 47012f6f5..11019d913 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts @@ -792,13 +792,15 @@ export const ProductionDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 } }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 }, }, { diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index 94ceaf6d2..ab50c9af8 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -1086,13 +1086,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 }, }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 } }, { diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index c9aa9a4e1..ab2d2ee8b 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -1096,13 +1096,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 }, }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 } }, { diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts index 7e2174154..951cf42af 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts @@ -1172,13 +1172,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 }, }, tableForm: { type: 'InputNumber', min: 0, - precision: 6 + max:9999, + // precision: 6 } }, { diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index d88934572..839122910 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -943,14 +943,16 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ component: 'InputNumber', componentProps: { min: 0, - precision: 6 + max:9999, + // precision: 6 }, }, tableForm: { type: 'InputNumber', default:1, min: 0, - precision: 6 + max:9999, + // precision: 6 } }, { From 2deb443346f291d16a75faf3bdb87427a79e7b09 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Wed, 28 Aug 2024 14:12:38 +0800 Subject: [PATCH 06/12] =?UTF-8?q?WMS=20bug=EF=BC=9AHL-5665=20=20=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E5=87=BA=E5=BA=93=E4=BB=BB=E5=8A=A1=E3=80=81=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scrap/scrapJobMain/scrapJobMain.data.ts | 16 ++++++++-------- .../scrapRecordMain/scrapRecordMain.data.ts | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts index d0f7bcb28..0d0a935b4 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts @@ -761,14 +761,14 @@ export const ScrapJobMainRules = reactive({ * @returns {Array} 报废出库任务子表 */ export const ScrapJobDetail = useCrudSchemas(reactive([ - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 180 - }, - }, + // { + // label: '单据号', + // field: 'number', + // sort: 'custom', + // table: { + // width: 180 + // }, + // }, { label: '物料代码', field: 'itemCode', diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts index 520aa838a..962ddc315 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts @@ -534,14 +534,14 @@ export const ScrapRecordMainRules = reactive({ * @returns {Array} 报废出库记录子表 */ export const ScrapRecordDetail = useCrudSchemas(reactive([ - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 180 - }, - }, + // { + // label: '单据号', + // field: 'number', + // sort: 'custom', + // table: { + // width: 180 + // }, + // }, { label: '物料代码', field: 'itemCode', From 1f8235093818e85188aac183dc6f82ddd51906c5 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 28 Aug 2024 19:57:32 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=BF=E7=94=A8=E5=86=B3=E7=AD=96=E4=B9=8B?= =?UTF-8?q?=E5=90=8E=E5=8F=91=E5=B8=83=E9=97=AE=E9=A2=98=EF=BC=8C=E6=B5=B7?= =?UTF-8?q?=E6=8B=89=E4=B9=9F=E6=8F=90=E8=BF=87=E8=BF=99=E4=B8=AA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionRecord/index.vue | 9 ++++++--- src/views/qms/inspectionRecord/useAddForm.vue | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue index a9765dd5b..56351c3b2 100644 --- a/src/views/qms/inspectionRecord/index.vue +++ b/src/views/qms/inspectionRecord/index.vue @@ -281,13 +281,13 @@ const buttonTableClick = async (val, row) => { // 编辑 // 评估代码值是1，接收时候，使用决策下拉列表是全部合格 if (row.estimateCode == 1) { - InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => { + InspectionRecordUser.allSchemas.formSchema.forEach((itemColumn) => { if (itemColumn.field == 'useDecision') { itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value == 1) } }) } else if (row.estimateCode == 2) { - InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => { + InspectionRecordUser.allSchemas.formSchema.forEach((itemColumn) => { if (itemColumn.field == 'useDecision') { itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value != 1) } @@ -430,7 +430,10 @@ const submitForm = async (formType, data) => { message.success(t('common.updateSuccess')) } formRef.value.dialogVisible = false - handleOrderPub(rowData.value) + if (!data.isPublished) { + handleOrderPub(rowData.value) + } + // 刷新当前列表 getList() } finally { diff --git a/src/views/qms/inspectionRecord/useAddForm.vue b/src/views/qms/inspectionRecord/useAddForm.vue index c430495c8..d6e9dbd82 100644 --- a/src/views/qms/inspectionRecord/useAddForm.vue +++ b/src/views/qms/inspectionRecord/useAddForm.vue @@ -140,7 +140,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any if(row.estimateCode == 1){ data.value.useDecision = '1' }else{ - data.value.useDecision ='' + data.value.useDecision =row.useDecision?row.useDecision:'' } // 全部合格时合格数量==数量 if(data.value.useDecision == 1){ From 46305d51058443be259866c9c34827b42b2a0bbb Mon Sep 17 00:00:00 2001 From: lidm0086 Date: Wed, 28 Aug 2024 20:22:17 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E7=BB=88=E6=AD=A2=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../saleShipmentMainRequest/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue index ff92dd48c..4653f0eb0 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue @@ -249,7 +249,7 @@ const butttondata = (row,$index) => { defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:refused'}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:agree'}), // 审批通过 defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:sale-shipment-main-request:handle'}), // 处理 - defaultButtons.mainListAbortBtn({hide:isShowMainButton(row,['8']),hasPermi:'wms:sale-shipment-main-request:abort'}), // 终止 + // defaultButtons.mainListAbortBtn({hide:isShowMainButton(row,['8']),hasPermi:'wms:sale-shipment-main-request:abort'}), // 终止 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-shipment-main-request:delete'}), // 删除 ] } @@ -324,7 +324,7 @@ const buttonTableClick = async (val, row) => { tableObject.loading = false console.log(err) }) - } else if (val == 'mainAbort') { // 废弃 + } else if (val == 'mainAbort') { // 结算出库废弃 await message.confirm('确认要终止吗？') tableObject.loading = true SaleShipmentMainApi.abort(row.masterId).then(() => { @@ -361,7 +361,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['subSettleQty']}`) + message.error(`物料${row['itemCode']}最大数量为${row['subSettleQty']}`) } } console.log('inputNumberChange',field, val,row, index) @@ -376,7 +376,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['subSettleQty']}`) + message.error(`物料${item['itemCode']}最大数量为${item['subSettleQty']}`) } }) if(!flag){ From aed5b55b2bf786e170c7a30ace82475ef2bc66ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Wed, 28 Aug 2024 21:29:50 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E9=A2=84=E7=94=9F=E4=BA=A7=E8=A3=85?= =?UTF-8?q?=E9=85=8D=E7=94=B3=E8=AF=B7=E6=9F=A5=E7=9C=8Bbom=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceipt/productreceiptRequestMain/index.vue | 2 +- .../productreceiptAssembleRequestMain/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index 656b5cfff..518185c62 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -802,7 +802,7 @@ const tableFormButton = async (val, row) => { bomModelVisible.value = true DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息' detatableDataBom.params = { - masterId: row.masterId + number: row.number } await getDetailListBom() } diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index 159dfdfaa..62913b6e9 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -709,7 +709,7 @@ const tableFormButton = async (val , row) => { bomModelVisible.value = true DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息' detatableDataBom.params = { - masterId: row.masterId + number: row.number } await getDetailListBom() } From 8451d61fbc0f6736c1d8f3d29bec8f322c5f68e5 Mon Sep 17 00:00:00 2001 From: lidm0086 Date: Thu, 29 Aug 2024 09:02:43 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E6=89=93=E5=BC=80=E6=92=A4=E9=94=80?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E7=9A=84=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceipt/productreceiptRecordMain/index.vue | 2 +- .../productreceiptAssembleRecordMain/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue index 177693c90..7421e62e3 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue @@ -203,7 +203,7 @@ const butttondata = (row,$index) => { // defaultButtons.mainInspectRequestBtn({hasPermi:'wms:productreceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 defaultButtons.mainInspectRequestBtn({hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 defaultButtons.mainListPointBtn(null), // 标签打印 - // defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示 + defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示 ] } diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue index a090fc761..d365756c9 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue @@ -240,7 +240,7 @@ const butttondata = (row,$index) => { defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 defaultButtons.mainPutawayRequestCpBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请 defaultButtons.mainListPointBtn(null), // 标签打印 - // defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示 + defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示 ] } From 8f2b618e82b378c03a1574a08a2257d256a61fd4 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 29 Aug 2024 12:04:21 +0800 Subject: [PATCH 11/12] =?UTF-8?q?HL-4935WMS=20WEB=E7=AB=AF=E9=A2=84?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=92=8C=E8=A3=85=E9=85=8D=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=AD=E5=A2=9E=E5=8A=A0=E6=92=A4=E9=94=80?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=93=8D=E4=BD=9C=E9=80=89=E9=A1=B9=EF=BC=8C?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=BF=AB=E9=80=9F=E5=88=B6=E5=93=81=E5=9B=9E?= =?UTF-8?q?=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptRecordMain/productreceiptRecordMain.data.ts | 2 +- .../productreceiptAssembleRecordMain.data.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts index 8fa04a485..b111d847b 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts @@ -760,7 +760,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( isDetail: false, isForm: false , table: { - width: 280, + width: 340, fixed: 'right' }, isTableForm:true, diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts index 12595ed27..e697dda38 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts @@ -765,7 +765,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( isDetail: false, isForm: false , table: { - width: 350, + width: 410, fixed: 'right' }, hiddenInMain: false, From 9d1a6ffa2e1c5c065f05b764ba2a11697df8dc94 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 29 Aug 2024 13:04:32 +0800 Subject: [PATCH 12/12] =?UTF-8?q?HL-4935WMS=20WEB=E7=AB=AF=E9=A2=84?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=92=8C=E8=A3=85=E9=85=8D=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=AD=E5=A2=9E=E5=8A=A0=E6=92=A4=E9=94=80?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=93=8D=E4=BD=9C=E9=80=89=E9=A1=B9=EF=BC=8C?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=BF=AB=E9=80=9F=E5=88=B6=E5=93=81=E5=9B=9E?= =?UTF-8?q?=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptRecordMain.data.ts | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts index b111d847b..10112301c 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts @@ -231,6 +231,24 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ }, isTable: false, }, + { + label: '是否已撤销', + field: 'recoveryRequestFlag', + sort: 'custom', + table: { + width: 150 + }, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value=='TRUE'){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '创建者', field: 'creator', @@ -569,24 +587,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( width: 150 }, }, - { - label: '是否已撤销', - field: 'recoveryRequestFlag', - sort: 'custom', - table: { - width: 150 - }, - detail:{ - dictType:'primary', - valueFilter:(value)=>{ - if(value=='TRUE'){ - return `是` - }else{ - return '否' - } - } - } - }, + { label: '单据号', field: 'number',