diff --git a/public/logo.png b/public/logo.png index 10a2805..f59f877 100644 Binary files a/public/logo.png and b/public/logo.png differ diff --git a/src/assets/images/logo-hldy.png b/src/assets/images/logo-hldy.png new file mode 100644 index 0000000..a206c80 Binary files /dev/null and b/src/assets/images/logo-hldy.png differ diff --git a/src/assets/images/t1.png b/src/assets/images/t1.png new file mode 100644 index 0000000..cc3820b Binary files /dev/null and b/src/assets/images/t1.png differ diff --git a/src/assets/images/t2.png b/src/assets/images/t2.png new file mode 100644 index 0000000..461b49a Binary files /dev/null and b/src/assets/images/t2.png differ diff --git a/src/assets/images/t3.png b/src/assets/images/t3.png new file mode 100644 index 0000000..c29f4e5 Binary files /dev/null and b/src/assets/images/t3.png differ diff --git a/src/enums/pageEnum.ts b/src/enums/pageEnum.ts index bbfd9c6..65008ae 100644 --- a/src/enums/pageEnum.ts +++ b/src/enums/pageEnum.ts @@ -17,4 +17,6 @@ export enum PageEnum { H5_ADVISORYINFO = '/h5/advisoryInfo', // h5白名单 H5_REGISTER_ADVISORY = '/h5/registerAdvisory', + // h5白名单 + H5_CGD_SHARE = '/h5/CgdShareInfo', } diff --git a/src/router/guard/permissionGuard.ts b/src/router/guard/permissionGuard.ts index 61576b5..fec2ec3 100644 --- a/src/router/guard/permissionGuard.ts +++ b/src/router/guard/permissionGuard.ts @@ -25,12 +25,13 @@ const SYS_FILES_PATH = PageEnum.SYS_FILES_PATH; const TOKEN_LOGIN = PageEnum.TOKEN_LOGIN; const H5_ADVISORYINFO = PageEnum.H5_ADVISORYINFO; const H5_REGISTER_ADVISORY = PageEnum.H5_REGISTER_ADVISORY; +const H5_CGD_SHARE = PageEnum.H5_CGD_SHARE; 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, H5_ADVISORYINFO,H5_REGISTER_ADVISORY ]; +const whitePathList: PageEnum[] = [LOGIN_PATH, OAUTH2_LOGIN_PAGE_PATH,SYS_FILES_PATH, TOKEN_LOGIN, H5_ADVISORYINFO,H5_REGISTER_ADVISORY,H5_CGD_SHARE]; //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 ae8ac94..68b9a5f 100644 --- a/src/router/routes/index.ts +++ b/src/router/routes/index.ts @@ -84,5 +84,16 @@ export const H5_ADVISORYINFO: AppRouteRecordRaw = { title: "选择入住", }, }; + + +//h5采购单分享列表 +export const H5_CGD_SHARE: AppRouteRecordRaw = { + path: '/h5/CgdShareInfo', + name: 'CgdShareInfo', + component: () => import('../../views/invoicing/share/CgdShareInfo.vue'), + meta: { + title: "采购单明细", + }, +}; // Basic routing without permission -export const basicRoutes = [LoginRoute, RootRoute, ...mainOutRoutes, REDIRECT_ROUTE, PAGE_NOT_FOUND_ROUTE, TokenLoginRoute, Oauth2LoginRoute,H5_REGISTER_ADVISORY,H5_ADVISORYINFO]; +export const basicRoutes = [LoginRoute, RootRoute, ...mainOutRoutes, REDIRECT_ROUTE, PAGE_NOT_FOUND_ROUTE, TokenLoginRoute, Oauth2LoginRoute,H5_REGISTER_ADVISORY,H5_ADVISORYINFO,H5_CGD_SHARE]; diff --git a/src/views/invoicing/share/CgdShareInfo.vue b/src/views/invoicing/share/CgdShareInfo.vue new file mode 100644 index 0000000..18c868e --- /dev/null +++ b/src/views/invoicing/share/CgdShareInfo.vue @@ -0,0 +1,182 @@ + + + + + + \ No newline at end of file diff --git a/src/views/invoicing/share/ShareInvoicing.api.ts b/src/views/invoicing/share/ShareInvoicing.api.ts new file mode 100644 index 0000000..335768d --- /dev/null +++ b/src/views/invoicing/share/ShareInvoicing.api.ts @@ -0,0 +1,15 @@ +import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/invoicing/blWarehouseMaterialInfo/list', +} + + +/** + * 列表接口 + * @param params + */ +export const list = (params) => defHttp.get({ url: Api.list, params }); diff --git a/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfoList.vue b/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfoList.vue index 315d33f..d2b4119 100644 --- a/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfoList.vue +++ b/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfoList.vue @@ -111,6 +111,7 @@ import { useMessage } from "/@/hooks/web/useMessage"; const formRef = ref(); const queryParam = reactive({}); +const nuId = ref(''); const toggleSearchStatus = ref(false); const registerModal = ref(); const registerAddModal = ref(); @@ -298,6 +299,7 @@ function searchQuery() { function searchReset() { formRef.value.resetFields(); selectedRowKeys.value = []; + queryParam.nuId = nuId.value; //刷新数据 reload(); } @@ -305,6 +307,7 @@ function searchReset() { function init(record) { queryParam.nuId = record.nuId; + nuId.value = record.nuId; reload(); }