From 6c734d297cffc2db8f160bca2ef5085f5f322070 Mon Sep 17 00:00:00 2001
From: zhouxiaoan <13598091228@139.com>
Date: Fri, 12 Apr 2024 01:59:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=20=20=20=20=E4=BC=98=E5=8C=96=E5=9B=BE?=
 =?UTF-8?q?=E9=89=B4=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/final/comp/CustomTabelModal.vue     | 345 ++++++++-------
 src/views/task/modal/CustomFieldModal.vue     | 416 +++++++++---------
 src/views/worksheet/content/Content.vue       |  39 +-
 .../worksheet/modal/CustomFieldModal.vue      | 343 ++++++++-------
 4 files changed, 602 insertions(+), 541 deletions(-)

diff --git a/src/views/final/comp/CustomTabelModal.vue b/src/views/final/comp/CustomTabelModal.vue
index 085ccd9..8361da7 100644
--- a/src/views/final/comp/CustomTabelModal.vue
+++ b/src/views/final/comp/CustomTabelModal.vue
@@ -1,97 +1,98 @@
 <script lang="ts" setup>
-import { getAllfieldList, getfieldList, savefield } 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";
+import { difference } from 'lodash-es'
+import { computed, onMounted, ref, watch } from 'vue'
+import { VueDraggable } from 'vue-draggable-plus'
+import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
+import { ColumnsMap } from '@/config/final'
+import { useUser } from '@/store/modules/user'
 
-const emit = defineEmits<{
-  (e: "commit", columns: any[]);
-}>();
-
-// 左侧隐藏列表
-const offList = ref<any[]>([]);
-// 右侧显示列表
-const fixLeftList = ref<any[]>([]);
-const onList = ref<any[]>([]);
 const props = defineProps({
   reviewType: {
     type: Number,
     default: () => 0,
     require: true,
   },
-});
+})
 
+const emit = defineEmits<{
+  (e: 'commit', columns: any[])
+}>()
+
+// 左侧隐藏列表
+const offList = ref<any[]>([])
+// 右侧显示列表
+const fixLeftList = ref<any[]>([])
+const onList = ref<any[]>([])
 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;
+  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 是否选中
    */
-  const userFieldFixed = useList.userFieldFixed?.split(",");
-  const userFieldUnFixed = useList.userFieldUnFixed?.split(",");
-  let mustList = [];
+  const userFieldFixed = useList.userFieldFixed?.split(',')
+  const userFieldUnFixed = useList.userFieldUnFixed?.split(',')
+  const mustList = []
   allList?.map((v) => {
-    let item = {
+    const item = {
       name: v.fieldDesc,
       id: v.name,
       fix: v.isrequired == 2,
       checked:
-        v.isrequired == 2 ||
-        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) {
-        fixLeftList.value.push(item);
-      }
-    }
-    if (userFieldFixed?.find((v2) => v2 == v.name)) {
-      fixLeftList.value.push(item);
+        v.isrequired == 2
+        || Boolean(userFieldFixed?.find(v2 => v2 == v.name))
+        || Boolean(userFieldUnFixed?.find(v2 => v2 == v.name)),
     }
-    if (userFieldUnFixed?.find((v2) => v2 == v.name)) {
-      onList.value.push(item);
+    if (item.fix) {
+      mustList.push(item)
+      if (!userFieldFixed?.length && !userFieldUnFixed?.length)
+        fixLeftList.value.push(item)
     }
-    offList.value.push(item);
-  });
-});
+    if (userFieldFixed?.find(v2 => v2 == v.name))
+      fixLeftList.value.push(item)
+
+    if (userFieldUnFixed?.find(v2 => v2 == v.name))
+      onList.value.push(item)
+
+    offList.value.push(item)
+  })
+})
 
 const allCount = computed(() => {
-  return `全部字段(共${offList.value.length - 1}个)`;
-});
+  return `全部字段(共${offList.value.length - 1}个)`
+})
 
 const selectCount = computed(() => {
-  return `显示字段(共${onList.value.length}个)`;
-});
+  return `显示字段(共${onList.value.length}个)`
+})
 
 function generatList() {
-  const keys = Object.keys(ColumnsMap);
+  const keys = Object.keys(ColumnsMap)
   // const showStr = 'name'
   // const showKeys = showStr.split(',').map((key: string) => key.toLowerCase())
 
   for (const key of keys) {
-    const { title, fixed, fixLeft, width } = ColumnsMap[key];
+    const { title, fixed, fixLeft, width } = ColumnsMap[key]
     const item = {
       id: key,
       title,
       fix: fixed,
       checked: ColumnsMap[key].fixed,
       width,
-    };
+    }
 
-    if (!fixed) offList.value.push(item);
+    if (!fixed)
+      offList.value.push(item)
 
-    if (fixLeft) fixLeftList.value.push(item);
+    if (fixLeft)
+      fixLeftList.value.push(item)
   }
 
   // showList = showKeys.reduce((acc, key) => {
@@ -103,18 +104,18 @@ function generatList() {
   //   return [...acc, config]
   // }, [])
 
-  const fixedList = generateDefaultList();
+  const fixedList = generateDefaultList()
   const filterList = fixedList.filter((item) => {
-    return !item.fixLeft;
-  });
+    return !item.fixLeft
+  })
 
-  onList.value.unshift(...filterList);
-  offList.value.unshift(...fixedList);
+  onList.value.unshift(...filterList)
+  offList.value.unshift(...fixedList)
 }
 
 function generateDefaultList() {
   return Object.keys(ColumnsMap).reduce((acc, key) => {
-    const { title, fixed, fixLeft, width } = ColumnsMap[key];
+    const { title, fixed, fixLeft, width } = ColumnsMap[key]
 
     if (fixed) {
       const config = {
@@ -124,115 +125,117 @@ function generateDefaultList() {
         checked: true,
         fixLeft,
         width,
-      };
-      return [...acc, config];
-    } else {
-      return acc;
+      }
+      return [...acc, config]
+    }
+    else {
+      return acc
     }
-  }, []);
+  }, [])
 }
 
-const show = ref(false);
-const checkAll = ref(false);
+const show = ref(false)
+const checkAll = ref(false)
 
 function showModal() {
-  show.value = true;
+  show.value = true
 }
 
 function closeModal() {
-  show.value = false;
+  show.value = false
 }
 
 async function handleSumbit(e: MouseEvent) {
-  e.preventDefault();
-  closeModal();
-  const userStore = useUser();
-  const userInfo = userStore.getUserInfo;
-  let userFieldFixed = "";
-  let userFieldUnFixed = "";
+  e.preventDefault()
+  closeModal()
+  const userStore = useUser()
+  const userInfo = userStore.getUserInfo
+  let userFieldFixed = ''
+  let userFieldUnFixed = ''
   fixLeftList.value.map((v) => {
-    userFieldFixed += `${v.id},`;
-  });
+    userFieldFixed += `${v.id},`
+  })
   onList.value.map((v) => {
-    userFieldUnFixed += `${v.id},`;
-  });
-  userFieldFixed = userFieldFixed.slice(0, userFieldFixed.length - 1);
-  userFieldUnFixed = userFieldUnFixed.slice(0, userFieldUnFixed.length - 1);
-  savefield(props.reviewType, userInfo.id, userFieldFixed, userFieldUnFixed);
+    userFieldUnFixed += `${v.id},`
+  })
+  userFieldFixed = userFieldFixed.slice(0, userFieldFixed.length - 1)
+  userFieldUnFixed = userFieldUnFixed.slice(0, userFieldUnFixed.length - 1)
+  savefield(props.reviewType, userInfo.id, userFieldFixed, userFieldUnFixed)
   const columns: any[] = [
     {
-      type: "selection",
-      fixed: "left",
+      type: 'selection',
+      fixed: 'left',
       width: 50,
     },
-  ];
+  ]
 
   const leftList = fixLeftList.value.map((item) => {
     return {
       title: item.name,
       key: item.id,
-      fixed: "left",
+      fixed: 'left',
       width: 120,
-    };
-  });
+    }
+  })
 
   const unfixList = onList.value.map((item) => {
     return {
       title: item.name,
       key: item.id,
       width: 120,
-    };
-  });
+    }
+  })
 
-  columns.push(...leftList, ...unfixList);
-  emit("commit", columns);
+  columns.push(...leftList, ...unfixList)
+  emit('commit', columns)
 }
 
 defineExpose({
   showModal,
-});
+})
 
 // generatList()
 
-const selectIds = ref<string[]>([]);
+const selectIds = ref<string[]>([])
 
 function onCheckAllChange(value) {
-  const ids: string[] = [];
+  const ids: string[] = []
   for (const item of offList.value) {
     if (!item.fix) {
-      item.checked = value;
-      ids.push(item.id);
+      item.checked = value
+      ids.push(item.id)
     }
   }
   if (value) {
     offList.value.map((v) => {
-      if (!v.checked) {
-        onList.value.push(v);
-      }
-    });
-  } else {
-    onList.value = [];
-    fixLeftList.value = [];
+      if (!v.checked)
+        onList.value.push(v)
+    })
+  }
+  else {
+    onList.value = []
+    fixLeftList.value = []
     offList.value.map((v) => {
-      if (v.fix) {
-        fixLeftList.value.push(v);
-      }
-    });
+      if (v.fix)
+        fixLeftList.value.push(v)
+    })
   }
-  selectIds.value = value ? ids : [];
+  selectIds.value = value ? ids : []
 }
 
 function onCheckChange(checked: any, item: any) {
-  item.checked = checked;
+  item.checked = checked
   if (checked) {
-    onList.value.push(item);
-  } else {
-    let index = onList.value.findIndex((v) => v.id == item.id);
+    onList.value.push(item)
+  }
+  else {
+    let index = onList.value.findIndex(v => v.id == item.id)
     if (index > -1) {
-      onList.value.splice(index, 1);
-    } else {
-      index = fixLeftList.value.findIndex((v) => v.id == item.id);
-      fixLeftList.value.splice(index, 1);
+      onList.value.splice(index, 1)
+    }
+    else {
+      index = fixLeftList.value.findIndex(v => v.id == item.id)
+      fixLeftList.value.splice(index, 1)
     }
   }
   // TODO 与现有逻辑冲突 暂时注释
@@ -242,24 +245,26 @@ function onCheckChange(checked: any, item: any) {
 
 const showIds = computed(() => {
   return onList.value.map((item) => {
-    return item.id;
-  });
-});
+    return item.id
+  })
+})
 
 watch(
   () => selectIds.value.length,
   (newVal, oldVal) => {
-    if (newVal === oldVal) return;
+    if (newVal === oldVal)
+      return
 
-    const action = newVal > oldVal ? "add" : "remove";
-    const diff: string[] =
-      action === "add"
+    const action = newVal > oldVal ? 'add' : 'remove'
+    const diff: string[]
+      = action === 'add'
         ? difference(selectIds.value, showIds.value)
-        : difference(showIds.value, selectIds.value);
+        : difference(showIds.value, selectIds.value)
 
-    if (diff.length === 0) return;
+    if (diff.length === 0)
+      return
 
-    if (action === "add") {
+    if (action === 'add') {
       for (const item of offList.value) {
         if (!item.fix && diff.includes(item.id)) {
           onList.value.push({
@@ -267,77 +272,81 @@ watch(
             name: item.name,
             fix: item.fix || false,
             width: 120,
-          });
+          })
         }
       }
-    } else {
-      const list = onList.value;
+    }
+    else {
+      const list = onList.value
       for (let index = 0; index < list.length; index++) {
-        const item = list[index];
+        const item = list[index]
         if (!item.fix && diff.includes(item.id)) {
-          list.splice(index, 1);
-          return;
+          list.splice(index, 1)
+          return
         }
       }
     }
-  }
-);
+  },
+)
 
 watch(
   () => showIds.value.length,
   (newVal, oldVal) => {
-    if (newVal === oldVal) return;
+    if (newVal === oldVal)
+      return
 
-    const diff = difference(selectIds.value, showIds.value);
+    const diff = difference(selectIds.value, showIds.value)
 
-    if (diff.length === 0) return;
+    if (diff.length === 0)
+      return
 
     for (const item of offList.value) {
       if (!item.fix && diff.includes(item.id)) {
-        const index = selectIds.value.indexOf(item.id);
-        item.checked = false;
-        selectIds.value.splice(index, 1);
+        const index = selectIds.value.indexOf(item.id)
+        item.checked = false
+        selectIds.value.splice(index, 1)
       }
     }
-  }
-);
+  },
+)
 
 function clearDragSource() {
   onList.value = onList.value.filter((item) => {
-    return item.fix === true;
-  });
+    return item.fix === true
+  })
 }
 
-function removeHandler(id: string, type: "fix" | "unfix") {
-  const list = type === "fix" ? fixLeftList.value : onList.value;
+function removeHandler(id: string, type: 'fix' | 'unfix') {
+  const list = type === 'fix' ? fixLeftList.value : onList.value
 
   let index = list.findIndex((item) => {
-    return item.id === id;
-  });
+    return item.id === id
+  })
 
-  if (index !== -1) list.splice(index, 1);
-  index = offList.value.findIndex((v) => v.id == id);
+  if (index !== -1)
+    list.splice(index, 1)
+  index = offList.value.findIndex(v => v.id == id)
   if (index !== -1) {
-    offList.value[index].checked = false;
-  } else {
-    index == fixLeftList.value.findIndex((v) => v.id == id);
-    fixLeftList.value[index].checked = false;
+    offList.value[index].checked = false
+  }
+  else {
+    index == fixLeftList.value.findIndex(v => v.id == id)
+    fixLeftList.value[index].checked = false
   }
 }
 
 const indeterminate = computed(() => {
-  let baseNum = 0;
+  let baseNum = 0
   offList.value.map((v) => {
-    if (v.fix) {
-      baseNum += 1;
-    }
-  });
+    if (v.fix)
+      baseNum += 1
+  })
   return (
-    onList.value.length + fixLeftList.value.length - baseNum > 0 &&
-    offList.value.length - baseNum >
-      onList.value.length + fixLeftList.value.length - baseNum
-  );
-});
+    onList.value.length + fixLeftList.value.length - baseNum > 0
+    && offList.value.length - baseNum
+    > onList.value.length + fixLeftList.value.length - baseNum
+  )
+})
 </script>
 
 <template>
@@ -376,8 +385,8 @@ const indeterminate = computed(() => {
                     <n-checkbox
                       v-model:checked="checkAll"
                       label="全部"
-                      @update:checked="onCheckAllChange"
                       :indeterminate="indeterminate"
+                      @update:checked="onCheckAllChange"
                     />
                   </div>
                   <div class="content">
@@ -475,7 +484,9 @@ const indeterminate = computed(() => {
 
       <template #footer>
         <div class="wrapper-footer">
-          <n-button type="info" @click="handleSumbit"> 确定 </n-button>
+          <n-button type="info" @click="handleSumbit">
+            确定
+          </n-button>
           <n-button secondary style="margin-left: 15px" @click="closeModal">
             取消
           </n-button>
@@ -543,7 +554,7 @@ const indeterminate = computed(() => {
 .textbtnStyle {
   cursor: pointer;
   color: #507AFD;
-  
+
 }
 
 .drag-wrapper {
diff --git a/src/views/task/modal/CustomFieldModal.vue b/src/views/task/modal/CustomFieldModal.vue
index 7622e52..c50b804 100644
--- a/src/views/task/modal/CustomFieldModal.vue
+++ b/src/views/task/modal/CustomFieldModal.vue
@@ -1,365 +1,369 @@
 <script lang="ts" setup>
-import { getAllfieldList, getfieldList, savefield } from "@/api/home/filter";
-import { workPackageMap } from "@/config/workorder";
-import { useUser } from "@/store/modules/user";
-import { difference, cloneDeep } from "lodash-es";
-import { computed, defineEmits, defineProps, onMounted, ref, watch } from "vue";
-import { VueDraggable } from "vue-draggable-plus";
+import { cloneDeep, difference } from 'lodash-es'
+import { computed, defineEmits, defineProps, onMounted, ref, watch } from 'vue'
+import { VueDraggable } from 'vue-draggable-plus'
+import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
+import { workPackageMap } from '@/config/workorder'
+import { useUser } from '@/store/modules/user'
+
 const props = defineProps({
   reviewType: {
     type: Number,
     default: () => 1,
     require: true,
   },
-});
+})
 
-const emit = defineEmits(["onOk"]);
+const emit = defineEmits(['onOk'])
 
 // 左侧隐藏列表
-const offList = ref<any[]>([]);
+const offList = ref<any[]>([])
 // 右侧显示列表
-const onList = ref<any[]>([]);
+const onList = ref<any[]>([])
 // 固定默认列表
-const fixList = ref<any[]>([]);
+const fixList = ref<any[]>([])
 
-const offShowList = ref<any[]>([]);
-const onShowList = ref<any[]>([]);
-const fixShowList = ref<any[]>([]);
+const offShowList = ref<any[]>([])
+const onShowList = ref<any[]>([])
+const fixShowList = ref<any[]>([])
 
 const allCount = computed(() => {
-  return `全部字段(共${offList.value.length - 1}个)`;
-});
+  return `全部字段(共${offList.value.length - 1}个)`
+})
 
 const selectCount = computed(() => {
-  return `显示字段(共${onList.value.length}个)`;
-});
+  return `显示字段(共${onList.value.length}个)`
+})
 
 function generatList() {
-  const keys = Object.keys(workPackageMap);
-  let showList: object[] = [];
-  const hideList: object[] = [];
-  const showStr = "status";
-  const showKeys = showStr.split(",").map((key: string) => key.toLowerCase());
+  const keys = Object.keys(workPackageMap)
+  let showList: object[] = []
+  const hideList: object[] = []
+  const showStr = 'status'
+  const showKeys = showStr.split(',').map((key: string) => key.toLowerCase())
 
   for (const key of keys) {
-    const name = workPackageMap[key]?.label;
-    const isDefault = workPackageMap[key]?.isDefault;
+    const name = workPackageMap[key]?.label
+    const isDefault = workPackageMap[key]?.isDefault
 
     // 系统配置为Y且不是默认配置
     if (!isDefault) {
       hideList.push({
         id: key,
-        name: name || "未配置",
+        name: name || '未配置',
         fix: isDefault,
         checked: workPackageMap[key].isDefault,
-      });
+      })
     }
   }
 
   showList = showKeys.reduce((acc, key) => {
     const config = {
       id: key,
-      name: workPackageMap[key].label || "未配置",
+      name: workPackageMap[key].label || '未配置',
       fix: workPackageMap[key].isDefault,
-    };
-    return [...acc, config];
-  }, []);
+    }
+    return [...acc, config]
+  }, [])
 
-  const fixedList = generateDefaultList();
+  const fixedList = generateDefaultList()
 
-  hideList.unshift(...fixedList);
-  showList.unshift(...fixedList);
+  hideList.unshift(...fixedList)
+  showList.unshift(...fixedList)
 
-  onList.value = showList;
-  offList.value = hideList;
-  return { showList, hideList };
+  onList.value = showList
+  offList.value = hideList
+  return { showList, hideList }
 }
 
 function generateDefaultList() {
   return Object.keys(workPackageMap).reduce((acc, key) => {
-    const { label, isDefault } = workPackageMap[key];
+    const { label, isDefault } = workPackageMap[key]
 
     if (isDefault) {
       const config = {
         id: key,
-        name: label || "未配置",
+        name: label || '未配置',
         fix: true,
         checked: true,
-      };
-      return [...acc, config];
-    } else {
-      return acc;
+      }
+      return [...acc, config]
+    }
+    else {
+      return acc
     }
-  }, []);
+  }, [])
 }
 
-const show = ref(false);
+const show = ref(false)
 const checkAll = computed(() => {
-  let baseNum = 0;
+  let baseNum = 0
   offList.value.map((v) => {
-    if (v.fix) {
-      baseNum += 1;
-    }
-  });
-  return onList.value.length == offList.value.length - baseNum;
-});
+    if (v.fix)
+      baseNum += 1
+  })
+  return onList.value.length == offList.value.length - baseNum
+})
 
 function showModal() {
-  show.value = true;
+  show.value = true
 }
 
 function closeModal() {
-  show.value = false;
+  show.value = false
 }
 
 async function handleSumbit(e: MouseEvent) {
-  const userStore = useUser();
-  const userInfo = userStore.getUserInfo;
-  let userFieldFixed = "";
+  const userStore = useUser()
+  const userInfo = userStore.getUserInfo
+  let userFieldFixed = ''
   fixList.value.map((v) => {
-    userFieldFixed += `${v.id},`;
-  });
+    userFieldFixed += `${v.id},`
+  })
   onList.value.map((v) => {
-    userFieldFixed += `${v.id},`;
-  });
-  userFieldFixed = userFieldFixed.slice(0, userFieldFixed.length - 1);
-  savefield(props.reviewType, userInfo.id, userFieldFixed);
-  e.preventDefault();
-  closeModal();
-  emit("onOk");
+    userFieldFixed += `${v.id},`
+  })
+  userFieldFixed = userFieldFixed.slice(0, userFieldFixed.length - 1)
+  savefield(props.reviewType, userInfo.id, userFieldFixed)
+  e.preventDefault()
+  closeModal()
+  emit('onOk')
 }
 
 defineExpose({
   showModal,
-});
+})
 
 // generatList();
 
-const selectIds = ref<string[]>([]);
+const selectIds = ref<string[]>([])
 
 function onCheckAllChange(value) {
-  const ids: string[] = [];
+  const ids: string[] = []
   for (const item of offList.value) {
     if (!item.fix) {
-      item.checked = value;
-      ids.push(item.id);
+      item.checked = value
+      ids.push(item.id)
     }
   }
   for (const item of offShowList.value) {
-    if (!item.fix) {
-      item.checked = value;
-    }
+    if (!item.fix)
+      item.checked = value
   }
-  selectIds.value = value ? ids : [];
+  selectIds.value = value ? ids : []
   if (value) {
     offList.value.map((v) => {
-      if (!v.checked) {
-        onList.value.push(v);
-      }
-    });
-    onShowList.value = cloneDeep(onList.value);
-  } else {
-    onList.value = [];
-    onShowList.value = [];
+      if (!v.checked)
+        onList.value.push(v)
+    })
+    onShowList.value = cloneDeep(onList.value)
+  }
+  else {
+    onList.value = []
+    onShowList.value = []
   }
 }
 
 function onCheckChange(checked: any, item: any) {
-  const index = selectIds.value.indexOf(item.id);
-  item.checked = checked;
-  let currentIndex = offList.value.findIndex((v) => v.id == item.id);
-  offList.value[currentIndex].checked = checked;
-  if (index === -1 && checked) {
-    selectIds.value.push(item.id);
-  } else {
-    selectIds.value.splice(index, 1);
-  }
+  const index = selectIds.value.indexOf(item.id)
+  item.checked = checked
+  const currentIndex = offList.value.findIndex(v => v.id == item.id)
+  offList.value[currentIndex].checked = checked
+  if (index === -1 && checked)
+    selectIds.value.push(item.id)
+  else
+    selectIds.value.splice(index, 1)
 }
 
 const showIds = computed(() => {
   return onList.value.map((item) => {
-    return item.id;
-  });
-});
+    return item.id
+  })
+})
 
 watch(
   () => selectIds.value.length,
   (newVal, oldVal) => {
-    if (newVal === oldVal) return;
+    if (newVal === oldVal)
+      return
 
-    const action = newVal > oldVal ? "add" : "remove";
-    const diff =
-      action === "add"
+    const action = newVal > oldVal ? 'add' : 'remove'
+    const diff
+      = action === 'add'
         ? difference(selectIds.value, showIds.value)
-        : difference(showIds.value, selectIds.value);
+        : difference(showIds.value, selectIds.value)
 
-    if (diff.length === 0) return;
+    if (diff.length === 0)
+      return
 
-    if (action === "add") {
+    if (action === 'add') {
       for (const item of offList.value) {
         if (!item.fix && diff.includes(item.id)) {
           onList.value.push({
             id: item.id,
-            name: item.name || "未配置",
+            name: item.name || '未配置',
             fix: item.fix || false,
-          });
+          })
         }
       }
-      onShowList.value = cloneDeep(onList.value);
-    } else {
-      const list = onList.value;
+      onShowList.value = cloneDeep(onList.value)
+    }
+    else {
+      const list = onList.value
       for (let index = 0; index < list.length; index++) {
-        const item = list[index];
+        const item = list[index]
         if (!item.fix && diff.includes(item.id)) {
-          list.splice(index, 1);
-          onShowList.value.splice(index, 1);
-          index--;
+          list.splice(index, 1)
+          onShowList.value.splice(index, 1)
+          index--
         }
       }
-      console.log(onShowList.value, list, "onShowList");
+      console.log(onShowList.value, list, 'onShowList')
     }
-  }
-);
+  },
+)
 
 watch(
   () => showIds.value.length,
   (newVal, oldVal) => {
-    if (newVal === oldVal) return;
+    if (newVal === oldVal)
+      return
 
-    const diff = difference(selectIds.value, showIds.value);
+    const diff = difference(selectIds.value, showIds.value)
 
-    if (diff.length === 0) return;
+    if (diff.length === 0)
+      return
 
     for (const item of offList.value) {
       if (!item.fix && diff.includes(item.id)) {
-        const index = selectIds.value.indexOf(item.id);
-        item.checked = false;
-        selectIds.value.splice(index, 1);
+        const index = selectIds.value.indexOf(item.id)
+        item.checked = false
+        selectIds.value.splice(index, 1)
       }
     }
-  }
-);
+  },
+)
 
 function clearDragSource() {
   onList.value = onList.value.filter((item) => {
-    return item.fix === true;
-  });
-  onShowList.value = cloneDeep(onList.value);
+    return item.fix === true
+  })
+  onShowList.value = cloneDeep(onList.value)
 }
 
 function removeHandler(id: string) {
   let index = onList.value.findIndex((item) => {
-    return item.id === id;
-  });
+    return item.id === id
+  })
   if (index !== -1) {
-    onList.value.splice(index, 1);
-    onShowList.value.splice(index, 1);
+    onList.value.splice(index, 1)
+    onShowList.value.splice(index, 1)
   }
 
-  index = offList.value.findIndex((v) => v.id == id);
-  offList.value[index].checked = false;
-  offShowList.value = cloneDeep(offList.value);
+  index = offList.value.findIndex(v => v.id == id)
+  offList.value[index].checked = false
+  offShowList.value = cloneDeep(offList.value)
 }
-const initData = ()=>{
-  offList.value = [];
-  onList.value = [];
-  fixList.value = [];
-  offShowList.value = [];
-  onShowList.value = [];
-  fixShowList.value = [];
-  selectIds.value = [];
+function initData() {
+  offList.value = []
+  onList.value = []
+  fixList.value = []
+  offShowList.value = []
+  onShowList.value = []
+  fixShowList.value = []
+  selectIds.value = []
 }
-const getData = async (type = "") => {
-  initData();
-  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;
+async function getData(type = '') {
+  initData()
+  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 是否选中
    */
-  const userFieldFixed = useList?.userFieldFixed?.split(",");
-  const userFieldUnFixed = useList?.userFieldUnFixed?.split(",");
-  if (!type || type == "off") {
-    offList.value = [];
+  const userFieldFixed = useList?.userFieldFixed?.split(',')
+  const userFieldUnFixed = useList?.userFieldUnFixed?.split(',')
+  if (!type || type == 'off') {
+    offList.value = []
     allList?.map((v) => {
-      let item = {
+      const item = {
         name: v.fieldDesc,
         id: v.name,
         fix: v.isrequired == 2,
         checked:
-          v.isrequired == 2 ||
-          Boolean(userFieldFixed?.find((v2) => v2 == v.name)) ||
-          Boolean(userFieldUnFixed?.find((v2) => v2 == v.name)),
-      };
-      if (item.fix) {
-        fixList.value.push(item);
-      } else {
-        offList.value.push(item);
+          v.isrequired == 2
+          || Boolean(userFieldFixed?.find(v2 => v2 == v.name))
+          || Boolean(userFieldUnFixed?.find(v2 => v2 == v.name)),
       }
-    });
-    offList.value.unshift(...fixList.value);
+      if (item.fix)
+        fixList.value.push(item)
+      else
+        offList.value.push(item)
+    })
+    offList.value.unshift(...fixList.value)
   }
-  if (!type || type == "on") {
-    useList?.userFieldFixed?.split(",").map((v) => {
-      let item = allList.find((v2) => v2.name == v);
+  if (!type || type == 'on') {
+    useList?.userFieldFixed?.split(',').map((v) => {
+      let item = allList.find(v2 => v2.name == v)
       if (item) {
         item = {
           name: item.fieldDesc,
           id: item.name,
           fix: item.isrequired == 2,
           checked: true,
-        };
-        selectIds.value.push(item.id);
-        if (!item.fix) {
-          onList.value.push(item);
         }
+        selectIds.value.push(item.id)
+        if (!item.fix)
+          onList.value.push(item)
       }
-    });
+    })
   }
-  offShowList.value = cloneDeep(offList.value);
-  fixShowList.value = cloneDeep(fixList.value);
-  onShowList.value = cloneDeep(onList.value);
-};
+  offShowList.value = cloneDeep(offList.value)
+  fixShowList.value = cloneDeep(fixList.value)
+  onShowList.value = cloneDeep(onList.value)
+}
 
-onMounted(() => getData());
+onMounted(() => getData())
 
 const indeterminate = computed(() => {
-  let baseNum = 0;
+  let baseNum = 0
   offList.value.map((v) => {
-    if (v.fix) {
-      baseNum += 1;
-    }
-  });
+    if (v.fix)
+      baseNum += 1
+  })
   return (
-    onShowList.value.length > 0 &&
-    offShowList.value.length - baseNum > onShowList.value.length
-  );
-});
-const queryData = (value, type) => {
+    onShowList.value.length > 0
+    && offShowList.value.length - baseNum > onShowList.value.length
+  )
+})
+function queryData(value, type) {
   if (value) {
-    if (type == "off") {
-      offShowList.value = offList.value.filter((item) => item.name.indexOf(value) > -1);
-    } else {
-      onShowList.value = onList.value.filter((item) => item.name.indexOf(value) > -1);
-      fixShowList.value = fixList.value.filter((item) => item.name.indexOf(value) > -1);
+    if (type == 'off') {
+      offShowList.value = offList.value.filter(item => item.name.includes(value))
     }
-  } else {
+    else {
+      onShowList.value = onList.value.filter(item => item.name.includes(value))
+      fixShowList.value = fixList.value.filter(item => item.name.includes(value))
+    }
+  }
+  else {
     // getData(type);
-    if (type == "off") {
-      offShowList.value = cloneDeep(offList.value);
-    } else {
-      onShowList.value = cloneDeep(onList.value);
-      fixShowList.value = cloneDeep(fixList.value);
+    if (type == 'off') {
+      offShowList.value = cloneDeep(offList.value)
+    }
+    else {
+      onShowList.value = cloneDeep(onList.value)
+      fixShowList.value = cloneDeep(fixList.value)
     }
   }
-};
+}
 </script>
 
 <template>
@@ -401,8 +405,8 @@ const queryData = (value, type) => {
                     <n-checkbox
                       v-model:checked="checkAll"
                       label="全选"
-                      @update:checked="onCheckAllChange"
                       :indeterminate="indeterminate"
+                      @update:checked="onCheckAllChange"
                     />
                   </div>
                   <div class="content">
@@ -445,7 +449,9 @@ const queryData = (value, type) => {
                     <SvgIcon size="14px" name="magnifying-1" />
                   </template>
                 </n-input>
-                <div class="draggable-title">系统默认</div>
+                <div class="draggable-title">
+                  系统默认
+                </div>
                 <div class="draggable-ul" style="border-bottom: none">
                   <div
                     v-for="item in fixShowList"
@@ -456,7 +462,9 @@ const queryData = (value, type) => {
                     <span class="ml-2">{{ item.name }}</span>
                   </div>
                 </div>
-                <div class="draggable-title" style="border-top: none">自定义配置</div>
+                <div class="draggable-title" style="border-top: none">
+                  自定义配置
+                </div>
                 <VueDraggable
                   v-model="onList"
                   class="draggable-ul"
@@ -487,7 +495,9 @@ const queryData = (value, type) => {
       </div>
       <template #footer>
         <div class="wrapper-footer">
-          <n-button type="info" @click="handleSumbit"> 确定 </n-button>
+          <n-button type="info" @click="handleSumbit">
+            确定
+          </n-button>
           <n-button secondary style="margin-left: 15px" @click="getData();closeModal()">
             取消
           </n-button>
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index e6a5d33..cca55ff 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -528,8 +528,9 @@ defineExpose({
             <div class="footer-times">
               <div class="time" style="margin-bottom: 4px;">
                 <SvgIcon color="#FFF" size="16" name="camera" />
-                <span class="time-value">{{ taskDetailInfo?.photoDateTimestamp ? format(
-                  taskDetailInfo.photoDateTimestamp, 'yyyy-MM-dd HH:mm:ss') : '-' }} </span>
+                <span>{{ taskDetailInfo?.photoDateTimestamp }}</span>
+                <!-- <span class="time-value">{{ taskDetailInfo?.photoDateTimestamp ? format(
+                  taskDetailInfo.photoDateTimestamp, 'yyyy-MM-dd HH:mm:ss') : '-' }} </span> -->
               </div>
               <div class="time">
                 <SvgIcon color="#FFF" size="16" name="save" />
@@ -586,7 +587,7 @@ defineExpose({
             <div v-show="overTask && overTask.id === taskDetailInfo.id" class="action" @click.stop="hideAction">
               <SvgIcon v-if="[1].includes(taskDetailInfo.historyStates)" style="cursor: pointer" name="t1" @click.stop="handleApproveMainImage" />
               <SvgIcon v-if="[1].includes(taskDetailInfo.historyStates)" style="cursor: pointer; margin-left: 30px" name="t2" @click.stop="handleRejectMainImage" />
-              <SvgIcon v-if="[1, 2, 3].includes(taskDetailInfo.historyStates)" style="cursor: pointer; margin-left: 30px" name="t2" @click.stop="handleRejectdubiousfileyd" />
+              <SvgIcon v-if="[1, 2, 3].includes(taskDetailInfo.historyStates)" style="cursor: pointer; margin-left: 30px" name="t9" @click.stop="handleRejectdubiousfileyd" />
             </div>
           </div>
           <PictureInfo :task-detail-info="taskDetailInfo" />
@@ -641,8 +642,10 @@ defineExpose({
               />
             </div>
             <div class="percent" :class="{ 'percent-red': item?.maxSimilarity >= 100 }">
+              <SvgIcon size="42" :name="item.maxSimilarity == 100 ? 'error_tag' : 'tag'" />
               <div class="val">
-                {{ item?.maxSimilarity && Number(item?.maxSimilarity).toFixed(0) }}<span class="percent-unit">%</span>
+                {{ `${item?.maxSimilarity && Number(item?.maxSimilarity).toFixed(0)}%` }}
+                <!-- {{ item?.maxSimilarity && Number(item?.maxSimilarity).toFixed(0) }}<span class="percent-unit">%</span> -->
               </div>
             </div>
 
@@ -652,9 +655,12 @@ defineExpose({
             <div v-else-if="item.historyStates === 3" class="pass-status">
               <SvgIcon name="no-pass-icon" style="width:52;height:24px" />
             </div>
+            <SvgIcon v-if="[1, 2, 3].includes(taskDetailInfo.historyStates)" style="cursor: pointer; margin-left: 30px" name="t9" @click.stop="handleRejectdubiousfileyd" />
+
             <div v-show="overTask && overTask.id === item.id" class="action">
               <SvgIcon style="cursor: pointer" name="t1" @click.stop="approvalHandler" />
               <SvgIcon style="cursor: pointer;margin-left: 40px;" name="t2" @click.stop="singleRejectHandler(item)" />
+              <SvgIcon v-if="[1, 2, 3].includes(taskDetailInfo.historyStates)" style="cursor: pointer; margin-left: 30px" name="t9" @click.stop="handleRejectdubiousfileyd" />
             </div>
           </div>
           <n-back-top :listen-to="wrapperListRef" :bottom="220" :visibility-height="10">
@@ -1091,16 +1097,33 @@ defineExpose({
         display: flex;
         align-items: center;
         justify-content: center;
-        width: 35px;
-        height: 18px;
+        // width: 35px;
+        // height: 18px;
         opacity: 0.9;
-        background: #6f92fd;
+        // background: #6f92fd;
         border-radius: 6px 0px 6px 0px;
         z-index: 5;
         right: 12px;
-        top: 15px;
+        top: 0;
         color: #fff;
         font-size: 14px;
+        .val {
+          position: absolute;
+    left: 0;
+    top: 0;
+    display: block;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 12px;
+    font-family: PingFang SC, PingFang SC-Semibold;
+    font-weight: Semibold;
+    text-align: left;
+    color: #ffffff;
+    line-height: 24px;
+        }
       }
 
       .percent-unit {
diff --git a/src/views/worksheet/modal/CustomFieldModal.vue b/src/views/worksheet/modal/CustomFieldModal.vue
index 7621a20..7fa9cb1 100644
--- a/src/views/worksheet/modal/CustomFieldModal.vue
+++ b/src/views/worksheet/modal/CustomFieldModal.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup>
-import { getAllfieldList, getfieldList, savefield } from "@/api/home/filter";
-import { workPackageMap } from "@/config/workorder";
-import { useUser } from "@/store/modules/user";
-import { difference } from "lodash-es";
-import { computed, defineEmits, defineProps, onMounted, ref, watch } from "vue";
-import { VueDraggable } from "vue-draggable-plus";
+import { difference } from 'lodash-es'
+import { computed, defineEmits, defineProps, onMounted, ref, watch } from 'vue'
+import { VueDraggable } from 'vue-draggable-plus'
+import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
+import { workPackageMap } from '@/config/workorder'
+import { useUser } from '@/store/modules/user'
 
 const props = defineProps({
   reviewType: {
@@ -12,304 +12,319 @@ const props = defineProps({
     default: () => 1,
     require: true,
   },
-});
+})
 
-const emit = defineEmits(["onOk"]);
+const emit = defineEmits(['onOk'])
 
 // 左侧隐藏列表
-const offList = ref<any[]>([]);
+const offList = ref<any[]>([])
 // 右侧显示列表
-const onList = ref<any[]>([]);
+const onList = ref<any[]>([])
 // 固定默认列表
-const fixList = ref<any[]>([]);
-
+const fixList = ref<any[]>([])
+// 搜索关键词
+const searchKey = ref('')
+const searchFixVal = ref('')
 const allCount = computed(() => {
-  return `全部字段(共${offList.value.length - 1}个)`;
-});
-
+  return `全部字段(共${offList.value.length - 1}个)`
+})
+const showOffList = computed(() => {
+  return offList.value.filter((i) => {
+    console.log(i.name, searchKey.value, 'i.name.includes(searchKey.value)')
+    return i.name.includes(searchKey.value)
+  })
+})
+const showFixList = computed(() => {
+  return fixList.value.filter(i => i.name.includes(searchFixVal.value))
+})
 const selectCount = computed(() => {
-  return `显示字段(共${onList.value.length}个)`;
-});
+  return `显示字段(共${onList.value.length}个)`
+})
 
 function generatList() {
-  const keys = Object.keys(workPackageMap);
-  let showList: object[] = [];
-  const hideList: object[] = [];
-  const showStr = "status";
-  const showKeys = showStr.split(",").map((key: string) => key.toLowerCase());
+  const keys = Object.keys(workPackageMap)
+  let showList: object[] = []
+  const hideList: object[] = []
+  const showStr = 'status'
+  const showKeys = showStr.split(',').map((key: string) => key.toLowerCase())
 
   for (const key of keys) {
-    const name = workPackageMap[key]?.label;
-    const isDefault = workPackageMap[key]?.isDefault;
+    const name = workPackageMap[key]?.label
+    const isDefault = workPackageMap[key]?.isDefault
 
     // 系统配置为Y且不是默认配置
     if (!isDefault) {
       hideList.push({
         id: key,
-        name: name || "未配置",
+        name: name || '未配置',
         fix: isDefault,
         checked: workPackageMap[key].isDefault,
-      });
+      })
     }
   }
 
   showList = showKeys.reduce((acc, key) => {
     const config = {
       id: key,
-      name: workPackageMap[key].label || "未配置",
+      name: workPackageMap[key].label || '未配置',
       fix: workPackageMap[key].isDefault,
-    };
-    return [...acc, config];
-  }, []);
+    }
+    return [...acc, config]
+  }, [])
 
-  const fixedList = generateDefaultList();
+  const fixedList = generateDefaultList()
 
-  hideList.unshift(...fixedList);
-  showList.unshift(...fixedList);
+  hideList.unshift(...fixedList)
+  showList.unshift(...fixedList)
 
-  onList.value = showList;
-  offList.value = hideList;
-  return { showList, hideList };
+  onList.value = showList
+  offList.value = hideList
+  console.log(offList.value, 'console.log(offList.value)')
+  return { showList, hideList }
 }
 
 function generateDefaultList() {
   return Object.keys(workPackageMap).reduce((acc, key) => {
-    const { label, isDefault } = workPackageMap[key];
+    const { label, isDefault } = workPackageMap[key]
 
     if (isDefault) {
       const config = {
         id: key,
-        name: label || "未配置",
+        name: label || '未配置',
         fix: true,
         checked: true,
-      };
-      return [...acc, config];
-    } else {
-      return acc;
+      }
+      return [...acc, config]
+    }
+    else {
+      return acc
     }
-  }, []);
+  }, [])
 }
 
-const show = ref(false);
+const show = ref(false)
 const checkAll = computed(() => {
-  let baseNum = 0;
+  let baseNum = 0
   offList.value.map((v) => {
-    if (v.fix) {
-      baseNum += 1;
-    }
-  });
-  return onList.value.length == offList.value.length - baseNum;
-});
+    if (v.fix)
+      baseNum += 1
+  })
+  return onList.value.length == offList.value.length - baseNum
+})
 function showModal() {
-  show.value = true;
+  show.value = true
 }
 
 function closeModal() {
-  show.value = false;
+  show.value = false
 }
 
 async function handleSumbit(e: MouseEvent) {
-  const userStore = useUser();
-  const userInfo = userStore.getUserInfo;
-  let userField = "";
+  const userStore = useUser()
+  const userInfo = userStore.getUserInfo
+  let userField = ''
   fixList.value.map((v) => {
-    userField += `${v.id},`;
-  });
+    userField += `${v.id},`
+  })
   onList.value.map((v) => {
-    userField += `${v.id},`;
-  });
-  userField = userField.slice(0, userField.length - 1);
-  savefield(props.reviewType, userInfo.id, userField);
-  e.preventDefault();
-  closeModal();
-  emit("onOk");
+    userField += `${v.id},`
+  })
+  userField = userField.slice(0, userField.length - 1)
+  savefield(props.reviewType, userInfo.id, userField)
+  e.preventDefault()
+  closeModal()
+  emit('onOk')
 }
 
 defineExpose({
   showModal,
-});
+})
 
 // generatList();
 
-const selectIds = ref<string[]>([]);
+const selectIds = ref<string[]>([])
 
 function onCheckAllChange(value) {
-  const ids: string[] = [];
+  const ids: string[] = []
 
   for (const item of offList.value) {
     if (!item.fix) {
-      item.checked = value;
-      ids.push(item.id);
+      item.checked = value
+      ids.push(item.id)
     }
   }
 
-  selectIds.value = value ? ids : [];
+  selectIds.value = value ? ids : []
 }
 
 function onCheckChange(checked: any, item: any) {
-  const index = selectIds.value.indexOf(item.id);
+  const index = selectIds.value.indexOf(item.id)
 
-  item.checked = checked;
+  item.checked = checked
 
-  if (index === -1 && checked) selectIds.value.push(item.id);
-  else selectIds.value.splice(index, 1);
+  if (index === -1 && checked)
+    selectIds.value.push(item.id)
+  else selectIds.value.splice(index, 1)
 }
 
 const showIds = computed(() => {
   return onList.value.map((item) => {
-    return item.id;
-  });
-});
+    return item.id
+  })
+})
 
 watch(
   () => selectIds.value.length,
   (newVal, oldVal) => {
-    if (newVal === oldVal) return;
+    if (newVal === oldVal)
+      return
 
-    const action = newVal > oldVal ? "add" : "remove";
-    const diff =
-      action === "add"
+    const action = newVal > oldVal ? 'add' : 'remove'
+    const diff
+      = action === 'add'
         ? difference(selectIds.value, showIds.value)
-        : difference(showIds.value, selectIds.value);
+        : difference(showIds.value, selectIds.value)
 
-    if (diff.length === 0) return;
+    if (diff.length === 0)
+      return
 
-    if (action === "add") {
+    if (action === 'add') {
       for (const item of offList.value) {
         if (!item.fix && diff.includes(item.id)) {
           onList.value.push({
             id: item.id,
-            name: item.name || "未配置",
+            name: item.name || '未配置',
             fix: item.fix || false,
-          });
+          })
         }
       }
-    } else {
-      const list = onList.value;
+    }
+    else {
+      const list = onList.value
       for (let index = 0; index < list.length; index++) {
-        const item = list[index];
+        const item = list[index]
         if (!item.fix && diff.includes(item.id)) {
-          list.splice(index, 1);
-          index--;
+          list.splice(index, 1)
+          index--
         }
       }
     }
-  }
-);
+  },
+)
 
 watch(
   () => showIds.value.length,
   (newVal, oldVal) => {
-    if (newVal === oldVal) return;
+    if (newVal === oldVal)
+      return
 
-    const diff = difference(selectIds.value, showIds.value);
+    const diff = difference(selectIds.value, showIds.value)
 
-    if (diff.length === 0) return;
+    if (diff.length === 0)
+      return
 
     for (const item of offList.value) {
       if (!item.fix && diff.includes(item.id)) {
-        const index = selectIds.value.indexOf(item.id);
-        item.checked = false;
-        selectIds.value.splice(index, 1);
+        const index = selectIds.value.indexOf(item.id)
+        item.checked = false
+        selectIds.value.splice(index, 1)
       }
     }
-  }
-);
+  },
+)
 
 function clearDragSource() {
   onList.value = onList.value.filter((item) => {
-    return item.fix === true;
-  });
+    return item.fix === true
+  })
 }
 
 function removeHandler(id: string) {
   let index = onList.value.findIndex((item) => {
-    return item.id === id;
-  });
-  if (index !== -1) onList.value.splice(index, 1);
+    return item.id === id
+  })
+  if (index !== -1)
+    onList.value.splice(index, 1)
 
-  index = offList.value.findIndex((v) => v.id == id);
-  offList.value[index].checked = false;
+  index = offList.value.findIndex(v => v.id == id)
+  offList.value[index].checked = false
 }
 
-const initData = () => {
-  offList.value = [];
-  onList.value = [];
-  fixList.value = [];
+function initData() {
+  offList.value = []
+  onList.value = []
+  fixList.value = []
   // offShowList.value = [];
   // onShowList.value = [];
   // fixShowList.value = [];
-  selectIds.value = [];
-};
-
-const getData = async () => {
-  initData();
-  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;
+  selectIds.value = []
+}
+
+async function getData() {
+  initData()
+  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 是否选中
    */
-  const userFieldFixed = useList.userFieldFixed?.split(",");
-  const userFieldUnFixed = useList.userFieldUnFixed?.split(",");
+  const userFieldFixed = useList.userFieldFixed?.split(',')
+  const userFieldUnFixed = useList.userFieldUnFixed?.split(',')
 
   allList.map((v) => {
-    let item = {
+    const item = {
       name: v.fieldDesc,
       id: v.name,
       fix: v.isrequired == 2,
       checked:
-        v.isrequired == 2 ||
-        Boolean(userFieldFixed?.find((v2) => v2 == v.name)) ||
-        Boolean(userFieldUnFixed?.find((v2) => v2 == v.name)),
-    };
-    if (item.fix) {
-      fixList.value.push(item);
-    } else {
-      offList.value.push(item);
+        v.isrequired == 2
+        || Boolean(userFieldFixed?.find(v2 => v2 == v.name))
+        || Boolean(userFieldUnFixed?.find(v2 => v2 == v.name)),
     }
-  });
-  offList.value.unshift(...fixList.value);
-  useList.userFieldFixed?.split(",").map((v) => {
-    let item = allList.find((v2) => v2.name == v);
+    if (item.fix)
+      fixList.value.push(item)
+    else
+      offList.value.push(item)
+  })
+  offList.value.unshift(...fixList.value)
+  useList.userFieldFixed?.split(',').map((v) => {
+    let item = allList.find(v2 => v2.name == v)
     if (item) {
       item = {
         name: item.fieldDesc,
         id: item.name,
         fix: item.isrequired == 2,
         checked: true,
-      };
-      selectIds.value.push(item.id);
-      if (!item.fix) {
-        onList.value.push(item);
       }
+      selectIds.value.push(item.id)
+      if (!item.fix)
+        onList.value.push(item)
     }
-  });
-};
+  })
+}
 
 onMounted(async () => {
-  getData();
-});
+  getData()
+})
 
 const indeterminate = computed(() => {
-  let baseNum = 0;
+  let baseNum = 0
   offList.value.map((v) => {
-    if (v.fix) {
-      baseNum += 1;
-    }
-  });
+    if (v.fix)
+      baseNum += 1
+  })
   return (
-    onList.value.length > 0 &&
-    offList.value.length - baseNum > onList.value.length
-  );
-});
+    onList.value.length > 0
+    && offList.value.length - baseNum > onList.value.length
+  )
+})
 </script>
 
 <template>
@@ -338,7 +353,7 @@ const indeterminate = computed(() => {
               :bordered="false"
             >
               <div>
-                <n-input placeholder="搜索关键词">
+                <n-input v-model:value="searchKey" placeholder="搜索关键词">
                   <template #suffix>
                     <SvgIcon size="14px" name="magnifying-1" />
                   </template>
@@ -348,13 +363,13 @@ const indeterminate = computed(() => {
                     <n-checkbox
                       v-model:checked="checkAll"
                       label="全选"
-                      @update:checked="onCheckAllChange"
                       :indeterminate="indeterminate"
+                      @update:checked="onCheckAllChange"
                     />
                   </div>
                   <div class="content">
                     <div
-                      v-for="item in offList"
+                      v-for="item in showOffList"
                       :key="item.id"
                       style="width: 170px"
                       :class="{ 'disable-check': item.fix }"
@@ -384,14 +399,14 @@ const indeterminate = computed(() => {
                 <span class="textbtnStyle" @click="clearDragSource">恢复默认</span>
               </template>
               <div>
-                <n-input placeholder="搜索关键词">
+                <n-input v-model:value="searchFixVal" placeholder="搜索关键词">
                   <template #suffix>
                     <SvgIcon size="14px" name="magnifying-1" />
                   </template>
                 </n-input>
                 <div class="draggable-ul">
                   <div
-                    v-for="item in fixList"
+                    v-for="item in showFixList"
                     :key="item.id"
                     :class="{ fix: item.fix }"
                     class="cursor-move draggable-item"
@@ -429,7 +444,9 @@ const indeterminate = computed(() => {
       </div>
       <template #footer>
         <div class="wrapper-footer">
-          <n-button type="info" @click="handleSumbit" style="background-color: #507AFD;"> 确定 </n-button>
+          <n-button type="info" style="background-color: #507AFD;" @click="handleSumbit">
+            确定
+          </n-button>
           <n-button secondary style="margin-left: 15px" @click="getData();closeModal();">
             取消
           </n-button>