Selaa lähdekoodia

reactor:排班管理对接;

zhangchong 1 vuosi sitten
vanhempi
commit
513e37ced5

+ 14 - 1
src/components/TextTooltip/index.vue

@@ -1,5 +1,10 @@
 <template>
-	<el-tooltip :content="props.tooltipContent ? props.tooltipContent : props.content" placement="right" :disabled="isShow" effect="light">
+	<el-tooltip
+		:content="props.tooltipContent ? props.tooltipContent : props.content"
+		:placement="props.placement"
+		:disabled="isShow"
+		:effect="props.effect"
+	>
 		<template #content>
 			<!-- 此处的默认值先看tooltipContent有没有,没有就给默认content -->
 			<slot name="tooltipContent">{{ props.tooltipContent ? props.tooltipContent : props.content }}</slot>
@@ -24,6 +29,14 @@ const props = defineProps({
 		type: String,
 		default: '',
 	},
+	effect: {
+		type: String,
+		default: 'light',
+	},
+	placement: {
+		type: String,
+		default: 'right',
+	},
 });
 // 使用isShow来控制tooltip是否显示
 let isShow = ref<boolean>(true);

+ 4 - 0
src/views/knowledge/config/type/index.vue

@@ -64,6 +64,7 @@ import other from '@/utils/other';
 // 引入组件
 const KnowledgeTypeAdd = defineAsyncComponent(() => import('@/views/knowledge/config/type/component/Knowledge-type-add.vue')); // 新增组件
 const KnowledgeTypeEdit = defineAsyncComponent(() => import('@/views/knowledge/config/type/component/Knowledge-type-edit.vue')); // 修改组件
+const TextTooltip = defineAsyncComponent(() => import('@/components/TextTooltip/index.vue'));
 
 // 定义变量内容
 const ruleFormRef = ref<RefType>(); // 表单ref
@@ -83,6 +84,9 @@ const state = reactive<any>({
 			dataKey: 'name',
 			title: '类型名称',
 			width: 600,
+      cellRenderer: (data: any) => {
+        return <TextTooltip content={data.rowData.name} effect="dark" placement="top"></TextTooltip>;
+      },
 		},
 		{
 			key: 'sort',

+ 10 - 0
src/views/system/organize/index.vue

@@ -66,6 +66,7 @@ import other from '@/utils/other';
 // 引入组件
 const OrgAdd = defineAsyncComponent(() => import('@/views/system/organize/component/Org-add.vue')); // 新增组织机构
 const OrgEdit = defineAsyncComponent(() => import('@/views/system/organize/component/Org-edit.vue')); // 编辑组织机构
+const TextTooltip = defineAsyncComponent(() => import('@/components/TextTooltip/index.vue'));
 
 // 定义变量内容
 const state = reactive<any>({
@@ -82,18 +83,27 @@ const state = reactive<any>({
 			dataKey: 'name',
 			title: '部门名称',
 			width: 300,
+      cellRenderer: (data: any) => {
+        return <TextTooltip content={data.rowData.name} effect="dark" placement="top"></TextTooltip>;
+      },
 		},
 		{
 			key: 'shortName',
 			dataKey: 'shortName',
 			title: '部门简称',
 			width: 300,
+      cellRenderer: (data: any) => {
+        return <TextTooltip content={data.rowData.shortName} effect="dark" placement="top"></TextTooltip>;
+      },
 		},
 		{
 			key: 'parentName',
 			dataKey: 'parentName',
 			title: '上级部门',
 			width: 200,
+      cellRenderer: (data: any) => {
+        return <TextTooltip content={data.rowData.parentName} effect="dark" placement="top"></TextTooltip>;
+      },
 		},
 		{
 			key: 'orgTypeText',

+ 1 - 1
src/views/system/workforce/components/Select-number.vue

@@ -54,7 +54,7 @@ const openDialog = async (row: any) => {
 	try {
 		const numberRes = await getWorkforceClassList({ PageSize: 999999, PageIndex: 1 });
 		numberOptions.value = numberRes.result?.items ?? [];
-		dialogTitle.value = `选择 ${row.row?.schedulingUserName}【${row.column?.property}】排班`;
+		dialogTitle.value = `选择 【${row.row?.SchedulingUserName} ${row.column?.property}】排班`;
 		const schedulingRes = await getSchedulingDetail(schedulingId.value);
 		state.ruleForm.shiftId = schedulingRes.result?.shiftId;
 		state.dialogVisible = true;