Browse Source

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

master_hella_20240701
zhaoxuebing 3 months ago
parent
commit
2ef42e1434
  1. 2
      src/components/BasicForm/src/BasicForm.vue
  2. 5
      src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts

2
src/components/BasicForm/src/BasicForm.vue

@ -494,7 +494,7 @@ watch(()=>props.tableData,() => {
}) })
watch(()=>unref(formRef)?.formModel,() => { watch(()=>unref(formRef)?.formModel,() => {
if(props?.sumFormDataByForm&&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 deep:true

5
src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts

@ -783,8 +783,7 @@ export const CountPlanDetailRules = reactive({
{ required: true, message: '请选择盘点范围类型', trigger: 'change' } { required: true, message: '请选择盘点范围类型', trigger: 'change' }
], ],
value: [ value: [
{ required: true, message: '请选择盘点范围值', trigger: ['blur','change'] }, { required: true, message: '请选择盘点范围值', trigger: ['blur','change'] }
{ max: 50, message: '不得超过50个字符', trigger: ['blur','change'] }
], ],
}) })
/** /**
@ -830,4 +829,4 @@ export const CountPlanMain1 = useCrudSchemas(reactive<CrudSchema[]>([
} }
} }
}, },
])) ]))

Loading…
Cancel
Save