From 44c3c50a0e802f6be20eb795824496691342db9d Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sun, 17 Mar 2024 18:27:58 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/comp/CustomFilterModalVue.vue |  6 +--
 src/views/final/comp/CustomTabelModal.vue     | 48 ++++++++++++++++--
 src/views/final/content/Content.vue           | 22 ++++----
 src/views/home/aside/comp/AdvanceFilter.vue   |  8 +--
 src/views/task/content/Content.vue            |  2 +-
 src/views/task/modal/CustomSettingModal.vue   | 50 ++++++++++++++++++-
 .../worksheet/modal/CustomFieldModal.vue      |  8 ++-
 7 files changed, 113 insertions(+), 31 deletions(-)

diff --git a/src/views/final/comp/CustomFilterModalVue.vue b/src/views/final/comp/CustomFilterModalVue.vue
index 1d8a67c..4539cbc 100644
--- a/src/views/final/comp/CustomFilterModalVue.vue
+++ b/src/views/final/comp/CustomFilterModalVue.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup>
-import { computed, ref, watch } from 'vue'
-import { VueDraggable } from 'vue-draggable-plus'
-import { debounce, difference } from 'lodash-es'
 import { setFilter } from '@/api/home/filter'
 import { asideMap } from '@/config/final'
 import { useFinal } from '@/store/modules/final'
+import { debounce, difference } from 'lodash-es'
+import { computed, ref, watch } from 'vue'
+import { VueDraggable } from 'vue-draggable-plus'
 
 const show = ref(false)
 const checkAll = ref(false)
diff --git a/src/views/final/comp/CustomTabelModal.vue b/src/views/final/comp/CustomTabelModal.vue
index fedcdfd..fa7238e 100644
--- a/src/views/final/comp/CustomTabelModal.vue
+++ b/src/views/final/comp/CustomTabelModal.vue
@@ -1,8 +1,10 @@
 <script lang="ts" setup>
-import { computed, ref, watch } from 'vue'
-import { difference } from 'lodash-es'
-import { VueDraggable } from 'vue-draggable-plus'
-import { ColumnsMap } from '@/config/final'
+import { getAllfieldList, getfieldList } from "@/api/home/filter";
+import { ColumnsMap } from '@/config/final';
+import { useUser } from "@/store/modules/user";
+import { difference } from 'lodash-es';
+import { computed, onMounted, ref, watch } from 'vue';
+import { VueDraggable } from 'vue-draggable-plus';
 
 const emit = defineEmits<{
   (e: 'commit', columns: any[])
@@ -13,6 +15,42 @@ const offList = ref<any[]>([])
 // 右侧显示列表
 const fixLeftList = ref<any[]>([])
 const onList = ref<any[]>([])
+  const props = defineProps({
+  reviewType: {
+    type: Number,
+    default: () => 0,
+    require: true,
+  },
+})
+
+onMounted(async()=>{
+  const userStore = useUser();
+  const userInfo = userStore.getUserInfo;
+  let res;
+  res = await getAllfieldList(props.reviewType); //所有筛选项目
+  const allList = res.data;
+  res = await getfieldList(props.reviewType, userInfo.id); //当前用户选择的项目
+  const useList = res.data;
+  console.log(allList,useList,'useList')
+  /**
+   * name 标题
+   * id 键值
+   * fix 是否默认
+   * checked 是否选中
+   */
+
+  allList.map((v) => {
+    let item = {
+      name: v.fieldDesc,
+      id: v.name,
+      fix: v.isrequired == 2,
+      checked:
+        v.isrequired == 2 ||
+        Boolean(useList.userField?.toLowerCase().indexOf(v.name)>-1),
+    };
+    offList.value.push(item)
+  });
+})
 
 const allCount = computed(() => {
   return `全部字段(共${offList.value.length - 1}个)`
@@ -129,7 +167,7 @@ defineExpose({
   showModal,
 })
 
-generatList()
+// generatList()
 
 const selectIds = ref<string[]>([])
 
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 4cf33b9..e8d5894 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -1,19 +1,19 @@
 <script lang="ts" setup>
-import { computed, h, nextTick, onMounted, reactive, ref, unref } from 'vue'
-import { NDataTable, useDialog, useMessage } from 'naive-ui'
-import type { DataTableColumns, DataTableRowKey, PaginationProps } from 'naive-ui'
-import { Action, CustomTabelModal, ImportExcelModal, RepeatModal, RepeatTaskTableModal } from '../comp'
-import ConfrimModal from '@/views/task/modal/ConfrimModal.vue'
-import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
-import { getViewportOffset } from '@/utils/domUtils'
+import { getFinalList } from '@/api/final'
+import { audit } from '@/api/task/task'
+import SvgIcon from '@/components/Icon/SvgIcon.vue'
 import type { RowData } from '@/config/final'
 import { findKey, headRules } from '@/config/final'
-import { getFinalList } from '@/api/final'
-import { isBoolean } from '@/utils/is'
+import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
 import { useUser } from '@/store/modules/user'
+import { getViewportOffset } from '@/utils/domUtils'
+import { isBoolean } from '@/utils/is'
+import ConfrimModal from '@/views/task/modal/ConfrimModal.vue'
+import type { DataTableColumns, DataTableRowKey, PaginationProps } from 'naive-ui'
+import { NDataTable, useDialog, useMessage } from 'naive-ui'
+import { computed, h, nextTick, onMounted, reactive, ref, unref } from 'vue'
+import { Action, CustomTabelModal, ImportExcelModal, RepeatModal, RepeatTaskTableModal } from '../comp'
 import type { ApprovalParam } from '/#/api'
-import { audit } from '@/api/task/task'
-import SvgIcon from '@/components/Icon/SvgIcon.vue'
 
 const columns: DataTableColumns<RowData> = [
   {
diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue
index 3adf9cd..d8c7b17 100644
--- a/src/views/home/aside/comp/AdvanceFilter.vue
+++ b/src/views/home/aside/comp/AdvanceFilter.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup>
-import { onMounted, reactive, ref } from 'vue'
+import { favorite, getConditionList, unfavorite } from '@/api/home/filter'
+import { asideMap } from '@/config/aside'
 import { useInfiniteScroll } from '@vueuse/core'
 import { debounce } from 'lodash-es'
-import { asideMap } from '@/config/aside'
-import { favorite, getConditionList, unfavorite } from '@/api/home/filter'
-import type { Filter, FilterEntity } from '/#/home'
+import { onMounted, reactive, ref } from 'vue'
 import type { FilterSearchParam } from '/#/api'
+import type { Filter, FilterEntity } from '/#/home'
 
 defineOptions({ name: 'AdvanceFilter' })
 
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index bc550e5..3926353 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -391,7 +391,7 @@ function previewHandler(event: MouseEvent) {
     </n-tabs>
     <ConfrimModal ref="confrimModalRef" @commit="reject" />
     <BatchModal ref="batchModalRef" @reject="rejectHandler" @approval="approvalHandler" />
-    <CustomSettingModal ref="CustomSettingModalRef" />
+    <CustomSettingModal ref="CustomSettingModalRef" :reviewType="3"/>
   </div>
 </template>
 
diff --git a/src/views/task/modal/CustomSettingModal.vue b/src/views/task/modal/CustomSettingModal.vue
index 9ddd05c..5e5dd78 100644
--- a/src/views/task/modal/CustomSettingModal.vue
+++ b/src/views/task/modal/CustomSettingModal.vue
@@ -1,6 +1,43 @@
 <script lang="ts" setup>
+import { getAllfieldList, getfieldList, savefield } from "@/api/home/filter";
 import { ReportInfoConfig } from "@/config/workorder";
-import { ref } from "vue";
+import { useUser } from "@/store/modules/user";
+import { defineProps, onMounted, ref } from "vue";
+
+const props = defineProps({
+  reviewType: {
+    type: Number,
+    default: () => 3,
+    require: true,
+  },
+})
+onMounted(async () => {
+  const userStore = useUser();
+  const userInfo = userStore.getUserInfo;
+  let res;
+  res = await getAllfieldList(props.reviewType); //所有筛选项目
+  const allList = res.data;
+  res = await getfieldList(props.reviewType, userInfo.id); //当前用户选择的项目
+  const useList = res.data;
+  /**
+   * name 标题
+   * id 键值
+   * fix 是否默认
+   * checked 是否选中
+   */
+
+  allList.map((v) => {
+    let item = {
+      name: v.fieldDesc,
+      id: v.name,
+      fix: v.isrequired == 2,
+      checked:
+        v.isrequired == 2 ||
+        Boolean(useList.userField?.toLowerCase().indexOf(v.name)>-1),
+    };
+    offList.value.push(item)
+  });
+});
 
 const offList = ref<any[]>([]);
 function generatList() {
@@ -59,6 +96,15 @@ function closeModal() {
 }
 
 async function handleSumbit(e: MouseEvent) {
+  const userStore = useUser();
+  const userInfo = userStore.getUserInfo;
+  let userField = "";
+  offList.value.map((v) => {
+    if(v.checked){
+      userField += `${v.id},`;
+    }
+  });
+  savefield(props.reviewType, userInfo.id, userField);
   e.preventDefault();
   closeModal();
 }
@@ -67,7 +113,7 @@ defineExpose({
   showModal,
 });
 
-generatList();
+// generatList();
 
 const selectIds = ref<string[]>([]);
 
diff --git a/src/views/worksheet/modal/CustomFieldModal.vue b/src/views/worksheet/modal/CustomFieldModal.vue
index d8402d9..f3322e5 100644
--- a/src/views/worksheet/modal/CustomFieldModal.vue
+++ b/src/views/worksheet/modal/CustomFieldModal.vue
@@ -100,11 +100,9 @@ function closeModal() {
 async function handleSumbit(e: MouseEvent) {
   const userStore = useUser();
   const userInfo = userStore.getUserInfo;
-  console.log(onList.value, "onList");
-  console.log(offList.value, "offList");
   let userField = "";
-  onList.value.map((v, index) => {
-    userField += `${v.id}${index == onList.value.length - 1 ? "" : ","}`;
+  onList.value.map((v) => {
+    userField += `${v.id},`;
   });
   savefield(props.reviewType, userInfo.id, userField);
   e.preventDefault();
@@ -240,7 +238,7 @@ onMounted(async () => {
       fix: v.isrequired == 2,
       checked:
         v.isrequired == 2 ||
-        Boolean(useList.userField?.toLowerCase().indexOf(v.name)),
+        Boolean(useList.userField?.toLowerCase().indexOf(v.name)>-1),
     };
     if (item.checked) {
       onList.value.push(item);