From d5190812ad15fe443e8988c6dbf20686d910d6c9 Mon Sep 17 00:00:00 2001 From: zy Date: Thu, 29 May 2025 23:55:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.local | 7 +- src/api/crm/industry/index.ts | 44 +++++ .../detail/ProcessInstanceOperationButton.vue | 1 - src/views/crm/contract/ContractForm.vue | 20 +-- .../ContractAAuthorizedCompanyForm.vue | 1 + .../components/ContractAuthPersonInfo.vue | 1 - .../components/ContractChangeLimit.vue | 20 +++ .../contract/components/ContractExtension.vue | 20 +++ .../contract/detail/ContractChangeDetail.vue | 10 +- .../crm/contract/detail/ContractDetail.vue | 64 +++---- src/views/crm/customer/CustomerForm.vue | 88 +++++----- .../customer/detail/CustomerDetailsHeader.vue | 5 +- src/views/crm/customer/detail/index.vue | 2 +- src/views/crm/customer/index.vue | 12 +- src/views/crm/industry/index.vue | 162 ++++++++++++++++++ src/views/crm/quotation/QuotationDetail.vue | 22 +++ src/views/crm/quotation/QuotationForm.vue | 21 +++ src/views/crm/quotation/index.vue | 4 +- 18 files changed, 403 insertions(+), 101 deletions(-) create mode 100644 src/api/crm/industry/index.ts create mode 100644 src/views/crm/industry/index.vue diff --git a/.env.local b/.env.local index 1f18c7f2b..5520251de 100644 --- a/.env.local +++ b/.env.local @@ -6,9 +6,10 @@ VITE_DEV=true # 请求路径 # VITE_BASE_URL='http://8.130.12.151:48080' # VITE_BASE_URL='http://lhy.free.idcfengye.com' -# VITE_BASE_URL='http://m94844f6.natappfree.cc' -VITE_BASE_URL='http://172.22.3.49:48080' -# VITE_BASE_URL='http://172.22.3.203:48080' +# VITE_BASE_URL='http://u82ba6cf.natappfree.cc' +# VITE_BASE_URL='http://172.22.3.49:48080' +VITE_BASE_URL='http://172.22.3.203:48080' +# VITE_BASE_URL='http://172.22.3.168:48080' # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务 VITE_UPLOAD_TYPE=server diff --git a/src/api/crm/industry/index.ts b/src/api/crm/industry/index.ts new file mode 100644 index 000000000..467e5d684 --- /dev/null +++ b/src/api/crm/industry/index.ts @@ -0,0 +1,44 @@ +import request from '@/config/axios' + +// 行业 VO +export interface IndustryVO { + id: number // 主键 + industryId: string // 门类ID + name: string // 门类名称 + parentId: string // 父门类ID + levelType: number // 门类级别 + description: string // 描述 +} + +// 行业 API +export const IndustryApi = { + // 查询行业树 + getIndustryPage: async (params: any) => { + return await request.get({ url: `/crm/industry/getTree`, params }) + }, + + // 查询选中的树 + getIndustry: async () => { + return await request.get({ url: `/crm/industry/getChooseTree` }) + }, + + // 新增行业 + createIndustry: async (data: IndustryVO) => { + return await request.post({ url: `/crm/industry/create`, data }) + }, + + // 修改行业 + updateIndustry: async (data: IndustryVO) => { + return await request.put({ url: `/crm/industry/update`, data }) + }, + + // 删除行业 + deleteIndustry: async (id: number) => { + return await request.delete({ url: `/crm/industry/delete?id=` + id }) + }, + + // 导出行业 Excel + exportIndustry: async (params) => { + return await request.download({ url: `/crm/industry/export-excel`, params }) + } +} \ No newline at end of file diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue index e3d6efc88..5099097a4 100644 --- a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue +++ b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue @@ -687,7 +687,6 @@ watch( /** 弹出气泡卡 */ const openPopover = async (type: string) => { if (type === 'approve') { - emit('updataData') // 校验流程表单 const valid = await validateNormalForm() if (!valid) { diff --git a/src/views/crm/contract/ContractForm.vue b/src/views/crm/contract/ContractForm.vue index a5d016002..a3b5d5bf2 100644 --- a/src/views/crm/contract/ContractForm.vue +++ b/src/views/crm/contract/ContractForm.vue @@ -483,8 +483,8 @@ - - + + { // formLoading.value = true try { let data = await ContractApi.getContract(type) - data.legalPersonName = data.customerDO.legalPersonName - data.creditNo = data.customerDO.creditNo - data.registeredAddress = data.customerDO.registeredAddress - data.actualCapital = data.customerDO.actualCapital - data.socialEmployeeNum = data.customerDO.socialEmployeeNum + // data.legalPersonName = data.customerDO.legalPersonName + // data.creditNo = data.customerDO.creditNo + // data.registeredAddress = data.customerDO.registeredAddress + // data.actualCapital = data.customerDO.actualCapital + // data.socialEmployeeNum = data.customerDO.socialEmployeeNum handleQuotationChange(formData.value.quotationId) formData.value = data } finally { @@ -870,7 +870,7 @@ const resetForm = () => { ownerUserId: undefined, clueDeveloper: undefined, contractor: undefined, - afterSaleUserId: undefined, + maintainer: undefined, collUserId: undefined, totalPrice: undefined, contractBody: undefined, @@ -966,7 +966,7 @@ const onCustomerChange = async (customerId: string) => { formData.value.financingInfo = customerRes.financingInfo; formData.value.socialEmployeeNum = customerRes.socialEmployeeNum; formData.value.registeredAddress = customerRes.registeredAddress; - formData.value.afterSaleUserId = customerRes.maintainer; + formData.value.maintainer = customerRes.maintainer; formData.value.clueDeveloper = customerRes.clueDeveloper; await handleQuotationChange(customerRes.quotationId); diff --git a/src/views/crm/contract/components/ContractAAuthorizedCompanyForm.vue b/src/views/crm/contract/components/ContractAAuthorizedCompanyForm.vue index ca624c210..ff311e6ba 100644 --- a/src/views/crm/contract/components/ContractAAuthorizedCompanyForm.vue +++ b/src/views/crm/contract/components/ContractAAuthorizedCompanyForm.vue @@ -80,6 +80,7 @@ const getList = async (val) => { companyBank: v.companyBank, companyAccount: v.companyAccount, companyAddress: v.companyAddress, + id: v.id }) }) formData.value = newList diff --git a/src/views/crm/contract/components/ContractAuthPersonInfo.vue b/src/views/crm/contract/components/ContractAuthPersonInfo.vue index 5e5435284..3b8d48fc4 100644 --- a/src/views/crm/contract/components/ContractAuthPersonInfo.vue +++ b/src/views/crm/contract/components/ContractAuthPersonInfo.vue @@ -1,5 +1,4 @@ + + + + - -