From fa62f879263c73d55fc3b0338d74e8bd4bbc5c34 Mon Sep 17 00:00:00 2001 From: bjang03 <259278618@qq.com> Date: Thu, 27 Jun 2024 15:50:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E4=BB=BB=E5=8A=A1=EF=BC=8C=E5=AF=BC=E5=87=BA=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E8=BE=93=E5=85=A5=E7=9B=98=E7=82=B9=E6=95=B0=E9=87=8F?= =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E5=AF=BC=E5=85=A5=EF=BC=8C=E6=8A=A5=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../countManage/count/countPlanMain/countPlanMain.data.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts index 4071a1df5..fd38865bb 100644 --- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts +++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts @@ -783,8 +783,7 @@ export const CountPlanDetailRules = reactive({ { required: true, message: '请选择盘点范围类型', trigger: 'change' } ], value: [ - { required: true, message: '请选择盘点范围值', trigger: ['blur','change'] }, - { max: 50, message: '不得超过50个字符', trigger: ['blur','change'] } + { required: true, message: '请选择盘点范围值', trigger: ['blur','change'] } ], }) /** @@ -830,4 +829,4 @@ export const CountPlanMain1 = useCrudSchemas(reactive([ } } }, -])) \ No newline at end of file +])) From 441cc9f8cb712ac5405c50d2a6ad1aa0a3383992 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 27 Jun 2024 16:47:05 +0800 Subject: [PATCH 2/2] basicform --- src/components/BasicForm/src/BasicForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 854ededeb..2df16c7e7 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -494,7 +494,7 @@ watch(()=>props.tableData,() => { }) watch(()=>unref(formRef)?.formModel,() => { if(props?.sumFormDataByForm&&unref(formRef)?.formModel){ - props?.sumFormDataByForm(formRef,unref(formRef)?.formModel) + props?.sumFormDataByForm(formRef,unref(formRef)?.formModel,props.tableData) } },{ deep:true