diff --git a/.env b/.env index 3e4929e..ade21e4 100644 --- a/.env +++ b/.env @@ -2,10 +2,10 @@ VITE_PORT = 3101 # 网站标题 -VITE_GLOB_APP_TITLE = 护理单元业务系统 +VITE_GLOB_APP_TITLE = 护理单元业务平台 # 简称,此变量只能是字符/下划线 -VITE_GLOB_APP_SHORT_NAME = 护理单元业务系统 +VITE_GLOB_APP_SHORT_NAME = 护理单元业务平台 # 单点登录服务端地址 VITE_GLOB_APP_CAS_BASE_URL=http://cas.test.com:8443/cas diff --git a/.env.production b/.env.production index aa67b52..e2c31c4 100644 --- a/.env.production +++ b/.env.production @@ -2,7 +2,7 @@ VITE_USE_MOCK = false # 发布路径 -VITE_PUBLIC_PATH = /biz102 +VITE_PUBLIC_PATH = /biz101 # 是否启用gzip或brotli压缩 # 选项值: gzip | brotli | none @@ -13,10 +13,10 @@ VITE_BUILD_COMPRESS = 'gzip' VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false #后台接口父地址(必填) -VITE_GLOB_API_URL=/nursingunit102 +VITE_GLOB_API_URL=/nursingunit101 #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit102 +VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit101 # 接口父路径前缀 VITE_GLOB_API_URL_PREFIX= diff --git a/src/assets/loginmini/icon/logo_yw.png b/src/assets/loginmini/icon/logo_yw.png index 30d58d5..26ca558 100644 Binary files a/src/assets/loginmini/icon/logo_yw.png and b/src/assets/loginmini/icon/logo_yw.png differ diff --git a/src/views/system/user/user.data.ts b/src/views/system/user/user.data.ts index e3b8143..45b4128 100644 --- a/src/views/system/user/user.data.ts +++ b/src/views/system/user/user.data.ts @@ -34,11 +34,11 @@ export const columns: BasicColumn[] = [ dataIndex: 'phone', width: 100, }, - // { - // title: '部门', - // width: 150, - // dataIndex: 'orgCodeTxt', - // }, + { + title: '部门', + width: 150, + dataIndex: 'orgCodeTxt', + }, { title: '可登录类型', width: 150, @@ -204,37 +204,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',