-
+
+
-
- 点击上传
+
+ 点击上传
- 仅支持jpg,jpeg,png,pdf后缀的文件上传
+
+
-
- 点击上传
+ :on-success="materiaUploadSuccessB"
+ :accept="'.jpg,.jpeg,.png,.pdf'"
+ >
+ 点击上传
- 仅支持jpg,jpeg,png,pdf后缀的文件上传
+
+
-
+
@@ -142,20 +147,15 @@
import { ref, reactive, computed } from 'vue'
import { Session } from '/@/utils/storage'
import { useMessage } from '/@/hooks/message'
-import { getAllInfoAboutList } from '/@/api/professional/teacherbase'
+import { getMyTeacherNo, updateOtherInfo } from '/@/api/professional/professionaluser/teacherbase'
import { putObj } from '/@/api/professional/professionaluser/professionalteacheracademicrelation'
import { getAllTypeList } from '/@/api/professional/rsbase/professionalacademiceducationtypeconfig'
import { getQualificationList } from '/@/api/professional/rsbase/academicqualificationsconfig'
import { getDegreeList } from '/@/api/professional/rsbase/professionalacademicdegreeconfig'
-
-// Props
-const props = defineProps<{
- visible?: boolean
-}>()
+import { checkLocked } from '/@/api/professional/professionalstatuslock'
// Emits
const emit = defineEmits<{
- (e: 'update:visible', value: boolean): void
(e: 'refreshData'): void
}>()
@@ -166,11 +166,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({
@@ -205,7 +202,8 @@ const formRules = {
{ required: true, message: '请输入所学专业', trigger: 'blur' }
],
certificateNumber: [
- { required: true, message: '请输入证书编码', trigger: 'blur' }
+ { required: true, message: '请输入证书编码', trigger: 'blur' },
+ { pattern: /^[A-Za-z0-9]+$/, message: '证书编码只能包含英文和数字', trigger: 'blur' }
]
}
@@ -214,32 +212,7 @@ const educationTypeList = ref([])
const qualificationList = ref([])
const degreeList = ref([])
-// 基础信息
-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: []
-})
+// 基础信息（简化，只保留需要的）
// 上传相关
const url = ref('')
@@ -248,7 +221,7 @@ const fileListB = ref([])
// 请求头
const headers = computed(() => {
- return {
+ return {
"Authorization": 'Bearer ' + Session.getToken()
}
})
@@ -259,26 +232,13 @@ const showForm = ref(false)
// 初始化字典数据
const initDicData = async () => {
try {
- const [response, eduRes, quaRes, degRes] = await Promise.all([
- getAllInfoAboutList(),
+ // 使用专门的 API 获取数据（与 index.vue 保持一致）
+ const [eduRes, quaRes, degRes] = await Promise.all([
getAllTypeList(),
getQualificationList(),
getDegreeList()
])
- 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'] || []
-
// 获取教育类型列表
if (eduRes && eduRes.data) {
educationTypeList.value = Array.isArray(eduRes.data)
@@ -299,13 +259,16 @@ const initDicData = async () => {
? degRes.data
: (degRes.data.records || degRes.data.list || [])
}
-
- visible.value = true
} catch (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") {
@@ -319,48 +282,127 @@ const materiaUploadSuccess = (response: any) => {
const materiaUploadSuccessB = (response: any) => {
if (response.data && response.data.code === "-1") {
message.error("当前不允许上传文件")
- return
- }
+ return
+ }
dataForm.degreeImg = response.data.url
}
// 打开对话框
-const openDialog = (row: any) => {
- 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
- initDicData()
+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
+ 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
+ }
+ }
}
// 提交表单
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 {
- 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 保持一致）
+ // 注意：MultiDialog 中 type 字段在提交时会被设置为 val（1），但表单中也有 type 字段用于教育类型
+ // 这里直接使用 dataForm 的所有字段，后端应该能够处理
+ const submitData: any = {
+ type: 1, // 学历更新类型（固定值，会覆盖表单中的 type）
+ teacherNo: dataForm.teacherNo,
+ graduateTime: dataForm.graduateTime,
+ qualificationConfigId: dataForm.qualificationConfigId,
+ degreeConfigId: dataForm.degreeConfigId,
+ graduateSchool: dataForm.graduateSchool,
+ major: dataForm.major,
+ certificateNumber: dataForm.certificateNumber,
+ mateA: dataForm.qualificationImg || dataForm.materialA, // 学历证书
+ mateB: dataForm.degreeImg || dataForm.materialB // 学位证书
+ }
+
+ // 注意：MultiDialog 中教育类型字段也是 type，但在提交时会被覆盖为 val（1）
+ // 如果后端需要教育类型，可能需要单独传递，这里先不传，保持与 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 || '操作失败')
diff --git a/src/views/professional/professionalteacheracademicrelation/index.vue b/src/views/professional/professionalteacheracademicrelation/index.vue
index 01904fb..30ecbe6 100755
--- a/src/views/professional/professionalteacheracademicrelation/index.vue
+++ b/src/views/professional/professionalteacheracademicrelation/index.vue
@@ -1,28 +1,6 @@
({})
-const chartData = ref([])
-
// 材料预览
const dialogVisible = ref(false)
const dialogTitle = ref('')
@@ -334,34 +305,6 @@ const state: BasicTableProps = reactive({
const { getDataList, currentChangeHandle, sizeChangeHandle, tableStyle } = useTable(state)
-// 初始化图表
-const initChartOption = async () => {
- try {
- const response = await getChartOption()
- chartOption.value = response.data.data || {}
-
- // 处理图表数据（如果有的话）
- if (chartOption.value.series && chartOption.value.series[0] && chartOption.value.series[0].data) {
- let total = 0
- chartOption.value.series[0].data.forEach((item: any) => {
- total += item.value || 0
- })
-
- chartData.value = []
- chartOption.value.series[0].data.forEach((item: any) => {
- const rate = total > 0 ? Number((item.value / total * 100).toFixed(1)) : 0
- chartData.value.push({
- xl: item.name,
- total: item.value,
- rate: `${rate}%`
- })
- })
- }
- } catch (error) {
- // Failed to load chart data
- }
-}
-
// 预览材料
const handlePreview = (list: string[], type: number) => {
imgUrl.value = []
@@ -425,7 +368,7 @@ const resetQuery = () => {
// 打开新增窗口
const handleAdd = () => {
- multiDialogRef.value?.init(1)
+ dataFormRef.value?.openDialog()
}
// 打开编辑窗口
diff --git a/src/views/professional/professionalteacheracademicrelation/statistics.vue b/src/views/professional/professionalteacheracademicrelation/statistics.vue
new file mode 100644
index 0000000..bfbd07e
--- /dev/null
+++ b/src/views/professional/professionalteacheracademicrelation/statistics.vue
@@ -0,0 +1,83 @@
+
+
+
点击上传
- 仅支持jpg,jpeg,png,pdf后缀的文件上传
+
@@ -63,7 +67,6 @@
点击上传
- 仅支持jpg,jpeg,png,pdf后缀的文件上传
+
@@ -81,7 +86,7 @@
@@ -92,18 +97,13 @@
import { ref, reactive, computed } from 'vue'
import { Session } from '/@/utils/storage'
import { useMessage } from '/@/hooks/message'
-import { getAllInfoAboutList } from '/@/api/professional/teacherbase'
+import { getMyTeacherNo, updateOtherInfo } from '/@/api/professional/professionaluser/teacherbase'
import { putObj } from '/@/api/professional/professionaluser/professionalteachercertificaterelation'
import { getTeacherCertificateList } from '/@/api/professional/rsbase/professionalteachercertificateconf'
-
-// Props
-const props = defineProps<{
- visible?: boolean
-}>()
+import { checkLocked } from '/@/api/professional/professionalstatuslock'
// Emits
const emit = defineEmits<{
- (e: 'update:visible', value: boolean): void
(e: 'refreshData'): void
}>()
@@ -114,11 +114,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({
@@ -143,39 +140,15 @@ 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 teacherCertificateList = ref([])
-// 基础信息
-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: []
-})
+// 基础信息（简化，只保留需要的）
// 上传相关
const url = ref('')
@@ -195,23 +168,8 @@ const showForm = ref(false)
// 初始化字典数据
const initDicData = async () => {
try {
- const [response, certResponse] = await Promise.all([
- getAllInfoAboutList(),
- getTeacherCertificateList()
- ])
-
- 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'] || []
+ // 使用专门的 API 获取数据（与 index.vue 保持一致）
+ const certResponse = await getTeacherCertificateList()
// 获取教师资格证列表
if (certResponse && certResponse.data) {
@@ -219,13 +177,16 @@ const initDicData = async () => {
? certResponse.data
: (certResponse.data.records || certResponse.data.list || [])
}
-
- visible.value = true
} catch (error) {
// 获取字典数据失败
}
}
+// 证书编号输入处理（只允许英文和数字）
+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") {
@@ -245,38 +206,104 @@ const materiaUploadSuccessB = (response: any) => {
}
// 打开对话框
-const openDialog = (row: any) => {
- 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
- initDicData()
+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
+ 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
+ }
+ }
}
// 提交表单
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 {
- 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 保持一致）
+ // 注意：MultiDialog 的 type=0 表单只有 certificateConfId 和 certificateNumber，没有 certificateTime
+ const submitData: any = {
+ type: 0, // 教师资格证类型
+ teacherNo: dataForm.teacherNo,
+ certificateConfId: dataForm.certificateConfId,
+ certificateNumber: dataForm.certificateNumber,
+ mateA: dataForm.evidenceA || 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 || '操作失败')
diff --git a/src/views/professional/professionalteachercertificaterelation/index.vue b/src/views/professional/professionalteachercertificaterelation/index.vue
index 172cba8..0868d43 100755
--- a/src/views/professional/professionalteachercertificaterelation/index.vue
+++ b/src/views/professional/professionalteachercertificaterelation/index.vue
@@ -14,7 +14,6 @@
- 通过
- 驳回
- 待审核
- -
-
+
+
+
@@ -116,40 +111,44 @@
v-if="scope.row.evidenceA && scope.row.evidenceA !== ''"
type="primary"
link
+ icon="Document"
@click="handlePreview(scope.row.srcList)">查看
-
-
+
编辑
通过
驳回
删除
@@ -174,7 +173,6 @@
-
@@ -197,11 +195,20 @@ import {
exportExcel
} from '/@/api/professional/professionaluser/professionalteachercertificaterelation'
import { defineAsyncComponent } from 'vue'
-const MultiDialog = defineAsyncComponent(() => import('/@/views/professional/teacherbase/multiDialog.vue'))
+const TeacherNameNo = defineAsyncComponent(() => import('/@/components/TeacherNameNo/index.vue'))
+const AuditState = defineAsyncComponent(() => import('/@/components/AuditState/index.vue'))
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'))
+// 审核状态选项（独立定义，防止其他页面修改时被波及）
+import type { StateOption } from '/@/components/AuditState/index.vue'
+const auditStateOptions: StateOption[] = [
+ { value: '1', label: '已通过', type: 'success', icon: 'fa-solid fa-circle-check', effect: 'dark' },
+ { value: '-2', label: '已驳回', type: 'danger', icon: 'fa-solid fa-circle-xmark', effect: 'dark' },
+ { value: '0', label: '待审核', type: 'warning', icon: 'fa-regular fa-clock', effect: 'light' }
+]
+
// 使用 Pinia store
const userInfoStore = useUserInfo()
const { userInfos } = storeToRefs(userInfoStore)
@@ -225,7 +232,6 @@ const { professional_state: professionalState } = useDict('professional_state')
// 表格引用
const tableRef = ref()
const searchFormRef = ref()
-const multiDialogRef = ref()
const dataFormRef = ref()
const backReasonRef = ref()
const showSearch = ref(true)
@@ -327,7 +333,7 @@ const resetQuery = () => {
// 打开新增窗口
const handleAdd = () => {
- multiDialogRef.value?.init(0)
+ dataFormRef.value?.openDialog()
}
// 打开编辑窗口
diff --git a/src/views/professional/professionalteacherhonor/form.vue b/src/views/professional/professionalteacherhonor/form.vue
index c9d53c9..5e0d6d0 100644
--- a/src/views/professional/professionalteacherhonor/form.vue
+++ b/src/views/professional/professionalteacherhonor/form.vue
@@ -1,5 +1,5 @@
-
+
点击上传
- 仅支持jpg,jpeg,png,pdf后缀的文件上传
+
@@ -52,7 +53,7 @@
@@ -63,17 +64,12 @@
import { ref, reactive, computed } from 'vue'
import { Session } from '/@/utils/storage'
import { useMessage } from '/@/hooks/message'
-import { getAllInfoAboutList } from '/@/api/professional/teacherbase'
+import { getMyTeacherNo, updateOtherInfo } from '/@/api/professional/professionaluser/teacherbase'
import { putObj } from '/@/api/professional/professionaluser/professionalteacherhonor'
-
-// Props
-const props = defineProps<{
- visible?: boolean
-}>()
+import { checkLocked } from '/@/api/professional/professionalstatuslock'
// Emits
const emit = defineEmits<{
- (e: 'update:visible', value: boolean): void
(e: 'refreshData'): void
}>()
@@ -84,11 +80,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({
@@ -116,32 +109,7 @@ const dataRules = {
]
}
-// 基础信息
-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: []
-})
+// 基础信息（简化，只保留需要的）
// 上传相关
const url = ref('')
@@ -160,26 +128,9 @@ const showForm = ref(false)
// 标题
const title = ref('')
-// 初始化字典数据
+// 初始化字典数据（简化，不需要加载字典数据）
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
- } catch (error) {
- // 获取字典数据失败
- }
+ // 综合表彰不需要额外的字典数据
}
// 文件上传成功
@@ -192,37 +143,102 @@ const materiaUploadSuccess = (response: any) => {
}
// 打开对话框
-const openDialog = (row: any) => {
- 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
- initDicData()
+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
+ 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
+ }
+ }
}
// 提交表单
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 {
- 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: 4, // 综合表彰类型
+ teacherNo: dataForm.teacherNo,
+ honor: dataForm.honor,
+ honorCompany: dataForm.honorCompany,
+ year: dataForm.year,
+ mateA: dataForm.attachment || 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 || '操作失败')
diff --git a/src/views/professional/professionalteacherhonor/index.vue b/src/views/professional/professionalteacherhonor/index.vue
index 285c1bf..912bd73 100755
--- a/src/views/professional/professionalteacherhonor/index.vue
+++ b/src/views/professional/professionalteacherhonor/index.vue
@@ -14,7 +14,6 @@
导出
+ :loading="exportLoading">导出信息
@@ -86,18 +84,15 @@
- 通过
- 驳回
- 待审核
- -
+
-
+
+
+
编辑
通过
驳回
删除
@@ -159,10 +158,9 @@
/>
-
@@ -181,10 +179,11 @@ import {
delObj
} from '/@/api/professional/professionaluser/professionalteacherhonor'
import { defineAsyncComponent } from 'vue'
-const MultiDialog = defineAsyncComponent(() => import('/@/views/professional/teacherbase/multiDialog.vue'))
-import ShowHonorEdvince from './showHonorEdvince.vue'
-import ProfessionalBackResaon from '/@/views/professional/common/professional-back-resaon.vue'
-import DataForm from './form.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'))
// 使用 Pinia store
const userInfoStore = useUserInfo()
@@ -206,10 +205,17 @@ const messageBox = useMessageBox()
// 字典数据
const { professional_state: professionalState } = useDict('professional_state')
+// 审核状态选项（独立定义，防止其他页面修改时被波及）
+import type { StateOption } from '/@/components/AuditState/index.vue'
+const auditStateOptions: StateOption[] = [
+ { value: '1', label: '已通过', type: 'success', icon: 'fa-solid fa-circle-check', effect: 'dark' },
+ { value: '-2', label: '已驳回', type: 'danger', icon: 'fa-solid fa-circle-xmark', effect: 'dark' },
+ { value: '0', label: '待审核', type: 'warning', icon: 'fa-regular fa-clock', effect: 'light' }
+]
+
// 表格引用
const tableRef = ref()
const searchFormRef = ref()
-const multiDialogRef = ref()
const showHonorEdvinceRef = ref()
const backReasonRef = ref()
const dataFormRef = ref()
@@ -288,7 +294,7 @@ const resetQuery = () => {
// 打开新增窗口
const handleAdd = () => {
- multiDialogRef.value?.init(4)
+ dataFormRef.value?.openDialog()
}
// 打开编辑窗口
diff --git a/src/views/professional/professionalteacherstationchange/index.vue b/src/views/professional/professionalteacherstationchange/index.vue
index 1b1fab8..9bd5bc3 100755
--- a/src/views/professional/professionalteacherstationchange/index.vue
+++ b/src/views/professional/professionalteacherstationchange/index.vue
@@ -6,7 +6,7 @@
v-show="showSearch"
:model="search"
ref="searchFormRef"
- @keyup-enter="handleFilter(search)"
+ @keyup-enter="handleFilter"
>
@@ -14,7 +14,6 @@
+ 仅支持jpg,jpeg,png,pdf后缀的文件上传
+
-
+ 仅支持jpg,jpeg,png,pdf后缀的文件上传
+
-
-
-
- 通过
- 驳回
- 待审核
- -
-
+
+
+
+
-
-
+
@@ -156,40 +130,44 @@
v-if="scope.row.degreeImg && scope.row.degreeImg !== ''"
type="primary"
link
+ icon="Document"
@click="handlePreview(scope.row.deList, 2)">查看
-
-
+
编辑
通过
驳回
删除
@@ -214,7 +192,6 @@
-
@@ -229,28 +206,28 @@ 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,
exportExcel
} from '/@/api/professional/professionaluser/professionalteacheracademicrelation'
import { getDegreeList } from '/@/api/professional/rsbase/professionalacademicdegreeconfig'
import { getQualificationList } from '/@/api/professional/rsbase/academicqualificationsconfig'
import { defineAsyncComponent } from 'vue'
-const MultiDialog = defineAsyncComponent(() => import('/@/views/professional/teacherbase/multiDialog.vue'))
-import DataForm from './form.vue'
-import ProfessionalBackResaon from '/@/views/professional/common/professional-back-resaon.vue'
+const TeacherNameNo = defineAsyncComponent(() => import('/@/components/TeacherNameNo/index.vue'))
+const AuditState = defineAsyncComponent(() => import('/@/components/AuditState/index.vue'))
+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])
+// 审核状态选项（独立定义，防止其他页面修改时被波及）
+import type { StateOption } from '/@/components/AuditState/index.vue'
+const auditStateOptions: StateOption[] = [
+ { value: '1', label: '已通过', type: 'success', icon: 'fa-solid fa-circle-check', effect: 'dark' },
+ { value: '-2', label: '已驳回', type: 'danger', icon: 'fa-solid fa-circle-xmark', effect: 'dark' },
+ { value: '0', label: '待审核', type: 'warning', icon: 'fa-regular fa-clock', effect: 'light' }
+]
// 使用 Pinia store
const userInfoStore = useUserInfo()
@@ -275,10 +252,8 @@ const { professional_state: professionalState } = useDict('professional_state')
// 表格引用
const tableRef = ref()
const searchFormRef = ref()
-const multiDialogRef = ref()
const dataFormRef = ref()
const backReasonRef = ref()
-const chartRef = ref()
const showSearch = ref(true)
// 搜索表单数据
@@ -288,10 +263,6 @@ const search = reactive({
realName: ''
})
-// 图表数据
-const chartOption = ref
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/src/views/professional/professionalteachercertificaterelation/form.vue b/src/views/professional/professionalteachercertificaterelation/form.vue
index b96063b..f15932e 100644
--- a/src/views/professional/professionalteachercertificaterelation/form.vue
+++ b/src/views/professional/professionalteachercertificaterelation/form.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+ 学历统计
+
+
+
+
+
+
+
+
+
+
+
+ 仅支持jpg,jpeg,png,pdf后缀的文件上传
+
+ 仅支持jpg,jpeg,png,pdf后缀的文件上传
+
+ 仅支持jpg,jpeg,png,pdf后缀的文件上传
+
+ 点击上传
+
+ 仅支持jpg,jpeg,png,pdf后缀的文件上传
+
+
+ 点击上传
+
+ 仅支持jpg,jpeg,png,pdf后缀的文件上传
+
+
+ 点击上传
+
+ 仅支持jpg,jpeg,png,pdf后缀的文件上传
+
+
+ 点击上传
+
+ 仅支持jpg,jpeg,png,pdf后缀的文件上传
+
+
+ 点击上传
+
+ 仅支持jpg,jpeg,png,pdf后缀的文件上传
+
+
+ 点击上传
+
+ 仅支持jpg,jpeg,png,pdf后缀的文件上传
+
+
+
+
+
+
+
+
+
+```
+
+### 使用 localStorage 持久化
+
+```vue
+
+
+
+
+
+ 编辑
+
+
+
+
+
+
+
+```
+
+**优点：**
+- ✅ 无需手动配置列信息
+- ✅ 自动同步表格列的变化
+- ✅ 代码更简洁
+
+### 方式二：手动配置
+
+手动传入列配置，适合需要自定义列信息的场景。
+
+```vue
+
+
+
+
+
+
+
+
+
+```
+
+## 自动提取的配置选项
+
+```typescript
+interface AutoExtractOptions {
+ // 默认隐藏的列（prop 或 label）
+ defaultHidden?: string[]
+
+ // 始终显示的列（prop 或 label）
+ alwaysShow?: string[]
+
+ // 列配置映射（用于自定义列的显示名称等）
+ columnMap?: Record
+
+
+ {{ triggerText || '列设置' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/composables/useTableColumns.ts b/src/composables/useTableColumns.ts
new file mode 100644
index 0000000..b0db92a
--- /dev/null
+++ b/src/composables/useTableColumns.ts
@@ -0,0 +1,411 @@
+import { ref, computed, watch, onMounted, nextTick, type Ref } from 'vue'
+import type { TableInstance } from 'element-plus'
+
+export interface ColumnConfig {
+ prop?: string
+ label: string
+ width?: number | string
+ minWidth?: number | string
+ fixed?: boolean | 'left' | 'right'
+ alwaysShow?: boolean
+ [key: string]: any
+}
+
+/**
+ * 自动从 el-table 提取列配置的 composable
+ * @param tableRef el-table 的 ref
+ * @param storageKey localStorage 存储的 key，用于持久化
+ * @param options 额外配置选项
+ */
+export function useTableColumns(
+ tableRef: Ref
+
+
+
+
+
+
+
+
+
+
+ {{ isAllSelected ? '取消全选' : '全选' }}
+
+
+
+
+
+
+
+
+ {{ column.label }}
+
+
+ {{ column.fixed === 'left' ? '固定左侧' : column.fixed === 'right' ? '固定右侧' : '固定' }}
+
+
+
+ 查看
+
- 查看
-
-
- 人员调动
-
-
- 党员调动
-
-
- 允许进出
-
-
- 禁止进出
-
-
- 重置密码
-
-
-
+
+
+
-
+
+
+
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
@@ -471,20 +452,22 @@
-
+
-
+
@@ -492,7 +475,9 @@
@@ -507,7 +492,7 @@
@@ -401,6 +376,10 @@
@@ -409,7 +388,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1405,7 +1396,7 @@
import { useMessage, useMessageBox } from '/@/hooks/message'
import axios from 'axios'
// 导入图标
- import { User, Phone, Document, CreditCard, Briefcase, Flag, Plus, Edit, Delete, Connection, School, Medal, Files, Clock, Setting } from '@element-plus/icons-vue'
+ import { User, Phone, Document, CreditCard, Briefcase, Flag, Plus, Edit, Delete, Connection, School, Medal, Files, Clock, Setting, Operation, Switch, CircleCheck, CircleClose, Refresh, Download } from '@element-plus/icons-vue'
// 导入api（统一使用 /@/ 路径别名）
import {
@@ -1420,6 +1411,7 @@
updateInout,
exportTeacherInfo as exportTeacherInfoApi
} from '/@/api/professional/professionaluser/teacherbase'
+ import {getDictsByTypes} from '/@/api/admin/dict'
import {getNationalList} from '/@/api/basic/basicnation'
import {addPoliticssStatus, dePoObj} from '/@/api/professional/professionaluser/professionalpoliticsstatus'
import {addAcadeRelation, delEduObj} from '/@/api/professional/professionaluser/professionalteacheracademicrelation'
@@ -1444,7 +1436,11 @@
// 导入工具
import { Session } from '/@/utils/storage'
+ // 导入 composables（已移除，改为通过 TableColumnControl 组件暴露）
// 导入组件（使用 defineAsyncComponent 异步加载，优化性能）
+ const TeacherNameNo = defineAsyncComponent(() => import('/@/components/TeacherNameNo/index.vue'))
+ const GenderTag = defineAsyncComponent(() => import('/@/components/GenderTag/index.vue'))
+ const StatusTag = defineAsyncComponent(() => import('/@/components/StatusTag/index.vue'))
const ShowEvidence = defineAsyncComponent(() => import("../common/showEvidence.vue"));
const ShowHonorEdvince = defineAsyncComponent(() => import("../common/showHonorEdvince.vue"));
const ExportTeacherInfoDialog = defineAsyncComponent(() => import('./export-teacher-info.vue'));
@@ -1453,6 +1449,10 @@
const PoliticsDialog = defineAsyncComponent(() => import('./politics-dialog.vue'));
const RelationDialog = defineAsyncComponent(() => import('./relation-dialog.vue'));
const StatusLockDialog = defineAsyncComponent(() => import('./status-lock-dialog.vue'));
+ const ActionDropdown = defineAsyncComponent(() => import('./action-dropdown.vue'));
+ const TableColumnControl = defineAsyncComponent(() => import('/@/components/TableColumnControl/index.vue'));
+ const TableColumn = defineAsyncComponent(() => import('/@/components/TableColumn/index.vue'));
+ const TableColumnProvider = defineAsyncComponent(() => import('/@/components/TableColumn/Provider.vue'));
// Pagination 组件已在模板中使用，无需导入（全局组件）
// 导入工具
import {validateNull} from "/@/utils/validate";
@@ -1570,6 +1570,7 @@
const qualificationList = ref([])
const degreeList = ref([])
const activeName = ref('')
+ const subActiveName = ref('subBaseInfo') // 子标签页当前激活的标签
const dialogImageUrl = ref('')
const nationalList = ref([])
const fileList = ref([])
@@ -1588,6 +1589,33 @@
const zgzData = ref([])
const nowImage = ref("")
const dataPolitics = ref([])
+
+ // 表格引用
+ const tableRef = ref()
+ // TableColumnControl 组件引用
+ const tableColumnControlRef = ref()
+
+ // 调试：监听 tableRef.value 的变化
+ watch(() => tableRef.value, (newVal, oldVal) => {
+ console.log('[index.vue] tableRef.value 变化:', { newVal, oldVal, hasValue: !!newVal })
+ if (newVal) {
+ console.log('[index.vue] tableRef.value 已赋值，表格实例:', newVal)
+ const tableEl = (newVal as any).$el
+ console.log('[index.vue] tableRef.value.$el:', tableEl)
+ }
+ }, { immediate: true })
+
+ // 从 TableColumnControl 获取 isColumnVisible 和 visibleTableColumns
+ const isColumnVisible = (propOrLabel: string) => {
+ if (tableColumnControlRef.value?.isColumnVisible) {
+ return tableColumnControlRef.value.isColumnVisible(propOrLabel)
+ }
+ // 默认显示所有列（在 TableColumnControl 初始化之前）
+ return true
+ }
+
+ const visibleTableColumns = ref([])
+
// 静态配置数据
const defaultProps = {
label: "deptName",
@@ -1646,14 +1674,20 @@
],
telPhone: [
{required: true, message: '请输入正确的电话号码', trigger: 'blur'},
- {min: 11, max: 11, message: '长度为 11', trigger: 'blur'}
+ {pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号', trigger: 'blur'}
],
idCard: [
{required: true, message: '请输入正确身份证', trigger: 'blur'},
- {min: 15, max: 18, message: '长度在 15 到 18 个字符', trigger: 'blur'}
+ {min: 15, max: 18, message: '长度在 15 到 18 个字符', trigger: 'blur'},
+ {pattern: /^(\d{15}|\d{17}[\dXx])$/, message: '身份证号格式不正确（15位或18位，18位最后一位可以是X）', trigger: 'blur'}
],
telPhoneTwo: [
- {required: false, min: 11, max: 11, message: '长度为 11', trigger: 'blur'}
+ {required: false, pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号', trigger: 'blur'}
+ ],
+ bankNo: [
+ {required: true, message: '请输入银行卡号', trigger: 'blur'},
+ {pattern: /^\d{16,30}$/, message: '银行卡号格式不正确（16-30位数字）', trigger: 'blur'},
+ {min: 16, max: 30, message: '银行卡号长度为 16 到 30 位', trigger: 'blur'}
],
bankOpen: [
{required: true, message: '请输入开户行', trigger: 'blur'}
@@ -1793,6 +1827,46 @@
}
})
+ // 合并表单验证规则
+ const mergedRules = computed(() => {
+ // 将 baseInfo 的规则加上 baseInfo 前缀
+ const baseInfoRules: Record = {}
+ Object.keys(rules).forEach(key => {
+ // 在编辑模式下，某些字段被禁用（如 realName, teacherNo），不需要验证
+ // 根据 isAdd 状态动态调整验证规则
+ if (isAdd.value) {
+ // 新增模式：使用原始规则
+ baseInfoRules[`baseInfo.${key}`] = rules[key]
+ } else {
+ // 编辑模式：对于被禁用的字段，移除必填验证
+ if (key === 'realName' || key === 'teacherNo') {
+ // 这些字段在编辑模式下被禁用，移除必填验证
+ const rule = rules[key]
+ if (Array.isArray(rule)) {
+ baseInfoRules[`baseInfo.${key}`] = rule.filter((r: any) => !r.required)
+ } else {
+ baseInfoRules[`baseInfo.${key}`] = rule
+ }
+ } else {
+ baseInfoRules[`baseInfo.${key}`] = rules[key]
+ }
+ }
+ })
+
+ // 岗位信息规则：始终包含所有岗位信息规则，以便在保存时能够验证
+ const stationRules: Record = {}
+ Object.keys(stationFormValidate).forEach(key => {
+ stationRules[`professionalStationRelation.${key}`] = stationFormValidate[key]
+ })
+
+ return {
+ // baseInfo 的规则（加上 baseInfo 前缀）
+ ...baseInfoRules,
+ // professionalStationRelation 的规则（始终包含）
+ ...stationRules
+ }
+ })
+
// 生命周期
onMounted(async () => {
// 先初始化基础数据
@@ -1801,6 +1875,17 @@
await loadSearchDictData()
// 初始化完成后加载表格数据
getDataList()
+
+ // 调试：检查 tableRef.value 是否被赋值
+ await nextTick()
+ setTimeout(() => {
+ console.log('[index.vue] onMounted: tableRef.value:', tableRef.value)
+ if (tableRef.value) {
+ console.log('[index.vue] onMounted: tableRef.value.$el:', (tableRef.value as any).$el)
+ } else {
+ console.warn('[index.vue] onMounted: tableRef.value 仍未赋值')
+ }
+ }, 500)
})
// 加载搜索条件字典数据
@@ -1836,16 +1921,19 @@
// 暴露方法给模板使用（如果需要）
// watch 监听器
- watch(activeName, (val) => {
+ watch(activeName, (val, oldVal) => {
//监听切换状态-计划单
- if (val != "first") {
- setTimeout(() => {
+ // 从其他标签页切换到非"first"标签页时检查基础信息
+ // 避免在初始化时触发检查（oldVal 为空字符串表示初始化）
+ // 同时需要确保对话框已打开（dialogFromVisible 为 true）
+ if (val != "first" && oldVal && oldVal !== '' && dialogFromVisible.value) {
+ setTimeout(() => {
if (!form.baseInfo.id || form.baseInfo.id == '') {
message.info("请先完善基础信息")
- saveSubmit();
- }
- }, 500)
+ activeName.value = "first"
}
+ }, 500)
+ }
})
watch(() => form.professionalStationRelation.employmentNature, (newVal) => {
@@ -1987,10 +2075,75 @@
multiDialogRef.value?.init(val)
})
}
+
+ // 获取操作菜单项配置
+ const getActionMenuItems = (row: any) => {
+ return [
+ {
+ command: 'export',
+ label: '导出',
+ icon: Download,
+ visible: permissions.value.professional_teacherbase_export
+ },
+ {
+ command: 'personnel-transfer',
+ label: '人员调动',
+ icon: Switch,
+ visible: permissions.value.professional_teacherbase_status_lock
+ },
+ {
+ command: 'party-transfer',
+ label: '党员调动',
+ icon: Switch,
+ visible: permissions.value.professional_teacherbase_status_lock
+ },
+ {
+ command: 'allow-inout',
+ label: '允许进出',
+ icon: CircleCheck,
+ visible: permissions.value.professional_teacherbase_inout && row.inoutFlag == '0'
+ },
+ {
+ command: 'forbid-inout',
+ label: '禁止进出',
+ icon: CircleClose,
+ visible: permissions.value.professional_teacherbase_inout && row.inoutFlag == '1'
+ },
+ {
+ command: 'reset-password',
+ label: '重置密码',
+ icon: Refresh,
+ visible: permissions.value.professional_teacherbase_resetpw
+ }
+ ]
+ }
+
+ // 处理更多操作下拉菜单命令
+ const handleMoreCommand = (command: string, row: any, index: number) => {
+ switch (command) {
+ case 'export':
+ handleDownLoadWord(row.teacherNo)
+ break
+ case 'personnel-transfer':
+ handleWaitExam(row, 5)
+ break
+ case 'party-transfer':
+ handleWaitExam(row, 6)
+ break
+ case 'allow-inout':
+ updateInoutFlag(row, 1)
+ break
+ case 'forbid-inout':
+ updateInoutFlag(row, 0)
+ break
+ case 'reset-password':
+ resetPassword(row)
+ break
+ }
+ }
// 分页处理方法已由 useTable 提供，无需手动实现
-
- const tableRef = ref()
+ // tableRef 已在上面定义（用于 useTableColumns）
const exportExcel = (form: any, url: string) => {
return axios({
@@ -2028,44 +2181,71 @@
const saveSubmit = () => {
canSave.value = false
if (activeName.value == "first") {
- baseForm.value?.validate((valid: boolean) => {
- if (valid) {
+ // 构建基本信息需要验证的字段列表（始终包含所有基本信息字段）
+ const baseInfoFields = Object.keys(rules).map(key => `baseInfo.${key}`)
+
+ // 构建岗位信息需要验证的字段列表（始终包含所有岗位信息字段）
+ const stationFields = Object.keys(stationFormValidate).map(key => `professionalStationRelation.${key}`)
+
+ // 根据当前子标签页决定先验证哪个
+ const currentFields = subActiveName.value === 'subBaseInfo'
+ ? baseInfoFields
+ : stationFields
+
+ const otherFields = subActiveName.value === 'subBaseInfo'
+ ? stationFields
+ : baseInfoFields
+
+ // 先验证当前子标签页的字段
+ baseForm.value?.validateField(currentFields, (isCurrentValid: boolean, currentInvalidFields: any) => {
+ if (!isCurrentValid) {
+ // 当前子标签页验证失败，提示用户
+ console.log('当前子标签页验证失败的字段:', currentInvalidFields);
+ if (subActiveName.value === 'subBaseInfo') {
+ message.info("请完善基本信息");
+ } else {
+ message.info("请完善岗位信息");
+ }
+ setTimeout(() => {
+ canSave.value = true
+ }, 1000)
+ return
+ }
+
+ // 当前子标签页验证通过，继续验证另一个子标签页
+ baseForm.value?.validateField(otherFields, (isOtherValid: boolean, otherInvalidFields: any) => {
+ if (!isOtherValid) {
+ // 另一个子标签页验证失败，跳转到那个子标签页
+ console.log('另一个子标签页验证失败的字段:', otherInvalidFields);
+ if (subActiveName.value === 'subBaseInfo') {
+ subActiveName.value = 'subStation'
+ message.info("基本信息已完善，请完善岗位信息");
+ } else {
+ subActiveName.value = 'subBaseInfo'
+ message.info("岗位信息已完善，请完善基本信息");
+ }
+ setTimeout(() => {
+ canSave.value = true
+ }, 1000)
+ return
+ }
+
+ // 两个子标签页都验证通过，执行保存
addInformation(form).then((response: any) => {
- const data = response.data.data;
+ const data = response.data;
message.success('保存成功')
form.baseInfo.id = data.baseId;
form.professionalStationRelation.id = data.relationId;
getDataList()
- }).catch(()=>{
- });
- } else {
- message.info("请完善基础信息");
- console.log('error submit!!');
- }
+ }).catch(() => {
+ // 错误处理
});
+ setTimeout(() => {
+ canSave.value = true
+ }, 1000)
+ })
+ })
}
-
- if (activeName.value == "seven") {
- stationForm.value?.validate((valid: boolean) => {
- if (valid) {
- addInformation(form).then((response: any) => {
- const data = response.data.data;
- message.success('保存成功')
- form.baseInfo.id = data.baseId;
- form.professionalStationRelation.id = data.relationId;
- getDataList()
- }).catch(()=>{
- });
- } else {
- message.info("请完善岗位信息");
- console.log('error submit!!');
- }
- });
- }
-
- setTimeout(()=>{
- canSave.value = true
- },1000)
}
// getNodeData 方法已移除，如需要请重新实现
// 政治面貌相关
@@ -2532,6 +2712,13 @@
getDicts(religiousBelief).then((response: any) => {
religiousBeliefDic.value = response.data;
}),
+ // 批量获取字典数据
+ getDictsByTypes(['religious_belief', 'heath', 'teacher_cate']).then((response: any) => {
+ religiousBeliefDic.value = response.data.religious_belief;
+ healthList.value = response.data.heath;
+ teacherCateList.value = response.data.teacher_cate;
+
+ }),
// 民族
getNationalList().then((response: any) => {
nationalList.value = response.data;
@@ -2942,7 +3129,16 @@
const handleImportDialog = () => {
importTeacherInfoRef.value?.init()
- }
+ }
+
+ // 身份证号输入限制：只允许数字和X/x，最大长度18
+ const handleIdCardInput = (value: string) => {
+ // 只保留数字和X/x
+ const filtered = value.replace(/[^\dXx]/g, '')
+ if (filtered !== value) {
+ form.baseInfo.idCard = filtered
+ }
+ }
+
diff --git a/src/composables/useTableColumns.ts b/src/composables/useTableColumns.ts
index b0db92a..ae959a5 100644
--- a/src/composables/useTableColumns.ts
+++ b/src/composables/useTableColumns.ts
@@ -76,23 +76,50 @@ export function useTableColumns(
if (store.states && store.states.columns) {
tableColumns = store.states.columns.value || []
+ console.log('[useTableColumns] 从 store.states.columns 获取到列数:', tableColumns.length)
+ console.log('[useTableColumns] store.states.columns 内容:', tableColumns)
} else if (store.columns) {
tableColumns = Array.isArray(store.columns) ? store.columns : (store.columns.value || [])
+ console.log('[useTableColumns] 从 store.columns 获取到列数:', tableColumns.length)
} else if ((table as any).columns) {
tableColumns = Array.isArray((table as any).columns) ? (table as any).columns : ((table as any).columns.value || [])
+ console.log('[useTableColumns] 从 table.columns 获取到列数:', tableColumns.length)
}
if (tableColumns.length > 0) {
- tableColumns.forEach((col: any) => {
- // 跳过序号列和没有 label 的列
- if (!col.label || col.type === 'index') return
+ tableColumns.forEach((col: any, idx: number) => {
+ console.log(`[useTableColumns] store 列 ${idx}:`, {
+ type: col.type,
+ label: col.label,
+ property: col.property,
+ prop: col.prop,
+ fixed: col.fixed,
+ fullCol: col
+ })
+
+ // 跳过序号列
+ if (col.type === 'index' || col.type === 'selection') {
+ console.log(`[useTableColumns] 列 ${idx} 被跳过（类型: ${col.type}）`)
+ return
+ }
+
+ // 尝试多种方式获取 label
+ const label = col.label || col.columnKey || col.property || col.prop || ''
+
+ // 如果没有 label，尝试从其他属性推断
+ if (!label) {
+ console.log(`[useTableColumns] 列 ${idx} 没有 label，尝试从其他属性推断`)
+ // 如果还是没有，跳过这一列
+ return
+ }
const config: ColumnConfig = {
prop: col.property || col.prop || '',
- label: col.label || '',
+ label: label,
width: col.width,
minWidth: col.minWidth,
- fixed: col.fixed,
+ // Element Plus 中非固定列的 fixed 通常是 false，这里统一将 false 归一为 undefined
+ fixed: col.fixed ? col.fixed : undefined,
}
// 应用自定义映射
@@ -111,12 +138,16 @@ export function useTableColumns(
}
}
+ console.log(`[useTableColumns] 从 store 提取到列配置:`, config)
extracted.push(config)
})
+ console.log('[useTableColumns] 从 store 总共提取到列数:', extracted.length)
if (extracted.length > 0) {
return extracted
}
+ } else {
+ console.warn('[useTableColumns] store 中没有找到列数据')
}
}
@@ -174,8 +205,45 @@ export function useTableColumns(
}
columnHeaders.forEach((th: HTMLElement, index: number) => {
- const label = th.textContent?.trim() || ''
- console.log(`[useTableColumns] 列 ${index}: label="${label}"`)
+ // 尝试多种方式获取 label 文本
+ // 1. 从 .cell 元素
+ const cell = th.querySelector('.cell') as HTMLElement | null
+ // 2. 从所有可能的文本节点
+ let rawLabel = ''
+
+ if (cell) {
+ rawLabel = cell.innerText || cell.textContent || ''
+ } else {
+ // 尝试从 th 的所有子元素中查找文本
+ const textNodes: string[] = []
+ const walker = document.createTreeWalker(
+ th,
+ NodeFilter.SHOW_TEXT,
+ null
+ )
+ let node: Node | null
+ while ((node = walker.nextNode())) {
+ const text = node.textContent?.trim()
+ if (text) {
+ textNodes.push(text)
+ }
+ }
+ rawLabel = textNodes.join(' ') || th.innerText || th.textContent || ''
+ }
+
+ const label = rawLabel.trim()
+
+ // 调试：打印 th 的完整结构
+ console.log(`[useTableColumns] DOM 列 ${index}:`, {
+ label,
+ rawLabel,
+ thHTML: th.innerHTML.substring(0, 100),
+ hasCell: !!cell,
+ cellText: cell?.innerText || cell?.textContent || '',
+ thInnerText: th.innerText,
+ thTextContent: th.textContent
+ })
+
// 排除序号列和空列
if (!label || label === '序号') {
console.log(`[useTableColumns] 列 ${index} 被跳过（序号列或空列）`)
@@ -234,7 +302,8 @@ export function useTableColumns(
prop: prop || `column_${index}`,
label,
width,
- fixed,
+ // DOM 提取的 fixed 只有 left/right，这里也归一为 undefined 或 'left'/'right'
+ fixed: fixed ? fixed : undefined,
}
console.log(`[useTableColumns] 提取到列配置:`, columnConfig)
extracted.push(columnConfig)
@@ -304,12 +373,13 @@ export function useTableColumns(
// 初始化默认可见列
const initDefaultVisibleColumns = () => {
const defaultHidden = options?.defaultHidden || []
- // 默认显示所有列（除了默认隐藏的列）
+ // 默认显示所有列（除了默认隐藏的列和固定列/alwaysShow列）
+ // 注意：固定列和 alwaysShow 列不需要在 visibleColumns 中，因为它们始终显示
visibleColumns.value = columns.value
.filter(col => {
const key = col.prop || col.label
return !col.alwaysShow &&
- col.fixed === undefined &&
+ !col.fixed &&
!defaultHidden.includes(key)
})
.map(col => col.prop || col.label)
@@ -317,7 +387,7 @@ export function useTableColumns(
// 如果所有列都被隐藏了，至少显示所有非固定列
if (visibleColumns.value.length === 0 && columns.value.length > 0) {
visibleColumns.value = columns.value
- .filter(col => !col.alwaysShow && col.fixed === undefined)
+ .filter(col => !col.alwaysShow && !col.fixed)
.map(col => col.prop || col.label)
}
}
@@ -339,7 +409,7 @@ export function useTableColumns(
}
// 固定列和始终显示的列始终显示
- if (column.fixed !== undefined || column.alwaysShow) {
+ if (column.fixed || column.alwaysShow) {
return true
}
diff --git a/src/views/professional/stayschool/outercompany/index.vue b/src/views/professional/outercompany/index.vue
similarity index 99%
rename from src/views/professional/stayschool/outercompany/index.vue
rename to src/views/professional/outercompany/index.vue
index d1e215e..e8f6424 100755
--- a/src/views/professional/stayschool/outercompany/index.vue
+++ b/src/views/professional/outercompany/index.vue
@@ -153,7 +153,7 @@ import { useUserInfo } from '/@/stores/userInfo'
import { BasicTableProps, useTable } from '/@/hooks/table'
import { useMessage } from '/@/hooks/message'
import { useMessageBox } from '/@/hooks/message'
-import { fetchList, addObj, putObj, delObj, getObj } from '/@/api/professional/outercompany'
+import { fetchList, addObj, putObj, delObj, getObj } from '/@/api/professional/stayschool/outercompany'
// 使用 Pinia store
const userInfoStore = useUserInfo()
diff --git a/src/views/professional/stayschool/outercompany/indexSecond.vue b/src/views/professional/outercompany/indexSecond.vue
similarity index 99%
rename from src/views/professional/stayschool/outercompany/indexSecond.vue
rename to src/views/professional/outercompany/indexSecond.vue
index 49c0cfc..625ef2e 100755
--- a/src/views/professional/stayschool/outercompany/indexSecond.vue
+++ b/src/views/professional/outercompany/indexSecond.vue
@@ -153,7 +153,7 @@ import { useUserInfo } from '/@/stores/userInfo'
import { BasicTableProps, useTable } from '/@/hooks/table'
import { useMessage } from '/@/hooks/message'
import { useMessageBox } from '/@/hooks/message'
-import { fetchList, addObj, putObj, delObj, getObj } from '/@/api/professional/outercompany'
+import { fetchList, addObj, putObj, delObj, getObj } from '/@/api/professional/stayschool/outercompany'
// 使用 Pinia store
const userInfoStore = useUserInfo()
diff --git a/src/views/professional/stayschool/outercompany/indexTrain.vue b/src/views/professional/outercompany/indexTrain.vue
similarity index 98%
rename from src/views/professional/stayschool/outercompany/indexTrain.vue
rename to src/views/professional/outercompany/indexTrain.vue
index 3e3a6e5..e98ec87 100755
--- a/src/views/professional/stayschool/outercompany/indexTrain.vue
+++ b/src/views/professional/outercompany/indexTrain.vue
@@ -100,7 +100,7 @@ import { ref, reactive, computed } from 'vue'
import { storeToRefs } from 'pinia'
import { useUserInfo } from '/@/stores/userInfo'
import { BasicTableProps, useTable } from '/@/hooks/table'
-import { fetchList } from '/@/api/professional/outercompany'
+import { fetchList } from '/@/api/professional/stayschool/outercompany'
// 使用 Pinia store
const userInfoStore = useUserInfo()
diff --git a/src/views/professional/stayschool/outercompanyemployee/index.vue b/src/views/professional/outercompanyemployee/index.vue
similarity index 99%
rename from src/views/professional/stayschool/outercompanyemployee/index.vue
rename to src/views/professional/outercompanyemployee/index.vue
index 968727d..ec99152 100755
--- a/src/views/professional/stayschool/outercompanyemployee/index.vue
+++ b/src/views/professional/outercompanyemployee/index.vue
@@ -405,8 +405,8 @@ import {
delObj,
batchDel,
resetPassWord
-} from '/@/api/professional/outercompanyemployee'
-import { getList as getCompanyList } from '/@/api/professional/outercompany'
+} from '/@/api/professional/stayschool/outercompanyemployee'
+import { getList as getCompanyList } from '/@/api/professional/stayschool/outercompany'
// 使用 Pinia store
const userInfoStore = useUserInfo()
diff --git a/src/views/professional/stayschool/outercompanyemployee/indexSecond.vue b/src/views/professional/outercompanyemployee/indexSecond.vue
similarity index 99%
rename from src/views/professional/stayschool/outercompanyemployee/indexSecond.vue
rename to src/views/professional/outercompanyemployee/indexSecond.vue
index 3fc8ffd..54d0374 100755
--- a/src/views/professional/stayschool/outercompanyemployee/indexSecond.vue
+++ b/src/views/professional/outercompanyemployee/indexSecond.vue
@@ -406,8 +406,8 @@ import {
delObj,
batchDel,
resetPassWord
-} from '/@/api/professional/outercompanyemployee'
-import { getList as getCompanyList } from '/@/api/professional/outercompany'
+} from '/@/api/professional/stayschool/outercompanyemployee'
+import { getList as getCompanyList } from '/@/api/professional/stayschool/outercompany'
// 使用 Pinia store
const userInfoStore = useUserInfo()
diff --git a/src/views/professional/stayschool/outercompanyemployee/indexTrain.vue b/src/views/professional/outercompanyemployee/indexTrain.vue
similarity index 99%
rename from src/views/professional/stayschool/outercompanyemployee/indexTrain.vue
rename to src/views/professional/outercompanyemployee/indexTrain.vue
index 125ebf1..b26bc1e 100755
--- a/src/views/professional/stayschool/outercompanyemployee/indexTrain.vue
+++ b/src/views/professional/outercompanyemployee/indexTrain.vue
@@ -385,8 +385,8 @@ import {
delObj,
batchDel,
resetPassWord
-} from '/@/api/professional/outercompanyemployee'
-import { getList as getCompanyList } from '/@/api/professional/outercompany'
+} from '/@/api/professional/stayschool/outercompanyemployee'
+import { getList as getCompanyList } from '/@/api/professional/stayschool/outercompany'
// 使用 Pinia store
const userInfoStore = useUserInfo()
diff --git a/src/views/professional/professionalqualificationrelation/form.vue b/src/views/professional/professionalqualificationrelation/form.vue
index 0ea73b5..8e054e8 100644
--- a/src/views/professional/professionalqualificationrelation/form.vue
+++ b/src/views/professional/professionalqualificationrelation/form.vue
@@ -96,8 +96,8 @@
import { ref, reactive, computed } from 'vue'
import { Session } from '/@/utils/storage'
import { useMessage } from '/@/hooks/message'
-import { getMyTeacherNo, updateOtherInfo } from '/@/api/professional/professionaluser/teacherbase'
-import { putObj } from '/@/api/professional/professionaluser/professionalqualificationrelation'
+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'
import { getWorkTypeList } from '/@/api/professional/rsbase/professionalworktype'
@@ -284,34 +284,26 @@ const dialogSubmit = async () => {
if (valid) {
submitLoading.value = true
try {
+ // 统一使用 addObj 接口（新增和编辑都使用同一个接口）
+ // 确保 evidenceA 或 materialA 有值
+ if (!dataForm.evidenceA && dataForm.materialA) {
+ dataForm.evidenceA = dataForm.materialA
+ }
+
if (dataForm.id) {
- // 编辑：使用 putObj 接口（管理员编辑）
+ // 编辑模式
dataForm.state = '0'
- await putObj(dataForm)
+ await addObj(dataForm)
message.success("修改成功")
} else {
- // 新增：使用 updateOtherInfo 接口（与 MultiDialog 保持一致）
- const submitData: any = {
- type: 3, // 职业资格类型
- teacherNo: dataForm.teacherNo,
- worker: dataForm.worker,
- qualificationConfigId: dataForm.qualificationConfigId,
- certificateTime: dataForm.certificateTime,
- certificateNumber: dataForm.certificateNumber,
- mateA: dataForm.evidenceA || dataForm.materialA // 使用 mateA 字段（与 MultiDialog 一致）
- }
-
- const res = await updateOtherInfo(submitData)
- if (res.data == '-1') {
- message.warning("当前不允许提交")
- } else {
- message.success("提交成功")
- }
+ // 新增模式
+ await addObj(dataForm)
+ message.success("提交成功")
}
dialogVisible.value = false
emit('refreshData')
} catch (error: any) {
- message.error(error?.msg || '操作失败')
+ // 错误处理已在数据请求层统一处理，此处不需要提示
} finally {
submitLoading.value = false
}
diff --git a/src/views/professional/professionalteacheracademicrelation/form.vue b/src/views/professional/professionalteacheracademicrelation/form.vue
index 56d9a82..f1b0421 100644
--- a/src/views/professional/professionalteacheracademicrelation/form.vue
+++ b/src/views/professional/professionalteacheracademicrelation/form.vue
@@ -147,8 +147,8 @@
import { ref, reactive, computed } from 'vue'
import { Session } from '/@/utils/storage'
import { useMessage } from '/@/hooks/message'
-import { getMyTeacherNo, updateOtherInfo } from '/@/api/professional/professionaluser/teacherbase'
-import { putObj } from '/@/api/professional/professionaluser/professionalteacheracademicrelation'
+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'
import { getDegreeList } from '/@/api/professional/rsbase/professionalacademicdegreeconfig'
@@ -370,42 +370,30 @@ const dialogSubmit = async () => {
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
+ }
+
if (dataForm.id) {
- // 编辑：使用 putObj 接口（管理员编辑）
+ // 编辑模式
dataForm.state = '0'
- await putObj(dataForm)
+ await addObj(dataForm)
message.success("修改成功")
} else {
- // 新增：使用 updateOtherInfo 接口（与 MultiDialog 保持一致）
- // 注意：MultiDialog 中 type 字段在提交时会被设置为 val（1），但表单中也有 type 字段用于教育类型
- // 这里直接使用 dataForm 的所有字段，后端应该能够处理
- const submitData: any = {
- type: 1, // 学历更新类型（固定值，会覆盖表单中的 type）
- teacherNo: dataForm.teacherNo,
- graduateTime: dataForm.graduateTime,
- qualificationConfigId: dataForm.qualificationConfigId,
- degreeConfigId: dataForm.degreeConfigId,
- graduateSchool: dataForm.graduateSchool,
- major: dataForm.major,
- certificateNumber: dataForm.certificateNumber,
- mateA: dataForm.qualificationImg || dataForm.materialA, // 学历证书
- mateB: dataForm.degreeImg || dataForm.materialB // 学位证书
- }
-
- // 注意：MultiDialog 中教育类型字段也是 type，但在提交时会被覆盖为 val（1）
- // 如果后端需要教育类型，可能需要单独传递，这里先不传，保持与 MultiDialog 一致
-
- const res = await updateOtherInfo(submitData)
- if (res.data == '-1') {
- message.warning("当前不允许提交")
- } else {
- message.success("提交成功")
- }
+ // 新增模式
+ await addObj(dataForm)
+ message.success("提交成功")
}
dialogVisible.value = false
emit('refreshData')
} catch (error: any) {
- message.error(error?.msg || '操作失败')
+ // 错误处理已在数据请求层统一处理，此处不需要提示
} finally {
submitLoading.value = false
}
diff --git a/src/views/professional/professionalteachercertificaterelation/form.vue b/src/views/professional/professionalteachercertificaterelation/form.vue
index f15932e..73c7f61 100644
--- a/src/views/professional/professionalteachercertificaterelation/form.vue
+++ b/src/views/professional/professionalteachercertificaterelation/form.vue
@@ -97,8 +97,8 @@
import { ref, reactive, computed } from 'vue'
import { Session } from '/@/utils/storage'
import { useMessage } from '/@/hooks/message'
-import { getMyTeacherNo, updateOtherInfo } from '/@/api/professional/professionaluser/teacherbase'
-import { putObj } from '/@/api/professional/professionaluser/professionalteachercertificaterelation'
+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'
@@ -280,33 +280,30 @@ const dialogSubmit = async () => {
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
+ }
+
if (dataForm.id) {
- // 编辑：使用 putObj 接口（管理员编辑）
+ // 编辑模式
dataForm.state = '0'
- await putObj(dataForm)
+ await addObj(dataForm)
message.success("修改成功")
} else {
- // 新增：使用 updateOtherInfo 接口（与 MultiDialog 保持一致）
- // 注意：MultiDialog 的 type=0 表单只有 certificateConfId 和 certificateNumber，没有 certificateTime
- const submitData: any = {
- type: 0, // 教师资格证类型
- teacherNo: dataForm.teacherNo,
- certificateConfId: dataForm.certificateConfId,
- certificateNumber: dataForm.certificateNumber,
- mateA: dataForm.evidenceA || dataForm.materialA // 使用 mateA 字段（与 MultiDialog 一致）
- }
-
- const res = await updateOtherInfo(submitData)
- if (res.data == '-1') {
- message.warning("当前不允许提交")
- } else {
- message.success("提交成功")
- }
+ // 新增模式
+ await addObj(dataForm)
+ message.success("提交成功")
}
dialogVisible.value = false
emit('refreshData')
} catch (error: any) {
- message.error(error?.msg || '操作失败')
+ // 错误处理已在数据请求层统一处理，此处不需要提示
} finally {
submitLoading.value = false
}
diff --git a/src/views/professional/professionalteacherhonor/form.vue b/src/views/professional/professionalteacherhonor/form.vue
index 5e0d6d0..09dd438 100644
--- a/src/views/professional/professionalteacherhonor/form.vue
+++ b/src/views/professional/professionalteacherhonor/form.vue
@@ -64,8 +64,8 @@
import { ref, reactive, computed } from 'vue'
import { Session } from '/@/utils/storage'
import { useMessage } from '/@/hooks/message'
-import { getMyTeacherNo, updateOtherInfo } from '/@/api/professional/professionaluser/teacherbase'
-import { putObj } from '/@/api/professional/professionaluser/professionalteacherhonor'
+import { getMyTeacherNo } from '/@/api/professional/professionaluser/teacherbase'
+import { addObj } from '/@/api/professional/professionaluser/professionalteacherhonor'
import { checkLocked } from '/@/api/professional/professionalstatuslock'
// Emits
@@ -215,33 +215,26 @@ const dialogSubmit = async () => {
if (valid) {
submitLoading.value = true
try {
+ // 统一使用 addObj 接口（新增和编辑都使用同一个接口）
+ // 确保 attachment 或 materialA 有值
+ if (!dataForm.attachment && dataForm.materialA) {
+ dataForm.attachment = dataForm.materialA
+ }
+
if (dataForm.id) {
- // 编辑：使用 putObj 接口（管理员编辑）
+ // 编辑模式
dataForm.state = '0'
- await putObj(dataForm)
+ await addObj(dataForm)
message.success("修改成功")
} else {
- // 新增：使用 updateOtherInfo 接口（与 MultiDialog 保持一致）
- const submitData: any = {
- type: 4, // 综合表彰类型
- teacherNo: dataForm.teacherNo,
- honor: dataForm.honor,
- honorCompany: dataForm.honorCompany,
- year: dataForm.year,
- mateA: dataForm.attachment || dataForm.materialA // 使用 mateA 字段（与 MultiDialog 一致）
- }
-
- const res = await updateOtherInfo(submitData)
- if (res.data == '-1') {
- message.warning("当前不允许提交")
- } else {
- message.success("提交成功")
- }
+ // 新增模式
+ await addObj(dataForm)
+ message.success("提交成功")
}
dialogVisible.value = false
emit('refreshData')
} catch (error: any) {
- message.error(error?.msg || '操作失败')
+ // 错误处理已在数据请求层统一处理，此处不需要提示
} finally {
submitLoading.value = false
}
diff --git a/src/views/professional/professionaltitlerelation/form.vue b/src/views/professional/professionaltitlerelation/form.vue
index cd8ba39..19c1123 100644
--- a/src/views/professional/professionaltitlerelation/form.vue
+++ b/src/views/professional/professionaltitlerelation/form.vue
@@ -229,7 +229,7 @@ const openDialog = async (row?: any) => {
return
}
} catch (error) {
- message.error('操作失败')
+ // 错误处理已在数据请求层统一处理，此处不需要提示
return
}
}
@@ -306,7 +306,7 @@ const dialogSubmit = async () => {
dialogVisible.value = false
emit('refreshData')
} catch (error: any) {
- message.error(error?.msg || '操作失败')
+ // 错误处理已在数据请求层统一处理，此处不需要提示
} finally {
submitLoading.value = false
}
diff --git a/src/views/professional/salaries/professionalyearbounds/index.vue b/src/views/professional/professionalyearbounds/index.vue
similarity index 100%
rename from src/views/professional/salaries/professionalyearbounds/index.vue
rename to src/views/professional/professionalyearbounds/index.vue
diff --git a/src/views/professional/salaries/salaryexportrecord/index.vue b/src/views/professional/salaryexportrecord/index.vue
similarity index 100%
rename from src/views/professional/salaries/salaryexportrecord/index.vue
rename to src/views/professional/salaryexportrecord/index.vue
diff --git a/src/views/professional/salaries/teacherawardtax/importAwardTax.vue b/src/views/professional/teacherawardtax/importAwardTax.vue
similarity index 100%
rename from src/views/professional/salaries/teacherawardtax/importAwardTax.vue
rename to src/views/professional/teacherawardtax/importAwardTax.vue
diff --git a/src/views/professional/salaries/teacherawardtax/index.vue b/src/views/professional/teacherawardtax/index.vue
similarity index 100%
rename from src/views/professional/salaries/teacherawardtax/index.vue
rename to src/views/professional/teacherawardtax/index.vue
diff --git a/src/views/professional/teacherbase/index.vue b/src/views/professional/teacherbase/index.vue
index 473e554..217fb19 100644
--- a/src/views/professional/teacherbase/index.vue
+++ b/src/views/professional/teacherbase/index.vue
@@ -369,24 +369,26 @@
-
-
-
-
-
-
- ![照片]()
-
-
-
-
+
+
+
+
+
@@ -886,19 +889,23 @@
+
-
+ ![照片]()
+
+
+
+
+
-
+
+
+
+ {{ getPoliticsStatusName(scope.row.politicsStatusId || scope.row.politicsStatus) }}
+
+
{{ scope.row.joinTime ? new Date(scope.row.joinTime).toLocaleDateString() : '-' }}
@@ -932,12 +939,12 @@
-
+
+
@@ -951,7 +958,11 @@
{{ scope.row.birthday ? new Date(scope.row.birthday).toLocaleDateString() : '-' }}
-
+
+ {{ getPoliticsStatusName(scope.row.politicsStatusId || scope.row.politicsStatus) }}
+
+
@@ -971,15 +982,11 @@
-
+
-
-
-
-
-
-
-
-
@@ -1043,15 +1038,11 @@
-
+
-
-
-
-
-
-
-
-
@@ -1105,15 +1084,11 @@
-
+
-
-
-
-
-
-
-
-
@@ -1198,6 +1161,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{
exportNoImgUser().then((response: any) => {
- if (response.data.msg == "fail") {
- alert(JSON.stringify(response.data.data));
- } else {
+ if (response.data.msg == "fail") {
+ alert(JSON.stringify(response.data));
+ } else {
import('/@/excel/Export2Excel.js').then(({ export_json_to_excel }) => {
- const tHeader = head;
- const filterVal = val;
- const list = response.data.data;
+ const tHeader = head;
+ const filterVal = val;
+ const list = response.data;
const data = formatJson(filterVal, list);
- export_json_to_excel(tHeader, data, fileName);
- })
- }
+ export_json_to_excel(tHeader, data, fileName);
})
- .catch((error: any) => {
- console.log(error);
- });
+ }
+ }).catch((error: any) => {
+ console.log(error);
+ });
}
const exportUserInfo = () => {
@@ -2253,6 +2246,13 @@
const politicsForm = ref({})
const politicsEditIndex = ref(-1)
+ // 根据政治面貌ID获取名称
+ const getPoliticsStatusName = (id: string | number | undefined) => {
+ if (!id) return '-'
+ const item = searchPoliticsStatusList.value.find((item: any) => item.id === id || item.id === String(id))
+ return item ? item.politicsStatus : '-'
+ }
+
const handleAddPolitics = () => {
politicsForm.value = {}
politicsEditIndex.value = -1
@@ -2285,7 +2285,8 @@
politicsDialogVisible.value = false
// 刷新数据
getObj(form.baseInfo.id).then((res: any) => {
- const baseInfo = res.data.data;
+ const baseInfo = res.data;
+ if (!baseInfo) return;
dataPolitics.value = baseInfo.poList;
})
});
@@ -2367,7 +2368,8 @@
educationDialogVisible.value = false
// 刷新数据
getObj(form.baseInfo.id).then((res: any) => {
- const baseInfo = res.data.data;
+ const baseInfo = res.data;
+ if (!baseInfo) return;
dataEducation.value = baseInfo.acadeList
dataEducation.value.forEach((v: any) => {
v.qiList = []
@@ -2460,7 +2462,8 @@
relationDialogVisible.value = false
// 刷新数据
getObj(form.baseInfo.id).then((res: any) => {
- const baseInfo = res.data.data;
+ const baseInfo = res.data;
+ if (!baseInfo) return;
relationData.value = baseInfo.socialList;
})
});
@@ -2541,7 +2544,8 @@
proDialogVisible.value = false
// 刷新数据
getObj(form.baseInfo.id).then((res: any) => {
- const baseInfo = res.data.data;
+ const baseInfo = res.data;
+ if (!baseInfo) return;
proData.value = baseInfo.titleList
proData.value.forEach((v: any) => {
v.srcList = []
@@ -2626,7 +2630,8 @@
workDialogVisible.value = false
// 刷新数据
getObj(form.baseInfo.id).then((res: any) => {
- const baseInfo = res.data.data;
+ const baseInfo = res.data;
+ if (!baseInfo) return;
workData.value = baseInfo.quaList
workData.value.forEach((v: any) => {
v.srcList = []
@@ -2698,32 +2703,19 @@
}
const init = async () => {
+ // 获取一级部门
fetchSecondTree()
await Promise.all([
- // 健康状况
- getDicts(global.HEATH).then((response: any) => {
- healthList.value = response.data;
- }),
- // 授课类型
- getDicts(global.TEACHER_CATE).then((response: any) => {
- teacherCateList.value = response.data;
- }),
- // 宗教信仰
- getDicts(religiousBelief).then((response: any) => {
- religiousBeliefDic.value = response.data;
- }),
- // 批量获取字典数据
+ // 批量获取字典数据 religious_belief宗教信仰 health健康状况 teacher_cate授课类型
getDictsByTypes(['religious_belief', 'heath', 'teacher_cate']).then((response: any) => {
religiousBeliefDic.value = response.data.religious_belief;
healthList.value = response.data.heath;
- teacherCateList.value = response.data.teacher_cate;
-
+ teacherCateList.value = response.data.teacher_cate;
}),
// 民族
getNationalList().then((response: any) => {
nationalList.value = response.data;
}),
-
// 岗位类型部门树
treeForCascader().then((response: any) => {
deptTreeList.value = response.data;
@@ -2809,6 +2801,7 @@
workData.value = [];
dialogFromVisible.value = true;
}
+
const handleEdit = (row: any, index: any) => {
isAdd.value = false
nowUserInfo.uploadUrl = '/professional/file/upload?teacherNo=' + row.teacherNo;
@@ -2819,7 +2812,12 @@
imageUrl.value = ''
//查询基础信息
getObj(row.id).then((response: any) => {
- const baseInfo = response.data.data;
+ const baseInfo = response.data;
+ if (!baseInfo || !baseInfo.teacherBase) {
+ console.error('[teacherbase] 获取教师详情失败，返回数据异常:', response);
+ message.error('获取教师详情失败，请稍后重试');
+ return;
+ }
form.baseInfo.teacherPhoto = "";
nowImage.value = baseInfo.teacherBase.teacherPhoto;
imgList.value = [];
@@ -2827,7 +2825,7 @@
dialogForListImageUrl.value = "/professional/minio/show?fileName=base-teach_photo/" + baseInfo.teacherBase.teacherNo + "/" + baseInfo.teacherBase.teacherNo + ".jpg"
imageUrl.value = dialogForListImageUrl.value
dataPolitics.value = baseInfo.poList;
- //资格证
+ //资格证
zgzData.value = baseInfo.certList;
zgzData.value.forEach((v: any) => {
v.srcList = []
@@ -2919,7 +2917,7 @@
}
if (row.deptCode != null && row.deptCode != '') {
getDeptByCode(row.deptCode).then((response: any) => {
- const dept = response.data.data
+ const dept = response.data
if (dept) {
form.professionalStationRelation.deptCodeList = [];
form.professionalStationRelation.deptCodeList[0] = dept.parentCode
@@ -3173,28 +3171,59 @@
.base-info-form {
background: #ffffff;
- // 照片区域
+ // 基本信息布局（照片+表单）
+ .base-info-layout {
+ display: flex;
+ gap: 18px;
+ align-items: center;
+ margin-bottom: 16px;
+
+ // 照片区域
+ .photo-section {
+ flex-shrink: 0;
+
+ .photo-wrapper {
+ width: 120px;
+ height: 160px;
+ border-radius: 8px;
+ overflow: hidden;
+ border: 1px solid #e4e7ed;
+ background: #fafafa;
+
+ .avatar-photo {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ display: block;
+ }
+ }
+ }
+
+ // 表单区域
+ .form-section {
+ flex: 1;
+ min-width: 0; // 防止 flex 子元素溢出
+ }
+ }
+
+ // 照片区域（独立显示，当没有表单时）
.photo-section {
- margin-bottom: 24px;
display: flex;
justify-content: center;
.photo-wrapper {
width: 120px;
- height: 120px;
+ height: 160px;
border-radius: 8px;
overflow: hidden;
- border: 2px solid #e4e7ed;
+ border: 1px solid #e4e7ed;
background: #fafafa;
- display: flex;
- align-items: center;
- justify-content: center;
- box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
.avatar-photo {
width: 100%;
height: 100%;
object-fit: cover;
+ display: block;
}
}
}
@@ -3214,9 +3243,10 @@
// 表单分组样式优化 - 保持当前间距，添加背景
.form-section {
margin-bottom: 16px;
- padding: 16px;
+ padding: 20px;
background: #fafbfc;
- border-radius: 6px;
+ border-radius: 8px;
+ border: 1px solid #ebeef5;
&:last-child {
margin-bottom: 0;
@@ -3248,11 +3278,12 @@
}
}
}
+
}
// 表格模块样式优化
.table-section {
- padding: 24px;
+ // padding: 24px;
background: #ffffff;
.table-header {
diff --git a/src/views/professional/teacherbase/politics-dialog.vue b/src/views/professional/teacherbase/politics-dialog.vue
index df603b1..37142e1 100644
--- a/src/views/professional/teacherbase/politics-dialog.vue
+++ b/src/views/professional/teacherbase/politics-dialog.vue
@@ -16,8 +16,8 @@
v-model="form.joinTime"
type="date"
placeholder="选择日期"
- format="yyyy-MM-dd"
- value-format="yyyy-MM-dd HH:mm:ss"
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD HH:mm:ss"
style="width: 100%"
/>
@@ -26,8 +26,8 @@
v-model="form.correctionTime"
type="date"
placeholder="选择日期"
- format="yyyy-MM-dd"
- value-format="yyyy-MM-dd HH:mm:ss"
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD HH:mm:ss"
style="width: 100%"
/>
diff --git a/src/views/professional/teacherbase/relation-dialog.vue b/src/views/professional/teacherbase/relation-dialog.vue
index 9706766..9d02625 100644
--- a/src/views/professional/teacherbase/relation-dialog.vue
+++ b/src/views/professional/teacherbase/relation-dialog.vue
@@ -1,7 +1,7 @@
-
-
+
+
-
+
-
+
-
+
-
+
{
}
const handleSubmit = () => {
- emit('submit', { ...form.value })
+ formRef.value?.validate((valid: boolean) => {
+ if (valid) {
+ emit('submit', { ...form.value })
+ }
+ })
+}
+
+// 表单验证规则
+const rules = {
+ title: [
+ { required: true, message: '请选择称谓', trigger: 'change' }
+ ],
+ realName: [
+ { required: true, message: '请输入姓名', trigger: 'blur' }
+ ],
+ birthday: [
+ { required: true, message: '请选择出生年月', trigger: 'change' }
+ ],
+ politicsStatusId: [
+ { required: true, message: '请选择政治面貌', trigger: 'change' }
+ ],
+ workStation: [
+ { required: true, message: '请输入工作单位及职务', trigger: 'blur' }
+ ]
}
diff --git a/src/views/professional/salaries/teacherpayslip/exportBaseSalary.vue b/src/views/professional/teacherpayslip/exportBaseSalary.vue
similarity index 100%
rename from src/views/professional/salaries/teacherpayslip/exportBaseSalary.vue
rename to src/views/professional/teacherpayslip/exportBaseSalary.vue
diff --git a/src/views/professional/salaries/teacherpayslip/importBaseSalary.vue b/src/views/professional/teacherpayslip/importBaseSalary.vue
similarity index 100%
rename from src/views/professional/salaries/teacherpayslip/importBaseSalary.vue
rename to src/views/professional/teacherpayslip/importBaseSalary.vue
diff --git a/src/views/professional/salaries/teacherpayslip/importTaxSalary.vue b/src/views/professional/teacherpayslip/importTaxSalary.vue
similarity index 100%
rename from src/views/professional/salaries/teacherpayslip/importTaxSalary.vue
rename to src/views/professional/teacherpayslip/importTaxSalary.vue
diff --git a/src/views/professional/salaries/teacherpayslip/index.vue b/src/views/professional/teacherpayslip/index.vue
similarity index 100%
rename from src/views/professional/salaries/teacherpayslip/index.vue
rename to src/views/professional/teacherpayslip/index.vue
diff --git a/src/views/professional/salaries/teacherpayslip/salaryInfo.vue b/src/views/professional/teacherpayslip/salaryInfo.vue
similarity index 100%
rename from src/views/professional/salaries/teacherpayslip/salaryInfo.vue
rename to src/views/professional/teacherpayslip/salaryInfo.vue
diff --git a/src/views/professional/salaries/teachersalary/exportBaseSalary.vue b/src/views/professional/teachersalary/exportBaseSalary.vue
similarity index 100%
rename from src/views/professional/salaries/teachersalary/exportBaseSalary.vue
rename to src/views/professional/teachersalary/exportBaseSalary.vue
diff --git a/src/views/professional/salaries/teachersalary/importBaseSalary.vue b/src/views/professional/teachersalary/importBaseSalary.vue
similarity index 100%
rename from src/views/professional/salaries/teachersalary/importBaseSalary.vue
rename to src/views/professional/teachersalary/importBaseSalary.vue
diff --git a/src/views/professional/salaries/teachersalary/importTaxSalary.vue b/src/views/professional/teachersalary/importTaxSalary.vue
similarity index 100%
rename from src/views/professional/salaries/teachersalary/importTaxSalary.vue
rename to src/views/professional/teachersalary/importTaxSalary.vue
diff --git a/src/views/professional/salaries/teachersalary/index.vue b/src/views/professional/teachersalary/index.vue
similarity index 100%
rename from src/views/professional/salaries/teachersalary/index.vue
rename to src/views/professional/teachersalary/index.vue
diff --git a/src/views/professional/salaries/teachersalary/salaryInfo.vue b/src/views/professional/teachersalary/salaryInfo.vue
similarity index 100%
rename from src/views/professional/salaries/teachersalary/salaryInfo.vue
rename to src/views/professional/teachersalary/salaryInfo.vue
From 3cf56a6b4c65590b602e87ed903ddd9aa1cbe5a9 Mon Sep 17 00:00:00 2001
From: zhoutianchi <1305666981@qq.com>
Date: Tue, 6 Jan 2026 22:09:04 +0800
Subject: [PATCH 07/21] 1
---
package.json | 1 -
src/excel/Export2Excel.js | 20 ++++++++++----------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/package.json b/package.json
index 7dc922b..936b248 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,6 @@
"driver.js": "^0.9.8",
"echarts": "^5.4.1",
"element-plus": "2.5.5",
- "file-saver": "^2.0.5",
"form-create-designer": "3.2.11-oem",
"highlight.js": "^11.7.0",
"html-to-image": "^1.11.13",
diff --git a/src/excel/Export2Excel.js b/src/excel/Export2Excel.js
index 33c6493..6babf2f 100644
--- a/src/excel/Export2Excel.js
+++ b/src/excel/Export2Excel.js
@@ -1,6 +1,6 @@
/* eslint-disable */
-import { saveAs } from 'file-saver'
-import * as XLSX from 'xlsx'
+// import { saveAs } from 'file-saver'
+// import * as XLSX from 'xlsx'
// 现代浏览器已原生支持 Blob，不需要 polyfill
// 如果需要支持旧浏览器，可以取消下面的注释
// import '/@/excel/Blob.js'
@@ -62,21 +62,21 @@ function sheet_from_array_of_arrays(data, opts) {
if (range.e.c < C) range.e.c = C;
var cell = {v: data[R][C]};
if (cell.v == null) continue;
- var cell_ref = XLSX.utils.encode_cell({c: C, r: R});
+ // var cell_ref = XLSX.utils.encode_cell({c: C, r: R});
if (typeof cell.v === 'number') cell.t = 'n';
else if (typeof cell.v === 'boolean') cell.t = 'b';
else if (cell.v instanceof Date) {
- cell.t = 'n';
- cell.z = XLSX.SSF._table[14];
- cell.v = datenum(cell.v);
+ // cell.t = 'n';
+ // cell.z = XLSX.SSF._table[14];
+ // cell.v = datenum(cell.v);
}
else cell.t = 's';
ws[cell_ref] = cell;
}
}
- if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range);
+ // if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range);
return ws;
}
@@ -114,9 +114,9 @@ export function export_table_to_excel(id) {
wb.SheetNames.push(ws_name);
wb.Sheets[ws_name] = ws;
- var wbout = XLSX.write(wb, {bookType: 'xlsx', bookSST: false, type: 'binary'});
+ // var wbout = XLSX.write(wb, {bookType: 'xlsx', bookSST: false, type: 'binary'});
- saveAs(new Blob([s2ab(wbout)], {type: "application/octet-stream"}), "test.xlsx")
+ // saveAs(new Blob([s2ab(wbout)], {type: "application/octet-stream"}), "test.xlsx")
}
function formatJson(jsonData) {
@@ -137,7 +137,7 @@ export function export_json_to_excel(th, jsonData, defaultTitle) {
wb.SheetNames.push(ws_name);
wb.Sheets[ws_name] = ws;
- var wbout = XLSX.write(wb, {bookType: 'xlsx', bookSST: false, type: 'binary'});
+ // var wbout = XLSX.write(wb, {bookType: 'xlsx', bookSST: false, type: 'binary'});
var title = defaultTitle || '列表'
saveAs(new Blob([s2ab(wbout)], {type: "application/octet-stream"}), title + ".xlsx")
}
From 747f6e7f76f5e018860096d3932550eb8bed2df1 Mon Sep 17 00:00:00 2001
From: wangdongjun
Date: Tue, 6 Jan 2026 22:34:41 +0800
Subject: [PATCH 08/21] 1
---
src/views/gen/table/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/gen/table/index.vue b/src/views/gen/table/index.vue
index 9ceb0c2..574318c 100644
--- a/src/views/gen/table/index.vue
+++ b/src/views/gen/table/index.vue
@@ -82,7 +82,7 @@ import { list } from '/@/api/gen/datasource';
import { useMessage } from '/@/hooks/message';
import { useI18n } from 'vue-i18n';
import { validateNull } from '/@/utils/validate';
-import BatchGenDialog from './BatchGenDialog.vue';
+import BatchGenDialog from './batchGenDialog.vue';
import { ElMessage } from 'element-plus';
// 定义变量内容
From 3fd6a0ac27134b808db668b70ee21b3af775ea9e Mon Sep 17 00:00:00 2001
From: wangdongjun
Date: Tue, 6 Jan 2026 22:38:23 +0800
Subject: [PATCH 09/21] 1
---
nginx/deploy.conf | 80 ++++++++++++++++++++++++++++++++++++++++++++
nginx/developer.conf | 80 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 160 insertions(+)
create mode 100644 nginx/deploy.conf
create mode 100644 nginx/developer.conf
diff --git a/nginx/deploy.conf b/nginx/deploy.conf
new file mode 100644
index 0000000..ccb4eb4
--- /dev/null
+++ b/nginx/deploy.conf
@@ -0,0 +1,80 @@
+client_body_buffer_size 10M;
+large_client_header_buffers 4 8M;
+server {
+
+ listen 80;
+ server_name localhost;
+ client_max_body_size 100M;
+
+
+ #charset koi8-r;
+ #access_log /var/log/nginx/host.access.log main;
+
+ #add_header X-Frame-Options SAMEORIGIN;
+ add_header Cache-Control no-store,max-age:0;
+ add_header X-XSS-Protection "1; mode=block";
+ add_header X-Content-Type-Options nosniff;
+ add_header Content-Security-Policy DENY;
+ add_header Referrer-Policy no-referrer;
+ add_header Strict-Transport-Security "max-age=63072000; includeSubdomains; preload";
+ add_header X-Permitted-Cross-Domain-Policies "master-only";
+ add_header X-Download-Options "noopen" always;
+ add_header 'Referrer-Policy' 'origin';
+ gzip_vary on;
+ gzip_disable "MSIE [1-6]\.(?!.*SV1)";
+ location / {
+ root /usr/share/nginx/html;
+ index index.html index.htm;
+ gzip on;
+ gzip_min_length 1k;
+ gzip_buffers 4 16k;
+ gzip_http_version 1.1;
+ gzip_comp_level 9;
+ gzip_types text/plain application/x-javascript text/css application/xml text/javascript application/x-httpd-php application/javascript application/json;
+ gzip_disable "MSIE [1-6]\.";
+ gzip_vary on;
+ gzip_static on;
+ }
+
+ #error_page 404 /404.html;
+
+ # redirect server error pages to the static page /50x.html
+ #
+
+
+
+ location ^~/api/ {
+ proxy_pass http://cloud-gateway-service:8001/;
+ proxy_connect_timeout 60s;
+ proxy_read_timeout 120s;
+ proxy_send_timeout 120s;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto http;
+ proxy_http_version 1.1;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection "upgrade";
+ proxy_set_header Host $http_host;
+ }
+
+ # 屏蔽所有敏感路径，不用改代码配置开关，双重保护
+ location ~* ^/(actuator|swagger-ui|v3/api-docs|swagger-resources|webjars|doc.html) {
+ return 403; # 禁止访问
+ }
+
+ error_page 500 502 503 504 /50x.html;
+ location = /50x.html {
+ root /usr/share/nginx/html;
+ }
+
+ # 避免端点安全问题
+ location ~ .*\/actuator.* {
+ deny all; # 这样配置返回403
+ }
+
+ # 避免接口暴露问题
+ location ~ .*\/api-docs.* {
+ deny all; # 这样配置返回403
+ }
+
+ }
diff --git a/nginx/developer.conf b/nginx/developer.conf
new file mode 100644
index 0000000..ccb4eb4
--- /dev/null
+++ b/nginx/developer.conf
@@ -0,0 +1,80 @@
+client_body_buffer_size 10M;
+large_client_header_buffers 4 8M;
+server {
+
+ listen 80;
+ server_name localhost;
+ client_max_body_size 100M;
+
+
+ #charset koi8-r;
+ #access_log /var/log/nginx/host.access.log main;
+
+ #add_header X-Frame-Options SAMEORIGIN;
+ add_header Cache-Control no-store,max-age:0;
+ add_header X-XSS-Protection "1; mode=block";
+ add_header X-Content-Type-Options nosniff;
+ add_header Content-Security-Policy DENY;
+ add_header Referrer-Policy no-referrer;
+ add_header Strict-Transport-Security "max-age=63072000; includeSubdomains; preload";
+ add_header X-Permitted-Cross-Domain-Policies "master-only";
+ add_header X-Download-Options "noopen" always;
+ add_header 'Referrer-Policy' 'origin';
+ gzip_vary on;
+ gzip_disable "MSIE [1-6]\.(?!.*SV1)";
+ location / {
+ root /usr/share/nginx/html;
+ index index.html index.htm;
+ gzip on;
+ gzip_min_length 1k;
+ gzip_buffers 4 16k;
+ gzip_http_version 1.1;
+ gzip_comp_level 9;
+ gzip_types text/plain application/x-javascript text/css application/xml text/javascript application/x-httpd-php application/javascript application/json;
+ gzip_disable "MSIE [1-6]\.";
+ gzip_vary on;
+ gzip_static on;
+ }
+
+ #error_page 404 /404.html;
+
+ # redirect server error pages to the static page /50x.html
+ #
+
+
+
+ location ^~/api/ {
+ proxy_pass http://cloud-gateway-service:8001/;
+ proxy_connect_timeout 60s;
+ proxy_read_timeout 120s;
+ proxy_send_timeout 120s;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto http;
+ proxy_http_version 1.1;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection "upgrade";
+ proxy_set_header Host $http_host;
+ }
+
+ # 屏蔽所有敏感路径，不用改代码配置开关，双重保护
+ location ~* ^/(actuator|swagger-ui|v3/api-docs|swagger-resources|webjars|doc.html) {
+ return 403; # 禁止访问
+ }
+
+ error_page 500 502 503 504 /50x.html;
+ location = /50x.html {
+ root /usr/share/nginx/html;
+ }
+
+ # 避免端点安全问题
+ location ~ .*\/actuator.* {
+ deny all; # 这样配置返回403
+ }
+
+ # 避免接口暴露问题
+ location ~ .*\/api-docs.* {
+ deny all; # 这样配置返回403
+ }
+
+ }
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 10/21] 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 @@
-
+
+
+
-
- ![]()
-
-
+
+
+
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 @@
-
-
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"
/>
-
-
-
+
+ >([])
// 导出加载状态
@@ -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%"
/>
From bb06c8199739c141ade7b1db3a5bdedb8593dbb2 Mon Sep 17 00:00:00 2001
From: guochunsi <1595020186@qq.com>
Date: Wed, 7 Jan 2026 16:32:29 +0800
Subject: [PATCH 11/21] ren
---
.../professional/professionalqualificationrelation/index.vue | 4 ++--
.../professionalteacheracademicrelation/index.vue | 4 ++--
.../professionalteachercertificaterelation/index.vue | 4 ++--
src/views/professional/professionalteacherhonor/index.vue | 4 ++--
src/views/professional/professionaltitlerelation/index.vue | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/views/professional/professionalqualificationrelation/index.vue b/src/views/professional/professionalqualificationrelation/index.vue
index ff13d7e..2882b95 100644
--- a/src/views/professional/professionalqualificationrelation/index.vue
+++ b/src/views/professional/professionalqualificationrelation/index.vue
@@ -191,7 +191,7 @@ import { useMessageBox } from '/@/hooks/message'
import { useDict } from '/@/hooks/dict'
import {
fetchList,
- putObj,
+ examObj,
delObj,
exportExcel
} from '/@/api/professional/professionaluser/professionalqualificationrelation'
@@ -301,7 +301,7 @@ const changeState = (row: any, val: number) => {
const str = '通过'
messageBox.confirm(`是否确认${str}${row.realName}的申请`).then(async () => {
try {
- await putObj({
+ await examObj({
id: row.id,
state: val
})
diff --git a/src/views/professional/professionalteacheracademicrelation/index.vue b/src/views/professional/professionalteacheracademicrelation/index.vue
index 3e41c8c..a3568b3 100755
--- a/src/views/professional/professionalteacheracademicrelation/index.vue
+++ b/src/views/professional/professionalteacheracademicrelation/index.vue
@@ -217,7 +217,7 @@ import { useMessageBox } from '/@/hooks/message'
import { useDict } from '/@/hooks/dict'
import {
fetchList,
- putObj,
+ examObj,
delObj,
exportExcel
} from '/@/api/professional/professionaluser/professionalteacheracademicrelation'
@@ -341,7 +341,7 @@ const changeState = (row: any, val: number) => {
const str = '通过'
messageBox.confirm(`是否确认${str}${row.realName}的申请`).then(async () => {
try {
- await putObj({
+ await examObj({
id: row.id,
state: val
})
diff --git a/src/views/professional/professionalteachercertificaterelation/index.vue b/src/views/professional/professionalteachercertificaterelation/index.vue
index 82d6165..33d33a2 100755
--- a/src/views/professional/professionalteachercertificaterelation/index.vue
+++ b/src/views/professional/professionalteachercertificaterelation/index.vue
@@ -188,7 +188,7 @@ import { useDict } from '/@/hooks/dict'
import { getTeacherCertificateList } from '/@/api/professional/rsbase/professionalteachercertificateconf'
import {
fetchList,
- putObj,
+ examObj,
delObj,
exportExcel
} from '/@/api/professional/professionaluser/professionalteachercertificaterelation'
@@ -294,7 +294,7 @@ const changeState = (row: any, val: number) => {
const str = '通过'
messageBox.confirm(`是否确认${str}${row.realName}的申请`).then(async () => {
try {
- await putObj({
+ await examObj({
id: row.id,
state: val
})
diff --git a/src/views/professional/professionalteacherhonor/index.vue b/src/views/professional/professionalteacherhonor/index.vue
index 872b84a..78bdf1b 100755
--- a/src/views/professional/professionalteacherhonor/index.vue
+++ b/src/views/professional/professionalteacherhonor/index.vue
@@ -182,7 +182,7 @@ import { useMessageBox } from '/@/hooks/message'
import { useDict } from '/@/hooks/dict'
import {
fetchList,
- putObj,
+ examObj,
delObj
} from '/@/api/professional/professionaluser/professionalteacherhonor'
import { defineAsyncComponent } from 'vue'
@@ -277,7 +277,7 @@ const changeState = (row: any, val: number) => {
const str = '通过'
messageBox.confirm(`是否确认${str}${row.teacherName || row.realName}的申请`).then(async () => {
try {
- await putObj({
+ await examObj({
id: row.id,
state: val
})
diff --git a/src/views/professional/professionaltitlerelation/index.vue b/src/views/professional/professionaltitlerelation/index.vue
index 4bdcbee..33dff20 100755
--- a/src/views/professional/professionaltitlerelation/index.vue
+++ b/src/views/professional/professionaltitlerelation/index.vue
@@ -228,7 +228,7 @@ import { useDict } from '/@/hooks/dict'
// 接口
import {
fetchList,
- putObj,
+ examObj,
delObj,
exportRelation
} from '/@/api/professional/professionaluser/professionaltitlerelation'
@@ -335,7 +335,7 @@ const changeState = (row: any, val: number) => {
const str = '通过'
messageBox.confirm(`是否确认${str}${row.realName}的申请`).then(async () => {
try {
- await putObj({
+ await examObj({
id: row.id,
state: val
})
From 9e3e775b0f2980bcd8e80d77ec94a4aac13a5503 Mon Sep 17 00:00:00 2001
From: guochunsi <1595020186@qq.com>
Date: Wed, 7 Jan 2026 18:33:03 +0800
Subject: [PATCH 12/21] ren
---
.../tools}/action-dropdown.vue | 1 +
src/components/tools/auth-img.vue | 201 ++++++------------
src/components/tools/preview-file.vue | 141 ++++++++++++
src/composables/useTableColumns.ts | 36 +++-
.../index.vue | 4 +-
.../index.vue | 4 +-
.../index.vue | 4 +-
.../professionalteacherhonor/index.vue | 4 +-
.../professionaltitlerelation/index.vue | 4 +-
src/views/professional/teacherbase/index.vue | 2 +-
.../professional/teacherbase/multiDialog.vue | 31 ++-
11 files changed, 277 insertions(+), 155 deletions(-)
rename src/{views/professional/teacherbase => components/tools}/action-dropdown.vue (99%)
create mode 100644 src/components/tools/preview-file.vue
diff --git a/src/views/professional/teacherbase/action-dropdown.vue b/src/components/tools/action-dropdown.vue
similarity index 99%
rename from src/views/professional/teacherbase/action-dropdown.vue
rename to src/components/tools/action-dropdown.vue
index 256ac3a..9de20bf 100644
--- a/src/views/professional/teacherbase/action-dropdown.vue
+++ b/src/components/tools/action-dropdown.vue
@@ -89,3 +89,4 @@ const handleCommand = (command: string) => {
}
+
diff --git a/src/components/tools/auth-img.vue b/src/components/tools/auth-img.vue
index 9884797..d69319b 100644
--- a/src/components/tools/auth-img.vue
+++ b/src/components/tools/auth-img.vue
@@ -1,150 +1,85 @@
-
-