From 1936df69b752fed698cd4f300e3413c39ed74509 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Thu, 15 May 2025 10:23:28 +0800
Subject: [PATCH 1/3] dev

---
 src/assets/scss/base.scss     |  2 +-
 src/assets/scss/main.scss     |  2 +-
 src/views/LayoutInventory.vue | 72 ++++++++++++++++++++++++-----------
 3 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/src/assets/scss/base.scss b/src/assets/scss/base.scss
index f38ba29..f5d00fd 100644
--- a/src/assets/scss/base.scss
+++ b/src/assets/scss/base.scss
@@ -17,7 +17,7 @@ $border-color-lighter: #EBEEF5;
 $border-color-extra-light: #F2F6FC;
 
 // 背景颜色
-$background-color-base: #eee;
+$background-color-base: #F1F5FB;
 $background-color-main: #4D6DE4;
 
 // 边框圆角
diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss
index 1d8e403..546feef 100644
--- a/src/assets/scss/main.scss
+++ b/src/assets/scss/main.scss
@@ -35,7 +35,7 @@ html {
 }
 
 body {
-  background-color: #EEEEEEFF;
+  background-color: base.$background-color-base;
 }
 
 .center-wrapper {
diff --git a/src/views/LayoutInventory.vue b/src/views/LayoutInventory.vue
index 8a53888..5347cd1 100644
--- a/src/views/LayoutInventory.vue
+++ b/src/views/LayoutInventory.vue
@@ -1,56 +1,82 @@
 <template>
   <div class="layout-container">
     <Header class="header"/>
-    <header>
-      <div class="center-wrapper">
-        <div class="childMenu">
-          <router-link :to="item.path" class="child-item" v-for="(item,index) in childMenuList" :key="index">
-            {{ item.name }}
-          </router-link>
+    <div class="body">
+      <header style="height: 50px">
+        <div class="center-wrapper">
+          <div class="childMenu">
+            <router-link :to="item.path" class="child-item" v-for="(item,index) in childMenuList" :key="index">
+              {{ item.name }}
+            </router-link>
+          </div>
         </div>
-      </div>
-    </header>
-    <div class="space"></div>
-    <main class="layout-main">
-      <router-view/>
-    </main>
-    <div class="space"></div>
+      </header>
+      <main class="layout-main" style="margin-top: 24px">
+        <router-view/>
+      </main>
+    </div>
     <Footer class="footer"/>
   </div>
-
 </template>
 
 <style scoped lang="scss">
+.body{
+  height: 100%;
+  padding: 24px;
+  display: flex;
+  flex-direction: column;
+}
 .childMenu {
   width: 100%;
-  height: 60px;
+  height: 50px;
   background: #fff;
   display: flex;
   align-items: center;
+  border-radius: 8px;
 
   .child-item {
+    width: 136px;
     display: inline-block;
     color: #151515;
     outline: none;
     text-decoration: none;
     font-size: 18px;
-    margin-left: 10px;
-    margin-right: 10px;
-    height: 35px;
+    height: 50px;
     position: relative;
+    line-height: 50px;
+    text-align: center;
+    &::before{
+      content: '';
+      position: absolute;
+      right: 0;
+      top:50%;
+      display: block;
+      width: 2px;
+      height: 16px;
+      background: #D8D8D8;
+      border-radius: 1px;
+      transform: translate(0 ,-50%);
+    }
+    &:last-child::before{
+      display: none;
+    }
   }
 
   .router-link-active:after {
     content: '';
     display: block;
-    width: 100%;
-    height: 2px;
-    background-color: #151515; // 下划线颜色
+    width: 80px;
+    height: 4px;
+    background-color: #4D6DE4; // 下划线颜色
     position: absolute;
-    bottom: -5px; // 调整下划线与文字的距离
-    left: 0;
+    bottom: 0; // 调整下划线与文字的距离
+    left: 50%;
+    transform: translateX(-50%);
   }
 }
+a.router-link-active.router-link-exact-active.child-item{
+  color: #4D6DE4;
+}
 </style>
 
 

From 3329690de829bc82cd6632b0ebe774da1036319d Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Thu, 15 May 2025 10:41:09 +0800
Subject: [PATCH 2/3] dev

---
 src/views/LayoutInventory.vue |   1 +
 src/views/LayoutSetting.vue   |  74 ++++++++++-----
 src/views/member/index.vue    | 165 ++++++++++++++++------------------
 3 files changed, 131 insertions(+), 109 deletions(-)

diff --git a/src/views/LayoutInventory.vue b/src/views/LayoutInventory.vue
index 5347cd1..e6083ad 100644
--- a/src/views/LayoutInventory.vue
+++ b/src/views/LayoutInventory.vue
@@ -72,6 +72,7 @@
     bottom: 0; // 调整下划线与文字的距离
     left: 50%;
     transform: translateX(-50%);
+    border-radius: 2px;
   }
 }
 a.router-link-active.router-link-exact-active.child-item{
diff --git a/src/views/LayoutSetting.vue b/src/views/LayoutSetting.vue
index 9bdecb8..54c4adc 100644
--- a/src/views/LayoutSetting.vue
+++ b/src/views/LayoutSetting.vue
@@ -1,56 +1,84 @@
 <template>
   <div class="layout-container">
     <Header class="header"/>
-    <header>
-      <div class="center-wrapper">
-        <div class="childMenu">
-          <router-link :to="item.path" class="child-item" v-for="(item,index) in childMenuList" :key="index">
-            {{ item.name }}
-          </router-link>
+    <div class="body">
+      <header style="height: 50px">
+        <div class="center-wrapper">
+          <div class="childMenu">
+            <router-link :to="item.path" class="child-item" v-for="(item,index) in childMenuList" :key="index">
+              {{ item.name }}
+            </router-link>
+          </div>
         </div>
-      </div>
-    </header>
-    <div class="space"></div>
-    <main class="layout-main">
-      <router-view/>
-    </main>
-    <div class="space"></div>
+      </header>
+      <main class="layout-main" style="margin-top: 24px">
+        <router-view/>
+      </main>
+    </div>
     <Footer class="footer"/>
   </div>
 
 </template>
 
 <style scoped lang="scss">
-
+.body{
+  height: 100%;
+  padding: 24px;
+  display: flex;
+  flex-direction: column;
+}
 .childMenu {
-  height: 60px;
+  width: 100%;
+  height: 50px;
   background: #fff;
   display: flex;
   align-items: center;
+  border-radius: 8px;
 
   .child-item {
+    width: 136px;
     display: inline-block;
     color: #151515;
     outline: none;
     text-decoration: none;
     font-size: 18px;
-    margin-left: 10px;
-    margin-right: 10px;
-    height: 35px;
+    height: 50px;
     position: relative;
+    line-height: 50px;
+    text-align: center;
+    &::before{
+      content: '';
+      position: absolute;
+      right: 0;
+      top:50%;
+      display: block;
+      width: 2px;
+      height: 16px;
+      background: #D8D8D8;
+      border-radius: 1px;
+      transform: translate(0 ,-50%);
+    }
+    &:last-child::before{
+      display: none;
+    }
   }
 
   .router-link-active:after {
     content: '';
     display: block;
-    width: 100%;
-    height: 2px;
-    background-color: #151515; // 下划线颜色
+    width: 80px;
+    height: 4px;
+    background-color: #4D6DE4; // 下划线颜色
     position: absolute;
-    bottom: -5px; // 调整下划线与文字的距离
-    left: 0;
+    bottom: 0; // 调整下划线与文字的距离
+    left: 50%;
+    transform: translateX(-50%);
+    border-radius: 2px;
   }
 }
+a.router-link-active.router-link-exact-active.child-item{
+  color: #4D6DE4;
+}
 </style>
 
 
diff --git a/src/views/member/index.vue b/src/views/member/index.vue
index b89e4e8..6258f7f 100644
--- a/src/views/member/index.vue
+++ b/src/views/member/index.vue
@@ -73,12 +73,17 @@
                   formatListTime(listItem.lastVisitTime) || "-"
                 }}
               </el-descriptions-item>
-              <el-descriptions-item label="证件类型">{{certTypeList.find((item:any)=>item.id==listItem.certType)?.name}}</el-descriptions-item>>
+              <el-descriptions-item label="证件类型">
+                {{ certTypeList.find((item: any) => item.id == listItem.certType)?.name }}
+              </el-descriptions-item>
+              >
               <el-descriptions-item label="证件号码">{{ listItem.certNo || "-" }}</el-descriptions-item>
               <el-descriptions-item label="积分"><span>{{ listItem.integralBalance }}</span>
               </el-descriptions-item>
-              <el-descriptions-item label="地址">{{ areaName}}{{areaName?'/'+listItem.address : listItem.address || "-" }}</el-descriptions-item>
-              <el-descriptions-item label="既往史" >{{ listItem.beforeMedicalHistory || "-" }}</el-descriptions-item>
+              <el-descriptions-item label="地址">
+                {{ areaName }}{{ areaName ? '/' + listItem.address : listItem.address || "-" }}
+              </el-descriptions-item>
+              <el-descriptions-item label="既往史">{{ listItem.beforeMedicalHistory || "-" }}</el-descriptions-item>
               <el-descriptions-item label="过敏史">{{ listItem.allergyHistory || "-" }}</el-descriptions-item>
               <el-descriptions-item label="备注">{{ listItem.remark || "-" }}</el-descriptions-item>
 
@@ -86,60 +91,63 @@
           </div>
         </div>
       </Panel>
-      <Panel title="消费记录" class="right-list">
-        <div class="list-content">
-          <div class="list">
-            <el-table :data="tableData" :header-cell-style="{ backgroundColor: '#F1F5FB' }" style="width: 100%"
-                      @cell-click="openDetail">
-              <el-table-column label="单号" prop="code" show-overflow-tooltip>
-              </el-table-column>
-              <el-table-column label="创建时间" prop="createDatetime">
-                <template #default="scope">
-                  {{ formatDate(scope.row.createDatetime) }}
-                </template>
-              </el-table-column>
-<!--              <el-table-column label="应收" prop="preTotalPrice" width="80">-->
-<!--                <template #default="scope">-->
-<!--                  {{ scope.row.preTotalPrice }}元-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-              <el-table-column label="实收" prop="totalPrice" width="80">
-                <template #default="scope">
-                  {{ scope.row.totalPrice }}元
-                </template>
-              </el-table-column>
-              <el-table-column label="支付方式" width="100">
-                <template #default="scope">
-                  {{ scope.row.payType ? getPayTypeStr(scope.row.payType) : "" }}
-                </template>
-              </el-table-column>
-              <el-table-column label="状态" width="100">
-                <template #default="scope">
-                  <el-tag v-if="scope.row.status==0" type="info">{{ getStatusStr(scope.row.status) }}</el-tag>
-                  <el-tag v-if="scope.row.status==1" type="success">{{ getStatusStr(scope.row.status) }}</el-tag>
-                </template>
-              </el-table-column>
-              <el-table-column label="支付时间" prop="payTime">
-                <template #default="scope">
-                  {{ formatDate(scope.row.payTime) }}
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
-          <div class="bottom">
-            <div class="page_btn_list">
-              <el-pagination
-                  background
-                  layout="prev, pager, next"
-                  :total="total"
-                  :page-size="pageSize"
-                  @current-change="handleCurrentChange"
-              >
-              </el-pagination>
+      <div class="right-list">
+        <Panel title="消费记录">
+          <div class="panel-content" style="display: flex;flex-direction: column;height: 100%;padding: 0 24px;">
+            <div class="list">
+              <el-table :data="tableData" :header-cell-style="{ backgroundColor: '#F1F5FB' }"
+                        style="width: 100%;height: 100%"
+                        @cell-click="openDetail">
+                <el-table-column label="单号" prop="code" show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column label="创建时间" prop="createDatetime">
+                  <template #default="scope">
+                    {{ formatDate(scope.row.createDatetime) }}
+                  </template>
+                </el-table-column>
+                <!--              <el-table-column label="应收" prop="preTotalPrice" width="80">-->
+                <!--                <template #default="scope">-->
+                <!--                  {{ scope.row.preTotalPrice }}元-->
+                <!--                </template>-->
+                <!--              </el-table-column>-->
+                <el-table-column label="实收" prop="totalPrice" width="80">
+                  <template #default="scope">
+                    {{ scope.row.totalPrice }}元
+                  </template>
+                </el-table-column>
+                <el-table-column label="支付方式" width="100">
+                  <template #default="scope">
+                    {{ scope.row.payType ? getPayTypeStr(scope.row.payType) : "" }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="状态" width="100">
+                  <template #default="scope">
+                    <el-tag v-if="scope.row.status==0" type="info">{{ getStatusStr(scope.row.status) }}</el-tag>
+                    <el-tag v-if="scope.row.status==1" type="success">{{ getStatusStr(scope.row.status) }}</el-tag>
+                  </template>
+                </el-table-column>
+                <el-table-column label="支付时间" prop="payTime">
+                  <template #default="scope">
+                    {{ formatDate(scope.row.payTime) }}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+            <div class="bottom">
+              <div class="page_btn_list">
+                <el-pagination
+                    background
+                    layout="prev, pager, next"
+                    :total="total"
+                    :page-size="pageSize"
+                    @current-change="handleCurrentChange"
+                >
+                </el-pagination>
+              </div>
             </div>
           </div>
-        </div>
-      </Panel>
+        </Panel>
+      </div>
     </div>
   </div>
   <VipEdit ref="refEdit" @close="init"></VipEdit>
@@ -274,7 +282,7 @@ const findAreaName = (code: string | null): string => {
   // 如果都没找到，返回原始 code
   return code;
 };
-const areaName=ref<any>('')
+const areaName = ref<any>('')
 // 点击列表中的某一项
 const btn = (item: any, i: number) => {
   index.value = i
@@ -290,8 +298,8 @@ const btn = (item: any, i: number) => {
   } catch (error) {
     areaData = null; // 或默认值
   }
-  if (areaData != null){
-    areaName.value=findAreaName(areaData[areaData?.length-1])
+  if (areaData != null) {
+    areaName.value = findAreaName(areaData[areaData?.length - 1])
   }
 
   getChargeList(listItem.value.id)
@@ -372,7 +380,7 @@ const handleCurrentChange = (val: number) => {
 };
 const levelEditRef = ref();
 const antysList = ref<any>(Object.entries(antys).map(([id, name]) => ({id, name})))
-const certTypeList=ref<any>(Object.entries(psnCertTypes).map(([id,name])=>({id,name})))
+const certTypeList = ref<any>(Object.entries(psnCertTypes).map(([id, name]) => ({id, name})))
 
 </script>
 <style scoped lang="scss">
@@ -596,34 +604,19 @@ const certTypeList=ref<any>(Object.entries(psnCertTypes).map(([id,name])=>({id,n
       display: flex;
       flex-direction: column;
       min-height: 0;
-
-      .list-content {
+      .list {
+        flex: 1;
+        min-height: 0;
+      }
+      .bottom {
+        width: 100%;
+        height: 60px;
+        background-color: #FFF;
+        box-sizing: border-box;
+        padding: 10px;
+        border-top: 1px solid #EEE;
         display: flex;
-        flex-direction: column;
-        padding: 0 24px;
-        height: 100%;
-
-        .list {
-          flex: 1;
-          display: flex;
-          flex-direction: column;
-        }
-
-        .bottom {
-          width: 100%;
-          height: 60px;
-          background-color: #FFF;
-          box-sizing: border-box;
-          padding: 10px;
-          position: relative;
-          border-top: 1px solid #EEE;
-
-          .page_btn_list {
-            position: absolute;
-            left: 0;
-            top: 10px;
-          }
-        }
+        justify-content: flex-end;
       }
     }
   }

From e7c7a50392a43069a7fd0b7744b431ddb2a7b714 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Thu, 15 May 2025 11:28:40 +0800
Subject: [PATCH 3/3] dev

---
 index.html                        |  13 +++---
 src/assets/iconfont/iconfont.css  |  22 ++++++++++
 src/assets/iconfont/iconfont.ttf  | Bin 0 -> 1964 bytes
 src/assets/iconfont/iconfont.woff | Bin 0 -> 1328 bytes
 src/assets/scss/main.scss         |   6 +--
 src/main.ts                       |   1 +
 src/views/inventory/apply.vue     |  14 +++----
 src/views/inventory/check.vue     |  14 +++----
 src/views/inventory/goods.vue     |  12 ++----
 src/views/inventory/inventory.vue |  14 +++----
 src/views/inventory/supplier.vue  |  12 ++----
 src/views/social/directory.vue    |  65 +++++++++++++++++-------------
 12 files changed, 94 insertions(+), 79 deletions(-)
 create mode 100644 src/assets/iconfont/iconfont.css
 create mode 100644 src/assets/iconfont/iconfont.ttf
 create mode 100644 src/assets/iconfont/iconfont.woff

diff --git a/index.html b/index.html
index 0d32c06..0eb2d5c 100644
--- a/index.html
+++ b/index.html
@@ -1,13 +1,14 @@
 <!DOCTYPE html>
 <html lang="">
-  <head>
+<head>
     <meta charset="UTF-8">
     <link rel="icon" href="/favicon.ico">
+    <link rel="stylesheet" href="@/assets/iconfont/iconfont.css">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>药慧精灵智慧诊所</title>
-  </head>
-  <body>
-    <div id="app"></div>
-    <script type="module" src="/src/main.ts"></script>
-  </body>
+</head>
+<body>
+<div id="app"></div>
+<script type="module" src="/src/main.ts"></script>
+</body>
 </html>
diff --git a/src/assets/iconfont/iconfont.css b/src/assets/iconfont/iconfont.css
new file mode 100644
index 0000000..6b5ed31
--- /dev/null
+++ b/src/assets/iconfont/iconfont.css
@@ -0,0 +1,22 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 4921806 */
+  src: url('iconfont.woff?t=1747274949107') format('woff'),
+       url('iconfont.ttf?t=1747274949107') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont", serif !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-RectangleCopy:before {
+  content: "\e6a2";
+}
+
+.icon-RectangleCopy1:before {
+  content: "\e6a4";
+}
+
diff --git a/src/assets/iconfont/iconfont.ttf b/src/assets/iconfont/iconfont.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..dd739fcd09cf3f7ce4e911301da3d1adefe7a829
GIT binary patch
literal 1964
zcmd^A&2Jk;6n`^g@7js&IA3-tBw8iJAx&@+<F4B@HEEMLgeFRxCc#9Z)UnrgDu3Z@
zN)45;Ad2XRT7*<_L$ve)7kWVALmaqq0S;Uc5~>hF;Q$9NNF0d5Z`W&R)BXp{YG!`#
z_uiX%@6C)&jEEYkN`i)_PA?u;uJpV@#14U7m^(cf8vSHihkO<C*<?OZ%65F$0{JiW
ztxT?xcAQ!KnMk||S<h;TRR71(>#+R^UCn}!?}|;}FVG*)=Jg9M0NDPH!Idi}6SPd9
z!@mmIkxyJGu_l^@ejj9|kjQJ^_ebv#+5RTtnNo3G|K`(g5ucob{ux5-qPkn96&plY
z!O;Z&4Z>u=Zth#zda-HrPim~${_^b3q+wQ{Z6q8J9mFkXV<kbyEZJZi@Dc6aqi>)g
ziV~lQ%`A{7m(UBe-w48NhX1{o<<>F@tY3?fL1$<g7)FxC+HAz$B0F-u#J>i2y*9Jo
zD8%5&$u7V?q@7Gprs&J<TidtIdXV^$sxZ618r;~h-T|=>G9((P(d>+69|voA4q!&c
z;BBUjgqaaHcG*Q0>N6~j3~D)`PRv06_g1^+PgrF@Rkm-{x>4Ef+qM4hT{GT*c~;^z
z+`_{|J-vahCgx#*UVITX5@iv!lehb1sgtP@^<X&2We<}jS@Qe*o$RTQ8u9x=YFJc0
zlAC1~+Ppk6(cNXUKlw<kFLvYN6!Qz&>lOP?UHfouXs#n{mwNkV`&Yx!jo?kG*&Vne
zNn-dwYj1FRYVPEC&!OhWnin=t9Emu*vg~+zV)31`ElSH+|I7=|pIQiabPn|0l-$k6
zg+vo^{sSpAhLi7PvWItf1$x`tq`*-YR*$d{;^QI2A7wp3jNGsK{0GCTuY<Ko-AFIU
zyO4>8iI~&D+f!HPR^A(GZ+AI`+{jzwuU@(sZ{bZluR9&Wm%2Q&{I02VIz?N&vQ>$<
zaW5MXP0kZ9A6uS%+vRq<{&2dS((&}+k?gp`d5wD=(=SCCdv4~2rR1VvEUBu=F{kks
zTj*}B^1!X=<|$xwK&oL*GCgWx0lv$^HsAvmw&NExWMK*XQ42RvKTTS=5i6FAmt}Ke
zp8&mKVMbp1z`~q7^qGYP_^&K%1ODE^cJk4$7M8&8Sh#_fnA^gQ6ky5mvX;=bl(Je;
z){@0Sx>(Tb^SqYX$R)~ku|6+p<@L2<K^YDX)u}11pq1;(te?+>bUm%4%f-AB!+KgS
zS5!*n;yEp;2eZ0f8W|ik_A&TivY4lFDw9SD(lMrRNmi+XagCBxqynYQQGY<5hjoTF
zC<o8-1KPdbORz4}I_!)!6&j`>ewO!IO~I;QTJDWzoz7#o5MtC3k%C^vN_n7|6`zJk
za=;1>(9oU3I!RauDQkL_XoLpw)$^&_2hBY5);qze8~+~<Yl3kmn2p@?C}g6L$!X)o
LQpIzhG)(jl_a+sm

literal 0
HcmV?d00001

diff --git a/src/assets/iconfont/iconfont.woff b/src/assets/iconfont/iconfont.woff
new file mode 100644
index 0000000000000000000000000000000000000000..357b10f529390b975f45168bf8e865b09b7d1875
GIT binary patch
literal 1328
zcmY*Xe>l^59RF-zv(ZG`sk@FW7beTk(y7r%;YxC$(qZ3C%w1+>YI-^*rs;<^sv}F3
zWF;wX3{PfKTj=SeqfxPbp$lC<9(r8v^S$f-xX<&vKJWMI^}Ifx_xpK2?|otG*8?1Y
zhu{w8V3An;FURu#pP(&~0RZ4gP+biXK|A8GKWvMeC)5HV$G~Pbgb2CGr~qnG$fID)
z<=OU75_hF1z<dY-i$YRtq>;B1jRyb;hCT*_w@ba>aUK+*CWPDuVhQmvlEX_Dil8Qg
zoQwgxcBODJp8}>>KO_(hnvziwtcz4Yz6gSbvjm}hG<he~Zo--@0Pu-c=b5#FlvMaX
z!327+y20IzclV1FTy{L0J;ZTm*K*l=cE2@4hdM(TdajJaM#VtJ^epjk^755uA-9k_
z*ThM4X$jd<JaAl12nN_&6lE(knmZazuU?p&l~ryR;B_Oxo%0MF_N?{vViRylHO^#W
z>9YN*9QAM}f*@~gO=)_K^qkZTNK-8;MT*z5HVd&k8F5P*MLbBBrp69IRbARKV`VMj
zlxvith0I`44(ZqnZrxM%+J{xkUrssiX&-p><HV#ozUic(k3M7Ij8D8ce?`wzJuv$O
z`m-sq0QR=*_=XMmaGQ>a*~cyW_|rumiMjT~a7EjqwV_YXEQ<fYnrBTt>gX&z%p0%|
zpd6IZ%ob$TA2FzuSMN8B%rUX(@ez2pc2Ce){yJOvy`=%$J2&2@nO9o(Qe$yUlpV?K
z1;cqQKXK<1)_?V2#Ut^~AW_o`(l0{4Vy$NMecxWM(QEg#5zbo|?(Hn2I(Ei4`AqQ`
z-UWPVwEE+qaz~@;iIU>cN_W^$S9mJMdF6+_*In)$?HP;g^9@PZXc&By>63TS*r7JO
zLF=A79-AIqeT+^Tme(C`4L7%*hex)3k=Rpt!Ldq>tJy|$nrz=R6eq5>W&AFwd>K>j
zu-M<L&G+kz*-qg!2Uqm{jB@uoRn;YQQ@=^+yA-?T44c~-6Y9YFw;5OdT6IuSnDZok
zWXg=u&dhr=)*aRS$tFKgyN1~{`k`aY@I3z}aoee-TM6Q9!=xR@GnPp;R_iXTi5T=t
z!RGwW{s80rydsq-qvR@ikU^$R-h6e{#j{(h>B3cf`(+V}31-)k=%2m(sV5q%b}hiO
z3gkFzcLW5P;dfz6`5#~ku)Y55XD0~a*&Kkg(i3vX<k_|Zrohr37lYN7$bI=*mX+je
zo6O_{{kw|gNm0&pihkxquyS+R#WG^uiy&2Bv|DhmPiVf3`iwNnOFbN%-oF-E*J5~>
z^7uxvtsacm9y;`A^Gnx<?GAMXE{&S=f|DN$Yr`_;*Ocd#3eJ4IEI`~uRQ`4Dt+}O{
z9o3S3sAa>HRn3s;S#9K4oYrr8M`JE=hSaB=HDBrerbbf2OCQ#ZDetGQ7*Iy?dUO@z
zqWt$9YS?Qf^EdCf;)t~DyWtB*BL=u72bxEG7ASS611-`oKkcvTI{oY1m|CIhtA+vj
zh(C`)W|w<NxQexCuI*Fv#pLe;*9jA+i^d7w((OsJX<;KOoziZP#1${R`@=U)J=*kD
zq4~?=UWKO#UHF}+bC#co?hfHxH(D|WuPAeR5yp{A<e%%+=ct*RyJR!C{=$^4*nBx+
p;A;AZxLBSiFP2NPR?=6fmw34OIz8}dEi15;B<eH(G;B84{S95t8!!L>

literal 0
HcmV?d00001

diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss
index 546feef..b13a452 100644
--- a/src/assets/scss/main.scss
+++ b/src/assets/scss/main.scss
@@ -96,8 +96,8 @@ body {
   padding: 0 !important;
   //border: 1px solid #4D6DE4 !important;
 }
-$btn-color: #4d99e4;
-$lighter-color: #6eaeed;
+$btn-color: #4D6DE4;
+$lighter-color: #7c91e3;
 .default-btn{
   cursor: pointer;
   width: 120px;
@@ -106,7 +106,7 @@ $lighter-color: #6eaeed;
   background: $btn-color;
   border-radius: 6px;
   color: #FFF;
-  font-size: 15px;
+  font-size: 16px;
   text-align: center;
   &:hover{
     background: $lighter-color;
diff --git a/src/main.ts b/src/main.ts
index 75904d9..285f36c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -3,6 +3,7 @@ import './assets/scss/main.scss'
 import {createApp} from 'vue'
 import ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
+import '../src/assets/iconfont/iconfont.css'
 import {createPinia} from 'pinia'
 
 import App from './App.vue'
diff --git a/src/views/inventory/apply.vue b/src/views/inventory/apply.vue
index dfdd992..fda2632 100644
--- a/src/views/inventory/apply.vue
+++ b/src/views/inventory/apply.vue
@@ -12,16 +12,12 @@
           </el-form>
         </div>
         <div class="right">
-          <div class="btn" @click="resetSearch">
-            <el-icon style="margin-right: 10px">
-              <Refresh/>
-            </el-icon>
+          <div class="default-btn" @click="resetSearch">
+            <span class="iconfont icon-RectangleCopy1"></span>
             重置
           </div>
-          <div class="btn" @click="getList">
-            <el-icon style="margin-right: 10px">
-              <Search/>
-            </el-icon>
+          <div class="default-btn" @click="getList" style="margin-left: 24px">
+            <span class="iconfont icon-RectangleCopy"></span>
             搜索
           </div>
         </div>
@@ -31,7 +27,7 @@
       </div>
     </div>
     <div class="content">
-      <el-table :data="dataList" style="width: 100%" @row-click="rowClick">
+      <el-table :data="dataList" style="width: 100%;height: 100%" @row-click="rowClick">
         <el-table-column prop="useCode" label="单号" width="180"></el-table-column>
         <el-table-column prop="status" label="状态" width="180"></el-table-column>
         <el-table-column prop="useUserId" label="领用人" width="180"></el-table-column>
diff --git a/src/views/inventory/check.vue b/src/views/inventory/check.vue
index 2cec192..9a545e9 100644
--- a/src/views/inventory/check.vue
+++ b/src/views/inventory/check.vue
@@ -13,16 +13,12 @@
           </el-form>
         </div>
         <div class="right">
-          <div class="btn" @click="resetSearch">
-            <el-icon style="margin-right: 10px">
-              <Refresh/>
-            </el-icon>
+          <div class="default-btn" @click="resetSearch">
+            <span class="iconfont icon-RectangleCopy1"></span>
             重置
           </div>
-          <div class="btn" @click="getCheck">
-            <el-icon style="margin-right: 10px">
-              <Search/>
-            </el-icon>
+          <div class="default-btn" @click="getCheck" style="margin-left: 24px">
+            <span class="iconfont icon-RectangleCopy"></span>
             搜索
           </div>
         </div>
@@ -33,7 +29,7 @@
     </div>
     <div class="content_list">
       <el-scrollbar>
-        <el-table :data="tableData" @cell-click="editCheck">
+        <el-table :data="tableData" @cell-click="editCheck" style="height: 100%">
           <el-table-column label="订单号" prop="code" width="250">
           </el-table-column>
           <el-table-column label="状态" prop="state" width="250"></el-table-column>
diff --git a/src/views/inventory/goods.vue b/src/views/inventory/goods.vue
index 92ee08b..5c58e49 100644
--- a/src/views/inventory/goods.vue
+++ b/src/views/inventory/goods.vue
@@ -65,16 +65,12 @@
             <el-checkbox v-model="inventoryNumber" label="不看0库存" size="large" @change="searchGoods"/>
             <el-checkbox v-model="status" label="不看已停用" size="large" @change="searchGoods"/>
           </div>
-          <div class="btn" @click="resetSearch">
-            <el-icon style="margin-right: 10px">
-              <Refresh/>
-            </el-icon>
+          <div class="default-btn" @click="resetSearch">
+            <span class="iconfont icon-RectangleCopy1"></span>
             重置
           </div>
-          <div class="btn" @click="searchGoods">
-            <el-icon style="margin-right: 10px">
-              <Search/>
-            </el-icon>
+          <div class="default-btn" @click="searchGoods" style="margin-left: 24px">
+            <span class="iconfont icon-RectangleCopy"></span>
             搜索
           </div>
         </div>
diff --git a/src/views/inventory/inventory.vue b/src/views/inventory/inventory.vue
index 40194d5..1b92cc1 100644
--- a/src/views/inventory/inventory.vue
+++ b/src/views/inventory/inventory.vue
@@ -66,16 +66,12 @@
           </el-form>
         </div>
         <div class="right">
-          <div class="btn" @click="resetSearch">
-            <el-icon style="margin-right: 10px">
-              <Refresh/>
-            </el-icon>
+          <div class="default-btn" @click="resetSearch">
+            <span class="iconfont icon-RectangleCopy1"></span>
             重置
           </div>
-          <div class="btn" @click="init">
-            <el-icon style="margin-right: 10px">
-              <Search/>
-            </el-icon>
+          <div class="default-btn" @click="init" style="margin-left: 24px">
+            <span class="iconfont icon-RectangleCopy"></span>
             搜索
           </div>
         </div>
@@ -86,7 +82,7 @@
     </div>
     <div class="content_list">
       <el-scrollbar>
-        <el-table :data="tableData" style="width: 100%" @row-click="open_edit"
+        <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">
diff --git a/src/views/inventory/supplier.vue b/src/views/inventory/supplier.vue
index 8cdc095..3231c9d 100644
--- a/src/views/inventory/supplier.vue
+++ b/src/views/inventory/supplier.vue
@@ -13,16 +13,12 @@
           </el-form>
         </div>
         <div class="right">
-          <div class="btn" @click="resetSearch">
-            <el-icon style="margin-right: 10px">
-              <Refresh/>
-            </el-icon>
+          <div class="default-btn" @click="resetSearch">
+            <span class="iconfont icon-RectangleCopy1"></span>
             重置
           </div>
-          <div class="btn" @click="getSupplier">
-            <el-icon style="margin-right: 10px">
-              <Search/>
-            </el-icon>
+          <div class="default-btn" @click="getSupplier" style="margin-left: 24px">
+            <span class="iconfont icon-RectangleCopy"></span>
             搜索
           </div>
         </div>
diff --git a/src/views/social/directory.vue b/src/views/social/directory.vue
index 6a0a85e..a2499f3 100644
--- a/src/views/social/directory.vue
+++ b/src/views/social/directory.vue
@@ -13,12 +13,17 @@
     </div>
     <div class="tip">
       <div class="search_input">
-              <el-input v-model="search_keyword"  placeholder="名称/编号" :suffix-icon="Search" size="large" clearable @change="change_search"/>
+        <el-input v-model="search_keyword" placeholder="名称/编号" :suffix-icon="Search" size="large" clearable
+                  @change="change_search"/>
 
       </div>
-      <div class="search_btn"><div class="default-btn" @click="change_search">搜索</div></div>
+      <div class="search_btn">
+        <div class="default-btn" @click="change_search">
+          <span class="iconfont icon-RectangleCopy"></span>
+          搜索
+        </div>
+      </div>
       <div class="middel">
-
       </div>
       <div class="op_btn">
         <el-dropdown placement="bottom">
@@ -55,7 +60,7 @@
       </div>
     </Mask>
 
-    <Mask  :is-show="isUpdate1312" :width="600" :height="300" title="有效期更新" @close="isUpdate1312=false">
+    <Mask :is-show="isUpdate1312" :width="600" :height="300" title="有效期更新" @close="isUpdate1312=false">
       <div class="update_box">
         <el-date-picker
             v-model="updt_time"
@@ -64,7 +69,7 @@
             size="default"
         />
         <div class="btn" @click="update1312(1)">开始更新</div>
-        <div class="tip">{{tip}}</div>
+        <div class="tip">{{ tip }}</div>
       </div>
 
     </Mask>
@@ -77,9 +82,10 @@ import {ElNotification, type TabsPaneContext} from 'element-plus'
 import {post} from '@/utils/request.ts'
 import {Search} from '@element-plus/icons-vue'
 import Mask from "@/components/common/Mask.vue";
-let isUpdate1312=ref(false)
-let isUpdate1318=ref(false)
-let isUpdate1319=ref(false)
+
+let isUpdate1312 = ref(false)
+let isUpdate1318 = ref(false)
+let isUpdate1319 = ref(false)
 let updt_time = ref(new Date())
 let current_page = ref(1);
 let total_page = ref(0)
@@ -87,7 +93,7 @@ let current_tab = ref(1301);
 let column_list = ref([]);
 let search_keyword = ref("");
 let isDownLoading = ref(false);
-let tip=ref("")
+let tip = ref("")
 const tabs = [
   {label: '中西成药', name: 1301},
   {label: '中药饮片', name: 1302},
@@ -103,43 +109,43 @@ const tabs = [
 ];
 let tableData: any = ref([])
 let content: any = ref(null);
-let update1312 = (current_page:number) => {
-  if(current_page==1){
-    tip.value="开始更新第1页"
+let update1312 = (current_page: number) => {
+  if (current_page == 1) {
+    tip.value = "开始更新第1页"
   }
   post("social/directory_upinfo/get_page", {
     updt_time: updt_time.value,
-    page:current_page
+    page: current_page
   }, {catch_error: true}).then((res: any) => {
     let pages = res.pages;
     let number = res.number;
-    if (current_page < pages&&isUpdate1312.value) {
+    if (current_page < pages && isUpdate1312.value) {
       current_page++
       let percent = Math.floor((current_page / pages) * 100)
-      tip.value= "开始更新第:" + current_page + "/" + pages;
+      tip.value = "开始更新第:" + current_page + "/" + pages;
       update1312(current_page);
     } else {
-      tip.value= "所有更新已完成"
+      tip.value = "所有更新已完成"
       isUpdate1312.value = false
     }
 
   }).catch((err: any) => {
     isUpdate1312.value = false;
-    current_page=1;
+    current_page = 1;
   })
 }
-const openUpdateBox = (type:number) => {
+const openUpdateBox = (type: number) => {
   //获取30天前时间
   let start_time = new Date();
   start_time.setDate(start_time.getDate() - 30);
   updt_time.value = start_time;
-  if(type==1312){
+  if (type == 1312) {
     isUpdate1312.value = true
   }
-  if(type==1318){
+  if (type == 1318) {
     isUpdate1318.value = true
   }
-  if(type==1319){
+  if (type == 1319) {
     isUpdate1319.value = true
   }
 
@@ -194,7 +200,7 @@ let change_page = (val: number) => {
 }
 let change_tab = (tab: TabsPaneContext, event: Event) => {
   search_keyword.value = "";
-  nextTick(()=>{
+  nextTick(() => {
     init()
   })
 }
@@ -247,12 +253,13 @@ let download = (ver: any, type: any) => {
 </script>
 
 <style scoped lang="scss">
-.update_box{
+.update_box {
   position: relative;
   width: 100%;
   height: 100%;
   padding: 20px;
 }
+
 .container-wrapper {
   box-sizing: border-box;
   padding: 20px;
@@ -273,18 +280,22 @@ let download = (ver: any, type: any) => {
 
   .tip {
     display: flex;
-    .search_input{
+
+    .search_input {
       flex: 1;
     }
-    .search_btn{
+
+    .search_btn {
       width: 140px;
       padding-left: 10px;
       padding-right: 10px;
     }
-    .middel{
+
+    .middel {
       width: 200px;
     }
-    .op_btn{
+
+    .op_btn {
       width: 120px;
     }