From 6a76fcaf7648ec57aad5a80b9ce2376297333fd1 Mon Sep 17 00:00:00 2001
From: duan <duanduanduan.com>
Date: Mon, 8 Aug 2022 13:02:10 +0800
Subject: [PATCH] =?UTF-8?q?style(index):=20=E4=BF=AE=E6=94=B9=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/icons/svg/流转.svg                          |  2 ++
 src/views/reagent/inventory/index.vue           |  2 +-
 src/views/reagent/report/record/index.vue       | 10 +++++++---
 src/views/reagent/report/usefrequency/index.vue | 10 +++++++---
 4 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 src/icons/svg/流转.svg

diff --git a/src/icons/svg/流转.svg b/src/icons/svg/流转.svg
new file mode 100644
index 0000000..e3d7363
--- /dev/null
+++ b/src/icons/svg/流转.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1659926968972" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2340" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M1019.6 549.4H899c-8.8 0-16-7.2-16-16V257c0-35.3-28.7-64-64-64H324c-2.2 0-4 1.8-4 4v88c0 2.2 1.8 4 4 4h447c8.8 0 16 7.2 16 16v228.4c0 8.8-7.2 16-16 16H650.4c-3.1 0-5 3.3-3.5 6L831.5 875c1.5 2.7 5.4 2.7 6.9 0L1023 555.4c1.6-2.7-0.4-6-3.4-6zM5 475.6h120.6c8.8 0 16 7.2 16 16V768c0 35.3 28.7 64 64 64h495c2.2 0 4-1.8 4-4v-88c0-2.2-1.8-4-4-4h-447c-8.8 0-16-7.2-16-16V491.6c0-8.8 7.2-16 16-16h120.6c3.1 0 5-3.3 3.5-6L193 150c-1.5-2.7-5.4-2.7-6.9 0L1.5 469.6c-1.5 2.7 0.4 6 3.5 6z" p-id="2341"></path></svg>
\ No newline at end of file
diff --git a/src/views/reagent/inventory/index.vue b/src/views/reagent/inventory/index.vue
index d13e5bd..66c21d3 100644
--- a/src/views/reagent/inventory/index.vue
+++ b/src/views/reagent/inventory/index.vue
@@ -110,7 +110,7 @@
             end-placeholder="结束日期"
             size="small"
           />
-          <el-select class="header-select" v-model="history_client_id" size="small" placeholder="请选择柜体">
+          <el-select v-model="history_client_id" class="header-select" size="small" placeholder="请选择柜体">
             <el-option
               v-for="item in clientOptions"
               :key="item.id"
diff --git a/src/views/reagent/report/record/index.vue b/src/views/reagent/report/record/index.vue
index 4728f74..c43c67e 100644
--- a/src/views/reagent/report/record/index.vue
+++ b/src/views/reagent/report/record/index.vue
@@ -48,7 +48,7 @@
       element-loading-text="拼命加载中"
       :header-cell-style="headerStyle"
       :data="reagentData"
-      height="420"
+      height="490"
     >
       <el-table-column align="center" property="name" label="试剂名称" />
       <el-table-column align="center" property="english_name" label="英文名称" />
@@ -63,7 +63,11 @@
       </el-table-column>
       <el-table-column align="center" property="create_date" label="归还时间" />
       <el-table-column align="center" property="create_user_name" label="操作人员" />
-      <el-table-column align="center" property="client_id" label="所属终端" />
+      <el-table-column align="center" property="client_id" label="所属终端">
+        <template slot-scope="scope">
+          {{ clientOptions.find(item => item.client_id === scope.row.client_id).client_name }}
+        </template>
+      </el-table-column>
     </el-table>
     <div style="text-align: center">
       <el-pagination
@@ -153,7 +157,7 @@ export default {
 .main-content-container{
   margin: 1rem;
   background: white;
-  min-height: calc(100vh - 12rem);
+  min-height: calc(100vh - 110px);
   padding: 1rem;
   .title {
     font-size: 1.25rem;
diff --git a/src/views/reagent/report/usefrequency/index.vue b/src/views/reagent/report/usefrequency/index.vue
index 3cafcd5..f776aed 100644
--- a/src/views/reagent/report/usefrequency/index.vue
+++ b/src/views/reagent/report/usefrequency/index.vue
@@ -37,7 +37,7 @@
       element-loading-text="拼命加载中"
       :header-cell-style="headerStyle"
       :data="reagentData"
-      height="460"
+      height="530"
     >
       <el-table-column align="center" property="name" label="试剂名称" />
       <el-table-column align="center" property="purity" label="纯度" />
@@ -48,7 +48,11 @@
       <!--      <el-table-column align="center" property="remain" label="结束时间" />-->
       <el-table-column align="center" property="sum_tp2" label="领用次数" />
       <el-table-column align="center" property="sum_tp3" label="归还次数" />
-      <el-table-column align="center" property="client_id" label="所属终端" />
+      <el-table-column align="center" property="client_id" label="所属终端">
+        <template slot-scope="scope">
+          {{ clientOptions.find(item => item.client_id === scope.row.client_id).client_name }}
+        </template>
+      </el-table-column>
     </el-table>
     <div style="text-align: center">
       <el-pagination
@@ -121,7 +125,7 @@ export default {
 .main-content-container{
   margin: 1rem;
   background: white;
-  min-height: calc(100vh - 12rem);
+  min-height: calc(100vh - 110px);
   padding: 1rem;
   .title {
     font-size: 1.25rem;