Merge remote-tracking branch 'origin/master'

src/views/project/debit/project/pay.vue

@@ -304,19 +304,20 @@ const tableCollectColumn = ref([
     { key: 'payTypeName', name: '支付项类型' },
     { key: 'isDeduct', name: '是否为扣款项' },
     { key: 'isTotalTerms', name: '是否合计项' },
-    { key: 'payApplicableType', name: '支付项适用类型' },
+    { key: 'payApplicableTypeName', name: '支付项适用类型' },
 ])
 const tableCollectData = ref([])
 const tableCollectLoading = ref(false)
 const getTableCollectData = async () => {
     tableCollectLoading.value = true
-    const { error, code, data } = await payApi.getProPayList({
-       type:0,
+    const { error, code, data } = await payApi.getProListPage({
+       type:1,
        projectId:projectId.value,
+       current: 1, size: 10000,
     })
     tableCollectLoading.value = false
     if (!error && code === 200) {
-        tableCollectData.value = getArrValue(data)
+        tableCollectData.value = getArrValue(data['records'])
       
     } else {
         tableCollectData.value = []

src/views/project/debit/project/unit.vue

@@ -203,7 +203,11 @@ const treeMenuTap = ({ key, node, data, keys }) => {
         treeModalTitle.value = '新增下级节点'
         treeModalShow.value = true
         formModel.value = {}
-        getEngineerName(data.id)
+        const { level } = node
+        if (level >= 3) {
+            getEngineerName(data.id)
+        }
+        
         formModel.value.nodeType = data.nodeType
         formModel.value.parentId = data.id
         formModel.value.ancestor = data.ancestor
@@ -239,7 +243,7 @@ const getEngineerName = async (id)=>{
        id,
     })
     if (!error && code === 200) {
-        formModel.value.engineeringTypeName = getObjVal(data) ? data : ''
+        formModel.value.engineeringTypeName = data || ''
    
     } else {
         formModel.value.engineeringTypeName = ''
@@ -259,7 +263,7 @@ const tableColumn = ref([
     { key: 'nodeCode', name: '节点编号' },
     { key: 'nodeName', name: '节点名称' },
     { key: 'nodeTypeName', name: '节点类型' },
-    { key: 'engineeringType', name: '工程类型' },
+    { key: 'engineeringTypeName', name: '工程类型' },
 ])
 const tableData = ref([])