修改样式

src/components/SimpleMenu/src/SimpleMenu.vue

@@ -196,24 +196,28 @@
 .jeecg-menu-item-active:not(.jeecg-menu-submenu) {
     color: white !important;
     background-color: #1890ff !important;
-    border-radius: 5px;
+    border-radius: 8px;
-    margin: 10px 20px;
+    margin: 0px 20px 0 20px;
-    padding: 10px;
+}
+
+.jeecg-menu-vertical .jeecg-menu-item:hover, .jeecg-menu-vertical .jeecg-menu-submenu-title:hover {
+    color: #fff !important;
+    border-radius: 8px;
+    background: #c9cacc;
+    margin: 10px 20px 0 20px;
 }
-// .jeecg-menu {
-//     background: #fbfbfd;
-//     position: relative;
-//     display: block;
-//     width: 100%;
-//     padding: 0;
-//     margin: 0;
-//     font-size: 14px;
-//     color: rgba(0, 0, 0, 0.88);
-//     list-style: none;
-//     outline: none;
-//     border-radius: 5px;
-// }
 .jeecg-menu-light.jeecg-menu-vertical .jeecg-menu-item-active.jeecg-menu-submenu {
+  color: #606266 !important;
   background: #f0f0f0;
+  
+}
+.jeecg-menu-vertical .jeecg-menu-item, .jeecg-menu-vertical .jeecg-menu-submenu-title {
+  position: relative;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: pointer;
+  margin-top: 10px;
+  padding: 8px;
 }
 </style>

src/components/Table/src/BasicTable.vue

@@ -504,7 +504,7 @@
         padding: 24px 10px 0px 10px;
         margin-bottom: 8px;
         background-color: @component-background;
-        border-radius: 5px;
+        border-radius: 8px;
       }
     }
 
@@ -523,7 +523,7 @@
     .ant-table-wrapper {
       padding: 6px;
       background-color: @component-background;
-      border-radius: 5px;
+      border-radius: 8px;
 
       .ant-table-title {
         min-height: 40px;
@@ -624,4 +624,7 @@
     }
     // update-end--author:liaozhiyang---date:20240604---for：【TV360X-377】关联记录必填影响到了table的输入框和页码样式
   }
+  .ant-table-wrapper .ant-table.ant-table-middle .ant-table-tbody > tr > td{
+    padding: 8px 8px;
+  }
 </style>

src/design/ant/btn.less

@@ -7,9 +7,44 @@
   // &.ant-btn-error:not(.ant-btn-link),
   // &.ant-btn-warning:not(.ant-btn-link),
   &.ant-btn-primary:not(.ant-btn-link) {
-    box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.12), 0 2px 4px 0 rgba(0, 0, 0, 0.08) !important;
+    // box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.12), 0 2px 4px 0 rgba(0, 0, 0, 0.08) !important;
-    background: linear-gradient(to right, #1ea1fb, #0480e7);
+    // background: linear-gradient(to right, #1ea1fb, #017de9);
+
+    // align-items: center;
+    border-radius: 8px;
+    background: linear-gradient(to right,#1ea0fa , #017de9);
+    // border: 1px solid #fff;
+    // color: #fff;
+    // position: relative;      /* needed for pseudo-element */
+    overflow: hidden;        /* clip the animated stripe */
+    // height: 34px;
   }
+  &.ant-btn-primary:not(.ant-btn-link)::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(
+      90deg,
+      transparent 0%,
+      rgba(255,255,255,0.4) 50%,
+      transparent 100%
+    );
+    transform: skewX(0);
+  }
+  
+  &.ant-btn-primary:not(.ant-btn-link):hover::before {
+    animation: light-sweep 1.5s forwards;
+  }
+
+  @keyframes light-sweep {
+    to {
+      left: 100%;
+    }
+  }
+
   // &-group {
   //   .ant-btn:not(:first-child) {
   //     bottom: 1px;
@@ -322,3 +357,51 @@
     }
   }
 }
+
+
+.ant-btn-default {
+  border-radius: 8px !important;
+  color: white;
+  background: linear-gradient(to right,#1ea0fa , #017de9);
+  border: 0px;
+}
+:where(.css-dev-only-do-not-override-9m98ij).ant-btn-default:not(:disabled):hover {
+  color: white;
+  border-color: white;
+}
+&.ant-btn-default:not(.ant-btn-link) {
+  border-radius: 8px;
+  color: white;
+  background: linear-gradient(to right,#1ea0fa , #017de9);
+  overflow: hidden;        /* clip the animated stripe */
+}
+&.ant-btn-default:not(:disabled):hover {
+  color: white;
+  border-color: #40a9ff;
+}
+&.ant-btn-default:not(.ant-btn-link)::before {
+  content: '';
+  color: white;
+  position: absolute;
+  top: 0;
+  left: -100%;
+  width: 100%;
+  height: 100%;
+  background: linear-gradient(
+    90deg,
+    transparent 0%,
+    rgba(255,255,255,0.4) 50%,
+    transparent 100%
+  );
+  transform: skewX(0);
+}
+
+&.ant-btn-default:not(.ant-btn-link):hover::before {
+  animation: light-sweep 1.5s forwards;
+}
+
+@keyframes light-sweep {
+  to {
+    left: 100%;
+  }
+}

src/settings/componentSetting.ts

@@ -18,11 +18,11 @@ export default {
       totalField: 'total',
     },
     // 可选的分页选项
-    pageSizeOptions: ['10', '50', '80', '100'],
+    pageSizeOptions: ['15', '50', '80', '100'],
     // 表格默认尺寸
     defaultSize: 'middle',
     //默认每页显示多少条
-    defaultPageSize: 10,
+    defaultPageSize: 15,
     // 默认排序方法
     defaultSortFn: (sortInfo: SorterResult) => {
       //update-begin-author:taoyan date:2022-10-21 for: VUEN-2199【表单设计器】多字段排序

src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue

@@ -24,7 +24,7 @@
     </div>
     <a-row>
       <a-col :span="6" v-for="(item,index) in dataList" :key="index" style="padding: 5px 10px 0 0;height: 240px;">
-        <a-row style="padding: 5px;background-color: white;border-radius: 5px;height: 220px;">
+        <a-row style="padding: 5px;background-color: white;border-radius: 8px;height: 220px;">
           <a-col :span="4">
             <div class="bjclass">
               <img :src="handleHeadPath(item.headPath)" style="width: 40px;height:40px;margin-top: 10px;"  @error="setDefaultImage"/>
@@ -62,47 +62,6 @@
           </a-col>
         </a-row>
       </a-col>
-
-      <!-- <a-col :span="6" v-for="(item,index) in dataList" :key="index">
-        <a-card :title="item.name +'/'+item.sex_dictText" class="cardClass">
-          <template #extra><a title="操作">
-            <a-popover title="功能" style="width: 300px;">
-              <template #content>
-                <div>
-                  <span class="buttonMargin">
-                    <a-button type="primary" @click="handleEdit(item)">编辑</a-button>
-                  </span>
-                  <span class="buttonMargin">
-                    <a-button type="primary" @click="handleFwbq(item)">服务标签</a-button>
-                  </span>
-                  <span class="buttonMargin">
-                    <a-button type="primary" @click="handleFpzh(item)">分配账号</a-button>
-                  </span>
-                </div>
-              </template>
-              <icon icon="ant-design:setting-outlined" />
-            </a-popover>
-            </a></template>
-            <a-row>
-              <a-col :span="8" style="padding: 0 8px;">
-                <img
-                  width="100%"
-                  :src="handleHeadPath(item.headPath)"
-                  @error="setDefaultImage"
-                />
-              </a-col>
-              <a-col :span="16">
-                <p>入职日期: {{item.entryTime}}</p>
-                <p>身份证号: {{item.idCard}}</p>
-                <p>联系电话: {{item.tel}}</p>
-                <p>出生日期: {{item.dateOfBirth}}</p>
-              </a-col>
-            </a-row>
-        </a-card>
-      </a-col> -->
-      <!-- <a-col :span="24" style="text-align: right;">
-        <a-pagination v-model:current="current" v-model:page-size="pageSize" :total="total" show-less-items @change="onPageChange" />
-      </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;">
@@ -310,7 +269,7 @@ function onPageChange(page,pageSize){
   .cardClass{
     margin: 5px;
     // 添加向右下的阴影效果
-    border-radius: 5px;
+    border-radius: 8px;
     transition: box-shadow 0.3s ease-in-out;
     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04);
 

src/views/biz/bizEmployeesInfo/employeesServiceTag/EmployeesServiceTagForm.vue

@@ -73,6 +73,7 @@ import { defHttp } from '/@/utils/http/axios';
   const employeesDataSource = ref<any[]>([]);
   const tagsDetailData = ref<any[]>([]);
   const employeesInfo = reactive<any>({});
+  const emit = defineEmits(['register', 'ok']);
   //注册model
   const [registerModal, {openModal}] = useModal();
   //注册table数据
@@ -191,11 +192,15 @@ import { defHttp } from '/@/utils/http/axios';
 	  reload();
     getEmployessServiceTagsList();
    }
+   function submitForm(){
+          emit('ok');
+   }
 
 
 
   defineExpose({
     init,
+    submitForm
   });
 </script>
 

src/views/biz/nuBizCustomerInfo/NuBizCustomerInfoList.vue

@@ -30,7 +30,7 @@
 
     <a-row>
       <a-col :span="6" v-for="(item,index) in dataList" :key="index" style="padding: 5px 10px 0 0;height: 240px;">
-        <a-row style="padding: 5px;background-color: white;border-radius: 5px;height: 220px;">
+        <a-row style="padding: 5px;background-color: white;border-radius: 8px;height: 220px;">
           <a-col :span="4">
             <div class="bjclass">
               <img :src="handleHeadPath(item.headPath)" style="width: 40px;height:40px;margin-top: 10px;" />
@@ -297,7 +297,7 @@
   .cardClass{
     margin: 5px;
     // 添加向右下的阴影效果
-    border-radius: 5px;
+    border-radius: 8px;
     transition: box-shadow 0.3s ease-in-out;
     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04);
 

src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.data.ts

@@ -55,18 +55,18 @@ export const columns: BasicColumn[] = [
     align: "center",
     dataIndex: 'medicationId_dictText'
   },
-  {
+  // {
-    title: '物料图片',
+  //   title: '物料图片',
-    align: "center",
+  //   align: "center",
-    dataIndex: 'materialImg',
+  //   dataIndex: 'materialImg',
-    customRender: render.renderImage,
+  //   customRender: render.renderImage,
-  },
+  // },
-  {
+  // {
-    title: '物料标识',
+  //   title: '物料标识',
-    align: "center",
+  //   align: "center",
-    dataIndex: 'materialIdent',
+  //   dataIndex: 'materialIdent',
-    customRender: render.renderImage,
+  //   customRender: render.renderImage,
-  },
+  // },
   {
     title: '是否启用',
     align: "center",

src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue

@@ -74,7 +74,7 @@
               <a-menu
                   v-model:openKeys="openKeys"
                   v-model:selectedKeys="selectedKeys"
-                  style="height:720px;overflow-y:auto;overflow-x: hidden;"
+                  style="height:700px;overflow-y:auto;overflow-x: hidden;"
                   mode="inline"
                 >
                 <template v-for="(item2,key2) in treeChildData" >
@@ -84,7 +84,7 @@
                         <span><img src="/src/assets/images/logo.png" /></span><span style="margin-left: 10px;">{{item2.title}}</span>
                       </div>
                     </template>
-                    <a-menu-item v-for="(item3,key3) in item2.children"  :key="key3" style="height:50px;" >
+                    <a-menu-item v-for="(item3,key3) in item2.children"  :key="key3" style="height:50px;text-align:left;" >
                       <div @click="onSelect(item3)">
                         <span style="font-size: 18px;">·</span> <span style="margin-left: 10px;">{{item3.title}}</span>
                       </div>

src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfo.data.ts

@@ -50,12 +50,12 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'wechartId'
    },
-   {
+  //  {
-    title: '资质照片',
+  //   title: '资质照片',
-    align:"center",
+  //   align:"center",
-    dataIndex: 'imgPath',
+  //   dataIndex: 'imgPath',
-    customRender:render.renderImage,
+  //   customRender:render.renderImage,
-   },
+  //  },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [

src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfoList.vue

@@ -1,5 +1,38 @@
 <template>
-  <div>
+  <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="suppliersName">
+              <template #label><span title="供应商名称">供应商名称</span></template>
+              <j-input placeholder="请输入供应商名称" v-model:value="queryParam.suppliersName" allow-clear ></j-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="personInCharge">
+              <template #label><span title="负责人">负责人</span></template>
+              <j-input placeholder="请输入负责人" v-model:value="queryParam.personInCharge" allow-clear ></j-input>
+            </a-form-item>
+          </a-col>
+            <a-col :lg="6">
+              <a-form-item name="supplyState">
+                <template #label><span title="供应状态">供应状态</span></template>
+                <j-dict-select-tag type='list' placeholder="请选择供应状态" v-model:value="queryParam.supplyState" dictCode="supply_state" allow-clear />
+              </a-form-item>
+            </a-col>
+          <a-col :lg="6" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
     <!--引用表格-->
    <BasicTable @register="registerTable">
      <!--插槽:table标题-->
@@ -32,9 +65,12 @@
   import { downloadFile } from '/@/utils/common/renderUtils';
   import { useUserStore } from '/@/store/modules/user';
   import { useDrawer } from '/@/components/Drawer';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
   const queryParam = reactive<any>({});
   const checkedKeys = ref<Array<string | number>>([]);
   const userStore = useUserStore();
+  const formRef = ref();
   //注册model
   const [registerModal, {openModal}] = useModal();
   //注册drawer
@@ -47,16 +83,6 @@
            columns,
            canResize:false,
            showIndexColumn: true,
-           formConfig: {
-              //labelWidth: 120,
-              schemas: searchFormSchema,
-              autoSubmitOnEnter:true,
-              showAdvancedButton:true,
-              fieldMapToNumber: [
-              ],
-              fieldMapToTime: [
-              ],
-            },
            actionColumn: {
                width: 160,
                fixed:'right'
@@ -77,7 +103,16 @@
   })
 
   const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
-
+const labelCol = reactive({
+    xs:24,
+    sm:6,
+    xl:6,
+    xxl:6
+  });
+  const wrapperCol = reactive({
+    xs: 24,
+    sm: 24,
+  });
   // 高级查询配置
   const superQueryConfig = reactive(superQuerySchema);
 
@@ -90,6 +125,22 @@
     });
     reload();
   }
+  
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
    /**
     * 新增事件
     */
@@ -175,6 +226,29 @@
 </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%;
+    }
+  }
   :deep(.ant-picker),:deep(.ant-input-number){
     width: 100%;
   }

src/views/services/directivePackage/DirectivePackageList.vue

@@ -10,7 +10,7 @@
               <a-input v-model:value="searchForm.packageName" allow-clear />
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :lg="6" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
@@ -26,7 +26,7 @@
     </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: 5px;height: 220px;">
+        <a-row style="padding: 5px;background-color: white;border-radius: 8px;height: 220px;">
           <a-col :span="4">
             <div class="bjclass">
               <img src="/src/assets/images/logo.png" style="width: 40px;height:40px;margin-top: 10px;" />
@@ -86,17 +86,15 @@ const registerModal = ref();
 const searchForm = ref({})
 const tableData = ref({})
 const labelCol = reactive({
+    xs:24,
+    sm:6,
+    xl:6,
+    xxl:6
+  });
+  const wrapperCol = reactive({
     xs: 24,
-  sm: 4,
+    sm: 24,
-  xl: 6,
+  });
-  xxl: 6
-});
-const wrapperCol = reactive({
-  xs: 24,
-  sm: 20,
-  xl: 14,
-  xxl: 14
-});
 const pageParams = ref({ pageNo: 1, pageSize: 12 })
 
 /**

src/views/services/directivePackage/components/DirectivePackageModal.vue

@@ -6,13 +6,13 @@
     :footer-style="{ textAlign: 'right' }" @close="handleCancel">
     <div style="display:flex;justify-content:space-between">
       
-      <div style="background-color: #fafafa;border-radius: 5px;padding: 10px;width: 25vw">
+      <div style="background-color: #fafafa;border-radius: 8px;padding: 10px;width: 25vw">
         <div style="font-size: 18px;font-weight:700;padding: 15px">服务指令包详情</div>
           <DirectivePackageForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false">
           </DirectivePackageForm>
       </div>
       
-      <div style="background-color: #fafafa;border-radius: 5px;padding: 10px;width: 25vw;height: 80vh;overflow:auto;">
+      <div style="background-color: #fafafa;border-radius: 8px;padding: 10px;width: 25vw;height: 80vh;overflow:auto;">
         <div style="padding: 15px;height: 30px;width:100%;">
           <a-row>
             <a-col :span="12">
@@ -31,7 +31,7 @@
         <div style="margin-top: 15px;">
           <a-row>
             <a-col :span="22" :push="1" v-for="directive of seletedRecord.directives" :key="directive.id"
-              style="margin-top: 15px;border-radius: 5px;" @click="directiveInfo(directive)" :class="{ 'selected': selectedDirective === directive.id }">
+              style="margin-top: 15px;border-radius: 8px;" @click="directiveInfo(directive)" :class="{ 'selected': selectedDirective === directive.id }">
                 <a-card size="small">
                   <div >
                     <a-row :span="24">
@@ -69,7 +69,7 @@
       </div>
       <div>
         
-        <div style="border-radius: 5px;padding: 10px;width: 25vw;height: 80vh;overflow:auto;border: 1px solid #dcdfe6;"> 
+        <div style="border-radius: 8px;padding: 10px;width: 25vw;height: 80vh;overflow:auto;border: 1px solid #dcdfe6;"> 
           <div style="padding: 15px;height: 30px;width:100%;">
             <a-row>
               <a-col :span="24">

src/views/services/serviceDirective/ConfigServiceDirective.data.ts

@@ -92,11 +92,11 @@ export const columns: BasicColumn[] = [
     dataIndex: 'izPreferential_dictText',
     width: 100,
   },
-  {
+  // {
-    title: '收费频次',
+  //   title: '收费频次',
-    align: 'center',
+  //   align: 'center',
-    dataIndex: 'chargingFrequency_dictText',
+  //   dataIndex: 'chargingFrequency_dictText',
-  },
+  // },
   {
     title: '周期类型',
     align: 'center',

src/views/services/serviceDirective/ConfigServiceDirectiveList.vue

@@ -21,7 +21,6 @@
                 :ignoreDisabled="true" allowClear />
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">
             <a-col :lg="6">
               <a-form-item name="directiveName">
                 <template #label><span title="服务指令">服务指令</span></template>
@@ -35,7 +34,7 @@
                   :ignoreDisabled="true" placeholder="请选分类标签" allowClear />
               </a-form-item>
             </a-col>
-            <a-col :lg="6">
+            <!-- <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>
@@ -46,7 +45,7 @@
                 <template #label><span title="提成价格">提成价格</span></template>
                 <JRangeNumber v-model:value="queryParam.comPrice" class="query-group-cust"></JRangeNumber>
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :lg="6">
               <a-form-item name="izReimbursement">
                 <template #label><span title="医保报销">医保报销</span></template>
@@ -71,15 +70,14 @@
             <a-col :lg="6">
               <a-form-item name="bodyTags">
                 <template #label><span title="体型标签">体型标签</span></template>
-                <JSelectMultiple type="list" v-model:value="queryParam.bodyTags"
+                <j-dict-select-tag type='list' v-model:value="queryParam.bodyTags" :dictCode="`nu_config_body_tag,tag_name,id,del_flag = '0' order by sort asc`"
-                  :dictCode="`nu_config_body_tag,tag_name,id,del_flag = '0' order by sort asc`" :ignoreDisabled="true"
+                  :ignoreDisabled="true" placeholder="请选择体型标签" allowClear />
-                  placeholder="请选择体型标签" allowClear />
               </a-form-item>
             </a-col>
             <a-col :lg="6">
               <a-form-item name="emotionTags">
                 <template #label><span title="情绪标签">情绪标签</span></template>
-                <JSelectMultiple type="list" v-model:value="queryParam.emotionTags"
+                <j-dict-select-tag type="list" v-model:value="queryParam.emotionTags"
                   :dictCode="`nu_config_emotion_tag,tag_name,id,del_flag = '0' order by sort asc`" :ignoreDisabled="true"
                   placeholder="请选择情绪标签" allowClear />
               </a-form-item>
@@ -98,17 +96,12 @@
                   :ignoreDisabled="true" 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>
@@ -119,15 +112,15 @@
     <BasicTable @register="registerTable">
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary" v-auth="'serviceDirective:config_service_directive:add'" @click="handleCategory"
+        <a-button type="primary" class="btnPrivate" v-auth="'serviceDirective:config_service_directive:add'" @click="handleCategory"
           preIcon="tabler:settings">配置服务类别</a-button>
-        <a-button type="primary" v-auth="'serviceDirective:config_service_directive:add'" @click="handleType"
+        <a-button type="primary" class="btnPrivate" v-auth="'serviceDirective:config_service_directive:add'" @click="handleType"
           preIcon="tabler:settings">配置服务类型</a-button>
-        <a-button type="primary" v-auth="'serviceDirective:config_service_directive:add'" @click="handleBodyTag"
+        <a-button type="primary" class="btnPrivate" v-auth="'serviceDirective:config_service_directive:add'" @click="handleBodyTag"
           preIcon="tabler:settings">配置体型标签</a-button>
-        <a-button type="primary" v-auth="'serviceDirective:config_service_directive:add'" @click="handleEmotionTag"
+        <a-button type="primary" class="btnPrivate" v-auth="'serviceDirective:config_service_directive:add'" @click="handleEmotionTag"
           preIcon="tabler:settings">配置情绪标签</a-button>
-        <a-button type="primary" v-auth="'serviceDirective:config_service_directive:add'" @click="handleAdd"
+        <a-button type="primary" class="btnPrivate" 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>
@@ -248,6 +241,11 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     canResize: false,
     useSearchForm: false,
     showIndexColumn: true,
+      pagination: {
+        current: 1,
+        pageSize: 10,
+        pageSizeOptions: ['10', '20', '50', '100'],
+      },
     actionColumn: {
       width: 160,
       fixed: 'right',
@@ -511,4 +509,8 @@ audio::-webkit-media-controls-current-time-display,
 audio::-webkit-media-controls-time-remaining-display {
   display: none;
 }
+.btnPrivate{
+  height: 34px;
+  margin-left: 4px;
+}
 </style>

src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue

@@ -158,13 +158,13 @@
             <a-col :span="12">
               <a-form-item label="语音文件" v-bind="validateInfos.mp3File" id="ConfigServiceDirectiveForm-mp3File"
                 name="mp3File">
-                <j-upload v-model:value="formData.mp3File" accept=".mp3" :disabled="true" :maxCount="1"></j-upload>
+                <j-upload v-model:value="formData.mp3File" accept=".mp3" :maxCount="1"></j-upload>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="视频文件" v-bind="validateInfos.mp4File" id="ConfigServiceDirectiveForm-mp4File"
                 name="mp4File">
-                <j-upload v-model:value="formData.mp4File" accept=".mp4" :disabled="true" :maxCount="1"></j-upload>
+                <j-upload v-model:value="formData.mp4File" accept=".mp4" :maxCount="1"></j-upload>
               </a-form-item>
             </a-col>
           </a-row>

src/views/services/serviceTag/ServiceTagList.vue

@@ -24,7 +24,7 @@
     </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: 5px;height: 220px;">
+        <a-row style="padding: 5px;background-color: white;border-radius: 8px;height: 220px;">
           <a-col :span="4">
             <div class="bjclass">
               <img src="/src/assets/images/logo.png" style="width: 40px;height:40px;margin-top: 10px;" />