From 8332e22f8e90e6e24ca9c00073ff7e2ea8fa3907 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Thu, 14 Mar 2024 10:18:46 +0800
Subject: [PATCH 1/2] update

---
 src/views/apply_with_seal/index.vue           | 42 +++++++++++--
 .../jianli_project_progress_report/index.vue  | 47 ++++++++++----
 .../project_change_visa_content/index.vue     |  7 +--
 src/views/project_progress_payment/index.vue  | 53 +++++++++++-----
 src/views/project_rectification/index.vue     | 61 ++++++++++++++-----
 src/views/project_survey_signature/index.vue  | 44 ++++++++++---
 6 files changed, 196 insertions(+), 58 deletions(-)

diff --git a/src/views/apply_with_seal/index.vue b/src/views/apply_with_seal/index.vue
index 4a74e3b..41eb7c3 100644
--- a/src/views/apply_with_seal/index.vue
+++ b/src/views/apply_with_seal/index.vue
@@ -2,10 +2,22 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="关联项目" prop="cost_project_id">
+                    <el-select v-model="queryParams.project_id" remote filterable :remote-method="queryCostProject"
+                        :loading="loading" class="flex-1">
+                        <el-option v-for="(item, index) in optionsData.projectList" :key="index"
+                            :label="item.projectinfo" :value="item.id" />
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="申请编号" prop="num">
                     <el-input class="w-[280px]" v-model="queryParams.num" clearable placeholder="请输入申请编号" />
                 </el-form-item>
-
+                <el-form-item label="盖章人" prop="stampman">
+                    <el-input class="w-[280px]" v-model="queryParams.stampman" clearable placeholder="请输入盖章人" />
+                </el-form-item>
+                <el-form-item label="申请人" prop="applicant">
+                    <el-input class="w-[280px]" v-model="queryParams.applicant" clearable placeholder="请输入申请人" />
+                </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
@@ -29,6 +41,7 @@
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
                     <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="types">
                         <template #default="{ row }">
                             <dict-value :options="dictData.apply_with_seal_type" :value="row.types" />
@@ -47,9 +60,7 @@
                     <el-table-column label="印章名称" prop="name" show-overflow-tooltip />
                     <el-table-column label="盖章次数" prop="frequency" show-overflow-tooltip />
                     <el-table-column label="限制次数" prop="limit" show-overflow-tooltip />
-                    <!-- <el-table-column label="用印部门" prop="depar" show-overflow-tooltip /> -->
                     <el-table-column label="盖章人" prop="stampman" show-overflow-tooltip />
-                    <el-table-column label="关联项目" prop="projectInfo.project_name" show-overflow-tooltip />
                     <el-table-column label="项目负责人" prop="projectInfo.principal" show-overflow-tooltip />
                     <el-table-column label="盖章内容" prop="content" show-overflow-tooltip />
                     <el-table-column label="印章是否外借" prop="loan" show-overflow-tooltip>
@@ -59,8 +70,6 @@
                     </el-table-column>
                     <el-table-column label="印章借用日期" prop="borrow" show-overflow-tooltip />
                     <el-table-column label="结束借用日期" prop="returndate" show-overflow-tooltip />
-                    <!-- <el-table-column label="申请人" prop="applicant" show-overflow-tooltip /> -->
-                    <!-- <el-table-column label="申请日期" prop="date" show-overflow-tooltip /> -->
                     <el-table-column label="实际借章日期" prop="sjborrow" show-overflow-tooltip />
                     <el-table-column label="实际借章人" prop="sjborrower" show-overflow-tooltip />
                     <el-table-column label="实际归还日期" prop="sjreturn" show-overflow-tooltip />
@@ -93,15 +102,38 @@ import { useDictData } from '@/hooks/useDictOptions'
 import { apiApplyWithSealLists, apiApplyWithSealDelete, apiApplyWithSealDetail } from '@/api/apply_with_seal'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import { apiCostProjectDatas } from "@/api/cost_project";
+import { useDictOptions } from "@/hooks/useDictOptions"
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
 const showEdit = ref(false)
+const loading = ref(false)
 
+const queryCostProject = async (query: string) => {
+    loading.value = true
+    const projectList = await apiCostProjectDatas({
+        name: query ?? ''
+    })
+    optionsData.projectList = projectList
+    loading.value = false
+}
+
+
+const { optionsData } = useDictOptions<{
+    projectList: any[]
+}>({
+    projectList: {
+        api: apiCostProjectDatas,
+    }
+})
 
 // 查询条件
 const queryParams = reactive({
     num: '',
+    project_id: '',
+    stampman: '',
+    applicant: '',
 })
 
 // 选中数据
diff --git a/src/views/jianli_project_progress_report/index.vue b/src/views/jianli_project_progress_report/index.vue
index 0d7d284..c0d789c 100644
--- a/src/views/jianli_project_progress_report/index.vue
+++ b/src/views/jianli_project_progress_report/index.vue
@@ -2,16 +2,22 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="所属项目" prop="cost_project_id">
+                    <el-select v-model="queryParams.project_id" remote filterable :remote-method="queryCostProject"
+                        :loading="loading" class="flex-1">
+                        <el-option v-for="(item, index) in optionsData.projectList" :key="index"
+                            :label="item.projectinfo" :value="item.id" />
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="单据编号" prop="num">
                     <el-input class="w-[280px]" v-model="queryParams.num" 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 label="委托单位" prop="wt_unit">
+                    <el-input class="w-[280px]" v-model="queryParams.wt_unit" clearable placeholder="请输入委托单位" />
                 </el-form-item>
-                <el-form-item label="项目编号" prop="project_num">
-                    <el-input class="w-[280px]" v-model="queryParams.project_num" clearable placeholder="请输入项目编号" />
+                <el-form-item label="登记人" prop="djr">
+                    <el-input class="w-[280px]" v-model="queryParams.djr" clearable placeholder="请输入登记人" />
                 </el-form-item>
-
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
@@ -37,15 +43,14 @@
                     <el-table-column type="selection" width="55" />
                     <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="projectInfo.project_num" show-overflow-tooltip />
                     <el-table-column label="部门负责人" prop="bm_master" show-overflow-tooltip />
                     <el-table-column label="委托单位" prop="wt_unit" show-overflow-tooltip />
                     <el-table-column label="项目负责人" prop="xm_master" 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="duration" show-overflow-tooltip />
+                    <el-table-column label="工期(天)" prop="duration" show-overflow-tooltip />
                     <el-table-column label="工时" prop="working_hours" show-overflow-tooltip />
-                    <el-table-column label="累计已完成进度（%）" prop="done_progress" show-overflow-tooltip />
+                    <el-table-column label="累计已完成进度(%)" prop="done_progress" show-overflow-tooltip />
                     <el-table-column label="本阶段完成进度(%)" prop="bjd_progress" show-overflow-tooltip />
                     <el-table-column label="登记人" prop="djr" show-overflow-tooltip />
                     <el-table-column label="登记时间" prop="apptime" show-overflow-tooltip />
@@ -79,18 +84,38 @@ import { apiJianliProjectProgressReportLists, apiJianliProjectProgressReportDele
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import { apiCostProjectDatas } from "@/api/cost_project";
+import { useDictOptions } from "@/hooks/useDictOptions"
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
 const showEdit = ref(false)
+const loading = ref(false)
 
+const queryCostProject = async (query: string) => {
+    loading.value = true
+    const projectList = await apiCostProjectDatas({
+        name: query ?? ''
+    })
+    optionsData.projectList = projectList
+    loading.value = false
+}
+
+
+const { optionsData } = useDictOptions<{
+    projectList: any[]
+}>({
+    projectList: {
+        api: apiCostProjectDatas,
+    }
+})
 
 // 查询条件
 const queryParams = reactive({
     num: '',
-    project_name: '',
-    project_num: '',
-    datas: '',
+    project_id: '',
+    wt_unit: '',
+    djr: '',
 })
 
 // 选中数据
diff --git a/src/views/project_change_visa_content/index.vue b/src/views/project_change_visa_content/index.vue
index a99e659..29e225e 100644
--- a/src/views/project_change_visa_content/index.vue
+++ b/src/views/project_change_visa_content/index.vue
@@ -49,15 +49,14 @@
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="所在目录" prop="directory" show-overflow-tooltip />
                     <el-table-column label="单位名称" prop="unit_name" show-overflow-tooltip />
-                    <el-table-column label="时间" prop="time" show-overflow-tooltip />
                     <el-table-column label="所属专业" prop="major" show-overflow-tooltip />
                     <el-table-column label="类别" prop="category" show-overflow-tooltip />
+                    <el-table-column label="施工单位申报值" prop="declared_value" show-overflow-tooltip />
+                    <el-table-column label="咨询单位测算值" prop="calculated_value" show-overflow-tooltip />
                     <el-table-column label="审核内容" prop="review_content" show-overflow-tooltip />
                     <el-table-column label="审核意见" prop="review_comments" show-overflow-tooltip />
                     <el-table-column label="审核人" prop="reviewer" show-overflow-tooltip />
-                    <el-table-column label="施工单位申报值" prop="declared_value" show-overflow-tooltip />
-                    <el-table-column label="咨询单位测算值" prop="calculated_value" show-overflow-tooltip />
-                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
+                    <el-table-column label="时间" prop="time" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['project_process_management.project_change_visa_content/edit']"
diff --git a/src/views/project_progress_payment/index.vue b/src/views/project_progress_payment/index.vue
index 3959495..150af35 100644
--- a/src/views/project_progress_payment/index.vue
+++ b/src/views/project_progress_payment/index.vue
@@ -2,16 +2,19 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="所属项目" prop="cost_project_id">
+                    <el-select v-model="queryParams.project_id" remote filterable :remote-method="queryCostProject"
+                        :loading="loading" class="flex-1">
+                        <el-option v-for="(item, index) in optionsData.projectList" :key="index"
+                            :label="item.projectinfo" :value="item.id" />
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="单据编号" prop="num">
                     <el-input class="w-[280px]" v-model="queryParams.num" clearable placeholder="请输入单据编号" />
                 </el-form-item>
-                <el-form-item label="项目名称" prop="project">
-                    <el-input class="w-[280px]" v-model="queryParams.project" clearable placeholder="请输入项目名称" />
+                <el-form-item label="登记人" prop="djr">
+                    <el-input class="w-[280px]" v-model="queryParams.djr" clearable placeholder="请输入登记人" />
                 </el-form-item>
-                <el-form-item label="项目编号" prop="project_num">
-                    <el-input class="w-[280px]" v-model="queryParams.project_num" clearable placeholder="请输入项目编号" />
-                </el-form-item>
-
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
@@ -45,7 +48,8 @@
                                     <el-table-column label="形象进度" prop="image_progress" show-overflow-tooltip />
                                     <el-table-column label="申报造价(土建)" prop="declared_cost_tj" show-overflow-tooltip />
                                     <el-table-column label="申报造价(安装)" prop="declared_cost_az" show-overflow-tooltip />
-                                    <el-table-column label="申报造价(其他)" prop="declared_cost_other" show-overflow-tooltip />
+                                    <el-table-column label="申报造价(其他)" prop="declared_cost_other"
+                                        show-overflow-tooltip />
                                     <el-table-column label="进度申报造价小计" prop="jdsbzj_xiaoji" show-overflow-tooltip />
                                     <el-table-column label="审核造价(土建)" prop="audit_cost_tj" show-overflow-tooltip />
                                     <el-table-column label="审核造价(安装)" prop="audit_cost_az" show-overflow-tooltip />
@@ -53,12 +57,14 @@
                                     <el-table-column label="进度审核造价小计" prop="jdshzj_xiaoji" show-overflow-tooltip />
                                     <el-table-column label="审减额(元)" prop="deduction_amount" show-overflow-tooltip />
                                     <el-table-column label="完成产值比例(%)" prop="completed_rate" show-overflow-tooltip />
-                                    <el-table-column label="合同工程款总额" prop="contract_total_amount" show-overflow-tooltip />
+                                    <el-table-column label="合同工程款总额" prop="contract_total_amount"
+                                        show-overflow-tooltip />
                                     <el-table-column label="累计完成工程款" prop="ljwc_funds" show-overflow-tooltip />
                                     <el-table-column label="当期应付工程款(元)" prop="current_payable_funds"
                                         show-overflow-tooltip />
                                     <el-table-column label="付款比例(%)" prop="payment_rate" show-overflow-tooltip />
-                                    <el-table-column label="合同付款比例(%)" prop="dcntract_payment_rate" show-overflow-tooltip />
+                                    <el-table-column label="合同付款比例(%)" prop="dcntract_payment_rate"
+                                        show-overflow-tooltip />
                                     <el-table-column label="备注" prop="remark" show-overflow-tooltip />
                                 </el-table>
                             </div>
@@ -66,7 +72,6 @@
                     </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="projectInfo.project_num" show-overflow-tooltip />
                     <el-table-column label="登记人" prop="djr" show-overflow-tooltip />
                     <el-table-column label="登记日期" prop="djrq" show-overflow-tooltip />
                     <el-table-column label="进度申报造价合计" prop="sbhj" show-overflow-tooltip />
@@ -74,8 +79,8 @@
                     <el-table-column label="累计应付工程款合计" prop="ljhj" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
-                            <el-button v-perms="['project_process_management.project_progress_payment/edit']" type="primary"
-                                link @click="handleEdit(row)">
+                            <el-button v-perms="['project_process_management.project_progress_payment/edit']"
+                                type="primary" link @click="handleEdit(row)">
                                 编辑
                             </el-button>
                             <el-button v-perms="['project_process_management.project_progress_payment/delete']"
@@ -101,17 +106,37 @@ import { apiProjectProgressPaymentLists, apiProjectProgressPaymentDelete, apiPro
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import { apiCostProjectDatas } from "@/api/cost_project";
+import { useDictOptions } from "@/hooks/useDictOptions"
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
 const showEdit = ref(false)
+const loading = ref(false)
 
+const queryCostProject = async (query: string) => {
+    loading.value = true
+    const projectList = await apiCostProjectDatas({
+        name: query ?? ''
+    })
+    optionsData.projectList = projectList
+    loading.value = false
+}
+
+
+const { optionsData } = useDictOptions<{
+    projectList: any[]
+}>({
+    projectList: {
+        api: apiCostProjectDatas,
+    }
+})
 
 // 查询条件
 const queryParams = reactive({
     num: '',
-    project: '',
-    project_num: '',
+    project_id: '',
+    djr: '',
 })
 
 // 选中数据
diff --git a/src/views/project_rectification/index.vue b/src/views/project_rectification/index.vue
index f8905d4..0c3895b 100644
--- a/src/views/project_rectification/index.vue
+++ b/src/views/project_rectification/index.vue
@@ -2,14 +2,24 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="所属项目" prop="cost_project_id">
+                    <el-select v-model="queryParams.project_id" remote filterable :remote-method="queryCostProject"
+                        :loading="loading" class="flex-1">
+                        <el-option v-for="(item, index) in optionsData.projectList" :key="index"
+                            :label="item.projectinfo" :value="item.id" />
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="单据编号" prop="num">
                     <el-input class="w-[280px]" v-model="queryParams.num" clearable placeholder="请输入单据编号" />
                 </el-form-item>
-                <el-form-item label="项目名称" prop="project">
-                    <el-input class="w-[280px]" v-model="queryParams.project" clearable placeholder="请输入项目名称" />
+                <el-form-item label="委托单位" prop="wt_unit">
+                    <el-input class="w-[280px]" v-model="queryParams.wt_unit" clearable placeholder="请输入委托单位" />
                 </el-form-item>
-                <el-form-item label="项目编号" prop="project_num">
-                    <el-input class="w-[280px]" v-model="queryParams.project_num" clearable placeholder="请输入项目编号" />
+                <el-form-item label="项目负责人" prop="xm_master">
+                    <el-input class="w-[280px]" v-model="queryParams.xm_master" clearable placeholder="请输入项目负责人" />
+                </el-form-item>
+                <el-form-item label="项目整改人" prop="zg_master">
+                    <el-input class="w-[280px]" v-model="queryParams.zg_master" clearable placeholder="请输入项目整改人" />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
@@ -20,14 +30,15 @@
             </el-form>
         </el-card>
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['project_process_management.project_rectification/add']" type="primary" @click="handleAdd">
+            <el-button v-perms="['project_process_management.project_rectification/add']" type="primary"
+                @click="handleAdd">
                 <template #icon>
                     <icon name="el-icon-Plus" />
                 </template>
                 新增
             </el-button>
-            <el-button v-perms="['project_process_management.project_rectification/delete']" :disabled="!selectData.length"
-                @click="handleDelete(selectData)">
+            <el-button v-perms="['project_process_management.project_rectification/delete']"
+                :disabled="!selectData.length" @click="handleDelete(selectData)">
                 删除
             </el-button>
             <div class="mt-4">
@@ -35,7 +46,6 @@
                     <el-table-column type="selection" width="55" />
                     <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="projectInfo.project_num" show-overflow-tooltip />
                     <el-table-column label="委托单位" prop="wt_unit" show-overflow-tooltip />
                     <el-table-column label="项目负责人" prop="xm_master" show-overflow-tooltip />
                     <el-table-column label="咨询类型" prop="zx_type" show-overflow-tooltip />
@@ -47,12 +57,12 @@
 
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
-                            <el-button v-perms="['project_process_management.project_rectification/edit']" type="primary"
-                                link @click="handleEdit(row)">
+                            <el-button v-perms="['project_process_management.project_rectification/edit']"
+                                type="primary" link @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button v-perms="['project_process_management.project_rectification/delete']" type="danger"
-                                link @click="handleDelete(row.id)">
+                            <el-button v-perms="['project_process_management.project_rectification/delete']"
+                                type="danger" link @click="handleDelete(row.id)">
                                 删除
                             </el-button>
                         </template>
@@ -74,17 +84,39 @@ import { apiProjectRectificationLists, apiProjectRectificationDelete, apiProject
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import { apiCostProjectDatas } from "@/api/cost_project";
+import { useDictOptions } from "@/hooks/useDictOptions"
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
 const showEdit = ref(false)
+const loading = ref(false)
 
+const queryCostProject = async (query: string) => {
+    loading.value = true
+    const projectList = await apiCostProjectDatas({
+        name: query ?? ''
+    })
+    optionsData.projectList = projectList
+    loading.value = false
+}
+
+
+const { optionsData } = useDictOptions<{
+    projectList: any[]
+}>({
+    projectList: {
+        api: apiCostProjectDatas,
+    }
+})
 
 // 查询条件
 const queryParams = reactive({
     num: '',
-    project: '',
-    project_num: '',
+    project_id: '',
+    wt_unit: '',
+    xm_master: '',
+    zg_master: ''
 })
 
 // 选中数据
@@ -129,4 +161,3 @@ const handleDelete = async (id: number | any[]) => {
 
 getLists()
 </script>
-
diff --git a/src/views/project_survey_signature/index.vue b/src/views/project_survey_signature/index.vue
index 14be081..2b30573 100644
--- a/src/views/project_survey_signature/index.vue
+++ b/src/views/project_survey_signature/index.vue
@@ -2,14 +2,21 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="所属项目" prop="cost_project_id">
+                    <el-select v-model="queryParams.project_id" remote filterable :remote-method="queryCostProject"
+                        :loading="loading" class="flex-1">
+                        <el-option v-for="(item, index) in optionsData.projectList" :key="index"
+                            :label="item.projectinfo" :value="item.id" />
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="单据编号" prop="num">
                     <el-input class="w-[280px]" v-model="queryParams.num" 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 label="委托单位" prop="wt_unit">
+                    <el-input class="w-[280px]" v-model="queryParams.wt_unit" clearable placeholder="请输入委托单位" />
                 </el-form-item>
-                <el-form-item label="项目编号" prop="project_num">
-                    <el-input class="w-[280px]" v-model="queryParams.project_num" clearable placeholder="请输入项目编号" />
+                <el-form-item label="建设单位" prop="jsdw">
+                    <el-input class="w-[280px]" v-model="queryParams.jsdw" clearable placeholder="请输入建设单位" />
                 </el-form-item>
 
                 <el-form-item>
@@ -37,18 +44,16 @@
                     <el-table-column type="selection" width="55" />
                     <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="projectInfo.project_num" show-overflow-tooltip />
                     <el-table-column label="委托单位" prop="wt_unit" show-overflow-tooltip />
                     <el-table-column label="建设单位" prop="jsdw" show-overflow-tooltip />
                     <el-table-column label="部门负责人" prop="bmfz" show-overflow-tooltip />
                     <el-table-column label="项目负责人" prop="xmfz" show-overflow-tooltip />
                     <el-table-column label="踏勘日期" prop="riqi" show-overflow-tooltip />
                     <el-table-column label="踏勘人员" prop="people" show-overflow-tooltip />
+                    <el-table-column label="踏勘内容" prop="content" 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="content" show-overflow-tooltip />
                     <el-table-column label="核实结果" prop="result" show-overflow-tooltip />
-                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['project_process_management.project_survey_signature/edit']"
@@ -78,17 +83,38 @@ import { apiProjectSurveySignatureLists, apiProjectSurveySignatureDelete, apiPro
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import { apiCostProjectDatas } from "@/api/cost_project";
+import { useDictOptions } from "@/hooks/useDictOptions"
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
 const showEdit = ref(false)
 
+const loading = ref(false)
 
+const queryCostProject = async (query: string) => {
+    loading.value = true
+    const projectList = await apiCostProjectDatas({
+        name: query ?? ''
+    })
+    optionsData.projectList = projectList
+    loading.value = false
+}
+
+
+const { optionsData } = useDictOptions<{
+    projectList: any[]
+}>({
+    projectList: {
+        api: apiCostProjectDatas,
+    }
+})
 // 查询条件
 const queryParams = reactive({
     num: '',
-    project_name: '',
-    project_num: '',
+    project_id: '',
+    wt_unit: '',
+    jsdw: '',
 })
 
 // 选中数据

From 9563fadfb9766ecb2be8053811100640b3a68f62 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Thu, 14 Mar 2024 10:41:49 +0800
Subject: [PATCH 2/2] update

---
 src/views/data_report_course/index.vue      | 11 +++--------
 src/views/data_report_information/index.vue |  9 +--------
 src/views/data_report_ledger/index.vue      |  6 ++++--
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/views/data_report_course/index.vue b/src/views/data_report_course/index.vue
index f3562f1..cf01ac0 100644
--- a/src/views/data_report_course/index.vue
+++ b/src/views/data_report_course/index.vue
@@ -2,16 +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="num">
-                    <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.project_name" clearable placeholder="请输入项目名称" />
                 </el-form-item>
-                <el-form-item label="项目编号" prop="project_num">
-                    <el-input class="w-[280px]" v-model="queryParams.project_num" clearable placeholder="请输入项目编号" />
+                <el-form-item label="合同名称" prop="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,8 +19,8 @@
                 <el-table :data="pager.lists">
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
-                    <el-table-column label="部门" prop="dept.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="task_allocation_status" show-overflow-tooltip>
                         <template #default="{ row }">
@@ -66,7 +62,6 @@ import { project_trace } from '@/api/data_report'
 // 查询条件
 const queryParams = reactive({
     contract_name: "",
-    project_num: "",
     project_name: "",
 })
 
diff --git a/src/views/data_report_information/index.vue b/src/views/data_report_information/index.vue
index 07da989..af21e85 100644
--- a/src/views/data_report_information/index.vue
+++ b/src/views/data_report_information/index.vue
@@ -5,12 +5,6 @@
                 <el-form-item label="项目名称" prop="num">
                     <el-input class="w-[280px]" v-model="queryParams.project_name" clearable placeholder="请输入项目名称" />
                 </el-form-item>
-                <el-form-item label="项目编号" prop="project">
-                    <el-input class="w-[280px]" v-model="queryParams.project_num" 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.contract_name" clearable placeholder="请输入项目编号" />
                 </el-form-item>
@@ -28,9 +22,9 @@
                 <el-table :data="pager.lists">
                     <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="starting" show-overflow-tooltip />
                     <el-table-column label="结束日期" prop="endtime" show-overflow-tooltip />
-                    <el-table-column label="合同名称" prop="contract_name" show-overflow-tooltip />
                     <el-table-column label="咨询类型" prop="types" show-overflow-tooltip>
                         <template #default="{ row }">
                             <dict-value :options="dictData.consultation_type" :value="row.types" />
@@ -69,7 +63,6 @@ import { cost_project_report } from '@/api/data_report'
 // 查询条件
 const queryParams = reactive({
     project_name: "",
-    project_num: "",
     contract_name: "",
     aunit: ""
 })
diff --git a/src/views/data_report_ledger/index.vue b/src/views/data_report_ledger/index.vue
index 4693724..b14ef2c 100644
--- a/src/views/data_report_ledger/index.vue
+++ b/src/views/data_report_ledger/index.vue
@@ -8,6 +8,9 @@
                 <el-form-item label="合同编号" prop="project">
                     <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> -->
@@ -35,7 +38,7 @@
                                 :value="row.business_nature" />
                         </template>
                     </el-table-column>
-                    <el-table-column label="甲方签约单位" prop="part_a_contract" 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 />
@@ -89,4 +92,3 @@ const { pager, getLists, resetParams, resetPage } = usePaging({
 
 getLists()
 </script>
-