xd
/
JNBusiness
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

111

This commit is contained in:
xd 2024-03-18 20:34:41 +08:00
parent 8d2169d2bb
commit 581dc8e385
2 changed files with 269 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ruoyi-ui/src/views/storageLocation/locationConsuming.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div>
<el-tabs v-model="activeName" @tab-click="handleClick" style="margin-left: 15px; margin-right: 15px;"> <el-tabs v-model="activeName" @tab-click="handleClick" style="margin-left: 15px; margin-right: 15px;">
<el-tab-pane label="库位查看" name="locationShow"> <el-tab-pane label="库位查看" name="locationShow">
<el-row :gutter="10" style="letter-spacing: 5px;"> <el-row :gutter="10" style="letter-spacing: 5px;">
@ -21,7 +21,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)">{{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">
@ -31,7 +31,7 @@
<el-tag size="mini" type="success">空闲</el-tag> <el-tag size="mini" type="success">空闲</el-tag>
</span> </span>
<span v-if = "item.materialState=='1'"> <span v-if = "item.materialState=='1'">
<el-tag size="mini" type="danger" @click="selectLocation(item)">占用</el-tag> <el-tag size="mini" type="danger" @click="selectLocation(item)">可用</el-tag>
</span> </span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'> <el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
@ -74,7 +74,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)">{{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">
@ -84,7 +84,7 @@
<el-tag size="mini" type="success">空闲</el-tag> <el-tag size="mini" type="success">空闲</el-tag>
</span> </span>
<span v-if = "item.materialState=='1'"> <span v-if = "item.materialState=='1'">
<el-tag size="mini" type="danger" @click="selectLocation(item)">占用</el-tag> <el-tag size="mini" type="danger" @click="selectLocation(item)">可用</el-tag>
</span> </span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'> <el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
@ -127,7 +127,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)">{{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">
@ -137,7 +137,7 @@
<el-tag size="mini" type="success">空闲</el-tag> <el-tag size="mini" type="success">空闲</el-tag>
</span> </span>
<span v-if = "item.materialState=='1'"> <span v-if = "item.materialState=='1'">
<el-tag size="mini" type="danger" @click="selectLocation(item)">占用</el-tag> <el-tag size="mini" type="danger" @click="selectLocation(item)">可用</el-tag>
</span> </span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'> <el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
@ -387,7 +387,11 @@
</el-container> </el-container>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<!-- 操作详情对话框 -->
<el-dialog :title="operlogTitle" :visible.sync="operlogOpen" width="1000px" append-to-body>
<operlog :materialBhProp="materialBhProp"></operlog>
</el-dialog>
</div>
</template> </template>
<style> <style>
/*库位号样式*/ /*库位号样式*/
@ -436,9 +440,11 @@
</style> </style>
<script> <script>
import { listStorageLocation, checkStorageLocation,clearLocationLyCacheKey, confirmStorageLocation } from "@/api/storageLocation/storageConsuming"; import { listStorageLocation, checkStorageLocation,clearLocationLyCacheKey, confirmStorageLocation } from "@/api/storageLocation/storageConsuming";
import operlog from "@/views/storageLocation/operlog.vue";
export default { export default {
name: "locationConsuming.vue", name: "locationConsuming.vue",
components: {operlog},
data() { data() {
return { return {
activeName: 'locationShow', activeName: 'locationShow',
@ -473,6 +479,13 @@
selMaterialDetailA:[], selMaterialDetailA:[],
selMaterialDetailB:[], selMaterialDetailB:[],
selMaterialDetailC:[], selMaterialDetailC:[],
// 操作记录弹出层标题
operlogTitle: "",
// 操作记录是否显示弹出层
operlogOpen: false,
materialBhProp: "",
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
@ -700,6 +713,12 @@
this.activeName = 'locationShow'; this.activeName = 'locationShow';
this.getStorageLocation(); this.getStorageLocation();
}); });
},
//操作详情
operlogdialog(materialBh){
this.operlogTitle = "操作记录";
this.operlogOpen = true;
this.materialBhProp = materialBh;
} }
} }
} }

6
ruoyi-ui/src/views/storageLocation/locationSet.vue
View File

@ -30,7 +30,7 @@
<el-tag size="mini" type="success" @click="openDialog(item)">空闲</el-tag> <el-tag size="mini" type="success" @click="openDialog(item)">空闲</el-tag>
</span> </span>
<span v-if = "item.materialState=='1'"> <span v-if = "item.materialState=='1'">
<el-tag size="mini" type="danger">占用</el-tag> <el-tag size="mini" type="danger">已用</el-tag>
</span> </span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'> <el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
@ -83,7 +83,7 @@
<el-tag size="mini" type="success" @click="openDialog(item)">空闲</el-tag> <el-tag size="mini" type="success" @click="openDialog(item)">空闲</el-tag>
</span> </span>
<span v-if = "item.materialState=='1'"> <span v-if = "item.materialState=='1'">
<el-tag size="mini" type="danger">占用</el-tag> <el-tag size="mini" type="danger">已用</el-tag>
</span> </span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'> <el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
@ -136,7 +136,7 @@
<el-tag size="mini" type="success" @click="openDialog(item)">空闲</el-tag> <el-tag size="mini" type="success" @click="openDialog(item)">空闲</el-tag>
</span> </span>
<span v-if = "item.materialState=='1'"> <span v-if = "item.materialState=='1'">
<el-tag size="mini" type="danger">占用</el-tag> <el-tag size="mini" type="danger">已用</el-tag>
</span> </span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'> <el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>