bug修复

src/views/data-fill/components/ListItem.vue

@@ -201,7 +201,7 @@ const setFormDataNum = (datas) => {
 //展开事件
 const ActiveKey = ref('')
 const formKeyIds = ref('')
-const CollapseChange = (name) => {
+const CollapseChange = async (name) => {
     ActiveKey.value = name
     const names = name ? name.split('-') : []
     if (names.length > 0) {
@@ -210,10 +210,10 @@ const CollapseChange = (name) => {
         const item = listDatas.value[index]
         formKeyIds.value = item.pkeyId ? item.pkeyId + '' : ''
         if (!item.isTableFormRender) {
-            //渲染表单
-            getExcelHtml(item,index)
             //获取已填写的数据
-            getBussDataInfo(item,item.pkeyId, index)
+            await getBussDataInfo(item,item.pkeyId, index)
+            //渲染表单
+            await getExcelHtml(item,index)
         }
     } else {
         getOffsetTop()
@@ -312,7 +312,6 @@ const tableFormSaveClick = async (item,index) => {
 
 //保存表单数据
 const saveExcelBussData = async (item, index, showTip = true) => {
-    console.log(formRegExpJson.value)
     if (!getObjNullValue(formRegExpJson.value)) {
         tableFormSaveLoading.value = true
         const InitObj = getFormDataInit(item, item.pkeyId)
@@ -655,9 +654,15 @@ const getFormData = () => {
     })
 }
 
+//获取表单效验数据
+const getFormRegExpJson = () => {
+    return deepClone(formRegExpJson.value);
+}
+
 // 暴露出去
 defineExpose({
-    getFormData
+    getFormData,
+    getFormRegExpJson
 })
 </script>
 

src/views/data-fill/wbs.vue

@@ -330,7 +330,7 @@ import HcTreeData from "./components/HcTreeData.vue"
 import WbsTree from "./components/WbsTree.vue"
 import {getTokenHeader} from '~src/api/request/header';
 import {getStoreData, setStoreData} from '~src/utils/storage'
-import {isType, deepClone, formValidate} from "vue-utils-plus"
+import {isType, deepClone, formValidate, clog} from "vue-utils-plus"
 import {getDictionary} from "~api/other"
 import wbsApi from "~api/data-fill/wbs"
 import Draggable from "vuedraggable";
@@ -339,7 +339,7 @@ import Draggable from "vuedraggable";
 const router = useRouter()
 const useRoutes = useRoute()
 const useAppState = useAppStore()
-const {getObjValue, getArrValue} = isType()
+const {getObjValue, getArrValue, getObjNullValue} = isType()
 
 //全局变量
 const projectId = ref(useAppState.getProjectId);
@@ -1096,14 +1096,19 @@ const ListItemsRef = ref(null)
 //保存
 const tableFormSaveLoading = ref(false)
 const tableFormSaveClick = async () => {
-    let FormData = [];
+    let FormData = [], FormRegExpJson = {};
     if (isDrawer.value) {
         FormData = ListItemsRef.value.getFormData()
+        FormRegExpJson = ListItemsRef.value.getFormRegExpJson()
     } else {
         FormData = ListItemRef.value.getFormData()
+        FormRegExpJson = ListItemRef.value.getFormRegExpJson()
     }
-    console.log(FormData)
-    if (FormData.length > 0) {
+    clog('FormData', '表单列表数据', FormData, '客户端')
+    clog('FormRegExpJson', '表单效验数据', FormRegExpJson, '客户端')
+    if (getObjNullValue(FormRegExpJson)) {
+
+    } else if (FormData.length > 0) {
         tableFormSaveLoading.value = true
         const {error, code} = await wbsApi.saveExcelBussData({
             dataInfo: {orderList: FormData}