tijaodaim

src/api/basic/basicasynctask.ts

@@ -28,3 +28,16 @@ export const fetchList = (query?: any) => {
 		params: query,
 	});
 };
+
+/**
+ * 下载任务文件
+ * @param data 如 { id: 任务id }
+ */
+export const downloadTaskFile = (data?: any) => {
+	return request({
+		url: '/basic/basicAsyncTask/downloadTaskFile',
+		method: 'post',
+		data: data,
+		responseType: 'blob',
+	});
+};

src/api/professional/professionalfile.ts

@@ -8,3 +8,11 @@ export const makeExportTeacherInfoBySelfTask = (data?: any) => {
         data: data,
     });
 };
+
+export const makeExportTeacherInfoByTypeTask = (data?: any) => {
+    return request({
+        url: '/professional/file/makeExportTeacherInfoByTypeTask',
+        method: 'post',
+        data: data,
+    });
+};

src/api/professional/professionaluser/professionaltitlerelation.ts

@@ -138,16 +138,3 @@ export const titleCountInfo = () => {
 	});
 };
 
-/**
- * 导出Excel
- * @param data 查询参数
- */
-export const exportRelation = (data: any) => {
-	return request({
-		url: '/professional/professionaltitlerelation/exportRelation',
-		method: 'post',
-		data: data,
-		responseType: 'blob',
-	});
-};
-

src/layout/navBars/breadcrumb/asyncTaskDrawer.vue

@@ -28,7 +28,12 @@
 			>
 				<el-table-column label="所属模块" prop="moduleName" width="120" show-overflow-tooltip />
 				<el-table-column label="任务类型" prop="typeLabel" width="100" show-overflow-tooltip />
-				<el-table-column label="任务名称" prop="detailType" min-width="150" show-overflow-tooltip />
+				<el-table-column label="任务名称" prop="detailType" min-width="150" show-overflow-tooltip >
+          <template #default="{ row }">
+            <el-button v-if="row.type==2" type="text" icon="Download" class="task-name-text" :loading="downloadingId === row.id" @click="handleDownloadFile(row)">{{row.detailType}}</el-button>
+            <span v-else class="task-name-text">{{row.detailType}}</span>
+          </template>
+        </el-table-column>
 				<el-table-column label="任务状态" align="center" show-overflow-tooltip>
 					<template #default="{ row }">
 						<el-tag>{{ row.status }}</el-tag>
@@ -58,7 +63,8 @@
 
 <script setup lang="ts">
 import { ref, reactive, watch, computed } from 'vue'
-import { fetchList } from '/@/api/basic/basicasynctask'
+import { fetchList, downloadTaskFile } from '/@/api/basic/basicasynctask'
+import { useMessage } from '/@/hooks/message'
 
 type TaskTab = 'upload' | 'download' | 'other'
 
@@ -87,6 +93,7 @@ const tableStyle = {
 }
 
 const emptyText = computed(() => EMPTY_TEXT_MAP[activeTab.value])
+const message = useMessage()
 
 const loadList = async () => {
 	const type = activeTab.value
@@ -135,6 +142,34 @@ const open = () => {
 	visible.value = true
 }
 
+const downloadingId = ref<string | number | null>(null)
+const handleDownloadFile = async (row: any) => {
+	if (!row?.id) return
+	downloadingId.value = row.id
+	try {
+		const response: any = await downloadTaskFile({ id: row.id })
+		const blob = (response && response.data instanceof Blob)
+			? response.data
+			: (response instanceof Blob ? response : new Blob([response]))
+		const dateStr = new Date().toISOString().slice(0, 10)
+		const baseName = row.detailType ? String(row.detailType).replace(/\s+/g, '_') : '下载文件'
+		const fileName = `${baseName}_${dateStr}.xls`
+		const elink = document.createElement('a')
+		elink.download = fileName
+		elink.style.display = 'none'
+		elink.href = URL.createObjectURL(blob)
+		document.body.appendChild(elink)
+		elink.click()
+		URL.revokeObjectURL(elink.href)
+		document.body.removeChild(elink)
+		message.success('下载成功')
+	} catch {
+		message.error('下载失败')
+	} finally {
+		downloadingId.value = null
+	}
+}
+
 defineExpose({ open })
 </script>
 

src/views/finance/purchasingrequisition/accept/AcceptBatchForm.vue

@@ -1,16 +1,16 @@
 <template>
-  <el-form ref="formRef" :model="form" :rules="rules" label-width="160px" class="accept-batch-form">
+  <el-form ref="formRef" :model="form" :rules="rules" label-width="160px" >
     <el-row :gutter="24">
-      <el-col :span="12">
+      <el-col :span="12" class="mb20">
         <el-form-item label="验收方式" prop="acceptType">
           <el-radio-group v-model="form.acceptType" :disabled="readonly">
-            <el-radio label="1">填写履约验收评价表</el-radio>
+            <el-radio label="1" :disabled="!canFill">填写履约验收评价表</el-radio>
-            <el-radio label="2" :disabled="!canFill">上传履约验收评价表</el-radio>
+            <el-radio label="2">上传履约验收评价表</el-radio>
           </el-radio-group>
           <div v-if="!canFill" class="el-form-item__tip">金额≥30万，仅支持上传模版</div>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="12" class="mb20">
         <el-form-item label="验收日期" prop="acceptDate">
           <el-date-picker
             v-model="form.acceptDate"
@@ -26,12 +26,13 @@
 
       <!-- 填报方式：验收内容表格 -->
       <template v-if="form.acceptType === '1' && canFill">
-        <el-col :span="24">
+        <el-col :span="12" class="mb20">
           <el-form-item label="验收内容" prop="acceptContents">
-            <el-table :data="form.acceptContents" border size="small" max-height="260"  class="accept-content-table">
+            <el-table :data="form.acceptContents" border size="small"   class="accept-content-table">
               <el-table-column prop="itemName" label="验收项" >
                 <template #default="{ row }">
-                  {{row.itemName}}
+                  <div>
+                    <span>{{row.itemName}}</span>
                     <el-input
                         v-if="row.type === 'input'"
                         v-model="row.remark"
@@ -39,10 +40,12 @@
                         size="small"
                         :disabled="readonly"
                     />
+                  </div>
+
 
                 </template>
               </el-table-column>
-              <el-table-column prop="isQualified" label="合格/不合格" width="140" align="center">
+              <el-table-column prop="isQualified" label="合格/不合格"  align="center">
                 <template #default="{ row }">
                   <el-radio-group v-model="row.isQualified" size="small" :disabled="readonly">
                     <el-radio label="1">合格</el-radio>
@@ -58,7 +61,7 @@
 
       <!-- 上传方式 -->
       <template v-if="form.acceptType === '2'">
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item label="履约验收模版" prop="templateFileIds">
             <UploadFile
               v-model="templateFileIdsStr"
@@ -72,7 +75,7 @@
       </template>
 
       <!-- 验收小组 -->
-      <el-col :span="24">
+      <el-col :span="12">
         <el-form-item label="验收小组" prop="acceptTeam">
           <div class="team-list">
             <div v-for="(m, idx) in form.acceptTeam" :key="idx" class="team-row">
@@ -82,7 +85,30 @@
             </div>
             <el-button v-if="!readonly" type="primary" link size="small" @click="addTeam">+ 增加成员</el-button>
           </div>
-          <div class="el-form-item__tip">至少3人，且为单数</div>
+          <div class="el-form-item__tip">
+            至少3人，且为单数
+            <template v-if="(previousBatchesTeams || []).length > 0">
+              ；
+              <span class="copy-from-inline">
+                从往期带入
+                <el-select
+                  v-model="copyFromBatch"
+                  placeholder="同第N期"
+                  clearable
+                  size="small"
+                  style="width: 100px"
+                  @change="onCopyFromBatch"
+                >
+                  <el-option
+                    v-for="item in (previousBatchesTeams || [])"
+                    :key="item.batch"
+                    :label="`同第${item.batch}期`"
+                    :value="item.batch"
+                  />
+                </el-select>
+              </span>
+            </template>
+          </div>
         </el-form-item>
       </el-col>
 
@@ -106,14 +132,17 @@ const props = withDefaults(
     readonly?: boolean
     purchaseId?: string
     acceptanceItems?: any[]
+    batchNum?: number
+    previousBatchesTeams?: { batch: number; team: any[] }[]
   }>(),
-  { readonly: false, canFill: true, purchaseId: '' }
+  { readonly: false, canFill: true, purchaseId: '', batchNum: 1, previousBatchesTeams: () => [] }
 )
 
 const emit = defineEmits(['update:modelValue'])
 
 const formRef = ref<FormInstance>()
 const templateFileIdsStr = ref('')
+const copyFromBatch = ref<number | null>(null)
 
 const form = reactive({
   acceptType: '1',
@@ -129,8 +158,20 @@ const form = reactive({
   ...props.modelValue,
 })
 
-watch(() => props.modelValue, (val) => Object.assign(form, val || {}), { deep: true })
+watch(() => props.modelValue, (val) => {
+  Object.assign(form, val || {})
+  // 金额≥30万时，强制为上传方式
+  if (!props.canFill && form.acceptType === '1') {
+    form.acceptType = '2'
+  }
+}, { deep: true })
 watch(form, () => emit('update:modelValue', { ...form }), { deep: true })
+// 金额≥30万时，默认选中上传方式
+watch(() => props.canFill, (val) => {
+  if (!val && form.acceptType === '1') {
+    form.acceptType = '2'
+  }
+}, { immediate: true })
 
 watch(() => props.acceptanceItems, (items) => {
   if (items?.length && form.acceptContents.length === 0) {
@@ -163,6 +204,19 @@ const removeTeam = (idx: number) => {
   form.acceptTeam.splice(idx, 1)
 }
 
+const onCopyFromBatch = (n: number | null) => {
+  if (!n) return
+  const item = props.previousBatchesTeams?.find((x) => x.batch === n)
+  if (item?.team?.length) {
+    form.acceptTeam = item.team.map((m: any) => ({
+      name: m.name || '',
+      deptCode: m.deptCode || '',
+      deptName: m.deptName || '',
+    }))
+  }
+  copyFromBatch.value = null
+}
+
 const rules: FormRules = {
   acceptType: [{ required: true, message: '请选择验收方式', trigger: 'change' }],
   acceptDate: [{ required: true, message: '请选择验收日期', trigger: 'change' }],
@@ -174,26 +228,16 @@ defineExpose({ validate, form })
 </script>
 
 <style scoped>
-.accept-batch-form :deep(.el-form-item) {
+.mb20 {
-  margin-bottom: 24px;
+  margin-bottom: 20px;
 }
-.accept-content-table :deep(.el-table__body td) {
+.copy-from-inline {
-  padding: 10px 0;
+  display: inline-flex;
-  width: 200px;
-}
-.team-list {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-}
-.team-row {
-  display: flex;
   align-items: center;
-  gap: 12px;
+  gap: 6px;
+  margin-left: 4px;
 }
-.el-form-item__tip {
+.copy-from-inline :deep(.el-select) {
-  font-size: 12px;
+  vertical-align: middle;
-  color: #909399;
-  margin-top: 6px;
 }
 </style>

src/views/finance/purchasingrequisition/accept/AcceptCommonForm.vue

@@ -1,17 +1,17 @@
 <template>
-  <el-form ref="formRef" :model="form" :rules="rules" label-width="140px" class="accept-common-form compact-form">
+  <el-form ref="formRef" :model="form" :rules="rules" label-width="140px">
     <el-row :gutter="24">
-      <el-col :span="8">
+      <el-col :span="8" class="mb20">
         <el-form-item label="项目名称">
           <el-input :model-value="projectName || form.projectName" readonly placeholder="-" />
         </el-form-item>
       </el-col>
-      <el-col :span="8">
+      <el-col :span="8" class="mb20">
         <el-form-item label="需求部门">
           <el-input :model-value="deptName || form.deptName" readonly placeholder="-" />
         </el-form-item>
       </el-col>
-      <el-col :span="8">
+      <el-col :span="8" class="mb20">
         <el-form-item label="是否签订合同" prop="hasContract">
           <el-radio-group v-model="form.hasContract">
             <el-radio label="0">否</el-radio>
@@ -19,12 +19,12 @@
           </el-radio-group>
         </el-form-item>
       </el-col>
-      <el-col :span="12" v-if="form.hasContract === '1'">
+      <el-col :span="8" class="mb20" v-if="form.hasContract === '1'">
         <el-form-item label="合同" prop="contractId">
           <el-input v-model="form.contractId" placeholder="请选择合同（待对接合同接口）" clearable />
         </el-form-item>
       </el-col>
-      <el-col :span="8">
+      <el-col :span="8" class="mb20">
         <el-form-item label="是否分期验收" prop="isInstallment">
           <el-radio-group v-model="form.isInstallment">
             <el-radio label="0">否</el-radio>
@@ -32,27 +32,27 @@
           </el-radio-group>
         </el-form-item>
       </el-col>
-      <el-col :span="12" v-if="form.isInstallment === '1'">
+      <el-col :span="8" class="mb20" v-if="form.isInstallment === '1'">
         <el-form-item label="分期次数" prop="totalPhases">
           <el-input-number v-model="form.totalPhases" :min="1" :max="99" placeholder="请输入" style="width: 100%" />
         </el-form-item>
       </el-col>
-      <el-col :span="8">
+      <el-col :span="8" class="mb20">
         <el-form-item label="供应商名称" prop="supplierName">
           <el-input v-model="form.supplierName" placeholder="选择合同后自动带出" clearable />
         </el-form-item>
       </el-col>
-      <el-col :span="8">
+      <el-col :span="8" class="mb20">
         <el-form-item label="供应商联系人及电话" prop="supplierContact">
           <el-input v-model="form.supplierContact" placeholder="请输入" clearable />
         </el-form-item>
       </el-col>
-      <el-col :span="8">
+      <el-col :span="8" class="mb20">
         <el-form-item label="采购人员" prop="purchaserId">
           <org-selector v-model:orgList="purchaserList" type="user" :multiple="false" @update:orgList="onPurchaserChange" />
         </el-form-item>
       </el-col>
-      <el-col :span="8">
+      <el-col :span="8" class="mb20">
         <el-form-item label="资产管理员" prop="assetAdminId">
           <org-selector v-model:orgList="assetAdminList" type="user" :multiple="false" @update:orgList="onAssetAdminChange" />
         </el-form-item>
@@ -69,6 +69,8 @@ const props = defineProps<{
   modelValue: Record<string, any>
   projectName?: string
   deptName?: string
+  /** 每次打开弹窗时变化，用于强制重置内部 form */
+  resetKey?: number
 }>()
 
 const emit = defineEmits(['update:modelValue'])
@@ -91,9 +93,8 @@ const form = reactive({
   ...props.modelValue,
 })
 
-watch(() => props.modelValue, (val) => {
+const syncFormFromModel = (val: Record<string, any> | undefined) => {
   Object.assign(form, val || {})
-  // 人员选择回显
   if (form.purchaserId && form.purchaserName) {
     purchaserList.value = [{ id: form.purchaserId, name: form.purchaserName, type: 'user' }]
   } else {
@@ -104,7 +105,11 @@ watch(() => props.modelValue, (val) => {
   } else {
     assetAdminList.value = []
   }
-}, { deep: true, immediate: true })
+}
+
+watch(() => props.modelValue, syncFormFromModel, { deep: true, immediate: true })
+// resetKey 变化时强制用 modelValue 覆盖内部 form
+watch(() => props.resetKey, () => syncFormFromModel(props.modelValue))
 watch(form, () => emit('update:modelValue', { ...form }), { deep: true })
 
 const onPurchaserChange = (list: any[]) => {
@@ -140,26 +145,7 @@ defineExpose({ validate, form })
 </script>
 
 <style scoped>
-.accept-common-form {
+.mb20 {
-  padding: 0 4px;
+  margin-bottom: 20px;
-}
-.accept-common-form :deep(.el-form-item) {
-  margin-bottom: 24px;
-}
-/* 紧凑表单样式 */
-.compact-form {
-  :deep(.el-form-item) {
-    margin-bottom: 16px;
-  }
-  
-  :deep(.el-form-item__label) {
-    padding-right: 12px;
-    font-size: 14px;
-  }
-  
-  :deep(.el-input__inner),
-  :deep(.el-textarea__inner) {
-    font-size: 14px;
-  }
 }
 </style>

src/views/finance/purchasingrequisition/accept/PurchasingAcceptModal.vue

@@ -2,13 +2,13 @@
   <el-dialog
     v-model="visible"
     title="履约验收"
-    width="85%"
+    width="75%"
     :close-on-click-modal="false"
     destroy-on-close
     class="purchasing-accept-modal"
     @close="handleClose"
   >
-    <div v-loading="loading" class="modal-body">
+    <div v-loading="loading" class="modal-body" :key="String(purchaseId)">
       <div class="main-tabs">
         <div class="main-tab-nav">
           <div
@@ -23,12 +23,14 @@
             :class="{ active: mainTab === 'batch' }"
             @click="mainTab = 'batch'"
           >
-            分期验收{{ batches.length > 0 ? ` (${batches.length})` : '' }}
+            {{ commonForm?.isInstallment === '0' ? '验收' : '分期验收' }}{{ commonForm?.isInstallment !== '0' && batches.length > 0 ? ` (${batches.length})` : '' }}
           </div>
         </div>
         <div class="main-tab-content">
           <div v-show="mainTab === 'common'" class="tab-content">
             <AcceptCommonForm
+              :key="`${purchaseId}-${openToken}`"
+              :reset-key="openToken"
               ref="commonFormRef"
               v-model="commonForm"
               :project-name="applyInfo?.projectName"
@@ -37,7 +39,7 @@
           </div>
           <div v-show="mainTab === 'batch'" class="tab-content">
             <div v-if="batches.length > 0">
-              <div class="batch-tabs">
+              <div v-show="commonForm?.isInstallment !== '0'" class="batch-tabs">
                 <div
                   v-for="b in batches"
                   :key="b.id"
@@ -55,11 +57,14 @@
                   v-for="b in batches"
                   v-show="String(b.batch) === activeTab"
                   :key="b.id"
+                  :ref="(el) => setBatchFormRef(b.batch, el)"
                   v-model="batchForms[b.batch]"
                   :can-fill="canFillForm"
                   :readonly="false"
                   :purchase-id="String(purchaseId)"
                   :acceptance-items="acceptanceItems"
+                  :batch-num="b.batch"
+                  :previous-batches-teams="getPreviousBatchesTeams(b.batch)"
                 />
               </div>
             </div>
@@ -125,14 +130,33 @@ const batches = ref<any[]>([])
 const mainTab = ref('common')
 const activeTab = ref('1')
 const commonFormRef = ref()
-const commonForm = reactive<Record<string, any>>({})
+const batchFormRefMap = ref<Record<number, any>>({})
+/** 使用 ref 并在每次打开时替换整个对象，确保子组件能感知引用变化并清空 */
+const commonForm = ref<Record<string, any>>({})
+/** 每次打开自增，用于强制 AcceptCommonForm 重新挂载，确保公共信息彻底清空 */
+const openToken = ref(0)
 const batchForms = reactive<Record<number, any>>({})
 
+const setBatchFormRef = (batch: number, el: any) => {
+  if (el) batchFormRefMap.value[batch] = el
+}
+
 const activeBatchId = computed(() => {
   const b = batches.value.find((x: any) => String(x.batch) === activeTab.value)
   return b?.id || ''
 })
 
+const getPreviousBatchesTeams = (batchNum: number) => {
+  const list: { batch: number; team: any[] }[] = []
+  for (let n = 1; n < batchNum; n++) {
+    const team = batchForms[n]?.acceptTeam
+    if (Array.isArray(team) && team.length > 0) {
+      list.push({ batch: n, team })
+    }
+  }
+  return list
+}
+
 const canEditBatch = (batch: number) => {
   if (batch === 1) return true
   for (let i = 1; i < batch; i++) {
@@ -142,7 +166,8 @@ const canEditBatch = (batch: number) => {
 }
 
 const isBatchCompleted = (b: any) => {
-  return !!(b.acceptType && b.acceptDate)
+  const form = batchForms[b.batch]
+  return !!(form?.acceptType && form?.acceptDate)
 }
 
 const isBatchCompletedByIdx = (batch: number) => {
@@ -152,17 +177,24 @@ const isBatchCompletedByIdx = (batch: number) => {
 
 const loadData = async () => {
   if (!purchaseId.value) return
+  const currentId = String(purchaseId.value)
   loading.value = true
   try {
     const [configRes, canFillRes] = await Promise.all([
-      getCommonConfigWithBatches(String(purchaseId.value)),
+      getCommonConfigWithBatches(currentId),
-      apiCanFillForm(String(purchaseId.value)),
+      apiCanFillForm(currentId),
     ])
+    // 防止快速切换：若已打开其他申请单，忽略本次结果
+    if (String(purchaseId.value) !== currentId) return
+
     const config = configRes?.data
     canFillForm.value = !!canFillRes?.data
 
     if (config?.common) {
-      Object.assign(commonForm, {
+      applyInfo.value = config.common
+      // 仅当存在已保存批次时，才用接口数据回填公共信息；否则保持 open() 中的默认清空值
+      if (config?.batches?.length) {
+        Object.assign(commonForm.value, {
           hasContract: config.common.hasContract || '0',
           contractId: config.common.contractId || '',
           isInstallment: config.common.isInstallment || '0',
@@ -174,13 +206,14 @@ const loadData = async () => {
           assetAdminId: config.common.assetAdminId || '',
           assetAdminName: config.common.assetAdminName || '',
         })
-      applyInfo.value = config.common
+      }
     }
 
     const projectType = applyInfo.value?.projectType || rowProjectType.value || 'A'
     const typeMap: Record<string, string> = { A: 'A', B: 'B', C: 'C' }
     const at = typeMap[projectType] || 'A'
     const itemsRes = await getAcceptanceItems(at)
+    if (String(purchaseId.value) !== currentId) return
     acceptanceItems.value = itemsRes?.data || []
 
     if (config?.batches?.length) {
@@ -191,6 +224,7 @@ const loadData = async () => {
         if (!batchForms[b.batch]) batchForms[b.batch] = {}
       }
       await loadBatchDetails()
+      if (String(purchaseId.value) !== currentId) return
     } else {
       batches.value = []
     }
@@ -252,9 +286,13 @@ const loadBatchDetails = async () => {
 }
 
 const saveCommonConfig = async () => {
-  const valid = await commonFormRef.value?.validate?.().catch(() => false)
+  const formRef = commonFormRef.value
+  const valid = await formRef?.validate?.().catch(() => false)
   if (!valid) return
-  if (commonForm.isInstallment === '1' && (!commonForm.totalPhases || commonForm.totalPhases < 1)) {
+  // 直接从子组件 form 读取，确保拿到用户填写的最新值（避免 v-model 同步延迟）
+  const form = formRef?.form || commonForm.value
+  const isInstallment = form.isInstallment === '1' || form.isInstallment === 1
+  if (isInstallment && (!form.totalPhases || form.totalPhases < 1)) {
     useMessage().error('请填写分期次数')
     return
   }
@@ -262,16 +300,16 @@ const saveCommonConfig = async () => {
   try {
     await apiSaveCommonConfig({
       purchaseId: String(purchaseId.value),
-      hasContract: commonForm.hasContract,
+      hasContract: form.hasContract ?? '0',
-      contractId: commonForm.contractId,
+      contractId: form.contractId ?? '',
-      isInstallment: commonForm.isInstallment,
+      isInstallment: form.isInstallment ?? '0',
-      totalPhases: commonForm.isInstallment === '1' ? commonForm.totalPhases : 1,
+      totalPhases: isInstallment ? (Number(form.totalPhases) || 1) : 1,
-      supplierName: commonForm.supplierName,
+      supplierName: String(form.supplierName ?? ''),
-      supplierContact: commonForm.supplierContact,
+      supplierContact: String(form.supplierContact ?? ''),
-      purchaserId: commonForm.purchaserId,
+      purchaserId: String(form.purchaserId ?? ''),
-      purchaserName: commonForm.purchaserName,
+      purchaserName: String(form.purchaserName ?? ''),
-      assetAdminId: commonForm.assetAdminId,
+      assetAdminId: String(form.assetAdminId ?? ''),
-      assetAdminName: commonForm.assetAdminName,
+      assetAdminName: String(form.assetAdminName ?? ''),
     })
     useMessage().success('保存成功')
     await loadData()
@@ -283,11 +321,25 @@ const saveCommonConfig = async () => {
 }
 
 const saveCurrentBatch = async () => {
+  const curBatch = Number(activeTab.value)
+  const batchFormRef = batchFormRefMap.value[curBatch]
+  const valid = await batchFormRef?.validate?.().catch(() => false)
+  if (!valid) return
+
   const b = batches.value.find((x: any) => String(x.batch) === activeTab.value)
   if (!b?.id) return
-  const form = batchForms[Number(activeTab.value)]
+  const form = batchForms[curBatch]
   if (!form) return
 
+  if (!form.acceptType) {
+    useMessage().error('请选择验收方式')
+    return
+  }
+  if (!form.acceptDate) {
+    useMessage().error('请选择验收日期')
+    return
+  }
+
   const team = (form.acceptTeam || []).filter((m: any) => m?.name)
   if (team.length < 3 || team.length % 2 === 0) {
     useMessage().error('验收小组至少3人且为单数')
@@ -320,13 +372,50 @@ const handleClose = () => {
   emit('refresh')
 }
 
-const open = (row: any) => {
+const DEFAULT_COMMON_FORM = {
+  hasContract: '0',
+  contractId: '',
+  isInstallment: '0',
+  totalPhases: 1,
+  supplierName: '',
+  supplierContact: '',
+  purchaserId: '',
+  purchaserName: '',
+  assetAdminId: '',
+  assetAdminName: '',
+}
+
+/** 将弹窗内所有内容恢复为初始空值（替换整个对象以确保引用变化） */
+const resetAllToDefault = () => {
+  openToken.value++
+  commonForm.value = { ...DEFAULT_COMMON_FORM }
+  applyInfo.value = null
+  mainTab.value = 'common'
+  activeTab.value = '1'
+  batchFormRefMap.value = {}
+  batches.value = []
+  acceptanceItems.value = []
+  canFillForm.value = true
+  Object.keys(batchForms).forEach((k) => delete batchForms[Number(k)])
+}
+
+const open = async (row: any) => {
   purchaseId.value = row?.id ?? ''
   rowProjectType.value = row?.projectType || 'A'
+
+  // 1. 先将弹窗内所有内容恢复为初始空值
+  resetAllToDefault()
+
+  // 2. 显示弹窗并开启 loading，避免接口返回前展示旧数据
   visible.value = true
-  batches.value = []
+  loading.value = true
-  Object.keys(batchForms).forEach((k) => delete batchForms[Number(k)])
+
-  nextTick(() => loadData())
+  // 3. 等待 Vue 完成渲染，确保子组件已接收并展示空值
+  await nextTick()
+  await nextTick()
+
+  // 4. 再进行接口查询并覆盖
+  await loadData()
 }
 
 defineExpose({ open })
@@ -337,6 +426,7 @@ defineExpose({ open })
   padding: 0;
   max-height: 70vh;
   overflow-y: auto;
+  overflow-x: hidden;
 }
 .main-tab-nav {
   display: flex;
@@ -403,3 +493,10 @@ defineExpose({ open })
   min-height: 200px;
 }
 </style>
+
+<style>
+/* 弹窗横向滚动修复，需非 scoped 以影响 el-dialog */
+.purchasing-accept-modal .el-dialog__body {
+  overflow-x: hidden;
+}
+</style>

src/views/professional/common/import-teacher-other-info.vue

@@ -98,7 +98,7 @@ const handleAvatarError = (err: any) => {
 };
 
 const handleDownloadTemplate = () => {
-	downBlobFile('/professional/file/exportTeacherInfoTemplate', { type: currentType.value || 'titleRelation' }, '职工信息导入模板.xlsx')
+	downBlobFile('/professional/file/exportTeacherInfoTemplate', { type: currentType.value || 'titleRelation' }, title.value+'模板.xlsx')
 }
 
 // 暴露方法给父组件

src/views/professional/professionalqualificationrelation/index.vue

@@ -229,11 +229,10 @@ import { useDict } from '/@/hooks/dict'
 import { 
   fetchList, 
   examObj, 
-  delObj, 
+  delObj} from '/@/api/professional/professionaluser/professionalqualificationrelation'
-  exportExcel
-} from '/@/api/professional/professionaluser/professionalqualificationrelation'
 import { getLevelList } from '/@/api/professional/rsbase/professionalqualificationconfig'
 import { getWorkTypeList } from '/@/api/professional/rsbase/professionalworktype'
+import { makeExportTeacherInfoByTypeTask } from '/@/api/professional/professionalfile';
 import { PROFESSIONAL_AUDIT_STATE_OPTIONS } from '/@/config/global'
 import { defineAsyncComponent } from 'vue'
 import { Medal } from '@element-plus/icons-vue'
@@ -391,27 +390,15 @@ const handleDel = (row: any) => {
 
 // 导出
 const handleDownLoadWord = async () => {
-  exportLoading.value = true
+  exportLoading.value = true;
-  try {
+  let params = Object.assign(search, { type: 'P20003' });
-    const response: any = await exportExcel(search)
+  makeExportTeacherInfoByTypeTask(params).then((res: any) => {
-    
+    message.success('后台下载进行中,请稍后查看任务列表');
-    const blob = new Blob([response as BlobPart])
+  });
-    const fileName = '职业资格信息.xls'
+  setTimeout(() => {
-    const elink = document.createElement('a')
+    exportLoading.value = false;
-    elink.download = fileName
+  }, 3000); // 5分钟后自动关闭
-    elink.style.display = 'none'
+};
-    elink.href = URL.createObjectURL(blob)
-    document.body.appendChild(elink)
-    elink.click()
-    URL.revokeObjectURL(elink.href)
-    document.body.removeChild(elink)
-    message.success('导出成功')
-  } catch (error) {
-    message.error('导出失败')
-  } finally {
-    exportLoading.value = false
-  }
-}
 
 // 获取资格等级名称
 const getQualificationLevelName = (id: string | number) => {

src/views/professional/professionalteacheracademicrelation/form.vue

@@ -84,10 +84,10 @@
           />
         </el-form-item>
 
-        <el-form-item label="证书编码" prop="certificateNumber">
+        <el-form-item label="证书编号" prop="certificateNumber">
           <el-input
             v-model="dataForm.certificateNumber"
-            placeholder="请输入证书编码（仅支持英文和数字）"
+            placeholder="请输入证书编号（仅支持英文和数字）"
             clearable
             show-word-limit
             maxlength="100"
@@ -215,8 +215,8 @@ const formRules = computed(() => {
       { required: true, message: '请输入所学专业', trigger: 'blur' }
     ],
     certificateNumber: [
-      { required: true, message: '请输入证书编码', trigger: 'blur' },
+      { required: true, message: '请输入证书编号', trigger: 'blur' },
-      { pattern: /^[A-Za-z0-9]+$/, message: '证书编码只能包含英文和数字', trigger: 'blur' }
+      { pattern: /^[A-Za-z0-9]+$/, message: '证书编号只能包含英文和数字', trigger: 'blur' }
     ]
   }
   

src/views/professional/professionalteacheracademicrelation/index.vue

@@ -241,14 +241,13 @@ import { useDict } from '/@/hooks/dict'
 import { 
   fetchList, 
   examObj, 
-  delObj, 
+  delObj} from '/@/api/professional/professionaluser/professionalteacheracademicrelation'
-  exportExcel
-} from '/@/api/professional/professionaluser/professionalteacheracademicrelation'
 import { getDegreeList } from '/@/api/professional/rsbase/professionalacademicdegreeconfig'
 import { getQualificationList } from '/@/api/professional/rsbase/academicqualificationsconfig'
 import { getAllTypeList } from '/@/api/professional/rsbase/professionalacademiceducationtypeconfig'
 import { PROFESSIONAL_AUDIT_STATE_OPTIONS } from '/@/config/global'
 import { defineAsyncComponent } from 'vue'
+import {makeExportTeacherInfoByTypeTask} from "/@/api/professional/professionalfile";
 const TeacherNameNo = defineAsyncComponent(() => import('/@/components/TeacherNameNo/index.vue'))
 const AuditState = defineAsyncComponent(() => import('/@/components/AuditState/index.vue'))
 const DataForm = defineAsyncComponent(() => import('./form.vue'))
@@ -412,26 +411,14 @@ const handleDel = (row: any) => {
 
 // 导出
 const handleDownLoadWord = async () => {
-  exportLoading.value = true
+  exportLoading.value = true;
-  try {
+  let params = Object.assign(search, { type: 'P20005' });
-    const response: any = await exportExcel(search)
+  makeExportTeacherInfoByTypeTask(params).then((res: any) => {
-    
+    message.success('后台下载进行中,请稍后查看任务列表');
-    const blob = new Blob([response as BlobPart])
+  });
-    const fileName = '学历学位信息.xls'
+  setTimeout(() => {
-    const elink = document.createElement('a')
+    exportLoading.value = false;
-    elink.download = fileName
+  }, 3000); // 5分钟后自动关闭
-    elink.style.display = 'none'
-    elink.href = URL.createObjectURL(blob)
-    document.body.appendChild(elink)
-    elink.click()
-    URL.revokeObjectURL(elink.href)
-    document.body.removeChild(elink)
-    message.success('导出成功')
-  } catch (error) {
-    message.error('导出失败')
-  } finally {
-    exportLoading.value = false
-  }
 }
 
 // 获取学位名称

src/views/professional/professionalteachercertificaterelation/index.vue

@@ -212,9 +212,10 @@ import { getTeacherCertificateList } from '/@/api/professional/rsbase/profession
 import { 
   fetchList, 
   examObj, 
-  delObj,
+  delObj
-  exportExcel
 } from '/@/api/professional/professionaluser/professionalteachercertificaterelation'
+import { makeExportTeacherInfoByTypeTask } from '/@/api/professional/professionalfile';
+
 import { PROFESSIONAL_AUDIT_STATE_OPTIONS } from '/@/config/global'
 import { defineAsyncComponent } from 'vue'
 const TeacherNameNo = defineAsyncComponent(() => import('/@/components/TeacherNameNo/index.vue'))
@@ -368,27 +369,15 @@ const handleDel = (row: any) => {
 
 // 导出
 const handleDownLoadWord = async () => {
-  exportLoading.value = true
+  exportLoading.value = true;
-  try {
+  let params = Object.assign(search, { type: 'P20004' });
-    const response: any = await exportExcel(search)
+  makeExportTeacherInfoByTypeTask(params).then((res: any) => {
-    
+    message.success('后台下载进行中,请稍后查看任务列表');
-    const blob = new Blob([response as BlobPart])
+  });
-    const fileName = '教师资格证信息.xls'
+  setTimeout(() => {
-    const elink = document.createElement('a')
+    exportLoading.value = false;
-    elink.download = fileName
+  }, 3000); // 5分钟后自动关闭
-    elink.style.display = 'none'
+};
-    elink.href = URL.createObjectURL(blob)
-    document.body.appendChild(elink)
-    elink.click()
-    URL.revokeObjectURL(elink.href)
-    document.body.removeChild(elink)
-    message.success('导出成功')
-  } catch (error) {
-    message.error('导出失败')
-  } finally {
-    exportLoading.value = false
-  }
-}
 
 // 获取证书名称
 const getCertificateName = (id: string | number) => {

src/views/professional/professionalteacherhonor/index.vue

@@ -243,6 +243,7 @@ import {
 } from '/@/api/professional/professionaluser/professionalteacherhonor'
 import { PROFESSIONAL_AUDIT_STATE_OPTIONS, getStatusConfig } from '/@/config/global'
 import { defineAsyncComponent } from 'vue'
+import {makeExportTeacherInfoByTypeTask} from "/@/api/professional/professionalfile";
 const TeacherNameNo = defineAsyncComponent(() => import('/@/components/TeacherNameNo/index.vue'))
 const AuditState = defineAsyncComponent(() => import('/@/components/AuditState/index.vue'))
 const ClickableTag = defineAsyncComponent(() => import('/@/components/ClickableTag/index.vue'))
@@ -393,29 +394,14 @@ const handleDel = (row: any) => {
 
 // 导出
 const handleDownLoadWord = async () => {
-  exportLoading.value = true
+  exportLoading.value = true;
-  try {
+  let params = Object.assign(search, { type: 'P20006' });
-    const response = await fetchList({
+  makeExportTeacherInfoByTypeTask(params).then((res: any) => {
-      current: 1,
+    message.success('后台下载进行中,请稍后查看任务列表');
-      size: 999999,
+  });
-      ...search
+  setTimeout(() => {
-    })
+    exportLoading.value = false;
-    const data = response.data.records || []
+  }, 3000); // 5分钟后自动关闭
-    
-    const tHeader = ['工号', '姓名', '荣誉', '表彰单位', '年份']
-    const filterVal = ['teacherNo', 'teacherName', 'honor', 'honorCompany', 'year']
-    
-    // 动态导入导出工具
-    const { export_json_to_excel } = await import('/@/excel/Export2Excel.js')
-    const exportData = data.map((v: any) => filterVal.map((j: string) => v[j]))
-    export_json_to_excel(tHeader, exportData, '综合表彰.xls')
-    
-    message.success('导出成功')
-  } catch (error) {
-    message.error('导出失败')
-  } finally {
-    exportLoading.value = false
-  }
 }
 
 // 打开导入弹窗

src/views/professional/professionaltitlerelation/index.vue

@@ -5,74 +5,28 @@
 			<div class="content-block">
 				<!-- 最上：搜索区 -->
 				<div v-show="showSearch" class="content-block__filter">
-          <search-form
+					<search-form :model="search" ref="searchFormRef" @keyup-enter="handleFilter">
-            :model="search"
-            ref="searchFormRef"
-            @keyup-enter="handleFilter"
-          >
 						<template #default="{ visible }">
 							<template v-if="visible">
 								<el-form-item label="姓名" prop="realName">
-                  <el-input
+									<el-input v-model="search.realName" clearable placeholder="请输入姓名" class="filter-input" />
-                    v-model="search.realName"
-                    clearable
-                    placeholder="请输入姓名"
-                    class="filter-input"
-                  />
 								</el-form-item>
 								<el-form-item label="工号" prop="teacherNo">
-                  <el-input
+									<el-input v-model="search.teacherNo" clearable placeholder="请输入工号" class="filter-input" />
-                    v-model="search.teacherNo"
-                    clearable
-                    placeholder="请输入工号"
-                    class="filter-input"
-                  />
 								</el-form-item>
 								<el-form-item label="审核状态" prop="state">
-                  <el-select
+									<el-select v-model="search.state" clearable placeholder="请选择审核状态" class="filter-select">
-                    v-model="search.state"
+										<el-option v-for="item in professionalState" :key="item.value" :label="item.label" :value="item.value" />
-                    clearable
-                    placeholder="请选择审核状态"
-                    class="filter-select"
-                  >
-                    <el-option
-                      v-for="item in professionalState"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
 									</el-select>
 								</el-form-item>
 								<el-form-item label="职称" prop="professionalTitleConfigId">
-                  <el-select
+									<el-select v-model="search.professionalTitleConfigId" clearable filterable placeholder="请选择职称" class="filter-select">
-                    v-model="search.professionalTitleConfigId"
+										<el-option v-for="item in professionalTitleList" :key="item.id" :label="item.professionalTitle" :value="item.id" />
-                    clearable
-                    filterable
-                    placeholder="请选择职称"
-                    class="filter-select"
-                  >
-                    <el-option
-                      v-for="item in professionalTitleList"
-                      :key="item.id"
-                      :label="item.professionalTitle"
-                      :value="item.id"
-                    />
 									</el-select>
 								</el-form-item>
 								<el-form-item label="专业技术职务" prop="majorStation">
-                  <el-select
+									<el-select v-model="search.majorStation" clearable filterable placeholder="请选择专业技术职务" class="filter-select">
-                    v-model="search.majorStation"
+										<el-option v-for="item in majorStationList" :key="item.id" :label="item.majorStationName" :value="item.id" />
-                    clearable
-                    filterable
-                    placeholder="请选择专业技术职务"
-                    class="filter-select"
-                  >
-                    <el-option
-                      v-for="item in majorStationList"
-                      :key="item.id"
-                      :label="item.majorStationName"
-                      :value="item.id"
-                    />
 									</el-select>
 								</el-form-item>
 							</template>
@@ -90,12 +44,9 @@
 				<div class="content-block__header">
 					<div class="header-actions">
 						<div class="action-group">
-              <el-button
+							<el-button v-if="hasAuth('professional_professionaltitlerelation_add')" type="primary" icon="FolderAdd" @click="handleAdd"
-                v-if="hasAuth('professional_professionaltitlerelation_add')"
+								>新增</el-button
-                type="primary"
+							>
-                icon="FolderAdd"
-                @click="handleAdd"
-              >新增</el-button>
 							<el-button
 								v-if="hasAuth('professional_teacherbase_export')"
 								type="warning"
@@ -103,21 +54,20 @@
 								icon="Download"
 								@click="handleDownLoadWord"
 								:loading="exportLoading"
-              >导出信息</el-button>
+								>导出信息</el-button
+							>
 							<el-button
 								v-auth="'professional_teacherinfo_import'"
 								type="primary"
 								plain
 								icon="UploadFilled"
 								:loading="exportLoading"
-                  @click="handleImportDialog">导入信息
+								@click="handleImportDialog"
+								>导入信息
 							</el-button>
 						</div>
 						<div class="header-right">
-              <RightToolbar
+							<RightToolbar v-model:showSearch="showSearch" @queryTable="getDataList" />
-                v-model:showSearch="showSearch"
-                @queryTable="getDataList"
-              />
 						</div>
 					</div>
 				</div>
@@ -167,7 +117,8 @@
 								type="primary"
 								link
 								icon="Document"
-              @click="handlePreview(scope.row.srcList)">查看
+								@click="handlePreview(scope.row.srcList)"
+								>查看
 							</el-button>
 							<span v-else class="empty-text">-</span>
 						</template>
@@ -183,42 +134,43 @@
 									type="primary"
 									link
 									icon="edit-pen"
-              @click="handleEdit(scope.row)">修改
+									@click="handleEdit(scope.row)"
+									>修改
 								</el-button>
 								<el-button
 									v-if="hasAuth('professional_professionaltitlerelation_exam') && scope.row.canExam"
 									type="success"
 									link
 									icon="CircleCheck"
-              @click="changeState(scope.row, 1)">通过
+									@click="changeState(scope.row, 1)"
+									>通过
 								</el-button>
 								<el-button
 									v-if="hasAuth('professional_professionaltitlerelation_exam') && scope.row.canDeptExam"
 									type="success"
 									link
 									icon="CircleCheck"
-              @click="changeState(scope.row, 1)">部门通过
+									@click="changeState(scope.row, 1)"
+									>部门通过
 								</el-button>
 								<el-button
 									v-if="hasAuth('professional_professionaltitlerelation_exam') && scope.row.canBack"
 									type="danger"
 									link
 									icon="CircleClose"
-              @click="changeState(scope.row, -2)">驳回
+									@click="changeState(scope.row, -2)"
+									>驳回
 								</el-button>
 								<el-button
 									v-if="hasAuth('professional_professionaltitlerelation_exam') && scope.row.canDeptBack"
 									type="danger"
 									link
 									icon="CircleClose"
-              @click="changeState(scope.row, -2)">部门驳回
+									@click="changeState(scope.row, -2)"
+									>部门驳回
 								</el-button>
-            <el-button
+								<el-button v-if="hasAuth('professional_professionaltitlerelation_del')" type="danger" link icon="delete" @click="handleDel(scope.row)"
-              v-if="hasAuth('professional_professionaltitlerelation_del')"
+									>删除
-              type="danger"
-              link
-              icon="delete"
-              @click="handleDel(scope.row)">删除
 								</el-button>
 							</div>
 						</template>
@@ -226,21 +178,12 @@
 				</el-table>
 
 				<!-- 分页 -->
-        <pagination
+				<pagination v-bind="state.pagination" @current-change="currentChangeHandle" @size-change="sizeChangeHandle" />
-          v-bind="state.pagination"
-          @current-change="currentChangeHandle"
-          @size-change="sizeChangeHandle"
-        />
 			</div>
 		</div>
 
 		<!-- 材料预览：图片直接显示，PDF 在组件内部 dialog 中显示 -->
-    <preview-file 
+		<preview-file v-for="src in imgUrl" :key="src.title" :authSrc="src.url" dialog-title="职称材料" />
-      v-for="src in imgUrl" 
-      :key="src.title" 
-      :authSrc="src.url"
-      dialog-title="职称材料"  
-    />
 
 		<!-- 子组件 -->
 		<MultiDialog ref="multiDialogRef" @getList="getDataList" :page="state.pagination" :nowRow="null" />
@@ -252,48 +195,44 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, onMounted, nextTick } from 'vue'
+import { ref, reactive, onMounted, nextTick } from 'vue';
-import { BasicTableProps, useTable } from '/@/hooks/table'
+import { BasicTableProps, useTable } from '/@/hooks/table';
-import { useAuth } from '/@/hooks/auth'
+import { useAuth } from '/@/hooks/auth';
-import { useMessage } from '/@/hooks/message'
+import { useMessage } from '/@/hooks/message';
-import { useMessageBox } from '/@/hooks/message'
+import { useMessageBox } from '/@/hooks/message';
-import { useDict } from '/@/hooks/dict'
+import { useDict } from '/@/hooks/dict';
 // 接口
-import { 
+import { fetchList, examObj, delObj } from '/@/api/professional/professionaluser/professionaltitlerelation';
-  fetchList, 
+import { getProfessionalTitleList } from '/@/api/professional/rsbase/professionaltitlelevelconfig';
-  examObj, 
+import { getMajorStationList } from '/@/api/professional/rsbase/professionalmajorstation';
-  delObj, 
+import { makeExportTeacherInfoByTypeTask } from '/@/api/professional/professionalfile';
-  exportRelation
+import { defineAsyncComponent } from 'vue';
-} from '/@/api/professional/professionaluser/professionaltitlerelation'
-import { getProfessionalTitleList } from '/@/api/professional/rsbase/professionaltitlelevelconfig'
-import { getMajorStationList } from '/@/api/professional/rsbase/professionalmajorstation'
-import { defineAsyncComponent } from 'vue'
 // 子组件
-const TeacherNameNo = defineAsyncComponent(() => import('/@/components/TeacherNameNo/index.vue'))
+const TeacherNameNo = defineAsyncComponent(() => import('/@/components/TeacherNameNo/index.vue'));
-const AuditState = defineAsyncComponent(() => import('/@/components/AuditState/index.vue'))
+const AuditState = defineAsyncComponent(() => import('/@/components/AuditState/index.vue'));
-const MultiDialog = defineAsyncComponent(() => import('/@/views/professional/teacherbase/multiDialog.vue'))
+const MultiDialog = defineAsyncComponent(() => import('/@/views/professional/teacherbase/multiDialog.vue'));
-const DataForm = defineAsyncComponent(() => import('./form.vue'))
+const DataForm = defineAsyncComponent(() => import('./form.vue'));
-const ProfessionalBackResaon = defineAsyncComponent(() => import('/@/views/professional/common/professional-back-resaon.vue'))
+const ProfessionalBackResaon = defineAsyncComponent(() => import('/@/views/professional/common/professional-back-resaon.vue'));
-const previewFile = defineAsyncComponent(() => import('/@/components/tools/preview-file.vue'))
+const previewFile = defineAsyncComponent(() => import('/@/components/tools/preview-file.vue'));
-const ImportTeacherOtherInfo = defineAsyncComponent(() => import('/@/views/professional/common/import-teacher-other-info.vue'))
+const ImportTeacherOtherInfo = defineAsyncComponent(() => import('/@/views/professional/common/import-teacher-other-info.vue'));
 
 // 无权限即无节点：使用 useAuth + v-if
-const { hasAuth } = useAuth()
+const { hasAuth } = useAuth();
 
 // 消息提示 hooks
-const message = useMessage()
+const message = useMessage();
-const messageBox = useMessageBox()
+const messageBox = useMessageBox();
 
 // 字典数据
-const { professional_state: professionalState } = useDict('professional_state')
+const { professional_state: professionalState } = useDict('professional_state');
 
 // 表格引用
-const tableRef = ref()
+const tableRef = ref();
-const searchFormRef = ref()
+const searchFormRef = ref();
-const multiDialogRef = ref()
+const multiDialogRef = ref();
-const dataFormRef = ref()
+const dataFormRef = ref();
-const backReasonRef = ref()
+const backReasonRef = ref();
-const showSearch = ref(true) // 方案 F：默认收起筛选，首屏仅一张大卡片
+const showSearch = ref(true); // 方案 F：默认收起筛选，首屏仅一张大卡片
 
 // 搜索表单数据
 const search = reactive({
@@ -301,82 +240,85 @@ const search = reactive({
 	teacherNo: '',
 	realName: '',
 	professionalTitleConfigId: '',
-  majorStation: ''
+	majorStation: '',
-})
+});
 
 // 材料预览
-const imgUrl = ref<Array<{ title: string; url: string }>>([])
+const imgUrl = ref<Array<{ title: string; url: string }>>([]);
 
 // 导出加载状态
-const exportLoading = ref(false)
+const exportLoading = ref(false);
 
 // 职称和专业技术职务列表
-const professionalTitleList = ref<any[]>([])
+const professionalTitleList = ref<any[]>([]);
-const majorStationList = ref<any[]>([])
+const majorStationList = ref<any[]>([]);
 
 // 配置 useTable
 const state: BasicTableProps = reactive<BasicTableProps>({
 	pageList: async (params: any) => {
-    const response = await fetchList(params)
+		const response = await fetchList(params);
-    const records = response.data.records || []
+		const records = response.data.records || [];
 		// 处理证明材料列表
 		records.forEach((v: any) => {
 			if (v.evidence != null) {
-        v.srcList = [v.evidence]
+				v.srcList = [v.evidence];
 			} else {
-        v.srcList = []
+				v.srcList = [];
 			}
-    })
+		});
 		return {
 			data: {
 				records,
-        total: response.data.total || 0
+				total: response.data.total || 0,
-      }
-    }
 			},
-  queryForm: search
+		};
-})
+	},
+	queryForm: search,
+});
 
-const { getDataList, currentChangeHandle, sizeChangeHandle, tableStyle } = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, tableStyle } = useTable(state);
 
 // 预览材料
 const handlePreview = (list: string[]) => {
-  imgUrl.value = []
+	imgUrl.value = [];
 	nextTick(() => {
-    list.forEach(v => {
+		list.forEach((v) => {
 			imgUrl.value.push({
 				title: '',
-        url: v
+				url: v,
-      })
+			});
-    })
+		});
-  })
+	});
-}
+};
 
 // 审核状态变更
 const changeState = (row: any, val: number) => {
 	if (val === 1) {
-    const str = '通过'
+		const str = '通过';
-    messageBox.confirm(`是否确认${str}${row.realName}的申请`).then(async () => {
+		messageBox
+			.confirm(`是否确认${str}${row.realName}的申请`)
+			.then(async () => {
 				try {
 					await examObj({
 						id: row.id,
-          state: val
+						state: val,
-        })
+					});
-        message.success('操作成功')
+					message.success('操作成功');
-        getDataList()
+					getDataList();
 				} catch (error: any) {
 					// 处理业务错误
 				}
-    }).catch(() => {})
+			})
+			.catch(() => {});
 	} else if (val === -2) {
-    backReasonRef.value?.init(row, 'title')
+		backReasonRef.value?.init(row, 'title');
 	}
-}
+};
 
 // 查询
 const handleFilter = () => {
-  getDataList()
+	getDataList();
-}
+};
 
 // 重置查询
 const resetQuery = () => {
@@ -385,103 +327,94 @@ const resetQuery = () => {
 		teacherNo: '',
 		realName: '',
 		professionalTitleConfigId: '',
-    majorStation: ''
+		majorStation: '',
-  })
+	});
-  getDataList()
+	getDataList();
-}
+};
 
 // 打开新增窗口
 const handleAdd = () => {
-  dataFormRef.value?.openDialog()
+	dataFormRef.value?.openDialog();
-}
+};
 
 // 打开编辑窗口
 const handleEdit = (row: any) => {
-  dataFormRef.value?.openDialog(row)
+	dataFormRef.value?.openDialog(row);
-}
+};
 
 // 删除
 const handleDel = (row: any) => {
-  messageBox.confirm('是否确认删除该条记录').then(async () => {
+	messageBox
+		.confirm('是否确认删除该条记录')
+		.then(async () => {
 			try {
-      await delObj(row.id)
+				await delObj(row.id);
-      message.success('删除成功')
+				message.success('删除成功');
 				// 如果当前页只剩一条数据，且不是第一页，则跳转到上一页
 				if (state.pagination && state.dataList && state.dataList.length === 1 && state.pagination.current && state.pagination.current > 1) {
-        state.pagination.current = state.pagination.current - 1
+					state.pagination.current = state.pagination.current - 1;
 				}
-      getDataList()
+				getDataList();
 			} catch (error: any) {
 				// 处理业务错误
-      message.error(error.msg)
+				message.error(error.msg);
 			}
-  }).catch(() => {})
+		})
-}
+		.catch(() => {});
+};
 
 // 导出
 const handleDownLoadWord = async () => {
-  exportLoading.value = true
+	exportLoading.value = true;
-  try {
+	let params = Object.assign(search, { type: 'P20002' });
-    const response: any = await exportRelation(search)
+	makeExportTeacherInfoByTypeTask(params).then((res: any) => {
-    
+		message.success('后台下载进行中,请稍后查看任务列表');
-    const blob = new Blob([response as BlobPart])
+	});
-    const fileName = '职称信息.xls'
+	setTimeout(() => {
-    const elink = document.createElement('a')
+		exportLoading.value = false;
-    elink.download = fileName
+	}, 3000); // 5分钟后自动关闭
-    elink.style.display = 'none'
+};
-    elink.href = URL.createObjectURL(blob)
-    document.body.appendChild(elink)
-    elink.click()
-    URL.revokeObjectURL(elink.href)
-    document.body.removeChild(elink)
-    message.success('导出成功')
-  } catch (error) {
-    message.error('导出失败')
-  } finally {
-    exportLoading.value = false
-  }
-}
 
 // 获取职称名称
 const getProfessionalTitleName = (id: string | number) => {
-  const item = professionalTitleList.value.find((item: any) => item.id === id)
+	const item = professionalTitleList.value.find((item: any) => item.id === id);
-  return item ? item.professionalTitle : '-'
+	return item ? item.professionalTitle : '-';
-}
+};
 
 // 获取专业技术职务名称
 const getMajorStationName = (id: string | number) => {
-  const item = majorStationList.value.find((item: any) => item.id === id)
+	const item = majorStationList.value.find((item: any) => item.id === id);
-  return item ? item.majorStationName : '-'
+	return item ? item.majorStationName : '-';
-}
+};
 
 // 加载字典数据
 const loadDictData = async () => {
 	try {
 		// 加载职称列表
-    const titleRes = await getProfessionalTitleList()
+		const titleRes = await getProfessionalTitleList();
 		if (titleRes && titleRes.data) {
-      professionalTitleList.value = titleRes.data
+			professionalTitleList.value = titleRes.data;
 		}
 
 		// 加载专业技术职务列表
-    const majorRes = await getMajorStationList()
+		const majorRes = await getMajorStationList();
 		if (majorRes && majorRes.data) {
-      majorStationList.value = majorRes.data
+			majorStationList.value = majorRes.data;
 		}
 	} catch (error) {
 		// Failed to load dict data
 	}
-}
+};
 
-const importTeacherOtherInfoRef=ref()
+const importTeacherOtherInfoRef = ref();
 const handleImportDialog = () => {
-  importTeacherOtherInfoRef.value?.init('titleRelation')
+	importTeacherOtherInfoRef.value?.init('titleRelation');
-}
+};
 
 // 初始化：仅加载下拉字典，表格数据由 useTable 在 createdIsNeed: true 时自动请求
 onMounted(async () => {
-  await loadDictData()
+	await loadDictData();
-})
+});
 </script>
 
 <style lang="scss" scoped>

src/views/professional/teacherbase/import-teacherInfo.vue

@@ -6,15 +6,15 @@
         show-icon
         style="margin-bottom: 20px;">
         <template #title>
-          <span>导入前请先下载字典文件，部分字段需严格按照字典值填写</span>
+          <span> 可先导出教职工信息,按照导出信息的模板填入职工数据,再执行导入</span>
         </template>
       </el-alert>
 
-      <div style="text-align: center; margin-bottom: 20px;">
+<!--      <div style="text-align: center; margin-bottom: 20px;">-->
-        <a href="excel/dictlist.xlsx" rel="external nofollow" download="职工信息字典下载" style="text-decoration: none;">
+<!--        <a href="excel/dictlist.xlsx" rel="external nofollow" download="职工信息字典下载" style="text-decoration: none;">-->
-          <el-button type="success" :icon="Download">下载字典文件</el-button>
+<!--          <el-button type="success" :icon="Download">下载字典文件</el-button>-->
-        </a>
+<!--        </a>-->
-      </div>
+<!--      </div>-->
 
       <el-upload
         class="upload-demo"

src/views/professional/teacherbase/index.vue

@@ -1024,7 +1024,7 @@
               </el-table-column>
               <el-table-column prop="graduateSchool" label="毕业学校" min-width="180" align="center" show-overflow-tooltip />
               <el-table-column prop="major" label="所学专业" min-width="150" align="center" show-overflow-tooltip />
-              <el-table-column prop="certificateNumber" label="证书编码" min-width="120" align="center" />
+              <el-table-column prop="certificateNumber" label="证书编号" min-width="120" align="center" />
               <el-table-column label="学历证书" min-width="150" align="center">
                 <template #default="scope">
                   <el-button 

src/views/recruit/common/import-recruit-info.vue

@@ -0,0 +1,101 @@
+<template>
+	<el-dialog v-model="visible" :title="title" width="600" append-to-body>
+		<div style="text-align: center; margin-bottom: 20px">
+			<el-button type="success" :icon="Download" @click="handleDownloadTemplate">下载模板</el-button>
+		</div>
+
+		<el-upload
+			class="upload-demo"
+			:action="uploadUrl"
+			:headers="headers"
+			:accept="'.xls,.xlsx'"
+			:on-success="handleUploadSuccess"
+			:on-error="handleAvatarError"
+			:limit="1"
+			drag
+		>
+			<el-icon class="el-icon--upload"><upload-filled /></el-icon>
+			<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+			<template #tip>
+				<div class="el-upload__tip">只能上传 .xls 或 .xlsx 格式的 Excel 文件</div>
+			</template>
+		</el-upload>
+	</el-dialog>
+</template>
+
+<script setup lang="ts">
+import { ref, computed } from 'vue';
+import { ElNotification } from 'element-plus';
+import { Download, UploadFilled } from '@element-plus/icons-vue';
+import { Session } from '/@/utils/storage';
+import { downBlobFile } from '/@/utils/other';
+
+const title = ref('');
+// 响应式数据
+const visible = ref(false);
+
+// 计算属性
+const headers = computed(() => {
+	return {
+		Authorization: 'Bearer ' + Session.getToken(),
+    TENANT_ID: Session.getTenant()
+	};
+});
+
+const uploadUrl = ref('')
+const currentType = ref('')
+const titleMap: Record<string, string> = {
+	planMajor: '计划专业导入'
+}
+// 方法
+const init = (type: any) => {
+	currentType.value = type
+	uploadUrl.value = '/professional/file/importTeacherOtherInfo?type=' + type
+	title.value = titleMap[type] || '信息导入'
+	visible.value = true
+}
+
+// Emits
+const emit = defineEmits<{
+  (e: 'refreshData'): void
+}>()
+
+const handleUploadSuccess = () => {
+	visible.value = false;
+	ElNotification({
+		title: '成功',
+		message: '导入成功',
+		type: 'success',
+	});
+
+  emit('refreshData')
+};
+
+const handleAvatarError = (err: any) => {
+	const result = JSON.parse(err.message);
+	if (result.code == '1') {
+		ElNotification.error({
+			title: '错误',
+			message: result.msg,
+			duration: 30000,
+		});
+	}
+};
+
+const handleDownloadTemplate = () => {
+	downBlobFile('/recruit/file/exportRecruitTemplate', { type: currentType.value || 'planMajor' }, title.value+'模板.xlsx')
+}
+
+// 暴露方法给父组件
+defineExpose({
+	init
+});
+</script>
+
+<style scoped lang="scss">
+.upload-demo {
+	:deep(.el-upload-dragger) {
+		width: 100%;
+	}
+}
+</style>

src/views/recruit/recruitplanmajor/index.vue

@@ -22,22 +22,12 @@
 			<el-form :model="queryForm" inline ref="searchFormRef">
 				<el-form-item label="招生计划" prop="groupId">
 					<el-select v-model="queryForm.groupId" filterable clearable placeholder="请选择招生计划">
-            <el-option
+						<el-option v-for="item in planList" :key="item.id" :label="item.groupName" :value="item.id" />
-              v-for="item in planList"
-              :key="item.id"
-              :label="item.groupName"
-              :value="item.id"
-            />
 					</el-select>
 				</el-form-item>
 				<el-form-item label="学院" prop="deptCode">
 					<el-select v-model="queryForm.deptCode" filterable clearable placeholder="请选择">
-            <el-option
+						<el-option v-for="item in deptList" :key="item.deptCode" :label="item.deptName" :value="item.deptCode" />
-              v-for="item in deptList"
-              :key="item.deptCode"
-              :label="item.deptName"
-              :value="item.deptCode"
-            />
 					</el-select>
 				</el-form-item>
 				<el-form-item label="专业序号" prop="majorCode">
@@ -57,13 +47,16 @@
 
 			<!-- 操作按钮 -->
 			<div class="mb15">
+				<el-button v-if="hasAuth('recruit_recruitplanmajor_add')" type="primary" icon="FolderAdd" @click="addOrUpdateHandle"> 新 增 </el-button>
+
 				<el-button
-          v-if="hasAuth('recruit_recruitplanmajor_add')"
+					v-auth="'professional_teacherinfo_import'"
 					type="primary"
-          icon="FolderAdd"
+					plain
-          @click="addOrUpdateHandle"
+					icon="UploadFilled"
-        >
+					:loading="exportLoading"
-          新 增
+					@click="handleImportDialog"
+					>导入信息
 				</el-button>
 			</div>
 
@@ -101,14 +94,7 @@
 
 				<el-table-column prop="sm" label="色盲不可录" align="center" width="120">
 					<template #default="scope">
-            <el-switch 
+						<el-switch v-model="scope.row.sm" active-text="是" inactive-text="否" active-value="1" inactive-value="0" @change="changeSm(scope.row)" />
-              v-model="scope.row.sm" 
-              active-text="是" 
-              inactive-text="否" 
-              active-value="1" 
-              inactive-value="0" 
-              @change="changeSm(scope.row)"
-            />
 					</template>
 				</el-table-column>
 				<el-table-column prop="stuworkMajorCode" label="正式专业代码" align="center" show-overflow-tooltip>
@@ -124,21 +110,8 @@
 				<!-- <el-table-column prop="sort" label="排序" align="center" show-overflow-tooltip /> -->
 				<el-table-column label="操作" width="150" align="center" fixed="right">
 					<template #default="scope">
-            <el-button
+						<el-button type="primary" link icon="EditPen" @click="addOrUpdateHandle(scope.row)"> 修改 </el-button>
-              type="primary"
+						<el-button v-if="hasAuth('recruit_recruitplanmajor_del')" type="danger" link icon="Delete" @click="deleteHandle(scope.row.id)">
-              link
-              icon="EditPen"
-              @click="addOrUpdateHandle(scope.row)"
-            >
-              修改
-            </el-button>
-            <el-button
-              v-if="hasAuth('recruit_recruitplanmajor_del')"
-              type="danger"
-              link
-              icon="Delete"
-              @click="deleteHandle(scope.row.id)"
-            >
 							删除
 						</el-button>
 					</template>
@@ -146,47 +119,47 @@
 			</el-table>
 
 			<!-- 分页 -->
-      <pagination
+			<pagination v-bind="state.pagination" @current-change="currentChangeHandle" @size-change="sizeChangeHandle" />
-        v-bind="state.pagination"
-        @current-change="currentChangeHandle"
-        @size-change="sizeChangeHandle"
-      />
 
 			<!-- 弹窗, 新增 / 修改 -->
 			<table-form ref="addOrUpdateRef" @refreshDataList="getDataList" />
+
+      <import-recruit-info ref="ImportRecruitInfoRef"></import-recruit-info>
 		</div>
 	</div>
 </template>
 
 <script setup lang="ts" name="recruitplanmajor">
-import { ref, reactive, onMounted, nextTick, defineAsyncComponent } from 'vue'
+import { ref, reactive, onMounted, nextTick, defineAsyncComponent } from 'vue';
-import { useAuth } from '/@/hooks/auth'
+import { useAuth } from '/@/hooks/auth';
-import { BasicTableProps, useTable } from '/@/hooks/table'
+import { BasicTableProps, useTable } from '/@/hooks/table';
-import { useMessage, useMessageBox } from '/@/hooks/message'
+import { useMessage, useMessageBox } from '/@/hooks/message';
-import { useDict } from '/@/hooks/dict'
+import { useDict } from '/@/hooks/dict';
-import { getList } from '/@/api/recruit/recruitstudentplangroup'
+import { getList } from '/@/api/recruit/recruitstudentplangroup';
-import { fetchList, delObj, editQuickField } from '/@/api/recruit/recruitstudentplan'
+import { fetchList, delObj, editQuickField } from '/@/api/recruit/recruitstudentplan';
-import { getDeptList } from '/@/api/basic/basicclass'
+import { getDeptList } from '/@/api/basic/basicclass';
-import { getMajorNameList } from '/@/api/basic/major'
+import { getMajorNameList } from '/@/api/basic/major';
 
-const TableForm = defineAsyncComponent(() => import('./detaiform.vue'))
+const TableForm = defineAsyncComponent(() => import('./detaiform.vue'));
-const { hasAuth } = useAuth()
+const ImportRecruitInfo = defineAsyncComponent(() => import('/@/views/recruit/common/import-recruit-info.vue'));
+const ImportRecruitInfoRef=ref<any>();
+const { hasAuth } = useAuth();
 // 消息提示 hooks
-const message = useMessage()
+const message = useMessage();
-const messageBox = useMessageBox()
+const messageBox = useMessageBox();
 
 // 表格引用
-const tableRef = ref()
+const tableRef = ref();
-const searchFormRef = ref()
+const searchFormRef = ref();
-const addOrUpdateRef = ref()
+const addOrUpdateRef = ref();
 
 // 字典数据
-const { yes_no_type } = useDict('yes_no_type')
+const { yes_no_type } = useDict('yes_no_type');
 
 // 数据
-const planList = ref<any[]>([])
+const planList = ref<any[]>([]);
-const deptList = ref<any[]>([])
+const deptList = ref<any[]>([]);
-const offcialZydmList = ref<any[]>([])
+const offcialZydmList = ref<any[]>([]);
 
 // 查询表单
 const queryForm = reactive({
@@ -194,125 +167,128 @@ const queryForm = reactive({
 	deptCode: '',
 	majorCode: '',
 	majorName: '',
-  learnYear: ''
+	learnYear: '',
-})
+});
 
 // 获取计划名称
 const getPlanName = (groupId: string) => {
-  const item = planList.value.find(item => item.id === groupId)
+	const item = planList.value.find((item) => item.id === groupId);
-  return item ? item.groupName : ''
+	return item ? item.groupName : '';
-}
+};
 
 // 获取学院名称
 const getDeptName = (deptCode: string) => {
-  const item = deptList.value.find(item => item.deptCode === deptCode)
+	const item = deptList.value.find((item) => item.deptCode === deptCode);
-  return item ? item.deptName : ''
+	return item ? item.deptName : '';
-}
+};
 
 // 获取是/否标签
 const getYesNoLabel = (value: string) => {
-  const item = yes_no_type.value.find((item: any) => item.value === value)
+	const item = yes_no_type.value.find((item: any) => item.value === value);
-  return item ? item.label : ''
+	return item ? item.label : '';
-}
+};
 
 // 获取专业代码名称
 const getMajorCodeName = (majorCode: string) => {
-  const item = offcialZydmList.value.find(item => item.majorCode === majorCode)
+	const item = offcialZydmList.value.find((item) => item.majorCode === majorCode);
-  return item ? item.majorCodeAndName : ''
+	return item ? item.majorCodeAndName : '';
-}
+};
 
 // 表格状态
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: queryForm,
 	pageList: async (params: any) => {
-    const response = await fetchList(params)
+		const response = await fetchList(params);
 		return {
 			data: {
 				records: response.data.records,
-        total: response.data.total
+				total: response.data.total,
-      }
-    }
 			},
-  createdIsNeed: false
+		};
-})
+	},
+	createdIsNeed: false,
+});
 
 // 使用 table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, tableStyle } = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, tableStyle } = useTable(state);
 
 // 初始化
 const init = async () => {
 	try {
 		// 查询二级学院信息
-    const deptData = await getDeptList()
+		const deptData = await getDeptList();
-    deptList.value = deptData.data || []
+		deptList.value = deptData.data || [];
 
 		// 获取招生计划列表
-    const planData = await getList()
+		const planData = await getList();
-    planList.value = planData.data || []
+		planList.value = planData.data || [];
 		if (planList.value.length > 0) {
-      queryForm.groupId = planList.value[0].id
+			queryForm.groupId = planList.value[0].id;
 		}
 
 		// 获取专业名称列表
-    const majorData = await getMajorNameList()
+		const majorData = await getMajorNameList();
-    offcialZydmList.value = majorData.data || []
+		offcialZydmList.value = majorData.data || [];
 
-    getDataList()
+		getDataList();
 	} catch (error) {
-    console.log(error)
+		console.log(error);
-    
 	}
-}
+};
 
 // 修改开关
 const changeSm = async (row: any) => {
 	try {
-    let parmas={id:row.id,sm:row.sm}
+		let parmas = { id: row.id, sm: row.sm };
-    await editQuickField(parmas)
+		await editQuickField(parmas);
-    message.success('修改成功')
+		message.success('修改成功');
 	} catch (error: any) {
-    console.log(error)
+		console.log(error);
-    
 	}
-}
+};
 
 // 新增 / 修改
 const addOrUpdateHandle = (row?: any) => {
 	nextTick(() => {
-    addOrUpdateRef.value?.init(row.id || null)
+		addOrUpdateRef.value?.init(row.id || null);
-  })
+	});
-}
+};
 
 // 删除
 const deleteHandle = async (id: string) => {
 	try {
-    await messageBox.confirm('是否确认删除本条数据？请谨慎操作')
+		await messageBox.confirm('是否确认删除本条数据？请谨慎操作');
-    await delObj(id)
+		await delObj(id);
-    message.success('删除成功')
+		message.success('删除成功');
-    getDataList()
+		getDataList();
 	} catch {
 		// 用户取消
 	}
-}
+};
 
 // 重置查询
 const resetQuery = () => {
-  searchFormRef.value?.resetFields()
+	searchFormRef.value?.resetFields();
-  queryForm.groupId = ''
+	queryForm.groupId = '';
-  queryForm.deptCode = ''
+	queryForm.deptCode = '';
-  queryForm.majorCode = ''
+	queryForm.majorCode = '';
-  queryForm.majorName = ''
+	queryForm.majorName = '';
-  queryForm.learnYear = ''
+	queryForm.learnYear = '';
 	if (planList.value.length > 0) {
-    queryForm.groupId = planList.value[0].id
+		queryForm.groupId = planList.value[0].id;
 	}
-  getDataList()
+	getDataList();
-}
+};
+
+const exportLoading = ref(false);
+
+const handleImportDialog = () => {
+  ImportRecruitInfoRef.value?.init("planMajor");
+};
 
 onMounted(() => {
-  init()
+	init();
-})
+});
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" scoped></style>
-</style>