add 其他收支

src/api/crm/project/index.ts

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

src/views/crm/finance/writeoff/index.vue

@@ -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="unwrittenOffIncomeInvoiceAmount" width="160px" />
-      <el-table-column label="未核销收款金额" align="center" prop="unwrittenOffIncomeAmount" width="230px" />
+      <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="unwrittenOffOutcomeInvoiceAmount" width="160px" />
-      <el-table-column label="未核销付款金额" align="center" prop="unwrittenOffOutcomeAmount" width="230px" />
+      <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>

src/views/crm/project/ProjectForm.vue

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

src/views/crm/project/index.vue

@@ -8,45 +8,190 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="项目名称" prop="deptId">
+      <el-form-item label="关联项目ID" prop="projectId">
-        <el-select
+        <el-input
-          v-model="queryParams.deptId"
+          v-model="queryParams.projectId"
-          class="!w-240px"
+          placeholder="请输入关联项目ID"
-          placeholder="请选择项目名称"
+          clearable
           @keyup.enter="handleQuery"
-        >
+          class="!w-240px"
-          <el-option
-            v-for="item in deptList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
         />
+      </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.settlementStatus"
+          placeholder="请选择结算状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
-      <!-- <el-form-item label="项目合伙人" prop="ownerUserId">
+      <el-form-item label="创建时间" prop="createTime">
-        <el-input
+        <el-date-picker
-          v-model="queryParams.ownerUserId"
+          v-model="queryParams.createTime"
-          placeholder="请输入项目合伙人"
+          value-format="YYYY-MM-DD HH:mm:ss"
-          clearable
+          type="daterange"
-          @keyup.enter="handleQuery"
+          start-placeholder="开始日期"
-          class="!w-240px"
+          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="type">
-        <el-select
-          v-model="queryParams.type"
-          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-select>
       </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" 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="结算记录ID" align="center" prop="id" />
-      
+      <el-table-column label="关联项目ID" align="center" prop="projectId" />
-      <el-table-column label="项目总投资额(万元)" align="center" prop="totalInvestment" width="180"/>
+      <el-table-column label="结算周期(如:2023-Q1)" align="center" prop="settlementPeriod" />
-      <el-table-column label="枪数" align="center" prop="estimatedPiles" />
+      <el-table-column label="结算日期" align="center" prop="settlementDate" />
-      <el-table-column label="单枪成本(万元)" align="center" min-width="120">
+      <el-table-column label="实际营收" align="center" prop="actualRevenue" />
-        <template #default="{ row }">
+      <el-table-column label="政府补贴收入" align="center" prop="governmentSubsidy" />
-          <span>{{ calculateCostPerPile(row) }}</span>
+      <el-table-column label="其他项目收入" align="center" prop="otherIncome" />
-        </template>
+      <el-table-column label="总收入" align="center" prop="totalIncome" />
-      </el-table-column>
+      <el-table-column label="收入备注" align="center" prop="incomeRemark" />
-      <el-table-column align="center" label="类型" prop="type" width="160">
+      <el-table-column label="电费成本" align="center" prop="electricityCost" />
-          <template #default="scope">
+      <el-table-column label="场地租金" align="center" prop="venueRent" />
-          <dict-tag :type="DICT_TYPE.CRM_PROJECT_TYPE" :value="scope.row.type" />
+      <el-table-column label="项目押金" align="center" prop="venueDeposit" />
-        </template>
+      <el-table-column label="项目推介费" align="center" prop="projectPromotion" />
-      </el-table-column>
+      <el-table-column label="设备更新购置费" align="center" prop="equipmentUpgrade" />
-
+      <el-table-column label="管理费用" align="center" prop="managementCost" />
-      <el-table-column align="center" label="供电模式" prop="type" width="160">
+      <el-table-column label="税收" align="center" prop="taxCost" />
-        <template #default="scope">
+      <el-table-column label="总支出" align="center" prop="totalExpenses" />
-          <dict-tag :type="DICT_TYPE.CRM_PROJECT_POWER_SUPPLY_TYPE" :value="scope.row.powerSupplyType" />
+      <el-table-column label="净利润" align="center" prop="netProfit" />
-        </template>
+      <el-table-column label="支出备注" align="center" prop="expenseRemark" />
-      </el-table-column>
+      <el-table-column label="结算状态" align="center" prop="settlementStatus" />
-      <el-table-column align="center" label="状态" prop="projectStatus" width="160">
+      <el-table-column
-        <template #default="scope">
+        label="创建时间"
-          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.projectStatus" />
+        align="center"
-        </template>
+        prop="createTime"
-      </el-table-column>
+        :formatter="dateFormatter"
-      <el-table-column label="操作" fixed="right" align="center" min-width="120px">
+        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 { ProjectSettlementApi, ProjectSettlementVO } from '@/api/crm/project'
-import * as DeptApi from '@/api/system/dept'
+import ProjectSettlementForm from './ProjectSettlementForm.vue'
-import ProjectForm from './ProjectForm.vue'
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 
-/** 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,
+  projectId: undefined,
-  siteId: undefined,
+  settlementPeriod: undefined,
-  ownerUserId: undefined,
+  settlementDate: [],
-  type: undefined,
+  actualRevenue: undefined,
-  projectStatus: undefined,
+  governmentSubsidy: undefined,
-  estimatedPiles: 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)
+    const data = await ProjectSettlementApi.exportProjectSettlement(queryParams)
-    download.excel(data, 'CRM 项目信息.xls')
+    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 () => {
+onMounted(() => {
-  await getList()
+  getList()
-    // 加载部门列表
-  deptList.value = await DeptApi.querySimpleDeptList(3)
 })
 </script>

src/views/crm/receivable/index.vue

@@ -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 () => {