From 9490c6670cebc4ff71916d2e0ccb1f3c64abcefd Mon Sep 17 00:00:00 2001
From: guochunsi <1595020186@qq.com>
Date: Wed, 7 Jan 2026 16:17:49 +0800
Subject: [PATCH] ren

---
 .../professional/professionalteacherpaper.ts  |  12 +
 .../professionalteachingmaterial.ts           |  12 +
 src/api/professional/professionaltopiclist.ts |  12 +
 .../professionalqualificationrelation.ts      |  12 +
 .../professionalteacheracademicrelation.ts    |  12 +
 .../professionalteachercertificaterelation.ts |  12 +
 .../professionalteacherhonor.ts               |  12 +
 src/components/tools/auth-img.vue             |  95 ++++--
 .../common/professional-back-resaon.vue       |  16 +-
 .../form.vue                                  | 102 +++---
 .../index.vue                                 |  21 +-
 .../form.vue                                  | 316 ++++++++++--------
 .../index.vue                                 |  69 ++--
 .../form.vue                                  | 188 +++--------
 .../index.vue                                 |  20 +-
 .../professionalteacherhonor/form.vue         | 223 ++++++------
 .../professionalteacherhonor/index.vue        |  32 +-
 .../showHonorEdvince.vue                      |  44 ---
 .../professionaltitlerelation/form.vue        |  13 +-
 .../professionaltitlerelation/index.vue       |  20 +-
 .../professional/teacherbase/multiDialog.vue  |   2 +-
 21 files changed, 642 insertions(+), 603 deletions(-)
 delete mode 100644 src/views/professional/professionalteacherhonor/showHonorEdvince.vue

diff --git a/src/api/professional/professionalteacherpaper.ts b/src/api/professional/professionalteacherpaper.ts
index 6aabb27..754e4eb 100644
--- a/src/api/professional/professionalteacherpaper.ts
+++ b/src/api/professional/professionalteacherpaper.ts
@@ -87,6 +87,18 @@ export const putObj = (obj: any) => {
 	});
 };
 
+/**
+ * 审核
+ * @param obj
+ */
+export const examObj = (obj: any) => {
+	return request({
+		url: '/professional/professionalteacherpaper/exam',
+		method: 'post',
+		data: obj,
+	});
+};
+
 /**
  * 更新状态
  * @param obj
diff --git a/src/api/professional/professionalteachingmaterial.ts b/src/api/professional/professionalteachingmaterial.ts
index c6e0912..472dd58 100644
--- a/src/api/professional/professionalteachingmaterial.ts
+++ b/src/api/professional/professionalteachingmaterial.ts
@@ -87,6 +87,18 @@ export const putObj = (obj: any) => {
 	});
 };
 
+/**
+ * 审核
+ * @param obj
+ */
+export const examObj = (obj: any) => {
+	return request({
+		url: '/professional/professionalteachingmaterial/exam',
+		method: 'post',
+		data: obj,
+	});
+};
+
 /**
  * 更新状态
  * @param obj
diff --git a/src/api/professional/professionaltopiclist.ts b/src/api/professional/professionaltopiclist.ts
index 6071eb1..8f8d405 100644
--- a/src/api/professional/professionaltopiclist.ts
+++ b/src/api/professional/professionaltopiclist.ts
@@ -75,6 +75,18 @@ export const putObj = (obj: any) => {
 	});
 };
 
+/**
+ * 审核
+ * @param obj
+ */
+export const examObj = (obj: any) => {
+	return request({
+		url: '/professional/professionaltopiclist/exam',
+		method: 'post',
+		data: obj,
+	});
+};
+
 /**
  * 更新状态
  * @param obj
diff --git a/src/api/professional/professionaluser/professionalqualificationrelation.ts b/src/api/professional/professionaluser/professionalqualificationrelation.ts
index de35f04..f1f7672 100644
--- a/src/api/professional/professionaluser/professionalqualificationrelation.ts
+++ b/src/api/professional/professionaluser/professionalqualificationrelation.ts
@@ -107,6 +107,18 @@ export function putObj(obj?: any) {
 	});
 }
 
+/**
+ * 审核对象
+ * @param obj 对象数据
+ */
+export function examObj(obj?: any) {
+	return request({
+		url: '/professional/professionalqualificationrelation/exam',
+		method: 'post',
+		data: obj,
+	});
+}
+
 /**
  * 获取图表选项
  */
diff --git a/src/api/professional/professionaluser/professionalteacheracademicrelation.ts b/src/api/professional/professionaluser/professionalteacheracademicrelation.ts
index 0a8f755..2b7060e 100644
--- a/src/api/professional/professionaluser/professionalteacheracademicrelation.ts
+++ b/src/api/professional/professionaluser/professionalteacheracademicrelation.ts
@@ -107,6 +107,18 @@ export const putObj = (obj: any) => {
 	});
 };
 
+/**
+ * 审核
+ * @param obj
+ */
+export const examObj = (obj: any) => {
+	return request({
+		url: '/professional/professionalteacheracademicrelation/exam',
+		method: 'post',
+		data: obj,
+	});
+};
+
 /**
  * 获取图表配置
  */
diff --git a/src/api/professional/professionaluser/professionalteachercertificaterelation.ts b/src/api/professional/professionaluser/professionalteachercertificaterelation.ts
index 111b590..8bab2f5 100644
--- a/src/api/professional/professionaluser/professionalteachercertificaterelation.ts
+++ b/src/api/professional/professionaluser/professionalteachercertificaterelation.ts
@@ -81,6 +81,18 @@ export const putObj = (obj: any) => {
 	});
 };
 
+/**
+ * 审核
+ * @param obj
+ */
+export const examObj = (obj: any) => {
+	return request({
+		url: '/professional/professionalteachercertificaterelation/exam',
+		method: 'post',
+		data: obj,
+	});
+};
+
 /**
  * 获取证书统计信息
  */
diff --git a/src/api/professional/professionaluser/professionalteacherhonor.ts b/src/api/professional/professionaluser/professionalteacherhonor.ts
index a4c7fd9..715b067 100644
--- a/src/api/professional/professionaluser/professionalteacherhonor.ts
+++ b/src/api/professional/professionaluser/professionalteacherhonor.ts
@@ -81,3 +81,15 @@ export const putObj = (obj: any) => {
 	});
 };
 
+/**
+ * 审核
+ * @param obj
+ */
+export const examObj = (obj: any) => {
+	return request({
+		url: '/professional/professionalteacherhonor/exam',
+		method: 'post',
+		data: obj,
+	});
+};
+
diff --git a/src/components/tools/auth-img.vue b/src/components/tools/auth-img.vue
index 6ed74d5..9884797 100644
--- a/src/components/tools/auth-img.vue
+++ b/src/components/tools/auth-img.vue
@@ -1,15 +1,43 @@
 <template>
-  <div style="width: 100%;height: 100%;">
-    <viewer :images="[authSrc]" v-if="!showIframe">
-      <img v-if="!showIframe" ref="imgRef" :width="imgWidth || '100%'" :height="imgHeight || '100%'" :src="authSrc" />
-    </viewer>
-    <iframe v-if="showIframe" ref="authIframeRef" style="width: 100%;height: 100%;" >
-    </iframe>
+  <!-- 组件不占据任何布局空间，所有预览组件都是 teleported 的 -->
+  <div style="display: none;">
+    <!-- 图片：直接使用 el-image-viewer 全屏预览 -->
+    <el-image-viewer
+      v-if="!showIframe && imageSrc && imagePreviewVisible"
+      :url-list="[imageSrc]"
+      :teleported="true"
+      hide-on-click-modal
+      @close="imagePreviewVisible = false"
+    />
+    
+    <!-- PDF：在 dialog 中显示 -->
+    <el-dialog
+      v-if="showIframe"
+      v-model="pdfDialogVisible"
+      :title="dialogTitle || '文件预览'"
+      append-to-body
+      width="90%"
+      class="pdf-preview-dialog"
+    >
+      <iframe ref="authIframeRef" :style="{ width: '100%', height: pdfIframeHeight }" />
+      <!-- <div class="pdf-iframe-wrapper">
+        <iframe 
+          ref="authIframeRef" 
+          :style="{ 
+            width: '100%', 
+            height: pdfIframeHeight, 
+            border: 'none',
+            display: 'block'
+          }"
+        />
+      </div> -->
+    </el-dialog>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, nextTick } from 'vue';
+import { ref, onMounted, nextTick, computed, onUnmounted } from 'vue';
+import { ElImageViewer } from 'element-plus';
 import { Session } from "/@/utils/storage";
 
 // 定义 props
@@ -17,17 +45,47 @@ const props = defineProps<{
   authSrc: string;
   imgWidth?: string;
   imgHeight?: string;
+  dialogTitle?: string;
 }>();
 
 // 定义响应式数据
 const showIframe = ref(false);
-const imgRef = ref<HTMLImageElement | null>(null);
+const imageSrc = ref<string>('');
+const imagePreviewVisible = ref(false);
+const pdfDialogVisible = ref(false);
 const authIframeRef = ref<HTMLIFrameElement | null>(null);
+const windowHeight = ref(window.innerHeight);
+
+// 计算 PDF iframe 的合适高度（优先使用外部传入的 imgHeight，否则根据窗口高度动态计算）
+const pdfIframeHeight = computed(() => {
+  // 如果外部传入了 imgHeight，优先使用
+  if (props.imgHeight) {
+    return props.imgHeight;
+  }
+  // 否则根据窗口高度动态计算：dialog header 约 50px，padding 约 40px，留一些余量
+  return `${windowHeight.value - 120}px`;
+});
+
+// 监听窗口大小变化
+const handleResize = () => {
+  windowHeight.value = window.innerHeight;
+};
+
+onMounted(() => {
+  window.addEventListener('resize', handleResize);
+  getImgSrcByToken();
+});
+
+onUnmounted(() => {
+  window.removeEventListener('resize', handleResize);
+});
+
 
 // 携带token请求img的src
 const getImgSrcByToken = (src?: string) => {
   if (props.authSrc.indexOf(".pdf") >= 0) {
     showIframe.value = true;
+    pdfDialogVisible.value = true;
     nextTick(() => {
       const imgSrc = src || props.authSrc;
       const tenantId = Session.getTenant();
@@ -52,12 +110,11 @@ const getImgSrcByToken = (src?: string) => {
       request.send(null);
     });
   } else {
-    // 图片处理逻辑（已注释，如需要可取消注释并更新）
+    // 图片处理逻辑：加载后直接打开预览
     showIframe.value = false;
+    pdfDialogVisible.value = false;
     const imgSrc = src || props.authSrc;
     const tenantId = Session.getTenant();
-    const img = imgRef.value;
-    if (!img) return;
     
     const request = new XMLHttpRequest();
     request.responseType = 'blob';
@@ -66,10 +123,8 @@ const getImgSrcByToken = (src?: string) => {
     request.setRequestHeader('TENANT-ID', tenantId);
     request.onreadystatechange = () => {
       if (request.readyState == XMLHttpRequest.DONE && request.status == 200) {
-        img.src = URL.createObjectURL(request.response);
-        img.onload = () => {
-          URL.revokeObjectURL(img.src);
-        }
+        imageSrc.value = URL.createObjectURL(request.response);
+        imagePreviewVisible.value = true;
       }
     };
     request.send(null);
@@ -86,8 +141,10 @@ defineExpose({
   refreshImg
 });
 
-// 组件挂载时执行
-onMounted(() => {
-  getImgSrcByToken();
-});
 </script>
+<style scoped>
+.pdf-preview-dialog :deep(.el-dialog__body) {
+  padding: 20px !important;
+  overflow-y: hidden !important;
+}
+</style>  
diff --git a/src/views/professional/common/professional-back-resaon.vue b/src/views/professional/common/professional-back-resaon.vue
index a01853c..a93f987 100644
--- a/src/views/professional/common/professional-back-resaon.vue
+++ b/src/views/professional/common/professional-back-resaon.vue
@@ -34,14 +34,14 @@
 <script setup lang="ts">
 import { ref, reactive } from 'vue'
 import { useMessage, useMessageBox } from '/@/hooks/message'
-import { putObj as editTitle } from '/@/api/professional/professionaluser/professionaltitlerelation'
-import { putObj as editQua } from '/@/api/professional/professionaluser/professionalqualificationrelation'
-import { putObj as editCer } from '/@/api/professional/professionaluser/professionalteachercertificaterelation'
-import { putObj as editEducation } from '/@/api/professional/professionaluser/professionalteacheracademicrelation'
-import { putObj as editHonor } from '/@/api/professional/professionaluser/professionalteacherhonor'
-import { putObj as editPaper } from '/@/api/professional/professionalteacherpaper'
-import { putObj as editMaterial } from '/@/api/professional/professionalteachingmaterial'
-import { putObj as editTopic } from '/@/api/professional/professionaltopiclist'
+import { examObj as editTitle } from '/@/api/professional/professionaluser/professionaltitlerelation'
+import { examObj as editQua } from '/@/api/professional/professionaluser/professionalqualificationrelation'
+import { examObj as editCer } from '/@/api/professional/professionaluser/professionalteachercertificaterelation'
+import { examObj as editEducation } from '/@/api/professional/professionaluser/professionalteacheracademicrelation'
+import { examObj as editHonor } from '/@/api/professional/professionaluser/professionalteacherhonor'
+import { examObj as editPaper } from '/@/api/professional/professionalteacherpaper'
+import { examObj as editMaterial } from '/@/api/professional/professionalteachingmaterial'
+import { examObj as editTopic } from '/@/api/professional/professionaltopiclist'
 
 // Emits
 const emit = defineEmits<{
diff --git a/src/views/professional/professionalqualificationrelation/form.vue b/src/views/professional/professionalqualificationrelation/form.vue
index 8e054e8..b94cc3d 100644
--- a/src/views/professional/professionalqualificationrelation/form.vue
+++ b/src/views/professional/professionalqualificationrelation/form.vue
@@ -96,7 +96,6 @@
 import { ref, reactive, computed } from 'vue'
 import { Session } from '/@/utils/storage'
 import { useMessage } from '/@/hooks/message'
-import { getMyTeacherNo } from '/@/api/professional/professionaluser/teacherbase'
 import { addObj } from '/@/api/professional/professionaluser/professionalqualificationrelation'
 import { checkLocked } from '/@/api/professional/professionalstatuslock'
 import { getLevelList } from '/@/api/professional/rsbase/professionalqualificationconfig'
@@ -126,7 +125,6 @@ const dataForm = reactive({
   materialA: '',
   evidenceA: '',
   state: '',
-  teacherNo: '',
   id: ''
 })
 
@@ -144,6 +142,9 @@ const formRules = {
   certificateNumber: [
     { required: true, message: '请输入证书编号', trigger: 'blur' },
     { pattern: /^[A-Za-z0-9]+$/, message: '证书编号只能包含英文和数字', trigger: 'blur' }
+  ],
+  materialA: [
+    { required: true, message: '请上传证明材料', trigger: 'change' }
   ]
 }
 
@@ -211,14 +212,34 @@ const materiaUploadSuccess = (response: any) => {
     return
   }
   dataForm.evidenceA = response.data.url
+  dataForm.materialA = response.data.url
+  // 上传成功后清除该字段的验证错误
+  formRef.value?.clearValidate('materialA')
 }
 
 // 打开对话框
 const openDialog = async (row?: any) => {
+  // 新增模式：先检查是否锁定
+  if (!row || !row.id) {
+    try {
+      const lockResponse = await checkLocked('job')
+      if (lockResponse.data) {
+        message.warning("新增功能已锁定，暂不允许操作")
+        return
+      }
+    } catch (error) {
+      // 错误处理已在数据请求层统一处理，此处不需要提示
+      return
+    }
+  }
+  
+  // 公共设置
+  url.value = `/professional/file/teacherAboutInfoUpload?type=3`
+  fileList.value = []
+  
+  // 根据是否有 row 设置不同的表单数据
   if (row && row.id) {
-    // 编辑模式
-    url.value = `/professional/file/teacherAboutInfoUpload?teacherNo=${row.teacherNo}&type=3`
-    fileList.value = []
+    // 编辑模式：使用传入的数据
     Object.assign(dataForm, {
       worker: row.worker || '',
       qualificationConfigId: row.qualificationConfigId || '',
@@ -227,59 +248,32 @@ const openDialog = async (row?: any) => {
       materialA: row.materialA || '',
       evidenceA: row.evidenceA || '',
       state: row.state || '',
-      teacherNo: row.teacherNo || '',
       id: row.id || ''
     })
-    showForm.value = true
-    await initDicData()
-    dialogVisible.value = true
   } else {
-    // 新增模式：先检查是否锁定，再获取当前用户的 teacherNo
-    try {
-      const lockResponse = await checkLocked('job')
-      if (lockResponse.data) {
-        // 已锁定
-        message.warning("新增功能已锁定，暂不允许操作")
-        return
-      }
-      
-      // 未锁定，继续获取 teacherNo
-      const response = await getMyTeacherNo()
-      const teacherNo = response.data
-      url.value = `/professional/file/teacherAboutInfoUpload?teacherNo=${teacherNo}&type=3`
-      Object.assign(dataForm, {
-        worker: '',
-        qualificationConfigId: '',
-        certificateTime: '',
-        certificateNumber: '',
-        materialA: '',
-        evidenceA: '',
-        state: '',
-        teacherNo: teacherNo,
-        id: ''
-      })
-      fileList.value = []
-      // 先加载字典数据，再显示表单
-      await initDicData()
-      showForm.value = true
-      dialogVisible.value = true
-    } catch (error) {
-      message.error('获取教师编号失败')
-      return
-    }
+    // 新增模式：重置为空
+    Object.assign(dataForm, {
+      worker: '',
+      qualificationConfigId: '',
+      certificateTime: '',
+      certificateNumber: '',
+      materialA: '',
+      evidenceA: '',
+      state: '',
+      id: ''
+    })
   }
+  
+  // 公共操作：加载字典数据并显示对话框
+  await initDicData()
+  showForm.value = true
+  dialogVisible.value = true
 }
 
 // 提交表单
 const dialogSubmit = async () => {
   if (!formRef.value) return
   
-  // 验证证明材料是否上传（与 MultiDialog 保持一致）
-  if (!dataForm.evidenceA && !dataForm.materialA) {
-    message.warning("请上传证明材料")
-    return
-  }
-  
   await formRef.value.validate(async (valid: boolean) => {
     if (valid) {
       submitLoading.value = true
@@ -290,16 +284,8 @@ const dialogSubmit = async () => {
           dataForm.evidenceA = dataForm.materialA
         }
         
-        if (dataForm.id) {
-          // 编辑模式
-          dataForm.state = '0'
-          await addObj(dataForm)
-          message.success("修改成功")
-        } else {
-          // 新增模式
-          await addObj(dataForm)
-          message.success("提交成功")
-        }
+        await addObj(dataForm)
+        message.success(dataForm.id ? "修改成功" : "提交成功")
         dialogVisible.value = false
         emit('refreshData')
       } catch (error: any) {
diff --git a/src/views/professional/professionalqualificationrelation/index.vue b/src/views/professional/professionalqualificationrelation/index.vue
index ba7eefe..ff13d7e 100644
--- a/src/views/professional/professionalqualificationrelation/index.vue
+++ b/src/views/professional/professionalqualificationrelation/index.vue
@@ -166,15 +166,13 @@
         @size-change="sizeChangeHandle"
       />
 
-      <!-- 材料预览对话框 -->
-      <el-dialog v-model="dialogVisible" title="职业资格材料" append-to-body width="90%">
-        <auth-img 
-          v-for="src in imgUrl" 
-          :key="src.title" 
-          :authSrc="src.url" 
-          style="height:1000px;"
-        />
-      </el-dialog>
+      <!-- 材料预览：图片直接显示，PDF 在组件内部 dialog 中显示 -->
+      <auth-img 
+        v-for="src in imgUrl" 
+        :key="src.title" 
+        :authSrc="src.url"
+        dialog-title="职业资格材料"
+      />
 
       <!-- 子组件 -->
       <DataForm ref="dataFormRef" @refreshData="handleFilter" />
@@ -249,7 +247,6 @@ const search = reactive({
 })
 
 // 材料预览
-const dialogVisible = ref(false)
 const imgUrl = ref<Array<{ title: string; url: string }>>([])
 
 // 导出加载状态
@@ -283,6 +280,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 
 const { getDataList, currentChangeHandle, sizeChangeHandle, tableStyle } = useTable(state)
 
+// 预览材料
 // 预览材料
 const handlePreview = (list: string[]) => {
   imgUrl.value = []
@@ -293,9 +291,6 @@ const handlePreview = (list: string[]) => {
         url: v
       })
     })
-    nextTick(() => {
-      dialogVisible.value = true
-    })
   })
 }
 
diff --git a/src/views/professional/professionalteacheracademicrelation/form.vue b/src/views/professional/professionalteacheracademicrelation/form.vue
index f1b0421..77f1e5e 100644
--- a/src/views/professional/professionalteacheracademicrelation/form.vue
+++ b/src/views/professional/professionalteacheracademicrelation/form.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-model="dialogVisible" title="编辑学历学位" width="800px" append-to-body :close-on-click-modal="false" destroy-on-close>
+  <el-dialog v-model="dialogVisible" title="编辑学历学位" width="600px" append-to-body :close-on-click-modal="false" destroy-on-close>
     <div v-if="showForm">
       <el-form
         ref="formRef"
@@ -14,7 +14,6 @@
             placeholder="请选择毕业时间"
             format="YYYY-MM-DD"
             value-format="YYYY-MM-DD HH:mm:ss"
-            style="width: 100%"
           />
         </el-form-item>
 
@@ -24,7 +23,6 @@
             filterable
             clearable
             placeholder="请选择教育类型"
-            style="width: 100%"
           >
             <el-option
               v-for="item in educationTypeList"
@@ -41,7 +39,7 @@
             filterable
             clearable
             placeholder="请选择学历"
-            style="width: 100%"
+            @change="handleQualificationChange"
           >
             <el-option
               v-for="item in qualificationList"
@@ -58,7 +56,7 @@
             filterable
             clearable
             placeholder="请选择学位"
-            style="width: 100%"
+            @change="handleDegreeChange"
           >
             <el-option
               v-for="item in degreeList"
@@ -96,40 +94,40 @@
           />
         </el-form-item>
 
-        <el-form-item label="学历证书" prop="materialA">
-        <el-upload
-          :headers="headers"
-          :limit="1"
-          :action="url"
-          :file-list="fileList"
-          :on-success="materiaUploadSuccess"
-          :accept="'.jpg,.jpeg,.png,.pdf'"
-        >
-          <el-button size="small" type="primary">点击上传</el-button>
+        <el-form-item v-if="needQualificationImg" label="学历证书" prop="qualificationImg" required>
+          <el-upload
+            :headers="headers"
+            :limit="1"
+            :action="url"
+            :file-list="fileList"
+            :on-success="materiaUploadSuccess"
+            :accept="'.jpg,.jpeg,.png,.pdf'"
+          >
+            <el-button size="small" type="primary">点击上传</el-button>
             <template #tip>
               <div style="margin-top: 8px;">
-          <el-tag>仅支持jpg,jpeg,png,pdf后缀的文件上传</el-tag>
+                <el-tag>仅支持jpg,jpeg,png,pdf后缀的文件上传</el-tag>
               </div>
             </template>
-        </el-upload>
+          </el-upload>
         </el-form-item>
 
-        <el-form-item label="学位证书" prop="materialB">
-        <el-upload
-          :headers="headers"
-          :limit="1"
-          :action="url"
+        <el-form-item v-if="needDegreeImg" label="学位证书" prop="degreeImg" required>
+          <el-upload
+            :headers="headers"
+            :limit="1"
+            :action="url"
             :file-list="fileListB"
-          :on-success="materiaUploadSuccessB"
-          :accept="'.jpg,.jpeg,.png,.pdf'"
-        >
-          <el-button size="small" type="primary">点击上传</el-button>
+            :on-success="materiaUploadSuccessB"
+            :accept="'.jpg,.jpeg,.png,.pdf'"
+          >
+            <el-button size="small" type="primary">点击上传</el-button>
             <template #tip>
               <div style="margin-top: 8px;">
-          <el-tag>仅支持jpg,jpeg,png,pdf后缀的文件上传</el-tag>
+                <el-tag>仅支持jpg,jpeg,png,pdf后缀的文件上传</el-tag>
               </div>
             </template>
-        </el-upload>
+          </el-upload>
         </el-form-item>
       </el-form>
     </div>
@@ -144,10 +142,9 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, computed } from 'vue'
+import { ref, reactive, computed, nextTick } from 'vue'
 import { Session } from '/@/utils/storage'
 import { useMessage } from '/@/hooks/message'
-import { getMyTeacherNo } from '/@/api/professional/professionaluser/teacherbase'
 import { addObj } from '/@/api/professional/professionaluser/professionalteacheracademicrelation'
 import { getAllTypeList } from '/@/api/professional/rsbase/professionalacademiceducationtypeconfig'
 import { getQualificationList } from '/@/api/professional/rsbase/academicqualificationsconfig'
@@ -178,34 +175,66 @@ const dataForm = reactive({
   graduateSchool: '',
   major: '',
   certificateNumber: '',
-  materialA: '',
-  materialB: '',
   qualificationImg: '',
   degreeImg: '',
   state: '',
-  teacherNo: '',
   id: ''
 })
 
-// 表单验证规则
-const formRules = {
-  graduateTime: [
-    { required: true, message: '请选择毕业时间', trigger: 'change' }
-  ],
-  type: [
-    { required: true, message: '请选择教育类型', trigger: 'change' }
-  ],
-  graduateSchool: [
-    { required: true, message: '请输入毕业学校', trigger: 'blur' }
-  ],
-  major: [
-    { required: true, message: '请输入所学专业', trigger: 'blur' }
-  ],
-  certificateNumber: [
-    { required: true, message: '请输入证书编码', trigger: 'blur' },
-    { pattern: /^[A-Za-z0-9]+$/, message: '证书编码只能包含英文和数字', trigger: 'blur' }
-  ]
-}
+// 计算属性：是否需要学历证书（选择了学历）
+const needQualificationImg = computed(() => {
+  return !!dataForm.qualificationConfigId
+})
+
+// 计算属性：是否需要学位证书（选择了学位且不等于 -1 或"无"）
+const needDegreeImg = computed(() => {
+  if (!dataForm.degreeConfigId) return false
+  // 检查是否为 -1 或"无"（处理类型转换）
+  const degreeId = String(dataForm.degreeConfigId)
+  if (degreeId === '-1') return false
+  // 检查学位列表中是否有名称为"无"的选项
+  const degreeItem = degreeList.value.find(item => String(item.id) === degreeId)
+  if (degreeItem && degreeItem.degreeName === '无') return false
+  return true
+})
+
+// 动态验证规则
+const formRules = computed(() => {
+  const rules: any = {
+    graduateTime: [
+      { required: true, message: '请选择毕业时间', trigger: 'change' }
+    ],
+    type: [
+      { required: true, message: '请选择教育类型', trigger: 'change' }
+    ],
+    graduateSchool: [
+      { required: true, message: '请输入毕业学校', trigger: 'blur' }
+    ],
+    major: [
+      { required: true, message: '请输入所学专业', trigger: 'blur' }
+    ],
+    certificateNumber: [
+      { required: true, message: '请输入证书编码', trigger: 'blur' },
+      { pattern: /^[A-Za-z0-9]+$/, message: '证书编码只能包含英文和数字', trigger: 'blur' }
+    ]
+  }
+  
+  // 只有当需要学历证书时才添加验证规则
+  if (needQualificationImg.value) {
+    rules.qualificationImg = [
+      { required: true, message: '请上传学历证书', trigger: 'change' }
+    ]
+  }
+  
+  // 只有当需要学位证书时才添加验证规则
+  if (needDegreeImg.value) {
+    rules.degreeImg = [
+      { required: true, message: '请上传学位证书', trigger: 'change' }
+    ]
+  }
+  
+  return rules
+})
 
 // 下拉列表数据
 const educationTypeList = ref<any[]>([])
@@ -241,23 +270,17 @@ const initDicData = async () => {
     
     // 获取教育类型列表
     if (eduRes && eduRes.data) {
-      educationTypeList.value = Array.isArray(eduRes.data) 
-        ? eduRes.data 
-        : (eduRes.data.records || eduRes.data.list || [])
+      educationTypeList.value = eduRes.data
     }
     
     // 获取学历列表
     if (quaRes && quaRes.data) {
-      qualificationList.value = Array.isArray(quaRes.data) 
-        ? quaRes.data 
-        : (quaRes.data.records || quaRes.data.list || [])
+      qualificationList.value = quaRes.data
     }
     
     // 获取学位列表
     if (degRes && degRes.data) {
-      degreeList.value = Array.isArray(degRes.data) 
-        ? degRes.data 
-        : (degRes.data.records || degRes.data.list || [])
+      degreeList.value = degRes.data
     }
   } catch (error) {
     // 获取字典数据失败
@@ -269,6 +292,26 @@ const handleCertificateNumberInput = (value: string) => {
   dataForm.certificateNumber = value.replace(/[^A-Za-z0-9]/g, '')
 }
 
+// 学历改变时的处理
+const handleQualificationChange = () => {
+  // 如果不需要学历证书，清除学历证书字段、文件列表和验证错误
+  if (!needQualificationImg.value) {
+    dataForm.qualificationImg = ''
+    fileList.value = []
+    formRef.value?.clearValidate('qualificationImg')
+  }
+}
+
+// 学位改变时的处理
+const handleDegreeChange = () => {
+  // 如果不需要学位证书，清除学位证书字段、文件列表和验证错误
+  if (!needDegreeImg.value) {
+    dataForm.degreeImg = ''
+    fileListB.value = []
+    formRef.value?.clearValidate('degreeImg')
+  }
+}
+
 // 文件上传成功 - 学历证书
 const materiaUploadSuccess = (response: any) => {
   if (response.data && response.data.code === "-1") {
@@ -276,120 +319,113 @@ const materiaUploadSuccess = (response: any) => {
     return
   }
   dataForm.qualificationImg = response.data.url
+  // 清除验证错误
+  formRef.value?.clearValidate('qualificationImg')
 }
 
 // 文件上传成功 - 学位证书
 const materiaUploadSuccessB = (response: any) => {
   if (response.data && response.data.code === "-1") {
     message.error("当前不允许上传文件")
-        return
-      }
+    return
+  }
   dataForm.degreeImg = response.data.url
+  // 清除验证错误
+  formRef.value?.clearValidate('degreeImg')
 }
 
 // 打开对话框
 const openDialog = async (row?: any) => {
-  if (row && row.id) {
-    // 编辑模式
-    url.value = `/professional/file/teacherAboutInfoUpload?teacherNo=${row.teacherNo}&type=1`
-    fileList.value = []
-    fileListB.value = []
-    Object.assign(dataForm, {
-      graduateTime: row.graduateTime || '',
-      type: row.type || '',
-      qualificationConfigId: row.qualificationConfigId || '',
-      degreeConfigId: row.degreeConfigId || '',
-      graduateSchool: row.graduateSchool || '',
-      major: row.major || '',
-      certificateNumber: row.certificateNumber || '',
-      materialA: row.materialA || '',
-      materialB: row.materialB || '',
-      qualificationImg: row.qualificationImg || '',
-      degreeImg: row.degreeImg || '',
-      state: row.state || '',
-      teacherNo: row.teacherNo || '',
-      id: row.id || ''
-    })
-    showForm.value = true
-    await initDicData()
-    dialogVisible.value = true
-  } else {
-    // 新增模式：先检查是否锁定，再获取当前用户的 teacherNo
+  // 新增模式：先检查是否锁定
+  if (!row || !row.id) {
     try {
       const lockResponse = await checkLocked('acade')
       if (lockResponse.data) {
-        // 已锁定
         message.warning("新增功能已锁定，暂不允许操作")
         return
       }
-      
-      // 未锁定，继续获取 teacherNo
-      const response = await getMyTeacherNo()
-      const teacherNo = response.data
-      url.value = `/professional/file/teacherAboutInfoUpload?teacherNo=${teacherNo}&type=1`
-      Object.assign(dataForm, {
-        graduateTime: '',
-        type: '',
-        qualificationConfigId: '',
-        degreeConfigId: '',
-        graduateSchool: '',
-        major: '',
-        certificateNumber: '',
-        materialA: '',
-        materialB: '',
-        qualificationImg: '',
-        degreeImg: '',
-        state: '',
-        teacherNo: teacherNo,
-        id: ''
-      })
-      fileList.value = []
-      fileListB.value = []
-      // 先加载字典数据，再显示表单
-      await initDicData()
-      showForm.value = true
-      dialogVisible.value = true
     } catch (error) {
-      message.error('获取教师编号失败')
+      // 错误处理已在数据请求层统一处理，此处不需要提示
       return
     }
   }
+  
+  // 公共设置
+  url.value = `/professional/file/teacherAboutInfoUpload?type=1`
+  fileList.value = []
+  fileListB.value = []
+  
+  // 根据是否有 row 设置不同的表单数据
+  if (row && row.id) {
+    // 编辑模式：使用传入的数据
+    // 确保类型匹配（将 id 转换为字符串或数字，与选项列表保持一致）
+    Object.assign(dataForm, {
+      graduateTime: row.graduateTime || '',
+      type: row.type !== null && row.type !== undefined ? String(row.type) : '',
+      qualificationConfigId: row.qualificationConfigId !== null && row.qualificationConfigId !== undefined ? String(row.qualificationConfigId) : '',
+      degreeConfigId: row.degreeConfigId !== null && row.degreeConfigId !== undefined ? String(row.degreeConfigId) : '',
+      graduateSchool: row.graduateSchool || '',
+      major: row.major || '',
+      certificateNumber: row.certificateNumber || '',
+      qualificationImg: row.qualificationImg || '',
+      degreeImg: row.degreeImg || '',
+      state: row.state || '',
+      id: row.id || ''
+    })
+  } else {
+    // 新增模式：重置为空
+    Object.assign(dataForm, {
+      graduateTime: '',
+      type: '',
+      qualificationConfigId: '',
+      degreeConfigId: '',
+      graduateSchool: '',
+      major: '',
+      certificateNumber: '',
+      qualificationImg: '',
+      degreeImg: '',
+      state: '',
+      id: ''
+    })
+  }
+  
+  // 公共操作：先加载字典数据，再显示对话框
+  await initDicData()
+  // 等待字典数据加载完成后再显示表单，确保选项列表已准备好
+  await nextTick()
+  showForm.value = true
+  dialogVisible.value = true
 }
 
 // 提交表单
 const dialogSubmit = async () => {
   if (!formRef.value) return
   
-  // 验证证明材料是否上传（与 MultiDialog 保持一致：mateA 或 mateB 至少有一个）
-  if (!dataForm.qualificationImg && !dataForm.degreeImg && !dataForm.materialA && !dataForm.materialB) {
-    message.warning("请上传学历或学位证书")
-    return
-  }
-  
   await formRef.value.validate(async (valid: boolean) => {
     if (valid) {
       submitLoading.value = true
       try {
-        // 统一使用 addObj 接口（新增和编辑都使用同一个接口）
-        // 确保 qualificationImg 或 materialA 有值
-        if (!dataForm.qualificationImg && dataForm.materialA) {
-          dataForm.qualificationImg = dataForm.materialA
-        }
-        // 确保 degreeImg 或 materialB 有值
-        if (!dataForm.degreeImg && dataForm.materialB) {
-          dataForm.degreeImg = dataForm.materialB
+        // 统一使用 addObj 接口（新增和编辑都使用）
+        const submitData: any = {
+          graduateTime: dataForm.graduateTime,
+          type: dataForm.type,
+          qualificationConfigId: dataForm.qualificationConfigId,
+          degreeConfigId: dataForm.degreeConfigId,
+          graduateSchool: dataForm.graduateSchool,
+          major: dataForm.major,
+          certificateNumber: dataForm.certificateNumber,
+          qualificationImg: dataForm.qualificationImg,
+          degreeImg: dataForm.degreeImg,
+          state: '' // 待审核
         }
         
+        // 编辑时需要传递 id
         if (dataForm.id) {
-          // 编辑模式
-          dataForm.state = '0'
-          await addObj(dataForm)
-          message.success("修改成功")
-        } else {
-          // 新增模式
-          await addObj(dataForm)
-          message.success("提交成功")
+          submitData.id = dataForm.id
         }
+        
+        await addObj(submitData)
+        message.success(dataForm.id ? "修改成功" : "提交成功")
         dialogVisible.value = false
         emit('refreshData')
       } catch (error: any) {
diff --git a/src/views/professional/professionalteacheracademicrelation/index.vue b/src/views/professional/professionalteacheracademicrelation/index.vue
index 30ecbe6..3e41c8c 100755
--- a/src/views/professional/professionalteacheracademicrelation/index.vue
+++ b/src/views/professional/professionalteacheracademicrelation/index.vue
@@ -95,12 +95,16 @@
           </template>
         </el-table-column>
         
-        <el-table-column prop="graduateTime" label="毕业时间" width="180" align="center" />
-        
-        <el-table-column prop="degreeConfigId" label="学位" min-width="120" align="center" show-overflow-tooltip>
+        <el-table-column prop="graduateTime" label="毕业时间" width="180" align="center">
           <template #default="scope">
-            {{ getDegreeName(scope.row.degreeConfigId) }}
-        </template>
+            {{ scope.row.graduateTime ? scope.row.graduateTime.split(' ')[0] : '-' }}
+          </template>
+        </el-table-column>
+        
+        <el-table-column prop="type" label="教育类型" min-width="120" align="center" show-overflow-tooltip>
+          <template #default="scope">
+            {{ getEducationTypeName(scope.row.type) }}
+          </template>
         </el-table-column>
         
         <el-table-column prop="qualificationConfigId" label="学历" min-width="120" align="center" show-overflow-tooltip>
@@ -108,8 +112,15 @@
             {{ getQualificationName(scope.row.qualificationConfigId) }}
           </template>
         </el-table-column>
+
+        <el-table-column prop="degreeConfigId" label="学位" min-width="120" align="center" show-overflow-tooltip>
+          <template #default="scope">
+            {{ getDegreeName(scope.row.degreeConfigId) }}
+        </template>
+        </el-table-column>
         
-        <el-table-column prop="createTime" label="创建时间" width="180" align="center" />
+        
+        <!-- <el-table-column prop="createTime" label="创建时间" width="180" align="center" /> -->
         
         <el-table-column label="学历证书附件" width="130" align="center">
           <template #default="scope">
@@ -181,15 +192,13 @@
         @size-change="sizeChangeHandle"
       />
 
-      <!-- 材料预览对话框 -->
-      <el-dialog v-model="dialogVisible" :title="dialogTitle" append-to-body width="90%">
-        <auth-img 
-          v-for="src in imgUrl" 
-          :key="src.title" 
-          :authSrc="src.url" 
-          style="height:1000px;"
-        />
-    </el-dialog>
+      <!-- 材料预览：图片直接显示，PDF 在组件内部 dialog 中显示 -->
+      <auth-img 
+        v-for="src in imgUrl" 
+        :key="src.title" 
+        :authSrc="src.url"
+        :dialog-title="dialogTitle"
+      />
 
       <!-- 子组件 -->
       <DataForm ref="dataFormRef" @refreshData="handleFilter" />
@@ -214,6 +223,7 @@ import {
 } 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 { defineAsyncComponent } from 'vue'
 const TeacherNameNo = defineAsyncComponent(() => import('/@/components/TeacherNameNo/index.vue'))
 const AuditState = defineAsyncComponent(() => import('/@/components/AuditState/index.vue'))
@@ -264,16 +274,16 @@ const search = reactive({
 })
 
 // 材料预览
-const dialogVisible = ref(false)
 const dialogTitle = ref('')
 const imgUrl = ref<Array<{ title: string; url: string }>>([])
 
 // 导出加载状态
 const exportLoading = ref(false)
 
-// 学位和学历列表
+// 学位、学历和教育类型列表
 const degreeList = ref<any[]>([])
 const qualificationList = ref<any[]>([])
+const educationTypeList = ref<any[]>([])
 
 // 配置 useTable
 const state: BasicTableProps = reactive<BasicTableProps>({
@@ -321,10 +331,6 @@ const handlePreview = (list: string[], type: number) => {
     } else if (type === 2) {
       dialogTitle.value = '学位证书附件'
     }
-    
-    nextTick(() => {
-      dialogVisible.value = true
-    })
   })
 }
 
@@ -429,20 +435,37 @@ const getQualificationName = (id: string | number) => {
   return item ? item.qualificationName : '-'
 }
 
+// 获取教育类型名称
+const getEducationTypeName = (id: string | number | undefined) => {
+  if (!id) return '-'
+  const item = educationTypeList.value.find((item: any) => item.id === id || String(item.id) === String(id))
+  return item ? item.name : '-'
+}
+
 // 加载字典数据
 const loadDictData = async () => {
   try {
+    // 并行加载所有字典数据
+    const [degreeRes, qualRes, eduTypeRes] = await Promise.all([
+      getDegreeList(),
+      getQualificationList(),
+      getAllTypeList()
+    ])
+    
     // 加载学位列表
-    const degreeRes = await getDegreeList()
     if (degreeRes && degreeRes.data) {
       degreeList.value = degreeRes.data
     }
     
     // 加载学历列表
-    const qualRes = await getQualificationList()
     if (qualRes && qualRes.data) {
       qualificationList.value = qualRes.data
     }
+    
+    // 加载教育类型列表
+    if (eduTypeRes && eduTypeRes.data) {
+      educationTypeList.value = eduTypeRes.data
+    }
   } catch (error) {
     // Failed to load dict data
   }
diff --git a/src/views/professional/professionalteachercertificaterelation/form.vue b/src/views/professional/professionalteachercertificaterelation/form.vue
index 73c7f61..b82085b 100644
--- a/src/views/professional/professionalteachercertificaterelation/form.vue
+++ b/src/views/professional/professionalteachercertificaterelation/form.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-model="dialogVisible" title="编辑教师资格证" width="800px" append-to-body :close-on-click-modal="false" destroy-on-close>
+  <el-dialog v-model="dialogVisible" title="编辑教师资格证" width="600px" append-to-body :close-on-click-modal="false" destroy-on-close>
     <div v-if="showForm">
       <el-form
         ref="formRef"
@@ -10,43 +10,29 @@
         <el-form-item label="类型" prop="certificateConfId">
           <el-select
             v-model="dataForm.certificateConfId"
-            filterable
-            clearable
             placeholder="请选择类型"
             style="width: 100%"
           >
             <el-option
               v-for="item in teacherCertificateList"
               :key="item.id"
-              :label="item.cretificateName || item.certificateName"
+              :label="item.cretificateName"
               :value="item.id"
             />
           </el-select>
         </el-form-item>
 
-        <el-form-item label="取证时间" prop="certificateTime">
-          <el-date-picker
-            v-model="dataForm.certificateTime"
-            type="date"
-            placeholder="请选择取证时间"
-            format="YYYY-MM-DD"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            style="width: 100%"
-          />
-        </el-form-item>
-
         <el-form-item label="证书编号" prop="certificateNumber">
           <el-input
             v-model="dataForm.certificateNumber"
             placeholder="请输入证书编号（仅支持英文和数字）"
-            clearable
             show-word-limit
             maxlength="64"
             @input="handleCertificateNumberInput"
           />
         </el-form-item>
 
-        <el-form-item label="材料1" prop="materialA">
+        <el-form-item label="证明材料" prop="evidenceA" required>
           <el-upload
             :headers="headers"
             :limit="1"
@@ -63,24 +49,6 @@
             </template>
           </el-upload>
         </el-form-item>
-
-        <el-form-item label="材料2" prop="materialB">
-          <el-upload
-            :headers="headers"
-            :limit="1"
-            :action="url"
-            :file-list="fileListB"
-            :on-success="materiaUploadSuccessB"
-            :accept="'.jpg,.jpeg,.png,.pdf'"
-          >
-            <el-button size="small" type="primary">点击上传</el-button>
-            <template #tip>
-              <div style="margin-top: 8px;">
-                <el-tag>仅支持jpg,jpeg,png,pdf后缀的文件上传</el-tag>
-              </div>
-            </template>
-          </el-upload>
-        </el-form-item>
       </el-form>
     </div>
     
@@ -97,7 +65,6 @@
 import { ref, reactive, computed } from 'vue'
 import { Session } from '/@/utils/storage'
 import { useMessage } from '/@/hooks/message'
-import { getMyTeacherNo } from '/@/api/professional/professionaluser/teacherbase'
 import { addObj } from '/@/api/professional/professionaluser/professionalteachercertificaterelation'
 import { getTeacherCertificateList } from '/@/api/professional/rsbase/professionalteachercertificateconf'
 import { checkLocked } from '/@/api/professional/professionalstatuslock'
@@ -120,14 +87,9 @@ const dialogVisible = ref(false)
 // 表单数据
 const dataForm = reactive({
   certificateConfId: '',
-  certificateTime: '',
   certificateNumber: '',
-  materialA: '',
-  materialB: '',
   evidenceA: '',
-  evidenceB: '',
   state: '',
-  teacherNo: '',
   id: ''
 })
 
@@ -136,12 +98,12 @@ const formRules = {
   certificateConfId: [
     { required: true, message: '请选择类型', trigger: 'change' }
   ],
-  certificateTime: [
-    { required: true, message: '请选择取证时间', trigger: 'change' }
-  ],
   certificateNumber: [
     { required: true, message: '请输入证书编号', trigger: 'blur' },
     { pattern: /^[A-Za-z0-9]+$/, message: '证书编号只能包含英文和数字', trigger: 'blur' }
+  ],
+  evidenceA: [
+    { required: true, message: '请上传证明材料', trigger: 'change' }
   ]
 }
 
@@ -153,7 +115,6 @@ const teacherCertificateList = ref<any[]>([])
 // 上传相关
 const url = ref('')
 const fileList = ref<any[]>([])
-const fileListB = ref<any[]>([])
 
 // 请求头
 const headers = computed(() => {
@@ -168,15 +129,8 @@ const showForm = ref(false)
 // 初始化字典数据
 const initDicData = async () => {
   try {
-    // 使用专门的 API 获取数据（与 index.vue 保持一致）
-    const certResponse = await getTeacherCertificateList()
-    
-    // 获取教师资格证列表
-    if (certResponse && certResponse.data) {
-      teacherCertificateList.value = Array.isArray(certResponse.data) 
-        ? certResponse.data 
-        : (certResponse.data.records || certResponse.data.list || [])
-    }
+    const res = await getTeacherCertificateList()
+    teacherCertificateList.value = res.data || []
   } catch (error) {
     // 获取字典数据失败
   }
@@ -187,119 +141,87 @@ const handleCertificateNumberInput = (value: string) => {
   dataForm.certificateNumber = value.replace(/[^A-Za-z0-9]/g, '')
 }
 
-// 文件上传成功 - 材料A
+// 文件上传成功
 const materiaUploadSuccess = (response: any) => {
   if (response.data && response.data.code === "-1") {
     message.error("当前不允许上传文件")
     return
   }
   dataForm.evidenceA = response.data.url
-}
-
-// 文件上传成功 - 材料B
-const materiaUploadSuccessB = (response: any) => {
-  if (response.data && response.data.code === "-1") {
-    message.error("当前不允许上传文件")
-    return
-  }
-  dataForm.evidenceB = response.data.url
+  // 清除验证错误
+  formRef.value?.clearValidate('evidenceA')
 }
 
 // 打开对话框
 const openDialog = async (row?: any) => {
-  if (row && row.id) {
-    // 编辑模式
-    url.value = `/professional/file/teacherAboutInfoUpload?teacherNo=${row.teacherNo}&type=0`
-    fileList.value = []
-    fileListB.value = []
-    Object.assign(dataForm, {
-      certificateConfId: row.certificateConfId || '',
-      certificateTime: row.certificateTime || '',
-      certificateNumber: row.certificateNumber || '',
-      materialA: row.materialA || '',
-      materialB: row.materialB || '',
-      evidenceA: row.evidenceA || '',
-      evidenceB: row.evidenceB || '',
-      state: row.state || '',
-      teacherNo: row.teacherNo || '',
-      id: row.id || ''
-    })
-    showForm.value = true
-    await initDicData()
-    dialogVisible.value = true
-  } else {
-    // 新增模式：先检查是否锁定，再获取当前用户的 teacherNo
+  // 新增模式：先检查是否锁定
+  if (!row || !row.id) {
     try {
       const lockResponse = await checkLocked('teacherTitle')
       if (lockResponse.data) {
-        // 已锁定
         message.warning("新增功能已锁定，暂不允许操作")
         return
       }
-      
-      // 未锁定，继续获取 teacherNo
-      const response = await getMyTeacherNo()
-      const teacherNo = response.data
-      url.value = `/professional/file/teacherAboutInfoUpload?teacherNo=${teacherNo}&type=0`
-      Object.assign(dataForm, {
-        certificateConfId: '',
-        certificateTime: '',
-        certificateNumber: '',
-        materialA: '',
-        materialB: '',
-        evidenceA: '',
-        evidenceB: '',
-        state: '',
-        teacherNo: teacherNo,
-        id: ''
-      })
-      fileList.value = []
-      fileListB.value = []
-      // 先加载字典数据，再显示表单
-      await initDicData()
-      showForm.value = true
-      dialogVisible.value = true
     } catch (error) {
-      message.error('获取教师编号失败')
+      // 错误处理已在数据请求层统一处理，此处不需要提示
       return
     }
   }
+  
+  // 公共设置
+  url.value = `/professional/file/teacherAboutInfoUpload?type=0`
+  fileList.value = []
+  
+  // 根据是否有 row 设置不同的表单数据
+  if (row && row.id) {
+    // 编辑模式：使用传入的数据
+    Object.assign(dataForm, {
+      certificateConfId: row.certificateConfId || '',
+      certificateNumber: row.certificateNumber || '',
+      evidenceA: row.evidenceA || '',
+      state: row.state || '',
+      id: row.id || ''
+    })
+  } else {
+    // 新增模式：重置为空
+    Object.assign(dataForm, {
+      certificateConfId: '',
+      certificateNumber: '',
+      evidenceA: '',
+      state: '',
+      id: ''
+    })
+  }
+  
+  // 公共操作：加载字典数据并显示对话框
+  await initDicData()
+  showForm.value = true
+  dialogVisible.value = true
 }
 
 // 提交表单
 const dialogSubmit = async () => {
   if (!formRef.value) return
   
-  // 验证证明材料是否上传（与 MultiDialog 保持一致）
-  if (!dataForm.evidenceA && !dataForm.materialA) {
-    message.warning("请上传证明材料")
-    return
-  }
-  
   await formRef.value.validate(async (valid: boolean) => {
     if (valid) {
       submitLoading.value = true
       try {
-        // 统一使用 addObj 接口（新增和编辑都使用同一个接口）
-        // 确保 evidenceA 或 materialA 有值
-        if (!dataForm.evidenceA && dataForm.materialA) {
-          dataForm.evidenceA = dataForm.materialA
-        }
-        // 确保 evidenceB 或 materialB 有值
-        if (!dataForm.evidenceB && dataForm.materialB) {
-          dataForm.evidenceB = dataForm.materialB
+        // 统一使用 addObj 接口（新增和编辑都使用）
+        const submitData: any = {
+          certificateConfId: dataForm.certificateConfId,
+          certificateNumber: dataForm.certificateNumber,
+          evidenceA: dataForm.evidenceA,
+          state: '' // 待审核
         }
         
+        // 编辑时需要传递 id
         if (dataForm.id) {
-          // 编辑模式
-          dataForm.state = '0'
-          await addObj(dataForm)
-          message.success("修改成功")
-        } else {
-          // 新增模式
-          await addObj(dataForm)
-          message.success("提交成功")
+          submitData.id = dataForm.id
         }
+        
+        await addObj(submitData)
+        message.success(dataForm.id ? "修改成功" : "提交成功")
         dialogVisible.value = false
         emit('refreshData')
       } catch (error: any) {
diff --git a/src/views/professional/professionalteachercertificaterelation/index.vue b/src/views/professional/professionalteachercertificaterelation/index.vue
index 0868d43..82d6165 100755
--- a/src/views/professional/professionalteachercertificaterelation/index.vue
+++ b/src/views/professional/professionalteachercertificaterelation/index.vue
@@ -162,15 +162,13 @@
         @size-change="sizeChangeHandle"
       />
 
-      <!-- 材料预览对话框 -->
-      <el-dialog v-model="dialogVisible" title="教师资格材料" append-to-body width="90%">
-        <auth-img 
-          v-for="src in imgUrl" 
-          :key="src.title" 
-          :authSrc="src.url" 
-          style="height:1000px;"
-        />
-    </el-dialog>
+      <!-- 材料预览：图片直接显示，PDF 在组件内部 dialog 中显示 -->
+      <auth-img 
+        v-for="src in imgUrl" 
+        :key="src.title" 
+        :authSrc="src.url"
+        dialog-title="教师资格材料"
+      />
 
       <!-- 子组件 -->
       <DataForm ref="dataFormRef" @refreshData="handleFilter" />
@@ -244,7 +242,6 @@ const search = reactive({
 })
 
 // 材料预览
-const dialogVisible = ref(false)
 const imgUrl = ref<Array<{ title: string; url: string }>>([])
 
 // 导出加载状态
@@ -287,9 +284,6 @@ const handlePreview = (list: string[]) => {
         url: v
       })
     })
-    nextTick(() => {
-      dialogVisible.value = true
-    })
   })
 }
 
diff --git a/src/views/professional/professionalteacherhonor/form.vue b/src/views/professional/professionalteacherhonor/form.vue
index 09dd438..1909582 100644
--- a/src/views/professional/professionalteacherhonor/form.vue
+++ b/src/views/professional/professionalteacherhonor/form.vue
@@ -1,55 +1,47 @@
 <template>
-  <el-dialog v-model="dialogVisible" :title="title" width="80%" append-to-body :close-on-click-modal="false" destroy-on-close>
-    <el-row>
-      <el-form
-        ref="formRef"
-        :model="dataForm"
-        :rules="dataRules"
-        label-width="120px"
-      >
-        <el-col :span="12">
-          <el-form-item label="荣誉" prop="honor">
-            <el-input v-model="dataForm.honor" placeholder="请输入荣誉" clearable />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="表彰单位" prop="honorCompany">
-            <el-input v-model="dataForm.honorCompany" placeholder="请输入表彰单位" clearable />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="年份" prop="year">
-            <el-input-number
-              v-model="dataForm.year"
-              :controls="false"
-              :min="1900"
-              :max="2100"
-              placeholder="请输入年份"
-              style="width: 100%"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="证明材料" prop="materialA">
-            <el-upload
-              :headers="headers"
-              :limit="1"
-              :action="url"
-              :on-success="materiaUploadSuccess"
-              :file-list="fileList"
-              :accept="'.jpg,.jpeg,.png,.pdf'"
-            >
-              <el-button size="small" type="primary">点击上传</el-button>
-              <template #tip>
-                <div style="margin-top: 8px;">
-                  <el-tag>仅支持jpg,jpeg,png,pdf后缀的文件上传</el-tag>
-                </div>
-              </template>
-            </el-upload>
-          </el-form-item>
-        </el-col>
-      </el-form>
-    </el-row>
+  <el-dialog v-model="dialogVisible" :title="title" width="600px" append-to-body :close-on-click-modal="false" destroy-on-close>
+    <el-form
+      ref="formRef"
+      :model="dataForm"
+      :rules="dataRules"
+      label-width="120px"
+    >
+      <el-form-item label="荣誉" prop="honor">
+        <el-input v-model="dataForm.honor" placeholder="请输入荣誉" clearable />
+      </el-form-item>
+      
+      <el-form-item label="表彰单位" prop="honorCompany">
+        <el-input v-model="dataForm.honorCompany" placeholder="请输入表彰单位" clearable />
+      </el-form-item>
+      
+      <el-form-item label="年份" prop="year">
+        <el-date-picker
+          v-model="dataForm.year"
+          type="year"
+          placeholder="请选择年份"
+          format="YYYY"
+          value-format="YYYY"
+        />
+      </el-form-item>
+      
+      <el-form-item label="证明材料" prop="attachment" required>
+        <el-upload
+          :headers="headers"
+          :limit="1"
+          :action="url"
+          :on-success="materiaUploadSuccess"
+          :file-list="fileList"
+          :accept="'.jpg,.jpeg,.png,.pdf'"
+        >
+          <el-button size="small" type="primary">点击上传</el-button>
+          <template #tip>
+            <div style="margin-top: 8px;">
+              <el-tag>仅支持jpg,jpeg,png,pdf后缀的文件上传</el-tag>
+            </div>
+          </template>
+        </el-upload>
+      </el-form-item>
+    </el-form>
 
     <template #footer>
       <div class="dialog-footer">
@@ -64,7 +56,6 @@
 import { ref, reactive, computed } from 'vue'
 import { Session } from '/@/utils/storage'
 import { useMessage } from '/@/hooks/message'
-import { getMyTeacherNo } from '/@/api/professional/professionaluser/teacherbase'
 import { addObj } from '/@/api/professional/professionaluser/professionalteacherhonor'
 import { checkLocked } from '/@/api/professional/professionalstatuslock'
 
@@ -87,11 +78,10 @@ const dialogVisible = ref(false)
 const dataForm = reactive({
   honor: '',
   honorCompany: '',
-  year: null as number | null,
+  year: '',
   materialA: '',
   attachment: '',
   state: '',
-  teacherNo: '',
   teacherName: '',
   id: ''
 })
@@ -99,13 +89,16 @@ const dataForm = reactive({
 // 表单验证规则
 const dataRules = {
   honor: [
-    { required: true, message: '请填写荣誉', trigger: 'change' }
+    { required: true, message: '请填写荣誉', trigger: 'blur' }
   ],
   honorCompany: [
-    { required: true, message: '请填写表彰单位', trigger: 'change' }
+    { required: true, message: '请填写表彰单位', trigger: 'blur' }
   ],
-  year: [
-    { required: true, message: '请填写年份', trigger: 'change' }
+      year: [
+        { required: true, message: '请选择年份', trigger: 'change' }
+      ],
+      attachment: [
+    { required: true, message: '请上传证明材料', trigger: 'change' }
   ]
 }
 
@@ -140,97 +133,79 @@ const materiaUploadSuccess = (response: any) => {
     return
   }
   dataForm.attachment = response.data.url
+  // 清除验证错误
+  formRef.value?.clearValidate('attachment')
 }
 
 // 打开对话框
 const openDialog = async (row?: any) => {
-  if (row && row.id) {
-    // 编辑模式
-    title.value = row.teacherName || ''
-    url.value = `/professional/file/teacherAboutInfoUpload?teacherNo=${row.teacherNo}&type=4`
-    fileList.value = []
-    Object.assign(dataForm, {
-      honor: row.honor || '',
-      honorCompany: row.honorCompany || '',
-      year: row.year || null,
-      materialA: row.materialA || '',
-      attachment: row.attachment || '',
-      state: row.state || '',
-      teacherNo: row.teacherNo || '',
-      teacherName: row.teacherName || '',
-      id: row.id || ''
-    })
-    showForm.value = true
-    await initDicData()
-    dialogVisible.value = true
-  } else {
-    // 新增模式：先检查是否锁定，再获取当前用户的 teacherNo
+  // 新增模式：先检查是否锁定
+  if (!row || !row.id) {
     try {
       const lockResponse = await checkLocked('remix')
       if (lockResponse.data) {
-        // 已锁定
         message.warning("新增功能已锁定，暂不允许操作")
         return
       }
-      
-      // 未锁定，继续获取 teacherNo
-      const response = await getMyTeacherNo()
-      const teacherNo = response.data
-      title.value = '新增综合表彰'
-      url.value = `/professional/file/teacherAboutInfoUpload?teacherNo=${teacherNo}&type=4`
-      Object.assign(dataForm, {
-        honor: '',
-        honorCompany: '',
-        year: null,
-        materialA: '',
-        attachment: '',
-        state: '',
-        teacherNo: teacherNo,
-        teacherName: '',
-        id: ''
-      })
-      fileList.value = []
-      // 先加载字典数据，再显示表单
-      await initDicData()
-      showForm.value = true
-      dialogVisible.value = true
     } catch (error) {
-      message.error('获取教师编号失败')
+      // 错误处理已在数据请求层统一处理，此处不需要提示
       return
     }
   }
+  
+  // 根据是否有 row 设置不同的表单数据
+  if (row && row.id) {
+    // 编辑模式：使用传入的数据
+    title.value = row.teacherName || ''
+    Object.assign(dataForm, {
+      honor: row.honor || '',
+      honorCompany: row.honorCompany || '',
+      year: row.year ? String(row.year) : '',
+      materialA: row.materialA || '',
+      attachment: row.attachment || '',
+      state: row.state || '',
+      teacherName: row.teacherName || '',
+      id: row.id || ''
+    })
+    // 回显已上传的证明材料
+    fileList.value = dataForm.attachment
+      ? [{ name: '证明材料', url: dataForm.attachment }]
+      : []
+  } else {
+    // 新增模式：重置为空
+    title.value = '新增综合表彰'
+    Object.assign(dataForm, {
+      honor: '',
+      honorCompany: '',
+      year: '',
+      attachment: '',
+      state: '',
+      teacherName: '',
+      id: ''
+    })
+    fileList.value = []
+  }
+  
+  // 公共设置：每次打开都重置上传地址
+  url.value = `/professional/file/teacherAboutInfoUpload?type=4`
+  
+  // 公共操作：加载字典数据并显示对话框
+  await initDicData()
+  showForm.value = true
+  dialogVisible.value = true
 }
 
 // 提交表单
 const dialogSubmit = async () => {
   if (!formRef.value) return
   
-  // 验证证明材料是否上传（与 MultiDialog 保持一致）
-  if (!dataForm.attachment && !dataForm.materialA) {
-    message.warning("请上传证明材料")
-    return
-  }
-  
   await formRef.value.validate(async (valid: boolean) => {
     if (valid) {
       submitLoading.value = true
       try {
         // 统一使用 addObj 接口（新增和编辑都使用同一个接口）
-        // 确保 attachment 或 materialA 有值
-        if (!dataForm.attachment && dataForm.materialA) {
-          dataForm.attachment = dataForm.materialA
-        }
-        
-        if (dataForm.id) {
-          // 编辑模式
-          dataForm.state = '0'
-          await addObj(dataForm)
-          message.success("修改成功")
-        } else {
-          // 新增模式
-          await addObj(dataForm)
-          message.success("提交成功")
-        }
+        await addObj(dataForm)
+        message.success(dataForm.id ? "修改成功" : "提交成功")
         dialogVisible.value = false
         emit('refreshData')
       } catch (error: any) {
diff --git a/src/views/professional/professionalteacherhonor/index.vue b/src/views/professional/professionalteacherhonor/index.vue
index 912bd73..872b84a 100755
--- a/src/views/professional/professionalteacherhonor/index.vue
+++ b/src/views/professional/professionalteacherhonor/index.vue
@@ -90,7 +90,7 @@
         
         <el-table-column label="姓名/工号" min-width="150" align="center">
           <template #default="scope">
-            <TeacherNameNo :name="scope.row.teacherName" :no="scope.row.teacherNo" />
+            <TeacherNameNo :name="scope.row.realName" :no="scope.row.teacherNo" />
           </template>
         </el-table-column>
         
@@ -157,8 +157,15 @@
         @size-change="sizeChangeHandle"
       />
 
+      <!-- 材料预览：图片直接显示，PDF 在组件内部 dialog 中显示 -->
+      <auth-img 
+        v-for="src in imgUrl" 
+        :key="src.title" 
+        :authSrc="src.url"
+        dialog-title="综合表彰材料"
+      />
+
       <!-- 子组件 -->
-      <ShowHonorEdvince ref="showHonorEdvinceRef" />
       <ProfessionalBackResaon ref="backReasonRef" @refreshData="handleFilter" />
       <DataForm ref="dataFormRef" @refreshData="handleFilter" />
     </div>
@@ -166,7 +173,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, computed, onMounted } from 'vue'
+import { ref, reactive, computed, onMounted, nextTick } from 'vue'
 import { storeToRefs } from 'pinia'
 import { useUserInfo } from '/@/stores/userInfo'
 import { BasicTableProps, useTable } from '/@/hooks/table'
@@ -181,9 +188,9 @@ import {
 import { defineAsyncComponent } from 'vue'
 const TeacherNameNo = defineAsyncComponent(() => import('/@/components/TeacherNameNo/index.vue'))
 const AuditState = defineAsyncComponent(() => import('/@/components/AuditState/index.vue'))
-const ShowHonorEdvince = defineAsyncComponent(() => import('./showHonorEdvince.vue'))
 const ProfessionalBackResaon = defineAsyncComponent(() => import('/@/views/professional/common/professional-back-resaon.vue'))
 const DataForm = defineAsyncComponent(() => import('./form.vue'))
+const authImg = defineAsyncComponent(() => import('/@/components/tools/auth-img.vue'))
 
 // 使用 Pinia store
 const userInfoStore = useUserInfo()
@@ -216,7 +223,6 @@ const auditStateOptions: StateOption[] = [
 // 表格引用
 const tableRef = ref()
 const searchFormRef = ref()
-const showHonorEdvinceRef = ref()
 const backReasonRef = ref()
 const dataFormRef = ref()
 const showSearch = ref(true)
@@ -228,6 +234,9 @@ const search = reactive({
   teacherName: ''
 })
 
+// 材料预览
+const imgUrl = ref<Array<{ title: string; url: string }>>([])
+
 // 导出加载状态
 const exportLoading = ref(false)
 
@@ -247,9 +256,18 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 
 const { getDataList, currentChangeHandle, sizeChangeHandle, tableStyle } = useTable(state)
 
-// 查看证明材料
+// 查看证明材料：构造预览列表，交给 auth-img 处理
 const showEdvince = (row: any) => {
-  showHonorEdvinceRef.value?.init(row)
+  imgUrl.value = []
+  nextTick(() => {
+    const list = row.attachment ? [row.attachment] : []
+    list.forEach(v => {
+      imgUrl.value.push({
+        title: '',
+        url: v
+      })
+    })
+  })
 }
 
 // 审核状态变更
diff --git a/src/views/professional/professionalteacherhonor/showHonorEdvince.vue b/src/views/professional/professionalteacherhonor/showHonorEdvince.vue
deleted file mode 100644
index 7193f69..0000000
--- a/src/views/professional/professionalteacherhonor/showHonorEdvince.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <el-dialog v-model="visible" width="90%" append-to-body title="综合表彰材料">
-    <auth-img 
-      v-for="src in imgUrl" 
-      :key="src.title" 
-      :authSrc="src.url" 
-      style="height:1000px;"
-    />
-  </el-dialog>
-</template>
-
-<script setup lang="ts">
-import { ref, nextTick } from 'vue'
-import authImg from '/@/components/tools/auth-img.vue'
-
-interface ImageItem {
-  title: string
-  url: string
-}
-
-const visible = ref(false)
-const row = ref<any>({})
-const imgUrl = ref<ImageItem[]>([])
-
-const init = (rowData: any) => {
-  row.value = rowData
-  imgUrl.value = []
-  nextTick(() => {
-    const obj: ImageItem = {
-      title: '',
-      url: row.value.attachment
-    }
-    imgUrl.value.push(obj)
-    visible.value = true
-  })
-}
-
-defineExpose({
-  init
-})
-</script>
-
-<style scoped lang="scss">
-</style>
diff --git a/src/views/professional/professionaltitlerelation/form.vue b/src/views/professional/professionaltitlerelation/form.vue
index 19c1123..14532ff 100644
--- a/src/views/professional/professionaltitlerelation/form.vue
+++ b/src/views/professional/professionaltitlerelation/form.vue
@@ -149,6 +149,9 @@ const formRules = {
   certificateNumber: [
     { required: true, message: '请输入证书编号', trigger: 'blur' },
     { pattern: /^[A-Za-z0-9]+$/, message: '证书编号只能包含英文和数字', trigger: 'blur' }
+  ],
+  evidence: [
+    { required: true, message: '请上传证明材料', trigger: 'change' }
   ]
 }
 
@@ -216,6 +219,8 @@ const materiaUploadSuccess = (response: any) => {
   }
   // 统一使用 evidence 字段存储证明材料URL（与后端API一致）
   dataForm.evidence = response.data.url
+  // 上传成功后清除该字段的验证错误
+  formRef.value?.clearValidate('evidence')
 }
 
 // 打开对话框
@@ -275,12 +280,6 @@ const openDialog = async (row?: any) => {
 const dialogSubmit = async () => {
   if (!formRef.value) return
   
-  // 验证证明材料是否上传
-  if (!dataForm.evidence) {
-    message.warning("请上传证明材料")
-    return
-  }
-  
   await formRef.value.validate(async (valid: boolean) => {
     if (valid) {
       submitLoading.value = true
@@ -293,7 +292,7 @@ const dialogSubmit = async () => {
           inOfficeDate: dataForm.inOfficeDate,
           certificateNumber: dataForm.certificateNumber,
           evidence: dataForm.evidence,
-          state: '0' // 待审核
+          state: '' // 待审核
         }
         
         // 编辑时需要传递 id
diff --git a/src/views/professional/professionaltitlerelation/index.vue b/src/views/professional/professionaltitlerelation/index.vue
index 7d6302f..4bdcbee 100755
--- a/src/views/professional/professionaltitlerelation/index.vue
+++ b/src/views/professional/professionaltitlerelation/index.vue
@@ -201,15 +201,13 @@
         @size-change="sizeChangeHandle"
       />
 
-      <!-- 材料预览对话框 -->
-      <el-dialog v-model="dialogVisible" title="职称材料" append-to-body width="90%">
-        <auth-img 
-          v-for="src in imgUrl" 
-          :key="src.title" 
-          :authSrc="src.url" 
-          style="height:1000px;"
-        />
-      </el-dialog>
+      <!-- 材料预览：图片直接显示，PDF 在组件内部 dialog 中显示 -->
+      <auth-img 
+        v-for="src in imgUrl" 
+        :key="src.title" 
+        :authSrc="src.url"
+        dialog-title="职称材料"  
+      />
 
       <!-- 子组件 -->
       <MultiDialog ref="multiDialogRef" @getList="getDataList" :page="state.pagination" :nowRow="null" />
@@ -283,7 +281,6 @@ const search = reactive({
 })
 
 // 材料预览
-const dialogVisible = ref(false)
 const imgUrl = ref<Array<{ title: string; url: string }>>([])
 
 // 导出加载状态
@@ -328,9 +325,6 @@ const handlePreview = (list: string[]) => {
         url: v
       })
     })
-    nextTick(() => {
-      dialogVisible.value = true
-    })
   })
 }
 
diff --git a/src/views/professional/teacherbase/multiDialog.vue b/src/views/professional/teacherbase/multiDialog.vue
index 8177725..a702de1 100644
--- a/src/views/professional/teacherbase/multiDialog.vue
+++ b/src/views/professional/teacherbase/multiDialog.vue
@@ -393,7 +393,7 @@
           type="date"
           placeholder="选择日期"
           format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd HH:mm:ss"
           style="width: 100%"
         />
       </el-form-item>