diff --git a/src/api/crm/project/index.ts b/src/api/crm/project/index.ts index cc9674d33..44d3f30a3 100644 --- a/src/api/crm/project/index.ts +++ b/src/api/crm/project/index.ts @@ -10,15 +10,29 @@ export interface ProjectVO { ownerUserId: string // 项目合伙人 ratio: string // 比例 investment: string // 投资额 - cooperationAgreement: number // 场地租赁合同或合作协议 + cooperationAgreement: number // 场地租赁合同 purchaseContractId: number // 设备采购合同ID epcContractId: number // EPC施工合同ID + cooperationAgreementName?: String // 场地租赁合同名称 + purchaseContractName?: String // 设备采购合同名称 + epcContractName?: String // EPC施工合同名称 buildPermit: string // 同意建桩证明 ownershipProof: string // 场地权属证明 projectRecord: string // 项目备案 powerSupplyReply: string // 供电答复单 investmentAgreement: string // 合作投资协议 + investmentShareAgreement: string // 合作投资分成协议 supplementaryMaterials: string // 其他补充材料文件路径 + cooperationAgreementConfig?: number // 场地租赁合同配置 + purchaseContractConfig?: number // 设备采购合同配置 + epcContractConfig?: number // EPC施工合同配置 + buildPermitConfig?: number // 同意建桩证明配置 + ownershipProofConfig?: number // 场地权属证明配置 + projectRecordConfig?: number // 项目备案配置 + powerSupplyReplyConfig?: number // 供电答复单配置 + investmentAgreementConfig?: number // 合作投资协议配置 + investmentShareAgreementConfig?: number // 合作投资分成协议配置 + supplementaryMaterialsConfig?: number // 其他补充材料配置 type: number // 类型 partners: [] RevenueSharePartners: [] diff --git a/src/api/crm/receivable/plan/index.ts b/src/api/crm/receivable/plan/index.ts index 32f8d8f0d..46030fb03 100644 --- a/src/api/crm/receivable/plan/index.ts +++ b/src/api/crm/receivable/plan/index.ts @@ -84,3 +84,8 @@ export const submitReceivablePlan = async (id: number) => { return await request.put({ url: `/crm/receivable-plan/submit?id=${id}`}) } +// 获取汇总数据 +export const getWaitPayData = async () => { + return await request.get({ url: `/crm/receivable-plan/getWaitPayData`}) +} + diff --git a/src/utils/dict.ts b/src/utils/dict.ts index cf77c4305..851d2282f 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -224,6 +224,7 @@ export enum DICT_TYPE { CRM_CONTRACT_ATTRIBUTE = 'crm_contract_attribute', // CRM 合同属性 CRM_PROJECT_TYPE = 'crm_project_type', // CRM 项目类型 CRM_PROJECT_POWER_SUPPLY_TYPE = 'crm_project_power_supply_type', // CRM 项目供电模式 + CRM_PROJECT_DOCUMENT_CONFIG = 'crm_project_document_config', // CRM 项目文档配置 // ========== ERP - 企业资源计划模块 ========== ERP_AUDIT_STATUS = 'erp_audit_status', // ERP 审批状态 diff --git a/src/views/crm/contract/ContractForm.vue b/src/views/crm/contract/ContractForm.vue index 38dce8ebc..2d0deb78a 100644 --- a/src/views/crm/contract/ContractForm.vue +++ b/src/views/crm/contract/ContractForm.vue @@ -416,7 +416,6 @@ const resetForm = () => { const handleCustomerChange = () => { formData.value.businessId = undefined formData.value.signContactId = undefined - formData.value.products = [] } diff --git a/src/views/crm/project/ProjectForm.vue b/src/views/crm/project/ProjectForm.vue index 46c08491d..3f7911c51 100644 --- a/src/views/crm/project/ProjectForm.vue +++ b/src/views/crm/project/ProjectForm.vue @@ -123,6 +123,7 @@ + {{ formData }} @@ -238,6 +239,17 @@ /> + + + + + ({ type: [{ required: true, message: '类型不能为空', trigger: 'change' }], projectStatus: [{ required: true, message: '状态不能为空', trigger: 'blur' }], powerSupplyType: [{ required: true, message: '供电类型不能为空', trigger: 'blur' }], - powerSupplyReply : formData.value.powerSupplyType === 2 ? [{ required: true, message: '供电答复单不能为空', trigger: 'blur' }] : [], - investmentAgreement: formData.value.type === 2 ?[{ required: true, message: '合作投资协议不能为空', trigger: 'blur' }] : [], cooperationAgreement: [{ required: true, message: '场地合同不能为空', trigger: 'blur' }], epcContractId: [{ required: true, message: 'EPC合同不能为空', trigger: 'blur' }], purchaseContractId: [{ required: true, message: '设备合同不能为空', trigger: 'blur' }], @@ -411,6 +422,7 @@ const resetForm = () => { projectRecord: undefined, powerSupplyReply: undefined, investmentAgreement: undefined, + investmentShareAgreement: undefined, supplementaryMaterials: [], partners:[], revenueSharePartners:[], diff --git a/src/views/crm/project/component/ProjectPartnerForm.vue b/src/views/crm/project/component/ProjectPartnerForm.vue index ba3d2cd08..91ad3040b 100644 --- a/src/views/crm/project/component/ProjectPartnerForm.vue +++ b/src/views/crm/project/component/ProjectPartnerForm.vue @@ -19,7 +19,7 @@ filterable clearable placeholder="请选择" - style="width: 150px" + style="min-width: 150px" > 导出 + + + + 查看汇总 + + @@ -207,14 +213,14 @@ > 创建付款 - + + + +
+
暂无数据
+
+
+