diff --git a/src/enums/pageEnum.ts b/src/enums/pageEnum.ts index 58651ac..a181928 100644 --- a/src/enums/pageEnum.ts +++ b/src/enums/pageEnum.ts @@ -12,5 +12,8 @@ export enum PageEnum { //文件路由 SYS_FILES_PATH = '/file/share', // 邮件中的跳转地址 - TOKEN_LOGIN = '/tokenLogin' + TOKEN_LOGIN = '/tokenLogin', + + // h5白名单 + orgAdvisoryInfo = '/zh/orgAdvisory/OrgAdvisoryInfo' } diff --git a/src/router/guard/permissionGuard.ts b/src/router/guard/permissionGuard.ts index 89a297f..03a7cfd 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 orgAdvisoryInfo = PageEnum.orgAdvisoryInfo; 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,orgAdvisoryInfo ]; //update-end---author:wangshuai ---date:20221111 for: [VUEN-2472]分享免登录------------ //update-end---author:wangshuai ---date:20220629 for:[issues/I5BG1I]vue3不支持auth2登录------------ diff --git a/src/router/routes/index.ts b/src/router/routes/index.ts index 4ef8dcf..f666ee2 100644 --- a/src/router/routes/index.ts +++ b/src/router/routes/index.ts @@ -74,5 +74,13 @@ export const newScreenRoute: AppRouteRecordRaw = { }, }; +export const orgAdvisoryInfo: AppRouteRecordRaw = { + path: '/zh/orgAdvisory/OrgAdvisoryInfo', + name: 'orgAdvisoryInfo', + component: () => import('/@/views/zh/orgAdvisory/OrgAdvisoryInfo.vue'), + meta: { + title: '加盟咨询', + }, +}; // Basic routing without permission -export const basicRoutes = [LoginRoute, RootRoute, ...mainOutRoutes, REDIRECT_ROUTE, PAGE_NOT_FOUND_ROUTE, TokenLoginRoute, Oauth2LoginRoute,newScreenRoute]; +export const basicRoutes = [LoginRoute, RootRoute, ...mainOutRoutes, REDIRECT_ROUTE, PAGE_NOT_FOUND_ROUTE, TokenLoginRoute, Oauth2LoginRoute,newScreenRoute,orgAdvisoryInfo]; diff --git a/src/utiles/index.js b/src/utiles/index.js index 68e823f..b22f0c4 100644 --- a/src/utiles/index.js +++ b/src/utiles/index.js @@ -1,4 +1,3 @@ -import $ from 'jquery' const cancelFrame = window.cancelAnimationFrame || window.cancelRequestAnimationFrame; const requestFrame = window.requestAnimationFrame; export let NumTile = ""; diff --git a/src/views/zh/orgAdvisory/BlOrgAdvisory.api.ts b/src/views/zh/orgAdvisory/BlOrgAdvisory.api.ts new file mode 100644 index 0000000..fd404d0 --- /dev/null +++ b/src/views/zh/orgAdvisory/BlOrgAdvisory.api.ts @@ -0,0 +1,72 @@ +import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/orgAdvisory/blOrgAdvisory/list', + save='/orgAdvisory/blOrgAdvisory/add', + edit='/orgAdvisory/blOrgAdvisory/edit', + deleteOne = '/orgAdvisory/blOrgAdvisory/delete', + deleteBatch = '/orgAdvisory/blOrgAdvisory/deleteBatch', + importExcel = '/orgAdvisory/blOrgAdvisory/importExcel', + exportXls = '/orgAdvisory/blOrgAdvisory/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/zh/orgAdvisory/BlOrgAdvisory.data.ts b/src/views/zh/orgAdvisory/BlOrgAdvisory.data.ts new file mode 100644 index 0000000..c13ee0f --- /dev/null +++ b/src/views/zh/orgAdvisory/BlOrgAdvisory.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' + }, + { + title: '电话', + align: "center", + dataIndex: 'tel' + }, + { + title: '职业', + align: "center", + dataIndex: 'vocational' + }, + { + title: '家庭住址', + align: "center", + dataIndex: 'address' + }, + { + title: '备注', + align: "center", + dataIndex: 'content' + }, +]; + +// 高级查询数据 +export const superQuerySchema = { + name: {title: '姓名',order: 0,view: 'text', type: 'string',}, + sex: {title: '性别',order: 1,view: 'text', type: 'string',}, + tel: {title: '电话',order: 2,view: 'text', type: 'string',}, + vocational: {title: '职业',order: 3,view: 'text', type: 'string',}, + address: {title: '家庭住址',order: 4,view: 'textarea', type: 'string',}, + content: {title: '备注',order: 5,view: 'textarea', type: 'string',}, +}; diff --git a/src/views/zh/orgAdvisory/BlOrgAdvisoryList.vue b/src/views/zh/orgAdvisory/BlOrgAdvisoryList.vue new file mode 100644 index 0000000..4cec76b --- /dev/null +++ b/src/views/zh/orgAdvisory/BlOrgAdvisoryList.vue @@ -0,0 +1,236 @@ + + + + + diff --git a/src/views/zh/orgAdvisory/OrgAdvisoryInfo.vue b/src/views/zh/orgAdvisory/OrgAdvisoryInfo.vue new file mode 100644 index 0000000..145fd82 --- /dev/null +++ b/src/views/zh/orgAdvisory/OrgAdvisoryInfo.vue @@ -0,0 +1,292 @@ + + + + + diff --git a/src/views/zh/orgAdvisory/components/BlOrgAdvisoryForm.vue b/src/views/zh/orgAdvisory/components/BlOrgAdvisoryForm.vue new file mode 100644 index 0000000..fcd68c9 --- /dev/null +++ b/src/views/zh/orgAdvisory/components/BlOrgAdvisoryForm.vue @@ -0,0 +1,175 @@ + + + + + diff --git a/src/views/zh/orgAdvisory/components/BlOrgAdvisoryModal.vue b/src/views/zh/orgAdvisory/components/BlOrgAdvisoryModal.vue new file mode 100644 index 0000000..6cf9b52 --- /dev/null +++ b/src/views/zh/orgAdvisory/components/BlOrgAdvisoryModal.vue @@ -0,0 +1,77 @@ + + + + + + diff --git a/src/views/zh/orgAdvisory/img/a1.png b/src/views/zh/orgAdvisory/img/a1.png new file mode 100644 index 0000000..4adf890 Binary files /dev/null and b/src/views/zh/orgAdvisory/img/a1.png differ diff --git a/src/views/zh/orgAdvisory/img/a2.png b/src/views/zh/orgAdvisory/img/a2.png new file mode 100644 index 0000000..90ec84c Binary files /dev/null and b/src/views/zh/orgAdvisory/img/a2.png differ diff --git a/src/views/zh/orgAdvisory/img/a3.png b/src/views/zh/orgAdvisory/img/a3.png new file mode 100644 index 0000000..126b676 Binary files /dev/null and b/src/views/zh/orgAdvisory/img/a3.png differ diff --git a/src/views/zh/orgAdvisory/img/beijing.png b/src/views/zh/orgAdvisory/img/beijing.png new file mode 100644 index 0000000..2d418ab Binary files /dev/null and b/src/views/zh/orgAdvisory/img/beijing.png differ