diff --git a/.env.development b/.env.development index 2a54d74..cc3ff87 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ NODE_ENV = 'development' -VITE_APP_BASE_URL = 'https://ceshi-engineering.lihaink.cn/' -# VITE_APP_BASE_URL = 'http://www.eng.local/' +# VITE_APP_BASE_URL = 'https://ceshi-engineering.lihaink.cn/' +VITE_APP_BASE_URL = 'http://www.eng.local/' # VITE_APP_BASE_URL = 'http://192.168.1.5:9090/' \ No newline at end of file diff --git a/src/api/contract.ts b/src/api/contract.ts index fe199d2..88291ff 100644 --- a/src/api/contract.ts +++ b/src/api/contract.ts @@ -1,26 +1,30 @@ -import request from '@/utils/request' +import request from "@/utils/request"; // 项目合同列表 export function apiContractLists(params: any) { - return request.get({ url: '/contract.contract/lists', params }) + return request.get({ url: "/contract.contract/lists", params }); } // 添加项目合同 export function apiContractAdd(params: any) { - return request.post({ url: '/contract.contract/add', params }) + return request.post({ url: "/contract.contract/add", params }); } // 编辑项目合同 export function apiContractEdit(params: any) { - return request.post({ url: '/contract.contract/edit', params }) + return request.post({ url: "/contract.contract/edit", params }); } // 删除项目合同 export function apiContractDelete(params: any) { - return request.post({ url: '/contract.contract/delete', params }) + return request.post({ url: "/contract.contract/delete", params }); } // 项目合同详情 export function apiContractDetail(params: any) { - return request.get({ url: '/contract.contract/detail', params }) -} \ No newline at end of file + return request.get({ url: "/contract.contract/detail", params }); +} + +export function apiContractSearch(params: any) { + return request.get({ url: "/contract.contract/datas", params }); +} diff --git a/src/api/custom.ts b/src/api/custom.ts index cfbb8c1..8eb8b93 100644 --- a/src/api/custom.ts +++ b/src/api/custom.ts @@ -23,4 +23,8 @@ export function apiCustomDelete(params: any) { // 客户表详情 export function apiCustomDetail(params: any) { return request.get({ url: '/custom.custom/detail', params }) +} + +export function apiCustomSearch(params: any) { + return request.get({ url: "/custom.custom/datas", params }); } \ No newline at end of file diff --git a/src/api/custom_contacts.ts b/src/api/custom_contacts.ts index bc9a74e..12879c0 100644 --- a/src/api/custom_contacts.ts +++ b/src/api/custom_contacts.ts @@ -1,26 +1,26 @@ -import request from '@/utils/request' +import request from "@/utils/request"; // 客户联系人列表 export function apiCustomContactsLists(params: any) { - return request.get({ url: '/custom.custom_contacts/lists', params }) + return request.get({ url: "/custom.custom_contacts/lists", params }); } // 添加客户联系人 export function apiCustomContactsAdd(params: any) { - return request.post({ url: '/custom.custom_contacts/add', params }) + return request.post({ url: "/custom.custom_contacts/add", params }); } // 编辑客户联系人 export function apiCustomContactsEdit(params: any) { - return request.post({ url: '/custom.custom_contacts/edit', params }) + return request.post({ url: "/custom.custom_contacts/edit", params }); } // 删除客户联系人 export function apiCustomContactsDelete(params: any) { - return request.post({ url: '/custom.custom_contacts/delete', params }) + return request.post({ url: "/custom.custom_contacts/delete", params }); } // 客户联系人详情 export function apiCustomContactsDetail(params: any) { - return request.get({ url: '/custom.custom_contacts/detail', params }) -} \ No newline at end of file + return request.get({ url: "/custom.custom_contacts/detail", params }); +} diff --git a/src/api/project.ts b/src/api/project.ts index 5b46883..f586ca0 100644 --- a/src/api/project.ts +++ b/src/api/project.ts @@ -23,4 +23,8 @@ export function apiProjectDelete(params: any) { // 项目表详情 export function apiProjectDetail(params: any) { return request.get({ url: '/project.project/detail', params }) +} + +export function apiProjectSearch(params: any) { + return request.get({ url: "/project.project/datas", params }); } \ No newline at end of file diff --git a/src/views/custom_contacts/index.vue b/src/views/custom_contacts/index.vue index dd19210..7a1d1b0 100644 --- a/src/views/custom_contacts/index.vue +++ b/src/views/custom_contacts/index.vue @@ -2,8 +2,8 @@
- - + + @@ -32,9 +32,9 @@ + - @@ -72,7 +72,7 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiCustomContactsLists, apiCustomContactsDelete, apiCustomContactsDetail } from '@/api/custom_contacts' -import { timeFormat } from '@/utils/util' +import { apiCustomSearch } from '@/api/custom' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' import DetailPopup from './detail.vue' @@ -85,7 +85,6 @@ const showDtail = ref(false) // 查询条件 const queryParams = reactive({ custom_id: '', - custom_name: '', name: '', position: '', phone: '', @@ -146,4 +145,3 @@ const handledetail = async (data: any) => { } getLists() - diff --git a/src/views/custom_follow/index.vue b/src/views/custom_follow/index.vue index a5755b7..5a39a48 100644 --- a/src/views/custom_follow/index.vue +++ b/src/views/custom_follow/index.vue @@ -3,23 +3,19 @@ + + + - - - - - - - - @@ -45,11 +41,10 @@ + - -