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 @@
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 @@
-
+
未成交
@@ -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
}
})