diff --git a/src/views/final/comp/CustomTabelModal.vue b/src/views/final/comp/CustomTabelModal.vue index 8ba3be8..d0d6a8b 100644 --- a/src/views/final/comp/CustomTabelModal.vue +++ b/src/views/final/comp/CustomTabelModal.vue @@ -39,6 +39,7 @@ onMounted(async () => { */ const userFieldFixed = useList.userFieldFixed?.split(","); const userFieldUnFixed = useList.userFieldUnFixed?.split(","); + let mustList = []; allList?.map((v) => { let item = { name: v.fieldDesc, @@ -49,8 +50,9 @@ onMounted(async () => { Boolean(userFieldFixed?.find((v2) => v2 == v.name)) || Boolean(userFieldUnFixed?.find((v2) => v2 == v.name)), }; + if (item.fix) { + mustList.push(item); if (!userFieldFixed?.length && !userFieldUnFixed?.length) { - if (item.fix) { fixLeftList.value.push(item); } } @@ -62,6 +64,7 @@ onMounted(async () => { } offList.value.push(item); }); + }); const allCount = computed(() => { diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue index a7c36b2..429f307 100644 --- a/src/views/final/content/Content.vue +++ b/src/views/final/content/Content.vue @@ -156,6 +156,8 @@ async function getColumns() { const useList = res.data; const userFieldFixed = useList.userFieldFixed?.split(","); const userFieldUnFixed = useList.userFieldUnFixed?.split(","); + console.log(userFieldFixed,userFieldUnFixed,'userFieldUnFixed') + console.log(allList,'allList') allList?.map((v) => { if (!userFieldFixed?.length && !userFieldUnFixed?.length) { if (v.isrequired == 2) { @@ -200,7 +202,7 @@ async function getColumns() { }, }); - // 处理特殊数据 + // TODO处理特殊字段 let index; index = columnsRef.value.findIndex((v) => v.title == "任务名称"); if (index > -1) {