From a0c20212ccb0bc11c6ba6e45d8f144de0b745edb Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Mon, 26 May 2025 13:48:47 +0800
Subject: [PATCH] dev

---
 .../member/memberProfile/Exchange.vue         |   5 +-
 src/components/member/memberProfile/Grant.vue |   4 +-
 .../member/memberProfile/VipEdit.vue          |   6 +-
 src/components/settings/MemberEdit.vue        |   6 +-
 src/components/settings/SectionEdit.vue       |   6 +-
 src/components/settings/item/ItemEdit.vue     |  11 +-
 src/components/settings/item/ItemSearch.vue   |  15 +-
 .../settings/item/group/GroupAdd.vue          |   2 +-
 .../settings/item/group/GroupList.vue         |  13 +-
 src/views/inventory/goods.vue                 |  40 +---
 src/views/inventory/inventory.vue             | 194 ++++++++----------
 src/views/settings/item.vue                   |  14 +-
 src/views/settings/log.vue                    |  59 +++---
 src/views/settings/member.vue                 |  13 +-
 src/views/settings/section.vue                |  18 +-
 15 files changed, 186 insertions(+), 220 deletions(-)

diff --git a/src/components/member/memberProfile/Exchange.vue b/src/components/member/memberProfile/Exchange.vue
index d6e6c0b..7fb1500 100644
--- a/src/components/member/memberProfile/Exchange.vue
+++ b/src/components/member/memberProfile/Exchange.vue
@@ -48,8 +48,8 @@
           <el-checkbox v-model="printReceipt">同时打印凭证</el-checkbox>
         </div>
         <div style="display:flex;">
-          <div class="default-btn" @click="reduceIntegral">兑换</div>
-          <div class="default-btn" style="margin-left: 24px" @click="close">取消</div>
+          <div class="small-btn" @click="close">取消</div>
+          <div class="small-btn" @click="reduceIntegral">兑换</div>
         </div>
       </div>
     </template>
@@ -122,6 +122,7 @@ const reduceIntegral = () => {
       flex-direction: column;
       justify-content: center;
       margin-left: 16px;
+
       .name {
         font-weight: bold;
         font-size: 24px;
diff --git a/src/components/member/memberProfile/Grant.vue b/src/components/member/memberProfile/Grant.vue
index 04dc01c..7721768 100644
--- a/src/components/member/memberProfile/Grant.vue
+++ b/src/components/member/memberProfile/Grant.vue
@@ -45,8 +45,8 @@
     </template>
     <template #footer>
       <div class="footer">
-        <div class="default-btn" @click="grant()">发放</div>
-        <div class="default-btn" style="margin-left: 24px" @click="close">取消</div>
+        <div class="small-btn" @click="close">取消</div>
+        <div class="small-btn" @click="grant()">发放</div>
       </div>
     </template>
   </Mask>
diff --git a/src/components/member/memberProfile/VipEdit.vue b/src/components/member/memberProfile/VipEdit.vue
index b2b212c..3f4aad0 100644
--- a/src/components/member/memberProfile/VipEdit.vue
+++ b/src/components/member/memberProfile/VipEdit.vue
@@ -186,10 +186,8 @@
           退出医保
         </div>
         <div class="bottom-right">
-          <el-button @click="close">取消</el-button>
-          <el-button type="primary" @click="submitForm">
-            保存
-          </el-button>
+          <span  class="default-btn" @click="close">取消</span>
+          <span class="default-btn" @click="submitForm">保存</span>
         </div>
       </div>
     </template>
diff --git a/src/components/settings/MemberEdit.vue b/src/components/settings/MemberEdit.vue
index cf00939..855cbc0 100644
--- a/src/components/settings/MemberEdit.vue
+++ b/src/components/settings/MemberEdit.vue
@@ -120,9 +120,9 @@
     </el-scrollbar>
     <template #footer>
       <div class="bottom">
-        <span class="default-btn" @click="save()">保存</span>
-        <span class="default-btn" style="margin: 0 24px">取消</span>
-        <span class="default-btn" v-if="memberInfo.id" @click="deleteDetail">删除</span>
+        <span class="small-btn" @click="save()">保存</span>
+        <span class="small-btn" @click="exit()">取消</span>
+        <span class="danger-btn" v-if="memberInfo.id" @click="deleteDetail">删除</span>
       </div>
     </template>
   </Mask>
diff --git a/src/components/settings/SectionEdit.vue b/src/components/settings/SectionEdit.vue
index 0c64d2f..335c4f2 100644
--- a/src/components/settings/SectionEdit.vue
+++ b/src/components/settings/SectionEdit.vue
@@ -115,9 +115,9 @@
     </template>
     <template #footer>
       <div class="bottom">
-        <span class="default-btn" @click="save()">保存</span>
-        <span class="default-btn" v-if="props.id" @click="deleteDetail" style="margin-left: 24px">删除</span>
-        <span class="default-btn" @click="exit" style="margin-left: 24px">取消</span>
+        <span class="small-btn" @click="exit">取消</span>
+        <span class="small-btn" @click="save()">保存</span>
+        <span class="danger-btn" v-if="props.id" @click="deleteDetail">删除</span>
       </div>
     </template>
   </Mask>
diff --git a/src/components/settings/item/ItemEdit.vue b/src/components/settings/item/ItemEdit.vue
index 6f19364..22d260f 100644
--- a/src/components/settings/item/ItemEdit.vue
+++ b/src/components/settings/item/ItemEdit.vue
@@ -5,10 +5,7 @@
       <el-scrollbar>
         <div style="padding: 0 24px">
           <div class="header" style="width: 100%;display: flex;justify-content: center;margin-bottom: 10px">
-            <el-button type="primary" style="margin-top:10px" round class="btn" @click="openCreateSearch"
-                       plain>
-              一键建档
-            </el-button>
+            <span style="margin-top:10px" class="btn small-btn" @click="openCreateSearch">一键建档</span>
           </div>
           <el-form :model="form" label-width="auto" :rules="formRules" ref="formRef">
             <el-descriptions
@@ -63,9 +60,9 @@
     </template>
     <template #footer>
       <div class="bottom">
-        <el-button type="primary" @click="save()">保存</el-button>
-        <el-button @click="close">取消</el-button>
-        <el-button v-if="props.id" @click="deleteDetail" type="danger">删除</el-button>
+        <span class="small-btn" @click="save()">保存</span>
+        <span class="small-btn" @click="close">取消</span>
+        <span class="danger-btn" v-if="props.id" @click="deleteDetail">删除</span>
       </div>
     </template>
   </Mask>
diff --git a/src/components/settings/item/ItemSearch.vue b/src/components/settings/item/ItemSearch.vue
index d713d90..f41c4dc 100644
--- a/src/components/settings/item/ItemSearch.vue
+++ b/src/components/settings/item/ItemSearch.vue
@@ -10,7 +10,7 @@
               placeholder="请输入药品名称或者编号"
               @keydown.enter="searchSocialItem"
               clearable/>
-          <span class="default-btn" @click="searchSocialItem">搜索</span>
+          <span class="small-btn" @click="searchSocialItem">搜索</span>
         </div>
         <div class="search_result" style="width: 100%;padding: 0 12px">
           <div class="result_table" style="width: 100%;height: 100%;box-sizing: border-box;padding-bottom: 20px">
@@ -34,8 +34,8 @@
                          v-model:current-page="searchResult.pageNum" @current-change="changePage"/>
         </div>
         <div class="btn">
-          <span class="default-btn" @click="confirm">确认</span>
-          <span class="default-btn" @click="close">关闭</span>
+          <span class="small-btn" @click="confirm">确认</span>
+          <span class="small-btn" @click="close">关闭</span>
         </div>
       </div>
     </template>
@@ -137,15 +137,15 @@ const close = () => {
   display: flex;
   margin-bottom: 24px;
 
-  span {
-    line-height: 42px;
-  }
-
   .input {
     display: block;
     flex: 1;
   }
 
+  span {
+    line-height: 1;
+  }
+
   .default-btn {
     margin-left: 24px;
   }
@@ -181,7 +181,6 @@ const close = () => {
 
 :deep(.el-input__wrapper) {
   width: 100%;
-  height: 42px;
 }
 
 .btn {
diff --git a/src/components/settings/item/group/GroupAdd.vue b/src/components/settings/item/group/GroupAdd.vue
index f365a28..c9d537d 100644
--- a/src/components/settings/item/group/GroupAdd.vue
+++ b/src/components/settings/item/group/GroupAdd.vue
@@ -76,7 +76,7 @@
           </el-table-column>
           <el-table-column label="操作" width="80">
             <template #default="scope">
-              <span @click="removeTableRow(scope.row)" class="small-btn">删除</span>
+              <span @click="removeTableRow(scope.row)" style="color: #ff0000">删除</span>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/components/settings/item/group/GroupList.vue b/src/components/settings/item/group/GroupList.vue
index 378248a..6384c03 100644
--- a/src/components/settings/item/group/GroupList.vue
+++ b/src/components/settings/item/group/GroupList.vue
@@ -24,8 +24,8 @@
             </el-table-column>
             <el-table-column label="操作">
               <template #default="scope">
-                <el-button type="primary" link @click="editGroup(scope.row)">编辑</el-button>
-                <el-button type="primary" link @click="deleteGroup(scope.row)">删除</el-button>
+                <span class="edit" @click="editGroup(scope.row)">编辑</span>
+                <span class="delete" @click="deleteGroup(scope.row)">删除</span>
               </template>
             </el-table-column>
           </el-table>
@@ -194,4 +194,13 @@ const handleCurrentChange = (val: any) => {
   align-items: center;
   padding: 0 24px;
 }
+.edit{
+  cursor: pointer;
+  color: #4d6de4;
+  margin-right: 10px
+}
+.delete{
+  cursor: pointer;
+  color: #ff0000;
+}
 </style>
diff --git a/src/views/inventory/goods.vue b/src/views/inventory/goods.vue
index 71115a8..150cda2 100644
--- a/src/views/inventory/goods.vue
+++ b/src/views/inventory/goods.vue
@@ -67,7 +67,7 @@
             <span class="iconfont icon-RectangleCopy1"></span>
             重置
           </div>
-          <div class="default-btn" @click="searchGoods" style="margin-left: 24px">
+          <div class="default-btn" @click="searchGoods">
             <span class="iconfont icon-RectangleCopy"></span>
             搜索
           </div>
@@ -81,7 +81,7 @@
       </div>
     </div>
     <div class="content_goods">
-      <el-table :data="tableData" style="height: 100%;padding: 0 24px;" @row-click="openMack"
+      <el-table :data="tableData" style="height: 100%;" @row-click="openMack"
                 :header-cell-style="{ backgroundColor: '#F1F5FB' }">
         <el-table-column fixed prop="name" label="名称" width="200" show-overflow-tooltip>
           <template #default="scope">
@@ -433,13 +433,13 @@ const props = {multiple: true}
   height: 100%;
   display: flex;
   flex-direction: column;
-
+  border-radius: 8px;
+  padding: 24px 24px 0;
   .top {
-    height: 144px;
-    padding: 24px 24px 0;
     background: #fff;
     display: flex;
     flex-direction: column;
+    margin-bottom: 24px;
 
     .search {
       display: flex;
@@ -447,21 +447,18 @@ const props = {multiple: true}
 
       .left {
         flex: 1;
+        min-width: 0;
         display: flex;
         justify-content: space-between;
-        margin-right: 24px;
-
-        .el-form-item {
-          margin-right: 5px;
-        }
       }
 
     }
 
     .addBtn {
       span {
-        display: inline-block;
-        margin-right: 24px;
+       &:first-child  {
+        margin-left: 0;
+      }
       }
     }
   }
@@ -514,24 +511,5 @@ const props = {multiple: true}
 
 .btn-group {
   display: flex;
-
-  .btn {
-    width: 120px;
-    height: 42px;
-    background: #FFFFFF;
-    border-radius: 6px;
-    border: 1px solid #979797;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    margin-left: 24px;
-    cursor: pointer;
-
-    &:hover {
-      background: #4D6DE4;
-      color: #fff;
-      border: none;
-    }
-  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/inventory/inventory.vue b/src/views/inventory/inventory.vue
index e539b57..7d5c9aa 100644
--- a/src/views/inventory/inventory.vue
+++ b/src/views/inventory/inventory.vue
@@ -78,37 +78,37 @@
       </div>
     </div>
     <div class="content_list">
-        <el-table :data="tableData" style="width: 100%;height: 100%" @row-click="open_edit"
-                  :header-cell-style="{ backgroundColor: '#F1F5FB' }">
-          <el-table-column fixed label="采购单号" show-overflow-tooltip>
-            <template #default="scope">
-              <div class="link">{{ scope.row.code }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="货单号" prop="shippingCode" show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column label="品种" prop="kindCount" show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column label="入库金额" show-overflow-tooltip>
-            <template #default="scope">
-              ￥{{ scope.row.totalPrice.toFixed(2) }}
-            </template>
-          </el-table-column>
-          <el-table-column label="采购人" prop="managerUserName" show-overflow-tooltip></el-table-column>
-          <el-table-column label="供应商" prop="supplierName" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="purchaseDate" label="采购时间" show-overflow-tooltip>
-            <template #default="scope">
-              {{ formatDate(scope.row.purchaseDate) }}
-            </template>
-          </el-table-column>
-          <!--          <el-table-column prop="createDatetime" label="入库时间">-->
-          <!--            <template #default="scope">-->
-          <!--              {{ formatDate(scope.row.purchaseDate) }}-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <el-table-column label="备注" prop="remark" show-overflow-tooltip>
-          </el-table-column>
-        </el-table>
+      <el-table :data="tableData" style="width: 100%;height: 100%" @row-click="open_edit"
+                :header-cell-style="{ backgroundColor: '#F1F5FB' }">
+        <el-table-column fixed label="采购单号" show-overflow-tooltip>
+          <template #default="scope">
+            <div class="link">{{ scope.row.code }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="货单号" prop="shippingCode" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column label="品种" prop="kindCount" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column label="入库金额" show-overflow-tooltip>
+          <template #default="scope">
+            ￥{{ scope.row.totalPrice.toFixed(2) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="采购人" prop="managerUserName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="供应商" prop="supplierName" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="purchaseDate" label="采购时间" show-overflow-tooltip>
+          <template #default="scope">
+            {{ formatDate(scope.row.purchaseDate) }}
+          </template>
+        </el-table-column>
+        <!--          <el-table-column prop="createDatetime" label="入库时间">-->
+        <!--            <template #default="scope">-->
+        <!--              {{ formatDate(scope.row.purchaseDate) }}-->
+        <!--            </template>-->
+        <!--          </el-table-column>-->
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip>
+        </el-table-column>
+      </el-table>
     </div>
     <div class="bottom">
       <div class="page_btn_list">
@@ -124,7 +124,7 @@
     </div>
     <AddOrder ref="addOrderRef" @close="closeAddOrder"/>
     <EditOrder ref="editOrderRef" @close="closeEditOrder" @updateOrderDetail="init"/>
-    <UpLoad v-model="show" @initAddOrderData =initAddOrderData></UpLoad>
+    <UpLoad v-model="show" @initAddOrderData=initAddOrderData></UpLoad>
   </div>
 </template>
 
@@ -240,37 +240,37 @@ const resetSearch = () => {
   init()
 }
 const show = ref(false)
-const openUpload= ()=>{
-  show.value=true
+const openUpload = () => {
+  show.value = true
 }
 
-const initAddOrderData = (initData:any)=>{
+const initAddOrderData = (initData: any) => {
   const data = {
-    invoiceCode:initData.tag.invoice_code,
-    shippingCode:initData.tag.shipping_code,
-    remark:initData.tag.remark,
+    invoiceCode: initData.tag.invoice_code,
+    shippingCode: initData.tag.shipping_code,
+    remark: initData.tag.remark,
     purchaseDate: initData.tag.purchase_date,
   }
   let goodsList = []
-  for (let i=0;i<initData.list.length;i++){
+  for (let i = 0; i < initData.list.length; i++) {
     let item = initData.list[i]
-    let  goodsInfo = {
-      productionBatchCode:item.info.production_batch_code,
-      wholeNumber:item.info.whole_number,
-      productionDate:item.info.production_date,
-      expiryDate:item.info.expiry_date,
-      purchaseUnitPrice:item.info.purchase_unit_price,
-      goodId:item.id,
-      name:item.goods.name,
-      packagingUnit:item.goods.packagingUnit,
-      unitPrice:item.goods.unitPrice,
+    let goodsInfo = {
+      productionBatchCode: item.info.production_batch_code,
+      wholeNumber: item.info.whole_number,
+      productionDate: item.info.production_date,
+      expiryDate: item.info.expiry_date,
+      purchaseUnitPrice: item.info.purchase_unit_price,
+      goodId: item.id,
+      name: item.goods.name,
+      packagingUnit: item.goods.packagingUnit,
+      unitPrice: item.goods.unitPrice,
     }
     goodsList.push(goodsInfo)
   }
 
 
-  nextTick(()=>{
-    addOrderRef.value?.init(data,goodsList)
+  nextTick(() => {
+    addOrderRef.value?.init(data, goodsList)
   })
 }
 </script>
@@ -279,11 +279,47 @@ const initAddOrderData = (initData:any)=>{
 
 .container-wrapper {
   box-sizing: border-box;
-  padding: 24px;
+  padding: 24px 24px 0;
   overflow: hidden;
   display: flex;
   flex-direction: column;
   height: 100%;
+  border-radius: 8px;
+
+  .top {
+    background: #fff;
+    display: flex;
+    flex-direction: column;
+
+    .search {
+      display: flex;
+      justify-content: space-between;
+
+      .left {
+        flex: 1;
+        display: flex;
+        justify-content: space-between;
+        margin-right: 24px;
+
+        .el-form-item {
+          margin-right: 5px;
+        }
+      }
+
+      .right {
+        display: flex;
+      }
+
+    }
+
+    .addBtn {
+      span {
+        &:first-child {
+          margin-left: 0;
+        }
+      }
+    }
+  }
 
   .content_list {
     width: 100%;
@@ -361,63 +397,11 @@ const initAddOrderData = (initData:any)=>{
 
 }
 
-.top {
-  height: 110px;
-  background: #fff;
-  display: flex;
-  flex-direction: column;
-
-  .search {
-    display: flex;
-    justify-content: space-between;
-
-    .left {
-      flex: 1;
-      display: flex;
-      justify-content: space-between;
-      margin-right: 24px;
-
-      .el-form-item {
-        margin-right: 5px;
-      }
-    }
-
-    .right {
-      display: flex;
-
-      .btn {
-        width: 120px;
-        height: 42px;
-        background: #FFFFFF;
-        border-radius: 6px;
-        border: 1px solid #979797;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        margin-left: 24px;
-        cursor: pointer;
-
-        &:hover {
-          background: #4D6DE4;
-          color: #fff;
-          border: none;
-        }
-      }
-    }
-
-  }
-
-  .addBtn {
-    span{
-      display: inline-block;
-      margin-right: 24px;
-    }
-  }
-}
 :deep(.el-input__wrapper) {
   height: 42px;
   width: 200px;
 }
+
 :deep(.el-range-editor.el-input__wrapper) {
   height: 42px;
 }
diff --git a/src/views/settings/item.vue b/src/views/settings/item.vue
index b273ab2..192fbd4 100644
--- a/src/views/settings/item.vue
+++ b/src/views/settings/item.vue
@@ -37,13 +37,21 @@
     </div>
     <div class="table">
       <el-scrollbar>
-        <el-table :data="tableData" @row-click="rowClick">
+        <el-table :data="tableData" @row-click="rowClick" :header-cell-style="{ backgroundColor: '#F1F5FB' }">
           <el-table-column prop="itemSocialCode" label="医保码编码" width="200"
                            show-overflow-tooltip></el-table-column>
           <el-table-column prop="itemName" label="项目名称" show-overflow-tooltip></el-table-column>
           <el-table-column prop="unit" label="单位" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="purchaseUnitPrice" label="原价" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="unitPrice" label="售价" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="purchaseUnitPrice" label="原价" show-overflow-tooltip>
+            <template #default="scope">
+              {{ scope.row.purchaseUnitPrice ? scope.row.purchaseUnitPrice + '元' : '' }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="unitPrice" label="售价" show-overflow-tooltip>
+            <template #default="scope">
+              {{ scope.row.unitPrice ? scope.row.unitPrice + '元' : '' }}
+            </template>
+          </el-table-column>
           <el-table-column prop="createDatetime" label="创建时间" show-overflow-tooltip>
             <template #default="scope">
               {{ formatDate(scope.row.createDatetime) }}
diff --git a/src/views/settings/log.vue b/src/views/settings/log.vue
index fe21471..888f758 100644
--- a/src/views/settings/log.vue
+++ b/src/views/settings/log.vue
@@ -1,35 +1,35 @@
 <template>
-  <div class="container-wrapper" style="padding: 24px">
+  <div class="container-wrapper" style="padding: 24px 24px 0">
     <div class="title">
-      <div class="left">
-        <el-form :inline="true" :model="searchModel">
-          <el-date-picker
-              v-model="selectedDate"
-              type="daterange"
-              range-separator="-"
-              @change="handleDateChange"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-          />
-          <el-input placeholder="请输入内容" v-model="searchModel.managerName" style="width: 180px;"></el-input>
-          <el-input placeholder="请输入内容" v-model="searchModel.message" style="width: 180px;"></el-input>
-          <span class="default-btn" @click="getData"><span class="iconfont icon-RectangleCopy" style="margin-right: 5px"></span>查询</span>
-        </el-form>
-      </div>
-      <div class="right">
-
-      </div>
+      <el-form :inline="true" :model="searchModel">
+        <el-date-picker
+            v-model="selectedDate"
+            type="daterange"
+            range-separator="-"
+            @change="handleDateChange"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+        />
+        <el-input placeholder="请输入内容" v-model="searchModel.managerName" style="width: 180px;"></el-input>
+        <el-input placeholder="请输入内容" v-model="searchModel.message" style="width: 180px;"></el-input>
+        <span class="default-btn" @click="getData">
+          <span class="iconfont icon-RectangleCopy"></span>
+          查询
+        </span>
+      </el-form>
     </div>
     <div class="content">
       <el-table
           :data="tableData"
           style="width: 100%;height: 100%"
+          :header-cell-style="{backgroundColor: '#F1F5FB'}"
+
       >
-        <el-table-column prop="managerName" label="用户名" width="100"></el-table-column>
-        <el-table-column prop="managerUsername" label="用户名" width="100"></el-table-column>
-        <el-table-column prop="message" label="操作" width="200"></el-table-column>
-        <el-table-column prop="createDatetime" label="时间" width="200"></el-table-column>
-        <el-table-column prop="params" label="请求参数">
+        <el-table-column prop="managerName" label="用户名" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="managerUsername" label="用户名" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="message" label="操作" width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="createDatetime" label="时间" width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="params" label="请求参数" show-overflow-tooltip>
           <template #default="scope">
             <el-input v-model="scope.row.params" class="input-with-select" disabled>
               <template #prepend>
@@ -111,18 +111,9 @@ const copy = (text: any) => {
 
   .title {
     font-size: 20px;
-    height: 60px;
-    line-height: 60px;
     background: #fff;
     font-weight: 500;
-
-    .left {
-      flex: 1;
-      display: flex;
-      justify-content: space-between;
-      margin-right: 24px;
-
-    }
+    margin-bottom: 24px;
   }
 
   .content {
diff --git a/src/views/settings/member.vue b/src/views/settings/member.vue
index f77af26..0b7d2bf 100644
--- a/src/views/settings/member.vue
+++ b/src/views/settings/member.vue
@@ -29,7 +29,10 @@
           <span class="iconfont icon-RectangleCopy1"></span>
           重置
         </span>
-        <span class="default-btn" @click="init()"><span class="iconfont icon-RectangleCopy"></span>查询</span>
+        <span class="default-btn" @click="init()">
+          <span class="iconfont icon-RectangleCopy"></span>
+          查询
+        </span>
         <span class="default-btn" @click="openDialog(null)">
           <span class="iconfont icon-jia"></span>
           新增
@@ -37,7 +40,7 @@
       </div>
     </div>
     <div class="table">
-      <el-table :data="tableData" style="width: 100%;height: 100%" @row-click="rowClick">
+      <el-table :data="tableData" style="width: 100%;height: 100%" @row-click="rowClick" :header-cell-style="{ backgroundColor: '#F1F5FB' }">
         <el-table-column prop="date" label="日期" width="180" show-overflow-tooltip>
           <template #default="scope">
             {{ formatDate(scope.row.memberInfo.createDatetime) }}
@@ -203,10 +206,4 @@ const resetSearch = () => {
 :deep(.el-select__wrapper) {
   height: 42px;
 }
-.default-btn{
-  margin-left: 5px;
-  &:first-child{
-    margin-left: 0;
-  }
-}
 </style>
\ No newline at end of file
diff --git a/src/views/settings/section.vue b/src/views/settings/section.vue
index 7e9cee7..8ed7177 100644
--- a/src/views/settings/section.vue
+++ b/src/views/settings/section.vue
@@ -33,9 +33,13 @@
       </div>
     </div>
     <div class="table">
-      <el-table :data="tableData" style="width: 100%" @row-click="rowClick">
+      <el-table :data="tableData" style="width: 100%" @row-click="rowClick" :header-cell-style="{ backgroundColor: '#F1F5FB' }">
         <el-table-column prop="name" label="科室类型" width="120" show-overflow-tooltip/>
-        <el-table-column prop="bedCnt" label="病床数量" width="80" show-overflow-tooltip/>
+        <el-table-column prop="bedCnt" label="病床数量" width="80" show-overflow-tooltip align="center">
+          <template #default="scope">
+            {{ scope.row.bedCnt?scope.row.bedCnt+'个':'' }}
+          </template>
+        </el-table-column>
         <el-table-column prop="beginDate" label="开始日期" width="120" show-overflow-tooltip/>
         <el-table-column prop="caty" label="类别" show-overflow-tooltip width="150">
           <template #default="scope">
@@ -44,17 +48,17 @@
         </el-table-column>
         <el-table-column prop="code" label="编码" width="180" show-overflow-tooltip/>
         <el-table-column prop="creationDate" label="创建日期" width="120" show-overflow-tooltip/>
-        <el-table-column prop="drPsncnt" label="医生人数" show-overflow-tooltip/>
+        <el-table-column prop="drPsncnt" label="医生人数" show-overflow-tooltip align="center"/>
         <el-table-column prop="endDate" label="结束日期" width="120" show-overflow-tooltip/>
         <el-table-column prop="info" label="信息" show-overflow-tooltip/>
         <el-table-column prop="medServScp" label="医疗服务范围" width="150" show-overflow-tooltip/>
         <el-table-column prop="memo" label="备注" show-overflow-tooltip/>
-        <el-table-column prop="nursPsncnt" label="护士人数" show-overflow-tooltip/>
-        <el-table-column prop="pharPsncnt" label="药剂师人数" width="100" show-overflow-tooltip/>
+        <el-table-column prop="nursPsncnt" label="护士人数" show-overflow-tooltip align="center"/>
+        <el-table-column prop="pharPsncnt" label="药剂师人数" width="100" show-overflow-tooltip align="center"/>
         <el-table-column prop="resperName" label="负责人姓名" width="100" show-overflow-tooltip/>
         <el-table-column prop="resperTel" label="负责人电话" width="200" show-overflow-tooltip/>
-        <el-table-column prop="socialBedCnt" label="社会病床数量" width="200" show-overflow-tooltip/>
-        <el-table-column prop="tecnPsncnt" label="技术人员人数" width="200" show-overflow-tooltip/>
+        <el-table-column prop="socialBedCnt" label="社会病床数量" width="200" show-overflow-tooltip align="center"/>
+        <el-table-column prop="tecnPsncnt" label="技术人员人数" width="200" show-overflow-tooltip align="center"/>
       </el-table>
     </div>
     <div class="bottom">