diff --git a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue index de82c52..286dd2f 100644 --- a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue +++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue @@ -58,13 +58,136 @@ @click="handleAddbj({ levle: '1' })" preIcon="ant-design:plus-outlined"> 一级分类 - + + + + + + + + + + + + @@ -117,7 +240,7 @@ - + -->
@@ -179,6 +302,7 @@ import ConfigMaterialTypeModal from '/@/views/invoicing/ConfigMaterial/component import ConfigMaterialMedicationModal from '/@/views/invoicing/ConfigMaterial/components/ConfigMaterialMedicationModal.vue'; import QianyiModal from '/@/views/invoicing/ConfigMaterial/components/QianyiModal.vue'; import WlqianyiModal from '/@/views/invoicing/ConfigMaterial/components/WlqianyiModal.vue'; +import ConfigMaterialInfoListMenu from './ConfigMaterialInfoListMenu.vue'; import { useResponsive } from '/@/hooks/web/useResponsive'; const { screenEnum, screenWidth } = useResponsive(); @@ -656,4 +780,13 @@ onMounted(() => { height: 81.5vh; } } + + +:deep(.ant-menu-item-selected) { + color: #4b4b4b !important; +} + +:deep(.ant-menu-submenu-title) { + color: #4b4b4b !important; +} \ No newline at end of file diff --git a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoListMenu.vue b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoListMenu.vue new file mode 100644 index 0000000..ddc145d --- /dev/null +++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoListMenu.vue @@ -0,0 +1,71 @@ + + + + diff --git a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialCategoryForm.vue b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialCategoryForm.vue index c632315..638024d 100644 --- a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialCategoryForm.vue +++ b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialCategoryForm.vue @@ -4,10 +4,16 @@ @@ -35,6 +40,7 @@ import { saveOrUpdate } from '../ConfigMaterialMedication.api'; import { Form } from 'ant-design-vue'; import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue'; + import { IconPicker } from '/@/components/Icon/index'; const props = defineProps({ formDisabled: { type: Boolean, default: false }, formData: { type: Object, default: () => ({})}, @@ -49,6 +55,7 @@ categoryId: '', typeId: '', medicationName: '', + icon: '', }); const { createMessage } = useMessage(); const labelCol = ref({ xs: { span: 24 }, sm: { span: 5 } }); diff --git a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialTypeForm.vue b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialTypeForm.vue index 65f1273..65bcce7 100644 --- a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialTypeForm.vue +++ b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialTypeForm.vue @@ -9,11 +9,16 @@ - + + + + + + @@ -30,6 +35,7 @@ import { saveOrUpdate } from '../ConfigMaterialType.api'; import { Form } from 'ant-design-vue'; import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue'; + import { IconPicker } from '/@/components/Icon/index'; const props = defineProps({ formDisabled: { type: Boolean, default: false }, formData: { type: Object, default: () => ({})}, @@ -43,6 +49,7 @@ id: '', categoryId: '', typeName: '', + icon: '', }); const { createMessage } = useMessage(); const labelCol = ref({ xs: { span: 24 }, sm: { span: 5 } });