ren

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

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