Skip to content

M
mes-ui
Commit 13ca3718 authored by 李驰骋's avatar 李驰骋
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 3079739f ee59de38
Hide whitespace changes
Inline Side-by-side
Showing with 907 additions and 0 deletions
src/api/mes/pro/request.js 0 → 100644
View file @ 13ca3718
import request from '@/utils/request'
// 查询领料申请列表
export function listMaterialRequest(query) {
return request({
url: '/pro/materialRequest/list',
method: 'get',
params: query
})
}
// 查询领料申请详细
export function getMaterialRequest(materialRequestId) {
return request({
url: '/pro/materialRequest/' + materialRequestId,
method: 'get'
})
}
// 新增领料申请
export function addMaterialRequest(data) {
return request({
url: '/pro/materialRequest',
method: 'post',
data: data
})
}
// 修改领料申请
export function updateMaterialRequest(data) {
return request({
url: '/pro/materialRequest',
method: 'put',
data: data
})
}
// 删除领料申请
export function delMaterialRequest(materialRequestId) {
return request({
url: '/pro/materialRequest/' + materialRequestId,
method: 'delete'
})
}
src/api/mes/pro/return.js 0 → 100644
View file @ 13ca3718
import request from '@/utils/request'
// 查询退料申请列表
export function listMaterialReturn(query) {
return request({
url: '/pro/materialReturn/list',
method: 'get',
params: query
})
}
// 查询退料申请详细
export function getMaterialReturn(materialReturnId) {
return request({
url: '/pro/materialReturn/' + materialReturnId,
method: 'get'
})
}
// 新增退料申请
export function addMaterialReturn(data) {
return request({
url: '/pro/materialReturn',
method: 'post',
data: data
})
}
// 修改退料申请
export function updateMaterialReturn(data) {
return request({
url: '/pro/materialReturn',
method: 'put',
data: data
})
}
// 删除退料申请
export function delMaterialReturn(materialReturnId) {
return request({
url: '/pro/materialReturn/' + materialReturnId,
method: 'delete'
})
}
src/views/mes/pro/request/index.vue 0 → 100644
View file @ 13ca3718
<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="itemCode">
<el-input
v-model="queryParams.itemCode"
placeholder="请输入产品编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品名称" prop="itemName">
<el-input
v-model="queryParams.itemName"
placeholder="请输入产品名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="编排单号" prop="arrangeCode">
<el-input
v-model="queryParams.arrangeCode"
placeholder="请输入编排单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="领用数量" prop="applyNum">
<el-input
v-model="queryParams.applyNum"
placeholder="请输入领用数量"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建人" prop="createBy">
<el-input
v-model="queryParams.createBy"
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>
<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="['pro:materialRequest: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="['pro:materialRequest: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="['pro:materialRequest: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="['pro:materialRequest:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="materialRequestList" @selection-change="handleSelectionChange">
<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="applyType">
<template slot-scope="scope">
<dict-tag :options="dict.type.pro_requisition_type" :value="scope.row.applyType"/>
</template>
</el-table-column>
<el-table-column label="编排单号" align="center" prop="arrangeCode" />
<el-table-column label="领用数量" align="center" prop="applyNum" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.CreateTime, '{y}-{m}-{d}') }}</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-view"
@click="handleView(scope.row)"
v-hasPermi="['pro:materialRequest:view']"
>查看</el-button>
<!-- <el-button
size="mini"
type="text"
icon="el-icon-edit"
@click=" handleUpdate(scope.row)"
v-hasPermi="['pro:materialRequest:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['pro:materialRequest: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="700px" append-to-body>
<el-form ref="form"
:model="form"
:rules="rules"
:disabled="form.materialRequestId&&optType!='edit'"
label-width="80px">
<el-row>
<el-col :span="12">
<el-form-item label="产品编号" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请输入产品编号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="产品名称" prop="itemName">
<el-input v-model="form.itemName" placeholder="请输入产品名称" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="领料类型" prop="applyType">
<el-select v-model="form.applyType" placeholder="请选择领用类型">
<el-option
v-for="dict in dict.type.pro_requisition_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="领用数量数量" prop="applyNum">
<el-input v-model="form.applyNum" placeholder="请输入申请数量" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="编排单号" prop="arrangeCode">
<el-input v-model="form.arrangeCode" type="textarea" placeholder="请输入编排单号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="创建人" prop="createBy">
<el-input v-model="form.createBy" type="textarea" placeholder="请输入创始人" />
</el-form-item>
</el-col>
</el-row>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker clearable
v-model="form.createTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择异常时间">
</el-date-picker>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view' ">返回</el-button>
<el-button type="primary" @click="submitForm" v-if="optType!='view'">确 定</el-button>
<el-button @click="cancel" v-if="optType!='view'">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listMaterialRequest, getMaterialRequest, delMaterialRequest, addMaterialRequest, updateMaterialRequest } from "@/api/mes/pro/request";
export default {
name: "MaterialRequest",
dicts: ['pro_requisition_type'],
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 领料申请表格数据
materialRequestList: [],
// 弹出层标题
title: "",
daterangePurchaseDate: [],
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
applyNo: null,
itemId: null,
taskId: null,
arrangeCode: null,
createTime: null,
applyNum: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null, },
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询领料申请列表 */
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];
}
listMaterialRequest(this.queryParams).then(response => {
this.materialRequestList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
materialRequestId: null,
applyNo: null,
itemId: null,
taskId: null,
applyNum: null,
arrangeCode: null,
createTime: null,
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: 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.materialRequestId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加领料申请";
this.optType = "add";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const materialRequestId = row.materialRequestId || this.ids
getMaterialRequest(materialRequestId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改领料申请";
this.optType="edit";
});
},
// 查询明细按钮操作
handleView(row){
this.reset();
const materialRequestId = row.materialRequestId || this.ids;
getMaterialRequest(materialRequestId).then(response => {
this.form = response.data;
this.open = true;
this.title = "查看领料申请";
this.optType = "view";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.materialRequestId != null) {
updateMaterialRequest(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addMaterialRequest(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const materialRequestIds = row.materialRequestId || this.ids;
this.$modal.confirm('是否确认删除领料申请编号为"' + materialRequestIds + '"的数据项？').then(function() {
return delMaterialRequest(materialRequestIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('pro/materialRequest/export', {
...this.queryParams
}, `materialRequest_${new Date().getTime()}.xlsx`)
}
}
};
</script>
src/views/mes/pro/return/index.vue 0 → 100644
View file @ 13ca3718
<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="itemCode">
<el-input
v-model="queryParams.itemCode"
placeholder="请输入产品编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品名称" prop="itemName">
<el-input
v-model="queryParams.itemName"
placeholder="请输入产品名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工单号" prop="workOrderId">
<el-input
v-model="queryParams.workOrderId"
placeholder="请输入工单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="退料数量" prop="backNum">
<el-input
v-model="queryParams.backNum"
placeholder="请输入退料数量"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="批次号" prop="batchNo">
<el-input
v-model="queryParams.batchNo"
placeholder="请输入批次号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="卷号" prop="packNo">
<el-input
v-model="queryParams.packNo"
placeholder="请输入卷号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建人" prop="createBy">
<el-input
v-model="queryParams.createBy"
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>
<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="['pro:materialReturn: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="['pro:materialReturn: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="['pro:materialReturn: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="['pro:materialReturn:export']"
>导出</el-button> -->
<!-- </el-col> -->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="materialReturnList" @selection-change="handleSelectionChange">
<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="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">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-view"
@click="handleView(scope.row)"
v-hasPermi="['pro:materialReturn:view']"
>查看</el-button>
<!-- <el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['pro:materialReturn:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['pro:materialReturn: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="600px" append-to-body>
<el-form ref="form" :model="form" :disabled="form.materialReturnId&&optType!='edit'" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
<el-form-item label="产品编码" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请输入产品编码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="产品名称" prop="itemName">
<el-input v-model="form.itemName" placeholder="请输入产品名称" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="工单号" prop="workOrderId">
<el-input v-model="form.workOrderId" placeholder="请输入工单号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="批次号" prop="batchNo">
<el-input v-model="form.batchNo" placeholder="请输入批次号" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="卷号" prop="packNo">
<el-input v-model="form.packNo" placeholder="请输入卷号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="退料数量" prop="backNum">
<el-input v-model="form.backNum" placeholder="请输入退料数量" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="创建人" prop="createBy">
<el-input v-model="form.createBy" placeholder="请输入创建人" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="创建时间" prop="createTime">
<el-input v-model="form.createTime" placeholder="请输入创建时间" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType=='view' ">返回</el-button>
<el-button type="primary" @click="submitForm" v-if="optType!='view'">确 定</el-button>
<el-button @click="cancel" v-if="optType!='view'">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listMaterialReturn, getMaterialReturn, delMaterialReturn, addMaterialReturn, updateMaterialReturn } from "@/api/mes/pro/return";
export default {
name: "MaterialReturn",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 退料申请表格数据
materialReturnList: [],
daterangePurchaseDate: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
applyNo: null,
itemId: null,
taskId: null,
itemCode: null,
itemName: null,
createBy: null,
createTime: null,
issueLineId: null,
workOrderId: null,
backNum: null,
batchNo: null,
packNo: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null, },
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询退料申请列表 */
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];
}
listMaterialReturn(this.queryParams).then(response => {
this.materialReturnList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
materialReturnId: null,
applyNo: null,
itemId: null,
taskId: null,
issueLineId: null,
workOrderId: null,
backNum: null,
itemCode: null,
itemName: null,
createBy: null,
createTime: null,
batchNo: null,
packNo: null,
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: 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.materialReturnId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加退料申请";
this.optType = "add";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const materialReturnId = row.materialReturnId || this.ids
getMaterialReturn(materialReturnId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改退料申请";
this.optType="edit";
});
},
handleView(row){
this.reset();
const materialReturnId = row.materialReturnId || this.ids;
getMaterialReturn(materialReturnId).then(response => {
this.form = response.data;
this.open = true;
this.title = "查看退料申请单";
this.optType = "view";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.materialReturnId != null) {
updateMaterialReturn(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addMaterialReturn(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const materialReturnIds = row.materialReturnId || this.ids;
this.$modal.confirm('是否确认删除退料申请编号为"' + materialReturnIds + '"的数据项？').then(function() {
return delMaterialReturn(materialReturnIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('pro/materialReturn/export', {
...this.queryParams
}, `materialReturn_${new Date().getTime()}.xlsx`)
}
}
};
</script>
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