diff --git a/src/App.vue b/src/App.vue
index 9b6af76..dfa26b4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -16,7 +16,8 @@
 }
 .commonbutton {
   width: 100px;
-  color: #349d2f !important;
+  // color: #349d2f !important;
+  color: rgb(14, 194, 116)!important;
   font-weight: 700!important;
   height: 35px;
 }
diff --git a/src/assets/images/currentusers.png b/src/assets/images/currentusers.png
new file mode 100644
index 0000000..efaab6c
Binary files /dev/null and b/src/assets/images/currentusers.png differ
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 7b29a70..086635a 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -467,7 +467,7 @@
           <!--  -->
           <div class="btn">
             <img
-              src="@/assets/images/currentuser2.png"
+              src="@/assets/images/currentusers.png"
               alt=""
               class="currentuser"
             />
@@ -845,6 +845,7 @@ export default {
 .dropdownmain:hover {
   background-color: rgb(204, 249, 203);
   color: rgb(30, 150, 63);
+  /* color: #2BCA84; */
   font-weight: 700;
 }
 .titleimg :hover {
diff --git a/src/views/common-settings/ItemType.vue b/src/views/common-settings/ItemType.vue
index 39a76ac..5c76566 100644
--- a/src/views/common-settings/ItemType.vue
+++ b/src/views/common-settings/ItemType.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="box">
     <div style="width: 95%">
-      <el-card style="height: 600px">
+      <el-card style="height: 600px;border-radius: 15px" class="elcard">
         <div class="allC">
           <i
             class="el-icon-link"
@@ -164,7 +164,7 @@
     </div>
     <!-- 按钮区域 -->
     <div style="margin-left: 10px">
-      <el-button type="primary" @click="addll">新增</el-button>
+      <el-button type="" @click="addll" class="commonbutton">新增</el-button>
     </div>
   </div>
 </template>
diff --git a/src/views/common-settings/SampleGroup.vue b/src/views/common-settings/SampleGroup.vue
index cf9ab61..2c0cd52 100644
--- a/src/views/common-settings/SampleGroup.vue
+++ b/src/views/common-settings/SampleGroup.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="box">
     <div style="width: 95%">
-      <el-card style="height: 800px">
+      <el-card style="height: 800px; border-radius: 15px" class="elcard">
         <div class="publiccss">条码分组</div>
         <el-table
-          style="margin-top:20px"
+          style="margin-top: 20px"
           :data="tableData"
           width="100%"
           height="350px"
@@ -192,23 +192,23 @@
 
             <div class="Selectbutton">
               <div style="margin-top: 10px">
-                <el-button @click="addall"
+                <el-button @click="addall" class="commonbutton" 
                   >全添加<i class="el-icon-caret-right"></i
                   ><i class="el-icon-caret-right"></i
                 ></el-button>
               </div>
               <div style="margin-top: 10px">
-                <el-button @click="addobj" style="width: 111px"
+                <el-button @click="addobj" style="width: 111px" class="commonbutton" 
                   >添加<i class="el-icon-caret-right"></i>
                 </el-button>
               </div>
               <div style="margin-top: 10px">
-                <el-button @click="removeright" style="width: 111px"
+                <el-button @click="removeright" style="width: 111px"  class="commonbutton"
                   >移去<i class="el-icon-caret-left"></i>
                 </el-button>
               </div>
               <div style="margin-top: 10px">
-                <el-button @click="allclear"
+                <el-button @click="allclear" class="commonbutton"
                   >全移去<i class="el-icon-caret-left"></i
                   ><i class="el-icon-caret-left"></i>
                 </el-button>
@@ -247,26 +247,26 @@
     </div>
     <!-- 按钮区域 -->
     <div style="margin-left: 10px; margin-top: 4rem">
-      <el-button type="primary" @click="addll">新增</el-button>
+      <el-button type="" @click="addll" class="commonbutton">新增</el-button>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="editreport">编辑</el-button>
+        <el-button type="" @click="editreport" class="commonbutton">编辑</el-button>
       </div>
       <div style="margin-top: 10px">
-        <el-button type="danger" @click="deleteid">删除</el-button>
+        <el-button type="" @click="deleteid" class="commonbutton">删除</el-button>
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="topping">置顶</el-button>
+        <el-button type="" @click="topping" class="commonbutton">置顶</el-button>
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="setlow">置底</el-button>
+        <el-button type="" @click="setlow"  class="commonbutton">置底</el-button>
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" :disabled="isshow" @click="assertion"
+        <el-button type="" :disabled="isshow" @click="assertion" class="commonbutton"
           >排序</el-button
         >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" :disabled="isshow" @click="cancellation"
+        <el-button type="" :disabled="isshow" @click="cancellation" class="commonbutton"
           >取消</el-button
         >
       </div>
@@ -749,6 +749,11 @@ export default {
 };
 </script>
 <style scoped>
+::v-deep .el-table__header th {
+  /* font-size: px; */
+  background-color: rgb(245, 245, 245); /* 设置表头背景颜色 */
+  color: rgb(113, 113, 113); /* 设置表头文字颜色 */
+}
 .intermediatesubject {
   /* width: 100%; */
   display: flex;
diff --git a/src/views/fee-settings/Asbitem.vue b/src/views/fee-settings/Asbitem.vue
index 8526a1b..8122cee 100644
--- a/src/views/fee-settings/Asbitem.vue
+++ b/src/views/fee-settings/Asbitem.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="box">
     <div style="width: 95%">
-      <el-card>
+      <el-card class="elcard" style="border-radius: 15px">
         <div class="publiccss">组合项目</div>
         <el-table
           :data="tableData"
-          style="width: 100%"
+          style="width: 100%;margin-top:20px"
           row-key="id"
           height="300px"
           class="el-table__body-wrapper tbody"
@@ -395,13 +395,17 @@
               </div>
               <div>
                 <el-button
-                  type="primary"
+                  type=""
                   @click="createabulletbox"
                   style="margin-top: 50px; margin-left: 30px"
+                  class="commonbutton"
                   >创建</el-button
                 >
                 <div style="margin-top: 10px; margin-left: 30px">
-                  <el-button type="danger" @click="deleteguidelines"
+                  <el-button
+                    type=""
+                    @click="deleteguidelines"
+                    class="commonbutton"
                     >删除</el-button
                   >
                 </div>
@@ -489,26 +493,40 @@
     <!--  -->
     <!-- 按钮区域 -->
     <div style="margin-left: 10px; margin-top: 5%">
-      <el-button type="primary" @click="addll">新增</el-button>
+      <el-button type="" @click="addll" class="commonbutton">新增</el-button>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="editpopup">编辑</el-button>
+        <el-button type="" @click="editpopup" class="commonbutton"
+          >编辑</el-button
+        >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="danger" @click="deleteid">删除</el-button>
+        <el-button type="" @click="deleteid" class="commonbutton"
+          >删除</el-button
+        >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="topping">置顶</el-button>
+        <el-button type="" @click="topping" class="commonbutton"
+          >置顶</el-button
+        >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="setlow">置底</el-button>
+        <el-button type="" @click="setlow" class="commonbutton">置底</el-button>
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" :disabled="isshow" @click="assertion"
+        <el-button
+          type=""
+          :disabled="isshow"
+          @click="assertion"
+          class="commonbutton"
           >排序</el-button
         >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" :disabled="isshow" @click="cancellation"
+        <el-button
+          type=""
+          :disabled="isshow"
+          @click="cancellation"
+          class="commonbutton"
           >取消</el-button
         >
       </div>
@@ -1198,7 +1216,7 @@ export default {
     rowick(row) {
       asbitemgetid(row.id).then((res) => {
         this.curRow = { ...res.data };
-        // this.form = res.data;
+        this.form = res.data;
       });
       getapi(
         `/api/app/asbitem-detail/asbitem-detail-in-item?AsbitemId=${row.id}`
@@ -1226,6 +1244,11 @@ export default {
 };
 </script>
 <style scoped>
+::v-deep .el-table__header th {
+  /* font-size: px; */
+  background-color: rgb(245, 245, 245); /* 设置表头背景颜色 */
+  color: rgb(113, 113, 113); /* 设置表头文字颜色 */
+}
 ::v-deep .el-table td.el-table__cell,
 .el-table th.el-table__cell.is-leaf {
   padding: 0;
diff --git a/src/views/fee-settings/Diagnosis.vue b/src/views/fee-settings/Diagnosis.vue
index 9780b06..93687fa 100644
--- a/src/views/fee-settings/Diagnosis.vue
+++ b/src/views/fee-settings/Diagnosis.vue
@@ -1,12 +1,11 @@
 <template>
   <div class="box">
     <div style="width: 95%">
-      <el-card>
+      <el-card class="elcard" style="border-radius: 15px">
         <div class="publiccss">诊断</div>
         <el-table
-    
           :data="tableData"
-          style="width: 100%;margin-top:20px"
+          style="width: 100%; margin-top: 20px"
           row-key="id"
           class="el-table__body-wrapper tbody"
           @row-click="rowick"
@@ -235,26 +234,38 @@
     </div>
     <!-- 按钮区域 -->
     <div style="margin-left: 10px; margin-top: 5%">
-      <el-button type="primary" @click="add">新增</el-button>
+      <el-button type="" @click="add" class="commonbutton">新增</el-button>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="edit">编辑</el-button>
+        <el-button type="" @click="edit" class="commonbutton">编辑</el-button>
       </div>
       <div style="margin-top: 10px">
-        <el-button type="danger" @click="delets">删除</el-button>
+        <el-button type="" @click="delets" class="commonbutton">删除</el-button>
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="topping">置顶</el-button>
+        <el-button type="" @click="topping" class="commonbutton"
+          >置顶</el-button
+        >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="toppings">置底</el-button>
+        <el-button type="" @click="toppings" class="commonbutton"
+          >置底</el-button
+        >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" :disabled="isshow" @click="assertion"
+        <el-button
+          type=""
+          :disabled="isshow"
+          @click="assertion"
+          class="commonbutton"
           >排序</el-button
         >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" :disabled="isshow" @click="cancellation"
+        <el-button
+          type=""
+          :disabled="isshow"
+          @click="cancellation"
+          class="commonbutton"
           >取消</el-button
         >
       </div>
@@ -669,6 +680,11 @@ export default {
 };
 </script>
 <style scoped>
+::v-deep .el-table__header th {
+  /* font-size: px; */
+  background-color: rgb(245, 245, 245); /* 设置表头背景颜色 */
+  color: rgb(113, 113, 113); /* 设置表头文字颜色 */
+}
 .confirmcancellation {
   margin-left: 45%;
 }
diff --git a/src/views/fee-settings/DiagnosisTemplate.vue b/src/views/fee-settings/DiagnosisTemplate.vue
index 6f3a8b0..ad9ba33 100644
--- a/src/views/fee-settings/DiagnosisTemplate.vue
+++ b/src/views/fee-settings/DiagnosisTemplate.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="box">
     <div style="width: 95%">
-      <el-card>
+      <el-card class="elcard" style="border-radius: 15px">
         <div class="publiccss">诊断模板</div>
         <el-table
           :data="tableData"
-          style="width: 100%;margin-top:20px"
+          style="width: 100%; margin-top: 20px"
           row-key="id"
           class="el-table__body-wrapper tbody"
           @row-click="rowick"
@@ -166,26 +166,30 @@
     </div>
     <!-- 按钮区域 -->
     <div style="margin-left: 10px; margin-top: 3.5%">
-      <el-button type="primary" @click="add">新增</el-button>
+      <el-button type="" @click="add" class="commonbutton">新增</el-button>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="edit">编辑</el-button>
+        <el-button type="" @click="edit" class="commonbutton">编辑</el-button>
       </div>
       <div style="margin-top: 10px">
-        <el-button type="danger" @click="delets">删除</el-button>
+        <el-button type="" @click="delets" class="commonbutton">删除</el-button>
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="topping">置顶</el-button>
+        <el-button type="" @click="topping" class="commonbutton"
+          >置顶</el-button
+        >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="toppings">置底</el-button>
+        <el-button type="" @click="toppings" class="commonbutton"
+          >置底</el-button
+        >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" :disabled="isshow" @click="assertion"
+        <el-button type="" :disabled="isshow" @click="assertion" class="commonbutton"
           >排序</el-button
         >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" :disabled="isshow" @click="cancellation"
+        <el-button type="" :disabled="isshow" @click="cancellation" class="commonbutton"
           >取消</el-button
         >
       </div>
@@ -622,6 +626,11 @@ export default {
 };
 </script>
 <style scoped>
+::v-deep .el-table__header th {
+  /* font-size: px; */
+  background-color: rgb(245, 245, 245); /* 设置表头背景颜色 */
+  color: rgb(113, 113, 113); /* 设置表头文字颜色 */
+}
 .confirmcancellation {
   margin-left: 45%;
 }
diff --git a/src/views/fee-settings/Item.vue b/src/views/fee-settings/Item.vue
index d1bcf37..ed7dc6c 100644
--- a/src/views/fee-settings/Item.vue
+++ b/src/views/fee-settings/Item.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="box">
     <div style="width: 90%">
-      <el-card style="height: 600px; width: 105%">
+      <el-card style="height: 600px; width: 105%;border-radius: 15px" class="elcard">
         <div class="publiccss">项目设置</div>
         <el-row style="margin-top: 20px; margin-left: 15px">
           <el-col :span="4">
@@ -50,7 +50,7 @@
               @node-click="treeclick"
             ></el-tree>
           </div>
-          <div style="width: 85%">
+          <div style="width: 85%;margin-top:15px">
             <el-table
               :data="tableData"
               style="width: 100%"
@@ -404,49 +404,52 @@
     </el-dialog>
     <!-- 按钮区域 -->
     <div style="margin-left: 6%; margin-top: 7%">
-      <el-button type="primary" @click="add">新增</el-button>
+      <el-button type="" @click="add" class="commonbutton">新增</el-button>
       <div>
         <el-button
-          type="primary"
+          type=""
           @click="editpopup"
           style="margin-left: 0; margin-top: 10px"
+          class="commonbutton"
           >编辑</el-button
         >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="danger" @click="delsrts">删除</el-button>
+        <el-button type="" @click="delsrts" class="commonbutton">删除</el-button>
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="topping">置顶</el-button>
+        <el-button type="" @click="topping" class="commonbutton">置顶</el-button>
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="toppings">置底</el-button>
+        <el-button type="" @click="toppings" class="commonbutton">置底</el-button>
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" :disabled="isshow" @click="assertion"
+        <el-button type="" :disabled="isshow" @click="assertion"  class="commonbutton"
           >排序</el-button
         >
       </div>
       <div style="margin-top: 5px">
-        <el-button type="primary" :disabled="isshow" @click="cancellation"
+        <el-button type="" :disabled="isshow" @click="cancellation" class="commonbutton"
           >取消</el-button
         >
       </div>
-      <div style="margin-top: 5px">
+      <div style="margin-top: 10px">
         <el-button
-          type="primary"
-          size="mini"
+          type=""
+          size=""
           @click="resulttemplate"
-          style="width: 70px; height: 50px"
+          style="height: 35px;"
+          class="commonbutton"
           >结果模板</el-button
         >
       </div>
-      <div style="margin-top: 5px">
+      <div style="margin-top: 10px">
         <el-button
-          type="primary"
+          type=""
           size="mini"
           @click="referencerange"
-          style="width: 70px; height: 50px"
+           class="commonbutton"
+          style="width: 100px; "
           >参考范围</el-button
         >
       </div>
@@ -1824,6 +1827,11 @@ export default {
 };
 </script>
 <style scoped>
+::v-deep .el-table__header th {
+  /* font-size: px; */
+  background-color: rgb(245, 245, 245); /* 设置表头背景颜色 */
+  color: rgb(113, 113, 113); /* 设置表头文字颜色 */
+}
 .box {
   display: flex;
 
diff --git a/src/views/fee-settings/ItemResultTemplate.vue b/src/views/fee-settings/ItemResultTemplate.vue
index 68888c1..bb967ac 100644
--- a/src/views/fee-settings/ItemResultTemplate.vue
+++ b/src/views/fee-settings/ItemResultTemplate.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="box">
     <div style="width: 150%">
-      <el-card>
+      <el-card class="elcard" style="border-radius: 15px">
         <div class="publiccss">项目结果模板</div>
         <el-table
           :data="tableData"
diff --git a/src/views/fee-settings/PayMode.vue b/src/views/fee-settings/PayMode.vue
index 8bd616b..8cccbb8 100644
--- a/src/views/fee-settings/PayMode.vue
+++ b/src/views/fee-settings/PayMode.vue
@@ -1,18 +1,18 @@
 <template>
   <div class="box">
     <div style="width: 95%">
-      <el-card>
+      <el-card class="elcard" style="border-radius: 15px">
         <div class="publiccss">支付方式</div>
         <el-table
           :data="tableData"
-          style="width: 100%; height: 500px"
+          style="width: 100%; height: 500px;margin-top:20px"
           row-key="id"
           :height="tableHeight"
           class="el-table__body-wrapper tbody"
           @row-click="rowick"
           highlight-current-row
         >
-          <el-table-column prop="id" label="编号" width="300">
+          <el-table-column prop="id" label="编号" width="300"> 
           </el-table-column>
           <el-table-column prop="displayName" label="名称" width="300">
           </el-table-column>
@@ -63,20 +63,20 @@
     </div>
     <!--  -->
     <div style="margin-left: 10px; margin-top: 5%">
-      <el-button type="primary" @click="editpopup">编辑</el-button>
+      <el-button type="" @click="editpopup" class="commonbutton">编辑</el-button>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="topping">置顶</el-button>
+        <el-button type="" @click="topping"  class="commonbutton">置顶</el-button>
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="toppings">置底</el-button>
+        <el-button type="" @click="toppings" class="commonbutton">置底</el-button>
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" :disabled="isshow" @click="assertion"
+        <el-button type="" :disabled="isshow" @click="assertion" class="commonbutton"
           >排序</el-button
         >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" :disabled="isshow" @click="cancellation"
+        <el-button type="" :disabled="isshow" @click="cancellation"  class="commonbutton"
           >取消</el-button
         >
       </div>
@@ -244,6 +244,11 @@ export default {
 };
 </script>
 <style scoped>
+::v-deep .el-table__header th {
+  /* font-size: px; */
+  background-color: rgb(245, 245, 245); /* 设置表头背景颜色 */
+  color: rgb(113, 113, 113); /* 设置表头文字颜色 */
+}
 .box {
   display: flex;
 }
diff --git a/src/views/fee-settings/cardBill.vue b/src/views/fee-settings/cardBill.vue
index a926bb7..fa1922e 100644
--- a/src/views/fee-settings/cardBill.vue
+++ b/src/views/fee-settings/cardBill.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card>
+    <el-card class="elcard" style="border-radius: 15px">
       <div class="publiccss">会员卡记账记录</div>
       <div style="display: flex;margin-top:20px">
         <div :style="'display: block; width:' + (window.pageWidth - 120 - 80) + 'px;'">
@@ -204,6 +204,11 @@ export default {
 };
 </script>
 <style scoped>
+::v-deep .el-table__header th {
+  /* font-size: px; */
+  background-color: rgb(245, 245, 245); /* 设置表头背景颜色 */
+  color: rgb(113, 113, 113); /* 设置表头文字颜色 */
+}
 ::v-deep .el-input__inner {
   /*text-align: center;*/
   padding-left: 5px;
diff --git a/src/views/fee-settings/cardRegister.vue b/src/views/fee-settings/cardRegister.vue
index f8b139f..05e4d63 100644
--- a/src/views/fee-settings/cardRegister.vue
+++ b/src/views/fee-settings/cardRegister.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card>
+    <el-card class="elcard" style="border-radius: 15px">
       <div class="publiccss">会员卡管理</div>
       <div style="display: flex;margin-top:20px">
         <div :style="'display: block; width:' + (window.pageWidth - 120 - 80) + 'px;'">
@@ -659,6 +659,11 @@ export default {
 };
 </script>
 <style scoped>
+::v-deep .el-table__header th {
+  /* font-size: px; */
+  background-color: rgb(245, 245, 245); /* 设置表头背景颜色 */
+  color: rgb(113, 113, 113); /* 设置表头文字颜色 */
+}
 ::v-deep .el-input__inner {
   /*text-align: center;*/
   padding-left: 5px;
@@ -667,7 +672,6 @@ export default {
 ::v-deep .el-icon-date:before {
     content: ""
 }
-
 .query {
   margin-left: 10px;
 }
diff --git a/src/views/fee-settings/cardType.vue b/src/views/fee-settings/cardType.vue
index 269bd38..aeedbf4 100644
--- a/src/views/fee-settings/cardType.vue
+++ b/src/views/fee-settings/cardType.vue
@@ -1,16 +1,38 @@
 <template>
   <div>
-    <el-card>
+    <el-card class="elcard" style="border-radius: 15px">
       <div class="publiccss">会员卡类别</div>
-      <div style="display: flex;margin-top:20px">
+      <div style="display: flex; margin-top: 20px">
         <div :style="'width:' + (window.pageWidth - 120 - 80) + 'px;'">
-          <el-table :data="dataList" border width="100%" :height="window.pageHeight < 600 ? 410 : window.pageHeight - 190"
-            row-key="id" size="small" highlight-current-row ref="dataList" @selection-change="handleSelectionChange"
-            @row-click="rowClick">
-            <el-table-column prop="displayName" label="卡类别名称" width="120" />
+          <el-table
+            :data="dataList"
+            border
+            width="100%"
+            :height="window.pageHeight < 600 ? 410 : window.pageHeight - 190"
+            row-key="id"
+            size="small"
+            highlight-current-row
+            ref="dataList"
+            @selection-change="handleSelectionChange"
+            @row-click="rowClick"
+          >
+            <el-table-column
+              prop="displayName"
+              label="卡类别名称"
+              width="120"
+            />
             <el-table-column prop="cardModeId" label="卡模式" width="80">
               <template slot-scope="scope">
-                <div>{{ dddw(dict.cardMode, "id", scope.row.cardModeId, "displayName") }}</div>
+                <div>
+                  {{
+                    dddw(
+                      dict.cardMode,
+                      "id",
+                      scope.row.cardModeId,
+                      "displayName"
+                    )
+                  }}
+                </div>
               </template>
             </el-table-column>
             <el-table-column prop="discount" label="折扣率" width="90" />
@@ -24,31 +46,58 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="lastModifierName" label="修改人员" width="100" />
-            <el-table-column prop="lastModificationTime" label="修改日期" width="150">
+            <el-table-column
+              prop="lastModifierName"
+              label="修改人员"
+              width="100"
+            />
+            <el-table-column
+              prop="lastModificationTime"
+              label="修改日期"
+              width="150"
+            >
               <template slot-scope="scope">
                 <div v-if="scope.row.lastModificationTime">
-                  {{ moment(scope.row.lastModificationTime).format("yyyy-MM-DD") }}
+                  {{
+                    moment(scope.row.lastModificationTime).format("yyyy-MM-DD")
+                  }}
                 </div>
               </template>
             </el-table-column>
           </el-table>
         </div>
-        <div style="margin-left: 10px;width:110px;">
+        <div style="margin-left: 10px; width: 110px">
           <div class="listBtn">
-            <el-button type="success" class="btnClass" @click="add">新增</el-button>
+            <el-button type="success" class="btnClass" @click="add"
+              >新增</el-button
+            >
           </div>
           <div class="listBtn">
-            <el-button type="primary" class="btnClass" @click="edit">编辑</el-button>
+            <el-button type="primary" class="btnClass" @click="edit"
+              >编辑</el-button
+            >
           </div>
           <div class="listBtn">
-            <el-button type="danger" class="btnClass" @click="del">删除</el-button>
+            <el-button type="danger" class="btnClass" @click="del"
+              >删除</el-button
+            >
           </div>
         </div>
       </div>
     </el-card>
-    <el-dialog :title="form.id ? '编辑' : '新增'" :visible.sync="dialogVisible" width="800px" :close-on-click-modal="false">
-      <el-form ref="form" :model="form" label-width="100px" :rules="rules" size="small">
+    <el-dialog
+      :title="form.id ? '编辑' : '新增'"
+      :visible.sync="dialogVisible"
+      width="800px"
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        label-width="100px"
+        :rules="rules"
+        size="small"
+      >
         <el-row>
           <el-col :span="8">
             <el-form-item label="卡类别名称" prop="displayName">
@@ -57,8 +106,17 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="卡模式" prop="cardModeId">
-              <el-select v-model="form.cardModeId" placeholder="请选择" filterable >
-                <el-option v-for="item in dict.cardMode" :key="item.id" :label="item.displayName" :value="item.id" />
+              <el-select
+                v-model="form.cardModeId"
+                placeholder="请选择"
+                filterable
+              >
+                <el-option
+                  v-for="item in dict.cardMode"
+                  :key="item.id"
+                  :label="item.displayName"
+                  :value="item.id"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -73,7 +131,7 @@
             <el-form-item label="有效期(天)" prop="expiryDay">
               <el-input type="number" v-model="form.expiryDay" />
             </el-form-item>
-          </el-col>          
+          </el-col>
           <el-col :span="16">
             <el-form-item label="备注">
               <el-input v-model="form.remark" />
@@ -88,7 +146,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="创建时间" label-width="80px">
-              <el-input :value="form.creationTime ? moment(form.creationTime).format('yyyy-MM-DD') : ''" disabled></el-input>
+              <el-input
+                :value="
+                  form.creationTime
+                    ? moment(form.creationTime).format('yyyy-MM-DD')
+                    : ''
+                "
+                disabled
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -98,8 +163,14 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="修改时间" label-width="80px">
-              <el-input :value="form.lastModificationTime
-                ? moment(form.lastModificationTime).format('yyyy-MM-DD') : '' " disabled></el-input>
+              <el-input
+                :value="
+                  form.lastModificationTime
+                    ? moment(form.lastModificationTime).format('yyyy-MM-DD')
+                    : ''
+                "
+                disabled
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -115,7 +186,13 @@
 import moment from "moment";
 import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { dddw, objCopy, arrayReduce, arrayExistObj,deepCopy } from "@/utlis/proFunc";
+import {
+  dddw,
+  objCopy,
+  arrayReduce,
+  arrayExistObj,
+  deepCopy,
+} from "@/utlis/proFunc";
 
 import PatientRegisterEdit from "../../components/patientRegister/PatientRegisterEdit.vue";
 import Camera from "../../components/patientRegister/Camera.vue";
@@ -133,13 +210,13 @@ export default {
       form: {
         id: null,
         displayName: null,
-        cardModeId: '0',
+        cardModeId: "0",
         discount: 100,
         expiryDay: 3650,
         displayOrder: 0,
-        remark: '',
+        remark: "",
       },
-      formInit:{},
+      formInit: {},
       rules: {
         displayName: [
           { required: true, message: "请填写卡类别名称", trigger: "blur" },
@@ -155,12 +232,11 @@ export default {
         ],
         displayOrder: [
           { required: true, message: "请填写显示顺序", trigger: "blur" },
-        ]
+        ],
       },
 
       curChoosedRow: {}, //当前选择的行数据
-      curChoosedId:'',   //当前选中的ID
-
+      curChoosedId: "", //当前选中的ID
     };
   },
 
@@ -177,7 +253,8 @@ export default {
   },
   methods: {
     ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
-    dddw, moment,
+    dddw,
+    moment,
 
     handleSelectionChange(val) {
       this.multipleSelection = val;
@@ -189,8 +266,7 @@ export default {
     },
 
     async add() {
-      
-      objCopy(this.formInit,this.form); 
+      objCopy(this.formInit, this.form);
       this.dialogVisible = true;
     },
 
@@ -214,25 +290,26 @@ export default {
         confirmButtonText: "是",
         cancelButtonText: "否",
         type: "warning",
-      }).then(() => {
-        //console.log('{patientRegisterIds}',{patientRegisterIds})
-        return postapi(`/api/app/cardtype/delete?id=${this.curChoosedId}`);
-      }).then(res =>{
-        if(res.code != -1){
-          this.$message.success("操作成功！");
+      })
+        .then(() => {
+          //console.log('{patientRegisterIds}',{patientRegisterIds})
+          return postapi(`/api/app/cardtype/delete?id=${this.curChoosedId}`);
+        })
+        .then((res) => {
+          if (res.code != -1) {
+            this.$message.success("操作成功！");
 
-          lfind = arrayExistObj(this.dataList, 'id', this.curChoosedId);
-          if (lfind > - 1) this.dataList.splice(lfind, 1);
-          this.curChoosedId = null;
-        }
-      });     
-      
+            lfind = arrayExistObj(this.dataList, "id", this.curChoosedId);
+            if (lfind > -1) this.dataList.splice(lfind, 1);
+            this.curChoosedId = null;
+          }
+        });
     },
 
-
     //提交
     onSubmit(formName) {
-      let body={},lfind=-1;
+      let body = {},
+        lfind = -1;
       this.$refs[formName].validate((valid, fields) => {
         if (!valid) {
           //console.log('fields',fields,Object.keys(fields));
@@ -240,25 +317,27 @@ export default {
           return;
         }
 
-        body = deepCopy(this.form)
+        body = deepCopy(this.form);
         delete body.id;
         delete body.displayOrder;
 
         //编辑
         if (this.form.id) {
-          postapi(`/api/app/cardtype/update?id=${this.form.id}`,body).then(res =>{
-            if(res.code != -1){
-              this.$message.success("操作成功！");
-              lfind = arrayExistObj(this.dataList,'id',this.form.id);
-              if(lfind > -1) objCopy(this.form,this.dataList[lfind]); 
+          postapi(`/api/app/cardtype/update?id=${this.form.id}`, body).then(
+            (res) => {
+              if (res.code != -1) {
+                this.$message.success("操作成功！");
+                lfind = arrayExistObj(this.dataList, "id", this.form.id);
+                if (lfind > -1) objCopy(this.form, this.dataList[lfind]);
+              }
             }
-          });
+          );
         } else {
           //新增
-          postapi('/api/app/cardtype/create',body).then(res =>{
-            if(res.code != -1){
+          postapi("/api/app/cardtype/create", body).then((res) => {
+            if (res.code != -1) {
               this.$message.success("操作成功！");
-              objCopy(res.data,this.form);
+              objCopy(res.data, this.form);
               this.dataList.push(deepCopy(this.form));
             }
           });
@@ -267,14 +346,13 @@ export default {
     },
 
     //查询
-    query() {  
-      console.log('/api/app/cardtype/getcardtypelist')
-      getapi('/api/app/cardtype/getcardtypelist')
-        .then((res) => {
-          if(res.code != -1){
-            this.dataList = res.data;
-          }          
-        });
+    query() {
+      console.log("/api/app/cardtype/getcardtypelist");
+      getapi("/api/app/cardtype/getcardtypelist").then((res) => {
+        if (res.code != -1) {
+          this.dataList = res.data;
+        }
+      });
     },
   },
 
@@ -287,11 +365,15 @@ export default {
         this.query();
       }
     },
-
   },
 };
 </script>
 <style scoped>
+::v-deep .el-table__header th {
+  /* font-size: px; */
+  background-color: rgb(245, 245, 245); /* 设置表头背景颜色 */
+  color: rgb(113, 113, 113); /* 设置表头文字颜色 */
+}
 .box {
   display: flex;
 }
diff --git a/src/views/user-list/OrganizationUnits.vue b/src/views/user-list/OrganizationUnits.vue
index e67698e..6e5e129 100644
--- a/src/views/user-list/OrganizationUnits.vue
+++ b/src/views/user-list/OrganizationUnits.vue
@@ -85,12 +85,13 @@
         <div v-if="title == 2">
           当前选中的科室<span
             style="margin-left: 20px; font-size: 18px; margin-top: -20px"
-            >{{ departmentname }}</span
+            >{{ departmentnames }}</span
           >
         </div>
         <div v-if="title == 2">
           <span>上级部门</span>
           <el-cascader
+            v-model="departmentname"
             ref="depref"
             @change="cascaderchang"
             :show-all-levels="false"
@@ -174,6 +175,7 @@ export default {
       parent: 1,
       treedata: [],
       departmentname: "", //科室名称
+      departmentnames: "",
     };
   },
   mounted() {
@@ -182,8 +184,8 @@ export default {
   methods: {
     cascaderchang(v) {
       console.log(this.departmentname);
-      this.departmentname = v[v.length - 1];
-      localStorage.setItem("departmentname", v[v.length - 1]);
+      this.departmentnames = v[v.length - 1];
+      // localStorage.setItem("departmentname", v[v.length - 1]);
       // console.log(v[v.length-1]);
       // v.forEach((item) => {
       //   this.departmentname = item;
@@ -372,13 +374,23 @@ export default {
     },
     //编辑组织
     rena(node, data) {
+      let a = this.$refs.tree.getNode(data.id).parent.data.displayName;
+      if (a == undefined) {
+        this.departmentname = "已是最上级";
+        console.log(this.departmentname);
+      } else {
+        this.departmentname = a;
+      }
+      // this.departmentname = a;
+      console.log(a);
       console.log(this.departmentname);
-      this.departmentname = localStorage.getItem("departmentname");
+      // this.departmentname = localStorage.getItem("departmentname");
       console.log(data, "data");
       this.dialogVisible = true;
       this.title = 2;
       console.log(this.form.isPeis);
       // this.selecttable.push(data);
+      
       this.showcheckbox = true;
       this.form = data;
       this.form.isPeis = "N";