diff --git a/src/components/IconText/index.vue b/src/components/IconText/index.vue new file mode 100644 index 0000000..e302bb6 --- /dev/null +++ b/src/components/IconText/index.vue @@ -0,0 +1,168 @@ + + + + + diff --git a/src/components/index.ts b/src/components/index.ts index 431e362..4a28aa0 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -16,6 +16,7 @@ import Sign from '/@/components/Sign/index.vue'; import ChinaArea from '/@/components/ChinaArea/index.vue'; import OrgSelector from '/@/components/OrgSelector/index.vue'; import AiEditor from '/@/components/AiEditor/index.vue'; +import IconText from '/@/components/IconText/index.vue'; // 第三方组件 import ElementPlus from 'element-plus'; @@ -56,6 +57,7 @@ export default { app.component('ChinaArea', ChinaArea); app.component('OrgSelector', OrgSelector); app.component('Sign', Sign); + app.component('IconText', IconText); // 导入全部的elmenet-plus的图标 for (const [key, component] of Object.entries(ElementPlusIconsVue)) { diff --git a/src/theme/element.scss b/src/theme/element.scss index 585f441..7b0c4e9 100644 --- a/src/theme/element.scss +++ b/src/theme/element.scss @@ -504,3 +504,60 @@ svg { .fc-form-row .fc-form-col { margin-bottom: 18px; } + +/* Tag 标签 +------------------------------- */ +// 全局优化 el-tag 背景色和文字颜色,提高对比度和可读性 +.el-tag { + // 成功类型 - 浅绿背景 + 深绿文字 + &.el-tag--success { + --el-tag-bg-color: #f0f9eb !important; + --el-tag-text-color: #67c23a !important; + background-color: #f0f9eb !important; + color: #67c23a !important; + border-color: #b3e19d !important; + } + + // 危险类型 - 浅红背景 + 深红文字 + &.el-tag--danger { + --el-tag-bg-color: #fef0f0 !important; + --el-tag-text-color: #f56c6c !important; + background-color: #fef0f0 !important; + color: #f56c6c !important; + border-color: #fbc4c4 !important; + } + + // 警告类型 - 浅黄背景 + 深橙文字 + &.el-tag--warning { + --el-tag-bg-color: #fdf6ec !important; + --el-tag-text-color: #e6a23c !important; + background-color: #fdf6ec !important; + color: #e6a23c !important; + border-color: #f5dab1 !important; + } + + // 信息类型 - 浅灰背景 + 深灰文字 + &.el-tag--info { + --el-tag-bg-color: #f4f4f5 !important; + --el-tag-text-color: #909399 !important; + background-color: #f4f4f5 !important; + color: #909399 !important; + border-color: #d3d4d6 !important; + } + + // 主要类型 - 浅蓝背景 + 深蓝文字 + &.el-tag--primary { + --el-tag-bg-color: #ecf5ff !important; + --el-tag-text-color: #409eff !important; + background-color: #ecf5ff !important; + color: #409eff !important; + border-color: #b3d8ff !important; + } + + // 确保文字颜色应用到所有子元素 + .el-tag__content, + .el-icon, + .el-tag__close { + color: inherit !important; + } +} diff --git a/src/views/recruit/recruitImitateAdjustBatch/mnTable.vue b/src/views/recruit/recruitImitateAdjustBatch/mnTable.vue index 66d94c2..9b50725 100644 --- a/src/views/recruit/recruitImitateAdjustBatch/mnTable.vue +++ b/src/views/recruit/recruitImitateAdjustBatch/mnTable.vue @@ -10,7 +10,7 @@ 新增 - { } }).catch(() => { // 错误处理 - }) + }) } else { // 新增模式:设置默认招生计划 getList().then((data: any) => { if (data.data && data.data.length > 0) { dataForm.groupId = data.data[0]?.id || "" - } - }) + } + }) } } diff --git a/src/views/recruit/recruitstudentschool/detaiform.vue b/src/views/recruit/recruitstudentschool/detaiform.vue index 133d533..d773ae3 100644 --- a/src/views/recruit/recruitstudentschool/detaiform.vue +++ b/src/views/recruit/recruitstudentschool/detaiform.vue @@ -176,8 +176,8 @@ const init = (id: string | null) => { getList().then((data: any) => { if (data.data && data.data.length > 0) { dataForm.groupId = data.data[0]?.id || "" - } - }) + } + }) } } diff --git a/src/views/recruit/recruitstudentsignup/AdmissionNoticeDialog.vue b/src/views/recruit/recruitstudentsignup/AdmissionNoticeDialog.vue index 33604db..cc6fab7 100644 --- a/src/views/recruit/recruitstudentsignup/AdmissionNoticeDialog.vue +++ b/src/views/recruit/recruitstudentsignup/AdmissionNoticeDialog.vue @@ -6,7 +6,7 @@ @@ -19,12 +19,6 @@ import { toWord, sureLQTZ } from '/@/api/recruit/recruitstudentsignup' export default { name: 'AdmissionNoticeDialog', - props: { - permissions: { - type: Object, - default: () => ({}) - } - }, emits: ['refresh'], setup(props, { emit }) { const visible = ref(false) diff --git a/src/views/recruit/recruitstudentsignup/index.vue b/src/views/recruit/recruitstudentsignup/index.vue index 885f174..6405138 100644 --- a/src/views/recruit/recruitstudentsignup/index.vue +++ b/src/views/recruit/recruitstudentsignup/index.vue @@ -271,16 +271,15 @@
新增 招生名单打包导出 @@ -296,7 +295,7 @@ type="primary" plain icon="UploadFilled" - v-if="permissions.recruit_send_img" + v-auth="'recruit_send_img'" @click="handleSendImg()">图片同步
@@ -314,59 +313,18 @@ @@ -374,7 +332,7 @@ prop="serialNumber" header-align="center" align="center" - width="120" + width="110" label="唯一号"> - + + + + + + + + + + + + + + +
- ({{scope.row.auditorName}}) + ({{scope.row.auditorName}}) + - @@ -473,7 +548,13 @@ width="90" label="缴费状态">
@@ -511,7 +595,7 @@ - + @@ -521,11 +605,11 @@ diff --git a/src/views/recruit/recruitstudentsignup/majorChange.vue b/src/views/recruit/recruitstudentsignup/majorChange.vue index 6253af2..b6cb46e 100644 --- a/src/views/recruit/recruitstudentsignup/majorChange.vue +++ b/src/views/recruit/recruitstudentsignup/majorChange.vue @@ -111,11 +111,11 @@ import { ref, reactive, nextTick } from 'vue' import { ElNotification } from 'element-plus' import { useMessageBox } from '/@/hooks/message' -import { getObj, changeMajor } from '@/api/recruit/recruitstudentsignup' -import { getList } from "@/api/recruit/recruitstudentplangroup" -import { listByEdu } from "@/api/recruit/recruitstudentplan" -import { getDictByType } from "@/api/contract/contract" -import { list as scoreList } from "@/api/recruit/recruitstudentplancorrectscoreconfig" +import { getObj, changeMajor } from '/@/api/recruit/recruitstudentsignup' +import { getList } from "/@/api/recruit/recruitstudentplangroup" +import { listByEdu } from "/@/api/recruit/recruitstudentplan" +import { getDictsByTypes } from "/@/api/admin/dict" +import { list as scoreList } from "/@/api/recruit/recruitstudentplancorrectscoreconfig" // 消息提示 hooks const messageBox = useMessageBox() @@ -323,10 +323,10 @@ const init = (id: string | null) => { dataFormRef.value?.resetFields() if (dataForm.id) { // 获取数据字典代办费 - getDictByType("agency_fee").then((res: any) => { + getDictsByTypes(["agency_fee"]).then((res: any) => { agencyFeeList.value = res.data // 获取数据字典学费 - getDictByType("tuition_fee").then((res: any) => { + getDictsByTypes(["tuition_fee"]).then((res: any) => { tuitionFeeList.value = res.data getObj(dataForm.id).then((response: any) => { Object.assign(dataForm, response.data) diff --git a/src/views/recruit/recruitstudentsignup/update.vue b/src/views/recruit/recruitstudentsignup/update.vue index cadf814..3a99c29 100644 --- a/src/views/recruit/recruitstudentsignup/update.vue +++ b/src/views/recruit/recruitstudentsignup/update.vue @@ -4,14 +4,14 @@ :close-on-click-modal="false" v-model="visible" append-to-body - width="90%"> + width="1000px"> + label-width="120px"> + placeholder="请选择招生计划"> - + - - - + - + + @@ -164,7 +163,7 @@ - + @@ -173,8 +172,8 @@ @@ -192,9 +191,9 @@ import { storeToRefs } from 'pinia' import { useUserInfo } from '/@/stores/userInfo' import { Session } from '/@/utils/storage' import axios from 'axios' -import { getObj, updateInfo } from '@/api/recruit/recruitstudentsignup' -import { getList } from "@/api/recruit/recruitstudentplangroup" -import { queryAllTeacher } from "@/api/professional/teacherbase" +import { getObj, updateInfo } from '/@/api/recruit/recruitstudentsignup' +import { getList } from '/@/api/recruit/recruitstudentplangroup' +import { queryAllTeacher } from '/@/api/professional/professionaluser/teacherbase' // 使用 Pinia store const userInfoStore = useUserInfo() @@ -631,7 +630,12 @@ defineExpose({ }) -