feat(wms): 新增钢卷状态管理和库位查询功能
refactor(warehouse): 将仓库相关术语统一修改为库位 style(warehouse): 优化库位管理界面表单布局 fix(warehouse): 修复树形组件数据展示问题 新增钢卷状态管理功能,支持在列表中直接修改状态 为钢卷管理添加库位查询条件,优化数据展示逻辑 统一将仓库相关术语修改为库位,保持系统一致性 移除部分无用代码和注释,优化界面布局
This commit is contained in:
@@ -1,24 +1,24 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="60px">
|
||||
<el-form-item label="仓库编码" prop="warehouseCode">
|
||||
<el-form-item label="库位编码" prop="warehouseCode">
|
||||
<el-input
|
||||
v-model="queryParams.warehouseCode"
|
||||
placeholder="请输入仓库编码"
|
||||
placeholder="请输入库位编码"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="仓库名称" prop="warehouseName">
|
||||
<el-form-item label="库位名称" prop="warehouseName">
|
||||
<el-input
|
||||
v-model="queryParams.warehouseName"
|
||||
placeholder="请输入仓库名称"
|
||||
placeholder="请输入库位名称"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="仓库类型" prop="warehouseType">
|
||||
<el-select v-model="queryParams.warehouseType" placeholder="请选择仓库类型" clearable>
|
||||
<!-- <el-form-item label="库位类型" prop="warehouseType">
|
||||
<el-select v-model="queryParams.warehouseType" placeholder="请选择库位类型" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.warehouse_type"
|
||||
:key="dict.value"
|
||||
@@ -47,7 +47,6 @@
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
|
||||
>新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
@@ -71,9 +70,9 @@
|
||||
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
|
||||
>
|
||||
<!-- <el-table-column label="上级节点" prop="parentId" /> -->
|
||||
<el-table-column label="仓库编码" align="center" prop="warehouseCode" />
|
||||
<el-table-column label="仓库名称" align="center" prop="warehouseName" />
|
||||
<!-- <el-table-column label="仓库类型" align="center" prop="warehouseType">
|
||||
<el-table-column label="库位编码" align="center" prop="warehouseCode" />
|
||||
<el-table-column label="库位名称" align="center" prop="warehouseName" />
|
||||
<!-- <el-table-column label="库位类型" align="center" prop="warehouseType">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.warehouse_type" :value="scope.row.warehouseType"/>
|
||||
</template>
|
||||
@@ -109,20 +108,20 @@
|
||||
</el-table-column>
|
||||
</KLPTable>
|
||||
|
||||
<!-- 添加或修改仓库/库区/库位自关联对话框 -->
|
||||
<!-- 添加或修改库位/库区/库位自关联对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
||||
<el-form-item label="上级节点" prop="parentId">
|
||||
<WarehouseSelect v-model="form.parentId" placeholder="请选择上级节点" />
|
||||
</el-form-item>
|
||||
<el-form-item label="仓库编码" prop="warehouseCode">
|
||||
<el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" />
|
||||
<el-form-item label="库位编码" prop="warehouseCode">
|
||||
<el-input v-model="form.warehouseCode" placeholder="请输入库位编码" />
|
||||
</el-form-item>
|
||||
<el-form-item label="仓库名称" prop="warehouseName">
|
||||
<el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
|
||||
<el-form-item label="库位名称" prop="warehouseName">
|
||||
<el-input v-model="form.warehouseName" placeholder="请输入库位名称" />
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="仓库类型" prop="warehouseType">
|
||||
<el-select v-model="form.warehouseType" placeholder="请选择仓库类型">
|
||||
<!-- <el-form-item label="库位类型" prop="warehouseType">
|
||||
<el-select v-model="form.warehouseType" placeholder="请选择库位类型">
|
||||
<el-option
|
||||
v-for="dict in dict.type.warehouse_type"
|
||||
:key="dict.value"
|
||||
@@ -173,9 +172,9 @@ export default {
|
||||
loading: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 仓库/库区/库位自关联表格数据
|
||||
// 库位/库区/库位自关联表格数据
|
||||
warehouseList: [],
|
||||
// 仓库/库区/库位自关联树选项
|
||||
// 库位/库区/库位自关联树选项
|
||||
warehouseOptions: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
@@ -199,10 +198,10 @@ export default {
|
||||
// 表单校验
|
||||
rules: {
|
||||
warehouseCode: [
|
||||
{ required: true, message: "仓库/库区编码不能为空", trigger: "blur" }
|
||||
{ required: true, message: "库位/库区编码不能为空", trigger: "blur" }
|
||||
],
|
||||
warehouseName: [
|
||||
{ required: true, message: "仓库/库区名称不能为空", trigger: "blur" }
|
||||
{ required: true, message: "库位/库区名称不能为空", trigger: "blur" }
|
||||
],
|
||||
warehouseType: [
|
||||
{ required: true, message: "类型不能为空", trigger: "change" }
|
||||
@@ -214,7 +213,7 @@ export default {
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
/** 查询仓库/库区/库位自关联列表 */
|
||||
/** 查询库位/库区/库位自关联列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listWarehouse(this.queryParams).then(response => {
|
||||
@@ -233,7 +232,7 @@ export default {
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
/** 转换仓库/库区/库位自关联数据结构 */
|
||||
/** 转换库位/库区/库位自关联数据结构 */
|
||||
normalizer(node) {
|
||||
if (node.children && !node.children.length) {
|
||||
delete node.children;
|
||||
@@ -244,7 +243,7 @@ export default {
|
||||
children: node.children
|
||||
};
|
||||
},
|
||||
/** 查询仓库/库区/库位自关联下拉树结构 */
|
||||
/** 查询库位/库区/库位自关联下拉树结构 */
|
||||
getTreeselect() {
|
||||
listWarehouse().then(response => {
|
||||
this.warehouseOptions = [];
|
||||
@@ -296,7 +295,7 @@ export default {
|
||||
this.form.parentId = 0;
|
||||
}
|
||||
this.open = true;
|
||||
this.title = "添加仓库/库区/库位自关联";
|
||||
this.title = "添加库位/库区/库位自关联";
|
||||
},
|
||||
/** 展开/折叠操作 */
|
||||
toggleExpandAll() {
|
||||
@@ -318,7 +317,7 @@ export default {
|
||||
this.loading = false;
|
||||
this.form = response.data;
|
||||
this.open = true;
|
||||
this.title = "修改仓库/库区/库位自关联";
|
||||
this.title = "修改库位/库区/库位自关联";
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
@@ -353,7 +352,7 @@ export default {
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
this.$modal.confirm('是否确认删除仓库/库区/库位自关联编号为"' + row.warehouseId + '"的数据项?').then(() => {
|
||||
this.$modal.confirm('是否确认删除库位/库区/库位自关联编号为"' + row.warehouseId + '"的数据项?').then(() => {
|
||||
this.loading = true;
|
||||
return delWarehouse(row.warehouseId);
|
||||
}).then(() => {
|
||||
|
||||
Reference in New Issue
Block a user