diff --git a/.env.local b/.env.local index 72544bdb4..13220e6be 100644 --- a/.env.local +++ b/.env.local @@ -4,7 +4,7 @@ NODE_ENV=development VITE_DEV=true # 请求路径 -VITE_BASE_URL='http://8.130.12.151:48080' +VITE_BASE_URL='http://8.130.12.151/:48080' # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务 VITE_UPLOAD_TYPE=server diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 37cbdb119..e514ff2b7 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -225,6 +225,7 @@ export enum DICT_TYPE { CRM_RETURN_VISIT_STSTUS = "crm_return_visit_type", //CRM 回访类型 CRM_COMPLAINT_METHOD = "crm_complaint_method", // 投诉方式 CRM_COMPLAINT_LEVEL = "crm_complaint_level", // 投诉级别 + TECH_SUPPORT = "tech_support", // 是否 // 商机账期 PAYMENT_TERM = "payment_term", // 投诉级别 diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue index 199ed09e7..1943566af 100644 --- a/src/views/Home/Index.vue +++ b/src/views/Home/Index.vue @@ -1,339 +1,11 @@ diff --git a/src/views/bpm/processInstance/detail/index.vue b/src/views/bpm/processInstance/detail/index.vue index c3f83cf06..c5436820a 100644 --- a/src/views/bpm/processInstance/detail/index.vue +++ b/src/views/bpm/processInstance/detail/index.vue @@ -42,7 +42,7 @@
- +
- + diff --git a/src/views/bpm/task/todo/index.vue b/src/views/bpm/task/todo/index.vue index 45a2eb449..9c0df6b7d 100644 --- a/src/views/bpm/task/todo/index.vue +++ b/src/views/bpm/task/todo/index.vue @@ -148,7 +148,7 @@ prop="processInstanceId" :show-overflow-tooltip="true" /> - + \ No newline at end of file diff --git a/src/views/crm/contract/components/ContractAuthPersonInfo.vue b/src/views/crm/contract/components/ContractAuthPersonInfo.vue new file mode 100644 index 000000000..94e8248bc --- /dev/null +++ b/src/views/crm/contract/components/ContractAuthPersonInfo.vue @@ -0,0 +1,46 @@ + + \ No newline at end of file diff --git a/src/views/crm/contract/components/ContractChangeLimit.vue b/src/views/crm/contract/components/ContractChangeLimit.vue index c73b06bd4..dd70ff3d8 100644 --- a/src/views/crm/contract/components/ContractChangeLimit.vue +++ b/src/views/crm/contract/components/ContractChangeLimit.vue @@ -4,12 +4,10 @@ ref="formRef" :model="formData" :rules="formRules" - label-width="110px" + label-width="130px" v-loading="formLoading" > - - @@ -22,17 +20,31 @@ - + - + - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + @@ -96,8 +74,8 @@ - - + + 是 否 @@ -112,24 +90,24 @@ - - + + 是 否 - - + + 是 否 - - + + 是 否 @@ -138,9 +116,20 @@ + + + + + + - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + -
- 确 定 - 取 消 -
\ No newline at end of file diff --git a/src/views/crm/contract/components/ContractExtension.vue b/src/views/crm/contract/components/ContractExtension.vue new file mode 100644 index 000000000..74cca08cc --- /dev/null +++ b/src/views/crm/contract/components/ContractExtension.vue @@ -0,0 +1,348 @@ + + \ No newline at end of file diff --git a/src/views/crm/contract/components/QuotationList.vue b/src/views/crm/contract/components/QuotationList.vue new file mode 100644 index 000000000..93b5e17ea --- /dev/null +++ b/src/views/crm/contract/components/QuotationList.vue @@ -0,0 +1,161 @@ + + + \ No newline at end of file diff --git a/src/views/crm/contract/index.vue b/src/views/crm/contract/index.vue index e3eae4057..b50fc08e4 100644 --- a/src/views/crm/contract/index.vue +++ b/src/views/crm/contract/index.vue @@ -331,7 +331,7 @@ const router = useRouter() // 路由 const openFormEdit = (row: Object) => { - push({ name: 'CrmContractEdit', query: { id: row.id} }) + router.push({ name: 'CrmContractEdit', query: { id: row.id} }) } const openFormAdd = () => { push({ name: 'CrmContractAdd' }) diff --git a/src/views/crm/customer/CustomerForm.vue b/src/views/crm/customer/CustomerForm.vue index 561082a76..3771ceb08 100644 --- a/src/views/crm/customer/CustomerForm.vue +++ b/src/views/crm/customer/CustomerForm.vue @@ -14,10 +14,10 @@ - + @@ -58,7 +58,7 @@ - + - + - - @@ -112,8 +110,6 @@ - - @@ -125,8 +121,6 @@ - - @@ -143,7 +137,6 @@ /> - - { if (formType.value === 'create') { formData.value.ownerUserId = useUserStore().getUser.id formData.value.developer = useUserStore().getUser.id - formData.value.assist = useUserStore().getUser.id + // formData.value.assist = useUserStore().getUser.id } } @@ -338,7 +331,7 @@ const resetForm = () => { source: undefined, reamark: undefined, developer: undefined, - assist: undefined, + assist: [], clueDeveloper: undefined, } formRef.value?.resetFields() diff --git a/src/views/crm/customer/detail/index.vue b/src/views/crm/customer/detail/index.vue index 05c2d48b0..c3c9b3709 100644 --- a/src/views/crm/customer/detail/index.vue +++ b/src/views/crm/customer/detail/index.vue @@ -63,6 +63,9 @@ + + + @@ -95,6 +98,7 @@ import ReturnVisitrecord from './returnvisitrecord/index.vue' // 回访 import ContactList from '@/views/crm/contact/components/ContactList.vue' // 联系人列表 import ContractList from '@/views/crm/contract/components/ContractList.vue' // 合同列表 import BusinessList from '@/views/crm/business/components/BusinessList.vue' // 商机列表 +import QuotationList from '@/views/crm/contract/components/QuotationList.vue' // 报价列表 import ReceivableList from '@/views/crm/receivable/components/ReceivableList.vue' // 回款列表 import ReceivablePlanList from '@/views/crm/receivable/plan/components/ReceivablePlanList.vue' // 回款计划列表 import PermissionList from '@/views/crm/permission/components/PermissionList.vue' // 团队成员列表（权限） @@ -169,19 +173,19 @@ const handleUnlock = async () => { await getCustomer() } -/** 领取客户 */ -const handleReceive = async () => { - await message.confirm(`确定领取客户【${customer.value.name}】 吗？`) - await CustomerApi.receiveCustomer([unref(customerId.value)]) - message.success(`领取客户【${customer.value.name}】成功`) - await getCustomer() -} +// /** 领取客户 */ +// const handleReceive = async () => { +// await message.confirm(`确定领取客户【${customer.value.name}】 吗？`) +// await CustomerApi.receiveCustomer([unref(customerId.value)]) +// message.success(`领取客户【${customer.value.name}】成功`) +// await getCustomer() +// } -/** 分配客户 */ -const distributeForm = ref>() // 分配客户表单 Ref -const handleDistributeForm = async () => { - distributeForm.value?.open(customerId.value) -} +// /** 分配客户 */ +// const distributeForm = ref>() // 分配客户表单 Ref +// const handleDistributeForm = async () => { +// distributeForm.value?.open(customerId.value) +// } /** 客户放入公海 */ const handlePutPool = async () => { diff --git a/src/views/crm/customer/pool/index.vue b/src/views/crm/customer/pool/index.vue index eab90e0c4..559aa4a46 100644 --- a/src/views/crm/customer/pool/index.vue +++ b/src/views/crm/customer/pool/index.vue @@ -161,6 +161,26 @@ width="180px" /> + + + + + + +