diff --git a/src/views/data_report_collection/index.vue b/src/views/data_report_collection/index.vue
index e6a9b68..470fa72 100644
--- a/src/views/data_report_collection/index.vue
+++ b/src/views/data_report_collection/index.vue
@@ -2,13 +2,12 @@
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
- <el-form-item label="单位名称" prop="aunit">
- <el-input class="w-[280px]" v-model="queryParams.aunit" clearable placeholder="请输入单位名称" />
- </el-form-item>
<el-form-item label="项目名称" prop="project">
<el-input class="w-[280px]" v-model="queryParams.project_name" clearable placeholder="请输入项目名称" />
</el-form-item>
-
+ <el-form-item label="合同名称" prop="project_num">
+ <el-input class="w-[280px]" v-model="queryParams.contract_name" clearable placeholder="请输入合同名称" />
+ </el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
@@ -23,11 +22,11 @@
<el-table-column type="selection" width="55" />
<el-table-column label="项目编号" prop="project_num" show-overflow-tooltip />
<el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
- <el-table-column label="合同名称" prop="cost_project_contract" show-overflow-tooltip />
- <el-table-column label="所属部门" prop="depar" show-overflow-tooltip />
- <el-table-column label="项目负责人" prop="principal" show-overflow-tooltip />
- <el-table-column label="开票金额" prop="has_invoice_amount" show-overflow-tooltip />
- <el-table-column label="收款金额" prop="amount_Collected" show-overflow-tooltip />
+ <el-table-column label="合同名称" prop="contract_name" show-overflow-tooltip />
+ <el-table-column label="所属部门" prop="dept_name" show-overflow-tooltip />
+ <el-table-column label="项目负责人" prop="project_director" show-overflow-tooltip />
+ <el-table-column label="开票金额" prop="total_invoice_amount" show-overflow-tooltip />
+ <el-table-column label="收款金额" prop="total_refund_amount" show-overflow-tooltip />
</el-table>
</div>
<div class="flex justify-end mt-4">
@@ -39,8 +38,6 @@
<script lang="ts" setup name="jianliProjectProgressReportLists">
import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-// import { apiJianliProjectProgressReportLists, apiJianliProjectProgressReportDelete, apiJianliProjectProgressReportDetail } from '@/api/jianli_project_progress_report'
import { apiproject_invoice_receipt } from '@/api/data_report'
// 是否显示编辑框
@@ -49,15 +46,9 @@ import { apiproject_invoice_receipt } from '@/api/data_report'
// 查询条件
const queryParams = reactive({
project_name: '',
- aunit: '',
+ contract_name: '',
})
-// 选中数据
-
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
// 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiproject_invoice_receipt,
diff --git a/src/views/data_report_course/index.vue b/src/views/data_report_course/index.vue
index cf01ac0..e766df5 100644
--- a/src/views/data_report_course/index.vue
+++ b/src/views/data_report_course/index.vue
@@ -20,8 +20,8 @@
<el-table-column type="selection" width="55" />
<el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
<el-table-column label="合同名称" prop="contract_name" show-overflow-tooltip />
- <el-table-column label="部门" prop="dept.name" show-overflow-tooltip />
- <el-table-column label="项目负责人" prop="principal" show-overflow-tooltip />
+ <el-table-column label="部门" prop="dept_name" show-overflow-tooltip />
+ <el-table-column label="项目负责人" prop="project_director" show-overflow-tooltip />
<el-table-column label="任务分配状态" prop="task_allocation_status" show-overflow-tooltip>
<template #default="{ row }">
{{ row.task_allocation_status ? '已分配' : "未分配" }}
@@ -38,10 +38,9 @@
{{ row.task_handling_three_level_review_status ? '已上传' : "未上传" }}
</template>
</el-table-column>
- <!-- <el-table-column label="回款金额" prop="regulators" show-overflow-tooltip />
- <el-table-column label="开票金额" prop="working_hours" show-overflow-tooltip />
- <el-table-column label="提成金额" prop="part_a_contract" show-overflow-tooltip />
- <el-table-column label="进度款金额" prop="start_date" show-overflow-tooltip /> -->
+ <el-table-column label="到账金额" prop="total_refund_amount" show-overflow-tooltip />
+ <el-table-column label="开票金额" prop="total_invoice_amount" show-overflow-tooltip />
+ <el-table-column label="提成金额" prop="total_commission_amount" show-overflow-tooltip />
</el-table>
</div>
<div class="flex justify-end mt-4">
@@ -53,7 +52,6 @@
<script lang="ts" setup name="jianliProjectProgressReportLists">
import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
import { project_trace } from '@/api/data_report'
// 是否显示编辑框
@@ -65,12 +63,6 @@ const queryParams = reactive({
project_name: "",
})
-// 选中数据
-
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
// 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: project_trace,
diff --git a/src/views/project_commission/index.vue b/src/views/project_commission/index.vue
index 7b304b8..eb5c455 100644
--- a/src/views/project_commission/index.vue
+++ b/src/views/project_commission/index.vue
@@ -61,20 +61,16 @@
</template>
</el-table-column>
<el-table-column label="单据编号" prop="num" show-overflow-tooltip />
- <el-table-column label="项目名称" prop="projectInfo.project_name" show-overflow-tooltip />
+ <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
- <el-table-column label="项目编号" prop="projectInfo.project_num" show-overflow-tooltip />
- <el-table-column label="项目负责人" prop="projectInfo.principal" show-overflow-tooltip />
- <el-table-column label="关联合同" prop="contract.contract_name" show-overflow-tooltip />
- <el-table-column label="行业" prop="industry" show-overflow-tooltip>
- <template #default="{ row }">
- <dict-value :options="dictData.supervision_project_industry" :value="row.industry" />
- </template>
- </el-table-column>
- <el-table-column label="项目回款总额" prop="hk" show-overflow-tooltip />
+ <el-table-column label="项目编号" prop="project_num" show-overflow-tooltip />
+ <el-table-column label="项目负责人" prop="project_director" show-overflow-tooltip />
+ <el-table-column label="关联合同" prop="contract_name" show-overflow-tooltip />
+ <el-table-column label="行业" prop="industry_nature" show-overflow-tooltip />
+ <el-table-column label="项目回款总额" prop="total_refund_amount" show-overflow-tooltip />
<el-table-column label="提成比例（%）" prop="rate" show-overflow-tooltip />
- <el-table-column label="应提成总金额" prop="ticheng" show-overflow-tooltip />
- <el-table-column label="已支付总额" prop="paid_amount" show-overflow-tooltip />
+ <el-table-column label="应提成总金额" prop="total_commission_amount" show-overflow-tooltip />
+ <el-table-column label="已支付总额" prop="total_pay_amount" show-overflow-tooltip />
<el-table-column label="本次支付总额" prop="bczfze" show-overflow-tooltip />
<el-table-column label="登记人" prop="djr" show-overflow-tooltip />
<el-table-column label="登记日期" prop="apptime" show-overflow-tooltip />