diff --git a/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/components/hbForm.vue b/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/components/hbForm.vue
index ded9988..0838408 100644
--- a/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/components/hbForm.vue
+++ b/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/components/hbForm.vue
@@ -11,8 +11,8 @@
           <span>所属部门：</span><MOSTY.Department width="300px" clearable v-model="listQuery.ssbmdm" />
           <div class="ml20 mr10">数据周期：<el-button @click="chooseTime(it)" v-for="it in btns" :key="it" :type="active == it ? 'primary':''" size="small">{{ it }}</el-button></div>
           <el-date-picker v-model="listQuery.times" type="daterange" range-separator="To" value-format="YYYY-MM-DD" start-placeholder="选择开始时间" end-placeholder="选择结束时间"/>
-          <el-button class="ml10 mr20" type="primary" size="small">查询</el-button>
-          <el-button type="primary" size="small">重置</el-button>
+          <el-button class="ml10 mr20" type="primary" size="small" @click="searchList">查询</el-button>
+          <el-button type="primary" size="small" @click="resetList">重置</el-button>
         </div>
         <h3>串并线索</h3>
         <MyTable
@@ -20,7 +20,7 @@
           :tableColumn="pageForm.tableColumn"
           :tableHeight="pageForm.tableHeight1"
           :key="pageForm.keyCount"
-          :tableConfiger="pageForm.tableConfiger"
+          :tableConfiger="pageForm.tableConfiger1"
           :controlsWidth="pageForm.controlsWidth"
         >
           <template #xlLx="{row}">
@@ -51,10 +51,10 @@
         <h3>来源线索</h3>
         <div class="flex align-center mb10">
           <span>线索标题：</span>
-          <el-input style="width:300px" placeholder="请输入标题" v-model="keyWords"></el-input>
+          <el-input style="width:300px" placeholder="请输入标题" clearable v-model="keyWords"></el-input>
           <el-button class="ml10 mr20" type="primary" size="small">查询</el-button>
           <el-button class="mr10" type="primary" size="small" @click="handleZdhb">自动合并</el-button>
-          <el-button type="primary" size="small">手动合并</el-button>
+          <el-button type="primary" size="small" @click="handleSdhb">手动合并</el-button>
         </div>
         <MyTable
           :tableData="pageForm.tableData_hbq"
@@ -63,6 +63,7 @@
           :key="pageForm.keyCount"
           :tableConfiger="pageForm.tableConfiger"
           :controlsWidth="pageForm.controlsWidth"
+          @chooseData="chooseData"
         >
           <template #xlLx="{row}">
             <DictTag :tag="false" :value="row.xlLx" :options="props.dic.D_GS_XS_LX" />
@@ -79,10 +80,6 @@
           <template #qtlx="{row}">
             <DictTag :tag="false" :value="row.qtlx" :options="props.dic.D_GS_XS_QTLX" />
           </template>
-
-          <template #controls="{ row }">
-            <el-link size="small" type="primary" @click="addEdit('detail', row)">详情</el-link>
-          </template>
         </MyTable>
       </div>
     </div>
@@ -103,7 +100,8 @@ const props = defineProps({
 const active = ref('本周')
 const btns = ref(['本周','本月','本季度','本年'])
 const { proxy } = getCurrentInstance();
-const dialogForm = ref(true); //弹窗
+const dialogForm = ref(false); //弹窗
+const ids = ref([])
 const listQuery = ref({
   times:timeSlotChange('本周')
 }); //表单
@@ -117,6 +115,12 @@ const pageForm = reactive({
     rowHieght: 61,
     showSelectType: "checkBox",
     loading: false,
+    haveControls:false
+  },
+  tableConfiger1: {
+    rowHieght: 61,
+    showSelectType: "null",
+    loading: false,
   },
   controlsWidth: 100,
   tableColumn: [
@@ -171,12 +175,46 @@ const handleZdhb = () =>{
   })
 }
 
+// 手动合并
+const handleSdhb = () =>{
+  if(ids.value.length == 0) return proxy.$message({ type: "success",  message: "请先选择需要合并的数据" });
+  proxy.$confirm("是否确定要合并？", "警告", {type: "warning"}).then(() => {
+    qcckPost(ids.value,'/mosty-gsxt/qbcj/getXshbSdhb').then(res=>{
+       proxy.$message({ type: "success",  message: "合并成功" });
+       gethb_before();
+       gethb_after();
+    })
+  })
+}
+// 重置
+const resetList = () =>{
+  active.value = '本周';
+  listQuery.value = {times:timeSlotChange('本周')}
+  config.pageCurrent = 1;
+  gethb_after();
+}
+// 搜索
+const searchList = () =>{
+  config.pageCurrent = 1;
+  gethb_after();
+}
+
 // 获取合并前的数据
 const gethb_after = () =>{
-  let params = { sfhb:1,...config }
+  let params = { sfhb:1,...config,...listQuery.value }
+  if(params.times && params.times.length > 0){
+    params.startTime = listQuery.value.times[0]
+    params.endTime = listQuery.value.times[1]
+  }
+  delete params.times;
+  pageForm.tableConfiger.tableConfiger1 = true;
   qcckGet(params,'/mosty-gsxt/qbcj/selectPage').then(res=>{
     console.log(res);
-    
+    pageForm.tableConfiger.tableConfiger1 = false;
+    pageForm.tableData_hbh = res.records || [];
+    config.total = res.total;
+  }).catch(()=>{
+    pageForm.tableConfiger.tableConfiger1 = false;
   })
 }
 
@@ -210,8 +248,17 @@ const chooseTime = (val) =>{
   }
 }
 
+const chooseData = (val) =>{
+  if(!Array.isArray(val)) return;
+  ids.value = val.map(v=>v.id);
+}
 // 关闭
 const close = () => {
+  active.value = '本周';
+  listQuery.value = {times:timeSlotChange('本周')};
+  keyWords.value = '';
+  ids.value = [];
+  config.pageCurrent = 1;
   dialogForm.value = false;
   loading.value = false;
 };
diff --git a/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/index.vue b/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/index.vue
index 5a50cb3..53a6bad 100644
--- a/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/index.vue
+++ b/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/index.vue
@@ -21,8 +21,7 @@
         :tableHeight="pageData.tableHeight"
         :key="pageData.keyCount"
         :tableConfiger="pageData.tableConfiger"
-        :controlsWidth="pageData.controlsWidth"
-        @chooseData="chooseData">
+        :controlsWidth="pageData.controlsWidth">
 
         <template #xlLx="{row}">
           <DictTag :tag="false" :value="row.xlLx" :options="D_GS_XS_LX" />
@@ -96,6 +95,11 @@ const pageData = reactive({
     showSelectType: "checkBox",
     loading: false
   },
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "checkBox",
+    loading: false
+  },
   total: 0,
   pageConfiger: {
     pageSize: 20,