ren

2026-01-07 16:17:49 +08:00
parent e1cb334fbf
commit 9490c6670c
21 changed files with 642 additions and 603 deletions
--- 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) {
--- 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
+      })
+    })
+  })
 }

 // 审核状态变更
--- a/src/views/professional/professionalteacherhonor/showHonorEdvince.vue
+++ b/src/views/professional/professionalteacherhonor/showHonorEdvince.vue
@@ -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>