Merge remote-tracking branch 'origin/master'

yangwl
mengjiao 3 months ago
commit e0e5c7a74f

@ -0,0 +1,53 @@
import request from '@/utils/request'
// 查询箱体类型列表
export function listMesBox(query) {
return request({
url: '/mes/mesBox/list',
method: 'get',
params: query
});
}
// 查询箱体类型详细
export function getMesBox(boxId) {
return request({
url: '/mes/mesBox/' + boxId,
method: 'get'
});
}
// 新增箱体类型
export function addMesBox(data) {
return request({
url: '/mes/mesBox',
method: 'post',
data: data
});
}
// 修改箱体类型
export function updateMesBox(data) {
return request({
url: '/mes/mesBox',
method: 'put',
data: data
});
}
// 删除箱体类型
export function delMesBox(boxId) {
return request({
url: '/mes/mesBox/' + boxId,
method: 'delete'
});
}
// 获取字典选择框列表
export function optionSelect() {
return request({
url: '/mes/mesBox/optionSelect',
method: 'get'
})
}

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询字典数据列表
export function listMesBoxDetail(query) {
return request({
url: '/mes/mesBoxDetail/list',
method: 'get',
params: query
});
}
// 查询字典数据详细
export function getMesBoxDetail(boxCode) {
return request({
url: '/mes/mesBoxDetail/' + boxCode,
method: 'get'
});
}
// 新增字典数据
export function addMesBoxDetail(data) {
return request({
url: '/mes/mesBoxDetail',
method: 'post',
data: data
});
}
// 修改字典数据
export function updateMesBoxDetail(data) {
return request({
url: '/mes/mesBoxDetail',
method: 'put',
data: data
});
}
// 删除字典数据
export function delMesBoxDetail(boxCode) {
return request({
url: '/mes/mesBoxDetail/' + boxCode,
method: 'delete'
});
}

@ -226,6 +226,20 @@ export const dynamicRoutes = [
}
]
},
{
path: '/mes/box-detail',
component: Layout,
hidden: true,
permissions: ['mes:mesBoxDetail:list'],
children: [
{
path: 'index/:boxId(\\d+)',
component: () => import('@/views/mes/mesBox/detail'),
name: 'Detail',
meta: { title: '箱体数据', activeMenu: '/mes/mesBox' }
}
]
},
{
path: '/qua/quality/qcProject-data',
component: Layout,

@ -0,0 +1,415 @@
<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="boxType">
<el-select v-model="queryParams.boxType">
<el-option
v-for="item in typeOptions"
:key="item.boxId"
:label="item.boxName"
:value="item.boxType"
/>
</el-select>
</el-form-item>
<el-form-item label="箱型标签" prop="boxLabel">
<el-input
v-model="queryParams.boxLabel"
placeholder="请输入箱型标签"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" 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="['mes:mesBoxDetail: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="['mes:mesBoxDetail: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="['mes:mesBoxDetail: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="['mes:mesBoxDetail:export']"
>导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-close"
size="mini"
@click="handleClose"
>关闭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="箱型编码" align="center" prop="boxCode" />
<el-table-column label="数据标签" align="center" prop="boxLabel">
<template slot-scope="scope">
<span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{scope.row.boxLabel}}</span>
<el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{scope.row.boxLabel}}</el-tag>
</template>
</el-table-column>
<el-table-column label="数据关键字" align="center" prop="boxKey" />
<el-table-column label="数据值" align="center" prop="boxValue" />
<el-table-column label="数据排序" align="center" prop="boxSort" />
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</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="['mes:mesBoxDetail:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes:mesBoxDetail: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="100px">
<el-form-item label="箱型类型">
<el-input v-model="form.boxType" :disabled="true" />
</el-form-item>
<el-form-item label="数据标签" prop="boxLabel">
<el-input v-model="form.boxLabel" placeholder="请输入数据标签" />
</el-form-item>
<el-form-item label="数据关键字" prop="boxKey">
<el-input v-model="form.boxKey" placeholder="请输入数据键值" />
</el-form-item>
<el-form-item label="数据键值" prop="boxValue">
<el-input v-model="form.boxValue" placeholder="请输入数据键值" />
</el-form-item>
<el-form-item label="样式属性" prop="cssClass">
<el-input v-model="form.cssClass" placeholder="请输入样式属性" />
</el-form-item>
<el-form-item label="显示排序" prop="boxSort">
<el-input-number v-model="form.boxSort" controls-position="right" :min="0" />
</el-form-item>
<el-form-item label="回显样式" prop="listClass">
<el-select v-model="form.listClass">
<el-option
v-for="item in listClassOptions"
:key="item.value"
:label="item.label + '(' + item.value + ')'"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status">
<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" type="textarea" placeholder="请输入内容"></el-input>
</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 {
listMesBoxDetail,
getMesBoxDetail,
delMesBoxDetail,
addMesBoxDetail,
updateMesBoxDetail } from "@/api/mes/mesBoxDetail";
import { optionSelect as getDictOptionselect, getMesBox } from "@/api/mes/mesBox";
export default {
name: "Detail",
dicts: ['sys_normal_disable'],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
dataList: [],
//
defaultDictType: "",
//
title: "",
//
open: false,
//
listClassOptions: [
{
value: "default",
label: "默认"
},
{
value: "primary",
label: "主要"
},
{
value: "success",
label: "成功"
},
{
value: "info",
label: "信息"
},
{
value: "warning",
label: "警告"
},
{
value: "danger",
label: "危险"
}
],
//
typeOptions: [],
//
queryParams: {
pageNum: 1,
pageSize: 10,
boxName: undefined,
boxType: undefined,
status: undefined
},
//
form: {},
//
rules: {
boxLabel: [
{ required: true, message: "数据标签不能为空", trigger: "blur" }
],
boxKey: [
{ required: true, message: "数据关键字不能为空", trigger: "blur" }
],
boxValue: [
{ required: true, message: "数据值不能为空", trigger: "blur" }
],
boxSort: [
{ required: true, message: "数据顺序不能为空", trigger: "blur" }
]
}
};
},
created() {
const boxId = this.$route.params && this.$route.params.boxId;
this.getType(boxId);
this.getTypeList();
},
methods: {
/** 查询箱型类型详细 */
getType(boxId) {
getMesBox(boxId).then(response => {
this.queryParams.boxType = response.data.boxType;
this.defaultDictType = response.data.boxType;
this.getList();
});
},
/** 查询箱型类型列表 */
getTypeList() {
getDictOptionselect().then(response => {
this.typeOptions = response.data;
});
},
/** 查询箱型数据列表 */
getList() {
this.loading = true;
listMesBoxDetail(this.queryParams).then(response => {
this.dataList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
boxCode: undefined,
boxLabel: undefined,
boxValue: undefined,
cssClass: undefined,
listClass: 'default',
boxSort: 0,
status: "0",
remark: undefined
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 返回按钮操作 */
handleClose() {
const obj = { path: "/mes/mesBox"};
this.$tab.closeOpenPage(obj);
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.queryParams.boxType = this.defaultDictType;
this.handleQuery();
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加箱型数据";
this.form.boxType = this.queryParams.boxType;
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.boxCode)
this.single = selection.length!=1
this.multiple = !selection.length
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const boxCode = row.boxCode || this.ids
getMesBoxDetail(boxCode).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改箱型数据";
});
},
/** 提交按钮 */
submitForm: _.debounce(function() {
//
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.boxCode != undefined) {
updateMesBoxDetail(this.form).then(response => {
this.$store.dispatch('box/removeDict', this.queryParams.boxType);
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addMesBoxDetail(this.form).then(response => {
this.$store.dispatch('box/removeDict', this.queryParams.boxType);
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
}, 300),
/** 删除按钮操作 */
handleDelete(row) {
const boxCodes = row.boxCode || this.ids;
this.$modal.confirm('是否确认删除箱型编码为"' + boxCodes + '"的数据项?').then(function() {
return delMesBoxDetail(boxCodes);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
this.$store.dispatch('box/removeDict', this.queryParams.boxType);
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('mes/mesBoxDetail/export', {
...this.queryParams
}, `mesBoxDetail_${new Date().getTime()}.xlsx`)
}
}
};
</script>

@ -0,0 +1,280 @@
<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="boxName">
<el-input
v-model="queryParams.boxName"
placeholder="请输入箱体名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="箱体类型" prop="boxType">
<el-input
v-model="queryParams.boxType"
placeholder="请输入箱体类型"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status"
placeholder="箱体状态"
clearable
style="width: 240px">
<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="['mes:mesBox: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="['mes:mesBox: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="['mes:mesBox: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="['mes:mesBox:export']">导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="mesBoxList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="箱体主键" align="center" prop="boxId" />
<el-table-column label="箱体名称" align="center" prop="boxName" />
<el-table-column label="箱体类型" align="center" prop="boxType" >
<template slot-scope="scope">
<router-link :to="'/mes/box-detail/index/' + scope.row.boxId" class="link-type">
<span>{{ scope.row.boxType }}</span>
</router-link>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="备注" align="center" prop="remark" />
<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="['mes:mesBox:edit']">修改
</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['mes:mesBox: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="boxName">
<el-input v-model="form.boxName" placeholder="请输入箱体名称" />
</el-form-item>
<el-form-item label="字典类型" prop="boxType">
<el-input v-model="form.boxType" placeholder="请输入字典类型" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status">
<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" type="textarea" 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 {
listMesBox,
getMesBox,
delMesBox,
addMesBox,
updateMesBox
} from "@/api/mes/mesBox"
export default {
name: "MesBox",
dicts: ['sys_normal_disable'],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
mesBoxList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
boxName: null,
boxType: null,
status: null,
},
//
form: {
},
//
rules: {
boxName: [
{ required: true, message: "字典名称不能为空", trigger: "blur" }
],
boxType: [
{ required: true, message: "字典类型不能为空", trigger: "blur" }
]
}
};
},
created() {
this.getList();
},
methods: {
/** 查询箱体类型列表 */
getList() {
this.loading = true;
listMesBox(this.queryParams).then(response => {
this.mesBoxList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
boxId: null,
boxName: null,
boxType: null,
status: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
remark: 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.boxId)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加箱体类型";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const boxId =
row.boxId || this.ids
getMesBox(boxId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改箱体类型";
});
},
/** 提交按钮 */
submitForm: function () {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.boxId != undefined) {
updateMesBox(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addMesBox(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const boxIds = row.boxId || this.ids;
this.$modal.confirm('是否确认删除箱体编号为"' + boxIds + '"的数据项?').then(function () {
return delMesBox(boxIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => { });
},
/** 导出按钮操作 */
handleExport() {
this.download('mes/mesBox/export', {
...this.queryParams
}, `箱体类型导出_${new Date().getTime()}.xlsx`)
},
}
}
</script>
Loading…
Cancel
Save