From 7e4b5106faaa03c662c98d4af12671b5ffc6067b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Sat, 7 Sep 2024 16:19:00 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/bl/xxhbjwxtscwjxx/Xxhbjwxtscwjxx.data.ts | 13 +++++++++++-- .../src/views/bl/xxhbjwxtxsmd/Xxhbjwxtxsmd.data.ts | 3 ++- .../system/role/components/UseSelectModalNew.vue | 6 ++++++ jeecgboot-vue3/src/views/system/role/role.data.ts | 10 ++++++++-- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/Xxhbjwxtscwjxx.data.ts b/jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/Xxhbjwxtscwjxx.data.ts index 389ef87..2025bc0 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/Xxhbjwxtscwjxx.data.ts +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/Xxhbjwxtscwjxx.data.ts @@ -3,17 +3,26 @@ import {FormSchema} from '/@/components/Table'; import { rules} from '/@/utils/helper/validator'; import { render } from '/@/utils/common/renderUtils'; import { getWeekMonthQuarterYear } from '/@/utils'; +import {h} from "vue"; //列表数据 export const columns: BasicColumn[] = [ { title: '文件名称', align: "center", - dataIndex: 'name' + dataIndex: 'name', + ellipsis: false, + customRender:({ text }) => { + return h('div', {style: {"width": "100%", "text-align":"left"}},text) + } }, { title: '存储路径', align: "center", - dataIndex: 'path' + dataIndex: 'path', + ellipsis: false, + customRender:({ text }) => { + return h('div', {style: {"width": "100%", "text-align":"left"}},text) + } }, { title: '创建人', diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/Xxhbjwxtxsmd.data.ts b/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/Xxhbjwxtxsmd.data.ts index 1b95387..d3d26b3 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/Xxhbjwxtxsmd.data.ts +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/Xxhbjwxtxsmd.data.ts @@ -9,7 +9,8 @@ export const columns: BasicColumn[] = [ title: '课程任务代码', align: "center", dataIndex: 'kcrwdm', - width: 200, + width: 280, + ellipsis: false }, { title: '年级', diff --git a/jeecgboot-vue3/src/views/system/role/components/UseSelectModalNew.vue b/jeecgboot-vue3/src/views/system/role/components/UseSelectModalNew.vue index cefcc66..7d65610 100644 --- a/jeecgboot-vue3/src/views/system/role/components/UseSelectModalNew.vue +++ b/jeecgboot-vue3/src/views/system/role/components/UseSelectModalNew.vue @@ -7,6 +7,8 @@ import { ref, unref, toRaw } from 'vue'; import { BasicModal, useModalInner } from '/src/components/Modal'; import { BasicTable, useTable, TableAction } from '/src/components/Table'; + import { useMessage } from '/@/hooks/web/useMessage'; + const { createMessage } = useMessage(); import { userColumnsNew, searchUserFormSchemaNew } from '../role.data'; import { expertList } from '../../user/user.api'; // 声明Emits @@ -49,6 +51,10 @@ //提交事件 function handleSubmit() { + if(checkedKeys.value.length <1){ + createMessage.warning('请选择要授权的专家!'); + return ; + } setModalProps({ confirmLoading: true }); //关闭弹窗 closeModal(); diff --git a/jeecgboot-vue3/src/views/system/role/role.data.ts b/jeecgboot-vue3/src/views/system/role/role.data.ts index c609b81..fccb2ce 100644 --- a/jeecgboot-vue3/src/views/system/role/role.data.ts +++ b/jeecgboot-vue3/src/views/system/role/role.data.ts @@ -74,9 +74,15 @@ export const searchFormSchema: FormSchema[] = [ export const searchUserFormSchemaNew: FormSchema[] = [ { field: 'username', - label: '专家账号', + label: '账号', component: 'Input', - colProps: { span: 12 }, + colProps: { span: 6 }, + }, + { + field: 'realname', + label: '姓名', + component: 'Input', + colProps: { span: 6 }, }, ];