From 09a47e536946fbc315937287038f8db8eada9e0c Mon Sep 17 00:00:00 2001
From: Esacpe <1113279529@qq.com>
Date: Mon, 14 Jul 2025 16:56:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IntelligenceManagement/components/hbDetail.vue           | 5 ++++-
 .../IntelligenceManagement/components/hbForm.vue             | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/components/hbDetail.vue b/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/components/hbDetail.vue
index 1693c4d..dbc0e81 100644
--- a/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/components/hbDetail.vue
+++ b/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/components/hbDetail.vue
@@ -78,9 +78,12 @@ const pageForm = reactive({
 const emits = defineEmits(["update:modelValue"]);
 
 const getList = () =>{
+    pageForm.tableConfiger.loading = true;
     qcckGet({},'/mosty-gsxt/qbcj/getXshbXq').then(res=>{
-        console.log(res,'============监听');
         pageForm.tableData = res || [];
+        pageForm.tableConfiger.loading = false;
+    }).catch(()=>{
+        pageForm.tableConfiger.loading = false;
     })
 }
 
diff --git a/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/components/hbForm.vue b/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/components/hbForm.vue
index 7b67625..0e8e254 100644
--- a/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/components/hbForm.vue
+++ b/src/views/backOfficeSystem/ResearchJudgment/IntelligenceManagement/components/hbForm.vue
@@ -182,7 +182,7 @@ const handleZdhb = () =>{
 
 // 手动合并
 const handleSdhb = () =>{
-  if(ids.value.length == 0) return proxy.$message({ type: "success",  message: "请先选择需要合并的数据" });
+  if(ids.value.length < 2) return proxy.$message({ type: "warning",  message: "请先选择需要合并的数据，并且至少选择 2 条数据。" });
   proxy.$confirm("是否确定要合并？", "警告", {type: "warning"}).then(() => {
     qcckPost(ids.value,'/mosty-gsxt/qbcj/getXshbSdhb').then(res=>{
        proxy.$message({ type: "success",  message: "合并成功" });