diff --git a/.env.test b/.env.test index 2252e146d..e911da88a 100644 --- a/.env.test +++ b/.env.test @@ -4,7 +4,7 @@ NODE_ENV=production VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://localhost:48080' +VITE_BASE_URL='http://172.22.3.168:48080' # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务 VITE_UPLOAD_TYPE=server diff --git a/src/api/crm/permission/index.ts b/src/api/crm/permission/index.ts index 4f88b14fc..9352abbba 100644 --- a/src/api/crm/permission/index.ts +++ b/src/api/crm/permission/index.ts @@ -34,7 +34,8 @@ export enum BizTypeEnum { CRM_CONTRACT = 5, // 合同 CRM_PRODUCT = 6, // 产品 CRM_RECEIVABLE = 7, // 回款 - CRM_RECEIVABLE_PLAN = 8 // 回款计划 + CRM_RECEIVABLE_PLAN = 8, // 回款计划 + CRM_QUOTATION = 9 // 报价 } /** diff --git a/src/views/bpm/processInstance/detail/index.vue b/src/views/bpm/processInstance/detail/index.vue index c5436820a..831aa2129 100644 --- a/src/views/bpm/processInstance/detail/index.vue +++ b/src/views/bpm/processInstance/detail/index.vue @@ -42,7 +42,7 @@
- +
- + @@ -238,7 +238,7 @@ const getApprovalDetail = async () => { }) } else { // 注意:data.processDefinition.formCustomViewPath 是组件的全路径,例如说:/crm/contract/detail/index.vue - BusinessFormComponent.value = registerComponent(data.processDefinition.formCustomViewPath) + BusinessFormComponent.value = registerComponent('data.processDefinition.formCustomViewPath') } // 获取审批节点,显示 Timeline 的数据 diff --git a/src/views/crm/business/BusinessForm.vue b/src/views/crm/business/BusinessForm.vue index 733820b2c..0cfbf4c67 100644 --- a/src/views/crm/business/BusinessForm.vue +++ b/src/views/crm/business/BusinessForm.vue @@ -14,11 +14,11 @@ - + diff --git a/src/views/crm/quotation/index.vue b/src/views/crm/quotation/index.vue index 122242847..b84e09d18 100644 --- a/src/views/crm/quotation/index.vue +++ b/src/views/crm/quotation/index.vue @@ -84,8 +84,19 @@ + + + + + - + + +