ren

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) {

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
-    })
   })
 }