diff --git a/src/views/biz/bizEmployeesInfo/employeesServiceTag/EmployeesServiceTagForm.vue b/src/views/biz/bizEmployeesInfo/employeesServiceTag/EmployeesServiceTagForm.vue
index ed0a273..b7fce48 100644
--- a/src/views/biz/bizEmployeesInfo/employeesServiceTag/EmployeesServiceTagForm.vue
+++ b/src/views/biz/bizEmployeesInfo/employeesServiceTag/EmployeesServiceTagForm.vue
@@ -7,7 +7,7 @@
- 可选服务标签
+ 可选服务标签
@@ -19,7 +19,7 @@
-
已选服务标签
+
已选服务标签
@@ -203,4 +203,8 @@ import { defHttp } from '/@/utils/http/axios';
:deep(.ant-picker),:deep(.ant-input-number){
width: 100%;
}
+ .title1Class{
+ // background-image: url(../../../../../public/resource/img/titleBackground1.jpg);
+ // width: 100px;
+ }
\ No newline at end of file
diff --git a/src/views/system/user/user.data.ts b/src/views/system/user/user.data.ts
index 123a351..f04e33b 100644
--- a/src/views/system/user/user.data.ts
+++ b/src/views/system/user/user.data.ts
@@ -14,12 +14,12 @@ export const columns: BasicColumn[] = [
dataIndex: 'realname',
width: 100,
},
- {
- title: '头像',
- dataIndex: 'avatar',
- width: 120,
- customRender: render.renderAvatar,
- },
+ // {
+ // title: '头像',
+ // dataIndex: 'avatar',
+ // width: 120,
+ // customRender: render.renderAvatar,
+ // },
{
title: '性别',
dataIndex: 'sex',
@@ -34,10 +34,15 @@ export const columns: BasicColumn[] = [
dataIndex: 'phone',
width: 100,
},
+ // {
+ // title: '部门',
+ // width: 150,
+ // dataIndex: 'orgCodeTxt',
+ // },
{
- title: '部门',
+ title: '可登录类型',
width: 150,
- dataIndex: 'orgCodeTxt',
+ dataIndex: 'loginType_dictText',
},
{
title: '状态',
@@ -193,37 +198,37 @@ export const formSchema: FormSchema[] = [
immediate: false,
},
},
- {
- label: '所属部门',
- field: 'selecteddeparts',
- component: 'JSelectDept',
- componentProps: ({ formActionType, formModel }) => {
- return {
- sync: false,
- checkStrictly: true,
- defaultExpandLevel: 2,
+ // {
+ // label: '所属部门',
+ // field: 'selecteddeparts',
+ // component: 'JSelectDept',
+ // componentProps: ({ formActionType, formModel }) => {
+ // return {
+ // sync: false,
+ // checkStrictly: true,
+ // defaultExpandLevel: 2,
- onSelect: (options, values) => {
- const { updateSchema } = formActionType;
- //所属部门修改后更新负责部门下拉框数据
- updateSchema([
- {
- field: 'departIds',
- componentProps: { options },
- },
- ]);
- //update-begin---author:wangshuai---date:2024-05-11---for:【issues/1222】用户编辑界面“所属部门”与“负责部门”联动出错整---
- if(!values){
- formModel.departIds = [];
- return;
- }
- //update-end---author:wangshuai---date:2024-05-11---for:【issues/1222】用户编辑界面“所属部门”与“负责部门”联动出错整---
- //所属部门修改后更新负责部门数据
- formModel.departIds && (formModel.departIds = formModel.departIds.filter((item) => values.value.indexOf(item) > -1));
- },
- };
- },
- },
+ // onSelect: (options, values) => {
+ // const { updateSchema } = formActionType;
+ // //所属部门修改后更新负责部门下拉框数据
+ // updateSchema([
+ // {
+ // field: 'departIds',
+ // componentProps: { options },
+ // },
+ // ]);
+ // //update-begin---author:wangshuai---date:2024-05-11---for:【issues/1222】用户编辑界面“所属部门”与“负责部门”联动出错整---
+ // if(!values){
+ // formModel.departIds = [];
+ // return;
+ // }
+ // //update-end---author:wangshuai---date:2024-05-11---for:【issues/1222】用户编辑界面“所属部门”与“负责部门”联动出错整---
+ // //所属部门修改后更新负责部门数据
+ // formModel.departIds && (formModel.departIds = formModel.departIds.filter((item) => values.value.indexOf(item) > -1));
+ // },
+ // };
+ // },
+ // },
{
label: '租户',
field: 'relTenantIds',
@@ -266,14 +271,14 @@ export const formSchema: FormSchema[] = [
// ifShow: ({ values }) => values.userIdentity == 2,
ifShow: false,
},
- {
- label: '头像',
- field: 'avatar',
- component: 'JImageUpload',
- componentProps: {
- fileMax: 1,
- },
- },
+ // {
+ // label: '头像',
+ // field: 'avatar',
+ // component: 'JImageUpload',
+ // componentProps: {
+ // fileMax: 1,
+ // },
+ // },
{
label: '生日',
field: 'birthday',
@@ -290,6 +295,15 @@ export const formSchema: FormSchema[] = [
stringToNumber: true,
},
},
+ {
+ label: '可登录类型',
+ field: 'loginType',
+ required: false,
+ component: 'JSelectMultiple',
+ componentProps: {
+ dictCode: 'login_type',
+ },
+ },
{
label: '手机号码',
field: 'phone',