Merge branch 'develop' into nice_dev

# Conflicts:
#	src/modules/06_retirement/components/DismissOrder/DismissOrder.vue
#	src/modules/06_retirement/router.ts
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-25 14:13:03 +07:00
commit 1484c9288d
5 changed files with 230 additions and 409 deletions

View file

@ -485,7 +485,7 @@ const OriginalDataFetch = async () => {
//
const redirectToPage = (id?: number) => {
router.push(`/dismiss-order/add-order`);
router.push(`/dismiss-order/add`);
};
const clickDelete = (id: string) => {