From ba7af953992da6f5111675bfd27bc8b8139d32f8 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Thu, 15 May 2025 13:06:28 +0800
Subject: [PATCH] dev

---
 src/assets/scss/main.scss        |  4 ++--
 src/views/inventory/apply.vue    |  3 ---
 src/views/inventory/goods.vue    | 21 +++++++++------------
 src/views/inventory/supplier.vue | 15 +++++++--------
 4 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss
index 5538cf2..f12c92e 100644
--- a/src/assets/scss/main.scss
+++ b/src/assets/scss/main.scss
@@ -33,12 +33,12 @@ html{
 }
 @media screen and (max-width: 1600px) {
   html {
-    font-size: 14px; // 更小的字体以适配较小屏幕
+    font-size: 12px; // 更小的字体以适配较小屏幕
   }
 }
 @media screen and (max-width: 1440px) {
   html {
-    font-size: 12px; // 更小的字体以适配较小屏幕
+    font-size: 10px; // 更小的字体以适配较小屏幕
   }
 }
 #app {
diff --git a/src/views/inventory/apply.vue b/src/views/inventory/apply.vue
index 8714884..54a0df2 100644
--- a/src/views/inventory/apply.vue
+++ b/src/views/inventory/apply.vue
@@ -143,7 +143,6 @@ const resetSearch=  () => {
 
 <style scoped lang="scss">
 @use "@/assets/scss/base.scss";
-
 .container-wrapper {
   box-sizing: border-box;
   padding: 24px;
@@ -151,14 +150,12 @@ const resetSearch=  () => {
   display: flex;
   flex-direction: column;
   height: 100%;
-
   .content {
     width: 100%;
     flex: 1;
     overflow: hidden;
     margin-top: base.$margin-base;
   }
-
   .bottom {
     width: 100%;
     height: 60px;
diff --git a/src/views/inventory/goods.vue b/src/views/inventory/goods.vue
index 5c58e49..b2b627a 100644
--- a/src/views/inventory/goods.vue
+++ b/src/views/inventory/goods.vue
@@ -82,8 +82,8 @@
         <span @click="open_edit(0,0)">新增其他商品</span>
       </div>
     </div>
-    <div class="content_goods" ref="content">
-      <el-table :data="tableData" style="width: 100%;height: 100%;padding: 0 24px" @row-click="openMack"
+    <div class="content_goods">
+      <el-table :data="tableData" style="height: 100%;padding: 0 24px;" @row-click="openMack"
                 :header-cell-style="{ backgroundColor: '#F1F5FB' }">
         <el-table-column fixed prop="name" label="名称" width="200" show-overflow-tooltip>
           <template #default="scope">
@@ -128,7 +128,6 @@
           </template>
         </el-table-column>
         <el-table-column label="最近效期" prop="recentlyExpiryDate" width="150"></el-table-column>
-
         <el-table-column label="进价" width="120">
           <template #default="scope">
             ￥{{ scope.row.purchaseUnitPrice.toFixed(2) }}
@@ -168,11 +167,11 @@
     </div>
     <div class="bottom">
       <div class="statistics">
-        <div class="">总成本:{{ statisticsData.totalCost }}</div>
-        <div class="">总售价:{{ statisticsData.totalPrice }}</div>
-        <div class="">医保药品:{{ statisticsData.totalSocialCount }}个</div>
-        <div v-for="item in statisticsData.chrgitmLvInfoList">
-          {{ item.name }}:{{ item.ratio }}({{ item.count }})
+        <div style="margin-right: 40px">总成本：￥{{ statisticsData.totalCost }}</div>
+        <div style="margin-right: 40px">总售价：￥{{ statisticsData.totalPrice }}</div>
+        <div style="margin-right: 40px">医保药品：{{ statisticsData.totalSocialCount }}个</div>
+        <div v-for="item in statisticsData.chrgitmLvInfoList" style="margin-right: 40px">
+          {{ item.name }}：{{ item.ratio }}({{ item.count }})
         </div>
       </div>
       <div class="page_btn_list">
@@ -485,13 +484,11 @@ const getStatisticsData = () => {
       }
     }
   }
-
   .content_goods {
     width: 100%;
     flex: 1;
-    overflow: hidden;
+    min-height: 0;
   }
-
   .bottom {
     width: 100%;
     height: 60px;
@@ -501,7 +498,7 @@ const getStatisticsData = () => {
     position: relative;
     border-top: 1px solid #EEE;
     display: flex;
-    justify-content: flex-end;
+    justify-content: space-between;
     align-items: center;
 
     .statistics {
diff --git a/src/views/inventory/supplier.vue b/src/views/inventory/supplier.vue
index 5cea231..97f2986 100644
--- a/src/views/inventory/supplier.vue
+++ b/src/views/inventory/supplier.vue
@@ -27,8 +27,8 @@
         <span @click="addSupplier(null)">添加供应商</span>
       </div>
     </div>
-    <div class="content_list">
-      <el-table :data="tableData" @row-click="editSupplier" style="height: 100%" :header-cell-style="{ backgroundColor: '#F1F5FB' }">
+    <div class="content">
+      <el-table :data="tableData" style="width: 100%;height: 100%" @row-click="editSupplier" :header-cell-style="{ backgroundColor: '#F1F5FB' }">
         <el-table-column label="供应商名称" prop="name" width="250">
         </el-table-column>
         <el-table-column label="启用状态" prop="turn" width="80">
@@ -40,7 +40,7 @@
         <el-table-column label="许可证号" prop="licenseCode"></el-table-column>
         <el-table-column label="联系人" prop="contactName" width="100"></el-table-column>
         <el-table-column label="联系方式" prop="contactTel" width="150"></el-table-column>
-        <el-table-column label="备注" prop="reamark"/>
+        <el-table-column label="备注" prop="remark"/>
       </el-table>
     </div>
     <div class="bottom">
@@ -64,7 +64,7 @@ import {post} from "@/utils/request.ts";
 import AddSupplier from "@/components/inventory/supplier/AddSupplier.vue";
 import {Search} from "@element-plus/icons-vue";
 
-const tableData = ref([])
+const tableData = ref<any>([])
 const getSupplier = () => {
   const query = {
     page: page.value,
@@ -121,6 +121,7 @@ const resetSearch = () => {
   }
 }
 </script>
+
 <style scoped lang="scss">
 @use "@/assets/scss/base.scss";
 .container-wrapper {
@@ -130,14 +131,11 @@ const resetSearch = () => {
   display: flex;
   flex-direction: column;
   height: 100%;
-
-  .content_list {
+  .content {
     width: 100%;
     flex: 1;
-    overflow: hidden;
     margin-top: base.$margin-base;
   }
-
   .bottom {
     width: 100%;
     height: 60px;
@@ -151,6 +149,7 @@ const resetSearch = () => {
     align-items: center;
   }
 }
+
 .top {
   height: 110px;
   background: #fff;