From 581dc8e38503fae71275d6b48ed323db4726e1e3 Mon Sep 17 00:00:00 2001
From: xd <xudong163mail@163.com>
Date: Mon, 18 Mar 2024 20:34:41 +0800
Subject: [PATCH] 111

---
 .../storageLocation/locationConsuming.vue     | 513 +++++++++---------
 .../src/views/storageLocation/locationSet.vue |   6 +-
 2 files changed, 269 insertions(+), 250 deletions(-)

diff --git a/ruoyi-ui/src/views/storageLocation/locationConsuming.vue b/ruoyi-ui/src/views/storageLocation/locationConsuming.vue
index 14a7bde..236d8ef 100644
--- a/ruoyi-ui/src/views/storageLocation/locationConsuming.vue
+++ b/ruoyi-ui/src/views/storageLocation/locationConsuming.vue
@@ -1,254 +1,38 @@
 <template>
-
-  <el-tabs v-model="activeName" @tab-click="handleClick" style="margin-left: 15px; margin-right: 15px;">
-    <el-tab-pane label="库位查看" name="locationShow">
-        <el-row :gutter="10" style="letter-spacing: 5px;">
-          <el-col :span="8">
-            <div class="grid-content bg-purpleA" @click="refresh()">黄色线芯A区(可用{{countA}})</div>
-          </el-col>
-          <el-col :span="8">
-            <div class="grid-content bg-purpleB" @click="refresh()">绿色线芯B区(可用{{countB}})</div>
-          </el-col>
-          <el-col :span="8">
-            <div class="grid-content bg-purpleC" @click="refresh()">红色线芯C区(可用{{countC}})</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 materialDetailA" :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>
-                  <span v-if = "item.materialState=='0'">
-                    <el-tag size="mini" type="success">空闲</el-tag>
-                  </span>
-                  <span v-if = "item.materialState=='1'">
-                    <el-tag size="mini" type="danger" @click="selectLocation(item)">占用</el-tag>
-                  </span>
-                </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 materialDetailB" :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>
-                  <span v-if = "item.materialState=='0'">
-                    <el-tag size="mini" type="success">空闲</el-tag>
-                  </span>
-                  <span v-if = "item.materialState=='1'">
-                    <el-tag size="mini" type="danger" @click="selectLocation(item)">占用</el-tag>
-                  </span>
-                </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 materialDetailC" :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>
-                  <span v-if = "item.materialState=='0'">
-                    <el-tag size="mini" type="success">空闲</el-tag>
-                  </span>
-                  <span v-if = "item.materialState=='1'">
-                    <el-tag size="mini" type="danger" @click="selectLocation(item)">占用</el-tag>
-                  </span>
-                </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-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-          <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="库位" prop="materialBh">
-                  <el-input v-model="form.materialBh" :disabled="true"/>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="指令号" prop="materialZlh">
-                  <el-input v-model="form.materialZlh"/>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="型号" prop="materialXingh">
-                  <el-input v-model="form.materialXingh" placeholder="请输入型号"/>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="规格" prop="materialGuig">
-                  <el-input v-model="form.materialGuig" placeholder="请输入规格"/>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="电压等级" prop="materialDiany">
-                  <el-input v-model="form.materialDiany" placeholder="请输入电压等级" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="米数" prop="materialMs">
-                  <el-input v-model="form.materialMs" placeholder="请输入米数" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-          <div slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="submitForm">确 定</el-button>
-            <el-button @click="cancel">取 消</el-button>
-          </div>
-        </el-dialog>
-    </el-tab-pane>
-    <el-tab-pane label="已选库位" name="locationSelected">
-      <el-container>
-        <el-main>
+  <div>
+    <el-tabs v-model="activeName" @tab-click="handleClick" style="margin-left: 15px; margin-right: 15px;">
+      <el-tab-pane label="库位查看" name="locationShow">
           <el-row :gutter="10" style="letter-spacing: 5px;">
             <el-col :span="8">
-              <div class="grid-content bg-purpleA">黄色线芯A区</div>
+              <div class="grid-content bg-purpleA" @click="refresh()">黄色线芯A区(可用{{countA}})</div>
             </el-col>
             <el-col :span="8">
-              <div class="grid-content bg-purpleB">绿色线芯B区</div>
+              <div class="grid-content bg-purpleB" @click="refresh()">绿色线芯B区(可用{{countB}})</div>
             </el-col>
             <el-col :span="8">
-              <div class="grid-content bg-purpleC">红色线芯C区</div>
+              <div class="grid-content bg-purpleC" @click="refresh()">红色线芯C区(可用{{countC}})</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 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">
                       库位
                     </template>
-                    <span class="kw">{{item.materialBh}}</span>
+                    <el-link class="kw" :underline="false" type="primary" @click="operlogdialog(item.materialBh)">{{item.materialBh}}</el-link>
                   </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>
+                    <span v-if = "item.materialState=='0'">
+                      <el-tag size="mini" type="success">空闲</el-tag>
+                    </span>
+                    <span v-if = "item.materialState=='1'">
+                      <el-tag size="mini" type="danger" @click="selectLocation(item)">可用</el-tag>
+                    </span>
                   </el-descriptions-item>
                   <el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
                     <template slot="label">
@@ -285,18 +69,23 @@
             </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 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">
                       库位
                     </template>
-                    <span class="kw">{{item.materialBh}}</span>
+                    <el-link class="kw" :underline="false" type="primary" @click="operlogdialog(item.materialBh)">{{item.materialBh}}</el-link>
                   </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>
+                    <span v-if = "item.materialState=='0'">
+                      <el-tag size="mini" type="success">空闲</el-tag>
+                    </span>
+                    <span v-if = "item.materialState=='1'">
+                      <el-tag size="mini" type="danger" @click="selectLocation(item)">可用</el-tag>
+                    </span>
                   </el-descriptions-item>
                   <el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
                     <template slot="label">
@@ -333,18 +122,23 @@
             </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 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">
                       库位
                     </template>
-                    <span class="kw">{{item.materialBh}}</span>
+                    <el-link class="kw" :underline="false" type="primary" @click="operlogdialog(item.materialBh)">{{item.materialBh}}</el-link>
                   </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>
+                    <span v-if = "item.materialState=='0'">
+                      <el-tag size="mini" type="success">空闲</el-tag>
+                    </span>
+                    <span v-if = "item.materialState=='1'">
+                      <el-tag size="mini" type="danger" @click="selectLocation(item)">可用</el-tag>
+                    </span>
                   </el-descriptions-item>
                   <el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
                     <template slot="label">
@@ -380,14 +174,224 @@
               </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-tab-pane>
-  </el-tabs>
-
+          <!-- 添加或修改材料管理对话框 -->
+          <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+              <el-row>
+                <el-col :span="12">
+                  <el-form-item label="库位" prop="materialBh">
+                    <el-input v-model="form.materialBh" :disabled="true"/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="指令号" prop="materialZlh">
+                    <el-input v-model="form.materialZlh"/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="12">
+                  <el-form-item label="型号" prop="materialXingh">
+                    <el-input v-model="form.materialXingh" placeholder="请输入型号"/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="规格" prop="materialGuig">
+                    <el-input v-model="form.materialGuig" placeholder="请输入规格"/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="12">
+                  <el-form-item label="电压等级" prop="materialDiany">
+                    <el-input v-model="form.materialDiany" placeholder="请输入电压等级" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="米数" prop="materialMs">
+                    <el-input v-model="form.materialMs" placeholder="请输入米数" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+              <el-button type="primary" @click="submitForm">确 定</el-button>
+              <el-button @click="cancel">取 消</el-button>
+            </div>
+          </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-tab-pane>
+    </el-tabs>
+    <!-- 操作详情对话框 -->
+    <el-dialog :title="operlogTitle" :visible.sync="operlogOpen" width="1000px" append-to-body>
+      <operlog :materialBhProp="materialBhProp"></operlog>
+    </el-dialog>
+  </div>
 </template>
 <style>
   /*库位号样式*/
@@ -436,9 +440,11 @@
 </style>
 <script>
   import { listStorageLocation, checkStorageLocation,clearLocationLyCacheKey, confirmStorageLocation } from "@/api/storageLocation/storageConsuming";
+  import operlog from "@/views/storageLocation/operlog.vue";
 
   export default {
     name: "locationConsuming.vue",
+    components: {operlog},
     data() {
       return {
         activeName: 'locationShow',
@@ -473,6 +479,13 @@
         selMaterialDetailA:[],
         selMaterialDetailB:[],
         selMaterialDetailC:[],
+
+        // 操作记录弹出层标题
+        operlogTitle: "",
+        // 操作记录是否显示弹出层
+        operlogOpen: false,
+        materialBhProp: "",
+
         // 表单参数
         form: {},
         // 表单校验
@@ -700,6 +713,12 @@
           this.activeName =  'locationShow';
           this.getStorageLocation();
         });
+      },
+      //操作详情
+      operlogdialog(materialBh){
+        this.operlogTitle = "操作记录";
+        this.operlogOpen = true;
+        this.materialBhProp = materialBh;
       }
     }
   }
diff --git a/ruoyi-ui/src/views/storageLocation/locationSet.vue b/ruoyi-ui/src/views/storageLocation/locationSet.vue
index e89bcd2..c8280e0 100644
--- a/ruoyi-ui/src/views/storageLocation/locationSet.vue
+++ b/ruoyi-ui/src/views/storageLocation/locationSet.vue
@@ -30,7 +30,7 @@
                 <el-tag size="mini" type="success" @click="openDialog(item)">空闲</el-tag>
               </span>
               <span v-if = "item.materialState=='1'">
-                <el-tag size="mini" type="danger">占用</el-tag>
+                <el-tag size="mini" type="danger">已用</el-tag>
               </span>
             </el-descriptions-item>
             <el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
@@ -83,7 +83,7 @@
                 <el-tag size="mini" type="success" @click="openDialog(item)">空闲</el-tag>
               </span>
               <span v-if = "item.materialState=='1'">
-                <el-tag size="mini" type="danger">占用</el-tag>
+                <el-tag size="mini" type="danger">已用</el-tag>
               </span>
             </el-descriptions-item>
             <el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
@@ -136,7 +136,7 @@
                 <el-tag size="mini" type="success" @click="openDialog(item)">空闲</el-tag>
               </span>
               <span v-if = "item.materialState=='1'">
-                <el-tag size="mini" type="danger">占用</el-tag>
+                <el-tag size="mini" type="danger">已用</el-tag>
               </span>
             </el-descriptions-item>
             <el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>