From 50f218b8f5997a6de8461c65291a3e6a46dad611 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Wed, 17 Sep 2025 11:56:09 +0800
Subject: [PATCH] sc

---
 src/views/Clue/Order/Comp/MallOrderList.vue | 11 ++++++-----
 src/views/Clue/Order/Comp/OrderList.vue     | 15 ++++++++-------
 src/views/Clue/Pool/index.vue               |  9 +++++----
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/views/Clue/Order/Comp/MallOrderList.vue b/src/views/Clue/Order/Comp/MallOrderList.vue
index d08364d..94afecb 100644
--- a/src/views/Clue/Order/Comp/MallOrderList.vue
+++ b/src/views/Clue/Order/Comp/MallOrderList.vue
@@ -172,7 +172,7 @@
 import { getSimpleFieldList } from '@/api/clue/orderField'
 import * as SignApi from '@/api/clue/sign'
 import { getSimpleProductList } from '@/api/mall/product'
-import { getSimpleUserList as getUserOption, getAllUserList } from '@/api/system/user'
+import { getSimpleUserList as getUserOption, getAllUserListWithHire } from '@/api/system/user'
 
 import DialogFeeback from './DialogFeeback.vue'
 import DialogAfterSale from './DialogAfterSale.vue'
@@ -258,9 +258,10 @@ async function getCurdSchemas() {
     // const mainOrderFields = data.filter((it) => it.paramLevel == 1)
     data.forEach((elem) => {
       if (elem.isSearch) {
-        if (['createUser'].includes(elem.field)) {
-          elem.search.options = userOptions.value
-        } else if (['convertPeople', 'receiver'].includes(elem.field)) {
+        // if (['createUser'].includes(elem.field)) {
+        //   elem.search.options = userOptions.value
+        // } else
+        if (['convertPeople', 'receiver', 'createUser'].includes(elem.field)) {
           elem.search.options = allUserOptions.value
         }
       }
@@ -318,7 +319,7 @@ function handleAddFee(row) {
 
 async function getOptions() {
   userOptions.value = await getUserOption()
-  allUserOptions.value = await getAllUserList()
+  allUserOptions.value = await getAllUserListWithHire()
   getCurdSchemas()
 
   // 产品
diff --git a/src/views/Clue/Order/Comp/OrderList.vue b/src/views/Clue/Order/Comp/OrderList.vue
index dde4cdf..c9913c4 100644
--- a/src/views/Clue/Order/Comp/OrderList.vue
+++ b/src/views/Clue/Order/Comp/OrderList.vue
@@ -182,7 +182,7 @@
 <script setup name="ClueOrderList">
 import { getSimpleFieldList } from '@/api/clue/orderField'
 import * as SignApi from '@/api/clue/sign'
-import { getSimpleUserList as getUserOption, getAllUserList } from '@/api/system/user'
+import { getAllUserListWithHire } from '@/api/system/user'
 import { getPlaceList } from '@/api/school/place'
 import { getClassTypeList } from '@/api/school/class'
 
@@ -194,7 +194,7 @@ import DialogExtraFee from './DialogExtraPay.vue'
 import { removeNullField } from '@/utils'
 import { formatDate } from '@/utils/formatTime'
 
-const userOptions = ref([])
+// const userOptions = ref([])
 const allUserOptions = ref([])
 onMounted(() => {
   getOptions()
@@ -273,9 +273,10 @@ async function getCurdSchemas() {
     const data = await getSimpleFieldList()
     searchFieldList.value = data.filter((it) => it.isCustom && it.isSearch)
     data.forEach((elem) => {
-      if (['createUser'].includes(elem.field)) {
-        elem.search.options = userOptions.value
-      } else if (['convertPeople', 'receiver'].includes(elem.field)) {
+      // if (['createUser'].includes(elem.field)) {
+      //   elem.search.options = userOptions.value
+      // } else
+      if (['convertPeople', 'receiver', 'createUser'].includes(elem.field)) {
         elem.search.options = allUserOptions.value
       }
     })
@@ -354,8 +355,8 @@ async function getOptions() {
     schoolOptions.value = data.schoolList
     allPlaceOptions.value = data.placeList
   })
-  userOptions.value = await getUserOption()
-  allUserOptions.value = await getAllUserList()
+  // userOptions.value = await getUserOption()
+  allUserOptions.value = await getAllUserListWithHire()
   getCurdSchemas()
 }
 </script>
diff --git a/src/views/Clue/Pool/index.vue b/src/views/Clue/Pool/index.vue
index b17a2c1..6df5cc1 100644
--- a/src/views/Clue/Pool/index.vue
+++ b/src/views/Clue/Pool/index.vue
@@ -5,7 +5,7 @@
         <el-tab-pane label="全部" name="0" />
         <el-tab-pane name="1">
           <template #label>
-            <Tooltip message="除了无效线索和已成交的线索" />
+            <Tooltip message="过滤掉无效线索、已流失和已成交的线索" />
             <el-badge v-if="clueCount.unSignNum" :value="clueCount.unSignNum" :max="9999">
               <span class="ml-3px">未成交</span>
             </el-badge>
@@ -240,9 +240,10 @@ async function getCurdSchemas() {
     const data = await getSimpleFieldList()
     searchFieldList.value = data.filter((it) => it.isCustom && it.isSearch)
     data.forEach((elem) => {
-      if (['followUser', 'convertPeople'].includes(elem.field)) {
-        elem.search.options = userOptions.value
-      } else if (['firstFollowUser'].includes(elem.field)) {
+      // if (['followUser', 'convertPeople'].includes(elem.field)) {
+      //   elem.search.options = userOptions.value
+      // } else
+      if (['firstFollowUser', 'followUser', 'convertPeople'].includes(elem.field)) {
         elem.search.options = allStatusUserOptions.value
       }
     })