merge

src/views/demo/onlineform/formModule/FormModal.vue

@@ -116,11 +116,15 @@ import { debug } from 'console';
 
   // 下一页
   function formNextClick() {
+<<<<<<< HEAD
 <<<<<<< HEAD
     console.log('click')
     debugger;
 =======
 >>>>>>> 9cc74217da9f7a6781340e6a7c259a48abd78fea
+=======
+    console.log('click')
+>>>>>>> 573447f3ecd57990b28e17cf0e14646e0469412b
     isNextSteps.value = true;
     isSubmitClick.value = false;
   }

src/views/demo/onlineform/formModule/modalForm.vue

@@ -246,8 +246,10 @@
   watch(
     () => props.isNextSteps,
     async () => {
+      console.log('props.isNextSteps',props.isNextSteps)
       if (props.isNextSteps) {
         // 判断数据表字段重复
+        console.log('formModuleRef.value',formModuleRef,formModuleRef.value)
         if (formModuleRef.value) {
           try {
             const valid = await formModuleRef.value.validate();