@@ -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 @@
-
+
+
+
+
+
+
+
@@ -25,6 +31,7 @@
import { saveOrUpdate } from '../ConfigMaterialCategory.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: () => ({})},
@@ -36,6 +43,7 @@
const formData = reactive>({
id: '',
categoryName: '',
+ icon: '',
});
const { createMessage } = useMessage();
const labelCol = ref({ xs: { span: 24 }, sm: { span: 5 } });
diff --git a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialMedicationForm.vue b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialMedicationForm.vue
index 9e90cb8..0728ab1 100644
--- a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialMedicationForm.vue
+++ b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialMedicationForm.vue
@@ -14,11 +14,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 } });
From d06145e113f9dcbad676ba74402ae4dd5864c5d3 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 27 Aug 2025 13:56:19 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BE=B9=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../serviceDirective/ConfigServiceDirectiveList.vue | 8 ++++----
.../components/ConfigServiceDirectiveModal.vue | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
index d3411cf..3da2541 100644
--- a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
+++ b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
@@ -422,7 +422,7 @@
-->
+ :footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '0' }">
关闭
@@ -432,7 +432,7 @@
+ :footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '0' }">
关闭
确认
@@ -442,7 +442,7 @@
+ :footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '0' }">
关闭
@@ -451,7 +451,7 @@
关闭
diff --git a/src/views/services/serviceDirective/components/ConfigServiceDirectiveModal.vue b/src/views/services/serviceDirective/components/ConfigServiceDirectiveModal.vue
index 6c8d965..2c53829 100644
--- a/src/views/services/serviceDirective/components/ConfigServiceDirectiveModal.vue
+++ b/src/views/services/serviceDirective/components/ConfigServiceDirectiveModal.vue
@@ -17,7 +17,7 @@
-->
+ :bodyStyle="{ background: 'linear-gradient(135deg, #f1f7ff 0%, #f1f7ff 100%)',padding: '14px' }">
Date: Wed, 27 Aug 2025 14:24:45 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BE=B9=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/Table/src/BasicTable.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue
index c38f9b4..0f5d266 100644
--- a/src/components/Table/src/BasicTable.vue
+++ b/src/components/Table/src/BasicTable.vue
@@ -521,7 +521,7 @@
//update-end-author:liusq---date:20230517--for: [issues/526]RangePicker 设置预设范围按钮样式问题---
.ant-table-wrapper {
- padding: 6px;
+ padding: 14px;
background-color: @component-background;
border-radius: 8px;
From a4c5ddc0c7d1960b96f4b58fab1685516810cc5e Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 27 Aug 2025 15:11:18 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/CompareDirectiveList.vue | 130 +++++++-----------
.../components/ConfigServiceDirective.data.ts | 76 ++++++++++
2 files changed, 123 insertions(+), 83 deletions(-)
diff --git a/src/views/services/serviceDirective/components/CompareDirectiveList.vue b/src/views/services/serviceDirective/components/CompareDirectiveList.vue
index c1075b9..74d0632 100644
--- a/src/views/services/serviceDirective/components/CompareDirectiveList.vue
+++ b/src/views/services/serviceDirective/components/CompareDirectiveList.vue
@@ -5,88 +5,48 @@
:disabled="loading">目标机构