diff --git a/src/views/config/dictType/DictTypeItem.data.ts b/src/views/config/dictType/DictTypeItem.data.ts
index 680cd70..0f44daa 100644
--- a/src/views/config/dictType/DictTypeItem.data.ts
+++ b/src/views/config/dictType/DictTypeItem.data.ts
@@ -28,10 +28,7 @@ export const columns: BasicColumn[] = [
   {
     title: '状态',
     align: "center",
-    dataIndex: 'status',
-    format(text, record, index) {
-      return text == 1 ? '启用' : '未启用'
-    },
+    dataIndex: 'status_dictText'
   },
 ];
 
diff --git a/src/views/config/dictType/components/DictTypeItemForm.vue b/src/views/config/dictType/components/DictTypeItemForm.vue
index 57a396f..32bf11a 100644
--- a/src/views/config/dictType/components/DictTypeItemForm.vue
+++ b/src/views/config/dictType/components/DictTypeItemForm.vue
@@ -29,10 +29,8 @@
             </a-col>
             <a-col :span="24">
               <a-form-item label="状态" v-bind="validateInfos.status" id="DictTypeItemForm-status" name="status">
-                <a-radio-group v-model:value="formData.status" style="width: 100%">
-                  <a-radio :value="1">启用</a-radio>
-                  <a-radio :value="0">不启用</a-radio>
-                </a-radio-group>
+                <j-dict-select-tag type='radio' v-model:value="formData.status" dictCode="iz_enabled"
+                  placeholder="请选择状态" />
               </a-form-item>
             </a-col>
             <a-col :span="24">
@@ -64,6 +62,7 @@ import { getValueType } from '/@/utils';
 import { saveOrUpdate } from '../DictTypeItem.api';
 import { Form } from 'ant-design-vue';
 import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
 const props = defineProps({
   formDisabled: { type: Boolean, default: false },
   formData: { type: Object, default: () => ({}) },
@@ -80,7 +79,7 @@ const formData = reactive<Record<string, any>>({
   itemValue: '',
   description: '',
   sortOrder: undefined,
-  status: 1,
+  status: '0',
   createTime: '',
   updateTime: '',
 });
diff --git a/src/views/config/serviceCategory/ConfigServiceCategory.data.ts b/src/views/config/serviceCategory/ConfigServiceCategory.data.ts
index 65f247a..8f25327 100644
--- a/src/views/config/serviceCategory/ConfigServiceCategory.data.ts
+++ b/src/views/config/serviceCategory/ConfigServiceCategory.data.ts
@@ -6,7 +6,7 @@ import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
-    title: '服务类别名称',
+    title: '服务类别',
     align: "center",
     dataIndex: 'categoryName'
   },
@@ -17,7 +17,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'sort'
   },
   {
-    title: '是否启用 0启用 1未启用',
+    title: '是否启用',
     align: "center",
     dataIndex: 'izEnabled_dictText'
   },
@@ -25,7 +25,7 @@ export const columns: BasicColumn[] = [
 
 // 高级查询数据
 export const superQuerySchema = {
-  categoryName: {title: '服务类别名称',order: 0,view: 'text', type: 'string',},
+  categoryName: {title: '服务类别',order: 0,view: 'text', type: 'string',},
   sort: {title: '排序',order: 1,view: 'number', type: 'number',},
-  izEnabled: {title: '是否启用 0启用 1未启用',order: 2,view: 'radio', type: 'string',dictCode: '',},
+  izEnabled: {title: '是否启用',order: 2,view: 'radio', type: 'string',dictCode: '',},
 };
diff --git a/src/views/config/serviceCategory/ConfigServiceCategoryList.vue b/src/views/config/serviceCategory/ConfigServiceCategoryList.vue
index 5204a8b..211609f 100644
--- a/src/views/config/serviceCategory/ConfigServiceCategoryList.vue
+++ b/src/views/config/serviceCategory/ConfigServiceCategoryList.vue
@@ -2,29 +2,32 @@
   <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-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="categoryName">
-        <template #label><span title="服务类别名称">服务类别</span></template>
-            <JInput v-model:value="queryParam.categoryName"/>
-        </a-form-item>
-        </a-col>
+          <a-col :lg="6">
+            <a-form-item name="categoryName">
+              <template #label><span title="服务类别">服务类别</span></template>
+              <JInput v-model:value="queryParam.categoryName" allowClear placeholder="请输入服务类别" />
+            </a-form-item>
+          </a-col>
           <a-col :lg="6">
             <a-form-item name="izEnabled">
-              <template #label><span title="是否启用 0启用 1未启用">是否启用</span></template>
-              <a-input placeholder="请输入是否启用 0启用 1未启用" v-model:value="queryParam.izEnabled" allow-clear ></a-input>
+              <template #label><span title="是否启用">是否启用</span></template>
+              <j-dict-select-tag type='list' v-model:value="queryParam.izEnabled" dictCode="iz_enabled"
+                placeholder="请选择是否启用" allowClear />
             </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 @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
+                  style="margin-left: 8px">重置</a-button>
+                <!-- <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
                   {{ toggleSearchStatus ? '收起' : '展开' }}
                   <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
-                </a>
+                </a> -->
               </a-col>
             </span>
           </a-col>
@@ -35,9 +38,9 @@
     <BasicTable @register="registerTable" :rowSelection="rowSelection">
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary" v-auth="'serviceCategory:config_service_category:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button  type="primary" v-auth="'serviceCategory:config_service_category:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" v-auth="'serviceCategory:config_service_category:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <!-- <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> -->
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
@@ -47,16 +50,16 @@
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button v-auth="'serviceCategory:config_service_category:deleteBatch'">批量操作
+          <a-button>批量操作
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
         <!-- 高级查询 -->
-        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+        <!-- <super-query :config="superQueryConfig" @search="handleSuperQuery" /> -->
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
       </template>
       <template v-slot:bodyCell="{ column, record, index, text }">
       </template>
@@ -67,194 +70,203 @@
 </template>
 
 <script lang="ts" name="serviceCategory-configServiceCategory" setup>
-  import { ref, reactive } from 'vue';
-  import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { useListPage } from '/@/hooks/system/useListPage';
-  import { columns, superQuerySchema } from './ConfigServiceCategory.data';
-  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ConfigServiceCategory.api';
-  import { downloadFile } from '/@/utils/common/renderUtils';
-  import ConfigServiceCategoryModal from './components/ConfigServiceCategoryModal.vue'
-  import { useUserStore } from '/@/store/modules/user';
-  import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
+import { ref, reactive } from 'vue';
+import { BasicTable, useTable, TableAction } from '/@/components/Table';
+import { useListPage } from '/@/hooks/system/useListPage';
+import { columns, superQuerySchema } from './ConfigServiceCategory.data';
+import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ConfigServiceCategory.api';
+import { downloadFile } from '/@/utils/common/renderUtils';
+import ConfigServiceCategoryModal from './components/ConfigServiceCategoryModal.vue'
+import { useUserStore } from '/@/store/modules/user';
+import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.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: 120,
-        fixed: 'right',
-      },
-      beforeFetch: async (params) => {
-        return Object.assign(params, queryParam);
-      },
+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: 120,
+      fixed: 'right',
     },
-    exportConfig: {
-      name: "服务类别",
-      url: getExportUrl,
-      params: queryParam,
+    beforeFetch: async (params) => {
+      params.column = 'sort'
+      params.order = 'asc'
+      return Object.assign(params, queryParam);
     },
-	  importConfig: {
-	    url: getImportUrl,
-	    success: handleSuccess
-	  },
-  });
-  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
-  const labelCol = reactive({
-    xs:24,
-    sm:4,
-    xl:6,
-    xxl:4
-  });
-  const wrapperCol = reactive({
-    xs: 24,
-    sm: 20,
-  });
+  },
+  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: 4,
+  xl: 8,
+  xxl: 8
+});
+const wrapperCol = reactive({
+  xs: 24,
+  sm: 20,
+  xl: 16,
+  xxl: 16
+});
 
-  // 高级查询配置
-  const superQueryConfig = reactive(superQuerySchema);
+// 高级查询配置
+const superQueryConfig = reactive(superQuerySchema);
 
-  /**
-   * 高级查询事件
-   */
-  function handleSuperQuery(params) {
-    Object.keys(params).map((k) => {
-      queryParam[k] = params[k];
-    });
-    searchQuery();
-  }
+/**
+ * 高级查询事件
+ */
+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: 'serviceCategory:config_service_category:edit'
-      },
-    ];
-  }
-   
-  /**
-   * 下拉操作栏
-   */
-  function getDropDownAction(record) {
-    return [
-      {
-        label: '详情',
-        onClick: handleDetail.bind(null, record),
-      }, {
-        label: '删除',
-        popConfirm: {
-          title: '是否确认删除',
-          confirm: handleDelete.bind(null, record),
-          placement: 'topLeft',
-        },
-        auth: 'serviceCategory:config_service_category:delete'
+/**
+ * 新增事件
+ */
+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)
+    },
+  ];
+}
+
+/**
+ * 下拉操作栏
+ */
+function getDropDownAction(record) {
+  return [
+    {
+      label: '详情',
+      onClick: handleDetail.bind(null, record),
+    }, {
+      label: '删除',
+      popConfirm: {
+        title: '是否确认删除',
+        confirm: handleDelete.bind(null, record),
+        placement: 'topLeft',
       }
-    ]
-  }
+    }
+  ]
+}
+
+/**
+ * 查询
+ */
+function searchQuery() {
+  reload();
+}
+
+/**
+ * 重置
+ */
+function searchReset() {
+  formRef.value.resetFields();
+  selectedRowKeys.value = [];
+  //刷新数据
+  reload();
+}
 
-  /**
-   * 查询
-   */
-  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%;
-    }
+.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/serviceCategory/components/ConfigServiceCategoryForm.vue b/src/views/config/serviceCategory/components/ConfigServiceCategoryForm.vue
index 5dd9e20..871f3c3 100644
--- a/src/views/config/serviceCategory/components/ConfigServiceCategoryForm.vue
+++ b/src/views/config/serviceCategory/components/ConfigServiceCategoryForm.vue
@@ -2,23 +2,27 @@
   <a-spin :spinning="confirmLoading">
     <JFormContainer :disabled="disabled">
       <template #detail>
-        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ConfigServiceCategoryForm">
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
+          name="ConfigServiceCategoryForm">
           <a-row>
-						<a-col :span="24">
-							<a-form-item label="服务类别名称" v-bind="validateInfos.categoryName" id="ConfigServiceCategoryForm-categoryName" name="categoryName">
-								<a-input v-model:value="formData.categoryName" placeholder="请输入服务类别名称"  allow-clear ></a-input>
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="排序" v-bind="validateInfos.sort" id="ConfigServiceCategoryForm-sort" name="sort">
-								<a-input-number v-model:value="formData.sort" placeholder="请输入排序" style="width: 100%" />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="是否启用 0启用 1未启用" v-bind="validateInfos.izEnabled" id="ConfigServiceCategoryForm-izEnabled" name="izEnabled">
-								<j-dict-select-tag type='radio' v-model:value="formData.izEnabled" dictCode="" placeholder="请选择是否启用 0启用 1未启用"  allow-clear />
-							</a-form-item>
-						</a-col>
+            <a-col :span="24">
+              <a-form-item label="服务类别名称" v-bind="validateInfos.categoryName"
+                id="ConfigServiceCategoryForm-categoryName" name="categoryName">
+                <a-input v-model:value="formData.categoryName" placeholder="请输入服务类别名称" allow-clear></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="排序" v-bind="validateInfos.sort" id="ConfigServiceCategoryForm-sort" name="sort">
+                <a-input-number v-model:value="formData.sort" placeholder="请输入排序" style="width: 100%" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="是否启用" v-bind="validateInfos.izEnabled" id="ConfigServiceCategoryForm-izEnabled"
+                name="izEnabled">
+                <j-dict-select-tag type='radio' v-model:value="formData.izEnabled" dictCode="iz_enabled"
+                  placeholder="请选择是否启用"  allowClear />
+              </a-form-item>
+            </a-col>
           </a-row>
         </a-form>
       </template>
@@ -27,135 +31,135 @@
 </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 '../ConfigServiceCategory.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: '',
-    categoryName: '',   
-    sort: 99,
-    izEnabled: '0',   
-  });
-  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({
-    categoryName: [{ required: true, message: '请输入服务类别名称!'},],
-    sort: [{ required: true, message: '请输入排序!'}, { pattern: /^-?\d+$/, message: '请输入整数!'},],
-    izEnabled: [{ required: true, message: '请输入是否启用 0启用 1未启用!'},],
-  });
-  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
+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 '../ConfigServiceCategory.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: '',
+  categoryName: '',
+  sort: 99,
+  izEnabled: '0',
+});
+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({
+  categoryName: [{ required: true, message: '请输入服务类别名称!' },],
+  sort: [{ required: true, message: '请输入排序!' }, { pattern: /^-?\d+$/, message: '请输入整数!' },],
+  izEnabled: [{ 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;
+// 表单禁用
+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 props.formDisabled;
-  });
-
-  
-  /**
-   * 新增
-   */
-  function add() {
-    edit({});
+    return Promise.reject(errorFields);
   }
-
-  /**
-   * 编辑
-   */
-  function edit(record) {
-    nextTick(() => {
-      resetFields();
-      const tmpData = {};
-      Object.keys(formData).forEach((key) => {
-        if(record.hasOwnProperty(key)){
-          tmpData[key] = record[key]
-        }
-      })
-      //赋值
-      Object.assign(formData, tmpData);
+  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;
     });
-  }
-
-  /**
-   * 提交数据
-   */
-  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,
-  });
+defineExpose({
+  add,
+  edit,
+  submitForm,
+});
 </script>
 
 <style lang="less" scoped>
-  .antd-modal-form {
-    padding: 14px;
-  }
+.antd-modal-form {
+  padding: 14px;
+}
 </style>
diff --git a/src/views/config/serviceDirective/ConfigServiceDirective.data.ts b/src/views/config/serviceDirective/ConfigServiceDirective.data.ts
index 659e09b..480d7b9 100644
--- a/src/views/config/serviceDirective/ConfigServiceDirective.data.ts
+++ b/src/views/config/serviceDirective/ConfigServiceDirective.data.ts
@@ -48,12 +48,12 @@ export const columns: BasicColumn[] = [
     dataIndex: 'izPreferential_dictText'
   },
   {
-    title: '收费频次  1按次收费 2按天收费',
+    title: '收费频次',
     align: "center",
     dataIndex: 'chargingFrequency_dictText'
   },
   {
-    title: '周期类型  1日常护理 2周期护理 3即时护理',
+    title: '周期类型',
     align: "center",
     dataIndex: 'cycleType_dictText'
   },
@@ -74,7 +74,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'serviceDuration'
   },
   {
-    title: '是否启用 0启用 1未启用',
+    title: '是否启用',
     align: "center",
     dataIndex: 'izEnabled_dictText'
   },
@@ -116,18 +116,18 @@ export const columns: BasicColumn[] = [
 export const superQuerySchema = {
   categoryId: {title: '服务类别id',order: 0,view: 'list', type: 'string',dictCode: '',},
   typeId: {title: '服务类型id',order: 1,view: 'list', type: 'string',dictCode: '',},
-  instructionTagId: {title: '指令标签id',order: 2,view: 'list', type: 'string',dictCode: '',},
+  instructionTagId: {title: '指令标签id',order: 2,view: 'list', type: 'string',dictCode: 'instruction_tag',},
   directiveName: {title: '服务指令名称',order: 3,view: 'text', type: 'string',},
   tollPrice: {title: '收费价格',order: 4,view: 'number', type: 'number',},
   comPrice: {title: '提成价格',order: 5,view: 'number', type: 'number',},
   izReimbursement: {title: '是否参与医保报销 0不报销 1报销',order: 6,view: 'radio', type: 'string',dictCode: '',},
   izPreferential: {title: '是否参与机构优惠 0不参与 1参与',order: 7,view: 'radio', type: 'string',dictCode: '',},
-  chargingFrequency: {title: '收费频次  1按次收费 2按天收费',order: 8,view: 'list', type: 'string',dictCode: '',},
-  cycleType: {title: '周期类型  1日常护理 2周期护理 3即时护理',order: 9,view: 'list', type: 'string',dictCode: '',},
+  chargingFrequency: {title: '收费频次',order: 8,view: 'list', type: 'string',dictCode: '',},
+  cycleType: {title: '周期类型',order: 9,view: 'list', type: 'string',dictCode: '',},
   sort: {title: '排序',order: 10,view: 'number', type: 'number',},
   serviceContent: {title: '服务说明',order: 11,view: 'textarea', type: 'string',},
   serviceDuration: {title: '服务时长（分钟）',order: 12,view: 'text', type: 'string',},
-  izEnabled: {title: '是否启用 0启用 1未启用',order: 13,view: 'radio', type: 'string',dictCode: '',},
+  izEnabled: {title: '是否启用',order: 13,view: 'radio', type: 'string',dictCode: '',},
   createBy: {title: '创建人',order: 14,view: 'text', type: 'string',},
   createTime: {title: '创建日期',order: 15,view: 'datetime', type: 'string',},
   updateBy: {title: '更新人',order: 16,view: 'text', type: 'string',},
diff --git a/src/views/config/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/config/serviceDirective/ConfigServiceDirectiveList.vue
index 0b11106..36546e6 100644
--- a/src/views/config/serviceDirective/ConfigServiceDirectiveList.vue
+++ b/src/views/config/serviceDirective/ConfigServiceDirectiveList.vue
@@ -2,33 +2,34 @@
   <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-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="服务类别id">服务类别</span></template>
-              <a-input placeholder="请输入服务类别id" v-model:value="queryParam.categoryId" allow-clear ></a-input>
+              <a-input placeholder="请输入服务类别id" v-model:value="queryParam.categoryId" allow-clear></a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="6">
             <a-form-item name="typeId">
               <template #label><span title="服务类型id">服务类型</span></template>
-              <a-input placeholder="请输入服务类型id" v-model:value="queryParam.typeId" allow-clear ></a-input>
+              <a-input placeholder="请输入服务类型id" v-model:value="queryParam.typeId" allow-clear></a-input>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :lg="6">
               <a-form-item name="instructionTagId">
                 <template #label><span title="指令标签id">指令标签</span></template>
-                <a-input placeholder="请输入指令标签id" v-model:value="queryParam.instructionTagId" allow-clear ></a-input>
+                <a-input placeholder="请输入指令标签id" v-model:value="queryParam.instructionTagId" allow-clear></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="6">
+              <a-form-item name="directiveName">
+                <template #label><span title="服务指令名称">服务指令</span></template>
+                <JInput v-model:value="queryParam.directiveName" />
               </a-form-item>
             </a-col>
-          <a-col :lg="6">
-          <a-form-item name="directiveName">
-          <template #label><span title="服务指令名称">服务指令</span></template>
-              <JInput v-model:value="queryParam.directiveName"/>
-          </a-form-item>
-          </a-col>
             <a-col :lg="6">
               <a-form-item name="tollPrice">
                 <template #label><span title="收费价格">收费价格</span></template>
@@ -43,32 +44,39 @@
             </a-col>
             <a-col :lg="6">
               <a-form-item name="izReimbursement">
-                <template #label><span title="是否参与医保报销 0不报销 1报销">是否参与</span></template>
-                <a-input placeholder="请输入是否参与医保报销 0不报销 1报销" v-model:value="queryParam.izReimbursement" allow-clear ></a-input>
+                <template #label><span title="医保报销">医保报销</span></template>
+                <a-select v-model:value="queryParam.izReimbursement" placeholder="请选择" allowClear>
+                  <a-select-option :value="0">不报销</a-select-option>
+                  <a-select-option :value="1">报销</a-select-option>
+                </a-select>
               </a-form-item>
             </a-col>
             <a-col :lg="6">
               <a-form-item name="izPreferential">
-                <template #label><span title="是否参与机构优惠 0不参与 1参与">是否参与</span></template>
-                <a-input placeholder="请输入是否参与机构优惠 0不参与 1参与" v-model:value="queryParam.izPreferential" allow-clear ></a-input>
+                <template #label><span title="机构优惠">机构优惠</span></template>
+                <a-select v-model:value="queryParam.izEizPreferentialnabled" placeholder="请选择" allowClear>
+                  <a-select-option :value="0">不参与</a-select-option>
+                  <a-select-option :value="1">参与</a-select-option>
+                </a-select>
               </a-form-item>
             </a-col>
             <a-col :lg="6">
               <a-form-item name="chargingFrequency">
-                <template #label><span title="收费频次  1按次收费 2按天收费">收费频次</span></template>
-                <a-input placeholder="请输入收费频次  1按次收费 2按天收费" v-model:value="queryParam.chargingFrequency" allow-clear ></a-input>
+                <template #label><span title="收费频次">收费频次</span></template>
+                <a-input placeholder="请输入收费频次" v-model:value="queryParam.chargingFrequency" allow-clear></a-input>
               </a-form-item>
             </a-col>
             <a-col :lg="6">
               <a-form-item name="cycleType">
-                <template #label><span title="周期类型  1日常护理 2周期护理 3即时护理">周期类型</span></template>
-                <a-input placeholder="请输入周期类型  1日常护理 2周期护理 3即时护理" v-model:value="queryParam.cycleType" allow-clear ></a-input>
+                <template #label><span title="周期类型">周期类型</span></template>
+                <a-input placeholder="请输入周期类型" v-model:value="queryParam.cycleType" allow-clear></a-input>
               </a-form-item>
             </a-col>
             <a-col :lg="6">
               <a-form-item name="izEnabled">
-                <template #label><span title="是否启用 0启用 1未启用">是否启用</span></template>
-                <a-input placeholder="请输入是否启用 0启用 1未启用" v-model:value="queryParam.izEnabled" allow-clear ></a-input>
+                <template #label><span title="是否启用">是否启用</span></template>
+                <j-dict-select-tag type='list' v-model:value="queryParam.izEnabled" dictCode="iz_enabled"
+                placeholder="请选择是否启用" />
               </a-form-item>
             </a-col>
           </template>
@@ -76,7 +84,8 @@
             <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-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
+                  style="margin-left: 8px">重置</a-button>
                 <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
                   {{ toggleSearchStatus ? '收起' : '展开' }}
                   <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
@@ -91,9 +100,16 @@
     <BasicTable @register="registerTable" :rowSelection="rowSelection">
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary" v-auth="'serviceDirective:config_service_directive:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button  type="primary" v-auth="'serviceDirective:config_service_directive:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" v-auth="'serviceDirective:config_service_directive:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-button type="primary" v-auth="'serviceDirective:config_service_directive:add'" @click="handleCategory"
+          preIcon="ant-design:plus-outlined"> 服务类别</a-button>
+        <a-button type="primary" v-auth="'serviceDirective:config_service_directive:add'" @click="handleType"
+          preIcon="ant-design:plus-outlined"> 服务类型</a-button>
+        <a-button type="primary" v-auth="'serviceDirective:config_service_directive:add'" @click="handleAdd"
+          preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button type="primary" v-auth="'serviceDirective:config_service_directive:exportXls'"
+          preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" v-auth="'serviceDirective:config_service_directive:importExcel'"
+          preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
@@ -112,242 +128,292 @@
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
       </template>
       <template v-slot:bodyCell="{ column, record, index, text }">
-        <template v-if="column.dataIndex==='mp3File'">
+        <template v-if="column.dataIndex === 'mp3File'">
           <!--文件字段回显插槽-->
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+          <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small"
+            @click="downloadFile(text)">下载</a-button>
         </template>
-        <template v-if="column.dataIndex==='mp4File'">
+        <template v-if="column.dataIndex === 'mp4File'">
           <!--文件字段回显插槽-->
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+          <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small"
+            @click="downloadFile(text)">下载</a-button>
         </template>
       </template>
     </BasicTable>
     <!-- 表单区域 -->
     <ConfigServiceDirectiveModal ref="registerModal" @success="handleSuccess"></ConfigServiceDirectiveModal>
   </div>
+
+  <!-- 服务类别 -->
+  <a-drawer title="服务类别" width="60vw" :open="categoryOpen" @close="onCategoryClose">
+    <template #footer>
+      <a-button type="primary" @click="onCategoryClose" style="float: right;">关闭</a-button>
+    </template>
+    <ConfigServiceCategoryList v-if="categoryOpen"></ConfigServiceCategoryList>
+  </a-drawer>
+
+  <!-- 服务类型 -->
+  <a-drawer title="服务类型" width="60vw" :open="typeOpen" @close="onTypeClose">
+    <template #footer>
+      <a-button type="primary" @click="onTypeClose" style="float: right;">关闭</a-button>
+    </template>
+    <ConfigServiceTypeList v-if="typeOpen"></ConfigServiceTypeList>
+  </a-drawer>
 </template>
 
 <script lang="ts" name="serviceDirective-configServiceDirective" setup>
-  import { ref, reactive } from 'vue';
-  import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { useListPage } from '/@/hooks/system/useListPage';
-  import { columns, superQuerySchema } from './ConfigServiceDirective.data';
-  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ConfigServiceDirective.api';
-  import { downloadFile } from '/@/utils/common/renderUtils';
-  import ConfigServiceDirectiveModal from './components/ConfigServiceDirectiveModal.vue'
-  import { useUserStore } from '/@/store/modules/user';
-  import JRangeNumber from "/@/components/Form/src/jeecg/components/JRangeNumber.vue";
-  import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
-  import { cloneDeep } from "lodash-es";
+import { ref, reactive } from 'vue';
+import { BasicTable, useTable, TableAction } from '/@/components/Table';
+import { useListPage } from '/@/hooks/system/useListPage';
+import { columns, superQuerySchema } from './ConfigServiceDirective.data';
+import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ConfigServiceDirective.api';
+import { downloadFile } from '/@/utils/common/renderUtils';
+import ConfigServiceDirectiveModal from './components/ConfigServiceDirectiveModal.vue'
+import { useUserStore } from '/@/store/modules/user';
+import JRangeNumber from "/@/components/Form/src/jeecg/components/JRangeNumber.vue";
+import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
+import { cloneDeep } from "lodash-es";
+import ConfigServiceCategoryList from '../serviceCategory/ConfigServiceCategoryList.vue';
+import ConfigServiceTypeList from '../serviceType/ConfigServiceTypeList.vue';
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.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: 120,
-        fixed: 'right',
-      },
-      beforeFetch: async (params) => {
-        let rangerQuery = await setRangeQuery();
-        return Object.assign(params, rangerQuery);
-      },
+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: 120,
+      fixed: 'right',
     },
-    exportConfig: {
-      name: "服务指令",
-      url: getExportUrl,
-      params: queryParam,
+    beforeFetch: async (params) => {
+      let rangerQuery = await setRangeQuery();
+      return Object.assign(params, rangerQuery);
     },
-	  importConfig: {
-	    url: getImportUrl,
-	    success: handleSuccess
-	  },
-  });
-  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
-  const labelCol = reactive({
-    xs:24,
-    sm:4,
-    xl:6,
-    xxl:4
-  });
-  const wrapperCol = reactive({
-    xs: 24,
-    sm: 20,
-  });
+  },
+  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: 4,
+  xl: 6,
+  xxl: 4
+});
+const wrapperCol = reactive({
+  xs: 24,
+  sm: 20,
+});
 
-  // 高级查询配置
-  const superQueryConfig = reactive(superQuerySchema);
+// 高级查询配置
+const superQueryConfig = reactive(superQuerySchema);
 
-  /**
-   * 高级查询事件
-   */
-  function handleSuperQuery(params) {
-    Object.keys(params).map((k) => {
-      queryParam[k] = params[k];
-    });
-    searchQuery();
-  }
+const categoryOpen = ref(false)//服务类别抽屉
+const typeOpen = ref(false)//服务类型抽屉
 
-  /**
-   * 新增事件
-   */
-  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: 'serviceDirective:config_service_directive:edit'
+/**
+ * 高级查询事件
+ */
+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: 'serviceDirective:config_service_directive:edit'
+    },
+  ];
+}
+
+/**
+ * 下拉操作栏
+ */
+function getDropDownAction(record) {
+  return [
+    {
+      label: '详情',
+      onClick: handleDetail.bind(null, record),
+    }, {
+      label: '删除',
+      popConfirm: {
+        title: '是否确认删除',
+        confirm: handleDelete.bind(null, record),
+        placement: 'topLeft',
       },
-    ];
-  }
-   
-  /**
-   * 下拉操作栏
-   */
-  function getDropDownAction(record) {
-    return [
-      {
-        label: '详情',
-        onClick: handleDetail.bind(null, record),
-      }, {
-        label: '删除',
-        popConfirm: {
-          title: '是否确认删除',
-          confirm: handleDelete.bind(null, record),
-          placement: 'topLeft',
-        },
-        auth: 'serviceDirective:config_service_directive:delete'
-      }
-    ]
-  }
-
-  /**
-   * 查询
-   */
-  function searchQuery() {
-    reload();
-  }
-  
-  /**
-   * 重置
-   */
-  function searchReset() {
-    formRef.value.resetFields();
-    selectedRowKeys.value = [];
-    //刷新数据
-    reload();
-  }
-  
-
-
-
-  
-  let rangeField = 'tollPrice,comPrice,'
-  
-  /**
-   * 设置范围查询条件
-   */
-  async function setRangeQuery(){
-    let queryParamClone = cloneDeep(queryParam);
-    if (rangeField) {
-      let fieldsValue = rangeField.split(',');
-      fieldsValue.forEach(item => {
-        if (queryParamClone[item]) {
-          let range = queryParamClone[item];
-          queryParamClone[item+'_begin'] = range[0];
-          queryParamClone[item+'_end'] = range[1];
-          delete queryParamClone[item];
-        } else {
-          queryParamClone[item+'_begin'] = '';
-          queryParamClone[item+'_end'] = '';
-        }
-      })
+      auth: 'serviceDirective:config_service_directive:delete'
     }
-    return queryParamClone;
+  ]
+}
+
+/**
+ * 查询
+ */
+function searchQuery() {
+  reload();
+}
+
+/**
+ * 重置
+ */
+function searchReset() {
+  formRef.value.resetFields();
+  selectedRowKeys.value = [];
+  //刷新数据
+  reload();
+}
+
+
+
+
+
+let rangeField = 'tollPrice,comPrice,'
+
+/**
+ * 设置范围查询条件
+ */
+async function setRangeQuery() {
+  let queryParamClone = cloneDeep(queryParam);
+  if (rangeField) {
+    let fieldsValue = rangeField.split(',');
+    fieldsValue.forEach(item => {
+      if (queryParamClone[item]) {
+        let range = queryParamClone[item];
+        queryParamClone[item + '_begin'] = range[0];
+        queryParamClone[item + '_end'] = range[1];
+        delete queryParamClone[item];
+      } else {
+        queryParamClone[item + '_begin'] = '';
+        queryParamClone[item + '_end'] = '';
+      }
+    })
   }
+  return queryParamClone;
+}
+
+//服务类别抽屉打开
+function handleCategory() {
+  categoryOpen.value = true
+}
+//服务类型抽屉打开
+function handleType() {
+  typeOpen.value = true
+}
+
+//服务类别抽屉关闭
+function onCategoryClose() {
+  categoryOpen.value = false
+}
+
+//服务类型抽屉关闭
+function onTypeClose() {
+  typeOpen.value = false
+}
+
 </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%;
-    }
+.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/serviceDirective/components/ConfigServiceDirectiveForm.vue b/src/views/config/serviceDirective/components/ConfigServiceDirectiveForm.vue
index be88a5e..bdca6c3 100644
--- a/src/views/config/serviceDirective/components/ConfigServiceDirectiveForm.vue
+++ b/src/views/config/serviceDirective/components/ConfigServiceDirectiveForm.vue
@@ -2,108 +2,136 @@
   <a-spin :spinning="confirmLoading">
     <JFormContainer :disabled="disabled">
       <template #detail>
-        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ConfigServiceDirectiveForm">
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
+          name="ConfigServiceDirectiveForm">
           <a-row>
-						<a-col :span="24">
-							<a-form-item label="服务类别id" v-bind="validateInfos.categoryId" id="ConfigServiceDirectiveForm-categoryId" name="categoryId">
-								<j-dict-select-tag v-model:value="formData.categoryId" dictCode="" placeholder="请选择服务类别id"  allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="服务类型id" v-bind="validateInfos.typeId" id="ConfigServiceDirectiveForm-typeId" name="typeId">
-								<j-dict-select-tag v-model:value="formData.typeId" dictCode="" placeholder="请选择服务类型id"  allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="指令标签id" v-bind="validateInfos.instructionTagId" id="ConfigServiceDirectiveForm-instructionTagId" name="instructionTagId">
-								<j-dict-select-tag v-model:value="formData.instructionTagId" dictCode="" placeholder="请选择指令标签id"  allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="服务指令名称" v-bind="validateInfos.directiveName" id="ConfigServiceDirectiveForm-directiveName" name="directiveName">
-								<a-input v-model:value="formData.directiveName" placeholder="请输入服务指令名称"  allow-clear ></a-input>
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="收费价格" v-bind="validateInfos.tollPrice" id="ConfigServiceDirectiveForm-tollPrice" name="tollPrice">
-								<a-input-number v-model:value="formData.tollPrice" placeholder="请输入收费价格" style="width: 100%" />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="提成价格" v-bind="validateInfos.comPrice" id="ConfigServiceDirectiveForm-comPrice" name="comPrice">
-								<a-input-number v-model:value="formData.comPrice" placeholder="请输入提成价格" style="width: 100%" />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="是否参与医保报销 0不报销 1报销" v-bind="validateInfos.izReimbursement" id="ConfigServiceDirectiveForm-izReimbursement" name="izReimbursement">
-								<j-dict-select-tag type='radio' v-model:value="formData.izReimbursement" dictCode="" placeholder="请选择是否参与医保报销 0不报销 1报销"  allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="是否参与机构优惠 0不参与 1参与" v-bind="validateInfos.izPreferential" id="ConfigServiceDirectiveForm-izPreferential" name="izPreferential">
-								<j-dict-select-tag type='radio' v-model:value="formData.izPreferential" dictCode="" placeholder="请选择是否参与机构优惠 0不参与 1参与"  allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="收费频次  1按次收费 2按天收费" v-bind="validateInfos.chargingFrequency" id="ConfigServiceDirectiveForm-chargingFrequency" name="chargingFrequency">
-								<j-dict-select-tag v-model:value="formData.chargingFrequency" dictCode="" placeholder="请选择收费频次  1按次收费 2按天收费"  allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="周期类型  1日常护理 2周期护理 3即时护理" v-bind="validateInfos.cycleType" id="ConfigServiceDirectiveForm-cycleType" name="cycleType">
-								<j-dict-select-tag v-model:value="formData.cycleType" dictCode="" placeholder="请选择周期类型  1日常护理 2周期护理 3即时护理"  allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="排序" v-bind="validateInfos.sort" id="ConfigServiceDirectiveForm-sort" name="sort">
-								<a-input-number v-model:value="formData.sort" placeholder="请输入排序" style="width: 100%" />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="服务说明" v-bind="validateInfos.serviceContent" id="ConfigServiceDirectiveForm-serviceContent" name="serviceContent">
-								<a-textarea v-model:value="formData.serviceContent" :rows="4" placeholder="请输入服务说明" />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="服务时长（分钟）" v-bind="validateInfos.serviceDuration" id="ConfigServiceDirectiveForm-serviceDuration" name="serviceDuration">
-								<a-input v-model:value="formData.serviceDuration" placeholder="请输入服务时长（分钟）"  allow-clear ></a-input>
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="是否启用 0启用 1未启用" v-bind="validateInfos.izEnabled" id="ConfigServiceDirectiveForm-izEnabled" name="izEnabled">
-								<j-dict-select-tag type='radio' v-model:value="formData.izEnabled" dictCode="" placeholder="请选择是否启用 0启用 1未启用"  allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="创建人" v-bind="validateInfos.createBy" id="ConfigServiceDirectiveForm-createBy" name="createBy">
-								<a-input v-model:value="formData.createBy" placeholder="请输入创建人" disabled allow-clear ></a-input>
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="创建日期" v-bind="validateInfos.createTime" id="ConfigServiceDirectiveForm-createTime" name="createTime">
-								<a-date-picker placeholder="请选择创建日期"  v-model:value="formData.createTime" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" disabled allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="更新人" v-bind="validateInfos.updateBy" id="ConfigServiceDirectiveForm-updateBy" name="updateBy">
-								<a-input v-model:value="formData.updateBy" placeholder="请输入更新人" disabled allow-clear ></a-input>
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="更新日期" v-bind="validateInfos.updateTime" id="ConfigServiceDirectiveForm-updateTime" name="updateTime">
-								<a-date-picker placeholder="请选择更新日期"  v-model:value="formData.updateTime" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" disabled allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="语音文件" v-bind="validateInfos.mp3File" id="ConfigServiceDirectiveForm-mp3File" name="mp3File">
-								<j-upload v-model:value="formData.mp3File"   ></j-upload>
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="视频文件" v-bind="validateInfos.mp4File" id="ConfigServiceDirectiveForm-mp4File" name="mp4File">
-								<j-upload v-model:value="formData.mp4File"   ></j-upload>
-							</a-form-item>
-						</a-col>
+            <a-col :span="24">
+              <a-form-item label="服务类别id" v-bind="validateInfos.categoryId" id="ConfigServiceDirectiveForm-categoryId"
+                name="categoryId">
+                <j-dict-select-tag v-model:value="formData.categoryId" dictCode="" placeholder="请选择服务类别id"
+                  allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="服务类型id" v-bind="validateInfos.typeId" id="ConfigServiceDirectiveForm-typeId"
+                name="typeId">
+                <j-dict-select-tag v-model:value="formData.typeId" dictCode="" placeholder="请选择服务类型id" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="指令标签id" v-bind="validateInfos.instructionTagId"
+                id="ConfigServiceDirectiveForm-instructionTagId" name="instructionTagId">
+                <j-dict-select-tag v-model:value="formData.instructionTagId" dictCode="instruction_tag"
+                  placeholder="请选择指令标签id" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="服务指令名称" v-bind="validateInfos.directiveName"
+                id="ConfigServiceDirectiveForm-directiveName" name="directiveName">
+                <a-input v-model:value="formData.directiveName" placeholder="请输入服务指令名称" allow-clear></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="收费价格" v-bind="validateInfos.tollPrice" id="ConfigServiceDirectiveForm-tollPrice"
+                name="tollPrice">
+                <a-input-number v-model:value="formData.tollPrice" placeholder="请输入收费价格" style="width: 100%" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="提成价格" v-bind="validateInfos.comPrice" id="ConfigServiceDirectiveForm-comPrice"
+                name="comPrice">
+                <a-input-number v-model:value="formData.comPrice" placeholder="请输入提成价格" style="width: 100%" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="是否参与医保报销 0不报销 1报销" v-bind="validateInfos.izReimbursement"
+                id="ConfigServiceDirectiveForm-izReimbursement" name="izReimbursement">
+                <j-dict-select-tag type='radio' v-model:value="formData.izReimbursement" dictCode=""
+                  placeholder="请选择是否参与医保报销 0不报销 1报销" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="是否参与机构优惠 0不参与 1参与" v-bind="validateInfos.izPreferential"
+                id="ConfigServiceDirectiveForm-izPreferential" name="izPreferential">
+                <j-dict-select-tag type='radio' v-model:value="formData.izPreferential" dictCode=""
+                  placeholder="请选择是否参与机构优惠 0不参与 1参与" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="收费频次" v-bind="validateInfos.chargingFrequency"
+                id="ConfigServiceDirectiveForm-chargingFrequency" name="chargingFrequency">
+                <j-dict-select-tag v-model:value="formData.chargingFrequency" dictCode="" placeholder="请选择收费频次"
+                  allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="周期类型" v-bind="validateInfos.cycleType" id="ConfigServiceDirectiveForm-cycleType"
+                name="cycleType">
+                <j-dict-select-tag v-model:value="formData.cycleType" dictCode="" placeholder="请选择周期类型" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="排序" v-bind="validateInfos.sort" id="ConfigServiceDirectiveForm-sort" name="sort">
+                <a-input-number v-model:value="formData.sort" placeholder="请输入排序" style="width: 100%" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="服务说明" v-bind="validateInfos.serviceContent"
+                id="ConfigServiceDirectiveForm-serviceContent" name="serviceContent">
+                <a-textarea v-model:value="formData.serviceContent" :rows="4" placeholder="请输入服务说明" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="服务时长（分钟）" v-bind="validateInfos.serviceDuration"
+                id="ConfigServiceDirectiveForm-serviceDuration" name="serviceDuration">
+                <a-input v-model:value="formData.serviceDuration" placeholder="请输入服务时长（分钟）" allow-clear></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="是否启用" v-bind="validateInfos.izEnabled" id="ConfigServiceDirectiveForm-izEnabled"
+                name="izEnabled">
+                <j-dict-select-tag type='radio' v-model:value="formData.izEnabled" dictCode="iz_enabled"
+                  placeholder="请选择是否启用"  allowClear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="创建人" v-bind="validateInfos.createBy" id="ConfigServiceDirectiveForm-createBy"
+                name="createBy">
+                <a-input v-model:value="formData.createBy" placeholder="请输入创建人" disabled allow-clear></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="创建日期" v-bind="validateInfos.createTime" id="ConfigServiceDirectiveForm-createTime"
+                name="createTime">
+                <a-date-picker placeholder="请选择创建日期" v-model:value="formData.createTime" showTime
+                  value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" disabled allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="更新人" v-bind="validateInfos.updateBy" id="ConfigServiceDirectiveForm-updateBy"
+                name="updateBy">
+                <a-input v-model:value="formData.updateBy" placeholder="请输入更新人" disabled allow-clear></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="更新日期" v-bind="validateInfos.updateTime" id="ConfigServiceDirectiveForm-updateTime"
+                name="updateTime">
+                <a-date-picker placeholder="请选择更新日期" v-model:value="formData.updateTime" showTime
+                  value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" disabled allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="语音文件" v-bind="validateInfos.mp3File" id="ConfigServiceDirectiveForm-mp3File"
+                name="mp3File">
+                <j-upload v-model:value="formData.mp3File"></j-upload>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="视频文件" v-bind="validateInfos.mp4File" id="ConfigServiceDirectiveForm-mp4File"
+                name="mp4File">
+                <j-upload v-model:value="formData.mp4File"></j-upload>
+              </a-form-item>
+            </a-col>
           </a-row>
         </a-form>
       </template>
@@ -112,163 +140,163 @@
 </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 JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
-  import { getValueType } from '/@/utils';
-  import { saveOrUpdate } from '../ConfigServiceDirective.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: '',   
-    instructionTagId: '',   
-    directiveName: '',   
-    tollPrice: 0,
-    comPrice: 0,
-    izReimbursement: '0',   
-    izPreferential: '0',   
-    chargingFrequency: '',   
-    cycleType: '',   
-    sort: 99,
-    serviceContent: '',   
-    serviceDuration: '',   
-    izEnabled: '',   
-    createBy: '',   
-    createTime: '',   
-    updateBy: '',   
-    updateTime: '',   
-    mp3File: '',   
-    mp4File: '',   
-  });
-  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: '请输入服务类别id!'},],
-    typeId: [{ required: true, message: '请输入服务类型id!'},],
-    instructionTagId: [{ required: true, message: '请输入指令标签id!'},],
-    directiveName: [{ required: true, message: '请输入服务指令名称!'},],
-    tollPrice: [{ required: true, message: '请输入收费价格!'}, { pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!'},],
-    comPrice: [{ required: false}, { pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!'},],
-    izReimbursement: [{ required: true, message: '请输入是否参与医保报销 0不报销 1报销!'},],
-    izPreferential: [{ required: true, message: '请输入是否参与机构优惠 0不参与 1参与!'},],
-    chargingFrequency: [{ required: true, message: '请输入收费频次  1按次收费 2按天收费!'},],
-    cycleType: [{ required: true, message: '请输入周期类型  1日常护理 2周期护理 3即时护理!'},],
-    sort: [{ required: true, message: '请输入排序!'},],
-    serviceDuration: [{ required: true, message: '请输入服务时长（分钟）!'}, { pattern: /^-?\d+$/, message: '请输入整数!'},],
-    izEnabled: [{ required: true, message: '请输入是否启用 0启用 1未启用!'},],
-  });
-  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
+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 JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
+import { getValueType } from '/@/utils';
+import { saveOrUpdate } from '../ConfigServiceDirective.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: '',
+  instructionTagId: '',
+  directiveName: '',
+  tollPrice: 0,
+  comPrice: 0,
+  izReimbursement: '0',
+  izPreferential: '0',
+  chargingFrequency: '',
+  cycleType: '',
+  sort: 99,
+  serviceContent: '',
+  serviceDuration: '',
+  izEnabled: '',
+  createBy: '',
+  createTime: '',
+  updateBy: '',
+  updateTime: '',
+  mp3File: '',
+  mp4File: '',
+});
+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: '请输入服务类别id!' },],
+  typeId: [{ required: true, message: '请输入服务类型id!' },],
+  instructionTagId: [{ required: true, message: '请输入指令标签id!' },],
+  directiveName: [{ required: true, message: '请输入服务指令名称!' },],
+  tollPrice: [{ required: true, message: '请输入收费价格!' }, { pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!' },],
+  comPrice: [{ required: false }, { pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!' },],
+  izReimbursement: [{ required: true, message: '请输入是否参与医保报销 0不报销 1报销!' },],
+  izPreferential: [{ required: true, message: '请输入是否参与机构优惠 0不参与 1参与!' },],
+  chargingFrequency: [{ required: true, message: '请输入收费频次!' },],
+  cycleType: [{ required: true, message: '请输入周期类型!' },],
+  sort: [{ required: true, message: '请输入排序!' },],
+  serviceDuration: [{ required: true, message: '请输入服务时长（分钟）!' }, { pattern: /^-?\d+$/, message: '请输入整数!' },],
+  izEnabled: [{ 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;
+// 表单禁用
+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 props.formDisabled;
-  });
-
-  
-  /**
-   * 新增
-   */
-  function add() {
-    edit({});
+    return Promise.reject(errorFields);
   }
-
-  /**
-   * 编辑
-   */
-  function edit(record) {
-    nextTick(() => {
-      resetFields();
-      const tmpData = {};
-      Object.keys(formData).forEach((key) => {
-        if(record.hasOwnProperty(key)){
-          tmpData[key] = record[key]
-        }
-      })
-      //赋值
-      Object.assign(formData, tmpData);
+  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;
     });
-  }
-
-  /**
-   * 提交数据
-   */
-  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,
-  });
+defineExpose({
+  add,
+  edit,
+  submitForm,
+});
 </script>
 
 <style lang="less" scoped>
-  .antd-modal-form {
-    padding: 14px;
-  }
+.antd-modal-form {
+  padding: 14px;
+}
 </style>
diff --git a/src/views/config/serviceDirective/components/ConfigServiceDirectiveModal.vue b/src/views/config/serviceDirective/components/ConfigServiceDirectiveModal.vue
index 4373246..9762086 100644
--- a/src/views/config/serviceDirective/components/ConfigServiceDirectiveModal.vue
+++ b/src/views/config/serviceDirective/components/ConfigServiceDirectiveModal.vue
@@ -8,6 +8,7 @@
   import { ref, nextTick, defineExpose } from 'vue';
   import ConfigServiceDirectiveForm from './ConfigServiceDirectiveForm.vue'
   import JModal from '/@/components/Modal/src/JModal/JModal.vue';
+import { array } from 'vue-types';
   
   const title = ref<string>('');
   const width = ref<number>(800);
@@ -16,6 +17,7 @@
   const registerForm = ref();
   const emit = defineEmits(['register', 'success']);
 
+
   /**
    * 新增
    */
diff --git a/src/views/config/serviceType/ConfigServiceDirective.data.ts b/src/views/config/serviceType/ConfigServiceDirective.data.ts
deleted file mode 100644
index 659e09b..0000000
--- a/src/views/config/serviceType/ConfigServiceDirective.data.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-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: '服务类别id',
-    align: "center",
-    sorter: true,
-    dataIndex: 'categoryId_dictText'
-  },
-  {
-    title: '服务类型id',
-    align: "center",
-    sorter: true,
-    dataIndex: 'typeId_dictText'
-  },
-  {
-    title: '指令标签id',
-    align: "center",
-    dataIndex: 'instructionTagId_dictText'
-  },
-  {
-    title: '服务指令名称',
-    align: "center",
-    dataIndex: 'directiveName'
-  },
-  {
-    title: '收费价格',
-    align: "center",
-    dataIndex: 'tollPrice'
-  },
-  {
-    title: '提成价格',
-    align: "center",
-    dataIndex: 'comPrice'
-  },
-  {
-    title: '是否参与医保报销 0不报销 1报销',
-    align: "center",
-    dataIndex: 'izReimbursement_dictText'
-  },
-  {
-    title: '是否参与机构优惠 0不参与 1参与',
-    align: "center",
-    dataIndex: 'izPreferential_dictText'
-  },
-  {
-    title: '收费频次  1按次收费 2按天收费',
-    align: "center",
-    dataIndex: 'chargingFrequency_dictText'
-  },
-  {
-    title: '周期类型  1日常护理 2周期护理 3即时护理',
-    align: "center",
-    dataIndex: 'cycleType_dictText'
-  },
-  {
-    title: '排序',
-    align: "center",
-    sorter: true,
-    dataIndex: 'sort'
-  },
-  {
-    title: '服务说明',
-    align: "center",
-    dataIndex: 'serviceContent'
-  },
-  {
-    title: '服务时长（分钟）',
-    align: "center",
-    dataIndex: 'serviceDuration'
-  },
-  {
-    title: '是否启用 0启用 1未启用',
-    align: "center",
-    dataIndex: 'izEnabled_dictText'
-  },
-  {
-    title: '创建人',
-    align: "center",
-    dataIndex: 'createBy'
-  },
-  {
-    title: '创建日期',
-    align: "center",
-    sorter: true,
-    dataIndex: 'createTime'
-  },
-  {
-    title: '更新人',
-    align: "center",
-    dataIndex: 'updateBy'
-  },
-  {
-    title: '更新日期',
-    align: "center",
-    sorter: true,
-    dataIndex: 'updateTime'
-  },
-  {
-    title: '语音文件',
-    align: "center",
-    dataIndex: 'mp3File',
-  },
-  {
-    title: '视频文件',
-    align: "center",
-    dataIndex: 'mp4File',
-  },
-];
-
-// 高级查询数据
-export const superQuerySchema = {
-  categoryId: {title: '服务类别id',order: 0,view: 'list', type: 'string',dictCode: '',},
-  typeId: {title: '服务类型id',order: 1,view: 'list', type: 'string',dictCode: '',},
-  instructionTagId: {title: '指令标签id',order: 2,view: 'list', type: 'string',dictCode: '',},
-  directiveName: {title: '服务指令名称',order: 3,view: 'text', type: 'string',},
-  tollPrice: {title: '收费价格',order: 4,view: 'number', type: 'number',},
-  comPrice: {title: '提成价格',order: 5,view: 'number', type: 'number',},
-  izReimbursement: {title: '是否参与医保报销 0不报销 1报销',order: 6,view: 'radio', type: 'string',dictCode: '',},
-  izPreferential: {title: '是否参与机构优惠 0不参与 1参与',order: 7,view: 'radio', type: 'string',dictCode: '',},
-  chargingFrequency: {title: '收费频次  1按次收费 2按天收费',order: 8,view: 'list', type: 'string',dictCode: '',},
-  cycleType: {title: '周期类型  1日常护理 2周期护理 3即时护理',order: 9,view: 'list', type: 'string',dictCode: '',},
-  sort: {title: '排序',order: 10,view: 'number', type: 'number',},
-  serviceContent: {title: '服务说明',order: 11,view: 'textarea', type: 'string',},
-  serviceDuration: {title: '服务时长（分钟）',order: 12,view: 'text', type: 'string',},
-  izEnabled: {title: '是否启用 0启用 1未启用',order: 13,view: 'radio', type: 'string',dictCode: '',},
-  createBy: {title: '创建人',order: 14,view: 'text', type: 'string',},
-  createTime: {title: '创建日期',order: 15,view: 'datetime', type: 'string',},
-  updateBy: {title: '更新人',order: 16,view: 'text', type: 'string',},
-  updateTime: {title: '更新日期',order: 17,view: 'datetime', type: 'string',},
-  mp3File: {title: '语音文件',order: 18,view: 'file', type: 'string',},
-  mp4File: {title: '视频文件',order: 19,view: 'file', type: 'string',},
-};
diff --git a/src/views/config/serviceType/ConfigServiceDirectiveList.vue b/src/views/config/serviceType/ConfigServiceDirectiveList.vue
deleted file mode 100644
index 0b11106..0000000
--- a/src/views/config/serviceType/ConfigServiceDirectiveList.vue
+++ /dev/null
@@ -1,353 +0,0 @@
-<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="服务类别id">服务类别</span></template>
-              <a-input placeholder="请输入服务类别id" v-model:value="queryParam.categoryId" allow-clear ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6">
-            <a-form-item name="typeId">
-              <template #label><span title="服务类型id">服务类型</span></template>
-              <a-input placeholder="请输入服务类型id" v-model:value="queryParam.typeId" allow-clear ></a-input>
-            </a-form-item>
-          </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :lg="6">
-              <a-form-item name="instructionTagId">
-                <template #label><span title="指令标签id">指令标签</span></template>
-                <a-input placeholder="请输入指令标签id" v-model:value="queryParam.instructionTagId" allow-clear ></a-input>
-              </a-form-item>
-            </a-col>
-          <a-col :lg="6">
-          <a-form-item name="directiveName">
-          <template #label><span title="服务指令名称">服务指令</span></template>
-              <JInput v-model:value="queryParam.directiveName"/>
-          </a-form-item>
-          </a-col>
-            <a-col :lg="6">
-              <a-form-item name="tollPrice">
-                <template #label><span title="收费价格">收费价格</span></template>
-                <JRangeNumber v-model:value="queryParam.tollPrice" class="query-group-cust"></JRangeNumber>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6">
-              <a-form-item name="comPrice">
-                <template #label><span title="提成价格">提成价格</span></template>
-                <JRangeNumber v-model:value="queryParam.comPrice" class="query-group-cust"></JRangeNumber>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6">
-              <a-form-item name="izReimbursement">
-                <template #label><span title="是否参与医保报销 0不报销 1报销">是否参与</span></template>
-                <a-input placeholder="请输入是否参与医保报销 0不报销 1报销" v-model:value="queryParam.izReimbursement" allow-clear ></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6">
-              <a-form-item name="izPreferential">
-                <template #label><span title="是否参与机构优惠 0不参与 1参与">是否参与</span></template>
-                <a-input placeholder="请输入是否参与机构优惠 0不参与 1参与" v-model:value="queryParam.izPreferential" allow-clear ></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6">
-              <a-form-item name="chargingFrequency">
-                <template #label><span title="收费频次  1按次收费 2按天收费">收费频次</span></template>
-                <a-input placeholder="请输入收费频次  1按次收费 2按天收费" v-model:value="queryParam.chargingFrequency" allow-clear ></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6">
-              <a-form-item name="cycleType">
-                <template #label><span title="周期类型  1日常护理 2周期护理 3即时护理">周期类型</span></template>
-                <a-input placeholder="请输入周期类型  1日常护理 2周期护理 3即时护理" v-model:value="queryParam.cycleType" allow-clear ></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :lg="6">
-              <a-form-item name="izEnabled">
-                <template #label><span title="是否启用 0启用 1未启用">是否启用</span></template>
-                <a-input placeholder="请输入是否启用 0启用 1未启用" v-model:value="queryParam.izEnabled" allow-clear ></a-input>
-              </a-form-item>
-            </a-col>
-          </template>
-          <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 @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
-                  {{ toggleSearchStatus ? '收起' : '展开' }}
-                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
-                </a>
-              </a-col>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection">
-      <!--插槽:table标题-->
-      <template #tableTitle>
-        <a-button type="primary" v-auth="'serviceDirective:config_service_directive:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button  type="primary" v-auth="'serviceDirective:config_service_directive:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" v-auth="'serviceDirective:config_service_directive: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="'serviceDirective:config_service_directive:deleteBatch'">批量操作
-            <Icon icon="mdi:chevron-down"></Icon>
-          </a-button>
-        </a-dropdown>
-        <!-- 高级查询 -->
-        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
-      </template>
-      <!--操作栏-->
-      <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
-      </template>
-      <template v-slot:bodyCell="{ column, record, index, text }">
-        <template v-if="column.dataIndex==='mp3File'">
-          <!--文件字段回显插槽-->
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
-        </template>
-        <template v-if="column.dataIndex==='mp4File'">
-          <!--文件字段回显插槽-->
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
-        </template>
-      </template>
-    </BasicTable>
-    <!-- 表单区域 -->
-    <ConfigServiceDirectiveModal ref="registerModal" @success="handleSuccess"></ConfigServiceDirectiveModal>
-  </div>
-</template>
-
-<script lang="ts" name="serviceDirective-configServiceDirective" setup>
-  import { ref, reactive } from 'vue';
-  import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { useListPage } from '/@/hooks/system/useListPage';
-  import { columns, superQuerySchema } from './ConfigServiceDirective.data';
-  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ConfigServiceDirective.api';
-  import { downloadFile } from '/@/utils/common/renderUtils';
-  import ConfigServiceDirectiveModal from './components/ConfigServiceDirectiveModal.vue'
-  import { useUserStore } from '/@/store/modules/user';
-  import JRangeNumber from "/@/components/Form/src/jeecg/components/JRangeNumber.vue";
-  import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
-  import { cloneDeep } from "lodash-es";
-
-  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: 120,
-        fixed: 'right',
-      },
-      beforeFetch: async (params) => {
-        let rangerQuery = await setRangeQuery();
-        return Object.assign(params, rangerQuery);
-      },
-    },
-    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:4,
-    xl:6,
-    xxl:4
-  });
-  const wrapperCol = reactive({
-    xs: 24,
-    sm: 20,
-  });
-
-  // 高级查询配置
-  const superQueryConfig = reactive(superQuerySchema);
-
-  /**
-   * 高级查询事件
-   */
-  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: 'serviceDirective:config_service_directive:edit'
-      },
-    ];
-  }
-   
-  /**
-   * 下拉操作栏
-   */
-  function getDropDownAction(record) {
-    return [
-      {
-        label: '详情',
-        onClick: handleDetail.bind(null, record),
-      }, {
-        label: '删除',
-        popConfirm: {
-          title: '是否确认删除',
-          confirm: handleDelete.bind(null, record),
-          placement: 'topLeft',
-        },
-        auth: 'serviceDirective:config_service_directive:delete'
-      }
-    ]
-  }
-
-  /**
-   * 查询
-   */
-  function searchQuery() {
-    reload();
-  }
-  
-  /**
-   * 重置
-   */
-  function searchReset() {
-    formRef.value.resetFields();
-    selectedRowKeys.value = [];
-    //刷新数据
-    reload();
-  }
-  
-
-
-
-  
-  let rangeField = 'tollPrice,comPrice,'
-  
-  /**
-   * 设置范围查询条件
-   */
-  async function setRangeQuery(){
-    let queryParamClone = cloneDeep(queryParam);
-    if (rangeField) {
-      let fieldsValue = rangeField.split(',');
-      fieldsValue.forEach(item => {
-        if (queryParamClone[item]) {
-          let range = queryParamClone[item];
-          queryParamClone[item+'_begin'] = range[0];
-          queryParamClone[item+'_end'] = range[1];
-          delete queryParamClone[item];
-        } else {
-          queryParamClone[item+'_begin'] = '';
-          queryParamClone[item+'_end'] = '';
-        }
-      })
-    }
-    return queryParamClone;
-  }
-</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/serviceType/ConfigServiceDirective.api.ts b/src/views/config/serviceType/ConfigServiceType.api.ts
similarity index 75%
rename from src/views/config/serviceType/ConfigServiceDirective.api.ts
rename to src/views/config/serviceType/ConfigServiceType.api.ts
index 2f2fcec..1af3d97 100644
--- a/src/views/config/serviceType/ConfigServiceDirective.api.ts
+++ b/src/views/config/serviceType/ConfigServiceType.api.ts
@@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage";
 const { createConfirm } = useMessage();
 
 enum Api {
-  list = '/serviceDirective/configServiceDirective/list',
-  save='/serviceDirective/configServiceDirective/add',
-  edit='/serviceDirective/configServiceDirective/edit',
-  deleteOne = '/serviceDirective/configServiceDirective/delete',
-  deleteBatch = '/serviceDirective/configServiceDirective/deleteBatch',
-  importExcel = '/serviceDirective/configServiceDirective/importExcel',
-  exportXls = '/serviceDirective/configServiceDirective/exportXls',
+  list = '/ServiceType/configServiceType/list',
+  save='/ServiceType/configServiceType/add',
+  edit='/ServiceType/configServiceType/edit',
+  deleteOne = '/ServiceType/configServiceType/delete',
+  deleteBatch = '/ServiceType/configServiceType/deleteBatch',
+  importExcel = '/ServiceType/configServiceType/importExcel',
+  exportXls = '/ServiceType/configServiceType/exportXls'
 }
 
 /**
@@ -70,3 +70,5 @@ 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/serviceType/ConfigServiceType.data.ts b/src/views/config/serviceType/ConfigServiceType.data.ts
new file mode 100644
index 0000000..01db948
--- /dev/null
+++ b/src/views/config/serviceType/ConfigServiceType.data.ts
@@ -0,0 +1,37 @@
+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",
+    sorter: true,
+    dataIndex: 'sort'
+  },
+  {
+    title: '是否启用',
+    align: "center",
+    dataIndex: 'izEnabled_dictText'
+  },
+];
+
+// 高级查询数据
+export const superQuerySchema = {
+  categoryId: {title: '服务类别id',order: 0,view: 'list', type: 'string',dictCode: '',},
+  typeName: {title: '服务类型名称',order: 1,view: 'text', type: 'string',},
+  sort: {title: '排序',order: 2,view: 'number', type: 'number',},
+  izEnabled: {title: '是否启用',order: 3,view: 'text', type: 'string',},
+};
diff --git a/src/views/config/serviceType/ConfigServiceTypeList.vue b/src/views/config/serviceType/ConfigServiceTypeList.vue
new file mode 100644
index 0000000..076f4fa
--- /dev/null
+++ b/src/views/config/serviceType/ConfigServiceTypeList.vue
@@ -0,0 +1,282 @@
+<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' v-model:value="queryParam.categoryId"
+                :dictCode="`config_service_category,category_name,id,del_flag = 0 and iz_enabled = 0`"
+                placeholder="请选择服务类别" allowClear />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="typeName">
+              <template #label><span title="服务类型">服务类型</span></template>
+              <JInput v-model:value="queryParam.typeName" placeholder="请输入服务类型" allowClear />
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :lg="6">
+              <a-form-item name="izEnabled">
+                <template #label><span title="是否启用">是否启用</span></template>
+                <j-dict-select-tag type='list' v-model:value="queryParam.izEnabled" dictCode="iz_enabled"
+                  placeholder="请选择是否启用" allowClear />
+              </a-form-item>
+            </a-col>
+          </template>
+          <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 @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a> -->
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <!-- <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" 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>批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+        <!-- 高级查询 -->
+        <!-- <super-query :config="superQueryConfig" @search="handleSuperQuery" /> -->
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <ConfigServiceTypeModal ref="registerModal" @success="handleSuccess"></ConfigServiceTypeModal>
+  </div>
+</template>
+
+<script lang="ts" name="ServiceType-configServiceType" setup>
+import { ref, reactive } from 'vue';
+import { BasicTable, useTable, TableAction } from '/@/components/Table';
+import { useListPage } from '/@/hooks/system/useListPage';
+import { columns, superQuerySchema } from './ConfigServiceType.data';
+import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ConfigServiceType.api';
+import { downloadFile } from '/@/utils/common/renderUtils';
+import ConfigServiceTypeModal from './components/ConfigServiceTypeModal.vue'
+import { useUserStore } from '/@/store/modules/user';
+import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
+import { Avatar } from 'ant-design-vue';
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.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: 120,
+      fixed: 'right',
+    },
+    beforeFetch: async (params) => {
+      params.column = 'sort'
+      params.order = 'asc'
+      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: 4,
+  xl: 8,
+  xxl: 8
+});
+const wrapperCol = reactive({
+  xs: 24,
+  sm: 20,
+  xl: 16,
+  xxl: 16
+});
+
+// 高级查询配置
+const superQueryConfig = reactive(superQuerySchema);
+
+/**
+ * 高级查询事件
+ */
+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)
+    },
+  ];
+}
+
+/**
+ * 下拉操作栏
+ */
+function getDropDownAction(record) {
+  return [
+    {
+      label: '详情',
+      onClick: handleDetail.bind(null, record),
+    }, {
+      label: '删除',
+      popConfirm: {
+        title: '是否确认删除',
+        confirm: handleDelete.bind(null, record),
+        placement: 'topLeft',
+      }
+    }
+  ]
+}
+
+/**
+ * 查询
+ */
+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/serviceType/components/ConfigServiceDirectiveForm.vue b/src/views/config/serviceType/components/ConfigServiceDirectiveForm.vue
deleted file mode 100644
index be88a5e..0000000
--- a/src/views/config/serviceType/components/ConfigServiceDirectiveForm.vue
+++ /dev/null
@@ -1,274 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <JFormContainer :disabled="disabled">
-      <template #detail>
-        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ConfigServiceDirectiveForm">
-          <a-row>
-						<a-col :span="24">
-							<a-form-item label="服务类别id" v-bind="validateInfos.categoryId" id="ConfigServiceDirectiveForm-categoryId" name="categoryId">
-								<j-dict-select-tag v-model:value="formData.categoryId" dictCode="" placeholder="请选择服务类别id"  allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="服务类型id" v-bind="validateInfos.typeId" id="ConfigServiceDirectiveForm-typeId" name="typeId">
-								<j-dict-select-tag v-model:value="formData.typeId" dictCode="" placeholder="请选择服务类型id"  allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="指令标签id" v-bind="validateInfos.instructionTagId" id="ConfigServiceDirectiveForm-instructionTagId" name="instructionTagId">
-								<j-dict-select-tag v-model:value="formData.instructionTagId" dictCode="" placeholder="请选择指令标签id"  allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="服务指令名称" v-bind="validateInfos.directiveName" id="ConfigServiceDirectiveForm-directiveName" name="directiveName">
-								<a-input v-model:value="formData.directiveName" placeholder="请输入服务指令名称"  allow-clear ></a-input>
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="收费价格" v-bind="validateInfos.tollPrice" id="ConfigServiceDirectiveForm-tollPrice" name="tollPrice">
-								<a-input-number v-model:value="formData.tollPrice" placeholder="请输入收费价格" style="width: 100%" />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="提成价格" v-bind="validateInfos.comPrice" id="ConfigServiceDirectiveForm-comPrice" name="comPrice">
-								<a-input-number v-model:value="formData.comPrice" placeholder="请输入提成价格" style="width: 100%" />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="是否参与医保报销 0不报销 1报销" v-bind="validateInfos.izReimbursement" id="ConfigServiceDirectiveForm-izReimbursement" name="izReimbursement">
-								<j-dict-select-tag type='radio' v-model:value="formData.izReimbursement" dictCode="" placeholder="请选择是否参与医保报销 0不报销 1报销"  allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="是否参与机构优惠 0不参与 1参与" v-bind="validateInfos.izPreferential" id="ConfigServiceDirectiveForm-izPreferential" name="izPreferential">
-								<j-dict-select-tag type='radio' v-model:value="formData.izPreferential" dictCode="" placeholder="请选择是否参与机构优惠 0不参与 1参与"  allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="收费频次  1按次收费 2按天收费" v-bind="validateInfos.chargingFrequency" id="ConfigServiceDirectiveForm-chargingFrequency" name="chargingFrequency">
-								<j-dict-select-tag v-model:value="formData.chargingFrequency" dictCode="" placeholder="请选择收费频次  1按次收费 2按天收费"  allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="周期类型  1日常护理 2周期护理 3即时护理" v-bind="validateInfos.cycleType" id="ConfigServiceDirectiveForm-cycleType" name="cycleType">
-								<j-dict-select-tag v-model:value="formData.cycleType" dictCode="" placeholder="请选择周期类型  1日常护理 2周期护理 3即时护理"  allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="排序" v-bind="validateInfos.sort" id="ConfigServiceDirectiveForm-sort" name="sort">
-								<a-input-number v-model:value="formData.sort" placeholder="请输入排序" style="width: 100%" />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="服务说明" v-bind="validateInfos.serviceContent" id="ConfigServiceDirectiveForm-serviceContent" name="serviceContent">
-								<a-textarea v-model:value="formData.serviceContent" :rows="4" placeholder="请输入服务说明" />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="服务时长（分钟）" v-bind="validateInfos.serviceDuration" id="ConfigServiceDirectiveForm-serviceDuration" name="serviceDuration">
-								<a-input v-model:value="formData.serviceDuration" placeholder="请输入服务时长（分钟）"  allow-clear ></a-input>
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="是否启用 0启用 1未启用" v-bind="validateInfos.izEnabled" id="ConfigServiceDirectiveForm-izEnabled" name="izEnabled">
-								<j-dict-select-tag type='radio' v-model:value="formData.izEnabled" dictCode="" placeholder="请选择是否启用 0启用 1未启用"  allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="创建人" v-bind="validateInfos.createBy" id="ConfigServiceDirectiveForm-createBy" name="createBy">
-								<a-input v-model:value="formData.createBy" placeholder="请输入创建人" disabled allow-clear ></a-input>
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="创建日期" v-bind="validateInfos.createTime" id="ConfigServiceDirectiveForm-createTime" name="createTime">
-								<a-date-picker placeholder="请选择创建日期"  v-model:value="formData.createTime" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" disabled allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="更新人" v-bind="validateInfos.updateBy" id="ConfigServiceDirectiveForm-updateBy" name="updateBy">
-								<a-input v-model:value="formData.updateBy" placeholder="请输入更新人" disabled allow-clear ></a-input>
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="更新日期" v-bind="validateInfos.updateTime" id="ConfigServiceDirectiveForm-updateTime" name="updateTime">
-								<a-date-picker placeholder="请选择更新日期"  v-model:value="formData.updateTime" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" disabled allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="语音文件" v-bind="validateInfos.mp3File" id="ConfigServiceDirectiveForm-mp3File" name="mp3File">
-								<j-upload v-model:value="formData.mp3File"   ></j-upload>
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="视频文件" v-bind="validateInfos.mp4File" id="ConfigServiceDirectiveForm-mp4File" name="mp4File">
-								<j-upload v-model:value="formData.mp4File"   ></j-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 JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
-  import { getValueType } from '/@/utils';
-  import { saveOrUpdate } from '../ConfigServiceDirective.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: '',   
-    instructionTagId: '',   
-    directiveName: '',   
-    tollPrice: 0,
-    comPrice: 0,
-    izReimbursement: '0',   
-    izPreferential: '0',   
-    chargingFrequency: '',   
-    cycleType: '',   
-    sort: 99,
-    serviceContent: '',   
-    serviceDuration: '',   
-    izEnabled: '',   
-    createBy: '',   
-    createTime: '',   
-    updateBy: '',   
-    updateTime: '',   
-    mp3File: '',   
-    mp4File: '',   
-  });
-  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: '请输入服务类别id!'},],
-    typeId: [{ required: true, message: '请输入服务类型id!'},],
-    instructionTagId: [{ required: true, message: '请输入指令标签id!'},],
-    directiveName: [{ required: true, message: '请输入服务指令名称!'},],
-    tollPrice: [{ required: true, message: '请输入收费价格!'}, { pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!'},],
-    comPrice: [{ required: false}, { pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!'},],
-    izReimbursement: [{ required: true, message: '请输入是否参与医保报销 0不报销 1报销!'},],
-    izPreferential: [{ required: true, message: '请输入是否参与机构优惠 0不参与 1参与!'},],
-    chargingFrequency: [{ required: true, message: '请输入收费频次  1按次收费 2按天收费!'},],
-    cycleType: [{ required: true, message: '请输入周期类型  1日常护理 2周期护理 3即时护理!'},],
-    sort: [{ required: true, message: '请输入排序!'},],
-    serviceDuration: [{ required: true, message: '请输入服务时长（分钟）!'}, { pattern: /^-?\d+$/, message: '请输入整数!'},],
-    izEnabled: [{ required: true, message: '请输入是否启用 0启用 1未启用!'},],
-  });
-  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/serviceType/components/ConfigServiceDirectiveModal.vue b/src/views/config/serviceType/components/ConfigServiceDirectiveModal.vue
deleted file mode 100644
index 4373246..0000000
--- a/src/views/config/serviceType/components/ConfigServiceDirectiveModal.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<template>
-  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
-    <ConfigServiceDirectiveForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ConfigServiceDirectiveForm>
-  </j-modal>
-</template>
-
-<script lang="ts" setup>
-  import { ref, nextTick, defineExpose } from 'vue';
-  import ConfigServiceDirectiveForm from './ConfigServiceDirectiveForm.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/serviceType/components/ConfigServiceTypeForm.vue b/src/views/config/serviceType/components/ConfigServiceTypeForm.vue
new file mode 100644
index 0000000..998b498
--- /dev/null
+++ b/src/views/config/serviceType/components/ConfigServiceTypeForm.vue
@@ -0,0 +1,176 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
+          name="ConfigServiceTypeForm">
+          <a-row>
+            <a-col :span="24">
+              <a-form-item label="服务类别" v-bind="validateInfos.categoryId" id="ConfigServiceTypeForm-categoryId"
+                name="categoryId">
+                <j-dict-select-tag type='list' v-model:value="formData.categoryId"
+                  :dictCode="`config_service_category,category_name,id,del_flag = 0 and iz_enabled = 0`"
+                  placeholder="请选择服务类别" allowClear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="服务类型" v-bind="validateInfos.typeName" id="ConfigServiceTypeForm-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.sort" id="ConfigServiceTypeForm-sort" name="sort">
+                <a-input-number v-model:value="formData.sort" placeholder="请输入排序" style="width: 100%" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="是否启用" v-bind="validateInfos.izEnabled" id="ConfigServiceTypeForm-izEnabled"
+                name="izEnabled">
+                <j-dict-select-tag type='radio' v-model:value="formData.izEnabled" dictCode="iz_enabled"
+                  placeholder="请选择是否启用" allowClear />
+              </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 '../ConfigServiceType.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: '',
+  sort: 99,
+  izEnabled: '0',
+});
+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: '请输入服务类别id!' },],
+  typeName: [{ required: true, message: '请输入服务类型名称!' },],
+  sort: [{ required: true, message: '请输入排序!' },],
+  izEnabled: [{ 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/serviceType/components/ConfigServiceTypeModal.vue b/src/views/config/serviceType/components/ConfigServiceTypeModal.vue
new file mode 100644
index 0000000..0b17b0d
--- /dev/null
+++ b/src/views/config/serviceType/components/ConfigServiceTypeModal.vue
@@ -0,0 +1,79 @@
+<template>
+  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk"
+    :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <ConfigServiceTypeForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false">
+    </ConfigServiceTypeForm>
+  </j-modal>
+</template>
+
+<script lang="ts" setup>
+import { ref, nextTick, defineExpose } from 'vue';
+import ConfigServiceTypeForm from './ConfigServiceTypeForm.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>