diff --git a/src/views/biz/NuBizAdvisoryInfo/pc/NuBizAdvisoryInfoList.vue b/src/views/biz/NuBizAdvisoryInfo/pc/NuBizAdvisoryInfoList.vue
index de21db6..2c9b7ac 100644
--- a/src/views/biz/NuBizAdvisoryInfo/pc/NuBizAdvisoryInfoList.vue
+++ b/src/views/biz/NuBizAdvisoryInfo/pc/NuBizAdvisoryInfoList.vue
@@ -19,13 +19,13 @@
             <a-col :lg="6">
               <a-form-item name="advisoryType">
                 <template #label><span title="咨询类型">咨询类型</span></template>
-                <j-select-multiple placeholder="请选择咨询类型" v-model:value="queryParam.advisoryType" dictCode="advisory_type" allow-clear />
+                <j-dict-select-tag placeholder="请选择咨询类型" v-model:value="queryParam.advisoryType" dictCode="advisory_type" allow-clear />
               </a-form-item>
             </a-col>
             <a-col :lg="6">
               <a-form-item name="status">
                 <template #label><span title="状态">状态</span></template>
-                <j-select-multiple placeholder="请选择状态" v-model:value="queryParam.status" dictCode="advisory_approval" allow-clear />
+                <j-dict-select-tag placeholder="请选择状态" v-model:value="queryParam.status" dictCode="advisory_approval" allow-clear />
               </a-form-item>
             </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -49,7 +49,7 @@
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)"/>
       </template>
       <template v-slot:bodyCell="{ column, record, index, text }">
       </template>
@@ -86,7 +86,7 @@
       useSearchForm: false,
       showIndexColumn: true,
       actionColumn: {
-        width: 120,
+        width: 140,
         fixed: 'right',
       },
       beforeFetch: async (params) => {
@@ -183,14 +183,6 @@
         onClick: handleEdit.bind(null, record),
         auth: 'NuBizAdvisoryInfo:nu_biz_advisory_info:edit'
       },
-    ];
-  }
-   
-  /**
-   * 下拉操作栏
-   */
-  function getDropDownAction(record) {
-    return [
       {
         label: '详情',
         onClick: handleDetail.bind(null, record),
@@ -203,8 +195,9 @@
         },
         auth: 'NuBizAdvisoryInfo:nu_biz_advisory_info:delete'
       }
-    ]
+    ];
   }
+   
 
   /**
    * 查询
diff --git a/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList copy.vue b/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList copy.vue
deleted file mode 100644
index 50937b5..0000000
--- a/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList copy.vue	
+++ /dev/null
@@ -1,227 +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="name">
-              <template #label><span title="姓名">姓名</span></template>
-              <a-input placeholder="请输入姓名" v-model:value="queryParam.name" allow-clear ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
-              <a-col :lg="6">
-                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
-                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
-              </a-col>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection">
-      <!--插槽:table标题-->
-      <template #tableTitle>
-        <a-button type="primary" v-auth="'bizEmployeesInfo:biz_employees_info:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button  type="primary" v-auth="'bizEmployeesInfo:biz_employees_info:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" v-auth="'bizEmployeesInfo:biz_employees_info:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
-      </template>
-      <!--操作栏-->
-      <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)"/>
-      </template>
-      <template v-slot:bodyCell="{ column, record, index, text }">
-      </template>
-    </BasicTable>
-    <!-- 表单区域 -->
-    <BizEmployeesInfoModal ref="registerModal" @success="handleSuccess"></BizEmployeesInfoModal>
-  </div>
-</template>
-
-<script lang="ts" name="bizEmployeesInfo-bizEmployeesInfo" setup>
-  import { ref, reactive } from 'vue';
-  import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { useListPage } from '/@/hooks/system/useListPage';
-  import { columns, superQuerySchema } from './BizEmployeesInfo.data';
-  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './BizEmployeesInfo.api';
-  import { downloadFile } from '/@/utils/common/renderUtils';
-  import BizEmployeesInfoModal from './components/BizEmployeesInfoModal.vue'
-  import { useUserStore } from '/@/store/modules/user';
-
-  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);
-      },
-    },
-    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: 'bizEmployeesInfo:biz_employees_info:edit'
-      },
-      {
-        label: '详情',
-        onClick: handleDetail.bind(null, record),
-      }, {
-        label: '删除',
-        popConfirm: {
-          title: '是否确认删除',
-          confirm: handleDelete.bind(null, record),
-          placement: 'topLeft',
-        },
-        auth: 'bizEmployeesInfo:biz_employees_info:delete'
-      }
-    ];
-  }
-   
-
-  /**
-   * 查询
-   */
-  function searchQuery() {
-    reload();
-  }
-  
-  /**
-   * 重置
-   */
-  function searchReset() {
-    formRef.value.resetFields();
-    selectedRowKeys.value = [];
-    //刷新数据
-    reload();
-  }
-  
-
-
-
-</script>
-
-<style lang="less" scoped>
-  .jeecg-basic-table-form-container {
-    padding: 0;
-    .table-page-search-submitButtons {
-      display: block;
-      margin-bottom: 24px;
-      white-space: nowrap;
-    }
-    .query-group-cust{
-      min-width: 100px !important;
-    }
-    .query-group-split-cust{
-      width: 30px;
-      display: inline-block;
-      text-align: center
-    }
-    .ant-form-item:not(.ant-form-item-with-help){
-      margin-bottom: 16px;
-      height: 32px;
-    }
-    :deep(.ant-picker),:deep(.ant-input-number){
-      width: 100%;
-    }
-  }
-</style>
diff --git a/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue b/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue
index 0509403..b8467cb 100644
--- a/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue
+++ b/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue
@@ -7,7 +7,7 @@
           <a-col :lg="6">
             <a-form-item name="name">
               <template #label><span title="姓名">姓名</span></template>
-              <a-input placeholder="请输入姓名" v-model:value="queryParam.name" allow-clear ></a-input>
+              <j-input placeholder="请输入姓名" v-model:value="queryParam.name" allow-clear ></j-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -64,7 +64,7 @@
       </a-col>
     </a-row>
 
-    <div style="text-align:right;right: 20px;bottom: 20px;z-index: 999;padding: 8px 16px;border-radius: 4px;display: flex;align-items: center;">
+    <div style="float:right;bottom: 20px;z-index: 999;padding: 8px 16px;border-radius: 4px;display: flex;align-items: center;">
       <span style="margin-right: 10px;">共 {{ total }} 条数据</span>
       <Pagination showLessItems v-model:current="current" :pageSize="pageSize" size="small"
         show-quick-jumper :total="total" @change="onPageChange" />
@@ -92,6 +92,7 @@
   import { Pagination } from 'ant-design-vue';
   import { useDrawer } from '/@/components/Drawer';
   import UserDrawer from '/@/views/system/user/UserDrawer.vue';
+import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
 
 
   const APagination = Pagination;
diff --git a/src/views/biz/nuBizCustomerInfo/NuBizCustomerInfoList copy.vue b/src/views/biz/nuBizCustomerInfo/NuBizCustomerInfoList copy.vue
deleted file mode 100644
index 6652404..0000000
--- a/src/views/biz/nuBizCustomerInfo/NuBizCustomerInfoList copy.vue	
+++ /dev/null
@@ -1,240 +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="customerName">
-              <template #label><span title="姓名">姓名</span></template>
-              <a-input placeholder="请输入姓名" v-model:value="queryParam.customerName" allow-clear ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6">
-            <a-form-item name="contactNumber">
-              <template #label><span title="联系电话">联系电话</span></template>
-              <a-input placeholder="请输入联系电话" v-model:value="queryParam.contactNumber" allow-clear ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
-              <a-col :lg="6">
-                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
-                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
-              </a-col>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!--引用表格-->
-    <BasicTable @register="registerTable">
-      <!--插槽:table标题-->
-      <template #tableTitle>
-        <a-button type="primary" v-auth="'nuBizCustomerInfo:nu_biz_customer_info:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button  type="primary" v-auth="'nuBizCustomerInfo:nu_biz_customer_info:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" v-auth="'nuBizCustomerInfo:nu_biz_customer_info:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
-      </template>
-      <!--操作栏-->
-      <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)"/>
-      </template>
-      <template v-slot:bodyCell="{ column, record, index, text }">
-      </template>
-    </BasicTable>
-    <!-- 表单区域 -->
-    <NuBizCustomerInfoModal ref="registerModal" @success="handleSuccess"></NuBizCustomerInfoModal>
-  </div>
-</template>
-
-<script lang="ts" name="nuBizCustomerInfo-nuBizCustomerInfo" setup>
-  import { ref, reactive } from 'vue';
-  import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { useListPage } from '/@/hooks/system/useListPage';
-  import { columns, superQuerySchema } from './NuBizCustomerInfo.data';
-  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './NuBizCustomerInfo.api';
-  import { downloadFile } from '/@/utils/common/renderUtils';
-  import NuBizCustomerInfoModal from './components/NuBizCustomerInfoModal.vue'
-  import { useUserStore } from '/@/store/modules/user';
-
-  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);
-      },
-    },
-    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: 'nuBizCustomerInfo:nu_biz_customer_info:edit'
-      },
-      {
-        label: '详情',
-        onClick: handleDetail.bind(null, record),
-      },
-    ];
-  }
-   
-  /**
-   * 下拉操作栏
-   */
-  function getDropDownAction(record) {
-    return [ {
-        label: '删除',
-        popConfirm: {
-          title: '是否确认删除',
-          confirm: handleDelete.bind(null, record),
-          placement: 'topLeft',
-        },
-        auth: 'nuBizCustomerInfo:nu_biz_customer_info:delete'
-      }
-    ]
-  }
-
-  /**
-   * 查询
-   */
-  function searchQuery() {
-    reload();
-  }
-  
-  /**
-   * 重置
-   */
-  function searchReset() {
-    formRef.value.resetFields();
-    selectedRowKeys.value = [];
-    //刷新数据
-    reload();
-  }
-  
-
-
-
-</script>
-
-<style lang="less" scoped>
-  .jeecg-basic-table-form-container {
-    padding: 0;
-    .table-page-search-submitButtons {
-      display: block;
-      margin-bottom: 24px;
-      white-space: nowrap;
-    }
-    .query-group-cust{
-      min-width: 100px !important;
-    }
-    .query-group-split-cust{
-      width: 30px;
-      display: inline-block;
-      text-align: center
-    }
-    .ant-form-item:not(.ant-form-item-with-help){
-      margin-bottom: 16px;
-      height: 32px;
-    }
-    :deep(.ant-picker),:deep(.ant-input-number){
-      width: 100%;
-    }
-  }
-</style>
diff --git a/src/views/biz/nuBizCustomerInfo/NuBizCustomerInfoList.vue b/src/views/biz/nuBizCustomerInfo/NuBizCustomerInfoList.vue
index c7b046e..6487b52 100644
--- a/src/views/biz/nuBizCustomerInfo/NuBizCustomerInfoList.vue
+++ b/src/views/biz/nuBizCustomerInfo/NuBizCustomerInfoList.vue
@@ -7,13 +7,13 @@
           <a-col :lg="6">
             <a-form-item name="customerName">
               <template #label><span title="姓名">姓名</span></template>
-              <a-input placeholder="请输入姓名" v-model:value="queryParam.customerName" allow-clear ></a-input>
+              <j-input placeholder="请输入姓名" v-model:value="queryParam.customerName" allow-clear ></j-input>
             </a-form-item>
           </a-col>
           <a-col :lg="6">
             <a-form-item name="contactNumber">
               <template #label><span title="联系电话">联系电话</span></template>
-              <a-input placeholder="请输入联系电话" v-model:value="queryParam.contactNumber" allow-clear ></a-input>
+              <j-input placeholder="请输入联系电话" v-model:value="queryParam.contactNumber" allow-clear ></j-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -77,7 +77,7 @@
 
     </a-row>
      
-    <div style="text-align:right;right: 20px;bottom: 20px;z-index: 999;padding: 8px 16px;border-radius: 4px;display: flex;align-items: center;">
+    <div style="float:right;bottom: 20px;z-index: 999;padding: 8px 16px;border-radius: 4px;display: flex;align-items: center;">
       <span style="margin-right: 10px;">共 {{ total }} 条数据</span>
       <Pagination showLessItems v-model:current="current" :pageSize="pageSize" size="small"
         show-quick-jumper :total="total" @change="onPageChange" />
@@ -99,6 +99,7 @@
   import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
   import { defHttp } from '/@/utils/http/axios';
   import { Pagination } from 'ant-design-vue';
+import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
 
   const APagination = Pagination;
   const formRef = ref();
diff --git a/src/views/biz/nuBizCustomerInfo/components/CheckNuListForm.vue b/src/views/biz/nuBizCustomerInfo/components/CheckNuListForm.vue
index a890d59..d6335d5 100644
--- a/src/views/biz/nuBizCustomerInfo/components/CheckNuListForm.vue
+++ b/src/views/biz/nuBizCustomerInfo/components/CheckNuListForm.vue
@@ -32,6 +32,7 @@
    */
   function edit(record) {
     customerInfo.value = record;
+    nuId.value = '';
     const getNulistUrl = "/h5Api/nuBaseInfo/list";
     defHttp.get({ url: getNulistUrl }).then((data) => {
       nulistSource.value = data;
diff --git a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.data.ts b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.data.ts
index a51f13b..570f316 100644
--- a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.data.ts
+++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.data.ts
@@ -13,7 +13,8 @@ export const columns: BasicColumn[] = [
   {
     title: '货品编码',
     align: "center",
-    dataIndex: 'materialNo'
+    dataIndex: 'materialNo',
+    width:'100px'
   },
   {
     title: '规格型号',
@@ -23,37 +24,44 @@ export const columns: BasicColumn[] = [
   {
     title: '销售单价',
     align: "center",
-    dataIndex: 'salesUnitPrice'
+    dataIndex: 'salesUnitPrice',
+    width:'100px'
   },
   {
     title: '参考单价',
     align: "center",
-    dataIndex: 'referenceUnitPrice'
+    dataIndex: 'referenceUnitPrice',
+    width:'100px'
   },
   {
     title: '货品单位',
     align: "center",
-    dataIndex: 'materialUnits'
+    dataIndex: 'materialUnits',
+    width:'100px'
   },
   {
     title: '供应商',
     align: "center",
-    dataIndex: 'suppliers_dictText'
+    dataIndex: 'suppliers_dictText',
+    width:'200px'
   },
   {
     title: '物料类别',
     align: "center",
-    dataIndex: 'categoryId_dictText'
+    dataIndex: 'categoryId_dictText',
+    width:'100px'
   },
   {
     title: '物料类型',
     align: "center",
-    dataIndex: 'typeId_dictText'
+    dataIndex: 'typeId_dictText',
+    width:'100px'
   },
   {
     title: '用药类型',
     align: "center",
-    dataIndex: 'medicationId_dictText'
+    dataIndex: 'medicationId_dictText',
+    width:'100px'
   },
   // {
   //   title: '物料图片',
@@ -70,7 +78,8 @@ export const columns: BasicColumn[] = [
   {
     title: '是否启用',
     align: "center",
-    dataIndex: 'izEnabled_dictText'
+    dataIndex: 'izEnabled_dictText',
+    width:'100px'
   },
 ];
 
diff --git a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue
index 68003de..47d6d6a 100644
--- a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue
+++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue
@@ -28,12 +28,6 @@
                 <j-input placeholder="请输入货品名称" v-model:value="queryParam.materialName" allow-clear ></j-input>
               </a-form-item>
             </a-col>
-            <a-col :lg="6">
-              <a-form-item name="izEnabled">
-                <template #label><span title="是否启用">是否启用</span></template>
-                <j-dict-select-tag type='list' placeholder="请选择是否启用" v-model:value="queryParam.izEnabled" dictCode="iz_enabled" allow-clear />
-              </a-form-item>
-            </a-col>
             <a-col :lg="6">
               <a-form-item name="materialNo">
                 <template #label><span title="货品编码">货品编码</span></template>
@@ -42,10 +36,16 @@
             </a-col>
             <a-col :lg="6">
               <a-form-item name="pinyin">
-                <template #label><span title="按拼音检索">按拼音检索</span></template>
+                <template #label><span title="拼音检索">拼音检索</span></template>
                 <j-input placeholder="请输入拼音" v-model:value="queryParam.pinyin" allow-clear ></j-input>
               </a-form-item>
             </a-col>
+            <a-col :lg="6">
+              <a-form-item name="izEnabled">
+                <template #label><span title="是否启用">是否启用</span></template>
+                <j-dict-select-tag type='list' placeholder="请选择是否启用" v-model:value="queryParam.izEnabled" dictCode="iz_enabled" allow-clear />
+              </a-form-item>
+            </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
diff --git a/src/views/services/directivePackage/DirectivePackageList.vue b/src/views/services/directivePackage/DirectivePackageList.vue
index 2ecaa18..c391047 100644
--- a/src/views/services/directivePackage/DirectivePackageList.vue
+++ b/src/views/services/directivePackage/DirectivePackageList.vue
@@ -25,24 +25,24 @@
       </a-form>
     </div>
     <a-row>
-      <a-col :span="6" v-for="directive of tableData.records" :key="directive.id" style="padding: 5px 10px 0 0;height: 240px;">
-        <a-row style="padding: 5px;background-color: white;border-radius: 8px;height: 220px;">
+      <a-col :span="6" v-for="directive of tableData.records" :key="directive.id" style="padding: 5px 10px 0 0;height: 220px;">
+        <a-row style="padding: 5px;background-color: white;border-radius: 8px;height: 200px;">
           <a-col :span="4">
             <div class="bjclass">
               <img src="/src/assets/images/logo.png" style="width: 40px;height:40px;margin-top: 10px;" />
             </div>
           </a-col>
-          <a-col :span="20" style="padding-left: 15px;">
+          <a-col :span="20" style="padding: 15px;">
             <div>
               <span class="titleOne">{{ directive.packageName }}</span>
             </div>
-            <div style="height: 130px">
+            <div style="height: 100px">
               <span class="ellipsis-two-lines" :title="directive.description">{{ directive.description }}</span>
             </div>
             <div style="color: #857f7f;">
               <span style="float:left;"><Icon icon="ant-design:user-add-outlined" :size="18" /><span style="margin-left:5px;">{{ directive.createBy_dictText }}</span></span> 
               <span style="margin-left: 15px;float:left;"><Icon icon="ant-design:field-time-outlined" :size="20" /><span style="margin-left:5px;font-size:16px;">{{ directive.createTime.substring(0,10) }}</span></span>
-              <span style="margin-right: 15px;float:right;">
+              <span style="float:right;">
                 <a-dropdown :trigger="['hover']" placement="topRight">
                 <a-button type="link"><Icon icon="ant-design:more-outlined" :size="20" /></a-button>
                 <template #overlay>
@@ -66,7 +66,7 @@
       </a-col>
     </a-row>
     <div
-      style="text-align:right;right: 20px;bottom: 20px;z-index: 999;padding: 8px 16px;border-radius: 4px;display: flex;align-items: center;">
+      style="float:right;bottom: 20px;z-index: 999;padding: 8px 16px;border-radius: 4px;display: flex;align-items: center;">
       <span style="margin-right: 10px;">共 {{ tableData.total }} 条数据</span>
       <Pagination showLessItems v-model:current="pageParams.pageNo" :pageSize="pageParams.pageSize" size="small"
         show-quick-jumper :total="tableData.total" @change="queryList" />
@@ -96,12 +96,16 @@ const labelCol = reactive({
     sm: 24,
   });
 const pageParams = ref({ pageNo: 1, pageSize: 12 })
-
+// function onShowSizeChange  (current, pageSize) {
+//   pageParams.value.pageSize = pageSize
+//       console.log(current, pageSize);
+//     };
 /**
  * 搜索
  */
 function searchQuery() {
-  queryList({})
+  pageParams.value.pageNo = 1
+  queryList()
 }
 
 /**
@@ -109,7 +113,8 @@ function searchQuery() {
  */
 function searchReset() {
   searchForm.value = {}
-  queryList({})
+  pageParams.value.pageNo = 1
+  queryList()
 }
 
 /**
@@ -123,7 +128,7 @@ function handleAdd() {
  * 成功回调
  */
 function handleSuccess() {
-  queryList({})
+  queryList()
 }
 
 /**
@@ -155,7 +160,7 @@ function remove(data) {
 }
 
 onMounted(() => {
-  queryList({ pageNo: 1, pageSize: 12 })
+  queryList()
 })
 </script>
 
@@ -191,11 +196,12 @@ onMounted(() => {
 }
 .bjclass{
   text-align: center;
-  margin-top: 16px;
+  margin-top: 24px;
   border-radius: 50%;
   width: 60px;
   height: 60px;
   background: linear-gradient(to bottom, #fff, #efe9e9);
+  margin-left: 9px;
 }
 .titleOne {
   font-size: 16px;
@@ -207,7 +213,7 @@ onMounted(() => {
 .ellipsis-two-lines {
   display: -webkit-box;
   -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2; /* 限制文本为2行 */
+  -webkit-line-clamp: 3; /* 限制文本为2行 */
   overflow: hidden;
   text-overflow: ellipsis;
   line-height:24px;color: #5a5a5a;
diff --git a/src/views/services/directivePackage/components/ConfigServiceDirectiveList.vue b/src/views/services/directivePackage/components/ConfigServiceDirectiveList.vue
index 5ade876..c7eaac3 100644
--- a/src/views/services/directivePackage/components/ConfigServiceDirectiveList.vue
+++ b/src/views/services/directivePackage/components/ConfigServiceDirectiveList.vue
@@ -17,7 +17,7 @@
             <a-form-item name="typeId">
               <template #label><span title="服务类型">服务类型</span></template>
               <j-dict-select-tag type="list" v-model:value="queryParam.typeId"
-                :dictCode="`nu_config_service_type,type_name,id,del_flag = 0 order by sort asc`" placeholder="请选择服务类型"
+                :dictCode="`nu_config_service_type,type_name,id,del_flag = 0  and category_id = ${queryParam.categoryId || -1}  order by sort asc`" placeholder="请选择服务类型"
                 :ignoreDisabled="true" allowClear />
             </a-form-item>
           </a-col>
diff --git a/src/views/services/directivePackage/components/DirectivePackageModal.vue b/src/views/services/directivePackage/components/DirectivePackageModal.vue
index a583294..c70c44a 100644
--- a/src/views/services/directivePackage/components/DirectivePackageModal.vue
+++ b/src/views/services/directivePackage/components/DirectivePackageModal.vue
@@ -282,6 +282,7 @@ function addDirective(directive_) {
   if (res_.length > 0) {
     createMessage.warning('服务指令已选择');
   } else {
+    createMessage.success('选择成功');
     seletedRecord.value.directives.push(directive_)
   }
 }
diff --git a/src/views/services/serviceDirective/ConfigServiceDirective.data.ts b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts
index a0d568a..1dc20dd 100644
--- a/src/views/services/serviceDirective/ConfigServiceDirective.data.ts
+++ b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts
@@ -37,7 +37,7 @@ export const columns: BasicColumn[] = [
     },
   },
   {
-    title: '服务指令名称',
+    title: '服务指令',
     align: 'center',
     dataIndex: 'directiveName',
   },
@@ -176,7 +176,7 @@ export const superQuerySchema = {
   categoryId: { title: '服务类别', order: 0, view: 'list', type: 'string', dictCode: '' },
   typeId: { title: '服务类型', order: 1, view: 'list', type: 'string', dictCode: '' },
   instructionTagId: { title: '分类标签', order: 2, view: 'list', type: 'string', dictCode: 'instruction_tag' },
-  directiveName: { title: '服务指令名称', order: 3, view: 'text', type: 'string' },
+  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: '医保报销', order: 6, view: 'radio', type: 'string', dictCode: '' },
diff --git a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
index f7dd236..e6c4d8e 100644
--- a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
+++ b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
@@ -17,7 +17,7 @@
             <a-form-item name="typeId">
               <template #label><span title="服务类型">服务类型</span></template>
               <j-dict-select-tag type="list" v-model:value="queryParam.typeId"
-                :dictCode="`nu_config_service_type,type_name,id,del_flag = 0 order by sort asc`" placeholder="请选择服务类型"
+                :dictCode="`nu_config_service_type,type_name,id,del_flag = 0 and category_id = ${queryParam.categoryId || -1} order by sort asc`" placeholder="请选择服务类型"
                 :ignoreDisabled="true" allowClear />
             </a-form-item>
           </a-col>
diff --git a/src/views/services/serviceTag/ServiceTagList.vue b/src/views/services/serviceTag/ServiceTagList.vue
index cfcfef6..6f36458 100644
--- a/src/views/services/serviceTag/ServiceTagList.vue
+++ b/src/views/services/serviceTag/ServiceTagList.vue
@@ -64,7 +64,7 @@
       </a-col>
     </a-row>
 
-    <div style="text-align:right;right: 20px;bottom: 20px;z-index: 999;padding: 8px 16px;border-radius: 4px;display: flex;align-items: center;">
+    <div style="float:right;bottom: 20px;z-index: 999;padding: 8px 16px;border-radius: 4px;display: flex;align-items: center;">
       <span style="margin-right: 10px;">共 {{ tableData.total }} 条数据</span>
       <Pagination showLessItems v-model:current="pageParams.pageNo" :pageSize="pageParams.pageSize" size="small"
         show-quick-jumper :total="tableData.total" @change="queryList" />
@@ -84,17 +84,15 @@ const registerModal = ref();
 const searchForm = ref({})
 const tableData = ref({})
 const labelCol = reactive({
-  xs: 24,
-  sm: 4,
-  xl: 6,
-  xxl: 6
-});
-const wrapperCol = reactive({
-  xs: 24,
-  sm: 20,
-  xl: 14,
-  xxl: 14
-});
+    xs:24,
+    sm:6,
+    xl:6,
+    xxl:6
+  });
+  const wrapperCol = reactive({
+    xs: 24,
+    sm: 24,
+  });
 const pageParams = ref({ pageNo: 1, pageSize: 12 })
 
 /**
diff --git a/src/views/services/serviceTag/components/ConfigServiceDirectiveList.vue b/src/views/services/serviceTag/components/ConfigServiceDirectiveList.vue
index 5ade876..f73bc1a 100644
--- a/src/views/services/serviceTag/components/ConfigServiceDirectiveList.vue
+++ b/src/views/services/serviceTag/components/ConfigServiceDirectiveList.vue
@@ -17,7 +17,7 @@
             <a-form-item name="typeId">
               <template #label><span title="服务类型">服务类型</span></template>
               <j-dict-select-tag type="list" v-model:value="queryParam.typeId"
-                :dictCode="`nu_config_service_type,type_name,id,del_flag = 0 order by sort asc`" placeholder="请选择服务类型"
+                :dictCode="`nu_config_service_type,type_name,id,del_flag = 0 and category_id = ${queryParam.categoryId || -1}  order by sort asc`" placeholder="请选择服务类型"
                 :ignoreDisabled="true" allowClear />
             </a-form-item>
           </a-col>
@@ -95,7 +95,9 @@ import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectT
 import { cloneDeep } from "lodash-es";
 import ConfigServiceDirectiveModal from './ConfigServiceDirectiveModal.vue'
 import { filterDictTextByCache } from '/@/utils/dict/JDictSelectUtil';
+import { useMessage } from '/@/hooks/web/useMessage';
 
+const { createMessage } = useMessage();
 const emit = defineEmits(['deleteDirective', 'addDirective']);
 const formRef = ref();
 const queryParam = reactive<any>({});
@@ -161,6 +163,7 @@ function handleSuccess() {
  * @param directive_ 
  */
 function handleSelect(directive_) {
+  // createMessage.success('选择成功！');
   emit('addDirective', directive_)
 }
 
diff --git a/src/views/services/serviceTag/components/ServiceTagModal.vue b/src/views/services/serviceTag/components/ServiceTagModal.vue
index 770abe0..e015b9b 100644
--- a/src/views/services/serviceTag/components/ServiceTagModal.vue
+++ b/src/views/services/serviceTag/components/ServiceTagModal.vue
@@ -254,6 +254,7 @@ function addDirective(directive_) {
   if (res_.length > 0) {
     createMessage.warning('服务指令已选择');
   } else {
+    createMessage.success('选择成功');
     seletedRecord.value.directives.push(directive_)
   }
 }