Skip to content

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

修复bug和退料申请调试

parent b2c69385
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 22 deletions
src/views/mes/pro/request/index.vue
View file @ e657817f
......@@ -41,8 +41,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建人" prop="createBy">
<el-form-item label="创建人" prop="createBy">
<el-input
v-model="queryParams.createBy"
placeholder="请输入创建人"
......@@ -275,7 +274,8 @@ export default {
pageNum: 1,
pageSize: 10,
applyNo: null,
itemId: null,
itemId: null,
itemName: null,
taskId: null,
arrangeCode: null,
createTime: null,
......@@ -317,10 +317,12 @@ export default {
},
// 表单重置
reset() {
this.daterangePurchaseDate = [];
this.form = {
materialRequestId: null,
applyNo: null,
itemId: null,
itemId: null,
itemName: null,
taskId: null,
applyNum: null,
arrangeCode: null,
......@@ -335,6 +337,7 @@ export default {
createTime: null,
updateBy: null,
updateTime: null };
this.resetForm("form");
},
/** 搜索按钮操作 */
......
src/views/mes/pro/return/index.vue
View file @ e657817f
......@@ -17,9 +17,9 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工单号" prop="workOrderId">
<el-form-item label="工单号" prop="workorderCode">
<el-input
v-model="queryParams.workOrderId"
v-model="queryParams.workorderCode"
placeholder="请输入工单号"
clearable
@keyup.enter.native="handleQuery"
......@@ -124,13 +124,21 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="产品编码" align="center" prop="itemCode" />
<el-table-column label="产品名称" align="center" prop="itemName" />
<el-table-column label="工单号" align="center" prop="workOrderId" />
<el-table-column label="工单号" align="center" prop="workorderCode" />
<el-table-column label="批次号" align="center" prop="batchNo" />
<el-table-column label="卷号" align="center" prop="packNo" />
<el-table-column label="退料数量" align="center" prop="backNum" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="是否合格" align="center" prop="isQualified">
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_non"
:value="scope.row.isQualified"
/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
......@@ -231,6 +239,7 @@ import { listMaterialReturn, getMaterialReturn, delMaterialReturn, addMaterialRe
export default {
name: "MaterialReturn",
dicts: ['sys_yes_non'],
data() {
return {
// 遮罩层
......@@ -265,7 +274,9 @@ export default {
createBy: null,
createTime: null,
issueLineId: null,
workOrderId: null,
workOrderId: null,
workorderCode: null,
isQualified: null,
backNum: null,
batchNo: null,
packNo: null,
......@@ -311,12 +322,14 @@ export default {
itemId: null,
taskId: null,
issueLineId: null,
workOrderId: null,
workOrderId: null,
workorderCode: null,
backNum: null,
itemCode: null,
itemName: null,
createBy: null,
createTime: null,
createTime: null,
isQualified: null,
batchNo: null,
packNo: null,
remark: null,
......
src/views/mes/qc/abnormal/index.vue
View file @ e657817f
<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="abnormalType">
<!-- <el-form-item label="异常类型" prop="abnormalType">
<el-input
v-model="queryParams.abnormalType"
placeholder="请输入异常类型"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="异常类型" prop="abnormalType">
<el-select v-model="queryParams.abnormalType" placeholder="请选择单据状态" clearable>
<el-option
v-for="dict in dict.type.pc_abnormal_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</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="abnormalReason">
<el-input
......
src/views/mes/qc/report/index.vue
View file @ e657817f
......@@ -33,13 +33,24 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="异常时间" prop="abnormalTime">
<!-- <el-form-item label="异常时间" prop="abnormalTime">
<el-input
v-model="queryParams.abnormalTime"
placeholder="请输入异常时间"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="异常时间">
<el-date-picker
v-model="daterangePurchaseDate"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<!-- <el-form-item label="单据状态" prop="abnormalStatus">
<el-select v-model="queryParams.abnormalStatus" placeholder="请选择单据状态" clearable>
......@@ -259,6 +270,8 @@ export default {
total: 0,
// 车间异常单表格数据
reportList: [],
daterangePurchaseDate: [],
// 弹出层标题
title: "",
// 是否显示弹出层
......@@ -292,6 +305,11 @@ export default {
/** 查询车间异常单列表 */
getList() {
this.loading = true;
this.queryParams.params = {};
if (null != this.daterangePurchaseDate && '' != this.daterangePurchaseDate) {
this.queryParams.params["beginPurchaseDate"] = this.daterangePurchaseDate[0];
this.queryParams.params["endPurchaseDate"] = this.daterangePurchaseDate[1];
}
listReport(this.queryParams).then(response => {
this.reportList = response.rows;
this.total = response.total;
......@@ -305,6 +323,7 @@ export default {
},
// 表单重置
reset() {
this.daterangePurchaseDate = [];
this.form = {
abnormalReportId: null,
batchNumber: null,
......
src/views/mes/tm/maintenance/index.vue
View file @ e657817f
<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="maintenanceCode">
<el-form-item label="维护保养编号" prop="toolMaintenanceCode">
<el-input
v-model="queryParams.maintenanceCode"
v-model="queryParams.toolMaintenanceCode"
placeholder="请输入维护保养编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="单据状态" prop="maintenanceStatus">
<!-- <el-form-item label="单据状态" prop="maintenanceStatus">
<el-select v-model="queryParams.maintenanceStatus" placeholder="请选择单据状态" clearable>
<el-option label="请选择字典生成" value="" />
<el-option
v-for="dict in dict.mes_maintenance_status"
:key="dict.value"
:label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="单据状态" prop="maintenanceStatus">
<el-select v-model="queryParams.maintenanceStatus" placeholder="请选择单据状态" clearable>
<el-option
v-for="dict in dict.type.mes_maintenance_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="物料编码" prop="itemCode">
<el-input
v-model="queryParams.itemCode"
......@@ -79,7 +93,7 @@
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
:disabled="single"
@click="handleDelete"
v-hasPermi="['md:maintenance:remove']"
>开始维护</el-button>
......@@ -101,12 +115,17 @@
<el-table v-loading="loading" :data="maintenanceList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="维护保养单号" align="center" prop="toolMaintenanceId" />
<el-table-column label="维护保养单号" align="center" prop="toolMaintenanceCode" />
<!--
<el-table-column label="单据状态" align="center" prop="maintenanceStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_maintenance_status" :value="scope.row.maintenanceStatus"/>
</template>
</el-table-column> -->
<el-table-column label="单据状态" align="center" prop="maintenanceStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_maintenance_status" :value="scope.row.maintenanceStatus"/>
</template>
</el-table-column>
<el-table-column label="维护类型" align="center" prop="maintenanceType">
......@@ -160,7 +179,7 @@
ref="form"
:model="form"
:rules="rules"
:disabled="form.toolMaintenanceId&&optType!='view'"
:disabled="form.toolMaintenanceId&&optType!='add'"
label-width="80px" >
<!-- <el-form-item label="单据状态">
<el-radio-group v-model="form.maintenanceStatus">
......@@ -326,6 +345,7 @@ export default {
pageNum: 1,
pageSize: 10,
toolMaintenanceId: null,
toolMaintenanceCode: null,
toolId: null,
maintenanceStatus: null,
maintenanceType: null,
......@@ -374,6 +394,7 @@ export default {
reset() {
this.form = {
toolMaintenanceId: null,
toolMaintenanceCode: null,
toolId: null,
maintenanceStatus: null,
maintenanceType: null,
......@@ -445,6 +466,7 @@ export default {
this.form = response.data;
this.opena = true;
this.title = "结束维护";
});
},
// 查询明细按钮操作
......
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