From d61c86aaaba1b77ba9a5b172c0076fbe99722498 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Sat, 16 Mar 2024 15:20:33 +0800
Subject: [PATCH] update

---
 src/views/data_report_information/index.vue | 42 +++--------------
 src/views/data_report_ledger/index.vue      | 51 +++++----------------
 2 files changed, 17 insertions(+), 76 deletions(-)

diff --git a/src/views/data_report_information/index.vue b/src/views/data_report_information/index.vue
index af21e85..409caea 100644
--- a/src/views/data_report_information/index.vue
+++ b/src/views/data_report_information/index.vue
@@ -6,10 +6,7 @@
                     <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 label="委托单位" prop="project_num">
-                    <el-input class="w-[280px]" v-model="queryParams.aunit" clearable placeholder="请输入委托单位" />
+                    <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>
@@ -21,28 +18,16 @@
             <div class="mt-4">
                 <el-table :data="pager.lists">
                     <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="contract_name" show-overflow-tooltip />
                     <el-table-column label="开始日期" prop="starting" show-overflow-tooltip />
                     <el-table-column label="结束日期" prop="endtime" show-overflow-tooltip />
-                    <el-table-column label="咨询类型" prop="types" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.consultation_type" :value="row.types" />
-                        </template>
-                    </el-table-column>
-                    <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="dept.name" show-overflow-tooltip />
-                    <el-table-column label="项目负责人" prop="principal" show-overflow-tooltip />
-                    <el-table-column label="委托单位" prop="aunit" show-overflow-tooltip />
-                    <el-table-column label="建设单位" prop="js_unit" show-overflow-tooltip />
+                    <el-table-column label="咨询类型" prop="types" show-overflow-tooltip />
                     <el-table-column label="项目总投资(万)" prop="invest" show-overflow-tooltip />
-                    <!-- <el-table-column label="汇款" prop="djr" show-overflow-tooltip /> -->
-                    <!-- <el-table-column label="登记时间" prop="apptime" show-overflow-tooltip />
-                    <el-table-column label="形象进度描述" prop="jdms" 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">
@@ -54,34 +39,19 @@
 
 <script lang="ts" setup name="jianliProjectProgressReportLists">
 import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
 import { cost_project_report } from '@/api/data_report'
 
-// 是否显示编辑框
-
-
 // 查询条件
 const queryParams = reactive({
     project_name: "",
     contract_name: "",
-    aunit: ""
 })
 
-// 选中数据
-
-
-// 获取字典数据
-const { dictData } = useDictData('consultation_type,supervision_project_industry')
-
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
     fetchFun: cost_project_report,
     params: queryParams
 })
 
-
-
-
 getLists()
 </script>
-
diff --git a/src/views/data_report_ledger/index.vue b/src/views/data_report_ledger/index.vue
index b14ef2c..a07348e 100644
--- a/src/views/data_report_ledger/index.vue
+++ b/src/views/data_report_ledger/index.vue
@@ -3,18 +3,14 @@
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
                 <el-form-item label="合同名称" prop="num">
-                    <el-input class="w-[280px]" v-model="queryParams.contract_name" clearable placeholder="请输入单据编号" />
+                    <el-input class="w-[280px]" v-model="queryParams.contract_name" clearable placeholder="请输入合同名称" />
                 </el-form-item>
                 <el-form-item label="合同编号" prop="project">
-                    <el-input class="w-[280px]" v-model="queryParams.contract_num" clearable placeholder="请输入项目名称" />
+                    <el-input class="w-[280px]" v-model="queryParams.contract_num" clearable placeholder="请输入合同编号" />
                 </el-form-item>
                 <el-form-item label="甲方签约单位" prop="project">
                     <el-input class="w-[280px]" v-model="queryParams.part_a" clearable placeholder="请输入甲方签约单位" />
                 </el-form-item>
-                <!-- <el-form-item label="甲方签约单位" prop="project_num">
-                    <el-input class="w-[280px]" v-model="queryParams.part_a" clearable placeholder="请输入项目编号" />
-                </el-form-item> -->
-
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
@@ -27,30 +23,18 @@
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="合同名称" prop="contract_name" show-overflow-tooltip />
                     <el-table-column label="合同编号" prop="contract_num" show-overflow-tooltip />
-                    <el-table-column label="合同类型" prop="contract_type" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.cost_contract_type" :value="row.contract_type" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="业务性质" prop="business_nature" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.cost_consultation_business_nature"
-                                :value="row.business_nature" />
-                        </template>
-                    </el-table-column>
+                    <el-table-column label="合同类型" prop="contract_type" show-overflow-tooltip />
                     <el-table-column label="甲方签约单位" prop="part_a" show-overflow-tooltip />
-                    <el-table-column label="合同签订日期" prop="start_date" show-overflow-tooltip />
-                    <el-table-column label="签订部门" prop="dept" show-overflow-tooltip />
-                    <el-table-column label="监管部门" prop="regulators" show-overflow-tooltip />
-                    <el-table-column label="合同结算日期" prop="end_date" show-overflow-tooltip />
-                    <el-table-column label="甲方联系人" prop="part_a_contract" show-overflow-tooltip />
+                    <el-table-column label="乙方签约单位" prop="part_b" show-overflow-tooltip />
+                    <el-table-column label="合同签订日期" prop="create_time" show-overflow-tooltip />
                     <el-table-column label="合同计划开始日期" prop="start_date" show-overflow-tooltip />
+                    <el-table-column label="合同计划结束日期" prop="end_date" show-overflow-tooltip />
                     <el-table-column label="工程总投资(万)" prop="project_money" show-overflow-tooltip />
-                    <!-- <el-table-column label="合同签订金额" prop="djr" show-overflow-tooltip />
-                    <el-table-column label="已开票金额" prop="djr" show-overflow-tooltip />
-                    <el-table-column label="已结算金额" prop="djr" show-overflow-tooltip />
-                    <el-table-column label="已到账金额" prop="djr" show-overflow-tooltip />
-                    <el-table-column label="应收账款" prop="djr" show-overflow-tooltip /> -->
+                    <el-table-column label="合同签订金额" prop="sign_money" 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-column label="已结算金额" prop="total_settlement_amount" show-overflow-tooltip />
+                    <el-table-column label="应收账款" prop="total_collection_amount" show-overflow-tooltip />
                 </el-table>
             </div>
             <div class="flex justify-end mt-4">
@@ -62,12 +46,8 @@
 
 <script lang="ts" setup name="jianliProjectProgressReportLists">
 import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
 import { cost_approved_project_list } from '@/api/data_report'
 
-// 是否显示编辑框
-
-
 // 查询条件
 const queryParams = reactive({
     contract_name: "",
@@ -75,20 +55,11 @@ const queryParams = reactive({
     part_a: ""
 })
 
-// 选中数据
-
-
-// 获取字典数据
-const { dictData } = useDictData('cost_contract_type,cost_consultation_business_nature')
-
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
     fetchFun: cost_approved_project_list,
     params: queryParams
 })
 
-
-
-
 getLists()
 </script>