From 8de29b754ab1eaf6e3a9d5b74a244cb2f4479bcb Mon Sep 17 00:00:00 2001 From: qsh <> Date: Thu, 26 Sep 2024 17:36:29 +0800 Subject: [PATCH] sc --- src/api/clue/index.js | 4 ++-- src/api/clue/sign.js | 4 ++-- src/views/Clue/Order/Comp/OrderList.vue | 18 ++++++++++++++++++ src/views/Clue/Pool/index.vue | 12 ++++++++++-- 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/src/api/clue/index.js b/src/api/clue/index.js index b5cf780..9b07233 100644 --- a/src/api/clue/index.js +++ b/src/api/clue/index.js @@ -6,8 +6,8 @@ export const getSimpleClueList = async () => { } // 查询列表 -export const getCluePage = async (params) => { - return await request.get({ url: '/admin-api/crm/sch-clue/page', params }) +export const getCluePage = async (data) => { + return await request.post({ url: '/admin-api/crm/sch-clue/page', data }) } // 查询详情 diff --git a/src/api/clue/sign.js b/src/api/clue/sign.js index 085e972..48e2c36 100644 --- a/src/api/clue/sign.js +++ b/src/api/clue/sign.js @@ -1,8 +1,8 @@ import request from '@/config/axios' // 查询列表 -export const getSignPage = async (params) => { - return await request.get({ url: '/admin-api/crm/sign/page', params }) +export const getSignPage = async (data) => { + return await request.post({ url: '/admin-api/crm/sign/page', data }) } // 查询详情 diff --git a/src/views/Clue/Order/Comp/OrderList.vue b/src/views/Clue/Order/Comp/OrderList.vue index 3c9e5c2..846fa2b 100644 --- a/src/views/Clue/Order/Comp/OrderList.vue +++ b/src/views/Clue/Order/Comp/OrderList.vue @@ -100,6 +100,16 @@ {{ formatDate(row[item.field]) }} +
+ + +
{{ row[item.field] }} @@ -150,6 +160,7 @@ type="primary" class="mr-10px" link + :disabled="scope.row.isCommissioned != '未发放'" style="padding: 0; margin-left: 0" v-hasPermi="['clue:pool:enroll']" @click="cancelDeal(scope.row)" @@ -240,6 +251,11 @@ async function getTableList() { pageNo: tableObject.value.pageNo, pageSize: tableObject.value.pageSize } + searchFieldList.value.map((it) => { + if (params[it.field]) { + params.diyParams[it.field] = params[it.field] + } + }) const data = await SignApi.getSignPage(removeNullField(params)) tableObject.value.tableList = data.list.map((it) => ({ ...it, ...it.diyParams })) tableObject.value.total = data.total @@ -249,10 +265,12 @@ async function getTableList() { } const loading = ref(true) +const searchFieldList = ref([]) async function getCurdSchemas() { loading.value = true try { const data = await getSimpleFieldList() + searchFieldList.value = data.filter((it) => it.isCustom) data.forEach((elem) => { if (['createUser'].includes(elem.field)) { elem.search.options = userOptions.value diff --git a/src/views/Clue/Pool/index.vue b/src/views/Clue/Pool/index.vue index 0d5d843..4ba4185 100644 --- a/src/views/Clue/Pool/index.vue +++ b/src/views/Clue/Pool/index.vue @@ -228,11 +228,13 @@ const followRef = ref() const loading = ref(true) const allSchemas = ref({}) +const searchFieldList = ref([]) async function getCurdSchemas() { loading.value = true try { const data = await getSimpleFieldList() + searchFieldList.value = data.filter((it) => it.isCustom) data.forEach((elem) => { if (['followUser', 'convertPeople'].includes(elem.field)) { elem.search.options = userOptions.value @@ -290,12 +292,18 @@ async function getTableList() { getSearchCount() try { const queryParams = await searchRef.value.getFormModel() - const params = { + let params = { ...queryParams, pageNo: tableObject.value.pageNo, pageSize: tableObject.value.pageSize, - queryType: queryType.value + queryType: queryType.value, + diyParams: {} } + searchFieldList.value.map((it) => { + if (params[it.field]) { + params.diyParams[it.field] = params[it.field] + } + }) const data = await ClueApi.getCluePage(removeNullField(params)) tableObject.value.tableList = data.list.map((it) => ({ ...it, ...it.diyParams })) tableObject.value.total = data.total