样式调整
信息体组件自动带部门 tab标题显示业务功能名称 修改流程默认节点名称、修改流程线名称可为空 表单流程验证跳过
This commit is contained in:
@ -647,6 +647,21 @@
|
||||
generatorConfig.listConfig.buttonConfigs.length === 0
|
||||
) {
|
||||
generatorConfig.listConfig.buttonConfigs = [
|
||||
{
|
||||
isUse: true,
|
||||
name: t('新增'),
|
||||
code: 'add',
|
||||
icon: 'ant-design:plus-outlined',
|
||||
isDefault: true,
|
||||
type: 'primary'
|
||||
},
|
||||
{
|
||||
isUse: true,
|
||||
name: t('编辑'),
|
||||
code: 'edit',
|
||||
icon: 'ant-design:form-outlined',
|
||||
isDefault: true,
|
||||
},
|
||||
{
|
||||
isUse: true,
|
||||
name: t('刷新'),
|
||||
@ -661,20 +676,6 @@
|
||||
icon: 'ant-design:eye-outlined',
|
||||
isDefault: true,
|
||||
},
|
||||
{
|
||||
isUse: true,
|
||||
name: t('新增'),
|
||||
code: 'add',
|
||||
icon: 'ant-design:plus-outlined',
|
||||
isDefault: true,
|
||||
},
|
||||
{
|
||||
isUse: true,
|
||||
name: t('编辑'),
|
||||
code: 'edit',
|
||||
icon: 'ant-design:form-outlined',
|
||||
isDefault: true,
|
||||
},
|
||||
{
|
||||
isUse: true,
|
||||
name: t('删除'),
|
||||
|
||||
@ -41,13 +41,15 @@ import {inject, ref, watchEffect} from 'vue';
|
||||
if (props && props.value) {
|
||||
//当前用户
|
||||
if (props.infoType === 0) {
|
||||
let deptId=formModel![props.deptField];
|
||||
let deptName=deptId?await getDepartment(deptId):"";
|
||||
const deptId=formModel?.[props.deptField];
|
||||
const dept=deptId?await getDepartment(deptId):null;
|
||||
const deptName=dept?.name||"";
|
||||
//判断传入的值 是不是当前登录人 或需要二次加载 就不需要发请求获取用户信息了
|
||||
if (props.value === userStore.getUserInfo.id || props.loadAgain) {
|
||||
name.value = userStore.getUserInfo.name+(props.userNameWithDepartment&&(deptName||userStore.getUserInfo.departmentName)?("/"+(deptName||userStore.getUserInfo.departmentName)):"");
|
||||
emit('update:value', userStore.getUserInfo.id);
|
||||
} else {
|
||||
name.value = props.value;
|
||||
//如果不是当前登陆人 需要用户id 查询当前用户信息
|
||||
const userInfo = await getUser(props.value);
|
||||
name.value = userInfo.name;
|
||||
@ -61,6 +63,7 @@ import {inject, ref, watchEffect} from 'vue';
|
||||
name.value = userStore.getUserInfo.departmentName;
|
||||
emit('update:value', userStore.getUserInfo.departmentId);
|
||||
} else {
|
||||
name.value = props.value;
|
||||
//如果不是当前登陆人 需要用户id 查询当前用户信息
|
||||
const dept = await getDepartment(props.value);
|
||||
name.value = dept.name;
|
||||
@ -78,8 +81,9 @@ import {inject, ref, watchEffect} from 'vue';
|
||||
} else {
|
||||
//当前用户
|
||||
if (props.infoType === 0) {
|
||||
let deptId=formModel![props.deptField];
|
||||
let deptName=deptId?await getDepartment(deptId):"";
|
||||
const deptId=formModel?.[props.deptField];
|
||||
const dept=deptId?await getDepartment(deptId):null;
|
||||
const deptName=dept?.name||"";
|
||||
//判断传入的值 是不是当前登录人 就不需要发请求获取用户信息了
|
||||
name.value = userStore.getUserInfo.name+(props.userNameWithDepartment&&(deptName||userStore.getUserInfo.departmentName)?("/"+(deptName||userStore.getUserInfo.departmentName)):"");
|
||||
emit('update:value', userStore.getUserInfo.id);
|
||||
|
||||
@ -67,7 +67,7 @@ function handleIndexColumn(
|
||||
flag: INDEX_COLUMN_FLAG,
|
||||
width: 50,
|
||||
title: t('序号'),
|
||||
align: 'center',
|
||||
align: 'right',
|
||||
customRender: ({ index }) => {
|
||||
const getPagination = unref(getPaginationRef);
|
||||
if (isBoolean(getPagination)) {
|
||||
|
||||
@ -67,7 +67,7 @@ function handleIndexColumn(
|
||||
flag: INDEX_COLUMN_FLAG,
|
||||
width: 50,
|
||||
title: t('序号'),
|
||||
align: 'center',
|
||||
align: 'right',
|
||||
customRender: ({ index }) => {
|
||||
const getPagination = unref(getPaginationRef);
|
||||
if (isBoolean(getPagination)) {
|
||||
|
||||
Reference in New Issue
Block a user