diff --git a/public/resource/img/titleBackground1.jpg b/public/resource/img/titleBackground1.jpg
new file mode 100644
index 0000000..ad6ac35
Binary files /dev/null and b/public/resource/img/titleBackground1.jpg differ
diff --git a/src/enums/pageEnum.ts b/src/enums/pageEnum.ts
index 58651ac..975850e 100644
--- a/src/enums/pageEnum.ts
+++ b/src/enums/pageEnum.ts
@@ -12,5 +12,7 @@ export enum PageEnum {
//文件路由
SYS_FILES_PATH = '/file/share',
// 邮件中的跳转地址
- TOKEN_LOGIN = '/tokenLogin'
+ TOKEN_LOGIN = '/tokenLogin',
+ // h5白名单
+ H5_ADVISORYINFO = '/h5/advisoryInfo',
}
diff --git a/src/router/guard/permissionGuard.ts b/src/router/guard/permissionGuard.ts
index 89a297f..c030eb1 100644
--- a/src/router/guard/permissionGuard.ts
+++ b/src/router/guard/permissionGuard.ts
@@ -23,12 +23,13 @@ const SYS_FILES_PATH = PageEnum.SYS_FILES_PATH;
// 邮件中的跳转地址,对应此路由,携带token免登录直接去办理页面
const TOKEN_LOGIN = PageEnum.TOKEN_LOGIN;
+const H5_ADVISORYINFO = PageEnum.H5_ADVISORYINFO;
const ROOT_PATH = RootRoute.path;
//update-begin---author:wangshuai ---date:20220629 for:[issues/I5BG1I]vue3不支持auth2登录------------
//update-begin---author:wangshuai ---date:20221111 for: [VUEN-2472]分享免登录------------
-const whitePathList: PageEnum[] = [LOGIN_PATH, OAUTH2_LOGIN_PAGE_PATH,SYS_FILES_PATH, TOKEN_LOGIN ];
+const whitePathList: PageEnum[] = [LOGIN_PATH, OAUTH2_LOGIN_PAGE_PATH,SYS_FILES_PATH, TOKEN_LOGIN, H5_ADVISORYINFO ];
//update-end---author:wangshuai ---date:20221111 for: [VUEN-2472]分享免登录------------
//update-end---author:wangshuai ---date:20220629 for:[issues/I5BG1I]vue3不支持auth2登录------------
@@ -56,6 +57,7 @@ export function createPermissionGuard(router: Router) {
const token = userStore.getToken;
// Whitelist can be directly entered
+ console.log('whitePathList2222--->',whitePathList);
if (whitePathList.includes(to.path as PageEnum)) {
if (to.path === LOGIN_PATH && token) {
const isSessionTimeout = userStore.getSessionTimeout;
@@ -98,6 +100,7 @@ export function createPermissionGuard(router: Router) {
//update-begin---author:wangshuai ---date:20220629 for:[issues/I5BG1I]vue3 Auth2未实现------------
let path = LOGIN_PATH;
+ console.log('whitePathList--->',whitePathList);
if (whitePathList.includes(to.path as PageEnum)) {
// 在免登录白名单,如果进入的页面是login页面并且当前是OAuth2app环境,就进入OAuth2登录页面
if (to.path === LOGIN_PATH && isOAuth2AppEnv()) {
diff --git a/src/router/routes/index.ts b/src/router/routes/index.ts
index 3b70793..9747fb1 100644
--- a/src/router/routes/index.ts
+++ b/src/router/routes/index.ts
@@ -64,5 +64,15 @@ export const TokenLoginRoute: AppRouteRecordRaw = {
ignoreAuth: true,
},
};
+
+//h5页面首页
+export const H5_ADVISORYINFO: AppRouteRecordRaw = {
+ path: '/h5/advisoryInfo',
+ name: 'advisoryInfo',
+ component: () => import('/@/views/biz/NuBizAdvisoryInfo/h5/NuBizAdvisoryInfoList.vue'),
+ meta: {
+ title: "选择入住",
+ },
+};
// Basic routing without permission
-export const basicRoutes = [LoginRoute, RootRoute, ...mainOutRoutes, REDIRECT_ROUTE, PAGE_NOT_FOUND_ROUTE, TokenLoginRoute, Oauth2LoginRoute];
+export const basicRoutes = [LoginRoute, RootRoute, ...mainOutRoutes, REDIRECT_ROUTE, PAGE_NOT_FOUND_ROUTE, TokenLoginRoute, Oauth2LoginRoute,H5_ADVISORYINFO];
diff --git a/src/views/biz/NuBizAdvisoryInfo/h5/NuBizAdvisoryInfoForm.vue b/src/views/biz/NuBizAdvisoryInfo/h5/NuBizAdvisoryInfoForm.vue
new file mode 100644
index 0000000..cee13a7
--- /dev/null
+++ b/src/views/biz/NuBizAdvisoryInfo/h5/NuBizAdvisoryInfoForm.vue
@@ -0,0 +1,113 @@
+
+
+
+
+ 返回
+ 咨询信息
+
+
+
+
+
+
+
+
+
diff --git a/src/views/biz/NuBizAdvisoryInfo/h5/NuBizAdvisoryInfoList.vue b/src/views/biz/NuBizAdvisoryInfo/h5/NuBizAdvisoryInfoList.vue
new file mode 100644
index 0000000..8811f4b
--- /dev/null
+++ b/src/views/biz/NuBizAdvisoryInfo/h5/NuBizAdvisoryInfoList.vue
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提交
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/biz/NuBizAdvisoryInfo/pc/NuBizAdvisoryInfo.api.ts b/src/views/biz/NuBizAdvisoryInfo/pc/NuBizAdvisoryInfo.api.ts
new file mode 100644
index 0000000..232689e
--- /dev/null
+++ b/src/views/biz/NuBizAdvisoryInfo/pc/NuBizAdvisoryInfo.api.ts
@@ -0,0 +1,72 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+ list = '/NuBizAdvisoryInfo/nuBizAdvisoryInfo/list',
+ save='/NuBizAdvisoryInfo/nuBizAdvisoryInfo/add',
+ edit='/NuBizAdvisoryInfo/nuBizAdvisoryInfo/edit',
+ deleteOne = '/NuBizAdvisoryInfo/nuBizAdvisoryInfo/delete',
+ deleteBatch = '/NuBizAdvisoryInfo/nuBizAdvisoryInfo/deleteBatch',
+ importExcel = '/NuBizAdvisoryInfo/nuBizAdvisoryInfo/importExcel',
+ exportXls = '/NuBizAdvisoryInfo/nuBizAdvisoryInfo/exportXls',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+ return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+ handleSuccess();
+ });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+ createConfirm({
+ iconType: 'warning',
+ title: '确认删除',
+ content: '是否删除选中数据',
+ okText: '确认',
+ cancelText: '取消',
+ onOk: () => {
+ return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+ handleSuccess();
+ });
+ }
+ });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+ let url = isUpdate ? Api.edit : Api.save;
+ return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
diff --git a/src/views/biz/NuBizAdvisoryInfo/pc/NuBizAdvisoryInfo.data.ts b/src/views/biz/NuBizAdvisoryInfo/pc/NuBizAdvisoryInfo.data.ts
new file mode 100644
index 0000000..0711e3a
--- /dev/null
+++ b/src/views/biz/NuBizAdvisoryInfo/pc/NuBizAdvisoryInfo.data.ts
@@ -0,0 +1,48 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+import { getWeekMonthQuarterYear } from '/@/utils';
+//列表数据
+export const columns: BasicColumn[] = [
+ {
+ title: '咨询人姓名',
+ align: "center",
+ dataIndex: 'name'
+ },
+ {
+ title: '性别',
+ align: "center",
+ dataIndex: 'sex_dictText'
+ },
+ {
+ title: '联系电话',
+ align: "center",
+ dataIndex: 'tel'
+ },
+ {
+ title: '咨询类型',
+ align: "center",
+ dataIndex: 'advisoryType_dictText'
+ },
+ {
+ title: '状态',
+ align: "center",
+ dataIndex: 'status_dictText'
+ },
+ {
+ title: '审核备注',
+ align: "center",
+ dataIndex: 'content'
+ },
+];
+
+// 高级查询数据
+export const superQuerySchema = {
+ name: {title: '咨询人姓名',order: 0,view: 'text', type: 'string',},
+ sex: {title: '性别',order: 1,view: 'radio', type: 'string',dictCode: 'sex',},
+ tel: {title: '联系电话',order: 2,view: 'text', type: 'string',},
+ advisoryType: {title: '咨询类型',order: 3,view: 'radio', type: 'string',dictCode: 'advisory_type',},
+ status: {title: '状态',order: 4,view: 'radio', type: 'string',dictCode: 'advisory_approval',},
+ content: {title: '审核备注',order: 5,view: 'textarea', type: 'string',},
+};
diff --git a/src/views/biz/NuBizAdvisoryInfo/pc/NuBizAdvisoryInfoList.vue b/src/views/biz/NuBizAdvisoryInfo/pc/NuBizAdvisoryInfoList.vue
new file mode 100644
index 0000000..de21db6
--- /dev/null
+++ b/src/views/biz/NuBizAdvisoryInfo/pc/NuBizAdvisoryInfoList.vue
@@ -0,0 +1,255 @@
+
+
+
+
+
+
+
+
+ 新增
+ 导入
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/biz/NuBizAdvisoryInfo/pc/components/NuBizAdvisoryInfoForm.vue b/src/views/biz/NuBizAdvisoryInfo/pc/components/NuBizAdvisoryInfoForm.vue
new file mode 100644
index 0000000..24e24f7
--- /dev/null
+++ b/src/views/biz/NuBizAdvisoryInfo/pc/components/NuBizAdvisoryInfoForm.vue
@@ -0,0 +1,176 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/biz/NuBizAdvisoryInfo/pc/components/NuBizAdvisoryInfoModal.vue b/src/views/biz/NuBizAdvisoryInfo/pc/components/NuBizAdvisoryInfoModal.vue
new file mode 100644
index 0000000..331bc34
--- /dev/null
+++ b/src/views/biz/NuBizAdvisoryInfo/pc/components/NuBizAdvisoryInfoModal.vue
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
+
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',