diff --git a/src/components/customerdemand/index.vue b/src/components/customerdemand/index.vue
index f72739e..6a49cb7 100644
--- a/src/components/customerdemand/index.vue
+++ b/src/components/customerdemand/index.vue
@@ -2,8 +2,8 @@
     <div>
         <el-card class="!border-none" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="查询" prop="name">
-                    <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入内容" />
+                <el-form-item label="查询" prop="theme">
+                    <el-input class="w-[280px]" v-model="queryParams.theme" clearable placeholder="请输入需求主题" />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
@@ -63,6 +63,7 @@ const props = defineProps({
 // 查询条件
 const queryParams = reactive({
     project_id: props.productid,
+    theme: ''
 });
 const { dictData } = useDictData('project_type,project_content,bidding_method,relationship,information_sources,construction_funds_sources,construction_financial_status,construction_recognition,my_construction_recognition,strategic_significance,industry,unit_nature')
 
diff --git a/src/components/project/index.vue b/src/components/project/index.vue
index 6deb8d3..c9a11ae 100644
--- a/src/components/project/index.vue
+++ b/src/components/project/index.vue
@@ -3,7 +3,7 @@
         <el-card class="!border-none" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
                 <el-form-item label="查询" prop="name">
-                    <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入内容" />
+                    <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入项目名称" />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
@@ -87,8 +87,8 @@ const props = defineProps({
 })
 // 查询条件
 const queryParams = reactive({
-    custom_name: '',
-    project_type: "",
+    name: '',
+
     customer_id: props.customer_id
 });
 const { dictData } = useDictData('project_type,project_content,bidding_method,relationship,information_sources,construction_funds_sources,construction_financial_status,construction_recognition,my_construction_recognition,strategic_significance,industry,unit_nature')
diff --git a/src/views/competitor/detail.vue b/src/views/competitor/detail.vue
index 15485c3..21232e5 100644
--- a/src/views/competitor/detail.vue
+++ b/src/views/competitor/detail.vue
@@ -1,7 +1,7 @@
 
 <template>
     <div class="detail-popup">
-        <popup ref="popupRef" title="解决方案详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
+        <popup ref="popupRef" title="竞争对手详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="120px">
                 <el-card class="mb-2">
                     <el-row>
@@ -79,7 +79,17 @@
                                 {{ formData.remark }}
                             </el-form-item>
                         </el-col>
+                        <el-col :span="24">
+                            <el-form-item label="附件">
+                                <div v-if="formData.annex && formData.annex.length > 0">
+                                    <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
+                                        <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">文件{{ index + 1 }}查看</a>
 
+                                    </div>
+                                </div>
+                                <div v-else>暂无附件</div>
+                            </el-form-item>
+                        </el-col>
                     </el-row>
                 </el-card>
             </el-form>
diff --git a/src/views/competitor/index.vue b/src/views/competitor/index.vue
index 7d6d7c8..05cb7b6 100644
--- a/src/views/competitor/index.vue
+++ b/src/views/competitor/index.vue
@@ -8,6 +8,9 @@
                 <el-form-item label="竞争对手名称" prop="competitor_name">
                     <el-input class="w-[280px]" v-model="queryParams.competitor_name" clearable placeholder="请输入竞争对手名称" />
                 </el-form-item>
+                <el-form-item label="竞争对手联系人" prop="competitor_contacts">
+                    <el-input class="w-[280px]" v-model="queryParams.competitor_contacts" clearable placeholder="请输入竞争对手联系人" />
+                </el-form-item>
                 <el-form-item label="联系人电话" prop="competitor_contacts_phone">
                     <el-input class="w-[280px]" v-model="queryParams.competitor_contacts_phone" clearable placeholder="请输入联系人电话" />
                 </el-form-item>
@@ -91,6 +94,7 @@ const queryParams = reactive({
     customer_demand_name: '',
     competitor_contacts_phone: '',
     custom_name: '',
+    competitor_contacts: '',
 
 })
 
diff --git a/src/views/custom/edit.vue b/src/views/custom/edit.vue
index d34c04a..75ce9a5 100644
--- a/src/views/custom/edit.vue
+++ b/src/views/custom/edit.vue
@@ -490,7 +490,10 @@ const setFormData = async (data: Record<any, any>) => {
         companyname.value = data.company_name
 
     }
-    formData.other_contacts = JSON.parse(data.other_contacts)
+    if (data.other_contacts && data.other_contacts.length > 0) {
+        formData.other_contacts = JSON.parse(data.other_contacts)
+    }
+
 
 
 
diff --git a/src/views/custom/index.vue b/src/views/custom/index.vue
index 3a177ae..8e5a069 100644
--- a/src/views/custom/index.vue
+++ b/src/views/custom/index.vue
@@ -48,27 +48,18 @@
                             <dict-value :options="dictData.custom_type" :value="row.custom_type" />
                         </template>
                     </el-table-column>
-                    <!-- <el-table-column label="联系人" prop="custom_type">
-                        <template #default="{ row }">
-                            <div>
-                                <text v-for="(item, i) in row.other_contacts" :key="i">{{ item.name }}</text>
-                            </div>
-                        </template>
-                    </el-table-column> -->
-                    <!-- <el-table-column label="省" prop="custom_type">
-                        <template #default="{ row }">
-                            {{ row.province.province_name }}
-                        </template>
-                    </el-table-column> -->
+
                     <el-table-column label="省" prop="province_name" show-overflow-tooltip />
                     <el-table-column label="职务" prop="master_position" show-overflow-tooltip />
                     <el-table-column label="手机" prop="master_phone" show-overflow-tooltip />
                     <el-table-column label="电话" prop="master_telephone" show-overflow-tooltip />
-                    <el-table-column label="备注" prop="master_notes" show-overflow-tooltip />
+
                     <el-table-column label="负责人" prop="master_name" show-overflow-tooltip />
                     <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
                     <el-table-column label="最后跟进" prop="last_follow_date" show-overflow-tooltip />
                     <el-table-column label="下次回访日期" prop="next_follow_date" show-overflow-tooltip />
+                    <el-table-column label="跟进" prop="follow_total" show-overflow-tooltip />
+                    <el-table-column label="备注" prop="master_notes" show-overflow-tooltip />
                     <el-table-column label="操作" width="160" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['custom.custom/edit']" type="primary" link @click="handleEdit(row)">
diff --git a/src/views/custom_follow/detail.vue b/src/views/custom_follow/detail.vue
index 5dae10f..7d9d458 100644
--- a/src/views/custom_follow/detail.vue
+++ b/src/views/custom_follow/detail.vue
@@ -11,6 +11,13 @@
                                 {{ formData.name }}
                             </el-form-item>
                         </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="客户名称" prop="notes">
+                                {{ formData.custom_name
+                                }}
+                            </el-form-item>
+
+                        </el-col>
                         <el-col :span="12">
                             <el-form-item label="联系人">
                                 {{ formData.contacts }}
@@ -30,7 +37,7 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="执行人">
-                                {{ formData.admin_id }}
+                                {{ formData.executor }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
@@ -44,6 +51,7 @@
                             </el-form-item>
 
                         </el-col>
+
                         <el-col :span="12">
                             <el-form-item label="下次回访日期" prop="notes">
                                 {{ formData.next_follow_date }}
@@ -87,36 +95,24 @@ const datas = reactive({
 
 // 表单数据
 const formData = reactive({
-    id: '',
-    name: '',
-    custom_id: '',
-    custom_name: '',
-    contacts: '',
-    date: '',
-    types: '',
-    admin_id: '',
-    description: '',
-    annex: '',
-    coordinate: '',
-    next_follow_date: '',
-    status: '',
+
 })
 
 
 
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
+    // for (const key in formData) {
+    //     if (data[key] != null && data[key] != undefined) {
+    //         //@ts-ignore
+    //         formData[key] = data[key]
 
-        }
+    //     }
 
-    }
+    // }
 
 
-    console.log(formData, '2222222222')
+    Object.assign(formData, data)
 
 
 }
diff --git a/src/views/custom_follow/index.vue b/src/views/custom_follow/index.vue
index a642bfb..9c030a4 100644
--- a/src/views/custom_follow/index.vue
+++ b/src/views/custom_follow/index.vue
@@ -61,7 +61,7 @@
 
 
                     <!-- <el-table-column label="状态" prop="status" show-overflow-tooltip /> -->
-                    <el-table-column label="操作" width="120" fixed="right">
+                    <el-table-column label="操作" width="160" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['custom_follow.custom_follow/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
diff --git a/src/views/custom_service/detail.vue b/src/views/custom_service/detail.vue
index dd498dc..d064541 100644
--- a/src/views/custom_service/detail.vue
+++ b/src/views/custom_service/detail.vue
@@ -19,8 +19,7 @@
                         </el-col>
                         <el-col :span="8">
                             <el-form-item label="客户名称">
-                                {{ formData.custom_name
-                                }}
+                                {{ formData.custom_name }}
 
                             </el-form-item>
                         </el-col>
@@ -137,10 +136,10 @@
                         <div style="margin-bottom: 20px;">客户评价</div>
                         <el-col :span="24">
                             <el-form-item label="整体评价" prop="score">
-                                <el-rate v-model="formData.score" disabled size="large" />
+                                <el-rate v-model="formData.score" disabled size="large" style="margin-top: 5px ;" />
                             </el-form-item>
                         </el-col>
-                        <el-col :span="24">
+                        <el-col :span="24" style="margin-top: -15px ;">
                             <el-form-item label="问题是否解决" prop="is_solve_text">
                                 {{ formData.is_solve_text }}
 
diff --git a/src/views/custom_service/handle.vue b/src/views/custom_service/handle.vue
index 383c8ed..2c32ce9 100644
--- a/src/views/custom_service/handle.vue
+++ b/src/views/custom_service/handle.vue
@@ -169,10 +169,10 @@
                     <div style="margin-bottom: 30px;">客户评价</div>
                     <el-col :span="24">
                         <el-form-item label="整体评价" prop="score">
-                            <el-rate v-model="formData1.score" size="large" />
+                            <el-rate v-model="formData1.score" size="large" style="margin-top: 5px ;" />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="24">
+                    <el-col :span="24" style="margin-top: -15px ;">
                         <el-form-item label="问题是否解决" prop="is_solve">
 
                             <el-radio-group v-model="formData1.is_solve" placeholder="问题是否解决">
diff --git a/src/views/customer_demand/index.vue b/src/views/customer_demand/index.vue
index 08d46a4..6bc7d0b 100644
--- a/src/views/customer_demand/index.vue
+++ b/src/views/customer_demand/index.vue
@@ -24,6 +24,15 @@
                 <el-form-item label="客户名称" prop="custom_name">
                     <el-input class="w-[250px]" v-model="queryParams.custom_name" clearable placeholder="请输入客户名称" />
                 </el-form-item>
+                <el-form-item label="记录时间" prop="recording_time">
+                    <el-date-picker class="w-[250px]" v-model="queryParams.recording_time" clearable type="date" value-format="YYYY-MM-DD" placeholder="选择记录时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="重要程度" prop="importance">
+                    <el-select class="w-[250px]" v-model="queryParams.importance" clearable placeholder="请选择发票类型">
+                        <el-option v-for="(item, index) in dictData.importance" :key="index" :label="item.name" :value="item.value" />
+                    </el-select>
+                </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
@@ -108,7 +117,9 @@ const queryParams = reactive({
     org_name: '',
     dept_name: '',
     project_name: '',
-    custom_name: ''
+    custom_name: '',
+    importance: '',
+    recording_time: '',
 })
 
 // 选中数据
diff --git a/src/views/customer_demand_solution/detail.vue b/src/views/customer_demand_solution/detail.vue
index a42cb18..7c30fe2 100644
--- a/src/views/customer_demand_solution/detail.vue
+++ b/src/views/customer_demand_solution/detail.vue
@@ -1,7 +1,7 @@
 
 <template>
     <div class="detail-popup">
-        <popup ref="popupRef" title="客户需求详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
+        <popup ref="popupRef" title="解决方案详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="120px">
                 <el-card class="mb-2">
                     <el-row>
@@ -64,6 +64,17 @@
                                 {{ formData.submission_time }}
                             </el-form-item>
                         </el-col>
+                        <el-col :span="24">
+                            <el-form-item label="附件">
+                                <div v-if="formData.annex && formData.annex.length > 0">
+                                    <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
+                                        <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">文件{{ index + 1 }}查看</a>
+
+                                    </div>
+                                </div>
+                                <div v-else>暂无附件</div>
+                            </el-form-item>
+                        </el-col>
                     </el-row>
                 </el-card>
             </el-form>
diff --git a/src/views/customer_demand_solution/index.vue b/src/views/customer_demand_solution/index.vue
index 7015cd2..b4d6447 100644
--- a/src/views/customer_demand_solution/index.vue
+++ b/src/views/customer_demand_solution/index.vue
@@ -39,12 +39,7 @@
                     <el-table-column label="客户名称" prop="custom_name" show-overflow-tooltip />
                     <el-table-column label="需求名称" prop="customer_demand_name" show-overflow-tooltip />
                     <el-table-column label="解决方案主题" prop="theme" show-overflow-tooltip />
-                    <el-table-column label="提交时间" prop="submission_time">
-                        <template #default="{ row }">
-                            <span>{{ row.submission_time ? timeFormat(row.submission_time, 'yyyy-mm-dd hh:MM:ss') : ''
-                            }}</span>
-                        </template>
-                    </el-table-column>
+                    <el-table-column label="提交时间" prop="submission_time" show-overflow-tooltip />
                     <el-table-column label="方案内容" prop="solution_content" show-overflow-tooltip />
                     <el-table-column label="客户反馈" prop="customer_feedback" show-overflow-tooltip />
                     <el-table-column label="附件" prop="annex" show-overflow-tooltip>
diff --git a/src/views/project/detail.vue b/src/views/project/detail.vue
index 75e7403..e802f4f 100644
--- a/src/views/project/detail.vue
+++ b/src/views/project/detail.vue
@@ -2,119 +2,133 @@
 <template>
     <div class="detail-popup">
         <popup ref="popupRef" title="项目立项详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="160px">
+            <el-form ref="formRef" :model="formData" label-width="auto">
                 <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
                     <el-tab-pane label="概况" name="demo-1">
                         <el-card class="mb-2">
                             <el-row>
-                                <el-col :span="12">
+                                <el-col :span="8">
                                     <el-form-item label="项目名称">
                                         {{ formData.name }}
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="12">
+                                <el-col :span="8">
                                     <el-form-item label="客户名称">
                                         {{ formData.custom_name }}
 
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="12">
+                                <el-col :span="8">
                                     <el-form-item label="项目类型">
                                         <dict-value :options="dictData.project_type" :value="formData.project_type" />
 
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="12">
+                                <el-col :span="8">
+                                    <el-form-item label="项目状态">
+                                        {{ formData.status_text
+                                        }}
+
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="8">
+                                    <el-form-item label="项目内容">
+                                        {{ formData.project_content_text
+                                        }}
+
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="8">
                                     <el-form-item label="联系人">
                                         {{ formData.contacts }}
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="12">
+                                <el-col :span="8">
                                     <el-form-item label="联系人职位">
                                         {{ formData.position }}
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="12">
+                                <el-col :span="8">
                                     <el-form-item label="联系电话">
                                         {{ formData.telephone }}
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="12">
+                                <el-col :span="8">
                                     <el-form-item label="项目所在地">
                                         {{ formData.project_address }}
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="12">
+                                <el-col :span="8">
                                     <el-form-item label="信息来源">
 
                                         <dict-value :options="dictData.information_sources" :value="formData.information_sources" />
 
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="12">
+                                <el-col :span="8">
                                     <el-form-item label="负责人">
                                         {{ formData.person }}
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="12">
+                                <el-col :span="8">
                                     <el-form-item label="战略意义">
                                         <dict-value :options="dictData.strategic_significance" :value="formData.strategic_significance" />
                                     </el-form-item>
 
                                 </el-col>
-                                <el-col :span="12">
+                                <el-col :span="8">
                                     <el-form-item label="招标方式" prop="notes">
                                         <dict-value :options="dictData.bidding_method" :value="formData.bidding_method" />
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="12">
+                                <el-col :span="8">
                                     <el-form-item label="所属行业" prop="notes">
                                         <dict-value :options="dictData.industry" :value="formData.industry" />
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="12">
+                                <el-col :span="8">
                                     <el-form-item label="单位性质" prop="notes">
                                         <dict-value :options="dictData.unit_nature" :value="formData.unit_nature" />
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="12">
+                                <el-col :span="8">
                                     <el-form-item label="竞争对手" prop="notes">
                                         {{ formData.competitor }}
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="12">
+                                <el-col :span="8">
                                     <el-form-item label="项目建设资金来源" prop="notes">
                                         <dict-value :options="dictData.construction_funds_sources" :value="formData.construction_funds_sources" />
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="12">
+                                <el-col :span="8">
                                     <el-form-item label="建设方付款方式" prop="notes">
                                         {{ formData.construction_payment_method }}
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="12">
+                                <el-col :span="8">
                                     <el-form-item label="建设方财务状况" prop="notes">
                                         <dict-value :options="dictData.construction_financial_status" :value="formData.construction_financial_status" />
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="12">
+                                <el-col :span="8">
                                     <el-form-item label="建设方对我方认可度" prop="notes">
                                         <dict-value :options="dictData.construction_recognition" :value="formData.construction_recognition" />
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="12">
+                                <el-col :span="8">
                                     <el-form-item label="我方对建设方认可度" prop="notes">
                                         <dict-value :options="dictData.my_construction_recognition" :value="formData.my_construction_recognition" />
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="12">
+                                <el-col :span="8">
                                     <el-form-item label="关系度" prop="notes">
                                         <dict-value :options="dictData.relationship" :value="formData.relationship" />
 
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="8">
-                                    <el-form-item label="附件" prop="field127">
+                                <el-col :span="24">
+                                    <el-form-item label="附件" prop="field87">
 
                                         <div v-if="formDataannex.length > 0">
                                             <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
@@ -141,7 +155,7 @@
                     <el-tab-pane label="分包" name="demo-9">Config</el-tab-pane>
                     <el-tab-pane label="进度" name="demo-10">Role</el-tab-pane>
                     <el-tab-pane label="任务" name="demo-11">Task</el-tab-pane>
-                    <el-tab-pane label="人力" name="demo-12">Task</el-tab-pane>
+                    <el-tab-pane label="人力" name="demo-8">Task</el-tab-pane>
                     <el-tab-pane label="机具" name="demo-13">Task</el-tab-pane>
                     <el-tab-pane label="收款" name="demo-14">Task</el-tab-pane>
                     <el-tab-pane label="付款" name="demo-15">Task</el-tab-pane>
@@ -187,37 +201,7 @@ const datas = reactive({
 
 // 表单数据
 const formData = reactive({
-    id: '',
-    name: '',
-    custom_id: '',
-    custom_name: '',
-    project_type: '',
-    project_code: '',
-    project_content: [],
-    project_estimation: '',
-    project_address: '',
-    estimated_construction: '',
-    bidding_time: '',
-    bidding_method: '',
-    contacts: '',
-    position: '',
-    telephone: '',
-    department: '',
-    person: '',
-    relationship: '',
-    discovery_time: '',
-    information_sources: '',
-    competitor: '',
-    construction_funds_sources: '',
-    construction_payment_method: '',
-    construction_financial_status: '',
-    construction_recognition: '',
-    my_construction_recognition: '',
-    strategic_significance: '',
-    industry: '',
-    unit_nature: '',
-    annex: [],
-    status: '',
+
 })
 
 
@@ -225,15 +209,15 @@ const formData = reactive({
 
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
+    // for (const key in formData) {
+    //     if (data[key] != null && data[key] != undefined) {
+    //         //@ts-ignore
+    //         formData[key] = data[key]
 
-        }
-
-    }
+    //     }
 
+    // }
+    Object.assign(formData, data)
 
     if (data.annex && data.annex.length > 0) {
         const arry1 = data.annex.map((item: any, index: any) => {
diff --git a/src/views/project/index.vue b/src/views/project/index.vue
index 38a401f..fda3dd7 100644
--- a/src/views/project/index.vue
+++ b/src/views/project/index.vue
@@ -15,6 +15,13 @@
                     <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入项目名称" />
                 </el-form-item>
 
+                <el-form-item label="项目内容" prop="project_content">
+                    <el-select class="w-[280px]" v-model="queryParams.project_content" clearable placeholder="请选择战略意义">
+                        <el-option label="全部" value=""></el-option>
+                        <el-option v-for="(item, index) in dictData.project_content" :key="index" :label="item.name" :value="item.value" />
+                    </el-select>
+                </el-form-item>
+
                 <el-form-item label="项目状态" prop="status">
                     <el-input class="w-[280px]" v-model="queryParams.status" clearable placeholder="请输入项目状态" />
                 </el-form-item>
@@ -150,6 +157,7 @@ const queryParams = reactive({
     industry: '',
     unit_nature: '',
     status: '',
+    project_content: '',
     information_sources: ''
 
 })
diff --git a/src/views/project_estimate/index.vue b/src/views/project_estimate/index.vue
index fbcef5d..8eab043 100644
--- a/src/views/project_estimate/index.vue
+++ b/src/views/project_estimate/index.vue
@@ -1,13 +1,27 @@
 <template>
     <div>
         <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
+            <el-form class="mb-[-16px]" :model="queryParams" label-width="auto" inline>
+                <el-form-item label="概算来源" prop="estimate_source">
+                    <el-select class="w-[280px]" v-model="queryParams.estimate_source" clearable placeholder="请选择概算来源">
+                        <el-option v-for="(item, index) in dictData.estimate_source" :key="index" :label="item.name" :value="item.value" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="发票类型" prop="invoice_type">
+                    <el-select class="w-[280px]" v-model="queryParams.invoice_type" clearable placeholder="请选择发票类型">
+
+                        <el-option v-for="(item, index) in dictData.invoice_type" :key="index" :label="item.name" :value="item.value" />
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="项目名称" prop="project_name">
                     <el-input class="w-[280px]" v-model="queryParams.project_name" clearable placeholder="请输入项目名称" />
                 </el-form-item>
                 <el-form-item label="客户名称" prop="custom_name">
                     <el-input class="w-[280px]" v-model="queryParams.custom_name" clearable placeholder="请输入客户名称" />
                 </el-form-item>
+                <el-form-item label="客户需求名称" prop="customer_demand_name">
+                    <el-input class="w-[280px]" v-model="queryParams.customer_demand_name" clearable placeholder="请输入客户需求名称" />
+                </el-form-item>
                 <el-form-item label="联系人" prop="contact_name">
                     <el-input class="w-[280px]" v-model="queryParams.contact_name" clearable placeholder="请输入联系人" />
                 </el-form-item>
@@ -107,6 +121,9 @@ const queryParams = reactive({
     contact_phone: '',
     technician_name: '',
     create_user: '',
+    customer_demand_name: '',
+    invoice_type: '',
+    estimate_source: '',
 })
 
 // 选中数据
diff --git a/src/views/project_follow_up/detail.vue b/src/views/project_follow_up/detail.vue
index e5e4a24..d6cb781 100644
--- a/src/views/project_follow_up/detail.vue
+++ b/src/views/project_follow_up/detail.vue
@@ -7,24 +7,26 @@
                     <el-row>
                         <el-col :span="12">
                             <el-form-item label="项目名称">
-                                {{ formData.name }}
+                                {{ formData.project_name }}
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="项目编码">
+                                {{ formData.project_code }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="客户名称">
-                                {{ formData.custom_name }}
+                                {{ formData.custom_name
+                                }}
 
                             </el-form-item>
                         </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="项目类型">
-                                <dict-value :options="dictData.project_type" :value="formData.project_type" />
 
-                            </el-form-item>
-                        </el-col>
                         <el-col :span="12">
                             <el-form-item label="执行人">
-                                {{ formData.project_code }}
+                                {{ formData.executor
+                                }}
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
@@ -42,13 +44,7 @@
                                 {{ formData.project_role }}
                             </el-form-item>
                         </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="职位">
 
-                                {{ formData.position }}
-
-                            </el-form-item>
-                        </el-col>
                         <el-col :span="12">
                             <el-form-item label="跟进类型">
                                 <dict-value :options="dictData.follow_type" :value="formData.follow_type" />
@@ -70,17 +66,17 @@
                                 {{ formData.action_description }}
                             </el-form-item>
                         </el-col>
-                        <el-col :span="24">
+                        <el-col :span="12">
                             <el-form-item label="项目把握度">
                                 <dict-value :options="dictData.project_assurance" :value="formData.project_assurance" />
                             </el-form-item>
                         </el-col>
-                        <el-col :span="24">
+                        <el-col :span="12">
                             <el-form-item label="跟进状态">
                                 <dict-value :options="dictData.follow_status" :value="formData.follow_status" />
                             </el-form-item>
                         </el-col>
-                        <el-col :span="24">
+                        <el-col :span="12">
                             <el-form-item label="跟进阶段">
                                 <dict-value :options="dictData.follow_stage" :value="formData.follow_stage" />
                             </el-form-item>
@@ -94,7 +90,17 @@
                                 {{ formData.next_follow_up_date }}
                             </el-form-item>
                         </el-col>
+                        <el-col :span="24">
+                            <el-form-item label="附件">
+                                <div v-if="formData.annex && formData.annex.length > 0">
+                                    <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
+                                        <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">文件{{ index + 1 }}查看</a>
 
+                                    </div>
+                                </div>
+                                <div v-else>暂无附件</div>
+                            </el-form-item>
+                        </el-col>
                     </el-row>
                 </el-card>
             </el-form>
diff --git a/src/views/project_follow_up/index.vue b/src/views/project_follow_up/index.vue
index 4ff6176..26d1c22 100644
--- a/src/views/project_follow_up/index.vue
+++ b/src/views/project_follow_up/index.vue
@@ -3,35 +3,9 @@
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline label-width="auto">
 
-
-                <el-form-item label="项目名称" prop="project_id">
-                    <el-input class="w-[280px]" v-model="queryParams.project_id" clearable placeholder="请输入项目名称" />
+                <el-form-item label="客户名称" prop="custom_name">
+                    <el-input class="w-[280px]" v-model="queryParams.custom_name" clearable placeholder="请输入客户名称" />
                 </el-form-item>
-
-                <el-form-item label="执行人" prop="executor">
-                    <el-input class="w-[280px]" v-model="queryParams.executor" clearable placeholder="请输入执行人" />
-                </el-form-item>
-
-                <el-form-item label="联系方式" prop="contact_information">
-                    <el-input class="w-[280px]" v-model="queryParams.contact_information" clearable placeholder="请输入联系方式" />
-                </el-form-item>
-
-                <el-form-item label="职位" prop="position">
-                    <el-input class="w-[280px]" v-model="queryParams.position" clearable placeholder="请输入职位" />
-                </el-form-item>
-
-                <el-form-item label="项目角色" prop="project_role">
-                    <el-input class="w-[280px]" v-model="queryParams.project_role" clearable placeholder="请输入项目角色" />
-                </el-form-item>
-
-                <el-form-item label="联系人" prop="contacts">
-                    <el-input class="w-[280px]" v-model="queryParams.contacts" clearable placeholder="请输入联系人" />
-                </el-form-item>
-
-
-
-
-
                 <el-form-item label="跟进类型" prop="follow_type">
                     <el-select v-model="queryParams.follow_type" class="w-[280px]" clearable placeholder="请选择跟进类型">
                         <el-option label="全部" value=""></el-option>
@@ -39,14 +13,6 @@
                     </el-select>
                 </el-form-item>
 
-                <el-form-item label="主题" prop="theme">
-                    <el-input v-model="queryParams.theme" class="w-[280px]" clearable placeholder="请输入主题" />
-                </el-form-item>
-
-                <el-form-item label="行动描述" prop="action_description">
-                    <el-input v-model="queryParams.action_description" class="w-[280px]" clearable placeholder="请输入行动描述" />
-                </el-form-item>
-
                 <el-form-item label="项目把握度" prop="project_assurance">
                     <el-select v-model="queryParams.project_assurance" class="w-[280px]" clearable placeholder="请选择项目把握度">
 
@@ -69,13 +35,28 @@
                 </el-form-item>
 
 
-                <el-form-item label="跟进日期" prop="follow_date">
-                    <daterange-picker v-model:startTime="queryParams.start_time" v-model:endTime="queryParams.end_time" />
+
+                <el-form-item label="主题" prop="theme">
+                    <el-input v-model="queryParams.theme" class="w-[280px]" clearable placeholder="请输入主题" />
+                </el-form-item>
+                <el-form-item label="联系人" prop="contacts">
+                    <el-input class="w-[280px]" v-model="queryParams.contacts" clearable placeholder="请输入联系人" />
+                </el-form-item>
+                <el-form-item label="联系方式" prop="contact_information">
+                    <el-input class="w-[280px]" v-model="queryParams.contact_information" clearable placeholder="请输入联系方式" />
+                </el-form-item>
+                <el-form-item label="执行人" prop="executor">
+                    <el-input class="w-[280px]" v-model="queryParams.executor" clearable placeholder="请输入执行人" />
                 </el-form-item>
 
-                <el-form-item label="下次回访日期" prop="next_follow_up_date">
-                    <daterange-picker v-model:startTime="queryParams.start_time" v-model:endTime="queryParams.end_time" />
-                </el-form-item>
+
+
+
+
+
+
+
+
 
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
@@ -83,9 +64,7 @@
                 </el-form-item>
 
 
-                <!-- <l-form-item label="" prop="ceate_time">
-                    <el-input    v-model="queryParams.ceate_time" clearable placeholder="请输入" />
-                </l-form-item> -->
+
 
             </el-form>
         </el-card>
@@ -185,12 +164,10 @@ const showDtail = ref(false)
 
 // 查询条件
 const queryParams = reactive({
-    project_id: '',
     executor: '',
     contacts: '',
     contact_information: '',
-    project_role: '',
-    position: '',
+    custom_name: '',
     follow_date: '',
     follow_type: '',
     theme: '',
@@ -198,9 +175,7 @@ const queryParams = reactive({
     project_assurance: '',
     follow_status: '',
     follow_stage: '',
-    notes: '',
-    next_follow_up_date: '',
-    ceate_time: ''
+
 })
 
 // 选中数据
diff --git a/src/views/project_pre_sales_members/detail.vue b/src/views/project_pre_sales_members/detail.vue
index f671c6c..4125377 100644
--- a/src/views/project_pre_sales_members/detail.vue
+++ b/src/views/project_pre_sales_members/detail.vue
@@ -11,6 +11,13 @@
                                 {{ formData.project_name }}
                             </el-form-item>
                         </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="客户名称">
+
+                                {{ formData.custom_name
+                                }}
+                            </el-form-item>
+                        </el-col>
                         <el-col :span="12">
                             <el-form-item label="技术人员">
                                 {{ formData.technician }}
@@ -31,7 +38,8 @@
                         <el-col :span="12">
                             <el-form-item label="添加人">
 
-                                {{ formData.add_user
+                                {{ formData.add_user_name
+
                                 }}
 
                             </el-form-item>
diff --git a/src/views/project_pre_sales_members/edit.vue b/src/views/project_pre_sales_members/edit.vue
index d6d98ca..5f80dec 100644
--- a/src/views/project_pre_sales_members/edit.vue
+++ b/src/views/project_pre_sales_members/edit.vue
@@ -409,7 +409,9 @@ const setFormData = async (data: Record<any, any>) => {
         }
     }
 
-
+    project_name.value = data.project_name;
+    project_code.value = data.project_code;
+    custom_name.value = data.custom_name;
 }
 
 const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/project_pre_sales_members/index.vue b/src/views/project_pre_sales_members/index.vue
index 160fe21..34eb73b 100644
--- a/src/views/project_pre_sales_members/index.vue
+++ b/src/views/project_pre_sales_members/index.vue
@@ -2,18 +2,13 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline label-width="auto">
-                <el-form-item label="项目名称" prop="project_id">
-                    <el-input class="w-[280px]" v-model="queryParams.project_id" clearable placeholder="请输入项目名称" />
+                <el-form-item label="项目名称" prop="project_name">
+                    <el-input class="w-[280px]" v-model="queryParams.project_name" clearable placeholder="请输入项目名称" />
                 </el-form-item>
-                <el-form-item label="技术人员" prop="technician_ids">
-                    <el-input class="w-[280px]" v-model="queryParams.technician_ids" clearable placeholder="请输入技术人员" />
-                </el-form-item>
-                <el-form-item label="商务人员" prop="business_people_ids">
-                    <el-input class="w-[280px]" v-model="queryParams.business_people_ids" clearable placeholder="请输入商务人员" />
-                </el-form-item>
-                <el-form-item label="跨部门人员" prop="cross_departmental_personnel_ids">
-                    <el-input class="w-[280px]" v-model="queryParams.cross_departmental_personnel_ids" clearable placeholder="请输入跨部门人员" />
+                <el-form-item label="客户名称" prop="custom_name">
+                    <el-input class="w-[280px]" v-model="queryParams.custom_name" clearable placeholder="请输入客户名称" />
                 </el-form-item>
+
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
@@ -81,10 +76,9 @@ const showDtail = ref(false)
 
 // 查询条件
 const queryParams = reactive({
-    project_id: '',
-    technician_ids: '',
-    business_people_ids: '',
-    cross_departmental_personnel_ids: ''
+    project_name: '',
+    custom_name: '',
+
 })
 
 // 选中数据