From 91c78d3d76f519a1fa10c62d0eeae2b94b9ea1e3 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 14 Nov 2024 17:11:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demandforecastingMain/demandforecastingMain.data.ts | 2 +- .../supplierdeliver/demandforecastingMain/index.vue | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts index 686bae159..a4de606ac 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts @@ -555,7 +555,7 @@ export const DemandforecastingMainPlan = useCrudSchemas(reactive([ { label: '计划日期', field: 'dueDate', - formatter: dateFormatter, + formatter: dateFormatter2, sort: 'custom', table: { width: 150 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue index cc340c4d4..46fa01fc7 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue @@ -283,6 +283,10 @@ const handlePreviewPlan = async ()=>{ await getListPlan() selectionPlanRows.value = [] dialogVisiblePlan.value = true + // 全选 + nextTick(()=>{ + tablePlanRef.value.toggleAllSelection(true) + }) } const buttonBaseClickPlan = async (val)=>{ From ddbce04d1b7d530cf53959a94209b9379933b728 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Fri, 15 Nov 2024 09:08:19 +0800 Subject: [PATCH 2/4] =?UTF-8?q?YT-996:=E5=88=9B=E5=BB=BA=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E5=8F=91=E7=A5=A8=E6=9C=AA=E7=A8=8E=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=98=AF=E5=8F=AF=E7=BC=96=E8=BE=91=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRequestMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 0c4a62e5b..260867b1e 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -465,7 +465,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( component: 'InputNumber', componentProps: { precision: 2, - disabled: true, + disabled: false, } }, isTableForm:false, From 84c5e1e5c4d22a2ea9d3a05a25c0b3c0668604d7 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Fri, 15 Nov 2024 09:46:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?YT-743STRATEGY04.=E8=A1=A5=E6=96=99?= =?UTF-8?q?=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/repairMaterialStrategy/AddForm.vue | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue index f2be85f3a..a1861151d 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue @@ -282,6 +282,16 @@ + + + + + + @@ -341,7 +351,8 @@ const formData = ref({ // 自动补料 autoFeed: false, // 邮件提醒 - emailNotification: true + emailNotification: true, + emailAddress:'' } }) @@ -606,7 +617,8 @@ const resetForm = () => { // 自动补料 autoFeed: false, // 邮件提醒 - emailNotification: true + emailNotification: true, + emailAddress:'' } } } From 5316063e68402f6aaaa0a3a19b76d8aa86025965 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Fri, 15 Nov 2024 09:51:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?YT-988=E5=8F=91=E6=96=99=E7=AD=96=E7=95=A5?= =?UTF-8?q?=EF=BC=8C=E8=A7=84=E5=88=99=E9=85=8D=E7=BD=AE=E5=B0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/downShelfStrategy/AddForm.vue | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue index 56731bb9b..78c1e6b1c 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue @@ -582,36 +582,36 @@ - - - - - - - - - + + + + + - - - - - - - - - + + + + + - - - - - - - - - - + + + 小时 + +