更新依赖

src/views/tentative/detect/components/ListItem.vue

@@ -223,7 +223,7 @@
         <LinkAcquisition v-if="isLinkAcquisition" v-model="linkAcquisitionLoadDataId" @change="linkAcquisitionChange" />
         <template #footer>
             <el-button @click="linksAcquisitionClose">取消</el-button>
-            <el-button hc-btn type="primary" @click="linksAcquisitionClick">确定</el-button>
+            <el-button hc-btn type="primary" :loading="linksAcquisitionLoading" @click="linksAcquisitionClick">确定</el-button>
         </template>
     </hc-new-dialog>
 </template>
@@ -252,7 +252,7 @@ import {
     formValidate,
     getArrValue,
     getObjVal,
-    getObjValue,
+    getObjValue, isNullES,
     isString,
     setPosInsert,
     setPosRange,
@@ -670,7 +670,7 @@ const changePositionInput = (infodata) => {
 }
 
 //获取已填写的数据
-const getBussDataInfo = async (item, index) => {
+const getBussDataInfo = async (item, index, loadDataId = null) => {
     const pkeyIds = getValString(item.pKeyId)
     const { contractId } = baseData.value
     if (pkeyIds) {
@@ -679,6 +679,7 @@ const getBussDataInfo = async (item, index) => {
             id: id || nodeIdvaluedata.value || newaddId.value,
             pkeyId: pkeyIds,
             contractId: contractId,
+            loadDataId: loadDataId,
         }, false)
         emit('changesingSaveId', pkeyIds)
         if (item.oper) {
@@ -686,6 +687,7 @@ const getBussDataInfo = async (item, index) => {
             formData.value[index] = {
                 ...item,
                 isCollapseLoad: true,
+                loadDataId: loadDataId,
             }
             getsampleData()
             getPositionData()
@@ -698,6 +700,7 @@ const getBussDataInfo = async (item, index) => {
                     formData.value[index] = {
                         ...resData, ...InitObj,
                         isCollapseLoad: true,
+                        loadDataId: loadDataId,
                     }
                     getsampleData()
                     getPositionData()
@@ -705,6 +708,7 @@ const getBussDataInfo = async (item, index) => {
                     formData.value[index] = {
                         ...getFormDataInit(item),
                         isCollapseLoad: true,
+                        loadDataId: loadDataId,
                     }
                     getsampleData()
                     getPositionData()
@@ -712,6 +716,7 @@ const getBussDataInfo = async (item, index) => {
             })
         }
         chartKey.value = formData.value[index].formchartKeyShow
+        console.log(formData.value[index])
     } else {
         window?.$message?.warning('pkeyId为空')
     }
@@ -1693,8 +1698,25 @@ const actionTipModalClose = () => {
 const isLinkAcquisition = ref(false)
 const linkAcquisitionLoadDataId = ref('')
 const linkAcquisitionIndex = ref(-1)
-const linkAcquisitionClick = ({ loadDataId }, index) => {
-    linkAcquisitionLoadDataId.value = loadDataId
+const linkAcquisitionRow = ref({})
+const linkAcquisitionClick = (item, index) => {
+    const pKeyId = getValString(item.pKeyId)
+    if (isNullES(pKeyId)) {
+        window?.$message?.warning('pkeyId为空')
+        return
+    }
+    const keyName = `item-${index}-${pKeyId}`
+    if (!item.isRenderTableForm) {
+        CollapseChange(keyName)
+        window?.$message?.warning('请再次点击上传')
+        return
+    }
+    if (!item.isTableForm) {
+        window?.$message?.warning('暂无表单数据')
+        return
+    }
+    linkAcquisitionRow.value = item
+    linkAcquisitionLoadDataId.value = item.loadDataId
     linkAcquisitionIndex.value = index
     isLinkAcquisition.value = true
 }
@@ -1704,17 +1726,25 @@ const linkAcquisitionChange = (id) => {
 }
 
 //确定
-const linksAcquisitionClick = () => {
+const linksAcquisitionLoading = ref(false)
+const linksAcquisitionClick = async () => {
+    linksAcquisitionLoading.value = true
+    const item = linkAcquisitionRow.value
     const index = linkAcquisitionIndex.value
-    const id = linkAcquisitionLoadDataId.value
-    listDatas.value[index].loadDataId = id
-    formData.value[index].loadDataId = id
+    const dataId = linkAcquisitionLoadDataId.value
+    await getBussDataInfo(item, index, dataId)
+    //listDatas.value[index].loadDataId = id
+    //formData.value[index].loadDataId = id
     linksAcquisitionClose()
 }
 
 //关闭关联
 const linksAcquisitionClose = () => {
-  isLinkAcquisition.value = false
+    isLinkAcquisition.value = false
+    linkAcquisitionRow.value = {}
+    linkAcquisitionLoadDataId.value = null
+    linkAcquisitionIndex.value = -1
+    linksAcquisitionLoading.value = false
 }
 
 // 暴露出去