|
@@ -994,7 +994,6 @@ const addingFormTreeProps = {
|
|
|
const addingFormTreeLoadNode = async (node, resolve) => {
|
|
|
if (node.level === 0) {
|
|
|
const resData = await tabTypeLazyTree()
|
|
|
- console.log(resData)
|
|
|
resolve(resData)
|
|
|
} else {
|
|
|
resolve([])
|
|
@@ -1013,10 +1012,13 @@ const addingFormTreeClick = async (data) => {
|
|
|
//搜索
|
|
|
const searchTreeTitle = ref('')
|
|
|
const querySearchTree = async (key, resolve) => {
|
|
|
- const primaryKeyId = addingFormTreeItem.value?.primaryKeyId ?? ''
|
|
|
- const resData = await tabTypeLazyTree(primaryKeyId, key)
|
|
|
- console.log(resData)
|
|
|
- resolve(resData)
|
|
|
+ if(key) {
|
|
|
+ const primaryKeyId = addingFormTreeItem.value?.primaryKeyId ?? ''
|
|
|
+ const resData = await tabTypeLazyTree(primaryKeyId, key)
|
|
|
+ resolve(resData)
|
|
|
+ } else{
|
|
|
+ resolve([])
|
|
|
+ }
|
|
|
}
|
|
|
const searchTreeSelect = (item) => {
|
|
|
dialogTableRef.value?.clearSelection()
|
|
@@ -1026,7 +1028,7 @@ const searchTreeSelect = (item) => {
|
|
|
searchFormPage.value.total = 0
|
|
|
}
|
|
|
|
|
|
-//搜索
|
|
|
+//分页
|
|
|
const searchFormPage = ref({current: 1, size: 20, total: 0})
|
|
|
const searchFormPageChange = ({current, size}) => {
|
|
|
searchFormPage.value.current = current
|
|
@@ -1051,13 +1053,12 @@ const getDialogTableData = async () => {
|
|
|
const primaryKeyId = addingFormTreeItem.value?.primaryKeyId ?? ''
|
|
|
const searchTitle = searchTreeTitle.value ?? ''
|
|
|
//获取数据
|
|
|
- const resData = await tabTypeLazyTree(primaryKeyId, searchTitle, true)
|
|
|
+ const resData = await tabTypeLazyTree(primaryKeyId, searchTitle, true, true)
|
|
|
const records = getArrValue(resData?.records)
|
|
|
- console.log(records)
|
|
|
//处理返回的数据
|
|
|
dialogTableData.value = records
|
|
|
if (records.length > 0) {
|
|
|
- searchFormPage.value.total = data.total || 0
|
|
|
+ searchFormPage.value.total = resData.total || 0
|
|
|
} else {
|
|
|
searchFormPage.value.total = 0
|
|
|
}
|
|
@@ -1070,7 +1071,7 @@ const dialogTableSelection = (rows) => {
|
|
|
}
|
|
|
|
|
|
//获取数据
|
|
|
-const tabTypeLazyTree = async (parentId = '12345678910', titleName = '', search = false) => {
|
|
|
+const tabTypeLazyTree = async (parentId = '12345678910', titleName = '', search = false, table = false) => {
|
|
|
let obj = {}, searchObj = {}
|
|
|
if(parentId) obj.parentId = parentId
|
|
|
if(titleName) obj.titleName = titleName
|
|
@@ -1082,11 +1083,15 @@ const tabTypeLazyTree = async (parentId = '12345678910', titleName = '', search
|
|
|
...obj,
|
|
|
...searchObj
|
|
|
})
|
|
|
- const resData = getArrValue(data)
|
|
|
- resData.forEach(item => {
|
|
|
- item.isLeaf = true
|
|
|
- })
|
|
|
- return resData
|
|
|
+ if (table) {
|
|
|
+ return data
|
|
|
+ } else {
|
|
|
+ const resData = getArrValue(data)
|
|
|
+ resData.forEach(item => {
|
|
|
+ item.isLeaf = true
|
|
|
+ })
|
|
|
+ return resData
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//保存
|