Przeglądaj źródła

资料填报,全部保存的bug

ZaiZai 2 lat temu
rodzic
commit
4a00dcb174

+ 11 - 5
src/views/data-fill/collapse-form/index.vue

@@ -766,14 +766,18 @@ const setInitDragModalTableForm = (item, index) => {
 }
 
 const TableFormClose = async (closeFunc, item, index) => {
-    const list = DragModalTableForm.value
-    list.splice(index, 1)
-    listDatas.value[item.index].isWindow = false
     //取表单的数据
     await setChangeFormDatas(item?.pkeyId, 'collapse')
+    console.log(item, index)
     //关闭窗口
-    closeFunc()
+    const list = DragModalTableForm.value
+    console.log(list)
+    list.splice(index, 1)
+    listDatas.value[item.index].isWindow = false
     DragModalTableForm.value = list
+    console.log(list)
+    //关闭窗口
+    //closeFunc()
 }
 
 const dragNodeMoreMenu = [
@@ -1138,7 +1142,9 @@ const getFormData = async () => {
         const pkeyId = formArr[i].pkeyId
         const refs = await getFormRef(pkeyId)
         const form = refs?.getFormData()
-        newArr.push(form)
+        newArr.push({
+            ...form
+        })
     }
     return newArr
 }

+ 4 - 4
src/views/data-fill/wbs.vue

@@ -1658,11 +1658,11 @@ const tableFormSaveClick = async () => {
     //获取数据
     let FormData = [], FormRegExpJson = {};
     if (isDrawer.value) {
-        FormData = ListItemsRef.value?.getFormData()
-        FormRegExpJson = ListItemsRef.value?.getFormRegExpJson()
+        FormData = await ListItemsRef.value?.getFormData()
+        FormRegExpJson = await ListItemsRef.value?.getFormRegExpJson()
     } else {
-        FormData = ListItemRef.value?.getFormData()
-        FormRegExpJson = ListItemRef.value?.getFormRegExpJson()
+        FormData = await ListItemRef.value?.getFormData()
+        FormRegExpJson = await ListItemRef.value?.getFormRegExpJson()
     }
     //效验数据
     if (getObjNullValue(FormRegExpJson)) {