Yangwl
/
LanJu_UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2024-3-1 基础信息BOM+产品+工厂 展示优化

Browse Source
master
A0010407 1 year ago
parent 3972b80908
commit 69c61233e8
3 changed files with 1094 additions and 822 deletions
Show Stats Download Patch File Download Diff File

26
src/views/wms/bom/index.vue
Unescape Escape View File

@ -138,7 +138,7 @@
/> />
<el-table-column <el-table-column
label="产品名称" label="产品名称"
align="center" align="left"
prop="productDescZh" prop="productDescZh"
width="350" width="350"
/> />
@ -150,7 +150,7 @@
/> />
<el-table-column <el-table-column
label="组件名称" label="组件名称"
align="center" align="left"
prop="componentDescZh" prop="componentDescZh"
width="350" width="350"
/> />
@ -419,7 +419,7 @@ export default {
component: null, component: null,
productCode: null, productCode: null,
bomHierarchy: null, bomHierarchy: null,
handle:null, handle: null,
factoryCode: null, factoryCode: null,
productionVersion: null, productionVersion: null,
bomCode: null, bomCode: null,
@ -581,32 +581,32 @@ export default {
}, },
load(tree, treeNode, resolve) { load(tree, treeNode, resolve) {
console.log("treeNode:",treeNode); console.log("treeNode:", treeNode);
console.log("tree:",tree); console.log("tree:", tree);
console.log("resolve:",resolve); console.log("resolve:", resolve);
this.queryParams.pageNum = null; this.queryParams.pageNum = null;
this.queryParams.pageSize = null; this.queryParams.pageSize = null;
if(tree.bomHierarchy == " " || tree.bomHierarchy == null){ if (tree.bomHierarchy == " " || tree.bomHierarchy == null) {
this.queryParams.bomHierarchy = "1"; this.queryParams.bomHierarchy = "1";
this.queryParams.cumc = tree.cumc; this.queryParams.cumc = tree.cumc;
this.queryParams.component = tree.component; this.queryParams.component = tree.component;
this.queryParams.bomCode = tree.bomCode; this.queryParams.bomCode = tree.bomCode;
}else if(tree.bomHierarchy == "1"){ } else if (tree.bomHierarchy == "1") {
this.queryParams.bomHierarchy = "2"; this.queryParams.bomHierarchy = "2";
this.queryParams.component = tree.component; this.queryParams.component = tree.component;
this.queryParams.bomCode = tree.bomCode; this.queryParams.bomCode = tree.bomCode;
}else if(tree.bomHierarchy == "2"){ } else if (tree.bomHierarchy == "2") {
this.queryParams.bomHierarchy = "3"; this.queryParams.bomHierarchy = "3";
this.queryParams.component = tree.component; this.queryParams.component = tree.component;
this.queryParams.bomCode = tree.bomCode; this.queryParams.bomCode = tree.bomCode;
}else if(tree.bomHierarchy == "3"){ } else if (tree.bomHierarchy == "3") {
this.queryParams.bomHierarchy = "4"; this.queryParams.bomHierarchy = "4";
this.queryParams.component = tree.component; this.queryParams.component = tree.component;
this.queryParams.bomCode = tree.bomCode; this.queryParams.bomCode = tree.bomCode;
} }
listBom(this.queryParams).then(response => { listBom(this.queryParams).then((response) => {
resolve(response.rows) resolve(response.rows);
}) });
this.queryParams.bomCode = null; this.queryParams.bomCode = null;
}, },
}, },

713
src/views/wms/factory/index.vue
Unescape Escape View File

@ -1,126 +1,171 @@
<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="68px"> <el-form
<el-form-item label="组织名称" prop="factoryName"> :model="queryParams"
<el-input ref="queryForm"
v-model="queryParams.factoryName" size="small"
placeholder="请输入组织名称" :inline="true"
clearable v-show="showSearch"
@keyup.enter.native="handleQuery" label-width="68px"
/> >
<el-form-item label="组织名称" prop="factoryName">
<el-input
v-model="queryParams.factoryName"
placeholder="请输入组织名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="组织编码" prop="factoryCode"> <el-form-item label="组织编码" prop="factoryCode">
<el-input <el-input
v-model="queryParams.factoryCode" v-model="queryParams.factoryCode"
placeholder="请输入组织编码" placeholder="请输入组织编码"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="启用状态" prop="status"> <el-form-item label="启用状态" prop="status">
<el-select <el-select
v-model="queryParams.status" v-model="queryParams.status"
placeholder="请选择启用状态" placeholder="请选择启用状态"
@change="$forceUpdate()" @change="$forceUpdate()"
clearable clearable
style="width:205px" style="width: 205px"
@keyup.enter.native="handleQuery"> @keyup.enter.native="handleQuery"
<el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option> >
</el-select> <el-option
</el-form-item> v-for="item in options"
<el-form-item> :key="item.status"
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> :label="item.label"
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> :value="item.status"
</el-form-item> ></el-option>
</el-form> </el-select>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['wms:factory:add']" v-hasPermi="['wms:factory:add']"
>新增</el-button> >新增</el-button
</el-col> >
<el-col :span="1.5"> </el-col>
<el-button <el-col :span="1.5">
type="info" <el-button
plain type="info"
icon="el-icon-sort" plain
size="mini" icon="el-icon-sort"
@click="toggleExpandAll" size="mini"
>展开/折叠</el-button> @click="toggleExpandAll"
</el-col> >展开/折叠</el-button
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> >
</el-row> </el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-table <el-table
v-if="refreshTable" v-if="refreshTable"
v-loading="loading" v-loading="loading"
:data="factoryList" :data="factoryList"
row-key="factoryId" row-key="factoryId"
:default-expand-all="isExpandAll" :default-expand-all="isExpandAll"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
> >
<el-table-column label="组织名称" align="center" prop="factoryName" width="350"/> <el-table-column
<el-table-column label="组织编码" align="center" prop="factoryCode" /> label="组织名称"
<el-table-column prop="ftype" label="工厂建模类型" width="100" align="center"> align="left"
prop="factoryName"
width="350"
/>
<el-table-column label="组织编码" align="center" prop="factoryCode" />
<el-table-column
prop="ftype"
label="工厂建模类型"
width="100"
align="center"
>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag :options="dict.type.f_type" :value="scope.row.ftype" />
:options="dict.type.f_type"
:value="scope.row.ftype"
/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建人" align="center" prop="createBy" /> <el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" /> <el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column prop="status" label="是否启用" align="center" > <el-table-column prop="status" label="是否启用" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.status == 1 ? "启用" : "停用" }} {{ scope.row.status == 1 ? "启用" : "停用" }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column
<template slot-scope="scope"> label="操作"
<el-button align="center"
size="mini" class-name="small-padding fixed-width"
type="text" >
icon="el-icon-edit" <template slot-scope="scope">
@click="handleUpdate(scope.row)" <el-button
v-hasPermi="['wms:factory:edit']" size="mini"
>修改</el-button> type="text"
<el-button icon="el-icon-edit"
size="mini" @click="handleUpdate(scope.row)"
type="text" v-hasPermi="['wms:factory:edit']"
icon="el-icon-plus" >修改</el-button
@click="handleAdd(scope.row)" >
v-hasPermi="['wms:factory:add']" <el-button
>新增</el-button> size="mini"
<el-button type="text"
size="mini" icon="el-icon-plus"
type="text" @click="handleAdd(scope.row)"
icon="el-icon-delete" v-hasPermi="['wms:factory:add']"
@click="handleDelete(scope.row)" >新增</el-button
v-hasPermi="['wms:factory:remove']" >
>删除</el-button> <el-button
</template> size="mini"
</el-table-column> type="text"
</el-table> icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['wms:factory:remove']"
>删除</el-button
>
</template>
</el-table-column>
</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="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="父组织名" prop="parentId" style="width:350px"> <el-form-item label="父组织名" prop="parentId" style="width: 350px">
<treeselect v-model="form.parentId" :options="factoryOptions" :normalizer="normalizer" placeholder="请选择父组织id" /> <treeselect
</el-form-item> v-model="form.parentId"
<el-form-item label="组织名称" prop="factoryName" style="width:350px"> :options="factoryOptions"
<el-input v-model="form.factoryName" placeholder="请输入组织名称" /> :normalizer="normalizer"
</el-form-item> placeholder="请选择父组织id"
<el-form-item label="组织编码" prop="factoryCode" style="width:350px"> />
<el-input v-model="form.factoryCode" placeholder="请输入组织编码" /> </el-form-item>
</el-form-item> <el-form-item label="组织名称" prop="factoryName" style="width: 350px">
<el-input v-model="form.factoryName" placeholder="请输入组织名称" />
</el-form-item>
<el-form-item label="组织编码" prop="factoryCode" style="width: 350px">
<el-input v-model="form.factoryCode" placeholder="请输入组织编码" />
</el-form-item>
<el-form-item label="工厂建模分类" prop="ftype"> <el-form-item label="工厂建模分类" prop="ftype">
<el-select <el-select
v-model="form.ftype" v-model="form.ftype"
@ -130,228 +175,254 @@
> >
<el-option <el-option
v-for="dict in dict.type.f_type" v-for="dict in dict.type.f_type"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="负责人" prop="leader" style="width:350px"> <el-form-item label="负责人" prop="leader" style="width: 350px">
<el-input v-model="form.leader" placeholder="请输入负责人" /> <el-input v-model="form.leader" placeholder="请输入负责人" />
</el-form-item> </el-form-item>
<el-form-item label="联系电话" prop="phone" style="width:350px"> <el-form-item label="联系电话" prop="phone" style="width: 350px">
<el-input v-model="form.phone" placeholder="请输入联系电话" /> <el-input v-model="form.phone" placeholder="请输入联系电话" />
</el-form-item> </el-form-item>
<el-form-item label="邮箱" prop="email" style="width:350px"> <el-form-item label="邮箱" prop="email" style="width: 350px">
<el-input v-model="form.email" placeholder="请输入邮箱" /> <el-input v-model="form.email" placeholder="请输入邮箱" />
</el-form-item> </el-form-item>
<el-form-item label="是否启用" prop="status" > <el-form-item label="是否启用" prop="status">
<el-select v-model="form.status" placeholder="请选择是否启用" @change="$forceUpdate()" clearable style="width:230px"> <el-select
<el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option> v-model="form.status"
placeholder="请选择是否启用"
@change="$forceUpdate()"
clearable
style="width: 230px"
>
<el-option
v-for="item in options"
:key="item.status"
:label="item.label"
:value="item.status"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { listFactory, getFactory, delFactory, addFactory, updateFactory } from "@/api/wms/factory"; import {
listFactory,
getFactory,
delFactory,
addFactory,
updateFactory,
} from "@/api/wms/factory";
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";
export default { export default {
name: "Factory", name: "Factory",
dicts: [ dicts: ["f_type"],
"f_type", components: {
], Treeselect,
components: { },
Treeselect data() {
}, return {
data() { // 遮罩层
return { loading: true,
// 遮罩层 // 显示搜索条件
loading: true, showSearch: true,
// 显示搜索条件 // 工厂模型表格数据
showSearch: true, factoryList: [],
// 工厂模型表格数据 // 工厂模型树选项
factoryList: [], factoryOptions: [],
// 工厂模型树选项 // 弹出层标题
factoryOptions: [], title: "",
// 弹出层标题 // 是否显示弹出层
title: "", open: false,
// 是否显示弹出层 // 是否展开，默认全部展开
open: false, isExpandAll: true,
// 是否展开，默认全部展开 // 重新渲染表格状态
isExpandAll: true, refreshTable: true,
// 重新渲染表格状态 // 查询参数
refreshTable: true, queryParams: {
// 查询参数 parentId: null,
queryParams: { ancestors: null,
parentId: null, factoryName: null,
ancestors: null, orderNum: null,
factoryName: null, leader: null,
orderNum: null, phone: null,
leader: null, email: null,
phone: null, status: null,
email: null, },
status: null, options: [
}, {
options: [{ status: "1",
status: "1", label: "启用",
label: '启用' },
}, { {
status: "0", status: "0",
label: '停用' label: "停用",
}], },
// 表单参数 ],
form: {}, // 表单参数
// 表单校验 form: {},
rules: { // 表单校验
factoryCode: [ rules: {
{ required: true, message: "组织编码不能为空", trigger: "blur" } factoryCode: [
], { required: true, message: "组织编码不能为空", trigger: "blur" },
factoryName: [ ],
{ required: true, message: "组织名称不能为空", trigger: "blur" } factoryName: [
], { required: true, message: "组织名称不能为空", trigger: "blur" },
status: [ ],
{ required: true, message: "组织状态不能为空", trigger: "blur" } status: [
] { required: true, message: "组织状态不能为空", trigger: "blur" },
} ],
}; },
}, };
created() { },
this.getList(); created() {
}, this.getList();
methods: { },
/** 查询工厂模型列表 */ methods: {
getList() { /** 查询工厂模型列表 */
this.loading = true; getList() {
listFactory(this.queryParams).then(response => { this.loading = true;
this.factoryList = this.handleTree(response.data, "factoryId", "parentId"); listFactory(this.queryParams).then((response) => {
this.loading = false; this.factoryList = this.handleTree(
}); response.data,
}, "factoryId",
/** 转换工厂模型数据结构 */ "parentId"
normalizer(node) { );
if (node.children && !node.children.length) { this.loading = false;
delete node.children; });
} },
return { /** 转换工厂模型数据结构 */
id: node.factoryId, normalizer(node) {
label: node.factoryName, if (node.children && !node.children.length) {
children: node.children delete node.children;
}; }
}, return {
/** 查询工厂模型下拉树结构 */ id: node.factoryId,
getTreeselect() { label: node.factoryName,
listFactory().then(response => { children: node.children,
this.factoryOptions = []; };
const data = { factoryId: 0, factoryName: '顶级节点', children: [] }; },
data.children = this.handleTree(response.data, "factoryId", "parentId"); /** 查询工厂模型下拉树结构 */
this.factoryOptions.push(data); getTreeselect() {
}); listFactory().then((response) => {
}, this.factoryOptions = [];
// 取消按钮 const data = { factoryId: 0, factoryName: "顶级节点", children: [] };
cancel() { data.children = this.handleTree(response.data, "factoryId", "parentId");
this.open = false; this.factoryOptions.push(data);
this.reset(); });
}, },
// 表单重置 // 取消按钮
reset() { cancel() {
this.form = { this.open = false;
factoryId: null, this.reset();
parentId: null, },
ancestors: null, // 表单重置
factoryName: null, reset() {
orderNum: null, this.form = {
leader: null, factoryId: null,
phone: null, parentId: null,
email: null, ancestors: null,
status: null, factoryName: null,
delFlag: null, orderNum: null,
createBy: null, leader: null,
createTime: null, phone: null,
updateBy: null, email: null,
updateTime: null status: null,
}; delFlag: null,
this.resetForm("form"); createBy: null,
}, createTime: null,
/** 搜索按钮操作 */ updateBy: null,
handleQuery() { updateTime: null,
this.getList(); };
}, this.resetForm("form");
/** 重置按钮操作 */ },
resetQuery() { /** 搜索按钮操作 */
this.resetForm("queryForm"); handleQuery() {
this.handleQuery(); this.getList();
}, },
/** 新增按钮操作 */ /** 重置按钮操作 */
handleAdd(row) { resetQuery() {
this.reset(); this.resetForm("queryForm");
this.getTreeselect(); this.handleQuery();
if (row != null && row.factoryId) { },
this.form.parentId = row.factoryId; /** 新增按钮操作 */
} else { handleAdd(row) {
this.form.parentId = 0; this.reset();
} this.getTreeselect();
this.open = true; if (row != null && row.factoryId) {
this.title = "添加工厂模型"; this.form.parentId = row.factoryId;
}, } else {
/** 展开/折叠操作 */ this.form.parentId = 0;
toggleExpandAll() { }
this.refreshTable = false; this.open = true;
this.isExpandAll = !this.isExpandAll; this.title = "添加工厂模型";
this.$nextTick(() => { },
this.refreshTable = true; /** 展开/折叠操作 */
}); toggleExpandAll() {
}, this.refreshTable = false;
/** 修改按钮操作 */ this.isExpandAll = !this.isExpandAll;
handleUpdate(row) { this.$nextTick(() => {
this.reset(); this.refreshTable = true;
this.getTreeselect(); });
if (row != null) { },
this.form.parentId = row.factoryId; /** 修改按钮操作 */
} handleUpdate(row) {
getFactory(row.factoryId).then(response => { this.reset();
this.form = response.data; this.getTreeselect();
this.open = true; if (row != null) {
this.title = "修改工厂模型"; this.form.parentId = row.factoryId;
}); }
}, getFactory(row.factoryId).then((response) => {
/** 提交按钮 */ this.form = response.data;
submitForm() { this.open = true;
this.$refs["form"].validate(valid => { this.title = "修改工厂模型";
if (valid) { });
if (this.form.factoryId != null) { },
updateFactory(this.form).then(response => { /** 提交按钮 */
this.$modal.msgSuccess("修改成功"); submitForm() {
this.open = false; this.$refs["form"].validate((valid) => {
this.getList(); if (valid) {
}); if (this.form.factoryId != null) {
} else { updateFactory(this.form).then((response) => {
addFactory(this.form).then(response => { this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess("新增成功"); this.open = false;
this.open = false; this.getList();
this.getList(); });
}); } else {
} addFactory(this.form).then((response) => {
} this.$modal.msgSuccess("新增成功");
}); this.open = false;
}, this.getList();
/** 删除按钮操作 */ });
handleDelete(row) { }
this.$modal.confirm('是否确认删除工厂模型编号为"' + row.factoryId + '"的数据项？').then(function() { }
return delFactory(row.factoryId); });
}).then(() => { },
this.getList(); /** 删除按钮操作 */
this.$modal.msgSuccess("删除成功"); handleDelete(row) {
}).catch(() => {}); this.$modal
} .confirm('是否确认删除工厂模型编号为"' + row.factoryId + '"的数据项？')
} .then(function () {
return delFactory(row.factoryId);
})
.then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {});
},
},
}; };
</script> </script>

1177
src/views/wms/product/index.vue
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save