From 48a3790e2b1937503bfa582a25b006a3960c63ae Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Mon, 18 Mar 2024 16:21:52 +0800
Subject: [PATCH] '20240318'

---
 .../src/main/resources/application.yml        |   2 +-
 .../storageLocation/StorageLocationMapper.xml |   3 +-
 .../src/views/storageLocation/locationSet.vue |  42 +++++--
 .../src/views/storageLocation/operlog.vue     | 116 ++++++++++++++++++
 4 files changed, 152 insertions(+), 11 deletions(-)
 create mode 100644 ruoyi-ui/src/views/storageLocation/operlog.vue

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index bf6a1f7..f98c42a 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -80,7 +80,7 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: localhost
+    host: 192.168.9.130
     # 端口，默认为6379
     port: 6379
     # 数据库索引
diff --git a/ruoyi-system/src/main/resources/mapper/storageLocation/StorageLocationMapper.xml b/ruoyi-system/src/main/resources/mapper/storageLocation/StorageLocationMapper.xml
index 487920a..940d958 100644
--- a/ruoyi-system/src/main/resources/mapper/storageLocation/StorageLocationMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/storageLocation/StorageLocationMapper.xml
@@ -42,7 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <update id="confirmStorageLocation" parameterType="java.util.List">
-        update storageLocation set materialState = '0'
+        update storageLocation set materialState = '0',materialZlh = null,materialXingh = null,materialGuig = null,
+        materialDiany = null, materialMs = null
         <where>
             materialBh
             <foreach collection="list" item="item" index="index" open="in (" close=")" separator=",">
diff --git a/ruoyi-ui/src/views/storageLocation/locationSet.vue b/ruoyi-ui/src/views/storageLocation/locationSet.vue
index f54f5c5..920ccad 100644
--- a/ruoyi-ui/src/views/storageLocation/locationSet.vue
+++ b/ruoyi-ui/src/views/storageLocation/locationSet.vue
@@ -20,7 +20,7 @@
               <template slot="label">
                 库位
               </template>
-              <span class="kw">{{item.materialBh}}</span>
+              <el-link class="kw" :underline="false" type="primary" @click="operlogdialog">{{item.materialBh}}</el-link>
             </el-descriptions-item>
             <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
               <template slot="label">
@@ -73,7 +73,7 @@
               <template slot="label">
                 库位
               </template>
-              <span class="kw">{{item.materialBh}}</span>
+              <el-link class="kw" :underline="false" type="primary" @click="operlogdialog">{{item.materialBh}}</el-link>
             </el-descriptions-item>
             <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
               <template slot="label">
@@ -126,7 +126,7 @@
               <template slot="label">
                 库位
               </template>
-              <span class="kw">{{item.materialBh}}</span>
+              <el-link class="kw" :underline="false" type="primary" @click="operlogdialog">{{item.materialBh}}</el-link>
             </el-descriptions-item>
             <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
               <template slot="label">
@@ -174,8 +174,8 @@
       </el-col>
     </el-row>
   </div>
-  <!-- 添加或修改材料管理对话框 -->
-  <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+  <!-- 录入/修改对话框 -->
+  <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :show-close="showClose">
     <el-form ref="form" :model="form" :rules="rules" label-width="80px">
       <el-row>
         <el-col :span="12">
@@ -219,12 +219,16 @@
       <el-button @click="cancel">取 消</el-button>
     </div>
   </el-dialog>
+   <!-- 操作详情对话框 -->
+   <el-dialog :title="operlogTitle" :visible.sync="operlogOpen" width="1000px" append-to-body>
+     <operlog></operlog>
+   </el-dialog>
  </div>
 </template>
 <style>
   /*库位号样式*/
   .kw{
-    font-size: 15px;color: black;font-weight: bold
+    font-size: 15px;color: black;font-weight: bold;
   }
 
   /* 修改标签本身的样式 */
@@ -233,9 +237,9 @@
   }
 
   /*卡片内容滚动条设置*/
-  ::-webkit-scrollbar {
-    display: none; /* Chrome Safari */
-  }
+  /*::-webkit-scrollbar {
+    display: none; !* Chrome Safari *!
+  }*/
   .scrollable{
     overflow: auto; /* 自动开启滚动条 */
     max-height: 600px; /* 设置最大高度 */
@@ -268,11 +272,18 @@
 </style>
 <script>
   import { listStorageLocation, addStorageLocation, checkStorageLocation,cancelStorageLocation } from "@/api/storageLocation/storageLocation";
+  // 导入操作记录详情组件
+  import operlog from '@/views/storageLocation/operlog.vue';
 
   export default {
         name: "locationSet",
+        components: {
+          // 注册组件
+          'operlog': operlog
+        },
         data() {
           return {
+
             //内容样式
             contentStyle: {
               'text-align': 'center',
@@ -290,6 +301,8 @@
               materialMs: null
             },
 
+            //弹窗右上角关闭按钮
+            showClose: false,
             // 弹出层标题
             title: "",
             // 是否显示弹出层
@@ -298,6 +311,12 @@
             materialDetailA:[],
             materialDetailB:[],
             materialDetailC:[],
+
+            // 操作记录弹出层标题
+            operlogTitle: "",
+            // 操作记录是否显示弹出层
+            operlogOpen: false,
+
             // 表单参数
             form: {},
             // 表单校验
@@ -402,6 +421,11 @@
             materialMs: null
           };
           this.resetForm("form");
+        },
+        //操作详情
+        operlogdialog(){
+          this.operlogTitle = "操作记录";
+          this.operlogOpen = true;
         }
       }
     }
diff --git a/ruoyi-ui/src/views/storageLocation/operlog.vue b/ruoyi-ui/src/views/storageLocation/operlog.vue
new file mode 100644
index 0000000..9af549b
--- /dev/null
+++ b/ruoyi-ui/src/views/storageLocation/operlog.vue
@@ -0,0 +1,116 @@
+<template>
+  <el-table
+    :data="tableData"
+    height="500"
+    style="width: 100%">
+    <el-table-column
+      prop="operDate"
+      label="时间"
+      width="200"
+      fixed>
+    </el-table-column>
+    <el-table-column
+      prop="operName"
+      label="操作人"
+      width="100"
+      fixed>
+    </el-table-column>
+    <el-table-column
+      prop="operEvent"
+      label="事件"
+      width="120"
+      fixed>
+    </el-table-column>
+    <el-table-column label="录入信息">
+      <el-table-column
+        prop="operZlh"
+        label="指令号"
+        width="150">
+      </el-table-column>
+      <el-table-column
+        prop="operXingh"
+        label="型号"
+        width="150">
+      </el-table-column>
+      <el-table-column
+        prop="operGuig"
+        label="规格"
+        width="150">
+      </el-table-column>
+      <el-table-column
+        prop="operDiany"
+        label="电压等级"
+        width="100">
+      </el-table-column>
+      <el-table-column
+        prop="operMs"
+        label="米数"
+        width="100">
+      </el-table-column>
+    </el-table-column>
+  </el-table>
+</template>
+<script>
+  export default {
+    name: 'Operlog',
+    data() {
+      return {
+        tableData: [{
+          operDate: '2016-05-02',
+          operName: '王小虎',
+          operEvent: '上海市普陀区金沙江路 1518 弄',
+          operZlh: '上海市普陀区金沙江路 1518 弄',
+          operXingh: '上海市普陀区金沙江路 1518 弄',
+          operGuig: '上海市普陀区金沙江路 1518 弄',
+          operDiany: '上海市普陀区金沙江路 1518 弄',
+          operMs: '上海市普陀区金沙江路 1518 弄',
+        },{
+          operDate: '2016-05-02',
+          operName: '王小虎',
+          operEvent: '上海市普陀区金沙江路 1518 弄',
+          operZlh: '上海市普陀区金沙江路 1518 弄',
+          operXingh: '上海市普陀区金沙江路 1518 弄',
+          operGuig: '上海市普陀区金沙江路 1518 弄',
+          operDiany: '上海市普陀区金沙江路 1518 弄',
+          operMs: '上海市普陀区金沙江路 1518 弄',
+        },{
+          operDate: '2016-05-02',
+          operName: '王小虎',
+          operEvent: '上海市普陀区金沙江路 1518 弄',
+          operZlh: '上海市普陀区金沙江路 1518 弄',
+          operXingh: '上海市普陀区金沙江路 1518 弄',
+          operGuig: '上海市普陀区金沙江路 1518 弄',
+          operDiany: '上海市普陀区金沙江路 1518 弄',
+          operMs: '上海市普陀区金沙江路 1518 弄',
+        },{
+          operDate: '2016-05-02',
+          operName: '王小虎',
+          operEvent: '上海市普陀区金沙江路 1518 弄',
+          operZlh: '上海市普陀区金沙江路 1518 弄',
+          operXingh: '上海市普陀区金沙江路 1518 弄',
+          operGuig: '上海市普陀区金沙江路 1518 弄',
+          operDiany: '上海市普陀区金沙江路 1518 弄',
+          operMs: '上海市普陀区金沙江路 1518 弄',
+        },{
+          operDate: '2016-05-02',
+          operName: '王小虎',
+          operEvent: '上海市普陀区金沙江路 1518 弄',
+          operZlh: '上海市普陀区金沙江路 1518 弄',
+          operXingh: '上海市普陀区金沙江路 1518 弄',
+          operGuig: '上海市普陀区金沙江路 1518 弄',
+          operDiany: '上海市普陀区金沙江路 1518 弄',
+          operMs: '上海市普陀区金沙江路 1518 弄',
+        },{
+          operDate: '2016-05-02',
+          operName: '王小虎',
+          operEvent: '上海市普陀区金沙江路 1518 弄',
+          operZlh: '上海市普陀区金沙江路 1518 弄',
+          operXingh: '上海市普陀区金沙江路 1518 弄',
+          operGuig: '上海市普陀区金沙江路 1518 弄',
+          operDiany: '上海市普陀区金沙江路 1518 弄',
+          operMs: '上海市普陀区金沙江路 1518 弄',
+        }]
+      }
+    }
+  }
+</script>