add 其他收支

pull/853/head
wersd 2025-08-02 15:34:00 +08:00
parent c22bbf169a
commit 30e63e8eee
5 changed files with 300 additions and 190 deletions

View File

@ -1,76 +1,59 @@
import request from '@/config/axios'
// CRM 项目信息 VO
export interface ProjectVO {
id: number // 主键ID
deptId: number // 部门ID
name?: string
siteId: number // 场地ID
totalInvestment: number // 项目总投资额
ownerUserId: string // 项目合伙人
ratio: string // 比例
investment: string // 投资额
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: []
projectStatus: number // 状态
estimatedPiles: number //枪数
}
// 查询CRM 项目信息分页
export const getProjectPage = async (params: any) => {
return await request.get({ url: `/crm/project/page`, params })
}
// 查询CRM 项目信息详情
export const getProject = async (id: number) => {
return await request.get({ url: `/crm/project/get?id=` + id })
}
// 新增CRM 项目信息
export const createProject = async (data: ProjectVO) => {
return await request.post({ url: `/crm/project/create`, data })
}
// 修改CRM 项目信息
export const updateProject = async (data: ProjectVO) => {
return await request.put({ url: `/crm/project/update`, data })
}
// 删除CRM 项目信息
export const deleteProject = async (id: number) => {
return await request.delete({ url: `/crm/project/delete?id=` + id })
}
// 导出CRM 项目信息 Excel
export const exportProject = async (params: any) => {
return await request.download({ url: `/crm/project/export-excel`, params })
}
// 获取项目列表
export const getProjectSimpleList = async () => {
return await request.get({ url: `/crm/project/simple-list` })
}
import request from '@/config/axios'
// 项目利润结算 VO
export interface ProjectSettlementVO {
id: number // 结算记录ID
projectId: number // 关联项目ID
settlementPeriod: string // 结算周期(如:2023-Q1)
settlementDate: Date // 结算日期
actualRevenue: number // 实际营收
governmentSubsidy: number // 政府补贴收入
otherIncome: number // 其他项目收入
totalIncome: number // 总收入
incomeRemark: string // 收入备注
electricityCost: number // 电费成本
venueRent: number // 场地租金
venueDeposit: number // 项目押金
projectPromotion: number // 项目推介费
equipmentUpgrade: number // 设备更新购置费
managementCost: number // 管理费用
taxCost: number // 税收
netProfit: number // 净利润
expenseRemark: string // 支出备注
settlementStatus: number // 结算状态
proofAttachment: string // 结算凭证附件
remark: string // 结算备注
}
// 项目利润结算 API
export const ProjectSettlementApi = {
// 查询项目利润结算分页
getProjectSettlementPage: async (params: any) => {
return await request.get({ url: `/crm/project-settlement/page`, params })
},
// 查询项目利润结算详情
getProjectSettlement: async (id: number) => {
return await request.get({ url: `/crm/project-settlement/get?id=` + id })
},
// 新增项目利润结算
createProjectSettlement: async (data: ProjectSettlementVO) => {
return await request.post({ url: `/crm/project-settlement/create`, data })
},
// 修改项目利润结算
updateProjectSettlement: async (data: ProjectSettlementVO) => {
return await request.put({ url: `/crm/project-settlement/update`, data })
},
// 删除项目利润结算
deleteProjectSettlement: async (id: number) => {
return await request.delete({ url: `/crm/project-settlement/delete?id=` + id })
},
// 导出项目利润结算 Excel
exportProjectSettlement: async (params) => {
return await request.download({ url: `/crm/project-settlement/export-excel`, params })
},
}

View File

@ -44,8 +44,8 @@
</el-link>
</template>
</el-table-column>
<el-table-column label="未核销收款票据金额" align="center" prop="unwrittenOffIncomeInvoiceAmount" width="230px" />
<el-table-column label="未核销收款金额" align="center" prop="unwrittenOffIncomeAmount" width="230px" />
<el-table-column label="未核销收款票据金额" align="center" prop="unwrittenOffIncomeInvoiceAmount" width="160px" />
<el-table-column label="未核销收款金额" align="center" prop="unwrittenOffIncomeAmount" width="160px" />
<el-table-column label="应收额" align="center" prop="unwrittenOffIncomeDiffAmount" width="230px">
<template #header>
<span class="diffAmount">应收额</span>
@ -54,8 +54,8 @@
<span class="diffAmount">{{ scope.row.unwrittenOffIncomeDiffAmount }}</span>
</template>
</el-table-column>
<el-table-column label="未核销付款票据金额" align="center" prop="unwrittenOffOutcomeInvoiceAmount" width="230px" />
<el-table-column label="未核销付款金额" align="center" prop="unwrittenOffOutcomeAmount" width="230px" />
<el-table-column label="未核销付款票据金额" align="center" prop="unwrittenOffOutcomeInvoiceAmount" width="160px" />
<el-table-column label="未核销付款金额" align="center" prop="unwrittenOffOutcomeAmount" width="160px" />
<el-table-column label="应付额" align="center" prop="unwrittenOffOutcomeDiffAmount" width="230px">
<template #header>
<span class="diffAmount">应付额</span>

View File

@ -122,8 +122,6 @@
</el-form-item>
</el-col>
</el-row>
{{ formData }}
<el-row>
<el-col :span="12">
<el-form-item label="设备合同" prop="purchaseContractId">

View File

@ -8,46 +8,191 @@
:inline="true"
label-width="68px"
>
<el-form-item label="项目名称" prop="deptId">
<el-select
v-model="queryParams.deptId"
class="!w-240px"
placeholder="请选择项目名称"
@keyup.enter="handleQuery"
>
<el-option
v-for="item in deptList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="项目合伙人" prop="ownerUserId">
<el-form-item label="关联项目ID" prop="projectId">
<el-input
v-model="queryParams.ownerUserId"
placeholder="请输入项目合伙人"
v-model="queryParams.projectId"
placeholder="请输入关联项目ID"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item> -->
<el-form-item label="类型" prop="type">
</el-form-item>
<el-form-item label="结算周期(如:2023-Q1)" prop="settlementPeriod">
<el-input
v-model="queryParams.settlementPeriod"
placeholder="请输入结算周期(如:2023-Q1)"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="结算日期" prop="settlementDate">
<el-date-picker
v-model="queryParams.settlementDate"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-220px"
/>
</el-form-item>
<el-form-item label="实际营收" prop="actualRevenue">
<el-input
v-model="queryParams.actualRevenue"
placeholder="请输入实际营收"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="政府补贴收入" prop="governmentSubsidy">
<el-input
v-model="queryParams.governmentSubsidy"
placeholder="请输入政府补贴收入"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="其他项目收入" prop="otherIncome">
<el-input
v-model="queryParams.otherIncome"
placeholder="请输入其他项目收入"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="总收入" prop="totalIncome">
<el-input
v-model="queryParams.totalIncome"
placeholder="请输入总收入"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="收入备注" prop="incomeRemark">
<el-input
v-model="queryParams.incomeRemark"
placeholder="请输入收入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="电费成本" prop="electricityCost">
<el-input
v-model="queryParams.electricityCost"
placeholder="请输入电费成本"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="场地租金" prop="venueRent">
<el-input
v-model="queryParams.venueRent"
placeholder="请输入场地租金"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="项目押金" prop="venueDeposit">
<el-input
v-model="queryParams.venueDeposit"
placeholder="请输入项目押金"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="项目推介费" prop="projectPromotion">
<el-input
v-model="queryParams.projectPromotion"
placeholder="请输入项目推介费"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="设备更新购置费" prop="equipmentUpgrade">
<el-input
v-model="queryParams.equipmentUpgrade"
placeholder="请输入设备更新购置费"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="管理费用" prop="managementCost">
<el-input
v-model="queryParams.managementCost"
placeholder="请输入管理费用"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="税收" prop="taxCost">
<el-input
v-model="queryParams.taxCost"
placeholder="请输入税收"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="总支出" prop="totalExpenses">
<el-input
v-model="queryParams.totalExpenses"
placeholder="请输入总支出"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="净利润" prop="netProfit">
<el-input
v-model="queryParams.netProfit"
placeholder="请输入净利润"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="支出备注" prop="expenseRemark">
<el-input
v-model="queryParams.expenseRemark"
placeholder="请输入支出备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="结算状态" prop="settlementStatus">
<el-select
v-model="queryParams.type"
placeholder="请选择类型"
v-model="queryParams.settlementStatus"
placeholder="请选择结算状态"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.CRM_PROJECT_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-220px"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@ -55,7 +200,7 @@
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['crm:project:create']"
v-hasPermi="['crm:project-settlement:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
@ -64,7 +209,7 @@
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['crm:project:export']"
v-hasPermi="['crm:project-settlement:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
@ -75,38 +220,40 @@
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column align="center" label="项目名称" prop="deptName" min-width="300"/>
<el-table-column label="项目总投资额(万元)" align="center" prop="totalInvestment" width="180"/>
<el-table-column label="枪数" align="center" prop="estimatedPiles" />
<el-table-column label="单枪成本(万元)" align="center" min-width="120">
<template #default="{ row }">
<span>{{ calculateCostPerPile(row) }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="类型" prop="type" width="160">
<template #default="scope">
<dict-tag :type="DICT_TYPE.CRM_PROJECT_TYPE" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column align="center" label="供电模式" prop="type" width="160">
<template #default="scope">
<dict-tag :type="DICT_TYPE.CRM_PROJECT_POWER_SUPPLY_TYPE" :value="scope.row.powerSupplyType" />
</template>
</el-table-column>
<el-table-column align="center" label="状态" prop="projectStatus" width="160">
<template #default="scope">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.projectStatus" />
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" min-width="120px">
<el-table-column label="结算记录ID" align="center" prop="id" />
<el-table-column label="关联项目ID" align="center" prop="projectId" />
<el-table-column label="结算周期(如:2023-Q1)" align="center" prop="settlementPeriod" />
<el-table-column label="结算日期" align="center" prop="settlementDate" />
<el-table-column label="实际营收" align="center" prop="actualRevenue" />
<el-table-column label="政府补贴收入" align="center" prop="governmentSubsidy" />
<el-table-column label="其他项目收入" align="center" prop="otherIncome" />
<el-table-column label="总收入" align="center" prop="totalIncome" />
<el-table-column label="收入备注" align="center" prop="incomeRemark" />
<el-table-column label="电费成本" align="center" prop="electricityCost" />
<el-table-column label="场地租金" align="center" prop="venueRent" />
<el-table-column label="项目押金" align="center" prop="venueDeposit" />
<el-table-column label="项目推介费" align="center" prop="projectPromotion" />
<el-table-column label="设备更新购置费" align="center" prop="equipmentUpgrade" />
<el-table-column label="管理费用" align="center" prop="managementCost" />
<el-table-column label="税收" align="center" prop="taxCost" />
<el-table-column label="总支出" align="center" prop="totalExpenses" />
<el-table-column label="净利润" align="center" prop="netProfit" />
<el-table-column label="支出备注" align="center" prop="expenseRemark" />
<el-table-column label="结算状态" align="center" prop="settlementStatus" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center" min-width="120px">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['crm:project:update']"
v-hasPermi="['crm:project-settlement:update']"
>
编辑
</el-button>
@ -114,7 +261,7 @@
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['crm:project:delete']"
v-hasPermi="['crm:project-settlement:delete']"
>
删除
</el-button>
@ -131,46 +278,56 @@
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<ProjectForm ref="formRef" @success="getList" />
<ProjectSettlementForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import * as ProjectApi from '@/api/crm/project'
import * as DeptApi from '@/api/system/dept'
import ProjectForm from './ProjectForm.vue'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import { ProjectSettlementApi, ProjectSettlementVO } from '@/api/crm/project'
import ProjectSettlementForm from './ProjectSettlementForm.vue'
/** CRM 项目信息 列表 */
defineOptions({ name: 'CrmProject' })
/** 项目利润结算 列表 */
defineOptions({ name: 'CrmProjectSettlement' })
const message = useMessage() //
const { t } = useI18n() //
const loading = ref(true) //
const list = ref<ProjectApi.ProjectVO[]>([]) //
const list = ref<ProjectSettlementVO[]>([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
deptId: undefined,
siteId: undefined,
ownerUserId: undefined,
type: undefined,
projectStatus: undefined,
estimatedPiles: undefined,
projectId: undefined,
settlementPeriod: undefined,
settlementDate: [],
actualRevenue: undefined,
governmentSubsidy: undefined,
otherIncome: undefined,
totalIncome: undefined,
incomeRemark: undefined,
electricityCost: undefined,
venueRent: undefined,
venueDeposit: undefined,
projectPromotion: undefined,
equipmentUpgrade: undefined,
managementCost: undefined,
taxCost: undefined,
totalExpenses: [],
netProfit: undefined,
expenseRemark: undefined,
settlementStatus: undefined,
createTime: [],
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
const deptList = ref<DeptApi.DeptVO[]>([])
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await ProjectApi.getProjectPage(queryParams)
const data = await ProjectSettlementApi.getProjectSettlementPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
@ -178,11 +335,6 @@ const getList = async () => {
}
}
/** 打开场地详情 */
const { push } = useRouter()
const openSiteDetail = (id: number) => {
push({ name: 'CrmStationSiteDetail', params: { id } })
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
@ -207,7 +359,7 @@ const handleDelete = async (id: number) => {
//
await message.delConfirm()
//
await ProjectApi.deleteProject(id)
await ProjectSettlementApi.deleteProjectSettlement(id)
message.success(t('common.delSuccess'))
//
await getList()
@ -221,34 +373,16 @@ const handleExport = async () => {
await message.exportConfirm()
//
exportLoading.value = true
const data = await ProjectApi.exportProject(queryParams)
download.excel(data, 'CRM 项目信息.xls')
const data = await ProjectSettlementApi.exportProjectSettlement(queryParams)
download.excel(data, '项目利润结算.xls')
} catch {
} finally {
exportLoading.value = false
}
}
const calculateCostPerPile = (row) => {
//
if (!row.estimatedPiles || isNaN(row.estimatedPiles) || row.estimatedPiles <= 0) {
return ''; //
}
//
if (!row.totalInvestment || isNaN(row.totalInvestment)) {
return ''; //
}
//
const cost = (row.totalInvestment / row.estimatedPiles).toFixed(2);
return parseFloat(cost); // 0
};
/** 初始化 **/
onMounted(async () => {
await getList()
//
deptList.value = await DeptApi.querySimpleDeptList(3)
onMounted(() => {
getList()
})
</script>

View File

@ -373,7 +373,6 @@ const queryParams = reactive({
receivableType: undefined,
priceMin: undefined, //
priceMax: undefined, //
isDeposit: undefined, //
transactionType: undefined, //
})
@ -384,10 +383,6 @@ const customerList = ref<CustomerApi.CustomerVO[]>([]) // 客户列表
const deptList = ref<DeptApi.DeptVO[]>([])
const projectList = ref<ProjectApi.ProjectVO[]>([])
const showSummaryDialog = ref(false)
const options = ref([
{ label: '是', value: 1 },
{ label: '否', value: 0 }
])
/** 查询列表 */
const getList = async () => {