From c029f7709ea3646105433b2145eab62c99a6337d Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Tue, 19 Mar 2024 14:54:20 +0800
Subject: [PATCH] '123'

---
 .../storageLocation/locationConsuming.vue     | 342 +++++++++---------
 1 file changed, 177 insertions(+), 165 deletions(-)

diff --git a/ruoyi-ui/src/views/storageLocation/locationConsuming.vue b/ruoyi-ui/src/views/storageLocation/locationConsuming.vue
index 0bd6e9e..b3e9357 100644
--- a/ruoyi-ui/src/views/storageLocation/locationConsuming.vue
+++ b/ruoyi-ui/src/views/storageLocation/locationConsuming.vue
@@ -221,170 +221,172 @@
           </el-dialog>
       </el-tab-pane>
       <el-tab-pane label="已选库位" name="locationSelected">
-        <el-container>
-          <el-main>
-            <el-row :gutter="10" style="letter-spacing: 5px;">
-              <el-col :span="8">
-                <div class="grid-content bg-purpleA">黄色线芯A区</div>
-              </el-col>
-              <el-col :span="8">
-                <div class="grid-content bg-purpleB">绿色线芯B区</div>
-              </el-col>
-              <el-col :span="8">
-                <div class="grid-content bg-purpleC">红色线芯C区</div>
-              </el-col>
-            </el-row>
-            <el-row :gutter="10">
-              <el-col :span="8">
-                <el-card class="box-card scrollable">
-                  <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-descriptions-item>
-                    <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
-                      <template slot="label">
-                        操作
-                      </template>
-                      <el-button type="danger" icon="el-icon-delete" size="mini" circle @click="del(item)"></el-button>
-                    </el-descriptions-item>
-                    <el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
-                      <template slot="label">
-                        指令号
-                      </template>
-                      {{item.materialZlh}}
-                    </el-descriptions-item>
-                    <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
-                      <template slot="label">
-                        型号
-                      </template>
-                      {{item.materialXingh}}
-                    </el-descriptions-item>
-                    <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
-                      <template slot="label">
-                        规格
-                      </template>
-                      {{item.materialGuig}}
-                    </el-descriptions-item>
-                    <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
-                      <template slot="label">
-                        电压等级
-                      </template>
-                      {{item.materialDiany}}
-                    </el-descriptions-item>
-                    <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
-                      <template slot="label">
-                        米数
-                      </template>
-                      {{item.materialMs}}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-card>
-              </el-col>
-              <el-col :span="8">
-                <el-card class="box-card scrollable">
-                  <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">
-                        库位
-                      </template>
-                      <span class="kw">{{item.materialBh}}</span>
-                    </el-descriptions-item>
-                    <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
-                      <template slot="label">
-                        操作
-                      </template>
-                      <el-button type="danger" icon="el-icon-delete" size="mini" circle @click="del(item)"></el-button>
-                    </el-descriptions-item>
-                    <el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
-                      <template slot="label">
-                        指令号
-                      </template>
-                      {{item.materialZlh}}
-                    </el-descriptions-item>
-                    <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
-                      <template slot="label">
-                        型号
-                      </template>
-                      {{item.materialXingh}}
-                    </el-descriptions-item>
-                    <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
-                      <template slot="label">
-                        规格
-                      </template>
-                      {{item.materialGuig}}
-                    </el-descriptions-item>
-                    <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
-                      <template slot="label">
-                        电压等级
-                      </template>
-                      {{item.materialDiany}}
-                    </el-descriptions-item>
-                    <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
-                      <template slot="label">
-                        米数
-                      </template>
-                      {{item.materialMs}}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-card>
-              </el-col>
-              <el-col :span="8">
-                <el-card class="box-card scrollable">
-                  <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">
-                        库位
-                      </template>
-                      <span class="kw">{{item.materialBh}}</span>
-                    </el-descriptions-item>
-                    <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
-                      <template slot="label">
-                        操作
-                      </template>
-                      <el-button type="danger" icon="el-icon-delete" size="mini" circle @click="del(item)"></el-button>
-                    </el-descriptions-item>
-                    <el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
-                      <template slot="label">
-                        指令号
-                      </template>
-                      {{item.materialZlh}}
-                    </el-descriptions-item>
-                    <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
-                      <template slot="label">
-                        型号
-                      </template>
-                      {{item.materialXingh}}
-                    </el-descriptions-item>
-                    <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
-                      <template slot="label">
-                        规格
-                      </template>
-                      {{item.materialGuig}}
-                    </el-descriptions-item>
-                    <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
-                      <template slot="label">
-                        电压等级
-                      </template>
-                      {{item.materialDiany}}
-                    </el-descriptions-item>
-                    <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
-                      <template slot="label">
-                        米数
-                      </template>
-                      {{item.materialMs}}
-                    </el-descriptions-item>
-                  </el-descriptions>
-                </el-card>
-              </el-col>
-            </el-row>
-          </el-main>
-          <el-footer style="margin:0 auto;">
-            <el-button type="primary" @click="confirm()">确认</el-button>
-          </el-footer>
-        </el-container>
+        <el-row :gutter="10" style="letter-spacing: 5px;">
+          <el-col :span="8">
+            <div class="grid-content bg-purpleA">黄色线芯A区(已选{{countSelA}})</div>
+          </el-col>
+          <el-col :span="8">
+            <div class="grid-content bg-purpleB">绿色线芯B区(已选{{countSelB}})</div>
+          </el-col>
+          <el-col :span="8">
+            <div class="grid-content bg-purpleC">红色线芯C区(已选{{countSelC}})</div>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-card class="box-card scrollable">
+              <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-descriptions-item>
+                <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
+                  <template slot="label">
+                    操作
+                  </template>
+                  <el-button type="danger" icon="el-icon-delete" size="mini" circle @click="del(item)"></el-button>
+                </el-descriptions-item>
+                <el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
+                  <template slot="label">
+                    指令号
+                  </template>
+                  {{item.materialZlh}}
+                </el-descriptions-item>
+                <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
+                  <template slot="label">
+                    型号
+                  </template>
+                  {{item.materialXingh}}
+                </el-descriptions-item>
+                <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
+                  <template slot="label">
+                    规格
+                  </template>
+                  {{item.materialGuig}}
+                </el-descriptions-item>
+                <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
+                  <template slot="label">
+                    电压等级
+                  </template>
+                  {{item.materialDiany}}
+                </el-descriptions-item>
+                <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
+                  <template slot="label">
+                    米数
+                  </template>
+                  {{item.materialMs}}
+                </el-descriptions-item>
+              </el-descriptions>
+            </el-card>
+          </el-col>
+          <el-col :span="8">
+            <el-card class="box-card scrollable">
+              <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">
+                    库位
+                  </template>
+                  <span class="kw">{{item.materialBh}}</span>
+                </el-descriptions-item>
+                <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
+                  <template slot="label">
+                    操作
+                  </template>
+                  <el-button type="danger" icon="el-icon-delete" size="mini" circle @click="del(item)"></el-button>
+                </el-descriptions-item>
+                <el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
+                  <template slot="label">
+                    指令号
+                  </template>
+                  {{item.materialZlh}}
+                </el-descriptions-item>
+                <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
+                  <template slot="label">
+                    型号
+                  </template>
+                  {{item.materialXingh}}
+                </el-descriptions-item>
+                <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
+                  <template slot="label">
+                    规格
+                  </template>
+                  {{item.materialGuig}}
+                </el-descriptions-item>
+                <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
+                  <template slot="label">
+                    电压等级
+                  </template>
+                  {{item.materialDiany}}
+                </el-descriptions-item>
+                <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
+                  <template slot="label">
+                    米数
+                  </template>
+                  {{item.materialMs}}
+                </el-descriptions-item>
+              </el-descriptions>
+            </el-card>
+          </el-col>
+          <el-col :span="8">
+            <el-card class="box-card scrollable">
+              <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">
+                    库位
+                  </template>
+                  <span class="kw">{{item.materialBh}}</span>
+                </el-descriptions-item>
+                <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
+                  <template slot="label">
+                    操作
+                  </template>
+                  <el-button type="danger" icon="el-icon-delete" size="mini" circle @click="del(item)"></el-button>
+                </el-descriptions-item>
+                <el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
+                  <template slot="label">
+                    指令号
+                  </template>
+                  {{item.materialZlh}}
+                </el-descriptions-item>
+                <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
+                  <template slot="label">
+                    型号
+                  </template>
+                  {{item.materialXingh}}
+                </el-descriptions-item>
+                <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
+                  <template slot="label">
+                    规格
+                  </template>
+                  {{item.materialGuig}}
+                </el-descriptions-item>
+                <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
+                  <template slot="label">
+                    电压等级
+                  </template>
+                  {{item.materialDiany}}
+                </el-descriptions-item>
+                <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
+                  <template slot="label">
+                    米数
+                  </template>
+                  {{item.materialMs}}
+                </el-descriptions-item>
+              </el-descriptions>
+            </el-card>
+          </el-col>
+        </el-row>
+        <el-footer style="margin:0 auto;">
+          <el-row type="flex" justify="center">
+            <el-col :span="6">
+              <div class="grid-content mt20">
+                <el-button type="primary" @click="confirm()">确认</el-button>
+              </div>
+            </el-col>
+          </el-row>
+        </el-footer>
       </el-tab-pane>
     </el-tabs>
     <!-- 操作详情对话框 -->
@@ -410,7 +412,7 @@
   }
   .scrollable{
     overflow: auto; /* 自动开启滚动条 */
-    max-height: 580px; /* 设置最大高度 */
+    max-height: 500px; /* 设置最大高度 */
   }
 
   /*最上方三大块样式*/
@@ -524,6 +526,16 @@
       countC(){
         // 使用 find 方法找到第一个符合条件的对象
         return this.materialDetailC.filter(task => task.materialState === '1').length;
+      },
+
+      countSelA(){
+        return this.selMaterialDetailA.length;
+      },
+      countSelB(){
+        return this.selMaterialDetailB.length;
+      },
+      countSelC(){
+        return this.selMaterialDetailC.length;
       }
     },
     methods: {