diff --git a/src/api/credit/creditJudgmentDebtor/index.ts b/src/api/credit/creditJudgmentDebtor/index.ts
index 2bd2bd5..c99ddc3 100644
--- a/src/api/credit/creditJudgmentDebtor/index.ts
+++ b/src/api/credit/creditJudgmentDebtor/index.ts
@@ -163,3 +163,25 @@ export async function importCreditJudgmentDebtorHistory(
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+/**
+ * 修正被执行人主体企业归属（按企业名称匹配回填 companyId）
+ *
+ * 后端: POST /api/credit/credit-judgment-debtor/company-id/refresh
+ * - onlyNull: 默认 true，仅更新 companyId 为空的数据
+ * - limit: 可选，限制处理条数
+ */
+export async function refreshCreditJudgmentDebtorCompanyId(params?: {
+  onlyNull?: boolean;
+  limit?: number;
+}) {
+  const res = await request.post<ApiResult<unknown>>(
+    '/credit/credit-judgment-debtor/company-id/refresh',
+    undefined,
+    { params }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
diff --git a/src/views/credit/creditAdministrativeLicense/components/credit-administrative-license-history-import.vue b/src/views/credit/creditAdministrativeLicense/components/credit-administrative-license-history-import.vue
index f035dbd..b3598d2 100644
--- a/src/views/credit/creditAdministrativeLicense/components/credit-administrative-license-history-import.vue
+++ b/src/views/credit/creditAdministrativeLicense/components/credit-administrative-license-history-import.vue
@@ -41,9 +41,11 @@
     (e: 'update:visible', visible: boolean): void;
   }>();
 
-  defineProps<{
+  const props = defineProps<{
     // 是否打开弹窗
     visible: boolean;
+    // 关联企业ID（企业详情下导入时需要）
+    companyId?: number;
   }>();
 
   // 导入请求状态
@@ -74,7 +76,7 @@
       return false;
     }
     loading.value = true;
-    importCreditAdministrativeLicenseHistory(file)
+    importCreditAdministrativeLicenseHistory(file, props.companyId)
       .then((msg) => {
         loading.value = false;
         message.success(msg);
@@ -93,4 +95,3 @@
     emit('update:visible', value);
   };
 </script>
-
diff --git a/src/views/credit/creditAdministrativeLicense/index.vue b/src/views/credit/creditAdministrativeLicense/index.vue
index b89c216..d0ef335 100644
--- a/src/views/credit/creditAdministrativeLicense/index.vue
+++ b/src/views/credit/creditAdministrativeLicense/index.vue
@@ -23,12 +23,6 @@
               @importData="openImport"
               @exportData="exportData"
             />
-            <a-button type="dashed" class="ele-btn-icon" @click="openImport2">
-              <template #icon>
-                <CloudUploadOutlined />
-              </template>
-              <span class="text-red-500">导入历史行政许可</span>
-            </a-button>
           </a-space>
         </template>
         <template #bodyCell="{ column, record }">
@@ -77,30 +71,24 @@
       v-model:visible="showImport"
       @done="reload"
     />
-    <!-- 历史导入弹窗 -->
-    <CreditAdministrativeLicenseHistoryImport
-      v-model:visible="showImport2"
-      @done="reload"
-    />
   </a-page-header>
 </template>
 
 <script lang="ts" setup>
   import { createVNode, ref } from 'vue';
   import { message, Modal } from 'ant-design-vue';
-  import { ExclamationCircleOutlined, CloudUploadOutlined } from '@ant-design/icons-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
   import type { EleProTable } from 'ele-admin-pro';
   import { toDateString } from 'ele-admin-pro';
   import type {
     DatasourceFunction,
     ColumnItem
   } from 'ele-admin-pro/es/ele-pro-table/types';
-  import Search from '@/views/credit/components/CreditSearchToolbar.vue';
+  import Search from '@/views/credit/components/CreditSearchToolbar2.vue';
   import { exportCreditData } from '../utils/export';
   import { getPageTitle } from '@/utils/common';
   import CreditAdministrativeLicenseEdit from './components/creditAdministrativeLicenseEdit.vue';
   import CreditAdministrativeLicenseImport from './components/credit-administrative-license-import.vue';
-  import CreditAdministrativeLicenseHistoryImport from './components/credit-administrative-license-history-import.vue';
   import {
     pageCreditAdministrativeLicense,
     listCreditAdministrativeLicense,
@@ -123,8 +111,6 @@
   const showEdit = ref(false);
   // 是否显示导入弹窗
   const showImport = ref(false);
-  // 是否显示历史导入弹窗
-  const showImport2 = ref(false);
   // 是否显示批量移动弹窗
   const showMove = ref(false);
   // 加载状态
@@ -267,11 +253,6 @@
     showImport.value = true;
   };
 
-  /* 打开历史导入弹窗 */
-  const openImport2 = () => {
-    showImport2.value = true;
-  };
-
   /* 导出 */
   const exportData = () => {
     exportCreditData<CreditAdministrativeLicense>({
diff --git a/src/views/credit/creditBankruptcy/index.vue b/src/views/credit/creditBankruptcy/index.vue
index 891d2b7..6684cd5 100644
--- a/src/views/credit/creditBankruptcy/index.vue
+++ b/src/views/credit/creditBankruptcy/index.vue
@@ -89,7 +89,7 @@
     DatasourceFunction,
     ColumnItem
   } from 'ele-admin-pro/es/ele-pro-table/types';
-  import Search from '@/views/credit/components/CreditSearchToolbar.vue';
+  import Search from '@/views/credit/components/CreditSearchToolbar2.vue';
   import { exportCreditData } from '../utils/export';
   import { getPageTitle } from '@/utils/common';
   import CreditBankruptcyEdit from './components/creditBankruptcyEdit.vue';
diff --git a/src/views/credit/creditBranch/index.vue b/src/views/credit/creditBranch/index.vue
index 4480ad4..50e7cf2 100644
--- a/src/views/credit/creditBranch/index.vue
+++ b/src/views/credit/creditBranch/index.vue
@@ -78,7 +78,7 @@
     DatasourceFunction,
     ColumnItem
   } from 'ele-admin-pro/es/ele-pro-table/types';
-  import Search from '@/views/credit/components/CreditSearchToolbar.vue';
+  import Search from '@/views/credit/components/CreditSearchToolbar2.vue';
   import { exportCreditData } from '../utils/export';
   import { getPageTitle } from '@/utils/common';
   import CreditBranchEdit from './components/creditBranchEdit.vue';
diff --git a/src/views/credit/creditCompany/components/creditCompanyInfo.vue b/src/views/credit/creditCompany/components/creditCompanyInfo.vue
index 66c349d..1ad834f 100644
--- a/src/views/credit/creditCompany/components/creditCompanyInfo.vue
+++ b/src/views/credit/creditCompany/components/creditCompanyInfo.vue
@@ -49,6 +49,16 @@
           >
             导入(多)
           </a-button>
+          <a-button
+            v-if="tab.key === '行政许可'"
+            :disabled="!form.id"
+            @click="openAdministrativeLicenseHistoryImport"
+          >
+            <template #icon>
+              <CloudUploadOutlined />
+            </template>
+            导入历史行政许可
+          </a-button>
           <a-button
             :loading="tabState[tab.key].loading"
             @click="reloadTab(tab.key)"
@@ -82,17 +92,26 @@
       :importFn="relatedImportFn"
       @done="handleRelatedImportDone"
     />
+
+    <!-- 历史行政许可导入（企业详情-行政许可tab） -->
+    <CreditAdministrativeLicenseHistoryImport
+      v-model:visible="showAdministrativeLicenseHistoryImport"
+      :companyId="form.id"
+      @done="handleAdministrativeLicenseHistoryImportDone"
+    />
   </a-drawer>
 </template>
 
 <script lang="ts" setup>
   import { computed, h, reactive, ref, watch } from 'vue';
   import { message } from 'ant-design-vue';
+  import { CloudUploadOutlined } from '@ant-design/icons-vue';
   import { assignObject } from 'ele-admin-pro';
   import { CreditCompany } from '@/api/credit/creditCompany/model';
   import { useThemeStore } from '@/store/modules/theme';
   import { storeToRefs } from 'pinia';
   import CreditCompanyRelatedImport from './credit-company-related-import.vue';
+  import CreditAdministrativeLicenseHistoryImport from '@/views/credit/creditAdministrativeLicense/components/credit-administrative-license-history-import.vue';
   import {
     pageCreditAdministrativeLicense,
     importCreditAdministrativeLicense
@@ -951,6 +970,22 @@
     reloadTab(activeTab.value);
   };
 
+  // 历史行政许可导入弹窗（企业详情-行政许可tab）
+  const showAdministrativeLicenseHistoryImport = ref(false);
+
+  const openAdministrativeLicenseHistoryImport = () => {
+    if (!form.id) {
+      message.error('缺少企业ID，无法导入');
+      return;
+    }
+    showAdministrativeLicenseHistoryImport.value = true;
+  };
+
+  const handleAdministrativeLicenseHistoryImportDone = () => {
+    resetTabPagination('行政许可');
+    reloadTab('行政许可');
+  };
+
   const defaultForm: CreditCompany = {
     id: undefined,
     name: undefined,
diff --git a/src/views/credit/creditHistoricalLegalPerson/index.vue b/src/views/credit/creditHistoricalLegalPerson/index.vue
index 3b1ef9c..d06a9a1 100644
--- a/src/views/credit/creditHistoricalLegalPerson/index.vue
+++ b/src/views/credit/creditHistoricalLegalPerson/index.vue
@@ -81,7 +81,7 @@
     DatasourceFunction,
     ColumnItem
   } from 'ele-admin-pro/es/ele-pro-table/types';
-  import Search from '@/views/credit/components/CreditSearchToolbar.vue';
+  import Search from '@/views/credit/components/CreditSearchToolbar2.vue';
   import { exportCreditData } from '../utils/export';
   import { getPageTitle } from '@/utils/common';
   import CreditHistoricalLegalPersonEdit from './components/creditHistoricalLegalPersonEdit.vue';
diff --git a/src/views/credit/creditJudgmentDebtor/index.vue b/src/views/credit/creditJudgmentDebtor/index.vue
index 5289a70..44e0548 100644
--- a/src/views/credit/creditJudgmentDebtor/index.vue
+++ b/src/views/credit/creditJudgmentDebtor/index.vue
@@ -125,7 +125,8 @@
     pageCreditJudgmentDebtor,
     listCreditJudgmentDebtor,
     removeCreditJudgmentDebtor,
-    removeBatchCreditJudgmentDebtor
+    removeBatchCreditJudgmentDebtor,
+    refreshCreditJudgmentDebtorCompanyId
   } from '@/api/credit/creditJudgmentDebtor';
   import type {
     CreditJudgmentDebtor,
@@ -359,6 +360,30 @@
     });
   };
 
+  /* 修正主体企业归属（按企业名称匹配回填 companyId） */
+  const belongToCompany = () => {
+    Modal.confirm({
+      title: '提示',
+      content:
+        '将按被执行人名称匹配企业名称并回填 companyId（默认仅更新 companyId 为0的数据）确定要执行吗？',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        return refreshCreditJudgmentDebtorCompanyId({ onlyNull: true })
+          .then((msg) => {
+            hide();
+            message.success(msg || '操作成功');
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
   /* 查询 */
   const query = () => {
     loading.value = true;
diff --git a/src/views/credit/creditJudiciary/components/search.vue b/src/views/credit/creditJudiciary/components/search.vue
index 4372792..8d4ac0f 100644
--- a/src/views/credit/creditJudiciary/components/search.vue
+++ b/src/views/credit/creditJudiciary/components/search.vue
@@ -7,12 +7,12 @@
 <!--      </template>-->
 <!--      <span>添加</span>-->
 <!--    </a-button>-->
-    <a-button class="ele-btn-icon" @click="openImport">
-      <template #icon>
-        <CloudUploadOutlined />
-      </template>
-      <span>导入(多)</span>
-    </a-button>
+<!--    <a-button class="ele-btn-icon" @click="openImport">-->
+<!--      <template #icon>-->
+<!--        <CloudUploadOutlined />-->
+<!--      </template>-->
+<!--      <span>导入(多)</span>-->
+<!--    </a-button>-->
     <a-button class="ele-btn-icon" @click="exportData">
       <template #icon>
         <CloudDownloadOutlined />
diff --git a/src/views/credit/creditNearbyCompany/index.vue b/src/views/credit/creditNearbyCompany/index.vue
index 585796b..e0ef149 100644
--- a/src/views/credit/creditNearbyCompany/index.vue
+++ b/src/views/credit/creditNearbyCompany/index.vue
@@ -80,7 +80,7 @@
     DatasourceFunction,
     ColumnItem
   } from 'ele-admin-pro/es/ele-pro-table/types';
-  import Search from '@/views/credit/components/CreditSearchToolbar.vue';
+  import Search from '@/views/credit/components/CreditSearchToolbar2.vue';
   import { exportCreditData } from '../utils/export';
   import { getPageTitle } from '@/utils/common';
   import CreditNearbyCompanyEdit from './components/creditNearbyCompanyEdit.vue';
diff --git a/src/views/credit/creditPatent/index.vue b/src/views/credit/creditPatent/index.vue
index 25562f0..763f3a8 100644
--- a/src/views/credit/creditPatent/index.vue
+++ b/src/views/credit/creditPatent/index.vue
@@ -78,7 +78,7 @@
     DatasourceFunction,
     ColumnItem
   } from 'ele-admin-pro/es/ele-pro-table/types';
-  import Search from '@/views/credit/components/CreditSearchToolbar.vue';
+  import Search from '@/views/credit/components/CreditSearchToolbar2.vue';
   import { exportCreditData } from '../utils/export';
   import { getPageTitle } from '@/utils/common';
   import CreditPatentEdit from './components/creditPatentEdit.vue';
diff --git a/src/views/credit/creditSuspectedRelationship/index.vue b/src/views/credit/creditSuspectedRelationship/index.vue
index 866cc64..444a40b 100644
--- a/src/views/credit/creditSuspectedRelationship/index.vue
+++ b/src/views/credit/creditSuspectedRelationship/index.vue
@@ -81,7 +81,7 @@
     DatasourceFunction,
     ColumnItem
   } from 'ele-admin-pro/es/ele-pro-table/types';
-  import Search from '@/views/credit/components/CreditSearchToolbar.vue';
+  import Search from '@/views/credit/components/CreditSearchToolbar2.vue';
   import { exportCreditData } from '../utils/export';
   import { getPageTitle } from '@/utils/common';
   import CreditSuspectedRelationshipEdit from './components/creditSuspectedRelationshipEdit.vue';