DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(ActualWarehouseSelect): 替换el-select为treeselect组件并优化功能

Browse Source 
重构实际仓库选择组件，使用vue-treeselect替代原有el-select实现树形选择功能
优化数据处理逻辑，增加对顶级节点的支持
调整样式布局，限制最大宽度为200px
This commit is contained in:
砂糖
2025-11-24 13:51:39 +08:00
parent 1c1f7d92e2
commit ff6acdde63
2 changed files with 126 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
klp-ui/src/components/KLPService/ActualWarehouseSelect/index.vue
View File

@@ -1,32 +1,30 @@
<template> <template>
<el-select <div style="width: 100%; max-width: 200px;">
v-model="selected" <treeselect
:max-height="200"
v-model="innerValue"
:options="warehouseOptions"
:normalizer="normalizer"
:placeholder="placeholder" :placeholder="placeholder"
:clearable="clearable" :clearable="clearable"
:disabled="disabled" :disable-branch-nodes="true"
:size="size" :show-count="true"
filterable search-nested
@change="onChange" @input="onInput"
style="width: 100%" />
> </div>
<el-option
v-for="item in warehouseOptions"
:key="item.actualWarehouseId"
:label="item.actualWarehouseName"
:value="item.actualWarehouseId"
>
<span :style="{ paddingLeft: item.level * 20 + 'px' }">
{{ item.actualWarehouseName }}
</span>
</el-option>
</el-select>
</template> </template>
<script> <script>
import Treeselect from '@riophae/vue-treeselect';
import '@riophae/vue-treeselect/dist/vue-treeselect.css';
import { listActualWarehouse } from '@/api/wms/actualWarehouse'; import { listActualWarehouse } from '@/api/wms/actualWarehouse';
export default { export default {
name: 'ActualWarehouseSelect', name: 'ActualWarehouseSelect',
components: { Treeselect },
props: { props: {
value: { value: {
type: [Number, String, null], type: [Number, String, null],
@@ -34,34 +32,27 @@ export default {
}, },
placeholder: { placeholder: {
type: String, type: String,
default: '请选择实际库区/库位' default: '请选择库区/仓库/库位'
}, },
clearable: { clearable: {
type: Boolean, type: Boolean,
default: true default: true
}, },
disabled: {
type: Boolean,
default: false
},
size: {
type: String,
default: 'mini'
},
showTop: { showTop: {
type: Boolean, type: Boolean,
default: false // 是否显示顶级节点 default: true // 是否显示顶级节点
} }
}, },
data() { data() {
return { return {
warehouseOptions: [], warehouseOptions: [],
selected: this.value innerValue: this.value,
list: []
}; };
}, },
watch: { watch: {
value(val) { value(val) {
this.selected = val; this.innerValue = val;
} }
}, },
mounted() { mounted() {
@@ -69,52 +60,52 @@ export default {
}, },
methods: { methods: {
loadOptions() { loadOptions() {
listActualWarehouse({ pageSize: 1000 }).then(response => { listActualWarehouse().then(response => {
console.log('实际库区/库位自关联API返回数据:', response); this.list = response.data.map(item => ({
const data = response.rows || []; ...item,
console.log('处理后的数据:', data); isDisabled: !item.isEnabled
// this.warehouseOptions = this.buildTreeOptions(data); }));
this.warehouseOptions = data;
console.log('构建的树形选项:', this.warehouseOptions);
}).catch(error => {
console.error("加载仓库选项失败:", error);
this.warehouseOptions = [];
});
},
buildTreeOptions(data, parentId = null, level = 0) {
const options = []; const options = [];
if (this.showTop) {
data.forEach(item => { const top = { actualWarehouseId: 0, actualWarehouseName: '顶级节点', children: [] };
if (item.parentId === parentId) { top.children = this.handleTree(response.data, 'actualWarehouseId', 'parentId');
const option = { options.push(top);
warehouseId: item.warehouseId,
warehouseName: item.warehouseName,
level: level
};
// 递归构建子节点
const children = this.buildTreeOptions(data, item.warehouseId, level + 1);
if (children.length > 0) {
options.push(option);
options.push(...children);
} else { } else {
options.push(option); options.push(...this.handleTree(response.data, 'actualWarehouseId', 'parentId'));
}
} }
this.warehouseOptions = options;
}); });
return options;
}, },
onChange(val) { handleTree(data, id, parentId) {
const cloneData = JSON.parse(JSON.stringify(data));
return cloneData.filter(father => {
const branchArr = cloneData.filter(child => father[id] === child[parentId]);
if (branchArr.length > 0) father.children = branchArr;
return father[parentId] === 0 || father[parentId] === null;
});
},
normalizer(node) {
if (node.children && !node.children.length) {
delete node.children;
}
return {
id: node.actualWarehouseId,
label: node.actualWarehouseName,
children: node.children
};
},
onInput(val) {
// 选中顶级节点时，返回null
if (val === 0) {
this.$emit('input', 0);
this.innerValue = 0;
} else {
this.$emit('input', val); this.$emit('input', val);
this.$emit('change', val); // 查找完整的实际仓库对象
const actualWarehouse = this.list.find(item => item.actualWarehouseId === val);
this.$emit('change', actualWarehouse);
}
} }
} }
}; };
</script> </script>
<style scoped>
.el-select {
width: 100%;
}
</style>

166
klp-ui/src/views/wms/warehouse/real.vue
View File

@@ -1,10 +1,10 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="60px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="库位编码" prop="actualWarehouseCode"> <el-form-item label="库位编码" prop="actualWarehouseCode">
<el-input <el-input
v-model="queryParams.actualWarehouseCode" v-model="queryParams.actualWarehouseCode"
placeholder="请输入库位编码" placeholder="请输入实际库区/库位编码"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@@ -12,26 +12,26 @@
<el-form-item label="库位名称" prop="actualWarehouseName"> <el-form-item label="库位名称" prop="actualWarehouseName">
<el-input <el-input
v-model="queryParams.actualWarehouseName" v-model="queryParams.actualWarehouseName"
placeholder="请输入库位名称" placeholder="请输入实际库区/库位名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="库位类型" prop="warehouseType"> <el-form-item label="排序号" prop="sortNo">
<el-select v-model="queryParams.warehouseType" placeholder="请选择库位类型" clearable> <el-input
<el-option v-model="queryParams.sortNo"
v-for="dict in dict.type.warehouse_type" placeholder="请输入同级排序号"
:key="dict.value" clearable
:label="dict.label" @keyup.enter.native="handleQuery"
:value="dict.value" />
</el-form-item>
<el-form-item label="是否启用" prop="isEnabled">
<el-input
v-model="queryParams.isEnabled"
placeholder="请输入是否启用"
clearable
@keyup.enter.native="handleQuery"
/> />
</el-select>
</el-form-item> -->
<el-form-item label="启用状态" prop="isEnabled">
<el-select v-model="queryParams.isEnabled" placeholder="请选择启用状态" clearable>
<el-option label="启用" :value="1" />
<el-option label="禁用" :value="0" />
</el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -61,28 +61,18 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<KLPTable <el-table
v-if="refreshTable" v-if="refreshTable"
v-loading="loading" v-loading="loading"
:data="warehouseList" :data="actualWarehouseList"
row-key="actualWarehouseId" row-key="actualWarehouseId"
:default-expand-all="isExpandAll" :default-expand-all="isExpandAll"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}" :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
> >
<!-- <el-table-column label="上级节点" prop="parentId" /> -->
<el-table-column label="库位编码" align="center" prop="actualWarehouseCode" /> <el-table-column label="库位编码" align="center" prop="actualWarehouseCode" />
<el-table-column label="库位名称" align="center" prop="actualWarehouseName" /> <el-table-column label="库位名称" align="center" prop="actualWarehouseName" />
<!-- <el-table-column label="库位类型" align="center" prop="warehouseType"> <el-table-column label="同级排序号" align="center" prop="sortNo" />
<template slot-scope="scope"> <!-- <el-table-column label="是否启用" align="center" prop="isEnabled" /> -->
<dict-tag :options="dict.type.warehouse_type" :value="scope.row.warehouseType"/>
</template>
</el-table-column> -->
<el-table-column label="排序号" align="center" prop="sortNo" />
<el-table-column label="启用状态" align="center" prop="isEnabled">
<template slot-scope="scope">
<span>{{ scope.row.isEnabled == 1 ? '启用' : '禁用' }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -92,12 +82,12 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
>修改</el-button> >修改</el-button>
<!-- <el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-plus" icon="el-icon-plus"
@click="handleAdd(scope.row)" @click="handleAdd(scope.row)"
>新增</el-button> --> >新增</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@@ -106,39 +96,26 @@
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</KLPTable> </el-table>
<!-- 添加或修改库位/库区/库位自关联对话框 --> <!-- 添加或修改实际库区/库位自关联对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <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 ref="form" :model="form" :rules="rules" label-width="80px">
<!-- <el-form-item label="上级节点" prop="parentId"> <el-form-item label="父节点" prop="parentId">
<WarehouseSelect v-model="form.parentId" placeholder="请选择上级节点" /> <treeselect :max-height="200" v-model="form.parentId" :options="actualWarehouseOptions" :normalizer="normalizer" placeholder="请选择父节点ID" />
</el-form-item> --> </el-form-item>
<el-form-item label="库位编码" prop="actualWarehouseCode"> <el-form-item label="库位编码" prop="actualWarehouseCode">
<el-input v-model="form.actualWarehouseCode" placeholder="请输入库位编码" /> <el-input v-model="form.actualWarehouseCode" placeholder="请输入实际库区/库位编码" />
</el-form-item> </el-form-item>
<el-form-item label="库位名称" prop="actualWarehouseName"> <el-form-item label="库位名称" prop="actualWarehouseName">
<el-input v-model="form.actualWarehouseName" placeholder="请输入库位名称" /> <el-input v-model="form.actualWarehouseName" placeholder="请输入实际库区/库位名称" />
</el-form-item> </el-form-item>
<!-- <el-form-item label="库位类型" prop="warehouseType"> <el-form-item label="排序" prop="sortNo">
<el-select v-model="form.warehouseType" placeholder="请选择库位类型"> <el-input v-model="form.sortNo" placeholder="请输入同级排序号" />
<el-option </el-form-item>
v-for="dict in dict.type.warehouse_type" <!-- <el-form-item label="是否启用" prop="isEnabled">
:key="dict.value" <el-input v-model="form.isEnabled" placeholder="请输入是否启用" />
:label="dict.label"
:value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item> --> </el-form-item> -->
<el-form-item label="排序号" prop="sortNo">
<el-input v-model="form.sortNo" placeholder="请输入排序号" />
</el-form-item>
<el-form-item label="启用状态" prop="isEnabled">
<el-select v-model="form.isEnabled" placeholder="请选择启用状态">
<el-option label="启用" :value="1" />
<el-option label="禁用" :value="0" />
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" /> <el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item> </el-form-item>
@@ -155,14 +132,11 @@
import { listActualWarehouse, getActualWarehouse, delActualWarehouse, addActualWarehouse, updateActualWarehouse } from "@/api/wms/actualWarehouse"; import { listActualWarehouse, getActualWarehouse, delActualWarehouse, addActualWarehouse, updateActualWarehouse } from "@/api/wms/actualWarehouse";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
// import ActualWarehouseSelect from '@/components/ActualWarehouseSelect';
export default { export default {
name: "ActualWarehouse", name: "ActualWarehouse",
// dicts: ['warehouse_type'],
components: { components: {
Treeselect, Treeselect
// ActualWarehouseSelect
}, },
data() { data() {
return { return {
@@ -172,10 +146,10 @@ export default {
loading: true, loading: true,
// 显示搜索条件 // 显示搜索条件
showSearch: true, showSearch: true,
// 库位/库区/库位自关联表格数据 // 实际库区/库位自关联表格数据
warehouseList: [], actualWarehouseList: [],
// 库位/库区/库位自关联树选项 // 实际库区/库位自关联树选项
warehouseOptions: [], actualWarehouseOptions: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
@@ -189,7 +163,7 @@ export default {
parentId: undefined, parentId: undefined,
actualWarehouseCode: undefined, actualWarehouseCode: undefined,
actualWarehouseName: undefined, actualWarehouseName: undefined,
warehouseType: undefined, actualWarehouseType: undefined,
sortNo: undefined, sortNo: undefined,
isEnabled: undefined, isEnabled: undefined,
}, },
@@ -197,15 +171,6 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
actualWarehouseCode: [
{ required: true, message: "库区编码不能为空", trigger: "blur" }
],
actualWarehouseName: [
{ required: true, message: "库区名称不能为空", trigger: "blur" }
],
// warehouseType: [
// { required: true, message: "类型不能为空", trigger: "change" }
// ],
} }
}; };
}, },
@@ -213,27 +178,15 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
/** 查询库位/库区/库位自关联列表 */ /** 查询实际库区/库位自关联列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listActualWarehouse({...this.queryParams, pageNum: 1, pageSize: 1000}).then(response => { listActualWarehouse(this.queryParams).then(response => {
const list = response.rows; this.actualWarehouseList = this.handleTree(response.data, "actualWarehouseId", "parentId");
// const list = this.handleTree(response.data, "warehouseId", "parentId");
// // 递归遍历list，通过sortNo排序
const sort = (list) => {
list.sort((a, b) => a.sortNo - b.sortNo);
list.forEach(item => {
if (item.children) {
sort(item.children);
}
});
};
sort(list)
this.warehouseList = list;
this.loading = false; this.loading = false;
}); });
}, },
/** 转换库位/库区/库位自关联数据结构 */ /** 转换实际库区/库位自关联数据结构 */
normalizer(node) { normalizer(node) {
if (node.children && !node.children.length) { if (node.children && !node.children.length) {
delete node.children; delete node.children;
@@ -244,13 +197,13 @@ export default {
children: node.children children: node.children
}; };
}, },
/** 查询库位/库区/库位自关联下拉树结构 */ /** 查询实际库区/库位自关联下拉树结构 */
getTreeselect() { getTreeselect() {
listActualWarehouse().then(response => { listActualWarehouse().then(response => {
this.warehouseOptions = []; this.actualWarehouseOptions = [];
const data = { actualWarehouseId: 0, actualWarehouseName: '顶级节点', children: [] }; const data = { actualWarehouseId: 0, actualWarehouseName: '顶级节点', children: [] };
data.children = this.handleTree(response.data, "actualWarehouseId", "parentId"); data.children = this.handleTree(response.data, "actualWarehouseId", "parentId");
this.warehouseOptions.push(data); this.actualWarehouseOptions.push(data);
}); });
}, },
// 取消按钮 // 取消按钮
@@ -265,9 +218,9 @@ export default {
parentId: null, parentId: null,
actualWarehouseCode: null, actualWarehouseCode: null,
actualWarehouseName: null, actualWarehouseName: null,
warehouseType: 1, actualWarehouseType: 1,
sortNo: null, sortNo: 0,
isEnabled: 1, isEnabled: null,
delFlag: null, delFlag: null,
remark: null, remark: null,
createTime: null, createTime: null,
@@ -296,7 +249,7 @@ export default {
this.form.parentId = 0; this.form.parentId = 0;
} }
this.open = true; this.open = true;
this.title = "添加库位/库区/库位自关联"; this.title = "添加实际库区/库位自关联";
}, },
/** 展开/折叠操作 */ /** 展开/折叠操作 */
toggleExpandAll() { toggleExpandAll() {
@@ -318,7 +271,7 @@ export default {
this.loading = false; this.loading = false;
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改库位/库区/库位自关联"; this.title = "修改实际库区/库位自关联";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
@@ -326,13 +279,8 @@ export default {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
this.buttonLoading = true; this.buttonLoading = true;
// 处理 parentId 为 0 的情况
let submitData = { ...this.form };
if (submitData.parentId === 0) {
delete submitData.parentId;
}
if (this.form.actualWarehouseId != null) { if (this.form.actualWarehouseId != null) {
updateActualWarehouse(submitData).then(response => { updateActualWarehouse(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
@@ -340,7 +288,7 @@ export default {
this.buttonLoading = false; this.buttonLoading = false;
}); });
} else { } else {
addActualWarehouse(submitData).then(response => { addActualWarehouse(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
@@ -353,7 +301,7 @@ export default {
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
this.$modal.confirm('是否确认删除库位/库区/库位自关联编号为"' + row.actualWarehouseId + '"的数据项？').then(() => { this.$modal.confirm('是否确认删除实际库区/库位自关联编号为"' + row.actualWarehouseId + '"的数据项？').then(() => {
this.loading = true; this.loading = true;
return delActualWarehouse(row.actualWarehouseId); return delActualWarehouse(row.actualWarehouseId);
}).then(() => { }).then(() => {