From ef7ac29f66b859e52793f54adedbbb1004c7e811 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Thu, 20 Mar 2025 08:30:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=EF=BC=8C=E7=89=A9=E6=96=99=E7=B1=BB=E5=88=AB=EF=BC=8C?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Modal/src/hooks/useTwoModal.ts | 160 ++++++++++
 src/utils/encryption/signMd5Utils.js          |   1 -
 .../ConfigMaterial/ConfigMaterialAllList.vue  | 192 +++++++++++
 .../ConfigMaterialCategory.api.ts             |  65 ++++
 .../ConfigMaterialCategory.data.ts            |  83 +++++
 .../ConfigMaterialCategoryList.vue            | 254 +++++++++++++++
 .../ConfigMaterialCategoryListModal.vue       |  75 +++++
 .../ConfigMaterial/ConfigMaterialInfo.api.ts  |  72 +++++
 .../ConfigMaterial/ConfigMaterialInfo.data.ts | 100 ++++++
 .../ConfigMaterial/ConfigMaterialInfoList.vue | 299 ++++++++++++++++++
 .../ConfigMaterialMedication.api.ts           |  72 +++++
 .../ConfigMaterialMedication.data.ts          |  29 ++
 .../ConfigMaterialMedicationList.vue          | 245 ++++++++++++++
 .../ConfigMaterialMedicationListModal.vue     |  75 +++++
 .../ConfigMaterial/ConfigMaterialType.api.ts  |  72 +++++
 .../ConfigMaterial/ConfigMaterialType.data.ts |  24 ++
 .../ConfigMaterial/ConfigMaterialTypeList.vue | 241 ++++++++++++++
 .../ConfigMaterialTypeListModal.vue           |  75 +++++
 .../components/ConfigMaterialCategoryForm.vue |  70 ++++
 .../ConfigMaterialCategoryModal.vue           |  76 +++++
 .../components/ConfigMaterialInfoForm.vue     | 279 ++++++++++++++++
 .../components/ConfigMaterialInfoModal.vue    |  77 +++++
 .../ConfigMaterialMedicationForm.vue          | 167 ++++++++++
 .../ConfigMaterialMedicationModal.vue         |  77 +++++
 .../components/ConfigMaterialTypeForm.vue     | 160 ++++++++++
 .../components/ConfigMaterialTypeModal.vue    |  77 +++++
 .../ConfigSuppliersInfoList.vue               |  36 +--
 27 files changed, 3127 insertions(+), 26 deletions(-)
 create mode 100644 src/components/Modal/src/hooks/useTwoModal.ts
 create mode 100644 src/views/config/ConfigMaterial/ConfigMaterialAllList.vue
 create mode 100644 src/views/config/ConfigMaterial/ConfigMaterialCategory.api.ts
 create mode 100644 src/views/config/ConfigMaterial/ConfigMaterialCategory.data.ts
 create mode 100644 src/views/config/ConfigMaterial/ConfigMaterialCategoryList.vue
 create mode 100644 src/views/config/ConfigMaterial/ConfigMaterialCategoryListModal.vue
 create mode 100644 src/views/config/ConfigMaterial/ConfigMaterialInfo.api.ts
 create mode 100644 src/views/config/ConfigMaterial/ConfigMaterialInfo.data.ts
 create mode 100644 src/views/config/ConfigMaterial/ConfigMaterialInfoList.vue
 create mode 100644 src/views/config/ConfigMaterial/ConfigMaterialMedication.api.ts
 create mode 100644 src/views/config/ConfigMaterial/ConfigMaterialMedication.data.ts
 create mode 100644 src/views/config/ConfigMaterial/ConfigMaterialMedicationList.vue
 create mode 100644 src/views/config/ConfigMaterial/ConfigMaterialMedicationListModal.vue
 create mode 100644 src/views/config/ConfigMaterial/ConfigMaterialType.api.ts
 create mode 100644 src/views/config/ConfigMaterial/ConfigMaterialType.data.ts
 create mode 100644 src/views/config/ConfigMaterial/ConfigMaterialTypeList.vue
 create mode 100644 src/views/config/ConfigMaterial/ConfigMaterialTypeListModal.vue
 create mode 100644 src/views/config/ConfigMaterial/components/ConfigMaterialCategoryForm.vue
 create mode 100644 src/views/config/ConfigMaterial/components/ConfigMaterialCategoryModal.vue
 create mode 100644 src/views/config/ConfigMaterial/components/ConfigMaterialInfoForm.vue
 create mode 100644 src/views/config/ConfigMaterial/components/ConfigMaterialInfoModal.vue
 create mode 100644 src/views/config/ConfigMaterial/components/ConfigMaterialMedicationForm.vue
 create mode 100644 src/views/config/ConfigMaterial/components/ConfigMaterialMedicationModal.vue
 create mode 100644 src/views/config/ConfigMaterial/components/ConfigMaterialTypeForm.vue
 create mode 100644 src/views/config/ConfigMaterial/components/ConfigMaterialTypeModal.vue

diff --git a/src/components/Modal/src/hooks/useTwoModal.ts b/src/components/Modal/src/hooks/useTwoModal.ts
new file mode 100644
index 0000000..9c747b5
--- /dev/null
+++ b/src/components/Modal/src/hooks/useTwoModal.ts
@@ -0,0 +1,160 @@
+import type { UseModalReturnType, ModalMethods, ModalProps, ReturnMethods, UseModalInnerReturnType } from '../typing';
+import { ref, onUnmounted, unref, getCurrentInstance, reactive, watchEffect, nextTick, toRaw } from 'vue';
+import { isProdMode } from '/@/utils/env';
+import { isFunction } from '/@/utils/is';
+import { isEqual } from 'lodash-es';
+import { tryOnUnmounted } from '@vueuse/core';
+import { error } from '/@/utils/log';
+import { computed } from 'vue';
+
+const dataTransfer = reactive<any>({});
+
+const visibleData = reactive<{ [key: number]: boolean }>({});
+
+/**
+ * @description: Applicable to independent modal and call outside
+ */
+export function useModal(): UseModalReturnType {
+  const modal = ref<Nullable<ModalMethods>>(null);
+  const loaded = ref<Nullable<boolean>>(false);
+  const uid = ref<string>('');
+
+  function register(modalMethod: ModalMethods, uuid: string) {
+    if (!getCurrentInstance()) {
+      throw new Error('useModal() can only be used inside setup() or functional components!');
+    }
+    uid.value = uuid;
+    isProdMode() &&
+      onUnmounted(() => {
+        modal.value = null;
+        loaded.value = false;
+        dataTransfer[unref(uid)] = null;
+      });
+    if (unref(loaded) && isProdMode() && modalMethod === unref(modal)) return;
+
+    modal.value = modalMethod;
+    loaded.value = true;
+    modalMethod.emitVisible = (visible: boolean, uid: number) => {
+      visibleData[uid] = visible;
+    };
+  }
+
+  const getInstance = () => {
+    const instance = unref(modal);
+    if (!instance) {
+      error('useModal instance is undefined!');
+    }
+    return instance;
+  };
+
+  const methods: ReturnMethods = {
+    setModalProps: (props: Partial<ModalProps>): void => {
+      getInstance()?.setModalProps(props);
+    },
+
+    getVisible: computed((): boolean => {
+      return visibleData[~~unref(uid)];
+    }),
+    getOpen: computed((): boolean => {
+      return visibleData[~~unref(uid)];
+    }),
+    redoModalHeight: () => {
+      getInstance()?.redoModalHeight?.();
+    },
+
+    openModal: <T = any>(visible = true, data?: T, openOnSet = true): void => {
+      // update-begin--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
+      getInstance()?.setModalProps({
+        open: visible,
+      });
+      // update-end--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
+
+      if (!data) return;
+      const id = unref(uid);
+      if (openOnSet) {
+        dataTransfer[id] = null;
+        dataTransfer[id] = toRaw(data);
+        return;
+      }
+      const equal = isEqual(toRaw(dataTransfer[id]), toRaw(data));
+      if (!equal) {
+        dataTransfer[id] = toRaw(data);
+      }
+    },
+    
+    openTwoModal: <T = any>(visible = true, data?: T, openOnSet = true): void => {
+      // openModal()
+    },
+
+    closeModal: () => {
+      // update-begin--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
+      getInstance()?.setModalProps({ open: false });
+      // update-end--author:liaozhiyang---date:20231218---for：【QQYUN-6366】升级到antd4.x
+    },
+  };
+  return [register, methods];
+}
+
+export const useModalInner = (callbackFn?: Fn): UseModalInnerReturnType => {
+  const modalInstanceRef = ref<Nullable<ModalMethods>>(null);
+  const currentInstance = getCurrentInstance();
+  const uidRef = ref<string>('');
+
+  const getInstance = () => {
+    const instance = unref(modalInstanceRef);
+    if (!instance) {
+      error('useModalInner instance is undefined!');
+    }
+    return instance;
+  };
+
+  const register = (modalInstance: ModalMethods, uuid: string) => {
+    isProdMode() &&
+      tryOnUnmounted(() => {
+        modalInstanceRef.value = null;
+      });
+    uidRef.value = uuid;
+    modalInstanceRef.value = modalInstance;
+    currentInstance?.emit('register', modalInstance, uuid);
+  };
+
+  watchEffect(() => {
+    const data = dataTransfer[unref(uidRef)];
+    if (!data) return;
+    if (!callbackFn || !isFunction(callbackFn)) return;
+    nextTick(() => {
+      callbackFn(data);
+    });
+  });
+
+  return [
+    register,
+    {
+      changeLoading: (loading = true) => {
+        getInstance()?.setModalProps({ loading });
+      },
+      getVisible: computed((): boolean => {
+        return visibleData[~~unref(uidRef)];
+      }),
+      getOpen: computed((): boolean => {
+        return visibleData[~~unref(uidRef)];
+      }),
+      changeOkLoading: (loading = true) => {
+        getInstance()?.setModalProps({ confirmLoading: loading });
+      },
+
+      closeModal: () => {
+        getInstance()?.setModalProps({ open: false });
+      },
+
+      setModalProps: (props: Partial<ModalProps>) => {
+        getInstance()?.setModalProps(props);
+      },
+
+      redoModalHeight: () => {
+        const callRedo = getInstance()?.redoModalHeight;
+        callRedo && callRedo();
+      },
+    },
+  ];
+};
diff --git a/src/utils/encryption/signMd5Utils.js b/src/utils/encryption/signMd5Utils.js
index 9bd4fc8..0d07fd5 100644
--- a/src/utils/encryption/signMd5Utils.js
+++ b/src/utils/encryption/signMd5Utils.js
@@ -39,7 +39,6 @@ export default class signMd5Utils {
     //update-end---author:wangshuai---date:2024-04-16---for:【QQYUN-9005】发送短信加签---
     let requestBody = this.sortAsc(jsonObj);
     delete requestBody._t;
-    console.log('sign requestBody:', requestBody);
     return md5(JSON.stringify(requestBody) + signatureSecret).toUpperCase();
   }
 
diff --git a/src/views/config/ConfigMaterial/ConfigMaterialAllList.vue b/src/views/config/ConfigMaterial/ConfigMaterialAllList.vue
new file mode 100644
index 0000000..ede823b
--- /dev/null
+++ b/src/views/config/ConfigMaterial/ConfigMaterialAllList.vue
@@ -0,0 +1,192 @@
+<template>
+  <div class="p-2">
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="6">
+            <a-form-item name="categoryId">
+              <template #label><span title="物料类别">物料类别</span></template>
+              <j-dict-select-tag type='list' placeholder="请选择物料类别" v-model:value="queryParam.categoryId" dictCode="config_material_category,category_name,id,iz_enabled = 0 and del_flag = 0" allow-clear />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="typeId">
+              <template #label><span title="物料类型">物料类型</span></template>
+              <j-dict-select-tag type='list' placeholder="请选择物料类别" v-model:value="queryParam.typeId" :dictCode="`config_material_type,type_name,id,iz_enabled = 0 and del_flag = 0 and category_id = ${queryParam.categoryId || -1}`" allow-clear />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" >
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" v-auth="'ConfigMaterial:config_material_category:add'" @click="handleCategoryAdd" preIcon="ant-design:plus-outlined"> 物料类别</a-button>
+          <a-button type="primary" v-auth="'ConfigMaterial:config_material_type:add'" @click="handleTypeAdd" preIcon="ant-design:plus-outlined"> 物料类型</a-button>
+          <a-button type="primary" v-auth="'ConfigMaterial:config_material_medication:add'" @click="handleMedicationAdd" preIcon="ant-design:plus-outlined"> 用药类型</a-button>
+      </template>
+      <!--字段回显插槽-->
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <ConfigMaterialCategoryListModal @register="registerDrawer" @success="handleSuccess"></ConfigMaterialCategoryListModal>
+    <ConfigMaterialTypeListModal @register="registerTypeDrawer" @success="handleSuccess"></ConfigMaterialTypeListModal>
+    <ConfigMaterialMedicationListModal @register="registerMedicationDrawer" @success="handleSuccess"></ConfigMaterialMedicationListModal>
+  </div>
+</template>
+
+<script lang="ts" name="ConfigMaterial-configMaterialCategory" setup>
+  import {ref, reactive, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import ConfigMaterialCategoryModal from './components/ConfigMaterialCategoryModal.vue'
+  import {allColumns, searchFormSchema, superQuerySchema} from './ConfigMaterialCategory.data';
+  import {selectMaterialList, deleteOne, batchDelete, getImportUrl,getExportUrl} from './ConfigMaterialCategory.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import { useUserStore } from '/@/store/modules/user';
+  import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
+  import ConfigMaterialCategoryListModal from '/@/views/config/ConfigMaterial/ConfigMaterialCategoryListModal.vue';
+  import ConfigMaterialTypeListModal from '/@/views/config/ConfigMaterial/ConfigMaterialTypeListModal.vue';
+  import ConfigMaterialMedicationListModal from '/@/views/config/ConfigMaterial/ConfigMaterialMedicationListModal.vue';
+  import { useDrawer } from '/@/components/Drawer';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const checkedKeys = ref<Array<string | number>>([]);
+  const userStore = useUserStore();
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册drawer
+  const [registerDrawer, { openDrawer:openCategoryDrawer }] = useDrawer();
+  const [registerTypeDrawer, { openDrawer: openTypeDrawer }] = useDrawer();
+  const [registerMedicationDrawer, { openDrawer:openMedicationDrawer }] = useDrawer();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '物料类别',
+           api: selectMaterialList,
+           columns: allColumns,
+           canResize:false,
+           showActionColumn: false,
+           showIndexColumn: true,
+           formConfig: {
+              //labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToNumber: [
+              ],
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+               fixed:'right'
+            },
+            beforeFetch: (params) => {
+              params.column = '',params.order = ''
+              return Object.assign(params, queryParam);
+            },
+      },
+  })
+  const labelCol = reactive({
+    xs:24,
+    sm:4,
+    xl:6,
+    xxl:4
+  });
+  const wrapperCol = reactive({
+    xs: 24,
+    sm: 20,
+  });
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+
+  //物料类别
+  function handleCategoryAdd(){
+    openCategoryDrawer(true, {
+      isUpdate: false,
+      showFooter: false,
+      tenantSaas: false,
+    });
+
+  }
+  //物料类型
+  function handleTypeAdd(){
+    openTypeDrawer(true, {
+      isUpdate: false,
+      showFooter: false,
+      tenantSaas: false,
+    });
+    
+  }
+  //用药类型
+  function handleMedicationAdd(){
+    openMedicationDrawer(true, {
+      isUpdate: false,
+      showFooter: false,
+      tenantSaas: false,
+    });
+    
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+  
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+
+function handleSuccess(){
+  searchQuery()
+}
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    padding: 0;
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+    .ant-form-item:not(.ant-form-item-with-help){
+      margin-bottom: 16px;
+      height: 32px;
+    }
+    :deep(.ant-picker),:deep(.ant-input-number){
+      width: 100%;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/config/ConfigMaterial/ConfigMaterialCategory.api.ts b/src/views/config/ConfigMaterial/ConfigMaterialCategory.api.ts
new file mode 100644
index 0000000..6fd36df
--- /dev/null
+++ b/src/views/config/ConfigMaterial/ConfigMaterialCategory.api.ts
@@ -0,0 +1,65 @@
+import {defHttp} from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/ConfigMaterial/configMaterialCategory/list',
+  selectMaterialList = '/ConfigMaterial/configMaterialCategory/selectMaterialList',
+  save='/ConfigMaterial/configMaterialCategory/add',
+  edit='/ConfigMaterial/configMaterialCategory/edit',
+  deleteOne = '/ConfigMaterial/configMaterialCategory/delete',
+  deleteBatch = '/ConfigMaterial/configMaterialCategory/deleteBatch',
+  importExcel = '/ConfigMaterial/configMaterialCategory/importExcel',
+  exportXls = '/ConfigMaterial/configMaterialCategory/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>  defHttp.get({url: Api.list, params});
+export const selectMaterialList = (params) =>  defHttp.get({url: Api.selectMaterialList, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}
diff --git a/src/views/config/ConfigMaterial/ConfigMaterialCategory.data.ts b/src/views/config/ConfigMaterial/ConfigMaterialCategory.data.ts
new file mode 100644
index 0000000..3f78862
--- /dev/null
+++ b/src/views/config/ConfigMaterial/ConfigMaterialCategory.data.ts
@@ -0,0 +1,83 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+import { getWeekMonthQuarterYear } from '/@/utils';
+//列表数据
+export const columns: BasicColumn[] = [
+   {
+    title: '物料类别名称',
+    align:"center",
+    dataIndex: 'categoryName'
+   },
+   {
+    title: '是否启用',
+    align:"center",
+    dataIndex: 'izEnabled_dictText'
+   },
+];
+
+export const allColumns: BasicColumn[] = [
+  {
+   title: '物料类别名称',
+   align:"center",
+   dataIndex: 'categoryName'
+  },
+  {
+   title: '物料类型名称',
+   align:"center",
+   dataIndex: 'typeName'
+  },
+  {
+   title: '用药类型名称',
+   align:"center",
+   dataIndex: 'medicationName'
+  },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '物料类别名称',
+    field: 'categoryName',
+    component: 'Input',
+    dynamicRules: ({model,schema}) => {
+          return [
+                 { required: true, message: '请输入物料类别名称!'},
+          ];
+     },
+  },
+  {
+    label: '是否启用',
+    field: 'izEnabled',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"iz_enabled",
+        type: "radio"
+     },
+  },
+	// TODO 主键隐藏字段，目前写死为ID
+	{
+	  label: '',
+	  field: 'id',
+	  component: 'Input',
+	  show: false
+	},
+];
+
+// 高级查询数据
+export const superQuerySchema = {
+  categoryName: {title: '物料类别名称',order: 0,view: 'text', type: 'string',},
+  izEnabled: {title: '是否启用',order: 1,view: 'radio', type: 'string',dictCode: 'iz_enabled',},
+};
+
+/**
+* 流程表单调用这个方法获取formSchema
+* @param param
+*/
+export function getBpmFormSchema(_formData): FormSchema[]{
+  // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema
+  return formSchema;
+}
\ No newline at end of file
diff --git a/src/views/config/ConfigMaterial/ConfigMaterialCategoryList.vue b/src/views/config/ConfigMaterial/ConfigMaterialCategoryList.vue
new file mode 100644
index 0000000..93e9d9a
--- /dev/null
+++ b/src/views/config/ConfigMaterial/ConfigMaterialCategoryList.vue
@@ -0,0 +1,254 @@
+<template>
+  <div class="p-2">
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="12">
+            <a-form-item name="categoryName">
+              <template #label><span title="物料类别">物料类别</span></template>
+              <a-input placeholder="请输入物料类别" v-model:value="queryParam.categoryName" allow-clear ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="12">
+            <a-form-item name="izEnabled">
+              <template #label><span title="是否启用">是否启用</span></template>
+              <j-dict-select-tag type='list' placeholder="请选择是否启用" v-model:value="queryParam.izEnabled" dictCode="iz_enabled" allow-clear />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12" >
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" >
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" v-auth="'ConfigMaterial:config_material_category:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" v-auth="'ConfigMaterial:config_material_category:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button type="primary" v-auth="'ConfigMaterial:config_material_category:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="selectedRowKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button v-auth="'ConfigMaterial:config_material_category:deleteBatch'">批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" />
+      </template>
+      <!--字段回显插槽-->
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <ConfigMaterialCategoryModal @register="registerModal" @success="handleSuccess"></ConfigMaterialCategoryModal>
+  </div>
+</template>
+
+<script lang="ts" name="ConfigMaterial-configMaterialCategory" setup>
+  import {ref, reactive, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import ConfigMaterialCategoryModal from './components/ConfigMaterialCategoryModal.vue'
+  import {columns, searchFormSchema, superQuerySchema} from './ConfigMaterialCategory.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './ConfigMaterialCategory.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import { useUserStore } from '/@/store/modules/user';
+  import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const checkedKeys = ref<Array<string | number>>([]);
+  const userStore = useUserStore();
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '物料类别',
+           api: list,
+           columns,
+           canResize:false,
+           showIndexColumn: true,
+           formConfig: {
+              //labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToNumber: [
+              ],
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 160,
+               fixed:'right'
+            },
+            beforeFetch: (params) => {
+              return Object.assign(params, queryParam);
+            },
+      },
+       exportConfig: {
+            name:"物料类别",
+            url: getExportUrl,
+            params: queryParam,
+          },
+          importConfig: {
+            url: getImportUrl,
+            success: handleSuccess
+          },
+  })
+  const labelCol = reactive({
+    xs:24,
+    sm:6,
+    xl:6,
+    xxl:6
+  });
+  const wrapperCol = reactive({
+    xs: 20,
+    sm: 20,
+  });
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, handleSuccess);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: selectedRowKeys.value}, handleSuccess);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      (selectedRowKeys.value = []) && reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+           auth: 'ConfigMaterial:config_material_category:edit'
+         },
+         {
+           label: '详情',
+           onClick: handleDetail.bind(null, record),
+         }, {
+           label: '删除',
+           popConfirm: {
+             title: '是否确认删除',
+             confirm: handleDelete.bind(null, record),
+             placement: 'topLeft',
+           },
+           auth: 'ConfigMaterial:config_material_category:delete'
+         }
+       ]
+   }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+  
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    padding: 0;
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+    .ant-form-item:not(.ant-form-item-with-help){
+      margin-bottom: 16px;
+      height: 32px;
+    }
+    :deep(.ant-picker),:deep(.ant-input-number){
+      width: 100%;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/config/ConfigMaterial/ConfigMaterialCategoryListModal.vue b/src/views/config/ConfigMaterial/ConfigMaterialCategoryListModal.vue
new file mode 100644
index 0000000..a2187d7
--- /dev/null
+++ b/src/views/config/ConfigMaterial/ConfigMaterialCategoryListModal.vue
@@ -0,0 +1,75 @@
+<template>
+  <BasicDrawer
+    v-bind="$attrs"
+    @register="registerDrawer"
+    :title="getTitle"
+    :width="`650px`"
+    @ok="handleSubmit"
+    @close="handleSubmit"
+    :showFooter="showFooter"
+    destroyOnClose
+  >
+    <ConfigMaterialCategoryList @register="registerForm" />
+  </BasicDrawer>
+</template>
+<script lang="ts" setup>
+  import { defineComponent, ref, computed, unref, useAttrs } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { useDrawerAdaptiveWidth } from '/@/hooks/jeecg/useAdaptiveWidth';
+  import { getTenantId } from "/@/utils/auth";
+  import ConfigMaterialCategoryList from "./ConfigMaterialCategoryList.vue";
+
+  // 声明Emits
+  const emit = defineEmits(['success', 'register']);
+  const attrs = useAttrs();
+  const isUpdate = ref(true);
+  const rowId = ref('');
+  const departOptions = ref([]);
+  let isFormDepartUser = false;
+  //表单配置
+  const [registerForm, { setProps, resetFields, setFieldsValue, validate, updateSchema }] = useForm({
+    labelWidth: 90,
+    showActionButtonGroup: false,
+  });
+  const showFooter = ref(true);
+  //表单赋值
+  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+    await resetFields();
+    showFooter.value = data?.showFooter ?? true;
+    setDrawerProps({ confirmLoading: false, showFooter: showFooter.value });
+    isUpdate.value = !!data?.isUpdate;
+    
+    if (unref(isUpdate)) {
+        //表单赋值
+        await setFieldsValue({
+            ...data.record,
+        });
+    }
+    setProps({ disabled: !showFooter.value });
+  });
+  //获取标题
+  const getTitle = computed(() => {
+    // update-begin--author:liaozhiyang---date:20240306---for：【QQYUN-8389】系统用户详情抽屉title更改
+    if (!unref(isUpdate)) {
+      return '新增';
+    } else {
+      return unref(showFooter) ? '编辑' : '详情';
+    }
+    // update-end--author:liaozhiyang---date:20240306---for：【QQYUN-8389】系统用户详情抽屉title更改
+  });
+  const { adaptiveWidth } = useDrawerAdaptiveWidth();
+
+  //提交事件
+  async function handleSubmit() {
+    try {
+       
+      //关闭弹窗
+      closeDrawer();
+      //刷新列表
+      emit('success');
+    } finally {
+      setDrawerProps({ confirmLoading: false });
+    }
+  }
+</script>
diff --git a/src/views/config/ConfigMaterial/ConfigMaterialInfo.api.ts b/src/views/config/ConfigMaterial/ConfigMaterialInfo.api.ts
new file mode 100644
index 0000000..2b60dbf
--- /dev/null
+++ b/src/views/config/ConfigMaterial/ConfigMaterialInfo.api.ts
@@ -0,0 +1,72 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/configMaterialInfo/configMaterialInfo/list',
+  save='/configMaterialInfo/configMaterialInfo/add',
+  edit='/configMaterialInfo/configMaterialInfo/edit',
+  deleteOne = '/configMaterialInfo/configMaterialInfo/delete',
+  deleteBatch = '/configMaterialInfo/configMaterialInfo/deleteBatch',
+  importExcel = '/configMaterialInfo/configMaterialInfo/importExcel',
+  exportXls = '/configMaterialInfo/configMaterialInfo/exportXls',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
diff --git a/src/views/config/ConfigMaterial/ConfigMaterialInfo.data.ts b/src/views/config/ConfigMaterial/ConfigMaterialInfo.data.ts
new file mode 100644
index 0000000..063e00a
--- /dev/null
+++ b/src/views/config/ConfigMaterial/ConfigMaterialInfo.data.ts
@@ -0,0 +1,100 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+import { getWeekMonthQuarterYear } from '/@/utils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '货品名称',
+    align: "center",
+    dataIndex: 'materialName'
+  },
+  {
+    title: '货品编码',
+    align: "center",
+    dataIndex: 'materialNo'
+  },
+  {
+    title: '规格型号',
+    align: "center",
+    dataIndex: 'specificationModel'
+  },
+  {
+    title: '销售单价',
+    align: "center",
+    dataIndex: 'salesUnitPrice'
+  },
+  {
+    title: '参考单价',
+    align: "center",
+    dataIndex: 'referenceUnitPrice'
+  },
+  {
+    title: '货品单位',
+    align: "center",
+    dataIndex: 'materialUnits'
+  },
+  {
+    title: '供应商',
+    align: "center",
+    dataIndex: 'suppliers_dictText'
+  },
+  {
+    title: '物料类别',
+    align: "center",
+    dataIndex: 'categoryId_dictText'
+  },
+  {
+    title: '物料类型',
+    align: "center",
+    dataIndex: 'typeId_dictText'
+  },
+  {
+    title: '用药类型',
+    align: "center",
+    dataIndex: 'medicationId_dictText'
+  },
+  {
+    title: '物料图片',
+    align: "center",
+    dataIndex: 'materialImg',
+    customRender: render.renderImage,
+  },
+  {
+    title: '物料标识',
+    align: "center",
+    dataIndex: 'materialIdent',
+    customRender: render.renderImage,
+  },
+  {
+    title: '是否启用',
+    align: "center",
+    dataIndex: 'izEnabled_dictText'
+  },
+];
+
+// 高级查询数据
+export const superQuerySchema = {
+  categoryId: {title: '物料类别',order: 0,view: 'radio', type: 'string',dictTable: "config_material_category", dictCode: 'id', dictText: 'category_name',},
+  typeId: {title: '物料类型',order: 1,view: 'radio', type: 'string',dictTable: "config_material_type", dictCode: 'id', dictText: 'type_name',},
+  medicationId: {title: '用药类型',order: 2,view: 'radio', type: 'string',dictTable: "config_material_medication", dictCode: 'id', dictText: 'medication_name',},
+  materialName: {title: '货品名称',order: 3,view: 'text', type: 'string',},
+  materialNo: {title: '货品编码',order: 4,view: 'text', type: 'string',},
+  specificationModel: {title: '规格型号',order: 5,view: 'text', type: 'string',},
+  salesUnitPrice: {title: '销售单价',order: 6,view: 'number', type: 'number',},
+  referenceUnitPrice: {title: '参考单价',order: 7,view: 'number', type: 'number',},
+  materialUnits: {title: '货品单位',order: 8,view: 'text', type: 'string',},
+  multiUnitSwitch: {title: '多单位开关',order: 9,view: 'switch', type: 'string',},
+  oneUnit: {title: '父级单位',order: 10,view: 'text', type: 'string',},
+  oneUnitProportion: {title: '父级单位兑换比例',order: 11,view: 'number', type: 'number',},
+  oneUnitPrice: {title: '父级单位价格',order: 12,view: 'number', type: 'number',},
+  twoUnit: {title: '爷级单位',order: 13,view: 'text', type: 'string',},
+  twoUnitProportion: {title: '爷级单位兑换比例',order: 14,view: 'number', type: 'number',},
+  twoUnitPrice: {title: '爷级单位价格',order: 15,view: 'number', type: 'number',},
+  multiUnitType: {title: '多单位采购默认使用  0子集 1父级 2爷级',order: 16,view: 'text', type: 'string',},
+  suppliers: {title: '供应商',order: 17,view: 'text', type: 'string',},
+  materialImg: {title: '物料图片',order: 18,view: 'image', type: 'string',},
+  materialIdent: {title: '物料标识',order: 19,view: 'image', type: 'string',},
+  izEnabled: {title: '是否启用',order: 20,view: 'radio', type: 'string',dictCode: '	 iz_enabled',},
+};
diff --git a/src/views/config/ConfigMaterial/ConfigMaterialInfoList.vue b/src/views/config/ConfigMaterial/ConfigMaterialInfoList.vue
new file mode 100644
index 0000000..ca0911a
--- /dev/null
+++ b/src/views/config/ConfigMaterial/ConfigMaterialInfoList.vue
@@ -0,0 +1,299 @@
+<template>
+  <div class="p-2">
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <!-- <a-col :lg="6">
+            <a-form-item name="categoryId">
+              <template #label><span title="物料类别">物料类别</span></template>
+              <j-dict-select-tag type='list' placeholder="请选择物料类别" v-model:value="queryParam.categoryId" dictCode="config_material_category,category_name,id,iz_enabled = 0 and del_flag = 0" allow-clear />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="typeId">
+              <template #label><span title="物料类型">物料类型</span></template>
+              <j-dict-select-tag type='list' placeholder="请选择物料类型" v-model:value="queryParam.typeId" :dictCode="`config_material_type,type_name,id,iz_enabled = 0 and del_flag = 0 and category_id = ${queryParam.categoryId || -1}`" allow-clear />
+            </a-form-item>
+          </a-col>
+            <a-col :lg="6">
+              <a-form-item name="medicationId">
+                <template #label><span title="用药类型">用药类型</span></template>
+                <j-dict-select-tag type='list' placeholder="请选择用药类型" v-model:value="queryParam.medicationId" :dictCode="`config_material_medication,medication_name,id,iz_enabled = 0 and del_flag = 0 and type_id = ${queryParam.typeId || -1}`" allow-clear />
+              </a-form-item>
+            </a-col> -->
+            <a-col :lg="6">
+              <a-form-item name="materialName">
+                <template #label><span title="货品名称">货品名称</span></template>
+                <j-input placeholder="请输入货品名称" v-model:value="queryParam.materialName" allow-clear ></j-input>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6">
+              <a-form-item name="izEnabled">
+                <template #label><span title="是否启用">是否启用</span></template>
+                <j-dict-select-tag type='list' placeholder="请选择是否启用" v-model:value="queryParam.izEnabled" dictCode="iz_enabled" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6">
+              <a-form-item name="materialNo">
+                <template #label><span title="货品编码">货品编码</span></template>
+                <j-input placeholder="请输入货品编码" v-model:value="queryParam.materialNo" allow-clear ></j-input>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6">
+              <a-form-item name="pinyin">
+                <template #label><span title="按拼音检索">按拼音检索</span></template>
+                <j-input placeholder="请输入拼音" v-model:value="queryParam.pinyin" allow-clear ></j-input>
+              </a-form-item>
+            </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <a-row>
+      <a-col :span="4" style="padding: 0 10px 0 0;">
+        <div style="height:600px;background:white; ">
+
+        <a-tree
+          show-line
+          autoExpandParent
+          :tree-data="treeData"
+          @select="onSelect"
+        >
+          <template #switcherIcon="{ switcherCls }"><down-outlined :class="switcherCls" /></template>
+        </a-tree>
+        </div>
+      </a-col>
+      <a-col :span="20">
+        <!--引用表格-->
+        <BasicTable @register="registerTable" >
+          <!--插槽:table标题-->
+          <template #tableTitle>
+            <a-button type="primary" v-auth="'configMaterialInfo:config_material_info:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+            <a-button  type="primary" v-auth="'configMaterialInfo:config_material_info:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+            <j-upload-button  type="primary" v-auth="'configMaterialInfo:config_material_info:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          </template>
+          <!--操作栏-->
+          <template #action="{ record }">
+            <TableAction :actions="getTableAction(record)" />
+          </template>
+          <template v-slot:bodyCell="{ column, record, index, text }">
+          </template>
+        </BasicTable>
+      </a-col>
+    </a-row>
+    
+    <!-- 表单区域 -->
+    <ConfigMaterialInfoModal ref="registerModal" @success="handleSuccess"></ConfigMaterialInfoModal>
+  </div>
+</template>
+
+<script lang="ts" name="configMaterialInfo-configMaterialInfo" setup>
+  import { ref, reactive,onMounted } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns, superQuerySchema } from './ConfigMaterialInfo.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ConfigMaterialInfo.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import ConfigMaterialInfoModal from './components/ConfigMaterialInfoModal.vue'
+  import { useUserStore } from '/@/store/modules/user';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue';
+  import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
+  import { JInput } from '/@/components/Form';
+  import type { TreeProps } from 'ant-design-vue';
+  import { DownOutlined } from '@ant-design/icons-vue';
+import { defHttp } from '/@/utils/http/axios';
+
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  const userStore = useUserStore();
+  let treeData = ref<any>([]);
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '物料信息',
+      api: list,
+      columns,
+      canResize:false,
+      useSearchForm: false,
+           showIndexColumn: true,
+      actionColumn: {
+        width: 160,
+        fixed: 'right',
+      },
+      beforeFetch: async (params) => {
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: "物料信息",
+      url: getExportUrl,
+      params: queryParam,
+    },
+	  importConfig: {
+	    url: getImportUrl,
+	    success: handleSuccess
+	  },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const labelCol = reactive({
+    xs:24,
+    sm:6,
+    xl:6,
+    xxl:6
+  });
+  const wrapperCol = reactive({
+    xs: 24,
+    sm: 20,
+  });
+
+  function onSelect(ids, e) {
+    let id = ids[0];
+    queryParam.treeId =id;
+    reload();
+  }
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    searchQuery();
+  }
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+  
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+   
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+   
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+   
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+   
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+   
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+        auth: 'configMaterialInfo:config_material_info:edit'
+      },
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
+        },
+        auth: 'configMaterialInfo:config_material_info:delete'
+      }
+    ];
+  }
+   
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+  
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    queryParam.treeId = null;
+    //刷新数据
+    reload();
+  }
+
+    
+  // 自动请求并暴露内部方法
+  onMounted(() => {
+    defHttp.get({url:'/ConfigMaterial/configMaterialCategory/getMaterialTreeData'}).then(res =>{
+      treeData.value = res;
+    })
+  });
+
+
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    padding: 0;
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+    .ant-form-item:not(.ant-form-item-with-help){
+      margin-bottom: 16px;
+      height: 32px;
+    }
+    :deep(.ant-picker),:deep(.ant-input-number){
+      width: 100%;
+    }
+  }
+</style>
diff --git a/src/views/config/ConfigMaterial/ConfigMaterialMedication.api.ts b/src/views/config/ConfigMaterial/ConfigMaterialMedication.api.ts
new file mode 100644
index 0000000..37011e5
--- /dev/null
+++ b/src/views/config/ConfigMaterial/ConfigMaterialMedication.api.ts
@@ -0,0 +1,72 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/ConfigMaterial/configMaterialMedication/list',
+  save='/ConfigMaterial/configMaterialMedication/add',
+  edit='/ConfigMaterial/configMaterialMedication/edit',
+  deleteOne = '/ConfigMaterial/configMaterialMedication/delete',
+  deleteBatch = '/ConfigMaterial/configMaterialMedication/deleteBatch',
+  importExcel = '/ConfigMaterial/configMaterialMedication/importExcel',
+  exportXls = '/ConfigMaterial/configMaterialMedication/exportXls',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
diff --git a/src/views/config/ConfigMaterial/ConfigMaterialMedication.data.ts b/src/views/config/ConfigMaterial/ConfigMaterialMedication.data.ts
new file mode 100644
index 0000000..21849d7
--- /dev/null
+++ b/src/views/config/ConfigMaterial/ConfigMaterialMedication.data.ts
@@ -0,0 +1,29 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+import { getWeekMonthQuarterYear } from '/@/utils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '物料类别',
+    align: "center",
+    dataIndex: 'categoryId_dictText'
+  },
+  {
+    title: '物料类型',
+    align: "center",
+    dataIndex: 'typeId_dictText'
+  },
+  {
+    title: '名称',
+    align: "center",
+    dataIndex: 'medicationName'
+  },
+  {
+    title: '是否启用',
+    align: "center",
+    dataIndex: 'izEnabled_dictText'
+  },
+];
+
diff --git a/src/views/config/ConfigMaterial/ConfigMaterialMedicationList.vue b/src/views/config/ConfigMaterial/ConfigMaterialMedicationList.vue
new file mode 100644
index 0000000..d9a0a70
--- /dev/null
+++ b/src/views/config/ConfigMaterial/ConfigMaterialMedicationList.vue
@@ -0,0 +1,245 @@
+<template>
+  <div class="p-2">
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="12">
+            <a-form-item name="categoryId">
+              <template #label><span title="物料类别">物料类别</span></template>
+              <j-dict-select-tag type='list' placeholder="请选择物料类别" v-model:value="queryParam.categoryId" dictCode="config_material_category,category_name,id,iz_enabled = 0 and del_flag = 0" allow-clear />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="12">
+            <a-form-item name="typeId">
+              <template #label><span title="物料类型">物料类型</span></template>
+              <j-dict-select-tag type='list' placeholder="请选择物料类别" v-model:value="queryParam.typeId" :dictCode="`config_material_type,type_name,id,iz_enabled = 0 and del_flag = 0 and category_id = ${queryParam.categoryId || -1}`" allow-clear />
+            </a-form-item>
+          </a-col>
+            <a-col :lg="12">
+              <a-form-item name="medicationName">
+                <template #label><span title="名称">名称</span></template>
+                <a-input placeholder="请输入名称" v-model:value="queryParam.medicationName" allow-clear ></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="12">
+              <a-form-item name="izEnabled">
+                <template #label><span title="是否启用">是否启用</span></template>
+                <j-select-multiple placeholder="请选择是否启用" v-model:value="queryParam.izEnabled" dictCode="iz_enabled" allow-clear />
+              </a-form-item>
+            </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="12">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" v-auth="'ConfigMaterial:config_material_medication:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button  type="primary" v-auth="'ConfigMaterial:config_material_medication:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button  type="primary" v-auth="'ConfigMaterial:config_material_medication:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" />
+      </template>
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <ConfigMaterialMedicationModal ref="registerModal" @success="handleSuccess"></ConfigMaterialMedicationModal>
+  </div>
+</template>
+
+<script lang="ts" name="ConfigMaterial-configMaterialMedication" setup>
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './ConfigMaterialMedication.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ConfigMaterialMedication.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import ConfigMaterialMedicationModal from './components/ConfigMaterialMedicationModal.vue'
+  import { useUserStore } from '/@/store/modules/user';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
+
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  const userStore = useUserStore();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '物料用药类型',
+      api: list,
+      columns,
+      canResize:false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 160,
+        fixed: 'right',
+      },
+      beforeFetch: async (params) => {
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: "物料用药类型",
+      url: getExportUrl,
+      params: queryParam,
+    },
+	  importConfig: {
+	    url: getImportUrl,
+	    success: handleSuccess
+	  },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const labelCol = reactive({
+    xs:24,
+    sm:6,
+    xl:6,
+    xxl:6
+  });
+  const wrapperCol = reactive({
+    xs: 24,
+    sm: 20,
+  });
+
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    searchQuery();
+  }
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+  
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+   
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+   
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+   
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+   
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+   
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+        auth: 'ConfigMaterial:config_material_medication:edit'
+      },
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
+        },
+        auth: 'ConfigMaterial:config_material_medication:delete'
+      }
+    ];
+  }
+   
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+  
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+  
+
+
+
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    padding: 0;
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+    .ant-form-item:not(.ant-form-item-with-help){
+      margin-bottom: 16px;
+      height: 32px;
+    }
+    :deep(.ant-picker),:deep(.ant-input-number){
+      width: 100%;
+    }
+  }
+</style>
diff --git a/src/views/config/ConfigMaterial/ConfigMaterialMedicationListModal.vue b/src/views/config/ConfigMaterial/ConfigMaterialMedicationListModal.vue
new file mode 100644
index 0000000..fc4a7ec
--- /dev/null
+++ b/src/views/config/ConfigMaterial/ConfigMaterialMedicationListModal.vue
@@ -0,0 +1,75 @@
+<template>
+  <BasicDrawer
+    v-bind="$attrs"
+    @register="registerDrawer"
+    :title="getTitle"
+    :width="`850px`"
+    @ok="handleSubmit"
+    @close="handleSubmit"
+    :showFooter="showFooter"
+    destroyOnClose
+  >
+    <ConfigMaterialMedicationList @register="registerForm" />
+  </BasicDrawer>
+</template>
+<script lang="ts" setup>
+  import { defineComponent, ref, computed, unref, useAttrs } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { useDrawerAdaptiveWidth } from '/@/hooks/jeecg/useAdaptiveWidth';
+  import { getTenantId } from "/@/utils/auth";
+  import ConfigMaterialMedicationList from "./ConfigMaterialMedicationList.vue";
+
+  // 声明Emits
+  const emit = defineEmits(['success', 'register']);
+  const attrs = useAttrs();
+  const isUpdate = ref(true);
+  const rowId = ref('');
+  const departOptions = ref([]);
+  let isFormDepartUser = false;
+  //表单配置
+  const [registerForm, { setProps, resetFields, setFieldsValue, validate, updateSchema }] = useForm({
+    labelWidth: 90,
+    showActionButtonGroup: false,
+  });
+  const showFooter = ref(true);
+  //表单赋值
+  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+    await resetFields();
+    showFooter.value = data?.showFooter ?? true;
+    setDrawerProps({ confirmLoading: false, showFooter: showFooter.value });
+    isUpdate.value = !!data?.isUpdate;
+    
+    if (unref(isUpdate)) {
+        //表单赋值
+        await setFieldsValue({
+            ...data.record,
+        });
+    }
+    setProps({ disabled: !showFooter.value });
+  });
+  //获取标题
+  const getTitle = computed(() => {
+    // update-begin--author:liaozhiyang---date:20240306---for：【QQYUN-8389】系统用户详情抽屉title更改
+    if (!unref(isUpdate)) {
+      return '新增';
+    } else {
+      return unref(showFooter) ? '编辑' : '详情';
+    }
+    // update-end--author:liaozhiyang---date:20240306---for：【QQYUN-8389】系统用户详情抽屉title更改
+  });
+  const { adaptiveWidth } = useDrawerAdaptiveWidth();
+
+  //提交事件
+  async function handleSubmit() {
+    try {
+       console.log(11111111111);
+      //关闭弹窗
+      closeDrawer();
+      //刷新列表
+      emit('success');
+    } finally {
+      setDrawerProps({ confirmLoading: false });
+    }
+  }
+</script>
diff --git a/src/views/config/ConfigMaterial/ConfigMaterialType.api.ts b/src/views/config/ConfigMaterial/ConfigMaterialType.api.ts
new file mode 100644
index 0000000..8cd2fe5
--- /dev/null
+++ b/src/views/config/ConfigMaterial/ConfigMaterialType.api.ts
@@ -0,0 +1,72 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/ConfigMaterial/configMaterialType/list',
+  save='/ConfigMaterial/configMaterialType/add',
+  edit='/ConfigMaterial/configMaterialType/edit',
+  deleteOne = '/ConfigMaterial/configMaterialType/delete',
+  deleteBatch = '/ConfigMaterial/configMaterialType/deleteBatch',
+  importExcel = '/ConfigMaterial/configMaterialType/importExcel',
+  exportXls = '/ConfigMaterial/configMaterialType/exportXls',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
diff --git a/src/views/config/ConfigMaterial/ConfigMaterialType.data.ts b/src/views/config/ConfigMaterial/ConfigMaterialType.data.ts
new file mode 100644
index 0000000..93b5467
--- /dev/null
+++ b/src/views/config/ConfigMaterial/ConfigMaterialType.data.ts
@@ -0,0 +1,24 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+import { getWeekMonthQuarterYear } from '/@/utils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '物料类别',
+    align: "center",
+    dataIndex: 'categoryId_dictText'
+  },
+  {
+    title: '物料类型',
+    align: "center",
+    dataIndex: 'typeName'
+  },
+  {
+    title: '是否启用',
+    align: "center",
+    dataIndex: 'izEnabled_dictText'
+  },
+];
+
diff --git a/src/views/config/ConfigMaterial/ConfigMaterialTypeList.vue b/src/views/config/ConfigMaterial/ConfigMaterialTypeList.vue
new file mode 100644
index 0000000..80f4056
--- /dev/null
+++ b/src/views/config/ConfigMaterial/ConfigMaterialTypeList.vue
@@ -0,0 +1,241 @@
+<template>
+  <div class="p-2">
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="12">
+            <a-form-item name="categoryId">
+              <template #label><span title="物料类别">物料类别</span></template>
+              <j-dict-select-tag type='list' placeholder="请选择物料类别" v-model:value="queryParam.categoryId" dictCode="config_material_category,category_name,id,iz_enabled = 0 and del_flag = 0" allow-clear />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="12">
+            <a-form-item name="typeName">
+              <template #label><span title="物料类型">物料类型</span></template>
+              <a-input placeholder="请输入物料类型" v-model:value="queryParam.typeName" allow-clear ></a-input>
+            </a-form-item>
+          </a-col>
+            <a-col :lg="12">
+              <a-form-item name="izEnabled">
+                <template #label><span title="是否启用">是否启用</span></template>
+                <j-dict-select-tag type='list' placeholder="请选择是否启用" v-model:value="queryParam.izEnabled" dictCode="iz_enabled" allow-clear />
+              </a-form-item>
+            </a-col>
+          <a-col :lg="12" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" v-auth="'ConfigMaterial:config_material_type:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button  type="primary" v-auth="'ConfigMaterial:config_material_type:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button  type="primary" v-auth="'ConfigMaterial:config_material_type:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)"/>
+      </template>
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <ConfigMaterialTypeModal ref="registerModal" @success="handleSuccess"></ConfigMaterialTypeModal>
+  </div>
+</template>
+
+<script lang="ts" name="ConfigMaterial-configMaterialType" setup>
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns,  } from './ConfigMaterialType.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ConfigMaterialType.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import ConfigMaterialTypeModal from './components/ConfigMaterialTypeModal.vue'
+  import { useUserStore } from '/@/store/modules/user';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
+
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  const userStore = useUserStore();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '物料类型',
+      api: list,
+      columns,
+      canResize:false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 160,
+        fixed: 'right',
+      },
+      beforeFetch: async (params) => {
+        return Object.assign(params, queryParam);
+      },
+    },
+    exportConfig: {
+      name: "物料类型",
+      url: getExportUrl,
+      params: queryParam,
+    },
+	  importConfig: {
+	    url: getImportUrl,
+	    success: handleSuccess
+	  },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const labelCol = reactive({
+    xs:24,
+    sm:6,
+    xl:6,
+    xxl:6
+  });
+  const wrapperCol = reactive({
+    xs: 24,
+    sm: 24,
+  });
+
+  // 高级查询配置
+  const superQueryConfig = reactive();
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    searchQuery();
+  }
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+  
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+   
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+   
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+   
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+   
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+   
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+        auth: 'ConfigMaterial:config_material_type:edit'
+      },
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+          placement: 'topLeft',
+        },
+        auth: 'ConfigMaterial:config_material_type:delete'
+      }
+    ];
+  }
+   
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+  
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+  
+
+
+
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    padding: 0;
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+    .ant-form-item:not(.ant-form-item-with-help){
+      margin-bottom: 16px;
+      height: 32px;
+    }
+    :deep(.ant-picker),:deep(.ant-input-number){
+      width: 100%;
+    }
+  }
+</style>
diff --git a/src/views/config/ConfigMaterial/ConfigMaterialTypeListModal.vue b/src/views/config/ConfigMaterial/ConfigMaterialTypeListModal.vue
new file mode 100644
index 0000000..f8612a3
--- /dev/null
+++ b/src/views/config/ConfigMaterial/ConfigMaterialTypeListModal.vue
@@ -0,0 +1,75 @@
+<template>
+  <BasicDrawer
+    v-bind="$attrs"
+    @register="registerDrawer"
+    :title="getTitle"
+    :width="`700px`"
+    @ok="handleSubmit"
+    @close="handleSubmit"
+    :showFooter="showFooter"
+    destroyOnClose
+  >
+    <ConfigMaterialTypeList @register="registerForm" />
+  </BasicDrawer>
+</template>
+<script lang="ts" setup>
+  import { defineComponent, ref, computed, unref, useAttrs } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { useDrawerAdaptiveWidth } from '/@/hooks/jeecg/useAdaptiveWidth';
+  import { getTenantId } from "/@/utils/auth";
+  import ConfigMaterialTypeList from "./ConfigMaterialTypeList.vue";
+
+  // 声明Emits
+  const emit = defineEmits(['success', 'register']);
+  const attrs = useAttrs();
+  const isUpdate = ref(true);
+  const rowId = ref('');
+  const departOptions = ref([]);
+  let isFormDepartUser = false;
+  //表单配置
+  const [registerForm, { setProps, resetFields, setFieldsValue, validate, updateSchema }] = useForm({
+    labelWidth: 90,
+    showActionButtonGroup: false,
+  });
+  const showFooter = ref(true);
+  //表单赋值
+  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+    await resetFields();
+    showFooter.value = data?.showFooter ?? true;
+    setDrawerProps({ confirmLoading: false, showFooter: showFooter.value });
+    isUpdate.value = !!data?.isUpdate;
+    
+    if (unref(isUpdate)) {
+        //表单赋值
+        await setFieldsValue({
+            ...data.record,
+        });
+    }
+    setProps({ disabled: !showFooter.value });
+  });
+  //获取标题
+  const getTitle = computed(() => {
+    // update-begin--author:liaozhiyang---date:20240306---for：【QQYUN-8389】系统用户详情抽屉title更改
+    if (!unref(isUpdate)) {
+      return '新增';
+    } else {
+      return unref(showFooter) ? '编辑' : '详情';
+    }
+    // update-end--author:liaozhiyang---date:20240306---for：【QQYUN-8389】系统用户详情抽屉title更改
+  });
+  const { adaptiveWidth } = useDrawerAdaptiveWidth();
+
+  //提交事件
+  async function handleSubmit() {
+    try {
+       
+      //关闭弹窗
+      closeDrawer();
+      //刷新列表
+      emit('success');
+    } finally {
+      setDrawerProps({ confirmLoading: false });
+    }
+  }
+</script>
diff --git a/src/views/config/ConfigMaterial/components/ConfigMaterialCategoryForm.vue b/src/views/config/ConfigMaterial/components/ConfigMaterialCategoryForm.vue
new file mode 100644
index 0000000..5315af2
--- /dev/null
+++ b/src/views/config/ConfigMaterial/components/ConfigMaterialCategoryForm.vue
@@ -0,0 +1,70 @@
+<template>
+    <div style="min-height: 400px">
+        <BasicForm @register="registerForm"></BasicForm>
+        <div style="width: 100%;text-align: center" v-if="!formDisabled">
+            <a-button @click="submitForm" pre-icon="ant-design:check" type="primary">提 交</a-button>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {computed, defineComponent} from 'vue';
+    import {defHttp} from '/@/utils/http/axios';
+    import { propTypes } from '/@/utils/propTypes';
+    import {getBpmFormSchema} from '../ConfigMaterialCategory.data';
+    import {saveOrUpdate} from '../ConfigMaterialCategory.api';
+    
+    export default defineComponent({
+        name: "ConfigMaterialCategoryForm",
+        components:{
+            BasicForm
+        },
+        props:{
+            formData: propTypes.object.def({}),
+            formBpm: propTypes.bool.def(true),
+        },
+        setup(props){
+            const [registerForm, { setFieldsValue, setProps, getFieldsValue }] = useForm({
+                labelWidth: 150,
+                schemas: getBpmFormSchema(props.formData),
+                showActionButtonGroup: false,
+                baseColProps: {span: 24}
+            });
+
+            const formDisabled = computed(()=>{
+                if(props.formData.disabled === false){
+                    return false;
+                }
+                return true;
+            });
+
+            let formData = {};
+            const queryByIdUrl = '/ConfigMaterial/configMaterialCategory/queryById';
+            async function initFormData(){
+                let params = {id: props.formData.dataId};
+                const data = await defHttp.get({url: queryByIdUrl, params});
+                formData = {...data}
+                //设置表单的值
+                await setFieldsValue(formData);
+                //默认是禁用
+                await setProps({disabled: formDisabled.value})
+            }
+
+            async function submitForm() {
+                let data = getFieldsValue();
+                let params = Object.assign({}, formData, data);
+                console.log('表单数据', params)
+                await saveOrUpdate(params, true)
+            }
+
+            initFormData();
+            
+            return {
+                registerForm,
+                formDisabled,
+                submitForm,
+            }
+        }
+    });
+</script>
\ No newline at end of file
diff --git a/src/views/config/ConfigMaterial/components/ConfigMaterialCategoryModal.vue b/src/views/config/ConfigMaterial/components/ConfigMaterialCategoryModal.vue
new file mode 100644
index 0000000..776982f
--- /dev/null
+++ b/src/views/config/ConfigMaterial/components/ConfigMaterialCategoryModal.vue
@@ -0,0 +1,76 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="800" @ok="handleSubmit">
+      <BasicForm @register="registerForm" name="ConfigMaterialCategoryForm" />
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../ConfigMaterialCategory.data';
+    import {saveOrUpdate} from '../ConfigMaterialCategory.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    const isDetail = ref(false);
+    //表单配置
+    const [registerForm, { setProps,resetFields, setFieldsValue, validate, scrollToField }] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+        baseColProps: {span: 24}
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        isDetail.value = !!data?.showFooter;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : !unref(isDetail) ? '详情' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } catch ({ errorFields }) {
+           if (errorFields) {
+             const firstField = errorFields[0];
+             if (firstField) {
+               scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+             }
+           }
+           return Promise.reject(errorFields);
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+	/** 时间和数字输入框样式 */
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+
+  :deep(.ant-calendar-picker) {
+    width: 100%;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/config/ConfigMaterial/components/ConfigMaterialInfoForm.vue b/src/views/config/ConfigMaterial/components/ConfigMaterialInfoForm.vue
new file mode 100644
index 0000000..a44684c
--- /dev/null
+++ b/src/views/config/ConfigMaterial/components/ConfigMaterialInfoForm.vue
@@ -0,0 +1,279 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ConfigMaterialInfoForm">
+          <a-row>
+						<a-col :span="8">
+							<a-form-item label="物料类别" v-bind="validateInfos.categoryId" id="ConfigMaterialInfoForm-categoryId" name="categoryId">
+                <j-dict-select-tag type='list' v-model:value="formData.categoryId" dictCode="config_material_category,category_name,id,iz_enabled = 0 and del_flag = 0" placeholder="请选择物料类别"  allow-clear @change="formData.typeId = null , formData.medicationId = null" />
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="物料类型" v-bind="validateInfos.typeId" id="ConfigMaterialInfoForm-typeId" name="typeId">
+                <j-dict-select-tag type='list' v-model:value="formData.typeId" :dictCode="`config_material_type,type_name,id,category_id = ${formData.categoryId || -1} and iz_enabled = 0 and del_flag = 0 `" placeholder="请选择物料类型" @change="formData.medicationId = null"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="用药类型" v-bind="validateInfos.medicationId" id="ConfigMaterialInfoForm-medicationId" name="medicationId">
+                <j-dict-select-tag type='list' v-model:value="formData.medicationId" :dictCode="`config_material_medication,medication_name,id,type_id = ${formData.typeId || -1} and iz_enabled = 0 and del_flag = 0`" placeholder="请选择用药类型"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="货品名称" v-bind="validateInfos.materialName" id="ConfigMaterialInfoForm-materialName" name="materialName">
+								<a-input v-model:value="formData.materialName" placeholder="请输入货品名称"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="货品编码" v-bind="validateInfos.materialNo" id="ConfigMaterialInfoForm-materialNo" name="materialNo">
+								<a-input v-model:value="formData.materialNo" placeholder="请输入货品编码"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="规格型号" v-bind="validateInfos.specificationModel" id="ConfigMaterialInfoForm-specificationModel" name="specificationModel">
+								<a-input v-model:value="formData.specificationModel" placeholder="请输入规格型号"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="销售单价" v-bind="validateInfos.salesUnitPrice" id="ConfigMaterialInfoForm-salesUnitPrice" name="salesUnitPrice">
+								<a-input-number v-model:value="formData.salesUnitPrice" placeholder="请输入销售单价" style="width: 100%" />
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="参考单价" v-bind="validateInfos.referenceUnitPrice" id="ConfigMaterialInfoForm-referenceUnitPrice" name="referenceUnitPrice">
+								<a-input-number v-model:value="formData.referenceUnitPrice" placeholder="请输入参考单价" style="width: 100%" />
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="货品单位" v-bind="validateInfos.materialUnits" id="ConfigMaterialInfoForm-materialUnits" name="materialUnits">
+								<a-input v-model:value="formData.materialUnits" placeholder="请输入货品单位"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="多单位开关" v-bind="validateInfos.multiUnitSwitch" id="ConfigMaterialInfoForm-multiUnitSwitch" name="multiUnitSwitch">
+                <j-dict-select-tag type='radio' v-model:value="formData.multiUnitSwitch" dictCode="multiUnitSwitch" placeholder="请选择多单位开关"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="多单位采购单位" v-bind="validateInfos.multiUnitType" id="ConfigMaterialInfoForm-multiUnitType" name="multiUnitType">
+                <j-dict-select-tag type='radio' v-model:value="formData.multiUnitType" dictCode="multiUnitType" placeholder="请选择多单位默认采购"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="是否启用" v-bind="validateInfos.izEnabled" id="ConfigMaterialInfoForm-izEnabled" name="izEnabled">
+                <j-dict-select-tag type='radio' v-model:value="formData.izEnabled" dictCode="iz_enabled" placeholder="请选择是否启用"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="8" v-if="formData.multiUnitSwitch == '1'">
+							<a-form-item label="父级单位" v-bind="validateInfos.oneUnit" id="ConfigMaterialInfoForm-oneUnit" name="oneUnit">
+								<a-input v-model:value="formData.oneUnit" placeholder="请输入父级单位"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8" v-if="formData.multiUnitSwitch == '1'">
+							<a-form-item label="父级单位兑换比例" v-bind="validateInfos.oneUnitProportion" id="ConfigMaterialInfoForm-oneUnitProportion" name="oneUnitProportion">
+								<a-input-number v-model:value="formData.oneUnitProportion" placeholder="请输入父级单位兑换比例" style="width: 100%" />
+							</a-form-item>
+						</a-col>
+						<a-col :span="8" v-if="formData.multiUnitSwitch == '1'">
+							<a-form-item label="父级单位价格" v-bind="validateInfos.oneUnitPrice" id="ConfigMaterialInfoForm-oneUnitPrice" name="oneUnitPrice">
+								<a-input-number v-model:value="formData.oneUnitPrice" placeholder="请输入父级单位价格" style="width: 100%" />
+							</a-form-item>
+						</a-col>
+						<a-col :span="8" v-if="formData.multiUnitSwitch == '1'">
+							<a-form-item label="爷级单位" v-bind="validateInfos.twoUnit" id="ConfigMaterialInfoForm-twoUnit" name="twoUnit">
+								<a-input v-model:value="formData.twoUnit" placeholder="请输入爷级单位"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8" v-if="formData.multiUnitSwitch == '1'">
+							<a-form-item label="爷级单位兑换比例" v-bind="validateInfos.twoUnitProportion" id="ConfigMaterialInfoForm-twoUnitProportion" name="twoUnitProportion">
+								<a-input-number v-model:value="formData.twoUnitProportion" placeholder="请输入爷级单位兑换比例" style="width: 100%" />
+							</a-form-item>
+						</a-col>
+						<a-col :span="8" v-if="formData.multiUnitSwitch == '1'">
+							<a-form-item label="爷级单位价格" v-bind="validateInfos.twoUnitPrice" id="ConfigMaterialInfoForm-twoUnitPrice" name="twoUnitPrice">
+								<a-input-number v-model:value="formData.twoUnitPrice" placeholder="请输入爷级单位价格" style="width: 100%" />
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="供应商" v-bind="validateInfos.suppliers" id="ConfigMaterialInfoForm-suppliers" name="suppliers" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
+                <j-select-multiple placeholder="请选择物料类别" v-model:value="formData.suppliers" dictCode="config_suppliers_info,suppliers_name,id,supply_state = 1 and del_flag = 0" allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="物料图片" v-bind="validateInfos.materialImg" id="ConfigMaterialInfoForm-materialImg" name="materialImg">
+								<j-image-upload :fileMax="0" v-model:value="formData.materialImg" ></j-image-upload>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="物料标识" v-bind="validateInfos.materialIdent" id="ConfigMaterialInfoForm-materialIdent" name="materialIdent">
+								<j-image-upload :fileMax="0" v-model:value="formData.materialIdent" ></j-image-upload>
+							</a-form-item>
+						</a-col>
+          </a-row>
+        </a-form>
+      </template>
+    </JFormContainer>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue';
+  import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue';
+  import { getValueType } from '/@/utils';
+  import { saveOrUpdate } from '../ConfigMaterialInfo.api';
+  import { Form } from 'ant-design-vue';
+  import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+  import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: () => ({})},
+    formBpm: { type: Boolean, default: true }
+  });
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    categoryId: '',   
+    typeId: '',   
+    medicationId: '',   
+    materialName: '',   
+    materialNo: '',   
+    specificationModel: '',   
+    salesUnitPrice: undefined,
+    referenceUnitPrice: undefined,
+    materialUnits: '',   
+    multiUnitSwitch: '2',   
+    oneUnit: '',   
+    oneUnitProportion: undefined,
+    oneUnitPrice: undefined,
+    twoUnit: '',   
+    twoUnitProportion: undefined,
+    twoUnitPrice: undefined,
+    multiUnitType: '0',   
+    izEnabled: '0',   
+    suppliers: '',   
+    materialImg: '',   
+    materialIdent: '',   
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 9 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 13 } });
+  const labelCol2 = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol2 = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const labelCol3 = ref<any>({ xs: { span: 24 }, sm: { span: 3 } });
+  const wrapperCol3 = ref<any>({ xs: { span: 24 }, sm: { span: 20 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = reactive({
+    categoryId: [{ required: true, message: '请选择物料类别!'},],
+    typeId: [{ required: true, message: '请选择物料类型!'},],
+    materialName: [{ required: true, message: '请输入货品名称!'},],
+    salesUnitPrice: [{ required: true, message: '请输入销售单价!'},],
+    referenceUnitPrice: [{ required: true, message: '请输入参考单价!'},],
+    materialUnits: [{ required: true, message: '请输入货品单位!'},],
+    suppliers: [{ required: true, message: '请选择供应商!'},],
+  });
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
+
+  // 表单禁用
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return false;
+      }else{
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+  
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      const tmpData = {};
+      Object.keys(formData).forEach((key) => {
+        if(record.hasOwnProperty(key)){
+          tmpData[key] = record[key]
+        }
+      })
+      //赋值
+      Object.assign(formData, tmpData);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    try {
+      // 触发表单验证
+      await validate();
+    } catch ({ errorFields }) {
+      if (errorFields) {
+        const firstField = errorFields[0];
+        if (firstField) {
+          formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+        }
+      }
+      return Promise.reject(errorFields);
+    }
+    confirmLoading.value = true;
+    const isUpdate = ref<boolean>(false);
+    //时间格式化
+    let model = formData;
+    if (model.id) {
+      isUpdate.value = true;
+    }
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    await saveOrUpdate(model, isUpdate.value)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    padding: 14px;
+  }
+</style>
diff --git a/src/views/config/ConfigMaterial/components/ConfigMaterialInfoModal.vue b/src/views/config/ConfigMaterial/components/ConfigMaterialInfoModal.vue
new file mode 100644
index 0000000..5d51502
--- /dev/null
+++ b/src/views/config/ConfigMaterial/components/ConfigMaterialInfoModal.vue
@@ -0,0 +1,77 @@
+<template>
+  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <ConfigMaterialInfoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ConfigMaterialInfoForm>
+  </j-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import ConfigMaterialInfoForm from './ConfigMaterialInfoForm.vue'
+  import JModal from '/@/components/Modal/src/JModal/JModal.vue';
+  
+  const title = ref<string>('');
+  const width = ref<string>('80%');
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style lang="less">
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
+<style lang="less" scoped></style>
diff --git a/src/views/config/ConfigMaterial/components/ConfigMaterialMedicationForm.vue b/src/views/config/ConfigMaterial/components/ConfigMaterialMedicationForm.vue
new file mode 100644
index 0000000..4867f12
--- /dev/null
+++ b/src/views/config/ConfigMaterial/components/ConfigMaterialMedicationForm.vue
@@ -0,0 +1,167 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ConfigMaterialMedicationForm">
+          <a-row>
+						<a-col :span="24">
+							<a-form-item label="物料类别" v-bind="validateInfos.categoryId" id="ConfigMaterialMedicationForm-categoryId" name="categoryId">
+								<j-dict-select-tag type='radio' v-model:value="formData.categoryId" dictCode="config_material_category,category_name,id,iz_enabled = 0 and del_flag = 0" placeholder="请选择物料类别"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="物料类型" v-bind="validateInfos.typeId" id="ConfigMaterialMedicationForm-typeId" name="typeId">
+								<j-dict-select-tag type='radio' v-model:value="formData.typeId" :dictCode="`config_material_type,type_name,id,iz_enabled = 0 and del_flag = 0 and category_id = ${formData.categoryId || -1}`" placeholder="请选择物料类型"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="名称" v-bind="validateInfos.medicationName" id="ConfigMaterialMedicationForm-medicationName" name="medicationName">
+								<a-input v-model:value="formData.medicationName" placeholder="请输入名称"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="是否启用" v-bind="validateInfos.izEnabled" id="ConfigMaterialMedicationForm-izEnabled" name="izEnabled">
+								<j-dict-select-tag type='radio' v-model:value="formData.izEnabled" dictCode="iz_enabled" placeholder="请选择是否启用"  allow-clear />
+							</a-form-item>
+						</a-col>
+          </a-row>
+        </a-form>
+      </template>
+    </JFormContainer>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import { getValueType } from '/@/utils';
+  import { saveOrUpdate } from '../ConfigMaterialMedication.api';
+  import { Form } from 'ant-design-vue';
+  import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: () => ({})},
+    formBpm: { type: Boolean, default: true }
+  });
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    categoryId: '',   
+    typeId: '',   
+    medicationName: '',   
+    izEnabled: '',   
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = reactive({
+    categoryId: [{ required: true, message: '请输入物料类别!'},],
+    typeId: [{ required: true, message: '请输入物料类型!'},],
+    medicationName: [{ required: true, message: '请输入名称!'},],
+  });
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
+
+  // 表单禁用
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return false;
+      }else{
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+
+  
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      const tmpData = {};
+      Object.keys(formData).forEach((key) => {
+        if(record.hasOwnProperty(key)){
+          tmpData[key] = record[key]
+        }
+      })
+      //赋值
+      Object.assign(formData, tmpData);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    try {
+      // 触发表单验证
+      await validate();
+    } catch ({ errorFields }) {
+      if (errorFields) {
+        const firstField = errorFields[0];
+        if (firstField) {
+          formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+        }
+      }
+      return Promise.reject(errorFields);
+    }
+    confirmLoading.value = true;
+    const isUpdate = ref<boolean>(false);
+    //时间格式化
+    let model = formData;
+    if (model.id) {
+      isUpdate.value = true;
+    }
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    await saveOrUpdate(model, isUpdate.value)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    padding: 14px;
+  }
+</style>
diff --git a/src/views/config/ConfigMaterial/components/ConfigMaterialMedicationModal.vue b/src/views/config/ConfigMaterial/components/ConfigMaterialMedicationModal.vue
new file mode 100644
index 0000000..541fc66
--- /dev/null
+++ b/src/views/config/ConfigMaterial/components/ConfigMaterialMedicationModal.vue
@@ -0,0 +1,77 @@
+<template>
+  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <ConfigMaterialMedicationForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ConfigMaterialMedicationForm>
+  </j-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import ConfigMaterialMedicationForm from './ConfigMaterialMedicationForm.vue'
+  import JModal from '/@/components/Modal/src/JModal/JModal.vue';
+  
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style lang="less">
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
+<style lang="less" scoped></style>
diff --git a/src/views/config/ConfigMaterial/components/ConfigMaterialTypeForm.vue b/src/views/config/ConfigMaterial/components/ConfigMaterialTypeForm.vue
new file mode 100644
index 0000000..4d8f62b
--- /dev/null
+++ b/src/views/config/ConfigMaterial/components/ConfigMaterialTypeForm.vue
@@ -0,0 +1,160 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ConfigMaterialTypeForm">
+          <a-row>
+						<a-col :span="24">
+							<a-form-item label="物料类别" v-bind="validateInfos.categoryId" id="ConfigMaterialTypeForm-categoryId" name="categoryId">
+                <j-dict-select-tag type='radio' v-model:value="formData.categoryId" dictCode="config_material_category,category_name,id,iz_enabled = 0 and del_flag = 0" placeholder="请选择物料类别"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="物料类型" v-bind="validateInfos.typeName" id="ConfigMaterialTypeForm-typeName" name="typeName">
+								<a-input v-model:value="formData.typeName" placeholder="请输入物料类型"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="是否启用" v-bind="validateInfos.izEnabled" id="ConfigMaterialTypeForm-izEnabled" name="izEnabled">
+								<j-dict-select-tag type='radio' v-model:value="formData.izEnabled" dictCode="iz_enabled" placeholder="请选择是否启用"  allow-clear />
+							</a-form-item>
+						</a-col>
+          </a-row>
+        </a-form>
+      </template>
+    </JFormContainer>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import { getValueType } from '/@/utils';
+  import { saveOrUpdate } from '../ConfigMaterialType.api';
+  import { Form } from 'ant-design-vue';
+  import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: () => ({})},
+    formBpm: { type: Boolean, default: true }
+  });
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    categoryId: '',   
+    typeName: '',   
+    izEnabled: '',   
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = reactive({
+    categoryId: [{ required: true, message: '请输入物料类别!'},],
+    typeName: [{ required: true, message: '请输入物料类型!'},],
+  });
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
+
+  // 表单禁用
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return false;
+      }else{
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+
+  
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      const tmpData = {};
+      Object.keys(formData).forEach((key) => {
+        if(record.hasOwnProperty(key)){
+          tmpData[key] = record[key]
+        }
+      })
+      //赋值
+      Object.assign(formData, tmpData);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    try {
+      // 触发表单验证
+      await validate();
+    } catch ({ errorFields }) {
+      if (errorFields) {
+        const firstField = errorFields[0];
+        if (firstField) {
+          formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+        }
+      }
+      return Promise.reject(errorFields);
+    }
+    confirmLoading.value = true;
+    const isUpdate = ref<boolean>(false);
+    //时间格式化
+    let model = formData;
+    if (model.id) {
+      isUpdate.value = true;
+    }
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    await saveOrUpdate(model, isUpdate.value)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    padding: 14px;
+  }
+</style>
diff --git a/src/views/config/ConfigMaterial/components/ConfigMaterialTypeModal.vue b/src/views/config/ConfigMaterial/components/ConfigMaterialTypeModal.vue
new file mode 100644
index 0000000..d4007ce
--- /dev/null
+++ b/src/views/config/ConfigMaterial/components/ConfigMaterialTypeModal.vue
@@ -0,0 +1,77 @@
+<template>
+  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <ConfigMaterialTypeForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ConfigMaterialTypeForm>
+  </j-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import ConfigMaterialTypeForm from './ConfigMaterialTypeForm.vue'
+  import JModal from '/@/components/Modal/src/JModal/JModal.vue';
+  
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style lang="less">
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
+<style lang="less" scoped></style>
diff --git a/src/views/config/configSuppliersInfo/ConfigSuppliersInfoList.vue b/src/views/config/configSuppliersInfo/ConfigSuppliersInfoList.vue
index 1bd3d60..58997bc 100644
--- a/src/views/config/configSuppliersInfo/ConfigSuppliersInfoList.vue
+++ b/src/views/config/configSuppliersInfo/ConfigSuppliersInfoList.vue
@@ -1,27 +1,12 @@
 <template>
   <div>
     <!--引用表格-->
-   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+   <BasicTable @register="registerTable">
      <!--插槽:table标题-->
       <template #tableTitle>
           <a-button type="primary" v-auth="'configSuppliersInfo:config_suppliers_info:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
           <a-button  type="primary" v-auth="'configSuppliersInfo:config_suppliers_info:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
           <j-upload-button type="primary" v-auth="'configSuppliersInfo:config_suppliers_info:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
-          <a-dropdown v-if="selectedRowKeys.length > 0">
-              <template #overlay>
-                <a-menu>
-                  <a-menu-item key="1" @click="batchHandleDelete">
-                    <Icon icon="ant-design:delete-outlined"></Icon>
-                    删除
-                  </a-menu-item>
-                </a-menu>
-              </template>
-              <a-button v-auth="'configSuppliersInfo:config_suppliers_info:deleteBatch'">批量操作
-                <Icon icon="mdi:chevron-down"></Icon>
-              </a-button>
-        </a-dropdown>
-        <!-- 高级查询 -->
-        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
       </template>
        <!--操作栏-->
       <template #action="{ record }">
@@ -61,6 +46,7 @@
            api: list,
            columns,
            canResize:false,
+           showIndexColumn: true,
            formConfig: {
               //labelWidth: 120,
               schemas: searchFormSchema,
@@ -72,7 +58,7 @@
               ],
             },
            actionColumn: {
-               width: 120,
+               width: 160,
                fixed:'right'
             },
             beforeFetch: (params) => {
@@ -163,14 +149,7 @@
            label: '编辑',
            onClick: handleEdit.bind(null, record),
            auth: 'configSuppliersInfo:config_suppliers_info:edit'
-         }
-       ]
-   }
-     /**
-        * 下拉操作栏
-        */
-  function getDropDownAction(record){
-       return [
+         },
          {
            label: '详情',
            onClick: handleDetail.bind(null, record),
@@ -185,6 +164,13 @@
          }
        ]
    }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+       return [
+       ]
+   }
 
 </script>