'20240318'

This commit is contained in:
xd 2024-03-18 16:21:52 +08:00
parent be7bea1ca5
commit 48a3790e2b
4 changed files with 152 additions and 11 deletions

View File

@ -80,7 +80,7 @@ spring:
# redis 配置 # redis 配置
redis: redis:
# 地址 # 地址
host: localhost host: 192.168.9.130
# 端口默认为6379 # 端口默认为6379
port: 6379 port: 6379
# 数据库索引 # 数据库索引

View File

@ -42,7 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update> </update>
<update id="confirmStorageLocation" parameterType="java.util.List"> <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> <where>
materialBh materialBh
<foreach collection="list" item="item" index="index" open="in (" close=")" separator=","> <foreach collection="list" item="item" index="index" open="in (" close=")" separator=",">

View File

@ -20,7 +20,7 @@
<template slot="label"> <template slot="label">
库位 库位
</template> </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>
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'> <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
<template slot="label"> <template slot="label">
@ -73,7 +73,7 @@
<template slot="label"> <template slot="label">
库位 库位
</template> </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>
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'> <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
<template slot="label"> <template slot="label">
@ -126,7 +126,7 @@
<template slot="label"> <template slot="label">
库位 库位
</template> </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>
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'> <el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
<template slot="label"> <template slot="label">
@ -174,8 +174,8 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </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-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
@ -219,12 +219,16 @@
<el-button @click="cancel"> </el-button> <el-button @click="cancel"> </el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 操作详情对话框 -->
<el-dialog :title="operlogTitle" :visible.sync="operlogOpen" width="1000px" append-to-body>
<operlog></operlog>
</el-dialog>
</div> </div>
</template> </template>
<style> <style>
/*库位号样式*/ /*库位号样式*/
.kw{ .kw{
font-size: 15px;color: black;font-weight: bold font-size: 15px;color: black;font-weight: bold;
} }
/* 修改标签本身的样式 */ /* 修改标签本身的样式 */
@ -233,9 +237,9 @@
} }
/*卡片内容滚动条设置*/ /*卡片内容滚动条设置*/
::-webkit-scrollbar { /*::-webkit-scrollbar {
display: none; /* Chrome Safari */ display: none; !* Chrome Safari *!
} }*/
.scrollable{ .scrollable{
overflow: auto; /* 自动开启滚动条 */ overflow: auto; /* 自动开启滚动条 */
max-height: 600px; /* 设置最大高度 */ max-height: 600px; /* 设置最大高度 */
@ -268,11 +272,18 @@
</style> </style>
<script> <script>
import { listStorageLocation, addStorageLocation, checkStorageLocation,cancelStorageLocation } from "@/api/storageLocation/storageLocation"; import { listStorageLocation, addStorageLocation, checkStorageLocation,cancelStorageLocation } from "@/api/storageLocation/storageLocation";
//
import operlog from '@/views/storageLocation/operlog.vue';
export default { export default {
name: "locationSet", name: "locationSet",
components: {
//
'operlog': operlog
},
data() { data() {
return { return {
// //
contentStyle: { contentStyle: {
'text-align': 'center', 'text-align': 'center',
@ -290,6 +301,8 @@
materialMs: null materialMs: null
}, },
//
showClose: false,
// //
title: "", title: "",
// //
@ -298,6 +311,12 @@
materialDetailA:[], materialDetailA:[],
materialDetailB:[], materialDetailB:[],
materialDetailC:[], materialDetailC:[],
//
operlogTitle: "",
//
operlogOpen: false,
// //
form: {}, form: {},
// //
@ -402,6 +421,11 @@
materialMs: null materialMs: null
}; };
this.resetForm("form"); this.resetForm("form");
},
//
operlogdialog(){
this.operlogTitle = "操作记录";
this.operlogOpen = true;
} }
} }
} }

View File

@ -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>