Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

src/components/FormViewer/cardGourp.vue

@@ -219,5 +219,6 @@
   }
   defineExpose({
     verify,
+    changeForm,
   });
 </script>

src/components/FormViewer/index.vue

@@ -408,22 +408,25 @@
   const groupRef = ref();
   async function getForm() {
     try {
-      //卡片组的值赋值给form，优化卡片组必填验证不通过
-      setFieldsValue({
-        ...subTableDataStore.getGroupData,
-      });
       // 验证卡片组必填项
       if (groupRef.value) {
         if (tabsColumns.value.length > 0) {
+          await groupRef.value[0].changeForm();
           if (!(await groupRef.value[0].verify())) {
             return false;
           }
         } else {
+          await groupRef.value.changeForm();
           if (!(await groupRef.value.verify())) {
             return false;
           }
         }
       }
+      console.log(subTableDataStore.getGroupData);
+      //卡片组的值赋值给form，优化卡片组必填验证不通过
+      setFieldsValue({
+        ...subTableDataStore.getGroupData,
+      });
 
       // 验证表单必填项
       let values = await validate();