From cd8d5018368f739c6e63a5b16e5278033c766871 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Tue, 6 May 2025 08:58:55 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfigMaterial/ConfigMaterialInfoList.vue | 67 +++++++++++++++----
 1 file changed, 54 insertions(+), 13 deletions(-)

diff --git a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue
index f1af149..ccffc6b 100644
--- a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue
+++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue
@@ -59,16 +59,40 @@
     </div>
     <a-row>
       <a-col :span="4" style="padding: 0 10px 0 0;">
-        <div style="height:600px;background:white; ">
-
-        <a-tree
-          show-line
-          autoExpandParent
-          :tree-data="treeData"
-          @select="onSelect"
-        >
-          <template #switcherIcon="{ switcherCls }"><down-outlined :class="switcherCls" /></template>
-        </a-tree>
+        <div style="height:729px;background:white;padding: 10px; ">
+          <a-tabs v-model:activeKey="activeKey" tabPosition="left" type="card" style="height:600px;">
+            <a-tab-pane :key="key"   v-for="(item,key) in treeData">
+              <!-- 一级分类 -->
+              <template #tab>
+                <div><img src="/src/assets/images/logo.png" /></div>
+                <span title="{{item.title}}">{{item.title}}</span>
+              </template>
+              <a-menu
+                  v-model:openKeys="openKeys"
+                  v-model:selectedKeys="selectedKeys"
+                  style="height:690px;overflow:auto;"
+                  mode="inline"
+                >
+                <template v-for="(item2,key2) in item.children" >
+                  <a-sub-menu v-if="item2.children.length>0" :key="`sub`+key2" style="background-image: url('/src/assets/images/bj.png');text-align:center;border-radius:5px;">
+                    <template #title>
+                      <div>
+                        <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;" >
+                      <div @click="onSelect(item3)"><span style="font-size: 18px;">·</span> <span style="margin-left: 10px;">{{item3.title}}</span></div>
+                    </a-menu-item>
+                  </a-sub-menu>
+                  <a-menu-item v-if="item2.children.length==0" :key="`sub`+key2" style="background-image: url('/src/assets/images/bj.png');text-align:center;border-radius:5px;">
+                      <div @click="onSelect(item2)">
+                        <span><img src="/src/assets/images/logo.png" /></span><span style="margin-left: 10px;">{{item2.title}}</span>
+                      </div>
+                  </a-menu-item>
+                </template>
+              </a-menu>
+            </a-tab-pane>
+          </a-tabs>
         </div>
       </a-col>
       <a-col :span="20">
@@ -111,6 +135,7 @@
   import type { TreeProps } from 'ant-design-vue';
   import { DownOutlined } from '@ant-design/icons-vue';
 import { defHttp } from '/@/utils/http/axios';
+import type { CollapseProps } from 'ant-design-vue';
 
   const formRef = ref();
   const queryParam = reactive<any>({});
@@ -118,6 +143,11 @@ import { defHttp } from '/@/utils/http/axios';
   const registerModal = ref();
   const userStore = useUserStore();
   let treeData = ref<any>([]);
+  const activeKey =  ref(0);
+  const activeKey2 =  ref(0);
+  const rootSubmenuKeys= ['sub1']
+  const openKeys= []
+  const selectedKeys= []
   //注册table数据
   const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     tableProps: {
@@ -157,9 +187,20 @@ import { defHttp } from '/@/utils/http/axios';
     sm: 20,
   });
 
-  function onSelect(ids, e) {
-    let id = ids[0];
-    queryParam.treeId =id;
+  function onOpenChange  (openKeys: string[]){
+      const latestOpenKey = openKeys.find(key => openKeys.indexOf(key) === -1);
+      if (rootSubmenuKeys.indexOf(latestOpenKey!) === -1) {
+        openKeys = openKeys;
+      } else {
+        openKeys = latestOpenKey ? [latestOpenKey] : [];
+      }
+    };
+
+  function onSelect({ key, domEvent }) {
+    // console.log(ids);
+    // console.log(e);
+    // let id = ids[0];
+    queryParam.treeId =key;
     reload();
   }
   /**

From 4dd33cd28a9caba9c0ac5a7398e1e19ed0d9263e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Tue, 6 May 2025 11:06:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=90=8C=E6=AD=A5tplink=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=B8=8E=E8=BF=90=E7=BB=B4=E4=BB=A3=E7=A0=81=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/iot/tplink/project/ProjectInfo.data.ts          | 4 ++--
 src/views/iot/tplink/region/RegionInfo.api.ts             | 2 +-
 src/views/iot/tplink/region/components/RegionForm.vue     | 8 ++++----
 .../iot/tplink/region/components/RegionInfoDrawer.vue     | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/iot/tplink/project/ProjectInfo.data.ts b/src/views/iot/tplink/project/ProjectInfo.data.ts
index b4cb545..f837301 100644
--- a/src/views/iot/tplink/project/ProjectInfo.data.ts
+++ b/src/views/iot/tplink/project/ProjectInfo.data.ts
@@ -59,7 +59,7 @@ export const searchFormSchema: FormSchema[] = [
     field: 'institutionId',
     component: 'JDictSelectTag',
     componentProps: {
-      dictCode: 'nu_admin_institution_area,inst_name,id,org_category = 1 order by inst_name asc',
+      dictCode: 'sys_depart,depart_name,id,org_category = 1 order by depart_name asc',
       placeholder: '请选择机构',
     },
   },
@@ -107,7 +107,7 @@ export const formSchema: FormSchema[] = [
     field: 'institutionId',
     component: 'JDictSelectTag',
     componentProps: {
-      dictCode: 'nu_admin_institution_area,inst_name,id,org_category = 1 order by inst_name asc',
+      dictCode: 'sys_depart,depart_name,id,org_category = 1 order by depart_name asc',
       placeholder: '请选择机构',
     },
   },
diff --git a/src/views/iot/tplink/region/RegionInfo.api.ts b/src/views/iot/tplink/region/RegionInfo.api.ts
index 5c1eac3..dd74287 100644
--- a/src/views/iot/tplink/region/RegionInfo.api.ts
+++ b/src/views/iot/tplink/region/RegionInfo.api.ts
@@ -11,7 +11,7 @@ enum Api {
   add = '/iot/regionInfo/add',
   edit = '/iot/regionInfo/edit',
   delete = '/iot/regionInfo/delete',
-  queryChildrenByParentId = '/admin/institutionArea/queryChildrenByParentId',
+  queryChildrenByParentId = '/sys/sysDepart/queryChildrenByParentId',
 }
 
 
diff --git a/src/views/iot/tplink/region/components/RegionForm.vue b/src/views/iot/tplink/region/components/RegionForm.vue
index c80be9c..a4c3c9a 100644
--- a/src/views/iot/tplink/region/components/RegionForm.vue
+++ b/src/views/iot/tplink/region/components/RegionForm.vue
@@ -5,8 +5,8 @@
         <a-select v-model:value="model[field]" @change="(value,option) => handleChange(value,option,model)">
           <a-select-option :value="null">请选择…</a-select-option>
           <template v-for="item in areaOptions" :key="`${item.id}`">
-            <a-select-option :value="item.id" :label="item.instName">
-              {{item.instName}}
+            <a-select-option :value="item.id" :label="item.departName">
+              {{item.departName}}
             </a-select-option>
           </template>
         </a-select>
@@ -103,9 +103,9 @@
 
   async function handleChange(value,option:Option,formData){
     if(value == null){
-      formData["regionName"] = model.value["regionName"];
+      formData["departName"] = model.value["departName"];
     }else{
-      formData["regionName"] = option.label;
+      formData["departName"] = option.label;
     }
   }
 
diff --git a/src/views/iot/tplink/region/components/RegionInfoDrawer.vue b/src/views/iot/tplink/region/components/RegionInfoDrawer.vue
index 78931b2..4e264fb 100644
--- a/src/views/iot/tplink/region/components/RegionInfoDrawer.vue
+++ b/src/views/iot/tplink/region/components/RegionInfoDrawer.vue
@@ -12,8 +12,8 @@
       <template #areaSelect ="{model,field}">
         <a-select v-model:value="model[field]" @change="(value,option) => handleChange(value,option,model)">
           <template v-for="item in areaOptions" :key="`${item.id}`">
-            <a-select-option :value="item.id" :label="item.instName">
-              {{item.instName}}
+            <a-select-option :value="item.id" :label="item.departName">
+              {{item.departName}}
             </a-select-option>
           </template>
         </a-select>
@@ -98,9 +98,9 @@ const fetchArea = async (institutionId) => {
 
 async function handleChange(value,option:Option,formData){
   if(value == null){
-    formData["regionName"] = "";
+    formData["departName"] = "";
   }else{
-    formData["regionName"] = option.label;
+    formData["departName"] = option.label;
   }
 }
 

From e84ffc1fcca67b0b20ad97652b63517d3eac356b Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 7 May 2025 14:04:02 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Table/src/BasicTable.vue       |   6 +-
 .../src/components/settings/ColumnSetting.vue |   2 +-
 .../bizEmployeesInfo/BizEmployeesInfoList.vue |  84 +++++++++-
 .../NuBizCustomerInfoList.vue                 | 157 ++++++++++--------
 .../ConfigMaterial/ConfigMaterialInfoList.vue |   6 +-
 .../directivePackage/DirectivePackageList.vue |  74 ++++++++-
 .../services/serviceTag/ServiceTagList.vue    |  80 +++++----
 7 files changed, 286 insertions(+), 123 deletions(-)

diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue
index 12380db..3c6c9af 100644
--- a/src/components/Table/src/BasicTable.vue
+++ b/src/components/Table/src/BasicTable.vue
@@ -501,10 +501,10 @@
       padding: 10px;
 
       .ant-form {
-        padding: 12px 10px 6px 10px;
+        padding: 24px 10px 0px 10px;
         margin-bottom: 8px;
         background-color: @component-background;
-        border-radius: 2px;
+        border-radius: 5px;
       }
     }
 
@@ -523,7 +523,7 @@
     .ant-table-wrapper {
       padding: 6px;
       background-color: @component-background;
-      border-radius: 2px;
+      border-radius: 5px;
 
       .ant-table-title {
         min-height: 40px;
diff --git a/src/components/Table/src/components/settings/ColumnSetting.vue b/src/components/Table/src/components/settings/ColumnSetting.vue
index 92dcd61..fa3f05e 100644
--- a/src/components/Table/src/components/settings/ColumnSetting.vue
+++ b/src/components/Table/src/components/settings/ColumnSetting.vue
@@ -1,5 +1,5 @@
 <template>
-  <Tooltip placement="top" v-bind="getBindProps" >
+  <Tooltip placement="top" v-bind="getBindProps">
     <template #title>
       <span>{{ t('component.table.settingColumn') }}</span>
     </template>
diff --git a/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue b/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue
index 9006ae5..e8638c4 100644
--- a/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue
+++ b/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue
@@ -23,10 +23,49 @@
       </a-form>
     </div>
     <a-row>
-      <a-col :span="6" v-for="(item,index) in dataList" :key="index">
+      <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-col :span="4">
+            <div class="bjclass">
+              <img :src="handleHeadPath(item.headPath)" style="width: 40px;height:40px;margin-top: 10px;"  @error="setDefaultImage"/>
+            </div>
+          </a-col>
+          <a-col :span="20" style="padding-left: 15px;">
+            <div>
+              <span class="titleOne">
+                {{item.name}} / 
+                {{item.sex_dictText?item.sex_dictText:'无'}}
+              </span>
+            </div>
+            <div style="height: 130px">
+              <div class="center-lines">入职日期: {{item.entryTime	}}</div>
+              <div class="center-lines">身份证号: {{item.idCard	}}</div>
+              <div class="center-lines">联系电话: {{item.tel	}}</div>
+              <div class="center-lines">出生日期: {{item.dateOfBirth	}}</div>
+            </div>
+            <div style="color: #857f7f;">
+              <span style="float:left;"><Icon icon="ant-design:user-add-outlined" :size="18" /><span style="margin-left:5px;">{{ item.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;">{{ item.createTime.substring(0,10) }}</span></span>
+              <span style="margin-right: 15px;float:right;">
+                <a-dropdown :trigger="['hover']" placement="topRight">
+                <a-button type="link"><Icon icon="ant-design:more-outlined" :size="20" /></a-button>
+                <template #overlay>
+                  <a-menu>
+                    <a-menu-item @click="handleEdit(item)">编辑</a-menu-item>
+                    <a-menu-item @click="handleFwbq(item)">服务标签</a-menu-item>
+                    <a-menu-item @click="handleFpzh(item)">分配账号</a-menu-item>
+                  </a-menu>
+                </template>
+              </a-dropdown>
+                </span>
+            </div>
+          </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>
@@ -43,9 +82,7 @@
               </template>
               <icon icon="ant-design:setting-outlined" />
             </a-popover>
-            
             </a></template>
-            <!-- 人员信息 -->
             <a-row>
               <a-col :span="8" style="padding: 0 8px;">
                 <img
@@ -62,12 +99,17 @@
               </a-col>
             </a-row>
         </a-card>
-      </a-col>
-      <a-col :span="24" style="text-align: right;">
+      </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-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;">
+      <span style="margin-right: 10px;">共 {{ total }} 条数据</span>
+      <Pagination showLessItems v-model:current="current" :pageSize="pageSize" size="small"
+        show-quick-jumper :total="total" @change="onPageChange" />
+    </div>
 
 
     <!-- 表单区域 -->
@@ -103,7 +145,7 @@
   const registerServiceTagModal = ref();
   const dataList = ref<any[]>([]);
   const current = ref(1);
-  const pageSize = ref(8);
+  const pageSize = ref(12);
   const total = ref(0);
 
   const labelCol = reactive({
@@ -276,4 +318,30 @@ function onPageChange(page,pageSize){
   .buttonMargin{
     margin: 3px;
   }
+  .bjclass{
+  text-align: center;
+  margin-top: 16px;
+  border-radius: 50%;
+  width: 60px;
+  height: 60px;
+  background: linear-gradient(to bottom, #fff, #efe9e9);
+}
+.titleOne {
+  font-size: 16px;
+  font-weight: 600;
+  height: 40px;
+  line-height: 40px;
+  margin-bottom: 10px;
+}
+.ellipsis-two-lines {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2; /* 限制文本为2行 */
+  overflow: hidden;
+  text-overflow: ellipsis;
+  line-height:24px;color: #5a5a5a;
+}
+.center-lines {
+  line-height:24px;color: #5a5a5a;
+}
 </style>
diff --git a/src/views/biz/nuBizCustomerInfo/NuBizCustomerInfoList.vue b/src/views/biz/nuBizCustomerInfo/NuBizCustomerInfoList.vue
index 60eb892..4a3f962 100644
--- a/src/views/biz/nuBizCustomerInfo/NuBizCustomerInfoList.vue
+++ b/src/views/biz/nuBizCustomerInfo/NuBizCustomerInfoList.vue
@@ -27,66 +27,61 @@
         </a-row>
       </a-form>
     </div>
+
     <a-row>
-      <a-col :span="6" v-for="(item,index) in dataList" :key="index">
-        <a-card class="cardClass">
-          <template #title>
-            {{item.customerName}} / 
-            {{item.customerSex_dictText?item.customerSex_dictText:'无'}} / 
-            <span v-if="item.currentState=='0'" style="color: #1890ff">{{item.currentState_dictText}}</span> 
-            <span v-if="item.currentState=='1'" style="color: green">{{item.currentState_dictText}}</span> 
-            <span v-if="item.currentState=='2'" style="color: #ff6c00">{{item.currentState_dictText}}</span> 
-            <span v-if="item.currentState=='3'" style="color: red">{{item.currentState_dictText}}</span> 
-          </template>
-          <template #extra><a title="操作">
-            
-            <a-popover title="功能" style="width: 300px;" placement="topRight">
-              <template #content>
-                <div>
-                  <span class="buttonMargin">
-                    <a-button type="primary" @click="handleEdit(item)">编辑</a-button>
-                  </span>
-                  <span class="buttonMargin" v-if="item.currentState!='3'">
-                    <a-button type="primary" @click="handleCheckNu(item)">更换护理单元</a-button>
-                  </span>
-                  <span class="buttonMargin" v-if="item.currentState=='1'">
-                    <a-button type="primary" @click="handleWaichu(item)">外出</a-button>
-                  </span>
-                  <span class="buttonMargin" v-if="item.currentState=='2'">
-                    <a-button type="primary" @click="handleFanhui(item)">返回</a-button>
-                  </span>
-                  <span class="buttonMargin" v-if="item.currentState=='1' || item.currentState=='2'">
-                    <a-button type="primary" @click="handleTuizhu(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.nuId_dictText	}}</p>
-                <p>报销类型：{{item.reimbType_dictText	}}</p>
-                <p>医保类型：{{item.medicalType_dictText	}}</p>
-                <p>联系电话：{{item.contactNumber	}}</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 :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-col :span="4">
+            <div class="bjclass">
+              <img :src="handleHeadPath(item.headPath)" style="width: 40px;height:40px;margin-top: 10px;" />
+            </div>
+          </a-col>
+          <a-col :span="20" style="padding-left: 15px;">
+            <div>
+              <span class="titleOne">
+                {{item.customerName}} / 
+                {{item.customerSex_dictText?item.customerSex_dictText:'无'}} / 
+                <span v-if="item.currentState=='0'" style="color: #1890ff">{{item.currentState_dictText}}</span> 
+                <span v-if="item.currentState=='1'" style="color: green">{{item.currentState_dictText}}</span> 
+                <span v-if="item.currentState=='2'" style="color: #ff6c00">{{item.currentState_dictText}}</span> 
+                <span v-if="item.currentState=='3'" style="color: red">{{item.currentState_dictText}}</span>
+              </span>
+            </div>
+            <div style="height: 130px">
+              <div class="center-lines">护理单元：{{item.nuId_dictText	}}</div>
+              <div class="center-lines">报销类型：{{item.reimbType_dictText	}}</div>
+              <div class="center-lines">医保类型：{{item.medicalType_dictText	}}</div>
+              <div class="center-lines">联系电话：{{item.contactNumber	}}</div>
+            </div>
+            <div style="color: #857f7f;">
+              <span style="float:left;"><Icon icon="ant-design:user-add-outlined" :size="18" /><span style="margin-left:5px;">{{ item.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;">{{ item.createTime.substring(0,10) }}</span></span>
+              <span style="margin-right: 15px;float:right;">
+                <a-dropdown :trigger="['hover']" placement="topRight">
+                <a-button type="link"><Icon icon="ant-design:more-outlined" :size="20" /></a-button>
+                <template #overlay>
+                  <a-menu>
+                    <a-menu-item @click="handleEdit(item)">编辑</a-menu-item>
+                    <a-menu-item @click="handleCheckNu(item)" v-if="item.currentState!='3'">更换护理单元</a-menu-item>
+                    <a-menu-item @click="handleWaichu(item)" v-if="item.currentState=='1'">外出</a-menu-item>
+                    <a-menu-item @click="handleFanhui(item)" v-if="item.currentState=='2'">返回</a-menu-item>
+                    <a-menu-item @click="handleTuizhu(item)" v-if="item.currentState=='1' || item.currentState=='2'">退住</a-menu-item>
+                  </a-menu>
+                </template>
+              </a-dropdown>
+                </span>
+            </div>
+          </a-col>
+        </a-row>
       </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;">
+      <span style="margin-right: 10px;">共 {{ total }} 条数据</span>
+      <Pagination showLessItems v-model:current="current" :pageSize="pageSize" size="small"
+        show-quick-jumper :total="total" @change="onPageChange" />
+    </div>
     <!-- 表单区域 -->
     <NuBizCustomerInfoModal ref="registerModal" @success="handleSuccess"></NuBizCustomerInfoModal>
     <CheckNuListModal ref="checkNuListModal" @success="handleSuccess"></CheckNuListModal>
@@ -114,7 +109,7 @@
   const userStore = useUserStore();
   const dataList = ref<any[]>([]);
   const current = ref(1);
-  const pageSize = ref(8);
+  const pageSize = ref(12);
   const total = ref(0);
   const labelCol = reactive({
     xs:24,
@@ -226,21 +221,6 @@
     ];
   }
    
-  /**
-   * 下拉操作栏
-   */
-  function getDropDownAction(record) {
-    return [ {
-        label: '删除',
-        popConfirm: {
-          title: '是否确认删除',
-          confirm: handleDelete.bind(null, record),
-          placement: 'topLeft',
-        },
-        auth: 'nuBizCustomerInfo:nu_biz_customer_info:delete'
-      }
-    ]
-  }
 
   /**
    * 查询
@@ -258,12 +238,17 @@
     reload();
   }
   
-
+  /**
+   * 分页
+   */
   function onPageChange(page,pageSize){
     console.log('onPageChange', page,pageSize);
     current.value = page;
     reload();
   }
+  /**
+   * 加载数据
+   */
   function reload(){
     queryParam.pageSize = pageSize;
     queryParam.pageNo = current;
@@ -320,4 +305,30 @@
   .buttonMargin{
     margin: 3px;
   }
+  .bjclass{
+  text-align: center;
+  margin-top: 16px;
+  border-radius: 50%;
+  width: 60px;
+  height: 60px;
+  background: linear-gradient(to bottom, #fff, #efe9e9);
+}
+.titleOne {
+  font-size: 16px;
+  font-weight: 600;
+  height: 40px;
+  line-height: 40px;
+  margin-bottom: 10px;
+}
+.ellipsis-two-lines {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2; /* 限制文本为2行 */
+  overflow: hidden;
+  text-overflow: ellipsis;
+  line-height:24px;color: #5a5a5a;
+}
+.center-lines {
+  line-height:24px;color: #5a5a5a;
+}
 </style>
diff --git a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue
index ccffc6b..a7ef040 100644
--- a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue
+++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue
@@ -58,8 +58,8 @@
       </a-form>
     </div>
     <a-row>
-      <a-col :span="4" style="padding: 0 10px 0 0;">
-        <div style="height:729px;background:white;padding: 10px; ">
+      <a-col :span="6" style="padding: 0 10px 0 0;">
+        <div style="height:729px;background:white;padding: 10px;border-radius: 5px; ">
           <a-tabs v-model:activeKey="activeKey" tabPosition="left" type="card" style="height:600px;">
             <a-tab-pane :key="key"   v-for="(item,key) in treeData">
               <!-- 一级分类 -->
@@ -95,7 +95,7 @@
           </a-tabs>
         </div>
       </a-col>
-      <a-col :span="20">
+      <a-col :span="18" >
         <!--引用表格-->
         <BasicTable @register="registerTable" >
           <!--插槽:table标题-->
diff --git a/src/views/services/directivePackage/DirectivePackageList.vue b/src/views/services/directivePackage/DirectivePackageList.vue
index 848fcd6..8c9bd8f 100644
--- a/src/views/services/directivePackage/DirectivePackageList.vue
+++ b/src/views/services/directivePackage/DirectivePackageList.vue
@@ -25,9 +25,49 @@
       </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: 5px;height: 220px;">
+          <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;">
+            <div>
+              <span class="titleOne">{{ directive.packageName }}</span>
+            </div>
+            <div style="height: 130px">
+              <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;">
+                <a-dropdown :trigger="['hover']" placement="topRight">
+                <a-button type="link"><Icon icon="ant-design:more-outlined" :size="20" /></a-button>
+                <template #overlay>
+                  <a-menu>
+                    <a-menu-item @click="packageEdit(directive)">
+                      <template #icon></template>
+                      编辑
+                    </a-menu-item>
+                    <a-menu-item>
+                      <a-popconfirm title="是否确认删除？" ok-text="确认" cancel-text="取消" @confirm="remove(directive)">
+                        删除
+                      </a-popconfirm>
+                    </a-menu-item>
+                  </a-menu>
+                </template>
+              </a-dropdown>
+                </span>
+            </div>
+          </a-col>
+        </a-row>
+      </a-col>
+    </a-row>
+    <!-- <a-row>
       <a-col :span="6" v-for="directive of tableData.records" :key="directive.id">
         <a-card :bordered="false" style="margin: 5px;">
-          <!-- 自定义标题区域 -->
           <template #title>
             <div style="display: flex; align-items: center; justify-content: space-between;">
               <span>{{ directive.packageName }}</span>
@@ -50,7 +90,6 @@
             </div>
           </template>
 
-          <!-- 保持原有内容区域 -->
           <div style="position: relative; height: 23vh;">
             <div
               style="height: 80%; overflow-y: auto; line-height: 1.5;white-space: pre-line;word-wrap: break-word;overflow-wrap: break-word;">
@@ -63,9 +102,9 @@
           </div>
         </a-card>
       </a-col>
-    </a-row>
+    </a-row> -->
     <div
-      style="position: fixed;right: 20px;bottom: 20px;z-index: 999;padding: 8px 16px;border-radius: 4px;display: flex;align-items: center;">
+      style="text-align:right;right: 20px;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,7 +135,7 @@ const wrapperCol = reactive({
   xl: 14,
   xxl: 14
 });
-const pageParams = ref({ pageNo: 1, pageSize: 8 })
+const pageParams = ref({ pageNo: 1, pageSize: 12 })
 
 /**
  * 搜索
@@ -156,7 +195,7 @@ function remove(data) {
 }
 
 onMounted(() => {
-  queryList({ pageNo: 1, pageSize: 10 })
+  queryList({ pageNo: 1, pageSize: 12 })
 })
 </script>
 
@@ -190,4 +229,27 @@ onMounted(() => {
     width: 100%;
   }
 }
+.bjclass{
+  text-align: center;
+  margin-top: 16px;
+  border-radius: 50%;
+  width: 60px;
+  height: 60px;
+  background: linear-gradient(to bottom, #fff, #efe9e9);
+}
+.titleOne {
+  font-size: 16px;
+  font-weight: 600;
+  height: 40px;
+  line-height: 40px;
+  margin-bottom: 10px;
+}
+.ellipsis-two-lines {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2; /* 限制文本为2行 */
+  overflow: hidden;
+  text-overflow: ellipsis;
+  line-height:24px;color: #5a5a5a;
+}
 </style>
diff --git a/src/views/services/serviceTag/ServiceTagList.vue b/src/views/services/serviceTag/ServiceTagList.vue
index f701b2e..f9df74f 100644
--- a/src/views/services/serviceTag/ServiceTagList.vue
+++ b/src/views/services/serviceTag/ServiceTagList.vue
@@ -14,10 +14,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:plus-outlined" @click="handleAdd"
-                  style="margin-left: 8px">新增</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:plus-outlined" @click="handleAdd" style="margin-left: 8px">新增</a-button>
               </a-col>
             </span>
           </a-col>
@@ -25,14 +23,26 @@
       </a-form>
     </div>
     <a-row>
-      <a-col :span="6" v-for="directive of tableData.records" :key="directive.id">
-        <a-card :bordered="false" style="margin: 5px;">
-          <!-- 自定义标题区域 -->
-          <template #title>
-            <div style="display: flex; align-items: center; justify-content: space-between;">
-              <span>{{ directive.tagName }}</span>
-              <a-dropdown :trigger="['hover']" placement="bottomRight">
-                <a-button type="link" preIcon="tabler:settings"></a-button>
+      <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-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;">
+            <div>
+              <span class="titleOne">{{ directive.tagName }}</span>
+            </div>
+            <div style="height: 130px">
+              <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;">
+                <a-dropdown :trigger="['hover']" placement="topRight">
+                <a-button type="link"><Icon icon="ant-design:more-outlined" :size="20" /></a-button>
                 <template #overlay>
                   <a-menu>
                     <a-menu-item @click="tagEdit(directive)">
@@ -47,25 +57,14 @@
                   </a-menu>
                 </template>
               </a-dropdown>
+                </span>
             </div>
-          </template>
-
-          <!-- 保持原有内容区域 -->
-          <div style="position: relative; height: 11vh;">
-            <div
-              style="height: 75%; overflow-y: auto; line-height: 1.5;white-space: pre-line;word-wrap: break-word;overflow-wrap: break-word;">
-              {{ directive.description }}
-            </div>
-            <div
-              style="position: absolute;bottom: 0;right: 0;font-weight: 600;color: rgba(0, 0, 0, 0.6);padding: 8px 0 0;">
-              {{ directive.createTime }} - {{ directive.createBy_dictText }}
-            </div>
-          </div>
-        </a-card>
+          </a-col>
+        </a-row>
       </a-col>
     </a-row>
-    <div
-      style="position: fixed;right: 20px;bottom: 20px;z-index: 999;padding: 8px 16px;border-radius: 4px;display: flex;align-items: center;">
+
+    <div style="text-align:right;right: 20px;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" />
@@ -156,7 +155,7 @@ function remove(data) {
 }
 
 onMounted(() => {
-  queryList({ pageNo: 1, pageSize: 10 })
+  queryList({ pageNo: 1, pageSize: 12 })
 })
 </script>
 
@@ -190,4 +189,27 @@ onMounted(() => {
     width: 100%;
   }
 }
+.bjclass{
+  text-align: center;
+  margin-top: 16px;
+  border-radius: 50%;
+  width: 60px;
+  height: 60px;
+  background: linear-gradient(to bottom, #fff, #efe9e9);
+}
+.titleOne {
+  font-size: 16px;
+  font-weight: 600;
+  height: 40px;
+  line-height: 40px;
+  margin-bottom: 10px;
+}
+.ellipsis-two-lines {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2; /* 限制文本为2行 */
+  overflow: hidden;
+  text-overflow: ellipsis;
+  line-height:24px;color: #5a5a5a;
+}
 </style>