Skip to content

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

退料申请界面优化

parent 3df96996
Hide whitespace changes
Inline Side-by-side
Showing with 436 additions and 75 deletions
src/api/mes/pro/return.js
View file @ 5a71672b
...@@ -9,6 +9,15 @@ export function listMaterialReturn(query) { ...@@ -9,6 +9,15 @@ export function listMaterialReturn(query) {
}) })
} }
// 查询退料申请列表
export function listMaterialReturns(query) {
return request({
url: '/pro/materialReturn/lists',
method: 'get',
params: query
})
}
// 查询退料申请详细 // 查询退料申请详细
export function getMaterialReturn(materialReturnId) { export function getMaterialReturn(materialReturnId) {
return request({ return request({
......
src/components/MaterialReturn/returnItem.vue 0 → 100644
View file @ 5a71672b
<template>
<el-dialog title="单号对应物料"
v-if="showFlag"
:visible.sync="showFlag"
:modal= false
width="80%"
>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="产品编号" prop="sapItemCode">
<el-input
v-model="queryParams.sapItemCode"
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="workorderCode">
<el-input
v-model="queryParams.workorderCode"
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>
<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-table v-loading="loading" :data="protaskList" @selection-change="handleSelectionChange">
<el-table-column label="产品编码" align="center" prop="sapItemCode" />
<el-table-column label="产品名称" align="center" prop="itemName" />
<el-table-column label="申请单号" align="center" prop="applyNo" />
<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="returnNum" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
<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>
<el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" :disabled="form.materialRequestId && optType != 'edit'"
label-width="100px">
<el-row>
<el-col :span="8">
<el-form-item label="申请号" prop="applyNo">
<el-input v-model="form.applyNo" placeholder="请输入申请号" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="工单号" prop="workorderCode">
<el-input v-model="form.workorderCode" placeholder="请输入任务单号" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="编排单号" prop="arrangeCode">
<el-input v-model="form.arrangeCode" placeholder="请输入编排单号" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="产品编号" prop="sapItemCode">
<el-input v-model="form.sapItemCode" placeholder="请输入任务单号" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="产品名称" prop="itemName">
<el-input v-model="form.itemName" placeholder="请输入产品名称" />
</el-form-item>
</el-col>
<el-col :span="8">
<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="8">
<el-form-item label="工作单元" prop="workunitName">
<el-input v-model="form.workunitName" placeholder="请输入工作单元" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="创建人" prop="createBy">
<el-input v-model="form.createBy" placeholder="请输入创始人" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col >
<el-form-item label="申请时间" prop="createTime">
<el-date-picker clearable v-model="form.createTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择申请时间">
</el-date-picker>
</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>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<div slot="footer" class="dialog-footer">
<el-button @click="cancels">返 回</el-button>
</div>
</el-dialog>
</template>
<script>
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue"
import { listMaterialReturn, getMaterialReturn } from "@/api/mes/pro/return";
export default {
name: "ProtaskSelect",
dicts: ['sys_yes_no','pro_grant_num_type'],
components: {WorkstationSelect},
props:{
applyNos: {
type: String,
default: null
},
},
watch: {
applyNos:{
handler(newVal, oldVal){
this.$nextTick(() =>{
if(this.applyNos !='' && this.applyNos!=null){
this.queryParams.applyNo=this.applyNos;
this.getList();
}
})
},
immediate: true,
deep: true
}
},
data() {
return {
showFlag: false,
selectedTaskId: undefined,
selectedRow: undefined,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 生产任务表格数据
protaskList: [],
// 弹出层标题
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,
workorderCode: null,
isQualified: null,
returnNum: null,
windCase: null,
backNum: null,
arrangeCode: null,
batchNo: null,
packNo: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
},
// 表单参数
form: {},
};
},
created() {
this.getList();
},
methods: {
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
/** 查询生产任务列表 */
getList() {
this.loading = true;
listMaterialReturn(this.queryParams).then(response => {
this.protaskList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
handleCurrent(row){
if(row){
this.selectedRow = row;
}
},
//行双击选中
handleRowDbClick(row){
if(row){
console.log(row)
this.selectedRow = row;
this.$emit('onSelected',this.selectedRow);
this.showFlag = false;
}
},
// 查询明细按钮操作
handleView(row) {
this.reset();
console.log( row.materialReturnId);
const materialReturnId = row.materialReturnId;
getMaterialReturn(materialReturnId).then(response => {
this.form = response.data;
this.open = true;
this.title = "查看领料申请";
this.optType = "view";
});
},
// 取消按钮
cancels() {
this.showFlag=false
this.queryParams();
},
// 单选选中数据
handleRowChange(row) {
debugger;
if(row){
this.selectedRow = row;
}
},
// 表单重置
reset() {
this.form = {
materialReturnId: null,
applyNo: null,
itemId: null,
taskId: null,
issueLineId: null,
workOrderId: null,
workorderCode: null,
backNum: null,
itemCode: null,
itemName: null,
createBy: null,
createTime: null,
isQualified: null,
batchNo: null,
packNo: null,
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
returnNum: null,
arrangeCode: null,
windCase: null
};
this.resetForm("form");
},
//确定选中
confirmSelect(){
if(this.selectedTaskId ==null || this.selectedTaskId==0){
this.$notify({
title:'提示',
type:'warning',
message: '请至少选择一条数据!'
});
return;
}
this.$emit('onSelected',this.selectedRow);
this.showFlag = false;
}
}
};
</script>
src/components/request/requestItem.vue
View file @ 5a71672b
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<el-table-column label="产品编号" align="center" prop="sapItemCode" width="300" /> <el-table-column label="产品编号" align="center" prop="sapItemCode" width="300" />
<el-table-column label="产品名称" align="center" prop="itemName" width="300" /> <el-table-column label="产品名称" align="center" prop="itemName" width="300" />
<el-table-column label="生产工单" align="center" prop="workorderCode" width="200" /> <el-table-column label="生产工单" align="center" prop="workorderCode" width="200" />
<el-table-column label="申请单号" align="center" prop="applyNo" width="200" />
<el-table-column label="领用数量" align="center" prop="applyNum" width="200"/> <el-table-column label="领用数量" align="center" prop="applyNum" width="200"/>
<el-table-column label="发料状态" align="center" prop="grantNumType"> <el-table-column label="发料状态" align="center" prop="grantNumType">
<template slot-scope="scope"> <template slot-scope="scope">
......
src/views/mes/pro/return/index.vue
View file @ 5a71672b
<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="100px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="产品编号" prop="sapItemCode">
<el-input
v-model="queryParams.sapItemCode"
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="workorderCode">
<el-input
v-model="queryParams.workorderCode"
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-form-item label="创建人" prop="createBy">
<el-input <el-input
v-model="queryParams.createBy" v-model="queryParams.createBy"
...@@ -65,6 +17,14 @@ ...@@ -65,6 +17,14 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </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="创建时间"> <el-form-item label="创建时间">
<el-date-picker <el-date-picker
v-model="daterangePurchaseDate" v-model="daterangePurchaseDate"
...@@ -126,20 +86,19 @@ ...@@ -126,20 +86,19 @@
<!-- </el-col> --> <!-- </el-col> -->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<requestItems ref="requestitemsref" key="requestitemsref" :applyNos="applyNos" ></requestItems>
<el-table v-loading="loading" :data="materialReturnList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="materialReturnList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="100" align="center" /> <el-table-column label="申请单号" align="center" prop="applyNo" :show-overflow-tooltip="true">
<el-table-column label="产品编码" align="center" prop="sapItemCode" width="150"/> <template slot-scope="scope">
<el-table-column label="产品名称" align="center" prop="itemName" width="150"/> <el-button size="mini" type="text" @click="showCombDetail(scope.row.applyNo)" >{{
<el-table-column label="申请单编码" align="center" prop="applyNo" width="150"/> scope.row.applyNo }}
<el-table-column label="工作单元编码" align="center" prop="workunitCode" width="150"/> </el-button>
<el-table-column label="工作单元名称" align="center" prop="workunitName" width="150"/> </template>
<el-table-column label="生产工单" align="center" prop="workorderCode" width="150"/> </el-table-column>
<el-table-column label="批次号" align="center" prop="batchNo" width="100"/> <el-table-column label="编排单号" align="center" prop="arrangeCode" />
<el-table-column label="卷号" align="center" prop="packNo" width="100"/> <el-table-column label="工作单元编码" align="center" prop="workunitCode" />
<el-table-column label="申请退料数量" align="center" prop="backNum" width="100"/> <el-table-column label="工作单元名称" align="center" prop="workunitName" />
<el-table-column label="已退料数量" align="center" prop="returnNum" width="100"/> <el-table-column label="是否结案" align="center" prop="windCase" >
<el-table-column label="是否结案" align="center" prop="windCase" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
:options="dict.type.sys_yes_no" :options="dict.type.sys_yes_no"
...@@ -147,8 +106,8 @@ ...@@ -147,8 +106,8 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建人" align="center" prop="createBy" width="100"/> <el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" width="170" align="center" prop="createTime" /> <el-table-column label="创建时间" align="center" prop="createTime" />
<!-- <el-table-column label="是否合格" align="center" prop="isQualified" width="100"> <!-- <el-table-column label="是否合格" align="center" prop="isQualified" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
...@@ -254,9 +213,10 @@ ...@@ -254,9 +213,10 @@
</template> </template>
<script> <script>
import { listMaterialReturn, getMaterialReturn, delMaterialReturn, addMaterialReturn, updateMaterialReturn } from "@/api/mes/pro/return"; import { listMaterialReturns,listMaterialReturn, getMaterialReturn, delMaterialReturn, addMaterialReturn, updateMaterialReturn } from "@/api/mes/pro/return";
import requestItems from "@/components/MaterialReturn/returnItem.vue";
export default { export default {
components: {requestItems},
name: "MaterialReturn", name: "MaterialReturn",
dicts: ['sys_yes_non','sys_yes_no'], dicts: ['sys_yes_non','sys_yes_no'],
data() { data() {
...@@ -271,6 +231,8 @@ export default { ...@@ -271,6 +231,8 @@ export default {
multiple: true, multiple: true,
// 显示搜索条件 // 显示搜索条件
showSearch: true, showSearch: true,
applyNos: null,
// 总条数 // 总条数
total: 0, total: 0,
// 退料申请表格数据 // 退料申请表格数据
...@@ -291,6 +253,7 @@ export default { ...@@ -291,6 +253,7 @@ export default {
itemCode: null, itemCode: null,
itemName: null, itemName: null,
createBy: null, createBy: null,
arrangeCode: null,
createTime: null, createTime: null,
issueLineId: null, issueLineId: null,
workOrderId: null, workOrderId: null,
...@@ -324,7 +287,7 @@ export default { ...@@ -324,7 +287,7 @@ export default {
this.queryParams.params["beginPurchaseDate"] = this.daterangePurchaseDate[0]; this.queryParams.params["beginPurchaseDate"] = this.daterangePurchaseDate[0];
this.queryParams.params["endPurchaseDate"] = this.daterangePurchaseDate[1]; this.queryParams.params["endPurchaseDate"] = this.daterangePurchaseDate[1];
} }
listMaterialReturn(this.queryParams).then(response => { listMaterialReturns(this.queryParams).then(response => {
this.materialReturnList = response.rows; this.materialReturnList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
...@@ -351,6 +314,7 @@ export default { ...@@ -351,6 +314,7 @@ export default {
createBy: null, createBy: null,
createTime: null, createTime: null,
isQualified: null, isQualified: null,
arrangeCode: null,
batchNo: null, batchNo: null,
packNo: null, packNo: null,
remark: null, remark: null,
...@@ -368,6 +332,12 @@ export default { ...@@ -368,6 +332,12 @@ export default {
this.resetForm("form"); this.resetForm("form");
}, },
showCombDetail(applyNo) {
this.$refs.requestitemsref.showFlag = true;
this.applyNos= applyNo;
},
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
...@@ -404,14 +374,9 @@ export default { ...@@ -404,14 +374,9 @@ export default {
}); });
}, },
handleView(row){ handleView(row){
this.reset(); const applyNo = row.applyNo || this.applyNo;
const materialReturnId = row.materialReturnId || this.ids; this.$refs.requestitemsref.showFlag = true;
getMaterialReturn(materialReturnId).then(response => { this.applyNos= applyNo;
this.form = response.data;
this.open = true;
this.title = "查看退料申请单";
this.optType = "view";
});
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
......
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