修改

src/api/modules/agree/land.js

@@ -3,7 +3,7 @@ export default {
         //获取补偿协议表单（新增
         async addGetTables(form, msg = true) {
             return httpApi({
-                url: '/api/blade-land/compensationInfo/addGetTables',
+                url: '/api/blade-land/compensationInfo/add',
                 method: 'get',
                 params: form,
             }, msg)

src/views/agree/land/collapse-form/form-item.vue

@@ -52,22 +52,21 @@ const props = defineProps({
         type: Object,
         default: () => ({}),
     },
-    nodeName: { // 表单名称
-        type: String,
-        default: '',
-    },
+   
     pid: { // 折叠ID
         type: String,
         default: '',
     },
-    nodeType:{
-        type:[String, Number],
-        default: '', //表单节点类型
-    },
+ 
     tableId:{
         type: [String, Number],
         default: '', //表单initTableId
     },
+    agreementId:{
+        type: [String, Number],
+        default: '', //协议ID
+    },
+
    
 })
 
@@ -79,17 +78,18 @@ const projectId = ref(useAppState.getProjectId)
 const contractId = ref(useAppState.getContractId)
 const keyId = ref(props.kid ? props.kid + '' : '')
 const areaId = ref(props.areaId)
+const agreementId = ref(props.agreementId)
 const classify = ref(props.classify)
 const loading = ref(false)
 const changeData = ref(props.datas)
-const nodeNames = ref(props.nodeName)
+
 
 const heights = ref(props.height)
 const widths = ref(props.width)
 const activeKey = ref(props.pid)
 
 const tableFormRef = ref(null)
-const nodeType = ref(props.nodeType)
+
 const tableId = ref(props.tableId)
 
 //监听
@@ -103,22 +103,24 @@ watch(() => [
     props.height,
     props.width,
     props.pid,
-    props.nodeType,
+
     props.tableId,
+    props.agreementId,
 ], (
-    [project_id, contract_id, area_id, key_id, cid, nodeName, height, width, pid, node_type, table_id],
+    [project_id, contract_id, area_id, key_id, cid, height, width, pid, , table_id, aeement_id],
 ) => {
     projectId.value = project_id
     contractId.value = contract_id
     areaId.value = area_id
     keyId.value = key_id ? key_id + '' : ''
     classify.value = cid
-    nodeNames.value = nodeName
+  
     heights.value = height
     widths.value = width
     activeKey.value = pid
-    nodeType.value = node_type
+
     tableId.value = table_id
+    agreementId.value = aeement_id
 })
 
 //深度监听变动的对象数据
@@ -156,14 +158,14 @@ const getFormDataInit = () => {
         // pkeyId: keyId.value,
         // nodeId: treeId.value,
         // isRenderForm: false,
-        pkeyId: keyId.value,
-        agreementId:'', //	协议的id,新增协议为null
+    
+        agreementId: agreementId.value, //	协议的id,新增协议为null
         areaId:areaId.value, //当前树节点id
-        linkId:'', //当前表单的id,
         projectId: projectId.value,
         tableId:tableId.value, //表单的tableId
         isRenderForm: false,
-        nodeType:nodeType.value,
+        linkId: keyId.value,
+    
     }
 }
 
@@ -172,7 +174,7 @@ const tableFormInfo = ref({})
 const getTableFormInfo = async (pkeyId) => {
     if (pkeyId) {
         const { error, code, data } = await landApi.getBussInfo({
-            linkId: pkeyId,
+            id: pkeyId,
         }, false)
         const resData = getObjVal(data)
         if (!error && code === 200 && resData) {
@@ -198,8 +200,8 @@ const colsKeys = ref([])
 const getHtmlBussColsApi = async (pkeyId) => {
     if (pkeyId) {
         const { error, code, data } = await landApi.getBussCols({
-            pkeyId: pkeyId,
-            type:classify.value,
+            id: pkeyId,
+       
         }, false)
         if (!error && code === 200) {
             let keys = getArrValue(data)
@@ -222,8 +224,7 @@ const excelHtml = ref('')
 const getExcelHtml = async (pkeyId) => {
     if (pkeyId) {
         const { error, code, data } = await landApi.getExcelHtml({
-            pkeyId: pkeyId,
-            type:classify.value,
+            id: pkeyId,
         }, false)
         const resData = isString(data) ? data || '' : ''
         if (!error && code === 200 && resData) {
@@ -255,7 +256,6 @@ const tableFormRightTap = (item) => {
 const setFormChangeData = (data) => {
     const form = deepClone(tableFormInfo.value)
     tableFormInfo.value = { ...form, ...data }
-    //console.log('设置数据', {...form, ...data})
 }
 
 const getFormData = () => {
@@ -276,10 +276,7 @@ const isFormRegExp = async () => {
     return await tableFormRef.value?.isFormRegExp()
 }
 
-//获取表单名称
-const getNodeName = () => {
-    return nodeNames.value
-}
+
 
 //按下ctrl键
 const setIsCtrlKey = (data) => {
@@ -302,7 +299,7 @@ defineExpose({
     setFormData,
     getRegExpJson,
     isFormRegExp,
-    getNodeName,
+
     setIsCtrlKey,
     setCopyKeyList,
     setPasteKeyList,

src/views/agree/land/collapse-form/index.vue

@@ -1,12 +1,12 @@
 <template>
     <div class="data-fill-list-box">
         <el-collapse v-model="ActiveKey" accordion @change="CollapseChange">
-            <template v-for="(item, index) in listDatas" :key="item?.pKeyId">
-                <el-collapse-item :id="`item-${index}-${item?.pKeyId}`" :name="`item-${index}-${item?.pKeyId}`">
+            <template v-for="(item, index) in listDatas" :key="item?.id">
+                <el-collapse-item :id="`item-${index}-${item?.id}`" :name="`item-${index}-${item?.id}`">
                     <template #title>
                         <div class="hc-collapse-item-header">
                             <div class="text-lg truncate item-title">
-                                {{ item.nodeName }}
+                                {{ item.tableName }}
                             </div>
                             <div class="hc-extra-text-box">
                                 <el-button :loading="copyClickLoading" plain type="primary" @click.stop="copyClick(item, index)">
@@ -20,14 +20,14 @@
                             v-if="item.isTableRender"
                             :ref="(el) => setItemRefs(el, item)"
                             :classify="classifys"
-                            :datas="changeFormDatas(item?.pKeyId, 'collapse')"
-                            :kid="item?.pKeyId"
+                            :datas="changeFormDatas(item?.id, 'collapse')"
+                            :kid="item?.id"
                             :node-name="item.nodeName"
                             :node-type="item.nodeType"
-                            :pid="`table-form-${item?.pKeyId}`"
+                            :pid="`table-form-${item?.id}`"
                             :area-id="areaId"
-                            :table-id="item.initTableId"
-                            
+                            :table-id="item.tableId"
+                            :agreement-id="agreementId"
                             style="width: 100%;"
                             @excelBodyTap="excelTableFormClick($event)"
                             @render="tableFormRender($event, item, index)"
@@ -127,14 +127,14 @@ const formparentId = ref('')
 
 //处理ref
 const itemRefs = ref([])
-const setItemRefs = (el, { pKeyId }) => {
+const setItemRefs = (el, { id }) => {
     if (el) {
-        let index = arrIndex(itemRefs.value, 'pKeyId', pKeyId)
+        let index = arrIndex(itemRefs.value, 'pKeyId', id)
         if (index !== -1) {
             itemRefs.value[index].ref = el
         } else {
             itemRefs.value.push({
-                pKeyId: pKeyId,
+                pKeyId: id,
                 ref: el,
             })
         }
@@ -241,7 +241,7 @@ const CollapseChange = (name) => {
     if (index > -1) {
         getOffsetTop(name)
         const item = listDatas.value[index]
-        formKeyIds.value = setToString(item.pKeyId)
+        formKeyIds.value = setToString(item.id)
         formparentId.value = setToString(item.parentId)
     
         nextTick(() => {
@@ -1048,7 +1048,7 @@ const setOnFuncFormRef = async () => {
 const getFilterFormData = async () => {
     const formArr = formDataList.value
     return formArr.filter((item) => {
-        return (item.pkeyId ?? '') !== '' && item.isCollapseLoad
+        return (item.linkId ?? '') !== '' && item.isCollapseLoad
     })
 }
 
@@ -1058,12 +1058,12 @@ const getFormData = async () => {
     //获取表单数据
     let newArr = []
     for (let i = 0; i < formArr.length; i++) {
-        const pkeyId = formArr[i].pkeyId
+        const pkeyId = formArr[i].linkId
         const refs = await getFormRef(pkeyId)
         const form = refs?.getFormData()
         newArr.push({ ...form })
     }
-    console.log('表单数据', newArr)
+    console.log('表单数据1111', newArr)
     return newArr
 }
 
@@ -1074,7 +1074,7 @@ const getFormRegExpJson = async () => {
     //获取表单数据
     let formRegExpJson = {}
     for (let i = 0; i < formArr.length; i++) {
-        const pKeyId = formArr[i].pKeyId
+        const pKeyId = formArr[i].linkId
         const refs = await getFormRef(pKeyId)
         const regExp = refs?.getRegExpJson()
         const nodeName = refs?.getNodeName()

src/views/agree/land/form.vue

@@ -11,7 +11,7 @@
                 :primary-key-id="0"
                 :status="0"
                 :area-id="areaId"
-                :agreement-id="dataId"
+                :agreement-id="agreementId"
             />
             <HcStatus text="暂无表单" />
         </el-scrollbar>
@@ -55,15 +55,15 @@ const useRoutes = useRoute()
 
 //初始变量
 const dataType = ref(useRoutes?.query?.type ?? 'view')
-const dataId = ref(useRoutes?.query?.id ?? '')
+const agreementId = ref(useRoutes?.query?.id ?? '')
 const areaId = ref(useRoutes?.query?.areaId ?? '')
 
 //缓存页面被激活时
 onActivated(() => {
     dataType.value = useRoutes?.query?.type ?? 'view'
-    dataId.value = useRoutes?.query?.id ?? ''
+    agreementId.value = useRoutes?.query?.id ?? ''
     areaId.value = useRoutes?.query?.areaId ?? ''
-    if (dataId.value.length > 0) {
+    if (agreementId.value.length > 0) {
         updateGetTablesData()
     } else {
         searchNodeAllTable()
@@ -83,29 +83,30 @@ const goBackClick = () => {
 const ListItemsRef = ref(null)
 const ListItemDatas = ref([])
 const ListItemLoading = ref(false)
-//新增获取表单列表
+
+//新增获取表单列表id
 const searchNodeAllTable = async () => {
-    ListItemDatas.value = []
-    ListItemLoading.value = true
     const { error, code, data } = await landApi.addGetTables({
         projectId: projectId.value,
         type: 1,
+        areaId:areaId.value,
     
     })
     //处理数据
-    ListItemLoading.value = false
+
     if (!error && code === 200) {
-        ListItemDatas.value = getArrValue(data)
+        agreementId.value = data
+        updateGetTablesData(data)
     } else {
-        ListItemDatas.value = []
+        agreementId.value = ''
     }
 }
 //编辑获取表单列表
-const updateGetTablesData = async () => {
+const updateGetTablesData = async (id) => {
     ListItemDatas.value = []
     ListItemLoading.value = true
     const { error, code, data } = await landApi.updateGetTables({
-        agreementId:dataId.value,
+        agreementId:id,
     
     })
     //处理数据
@@ -125,7 +126,7 @@ const tableFormSaveClick = async () => {
     let FormData = []
         FormData = await ListItemRef.value?.getFormData()
     //效验数据
-    console.log(ListItemRef.value, 'ListItemRef.value')
+    console.log( FormData, ' FormData')
 
     if (FormData.length > 0) {
         console.log('保存')
@@ -140,7 +141,7 @@ const tableFormSaveClick = async () => {
         tableFormSaveLoading.value = false
         if (!error && code === 200) {
             window?.$message?.success('保存成功')
-            dataId.value = data
+            // dataId.value = data
             dataType.value = 2
              // await bussPdfsClick()
             updateGetTablesData()