Skip to content

M
mes-ui
Commit c0734386 authored by chenzj's avatar chenzj
Browse files
Options

车间异常单，改工装夹具bug

parent 53799369
Hide whitespace changes
Inline Side-by-side
Showing with 454 additions and 21 deletions
src/api/mes/qc/report.js 0 → 100644
View file @ c0734386
import request from '@/utils/request'
// 查询车间异常单列表
export function listReport(query) {
return request({
url: '/qc/report/list',
method: 'get',
params: query
})
}
// 查询车间异常单详细
export function getReport(abnormalReportId) {
return request({
url: '/qc/report/' + abnormalReportId,
method: 'get'
})
}
// 新增车间异常单
export function addReport(data) {
return request({
url: '/qc/report',
method: 'post',
data: data
})
}
// 修改车间异常单
export function updateReport(data) {
return request({
url: '/qc/report',
method: 'put',
data: data
})
}
// 删除车间异常单
export function delReport(abnormalReportId) {
return request({
url: '/qc/report/' + abnormalReportId,
method: 'delete'
})
}
src/views/mes/qc/abnormal/index.vue
View file @ c0734386
<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 :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="异常类型" prop="abnormalType"> <el-form-item label="异常类型" prop="abnormalType">
<el-select v-model="queryParams.abnormalType" placeholder="请选择异常类型" clearable> <el-input
<el-option label="请选择字典生成" value="" /> v-model="queryParams.abnormalType"
</el-select> placeholder="请输入异常类型"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="异常原因" prop="abnormalReason"> <el-form-item label="异常原因" prop="abnormalReason">
<el-input <el-input
......
src/views/mes/qc/report/index.vue 0 → 100644
View file @ c0734386
<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="batchNumber">
<el-input
v-model="queryParams.batchNumber"
placeholder="请输入编批单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工序编号" prop="processCode">
<el-input
v-model="queryParams.processCode"
placeholder="请输入工序编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工作单元编号" prop="workstationCode">
<el-input
v-model="queryParams.workstationCode"
placeholder="请输入工作单元编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="异常原因" prop="abnormalReason">
<el-input
v-model="queryParams.abnormalReason"
placeholder="请输入异常原因"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="异常时间" prop="abnormalTime">
<el-date-picker clearable
v-model="queryParams.abnormalTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择异常时间">
</el-date-picker>
</el-form-item>
<el-form-item label="单据状态" prop="abnormalStatus">
<el-select v-model="queryParams.abnormalStatus" placeholder="请选择单据状态" clearable>
<el-option label="请选择字典生成" 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="['qc:report: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="['qc:report: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="['qc:report: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="['qc:report:export']"
>导出</el-button>
</el-col> -->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="编批单号" align="center" prop="batchNumber" />
<el-table-column label="工序编号" align="center" prop="processCode" />
<el-table-column label="工序名称" align="center" prop="processName" />
<el-table-column label="工作单元编号" align="center" prop="workstationCode" />
<el-table-column label="工作单元名称" align="center" prop="workstationName" />
<el-table-column label="异常类型" align="center" prop="abnormalType" >
<template slot-scope="scope">
<dict-tag :options="dict.type.pc_abnormal_type" :value="scope.row.abnormalType"/>
</template>
</el-table-column>
<el-table-column label="异常原因" align="center" prop="abnormalReason" />
<el-table-column label="异常时间" align="center" prop="abnormalTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.abnormalTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="单据状态" align="center" prop="abnormalStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.qc_submit_status" :value="scope.row.abnormalStatus"/>
</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="primary"
@click="0"
>提交</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['qc:report:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['qc:report: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="900px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
<el-form-item label="编批单号" prop="batchNumber">
<el-input v-model="form.batchNumber" placeholder="请输入编批单号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工序编号" prop="processCode">
<el-input v-model="form.processCode" placeholder="请输入工序编号" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="工序名称" prop="processName">
<el-input v-model="form.processName" placeholder="请输入工序名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="作业单元编号" prop="workstationCode">
<el-input v-model="form.workstationCode" placeholder="请输入工作单元编号" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="作业单元名称" prop="workstationName">
<el-input v-model="form.workstationName" placeholder="请输入工作单元名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="异常类型" prop="abnormalType">
<el-select v-model="form.abnormalType" placeholder="请选择异常类型">
<el-option
v-for="dict in dict.type.pc_abnormal_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="异常原因" prop="abnormalReason">
<el-input v-model="form.abnormalReason" placeholder="请输入异常原因" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="异常时间" prop="abnormalTime">
<el-date-picker clearable
v-model="form.abnormalTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择异常时间">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="单据状态" prop="abnormalStatus">
<el-select v-model="form.abnormalStatus" placeholder="请选择异常状态">
<el-option
v-for="dict in dict.type.qc_submit_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</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 { listReport, getReport, delReport, addReport, updateReport } from "@/api/mes/qc/report";
export default {
dicts: ['qc_submit_status','pc_abnormal_type'],
name: "Report",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 车间异常单表格数据
reportList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
batchNumber: null, processId: null, processCode: null, processName: null, workstationId: null, workstationCode: null, workstationName: null, abnormalType: null, abnormalReason: null, abnormalTime: null, abnormalStatus: null, },
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询车间异常单列表 */
getList() {
this.loading = true;
listReport(this.queryParams).then(response => {
this.reportList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
abnormalReportId: null, batchNumber: null, processId: null, processCode: null, processName: null, workstationId: null, workstationCode: null, workstationName: null, abnormalType: null, abnormalReason: null, abnormalTime: null, abnormalStatus: null, createBy: null, createTime: null, updateBy: null, updateTime: 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.abnormalReportId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加车间异常单";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const abnormalReportId = row.abnormalReportId || this.ids
getReport(abnormalReportId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改车间异常单";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.abnormalReportId != null) {
updateReport(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addReport(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const abnormalReportIds = row.abnormalReportId || this.ids;
this.$modal.confirm('是否确认删除车间异常单编号为"' + abnormalReportIds + '"的数据项？').then(function() {
return delReport(abnormalReportIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('qc/report/export', {
...this.queryParams
}, `report_${new Date().getTime()}.xlsx`)
}
}
};
</script>
src/views/mes/tm/maintenance/index.vue
View file @ c0734386
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
v-hasPermi="['md:maintenance:add']" v-hasPermi="['md:maintenance:add']"
>创建</el-button> >创建</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
plain plain
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
@click="handleView" @click="handleView"
v-hasPermi="['md:maintenance:query']" v-hasPermi="['md:maintenance:query']"
>查看</el-button> >查看</el-button>
</el-col> </el-col> -->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="danger" type="danger"
...@@ -233,10 +233,8 @@ ...@@ -233,10 +233,8 @@
</el-form-item> </el-form-item>
<el-form-item label="存放位置" prop="location"> <el-form-item label="存放位置" prop="location">
<el-input <el-input
v-model="form.location" v-model="form.location" placeholder="请选择维护类型"
readonly="readonly" ></el-input>
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="维护人" prop="processPerson"> <el-form-item label="维护人" prop="processPerson">
<el-input v-model="form.processPerson" readonly="readonly" /> <el-input v-model="form.processPerson" readonly="readonly" />
......
src/views/mes/tm/tool/index.vue
View file @ c0734386
...@@ -163,13 +163,20 @@ ...@@ -163,13 +163,20 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" width="120" fixed="right" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" width="120" fixed="right" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <!-- <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['mes:tm:tool:edit']" v-hasPermi="['mes:tm:tool:edit']"
>修改</el-button> >修改</el-button> -->
<el-button
size="mini"
type="text"
icon="el-icon-query"
@click="handleView(scope.row)"
v-hasPermi="['mes:tm:tool:query']"
>查看</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
...@@ -191,7 +198,11 @@ ...@@ -191,7 +198,11 @@
<!-- 添加或修改工装夹具清单对话框 --> <!-- 添加或修改工装夹具清单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form"
:model="form"
:rules="rules"
:disabled="form.toolId&&optType!='edit'"
label-width="120px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工装夹具类型" prop="toolTypeId"> <el-form-item label="工装夹具类型" prop="toolTypeId">
...@@ -263,15 +274,16 @@ ...@@ -263,15 +274,16 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="数量" prop="quantity"> <el-form-item label="数量" prop="quantity">
<el-input v-if="form.codeFlag=='Y'" readonly v-model="form.quantity" /> <!-- <el-input v-if="form.codeFlag=='Y'" readonly v-model="form.quantity" /> -->
<el-input-number :min="0" @blur="onQuantityChanged" v-else v-model="form.quantity" placeholder="请输入数量" /> <!-- <el-input-number :min="0" @blur="onQuantityChanged" v-else v-model="form.quantity" /> -->
<el-input-number :min="0" @blur="onQuantityChanged" disabled v-model="form.quantity" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="可用数量" prop="quantityAvail"> <el-form-item label="可用数量" prop="quantityAvail">
<el-input v-model="form.quantityAvail" readonly placeholder="请输入可用数量" /> <el-input v-model="form.quantityAvail" readonly />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -405,7 +417,11 @@ export default { ...@@ -405,7 +417,11 @@ export default {
], ],
quantity: [ quantity: [
{ required: true, message: "数量不能为空", trigger: "blur" } { required: true, message: "数量不能为空", trigger: "blur" }
], ], nextMaintenPeriod: [
{ required: true, message: "最低寿命不能为空", trigger: "blur" }
], lifeTime: [
{ required: true, message: "剩余寿命不能为空", trigger: "blur" }
],
} }
}; };
}, },
...@@ -448,8 +464,8 @@ export default { ...@@ -448,8 +464,8 @@ export default {
toolTypeId: null, toolTypeId: null,
toolTypeCode: null, toolTypeCode: null,
toolTypeName: null, toolTypeName: null,
quantity: null, quantity: '1',
quantityAvail: null, quantityAvail: '1',
maintenType: 'REGULAR', maintenType: 'REGULAR',
nextMaintenPeriod: null, nextMaintenPeriod: null,
nextMaintenDate: null, nextMaintenDate: null,
...@@ -581,8 +597,8 @@ export default { ...@@ -581,8 +597,8 @@ export default {
if(row != undefined && row != null){ if(row != undefined && row != null){
this.form.itemId = row.itemId; this.form.itemId = row.itemId;
this.form.itemCode = row.itemCode; this.form.itemCode = row.itemCode;
this.form.itemName = row.itemName; this.form.toolName = row.itemName;
this.form.specification = row.specification; this.form.spec = row.specification;
this.form.sapItemCode = row.sapItemCode; this.form.sapItemCode = row.sapItemCode;
this.form.unitOfMeasure = row.unitOfMeasure; this.form.unitOfMeasure = row.unitOfMeasure;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment