yinq
/
aucma-mes-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add - 工厂管理、产线管理

Browse Source
master
yinq 1 year ago
parent 43ee755e9b
commit c8994a6b43
5 changed files with 780 additions and 0 deletions
Show Stats Download Patch File Download Diff File

53
src/api/base/factory.js
Unescape Escape View File

@ -0,0 +1,53 @@
import request from '@/utils/request'
// 查询工厂管理列表
export function listFactory(query) {
return request({
url: '/base/factory/list',
method: 'get',
params: query
})
}
// 查询工厂下拉框列表
export function findFactoryList(query) {
return request({
url: '/base/factory/findFactoryList',
method: 'get',
params: query
})
}
// 查询工厂管理详细
export function getFactory(objId) {
return request({
url: '/base/factory/' + objId,
method: 'get'
})
}
// 新增工厂管理
export function addFactory(data) {
return request({
url: '/base/factory',
method: 'post',
data: data
})
}
// 修改工厂管理
export function updateFactory(data) {
return request({
url: '/base/factory',
method: 'put',
data: data
})
}
// 删除工厂管理
export function delFactory(objId) {
return request({
url: '/base/factory/' + objId,
method: 'delete'
})
}

44
src/api/base/productline.js
Unescape Escape View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询产线信息列表
export function listProductline(query) {
return request({
url: '/base/productline/list',
method: 'get',
params: query
})
}
// 查询产线信息详细
export function getProductline(objid) {
return request({
url: '/base/productline/' + objid,
method: 'get'
})
}
// 新增产线信息
export function addProductline(data) {
return request({
url: '/base/productline',
method: 'post',
data: data
})
}
// 修改产线信息
export function updateProductline(data) {
return request({
url: '/base/productline',
method: 'put',
data: data
})
}
// 删除产线信息
export function delProductline(objid) {
return request({
url: '/base/productline/' + objid,
method: 'delete'
})
}

BIN
src/assets/images/profile.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 13 KiB

321
src/views/base/factory/index.vue
Unescape Escape View File

@ -0,0 +1,321 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" 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 label="工厂状态" prop="factoryStatus">
<el-select v-model="queryParams.factoryStatus" placeholder="请选择工厂状态" clearable>
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</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-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['base:factory:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['base:factory:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['base:factory:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['base:factory:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="factoryList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
<el-table-column label="公司名称" align="center" prop="companyName" v-if="columns[1].visible"/>
<el-table-column label="工厂编号" align="center" prop="factoryCode" v-if="columns[2].visible"/>
<el-table-column label="工厂名称" align="center" prop="factoryName" v-if="columns[3].visible"/>
<el-table-column label="工厂状态" align="center" prop="factoryStatus" v-if="columns[4].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.factoryStatus"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" v-if="columns[5].visible"/>
<el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[6].visible"/>
<el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[7].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="更新人" align="center" prop="updatedBy" v-if="columns[8].visible"/>
<el-table-column label="更新时间" align="center" prop="updatedTime" width="180" v-if="columns[9].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['base:factory:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['base:factory:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改工厂管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="公司名称" prop="companyName">
<el-input v-model="form.companyName" placeholder="请输入公司名称" />
</el-form-item>
<el-form-item label="工厂编号" prop="factoryCode">
<el-input v-model="form.factoryCode" placeholder="请输入工厂编号" />
</el-form-item>
<el-form-item label="工厂名称" prop="factoryName">
<el-input v-model="form.factoryName" placeholder="请输入工厂名称" />
</el-form-item>
<el-form-item label="工厂状态" prop="factoryStatus">
<el-radio-group v-model="form.factoryStatus">
<el-radio
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listFactory, getFactory, delFactory, addFactory, updateFactory } from "@/api/base/factory";
export default {
name: "Factory",
dicts: ['sys_normal_disable'],
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 工厂管理表格数据
factoryList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
companyName: null,
factoryCode: null,
factoryName: null,
factoryStatus: null,
createdBy: null,
createdTime: null,
updatedBy: null,
updatedTime: null
},
// 表单参数
form: {},
// 表单校验
rules: {
},
columns: [
{ key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `公司名称`, visible: true },
{ key: 2, label: `工厂编号`, visible: true },
{ key: 3, label: `工厂名称`, visible: true },
{ key: 4, label: `工厂状态`, visible: true },
{ key: 5, label: `备注`, visible: true },
{ key: 6, label: `创建人`, visible: false },
{ key: 7, label: `创建时间`, visible: true },
{ key: 8, label: `更新人`, visible: false },
{ key: 9, label: `更新时间`, visible: true },
]
};
},
created() {
this.getList();
},
methods: {
/** 查询工厂管理列表 */
getList() {
this.loading = true;
listFactory(this.queryParams).then(response => {
this.factoryList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
objId: null,
companyName: null,
factoryCode: null,
factoryName: null,
factoryStatus: "0",
remark: null,
createdBy: null,
createdTime: null,
updatedBy: null,
updatedTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.objId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加工厂管理";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const objId = row.objId || this.ids
getFactory(objId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改工厂管理";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.objId != null) {
updateFactory(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addFactory(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const objIds = row.objId || this.ids;
this.$modal.confirm('是否确认删除工厂管理编号为"' + objIds + '"的数据项？').then(function() {
return delFactory(objIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('base/factory/export', {
...this.queryParams
}, `factory_${new Date().getTime()}.xlsx`)
}
}
};
</script>

362
src/views/base/productline/index.vue
Unescape Escape View File

@ -0,0 +1,362 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<!-- <el-form-item label="产线编号" prop="productlineCode">-->
<!-- <el-input-->
<!-- v-model="queryParams.productlineCode"-->
<!-- placeholder="请输入产线编号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="产线名称" prop="productlineName">
<el-input
v-model="queryParams.productlineName"
placeholder="请输入产线名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产线类别" prop="productlineType">
<el-select v-model="queryParams.productlineType" placeholder="请选择产线类别" clearable>
<el-option
v-for="dict in dict.type.line_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="所属工厂" prop="plantCode">-->
<!-- <el-input-->
<!-- v-model="queryParams.plantCode"-->
<!-- placeholder="请输入所属工厂"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </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-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['base:productline:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['base:productline:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['base:productline:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['base:productline:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="productlineList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键标识" align="center" prop="objid" v-if="columns[0].visible"/>
<el-table-column label="产线编号" align="center" prop="productlineCode" v-if="columns[1].visible"/>
<el-table-column label="产线名称" align="center" prop="productlineName" v-if="columns[2].visible"/>
<el-table-column label="产线类别" align="center" prop="productlineType" v-if="columns[3].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.line_type" :value="scope.row.productlineType"/>
</template>
</el-table-column>
<el-table-column label="所属工厂" align="center" prop="plantName" v-if="columns[4].visible"/>
<el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[5].visible" >
<template slot-scope="scope">
<dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[6].visible"/>
<el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[7].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="更新人" align="center" prop="updatedBy" v-if="columns[8].visible"/>
<el-table-column label="更新时间" align="center" prop="updatedTime" width="180" v-if="columns[9].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['base:productline:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['base:productline:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改产线信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="产线编号" prop="productlineCode">
<el-input v-model="form.productlineCode" placeholder="请输入产线编号" />
</el-form-item>
<el-form-item label="产线名称" prop="productlineName">
<el-input v-model="form.productlineName" placeholder="请输入产线名称" />
</el-form-item>
<el-form-item label="产线类别" prop="productlineType">
<el-select v-model="form.productlineType" placeholder="请选择产线类别">
<el-option
v-for="dict in dict.type.line_type"
:key="dict.value"
:label="dict.label"
:value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="所属工厂">
<el-select v-model="form.plantCode" placeholder="请选择所属工厂">
<el-option
v-for="item in factoryList"
:key="item.factoryCode"
:label="item.factoryName"
:value="item.factoryCode"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="启用标识" prop="isFlag">
<el-radio-group v-model="form.isFlag">
<el-radio
v-for="dict in dict.type.is_flag"
:key="dict.value"
:label="parseInt(dict.value)"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listProductline, getProductline, delProductline, addProductline, updateProductline } from "@/api/base/productline";
import { findFactoryList } from "@/api/base/factory";
export default {
name: "Productline",
dicts: ['line_type', 'is_flag'],
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 产线信息表格数据
productlineList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
productlineCode: null,
productlineName: null,
productlineType: null,
plantCode: null,
isFlag: null,
createdBy: null,
createdTime: null,
updatedBy: null,
updatedTime: null
},
// 表单参数
form: {},
// 表单校验
rules: {
},
columns: [
{ key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `产线编号`, visible: true },
{ key: 2, label: `产线名称`, visible: true },
{ key: 3, label: `产线类别`, visible: true },
{ key: 4, label: `所属工厂`, visible: true },
{ key: 5, label: `启用标识`, visible: true },
{ key: 6, label: `创建人`, visible: true },
{ key: 7, label: `创建时间`, visible: true },
{ key: 8, label: `更新人`, visible: true },
{ key: 9, label: `更新时间`, visible: true },
],
// 工厂选项
factoryList: [],
};
},
created() {
this.getList();
},
methods: {
/** 查询产线信息列表 */
getList() {
this.loading = true;
listProductline(this.queryParams).then(response => {
this.productlineList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
objid: null,
productlineCode: null,
productlineName: null,
productlineType: null,
plantCode: null,
isFlag: 0,
createdBy: null,
createdTime: null,
updatedBy: null,
updatedTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.objid)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
findFactoryList().then(response => {
this.factoryList = response.data;
});
this.open = true;
this.title = "添加产线信息";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const objid = row.objid || this.ids
getProductline(objid).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改产线信息";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.objid != null) {
updateProductline(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addProductline(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const objids = row.objid || this.ids;
this.$modal.confirm('是否确认删除产线信息编号为"' + objids + '"的数据项？').then(function() {
return delProductline(objids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('base/productline/export', {
...this.queryParams
}, `productline_${new Date().getTime()}.xlsx`)
}
}
};
</script>
Write Preview
Loading…
Cancel
Save