人员管理

src/views/professional/professionaltitlerelation/form.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-model="visible" 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"
@@ -66,15 +66,17 @@
         <el-form-item label="证书编号" prop="certificateNumber">
           <el-input
             v-model="dataForm.certificateNumber"
-            placeholder="请输入证书编号"
+            placeholder="请输入证书编号（仅支持英文和数字）"
             clearable
+            show-word-limit 
+            maxlength="32"
+            @input="handleCertificateNumberInput"
           />
         </el-form-item>
 
         <el-form-item label="证明材料" prop="materialA">
           <el-upload
             :headers="headers"
-            style="width:3.5cm;height:5.3cm;"
             :limit="1"
             :action="url"
             :file-list="fileList"
@@ -83,7 +85,9 @@
           >
             <el-button size="small" type="primary">点击上传</el-button>
             <template #tip>
-              <el-tag>仅支持jpg,jpeg,png,pdf后缀的文件上传</el-tag>
+              <div style="margin-top: 8px;">
+                <el-tag>仅支持jpg,jpeg,png,pdf后缀的文件上传</el-tag>
+              </div>
             </template>
           </el-upload>
         </el-form-item>
@@ -92,7 +96,7 @@
     
     <template #footer>
       <div class="dialog-footer">
-        <el-button @click="visible = false">取消</el-button>
+        <el-button @click="dialogVisible = false">取消</el-button>
         <el-button type="primary" @click="dialogSubmit" :loading="submitLoading">确定</el-button>
       </div>
     </template>
@@ -103,17 +107,14 @@
 import { ref, reactive, computed } from 'vue'
 import { Session } from '/@/utils/storage'
 import { useMessage } from '/@/hooks/message'
-import { getAllInfoAboutList } from '/@/api/professional/teacherbase'
+import { getProfessionalTitleList } from '/@/api/professional/rsbase/professionaltitlelevelconfig'
+import { getMajorStationList } from '/@/api/professional/rsbase/professionalmajorstation'
 import { putObj } from '/@/api/professional/professionaluser/professionaltitlerelation'
-
-// Props
-const props = defineProps<{
-  visible?: boolean
-}>()
+import { getMyTeacherNo, updateOtherInfo } from '/@/api/professional/professionaluser/teacherbase'
+import { checkLocked } from '/@/api/professional/professionalstatuslock'
 
 // Emits
 const emit = defineEmits<{
-  (e: 'update:visible', value: boolean): void
   (e: 'refreshData'): void
 }>()
 
@@ -124,11 +125,8 @@ const message = useMessage()
 const formRef = ref()
 const submitLoading = ref(false)
 
-// 对话框显示状态
-const visible = computed({
-  get: () => props.visible || false,
-  set: (val) => emit('update:visible', val)
-})
+// 对话框显示状态（内部管理）
+const dialogVisible = ref(false)
 
 // 表单数据
 const dataForm = reactive({
@@ -156,35 +154,18 @@ const formRules = {
     { required: true, message: '请选择取证时间', trigger: 'change' }
   ],
   certificateNumber: [
-    { required: true, message: '请输入证书编号', trigger: 'blur' }
+    { required: true, message: '请输入证书编号', trigger: 'blur' },
+    { pattern: /^[A-Za-z0-9]+$/, message: '证书编号只能包含英文和数字', trigger: 'blur' }
   ]
 }
 
 // 基础信息
 const baseInfoAbout = reactive<{
-  stationTypeList: any[]
-  atStationList: any[]
-  teacherTypeList: any[]
-  employmentNatureList: any[]
-  stationLevelList: any[]
-  stationDutyLevelList: any[]
-  workTypeList: any[]
   proTitleList: any[]
   majorStationList: any[]
-  qualificationList: any[]
-  partBranchList: any[]
 }>({
-  stationTypeList: [],
-  atStationList: [],
-  teacherTypeList: [],
-  employmentNatureList: [],
-  stationLevelList: [],
-  stationDutyLevelList: [],
-  workTypeList: [],
   proTitleList: [],
-  majorStationList: [],
-  qualificationList: [],
-  partBranchList: []
+  majorStationList: []
 })
 
 // 上传相关
@@ -210,66 +191,142 @@ const majorStationList = computed(() => baseInfoAbout.majorStationList as any[])
 // 初始化字典数据
 const initDicData = async () => {
   try {
-    const response = await getAllInfoAboutList()
-    const map = response.data.data
-    baseInfoAbout.stationTypeList = map['stationTypeList'] || []
-    baseInfoAbout.atStationList = map['atStationList'] || []
-    baseInfoAbout.teacherTypeList = map['teacherTypeList'] || []
-    baseInfoAbout.employmentNatureList = map['employmentNatureList'] || []
-    baseInfoAbout.stationLevelList = map['stationLevelList'] || []
-    baseInfoAbout.stationDutyLevelList = map['stationDutyLevelList'] || []
-    baseInfoAbout.workTypeList = map['workTypeList'] || []
-    baseInfoAbout.proTitleList = map['proTitleList'] || []
-    baseInfoAbout.majorStationList = map['majorStationList'] || []
-    baseInfoAbout.qualificationList = map['qualificationList'] || []
-    baseInfoAbout.partBranchList = map['partBranchList'] || []
-    visible.value = true
+    const [titleResponse, stationResponse] = await Promise.all([
+      getProfessionalTitleList(),
+      getMajorStationList()
+    ])
+    
+    // 处理职称列表（与 index.vue 保持一致）
+    if (titleResponse && titleResponse.data) {
+      baseInfoAbout.proTitleList = titleResponse.data
+    }
+    
+    // 处理专业技术职务列表（与 index.vue 保持一致）
+    if (stationResponse && stationResponse.data) {
+      baseInfoAbout.majorStationList = stationResponse.data
+    }
   } catch (error) {
-    // 获取字典数据失败
+    message.error('获取字典数据失败')
   }
 }
 
+// 证书编号输入处理（只允许英文和数字）
+const handleCertificateNumberInput = (value: string) => {
+  dataForm.certificateNumber = value.replace(/[^A-Za-z0-9]/g, '')
+}
+
 // 文件上传成功
 const materiaUploadSuccess = (response: any) => {
   if (response.data && response.data.code === "-1") {
     message.error("当前不允许上传文件")
     return
   }
+  // 统一使用 evidence 字段存储证明材料URL（与后端API一致）
   dataForm.evidence = response.data.url
+  dataForm.materialA = response.data.url
 }
 
 // 打开对话框
-const openDialog = (row: any) => {
-  url.value = `/professional/file/teacherAboutInfoUpload?teacherNo=${row.teacherNo}&type=2`
-  fileList.value = []
-  Object.assign(dataForm, {
-    professionalTitleConfigId: row.professionalTitleConfigId || '',
-    majorStation: row.majorStation || '',
-    certificateTime: row.certificateTime || '',
-    inOfficeDate: row.inOfficeDate || '',
-    certificateNumber: row.certificateNumber || '',
-    materialA: row.materialA || '',
-    evidence: row.evidence || '',
-    state: row.state || '',
-    teacherNo: row.teacherNo || '',
-    id: row.id || ''
-  })
-  showForm.value = true
-  initDicData()
+const openDialog = async (row?: any) => {
+  // 新增时 row 可能为 null 或 undefined
+  if (row && row.teacherNo) {
+    // 编辑模式：使用传入的 teacherNo（编辑不需要检查锁定）
+    url.value = `/professional/file/teacherAboutInfoUpload?teacherNo=${row.teacherNo}&type=2`
+    Object.assign(dataForm, {
+      professionalTitleConfigId: row.professionalTitleConfigId || '',
+      majorStation: row.majorStation || '',
+      certificateTime: row.certificateTime || '',
+      inOfficeDate: row.inOfficeDate || '',
+      certificateNumber: row.certificateNumber || '',
+      materialA: row.materialA || '',
+      evidence: row.evidence || '',
+      state: row.state || '',
+      teacherNo: row.teacherNo || '',
+      id: row.id || ''
+    })
+    fileList.value = []
+    // 先加载字典数据，再显示表单
+    await initDicData()
+    showForm.value = true
+    dialogVisible.value = true
+  } else {
+    // 新增模式：先检查是否锁定，再获取当前用户的 teacherNo
+    try {
+      const lockResponse = await checkLocked('title')
+      if (lockResponse.data) {
+        // 已锁定
+        message.warning("新增功能已锁定，暂不允许操作")
+        return
+      }
+      
+      // 未锁定，继续获取 teacherNo
+      const response = await getMyTeacherNo()
+      const teacherNo = response.data
+      url.value = `/professional/file/teacherAboutInfoUpload?teacherNo=${teacherNo}&type=2`
+      Object.assign(dataForm, {
+        professionalTitleConfigId: '',
+        majorStation: '',
+        certificateTime: '',
+        inOfficeDate: '',
+        certificateNumber: '',
+        materialA: '',
+        evidence: '',
+        state: '',
+        teacherNo: teacherNo,
+        id: ''
+      })
+      fileList.value = []
+      // 先加载字典数据，再显示表单
+      await initDicData()
+      showForm.value = true
+      dialogVisible.value = true
+    } catch (error) {
+      message.error('获取教师编号失败')
+      return
+    }
+  }
 }
 
 // 提交表单
 const dialogSubmit = async () => {
   if (!formRef.value) return
   
+  // 验证证明材料是否上传（与 MultiDialog 保持一致）
+  if (!dataForm.evidence && !dataForm.materialA) {
+    message.warning("请上传证明材料")
+    return
+  }
+  
   await formRef.value.validate(async (valid: boolean) => {
     if (valid) {
       submitLoading.value = true
       try {
-        dataForm.state = '0'
-        await putObj(dataForm)
-        message.success("操作成功")
-        visible.value = false
+        if (dataForm.id) {
+          // 编辑：使用 putObj 接口（管理员编辑）
+          dataForm.state = '0'
+          await putObj(dataForm)
+          message.success("修改成功")
+        } else {
+          // 新增：使用 updateOtherInfo 接口（与 MultiDialog 保持一致）
+          const submitData: any = {
+            type: 2, // 职称类型
+            teacherNo: dataForm.teacherNo,
+            professionalTitleConfigId: dataForm.professionalTitleConfigId,
+            majorStation: dataForm.majorStation,
+            certificateTime: dataForm.certificateTime,
+            inOfficeDate: dataForm.inOfficeDate,
+            certificateNumber: dataForm.certificateNumber,
+            mateA: dataForm.evidence || dataForm.materialA // 使用 mateA 字段（与 MultiDialog 一致）
+          }
+          
+          const res = await updateOtherInfo(submitData)
+          if (res.data == '-1') {
+            message.warning("当前不允许提交")
+          } else {
+            message.success("提交成功")
+          }
+        }
+        dialogVisible.value = false
         emit('refreshData')
       } catch (error: any) {
         message.error(error?.msg || '操作失败')

src/views/professional/professionaltitlerelation/index.vue

@@ -1,41 +1,6 @@
 <template>
   <div class="layout-padding">
     <div class="layout-padding-auto layout-padding-view">
-      <!-- 图表统计 -->
-      <div style="text-align: right; margin-bottom: 20px;">
-        <el-collapse accordion @change="initChartOption">
-          <el-collapse-item title="职称统计">
-            <div style="width: 100%">
-              <el-row :gutter="24">
-                <el-col :span="12">
-                  <v-chart ref="titleChartRef" style="width: 100%; height: 400px;" :option="titleChartOption" />
-                </el-col>
-                <el-col :span="12">
-                  <el-table :data="titleChartTableData" border show-summary style="width: 100%">
-                    <el-table-column prop="name" label="职称" width="180" align="center" />
-                    <el-table-column prop="value" label="人数" width="180" align="center" />
-                    <el-table-column prop="rate" label="比例" width="180" align="center" />
-                  </el-table>
-                </el-col>
-              </el-row>
-
-              <el-row :gutter="24" style="margin-top: 20px;">
-                <el-col :span="12">
-                  <v-chart ref="techChartRef" style="width: 100%; height: 400px;" :option="techChartOption" />
-                </el-col>
-                <el-col :span="12">
-                  <el-table :data="techChartTableData" border show-summary style="width: 100%">
-                    <el-table-column prop="name" label="技术职务" width="180" align="center" />
-                    <el-table-column prop="value" label="人数" width="180" align="center" />
-                    <el-table-column prop="rate" label="比例" width="180" align="center" />
-                  </el-table>
-                </el-col>
-              </el-row>
-            </div>
-          </el-collapse-item>
-        </el-collapse>
-      </div>
-
       <!-- 搜索表单 -->
       <search-form 
         v-show="showSearch" 
@@ -49,7 +14,6 @@
               <el-select
                 v-model="search.state"
                 clearable
-                style="width: 200px"
                 placeholder="请选择审核状态"
               >
                 <el-option
@@ -65,7 +29,6 @@
               <el-input
                 v-model="search.teacherNo"
                 clearable
-                style="width: 200px"
                 placeholder="请输入工号"
               />
             </el-form-item>
@@ -74,7 +37,6 @@
               <el-input
                 v-model="search.realName"
                 clearable
-                style="width: 200px"
                 placeholder="请输入姓名"
               />
             </el-form-item>
@@ -84,7 +46,6 @@
                 v-model="search.professionalTitleConfigId"
                 clearable
                 filterable
-                style="width: 200px"
                 placeholder="请选择职称"
               >
                 <el-option
@@ -101,7 +62,6 @@
                 v-model="search.majorStation"
                 clearable
                 filterable
-                style="width: 200px"
                 placeholder="请选择专业技术职务"
               >
                 <el-option
@@ -134,7 +94,9 @@
             v-if="permissions.professional_professionaltitlerelation_add">新 增
           </el-button>
           <el-button 
-            type="success"
+            class="ml10"
+            type="warning"
+            plain
             icon="Download"
             v-if="permissions.professional_teacherbase_export"
             @click="handleDownLoadWord"
@@ -188,7 +150,7 @@
               v-if="scope.row.evidence && scope.row.evidence !== ''" 
               type="primary"
               link
-              icon="View"
+              icon="Document"
               @click="handlePreview(scope.row.srcList)">查看
             </el-button>
             <span v-else>-</span>
@@ -209,14 +171,14 @@
             <el-button 
               type="success"
               link
-              icon="check"
+              icon="CircleCheck"
               v-if="permissions.professional_professionaltitlerelation_exam && scope.row.state === '0'"
               @click="changeState(scope.row, 1)">通过
             </el-button>
             <el-button 
               type="danger"
               link
-              icon="close"
+              icon="CircleClose"
               v-if="permissions.professional_professionaltitlerelation_exam && (scope.row.state === '0' || scope.row.state === '1')"
               @click="changeState(scope.row, -2)">驳回
             </el-button>
@@ -265,21 +227,17 @@ import { BasicTableProps, useTable } from '/@/hooks/table'
 import { useMessage } from '/@/hooks/message'
 import { useMessageBox } from '/@/hooks/message'
 import { useDict } from '/@/hooks/dict'
-import VChart from 'vue-echarts'
-import { use } from 'echarts/core'
-import { PieChart } from 'echarts/charts'
-import { TooltipComponent, LegendComponent } from 'echarts/components'
-import { CanvasRenderer } from 'echarts/renderers'
+// 接口
 import { 
   fetchList, 
   putObj, 
   delObj, 
-  getChartOption,
   exportRelation
 } from '/@/api/professional/professionaluser/professionaltitlerelation'
 import { getProfessionalTitleList } from '/@/api/professional/rsbase/professionaltitlelevelconfig'
 import { getMajorStationList } from '/@/api/professional/rsbase/professionalmajorstation'
 import { defineAsyncComponent } from 'vue'
+// 子组件
 const TeacherNameNo = defineAsyncComponent(() => import('/@/components/TeacherNameNo/index.vue'))
 const AuditState = defineAsyncComponent(() => import('/@/components/AuditState/index.vue'))
 const MultiDialog = defineAsyncComponent(() => import('/@/views/professional/teacherbase/multiDialog.vue'))
@@ -287,9 +245,6 @@ const DataForm = defineAsyncComponent(() => import('./form.vue'))
 const ProfessionalBackResaon = defineAsyncComponent(() => import('/@/views/professional/common/professional-back-resaon.vue'))
 const authImg = defineAsyncComponent(() => import('/@/components/tools/auth-img.vue'))
 
-// 注册 ECharts 组件
-use([TooltipComponent, LegendComponent, PieChart, CanvasRenderer])
-
 // 使用 Pinia store
 const userInfoStore = useUserInfo()
 const { userInfos } = storeToRefs(userInfoStore)
@@ -316,8 +271,6 @@ const searchFormRef = ref()
 const multiDialogRef = ref()
 const dataFormRef = ref()
 const backReasonRef = ref()
-const titleChartRef = ref()
-const techChartRef = ref()
 const showSearch = ref(true)
 
 // 搜索表单数据
@@ -329,12 +282,6 @@ const search = reactive({
   majorStation: ''
 })
 
-// 图表数据
-const titleChartOption = ref<any>({})
-const titleChartTableData = ref<any[]>([])
-const techChartOption = ref<any>({})
-const techChartTableData = ref<any[]>([])
-
 // 材料预览
 const dialogVisible = ref(false)
 const imgUrl = ref<Array<{ title: string; url: string }>>([])
@@ -371,54 +318,6 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 
 const { getDataList, currentChangeHandle, sizeChangeHandle, tableStyle } = useTable(state)
 
-// 初始化图表
-const initChartOption = async () => {
-  try {
-    const response = await getChartOption()
-    const data = response.data.data || {}
-    
-    // 职称图表
-    titleChartOption.value = data.titleOption || {}
-    let titleTotal = 0
-    if (titleChartOption.value.series && titleChartOption.value.series[0] && titleChartOption.value.series[0].data) {
-      titleChartOption.value.series[0].data.forEach((item: any) => {
-        titleTotal += item.value || 0
-      })
-      
-      titleChartTableData.value = []
-      titleChartOption.value.series[0].data.forEach((item: any) => {
-        const rate = titleTotal > 0 ? Number((item.value / titleTotal * 100).toFixed(1)) : 0
-        titleChartTableData.value.push({
-          name: item.name,
-          value: item.value,
-          rate: `${rate}%`
-        })
-      })
-    }
-    
-    // 技术职务图表
-    techChartOption.value = data.techOption || {}
-    let techTotal = 0
-    if (techChartOption.value.series && techChartOption.value.series[0] && techChartOption.value.series[0].data) {
-      techChartOption.value.series[0].data.forEach((item: any) => {
-        techTotal += item.value || 0
-      })
-      
-      techChartTableData.value = []
-      techChartOption.value.series[0].data.forEach((item: any) => {
-        const rate = techTotal > 0 ? Number((item.value / techTotal * 100).toFixed(1)) : 0
-        techChartTableData.value.push({
-          name: item.name,
-          value: item.value,
-          rate: `${rate}%`
-        })
-      })
-    }
-  } catch (error) {
-    // Failed to load chart data
-  }
-}
-
 // 预览材料
 const handlePreview = (list: string[]) => {
   imgUrl.value = []
@@ -477,7 +376,7 @@ const resetQuery = () => {
 
 // 打开新增窗口
 const handleAdd = () => {
-  multiDialogRef.value?.init(2)
+  dataFormRef.value?.openDialog()
 }
 
 // 打开编辑窗口

src/views/professional/professionaltitlerelation/statistics.vue

@@ -0,0 +1,119 @@
+<template>
+  <div class="layout-padding">
+    <div class="layout-padding-auto layout-padding-view">
+      <!-- 页面标题 -->
+      <div style="margin-bottom: 20px;">
+        <h2 style="margin: 0; font-size: 20px; font-weight: 600; color: #303133;">职称统计</h2>
+      </div>
+
+      <!-- 图表统计 -->
+      <div style="width: 100%">
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <v-chart ref="titleChartRef" style="width: 100%; height: 400px;" :option="titleChartOption" />
+          </el-col>
+          <el-col :span="12">
+            <el-table :data="titleChartTableData" border show-summary style="width: 100%">
+              <el-table-column prop="name" label="职称" width="180" align="center" />
+              <el-table-column prop="value" label="人数" width="180" align="center" />
+              <el-table-column prop="rate" label="比例" width="180" align="center" />
+            </el-table>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24" style="margin-top: 20px;">
+          <el-col :span="12">
+            <v-chart ref="techChartRef" style="width: 100%; height: 400px;" :option="techChartOption" />
+          </el-col>
+          <el-col :span="12">
+            <el-table :data="techChartTableData" border show-summary style="width: 100%">
+              <el-table-column prop="name" label="技术职务" width="180" align="center" />
+              <el-table-column prop="value" label="人数" width="180" align="center" />
+              <el-table-column prop="rate" label="比例" width="180" align="center" />
+            </el-table>
+          </el-col>
+        </el-row>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import VChart from 'vue-echarts'
+import { use } from 'echarts/core'
+import { PieChart } from 'echarts/charts'
+import { TooltipComponent, LegendComponent } from 'echarts/components'
+import { CanvasRenderer } from 'echarts/renderers'
+import { getChartOption } from '/@/api/professional/professionaluser/professionaltitlerelation'
+
+// 注册 ECharts 组件
+use([TooltipComponent, LegendComponent, PieChart, CanvasRenderer])
+
+// 图表引用
+const titleChartRef = ref()
+const techChartRef = ref()
+
+// 图表数据
+const titleChartOption = ref<any>({})
+const titleChartTableData = ref<any[]>([])
+const techChartOption = ref<any>({})
+const techChartTableData = ref<any[]>([])
+
+// 初始化图表
+const initChartOption = async () => {
+  try {
+    const response = await getChartOption()
+    const data = response.data.data || {}
+    
+    // 职称图表
+    titleChartOption.value = data.titleOption || {}
+    let titleTotal = 0
+    if (titleChartOption.value.series && titleChartOption.value.series[0] && titleChartOption.value.series[0].data) {
+      titleChartOption.value.series[0].data.forEach((item: any) => {
+        titleTotal += item.value || 0
+      })
+      
+      titleChartTableData.value = []
+      titleChartOption.value.series[0].data.forEach((item: any) => {
+        const rate = titleTotal > 0 ? Number((item.value / titleTotal * 100).toFixed(1)) : 0
+        titleChartTableData.value.push({
+          name: item.name,
+          value: item.value,
+          rate: `${rate}%`
+        })
+      })
+    }
+    
+    // 技术职务图表
+    techChartOption.value = data.techOption || {}
+    let techTotal = 0
+    if (techChartOption.value.series && techChartOption.value.series[0] && techChartOption.value.series[0].data) {
+      techChartOption.value.series[0].data.forEach((item: any) => {
+        techTotal += item.value || 0
+      })
+      
+      techChartTableData.value = []
+      techChartOption.value.series[0].data.forEach((item: any) => {
+        const rate = techTotal > 0 ? Number((item.value / techTotal * 100).toFixed(1)) : 0
+        techChartTableData.value.push({
+          name: item.name,
+          value: item.value,
+          rate: `${rate}%`
+        })
+      })
+    }
+  } catch (error) {
+    // Failed to load chart data
+  }
+}
+
+// 页面加载时初始化图表
+onMounted(() => {
+  initChartOption()
+})
+</script>
+
+<style lang="scss" scoped>
+</style>
+