|
@@ -299,7 +299,7 @@ import HcTreeData from "./components/division/HcTreeData.vue"
|
|
import HcTreeData1 from "./components/division/HcTreeData1.vue"
|
|
import HcTreeData1 from "./components/division/HcTreeData1.vue"
|
|
import DivisionTree from "./components/division/DivisionTree.vue"
|
|
import DivisionTree from "./components/division/DivisionTree.vue"
|
|
import HcTreeNode from "./components/HcTreeNode.vue"
|
|
import HcTreeNode from "./components/HcTreeNode.vue"
|
|
-import {isType, getIndex, deepClone, formValidate} from "vue-utils-plus"
|
|
|
|
|
|
+import {isType, getIndex, deepClone, formValidate, utilsArray } from "vue-utils-plus"
|
|
import {getStoreData, setStoreData} from '~src/utils/storage'
|
|
import {getStoreData, setStoreData} from '~src/utils/storage'
|
|
import {getDictionary} from "~api/other"
|
|
import {getDictionary} from "~api/other"
|
|
import wbsApi from "~api/data-fill/wbs";
|
|
import wbsApi from "~api/data-fill/wbs";
|
|
@@ -311,6 +311,7 @@ const router = useRouter()
|
|
const useRoutes = useRoute()
|
|
const useRoutes = useRoute()
|
|
const useAppState = useAppStore()
|
|
const useAppState = useAppStore()
|
|
const {getObjValue, getArrValue} = isType()
|
|
const {getObjValue, getArrValue} = isType()
|
|
|
|
+const { isIndex } = utilsArray()
|
|
|
|
|
|
//全局变量
|
|
//全局变量
|
|
const projectId = ref(useAppState.getProjectId);
|
|
const projectId = ref(useAppState.getProjectId);
|
|
@@ -1045,13 +1046,18 @@ const addingFormTreeLoadNode = async (node, resolve) => {
|
|
|
|
|
|
//树被点击
|
|
//树被点击
|
|
const addingFormTreeItem = ref({})
|
|
const addingFormTreeItem = ref({})
|
|
|
|
+const selectItems=ref([])
|
|
|
|
+const selectItem=ref({})
|
|
|
|
+const selectIds=ref([])
|
|
const addingFormTreeClick = async (data, node) => {
|
|
const addingFormTreeClick = async (data, node) => {
|
|
searchTreeTitle.value = ''
|
|
searchTreeTitle.value = ''
|
|
addingFormTreeItem.value = data
|
|
addingFormTreeItem.value = data
|
|
dialogTableData.value = []
|
|
dialogTableData.value = []
|
|
searchFormPage.value.current = 1
|
|
searchFormPage.value.current = 1
|
|
|
|
+ console.log(addingFormTreeItem.value.primaryKeyId,'addingFormTreeItem.value');
|
|
if (node?.level === 1) {
|
|
if (node?.level === 1) {
|
|
getDialogTableData().then()
|
|
getDialogTableData().then()
|
|
|
|
+
|
|
} else if (node?.level === 2) {
|
|
} else if (node?.level === 2) {
|
|
searchFormPage.value.total = 1
|
|
searchFormPage.value.total = 1
|
|
dialogTableData.value = [data]
|
|
dialogTableData.value = [data]
|
|
@@ -1066,8 +1072,15 @@ const searchTreeTitle = ref('')
|
|
const querySearchTree = async (key, resolve) => {
|
|
const querySearchTree = async (key, resolve) => {
|
|
if(key) {
|
|
if(key) {
|
|
const primaryKeyId = addingFormTreeItem.value?.primaryKeyId ?? ''
|
|
const primaryKeyId = addingFormTreeItem.value?.primaryKeyId ?? ''
|
|
- const resData = await tabTypeLazyTree(primaryKeyId, key)
|
|
|
|
- resolve(resData?.data)
|
|
|
|
|
|
+ const size=100000
|
|
|
|
+ const { data } = await divisionApi.tabTypeLazyTree({
|
|
|
|
+ projectId: projectId.value,
|
|
|
|
+ contractId: contractId.value,
|
|
|
|
+ titleName:key,
|
|
|
|
+ current: 1,
|
|
|
|
+ size: 10000
|
|
|
|
+ })
|
|
|
|
+ resolve(data?.records)
|
|
} else{
|
|
} else{
|
|
resolve([])
|
|
resolve([])
|
|
}
|
|
}
|
|
@@ -1126,11 +1139,21 @@ const getDialogTableData = async () => {
|
|
//多选
|
|
//多选
|
|
const dialogTableKeys = ref([]);
|
|
const dialogTableKeys = ref([]);
|
|
const dialogTableSelection = (rows) => {
|
|
const dialogTableSelection = (rows) => {
|
|
- dialogTableKeys.value = rows
|
|
|
|
|
|
+ console.log(rows,'rows');
|
|
|
|
+ dialogTableKeys.value = rows
|
|
|
|
+ // selectItem.value.rows=rows;
|
|
|
|
+ // selectItem.value.type=addingFormTreeItem.value.primaryKeyId
|
|
|
|
+ // console.log(rows,'rows');
|
|
|
|
+ // if(selectItem.value.rows.length>0){
|
|
|
|
+ // selectItems.value.push(selectItem.value)
|
|
|
|
+ // var newArr = [...new Set(selectItems.value)];
|
|
|
|
+ // selectItems.value=newArr
|
|
|
|
+ // }
|
|
|
|
+ // setStoreData('selectItems',rows)
|
|
}
|
|
}
|
|
|
|
|
|
//获取数据
|
|
//获取数据
|
|
-const tabTypeLazyTree = async (parentId = '12345678910', titleName = '', search = false, form = {}) => {
|
|
|
|
|
|
+const tabTypeLazyTree = async (parentId = '12345678910', titleName = '', search = false, form = {},size) => {
|
|
let obj = {}, searchObj = {}
|
|
let obj = {}, searchObj = {}
|
|
if(parentId) obj.parentId = parentId
|
|
if(parentId) obj.parentId = parentId
|
|
if(titleName) obj.titleName = titleName
|
|
if(titleName) obj.titleName = titleName
|