canrd-main / canrd-erp-front · Commits

# Conflicts:
#	.idea/UniappTool.xml
#	src/pages/Order/constant.ts

# Conflicts:
#	src/services/definition.ts
#	src/services/request.ts

The taxId was appended to the company name in the invoice drawer form,
resulting in a combined value used as the `value` prop for company selection.
This change removes the tax

Add a new unit name field in the ResearchGroupAddModal.tsx component and update the
constant.tsx file to include the unit name in the form fields. This enhancement
allows users to input the unit name for research groups, improving data

Add a new unit name field in the ResearchGroupAddModal.tsx component and update the
constant.tsx file to include the unit name in the form fields. This enhancement
allows users to input the unit name for research groups, improving data

- Introduce new routes for user management including authority and role management.
- Add corresponding component views for user management features.
- Refactor definition.ts to include new types and interfaces for client and company info.
- Update OrderPrint and ZoNing components with new functionalities.
- Modify table.tsx and modal.tsx in ZoNing components to support user and province selection.

# Conflicts:
#	.umirc.ts
#	src/pages/Client/index.tsx

- Implement new check types for urgent invoice auditing and confirmation of reissue.
- Add associated constants and services for the new functionalities.
- Modify the InvoicingDrawerForm to include new fields and improve the UI/UX.
- Refactor the CheckModal to handle the new check types gracefully.
- Remove deprecated research group interfaces and clean up the codebase.

BREAKING CHANGE: The addition of new check types and related changes may affect existing
clients relying on the previous API structure.

# Conflicts:
#	src/pages/Order/index.tsx
#	src/services/definition.ts
#	src/services/request.ts

# Conflicts:
#	src/services/definition.ts
#	src/services/request.ts