From cc20aa0d3f6640d5dd9e389aeaf5db017b13ab4b Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Wed, 20 Mar 2024 08:52:23 +0800
Subject: [PATCH] '123'

---
 .../storageLocation/locationConsuming.vue     | 33 ++++++++++++-------
 .../src/views/storageLocation/locationSet.vue |  8 +++--
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/ruoyi-ui/src/views/storageLocation/locationConsuming.vue b/ruoyi-ui/src/views/storageLocation/locationConsuming.vue
index b3e9357..dc26b97 100644
--- a/ruoyi-ui/src/views/storageLocation/locationConsuming.vue
+++ b/ruoyi-ui/src/views/storageLocation/locationConsuming.vue
@@ -15,7 +15,7 @@
           </el-row>
           <el-row :gutter="10">
             <el-col :span="8">
-              <el-card class="box-card scrollable">
+              <el-card class="box-card lyScrollable">
                 <el-descriptions border :column="2" size="small" :style="index==0?'': 'margin-top :15px'" v-for="(item,index) in materialDetailA" :key="item.materialBh">
                   <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
                     <template slot="label">
@@ -68,7 +68,7 @@
               </el-card>
             </el-col>
             <el-col :span="8">
-              <el-card class="box-card scrollable">
+              <el-card class="box-card lyScrollable">
                 <el-descriptions border :column="2" size="small" :style="index==0?'': 'margin-top :12px'" v-for="(item,index) in materialDetailB" :key="item.materialBh">
                   <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
                     <template slot="label">
@@ -121,7 +121,7 @@
               </el-card>
             </el-col>
             <el-col :span="8">
-              <el-card class="box-card scrollable">
+              <el-card class="box-card lyScrollable">
                 <el-descriptions border :column="2" size="small" :style="index==0?'': 'margin-top :12px'" v-for="(item,index) in materialDetailC" :key="item.materialBh">
                   <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
                     <template slot="label">
@@ -234,13 +234,13 @@
         </el-row>
         <el-row :gutter="10">
           <el-col :span="8">
-            <el-card class="box-card scrollable">
+            <el-card class="box-card selScrollable">
               <el-descriptions border :column="2" size="small" :style="index==0?'': 'margin-top :15px'" v-for="(item,index) in selMaterialDetailA" :key="item.materialBh">
                 <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
                   <template slot="label">
                     库位
                   </template>
-                  <span class="kw">{{item.materialBh}}</span>
+                  <el-link class="kw" :underline="false" type="primary">{{item.materialBh}}</el-link>
                 </el-descriptions-item>
                 <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
                   <template slot="label">
@@ -282,7 +282,7 @@
             </el-card>
           </el-col>
           <el-col :span="8">
-            <el-card class="box-card scrollable">
+            <el-card class="box-card selScrollable">
               <el-descriptions border :column="2" size="small" :style="index==0?'': 'margin-top :12px'" v-for="(item,index) in selMaterialDetailB" :key="item.materialBh">
                 <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
                   <template slot="label">
@@ -330,7 +330,7 @@
             </el-card>
           </el-col>
           <el-col :span="8">
-            <el-card class="box-card scrollable">
+            <el-card class="box-card selScrollable">
               <el-descriptions border :column="2" size="small" :style="index==0?'': 'margin-top :12px'" v-for="(item,index) in selMaterialDetailC" :key="item.materialBh">
                 <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
                   <template slot="label">
@@ -407,12 +407,19 @@
   }
 
   /*卡片内容滚动条设置*/
-  .scrollable::-webkit-scrollbar {
+  .lyScrollable::-webkit-scrollbar {
     display: none; /* 对于Webkit浏览器 */
   }
-  .scrollable{
+  .lyScrollable{
     overflow: auto; /* 自动开启滚动条 */
-    max-height: 500px; /* 设置最大高度 */
+    max-height: 630px; /* 设置最大高度 */
+  }
+  .selScrollable::-webkit-scrollbar {
+    display: none; /* 对于Webkit浏览器 */
+  }
+  .selScrollable{
+    overflow: auto; /* 自动开启滚动条 */
+    max-height: 580px; /* 设置最大高度 */
   }
 
   /*最上方三大块样式*/
@@ -454,10 +461,12 @@
         //内容样式
         contentStyle: {
           'text-align': 'center',
-          'width': '150px'
+          'width': '150px',
+          'color': '#82848a',
+          'font-size':'12px'
         },
         //label样式
-        labelStyle: { 'width': '80px' },
+        labelStyle: { 'width': '80px','color':'#606266','font-size':'12px' },
 
         queryParams: {
           materialBh: null,
diff --git a/ruoyi-ui/src/views/storageLocation/locationSet.vue b/ruoyi-ui/src/views/storageLocation/locationSet.vue
index 7686f64..a325732 100644
--- a/ruoyi-ui/src/views/storageLocation/locationSet.vue
+++ b/ruoyi-ui/src/views/storageLocation/locationSet.vue
@@ -243,7 +243,7 @@
   }
   .scrollable{
     overflow: auto; /* 自动开启滚动条 */
-    max-height: 600px; /* 设置最大高度 */
+    max-height: 680px; /* 设置最大高度 */
   }
 
   /*最上方三大块样式*/
@@ -288,10 +288,12 @@
             //内容样式
             contentStyle: {
               'text-align': 'center',
-              'width': '150px'
+              'width': '150px',
+              'color': '#82848a',
+              'font-size':'12px'
             },
             //label样式
-            labelStyle: { 'width': '80px' },
+            labelStyle: { 'width': '80px','color':'#606266','font-size':'12px' },
 
             queryParams: {
               materialBh: null,