update - add质检工序

master
yinq 10 months ago
parent 8e4126e62c
commit 2dad118699

@ -2,7 +2,7 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="所属产线" prop="productLineCode" >
<el-select v-model="queryParams.productLineCode" placeholder="请选择产线工位">
<el-select v-model="queryParams.productLineCode" placeholder="请选择所属产线">
<el-option
v-for="item in productLineList"
:key="item.productLineCode"
@ -11,13 +11,15 @@
></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="工序编号" prop="processCode">-->
<!-- <el-input-->
<!-- v-model="queryParams.processCode"-->
<!-- placeholder="请输入工序编号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- <el-form-item label="工序类别" prop="processType">-->
<!-- <el-select v-model="queryParams.processType" placeholder="请选择工序类别" clearable>-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.process_type"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="工序名称" prop="processName">
<el-input
@ -95,8 +97,8 @@
<el-table-column label="工序名称" align="center" prop="processName" v-if="columns[2].visible"/>
<el-table-column label="类别" align="center" prop="processType" v-if="columns[3].visible"/>
<el-table-column label="所属产线" align="center" prop="productLineCode" v-if="columns[4].visible"/>
<el-table-column label="所属工位编号" align="center" prop="parentId" v-if="columns[13].visible"/>
<el-table-column label="所属工位名称" align="center" prop="stationName" v-if="columns[14].visible"/>
<el-table-column label="下级工位编号" align="center" prop="parentId" v-if="columns[13].visible"/>
<el-table-column label="下级工位名称" align="center" prop="stationName" v-if="columns[14].visible"/>
<el-table-column label="单位生产时间" align="center" prop="productionTime" v-if="columns[5].visible"/>
<el-table-column label="日产能" align="center" prop="capacityDay" v-if="columns[6].visible"/>
<el-table-column label="月产能" align="center" prop="capacityMonth" v-if="columns[7].visible"/>
@ -124,7 +126,7 @@
type="text"
icon="el-icon-s-grid"
@click="findStation(scope.row)"
>所属工位</el-button>
>下级工位</el-button>
<el-button
size="mini"
type="text"
@ -170,8 +172,8 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="所属工位">
<el-select v-model="form.parentId" placeholder="请输入所属工位" multiple clearable>
<el-form-item label="下级工位">
<el-select v-model="form.parentId" placeholder="请输入下级工位" multiple clearable>
<el-option
v-for="item in findStationList"
:key="item.productLineCode"
@ -203,7 +205,7 @@ import { listProcessStation, getProcessStation, delProcessStation, addProcessSta
import { findProductLineList } from "@/api/base/productLine";
export default {
name: "ProcessStation",
dicts: ['is_flag'],
dicts: ['is_flag','process_type'],
data() {
return {
//
@ -340,7 +342,7 @@ export default {
this.open = true;
this.title = "添加生产工序/工位信息";
},
/** 查看所属工位 */
/** 查看下级工位 */
findStation: function(row) {
const processCode = row.processCode;
this.$router.push("/base/productProcess-station/index/" + processCode);

@ -102,7 +102,7 @@
type="text"
icon="el-icon-s-grid"
@click="findStation(scope.row)"
>所属工位</el-button>
>下级工位</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
@ -308,7 +308,7 @@ export default {
});
},
/** 查看所属工位 */
/** 查看下级工位 */
findStation: function(row) {
const productLineCode = row.productLineCode;
this.$router.push("/base/product-station/index/" + productLineCode);

@ -276,7 +276,8 @@ export default {
};
},
created() {
if (!this.$route.params){
console.log(this.$route.params)
if (this.$route.params != null){
this.queryParams.parentId = this.$route.params && this.$route.params.productLineCode;
this.queryParams.processCode = this.$route.params && this.$route.params.processCode;
}

@ -0,0 +1,413 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="所属产线" prop="productLineCode" >
<el-select v-model="queryParams.productLineCode" placeholder="请选择所属产线">
<el-option
v-for="item in productLineList"
:key="item.productLineCode"
:label="item.productLineName"
:value="item.productLineCode"
></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="工序类别" prop="processType">-->
<!-- <el-select v-model="queryParams.processType" placeholder="请选择工序类别" clearable>-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.process_type"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="工序名称" prop="processName">
<el-input
v-model="queryParams.processName"
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-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="['base:processStation: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="['base:processStation: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="['base:processStation: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="['base:processStation:export']"
>导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-close"
size="mini"
@click="handleClose"
>关闭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="processStationList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
<el-table-column label="工序编号" align="center" prop="processCode" v-if="columns[1].visible"/>
<el-table-column label="工序名称" align="center" prop="processName" v-if="columns[2].visible"/>
<el-table-column label="类别" align="center" prop="processType" v-if="columns[3].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.process_type" :value="scope.row.processType"/>
</template>
</el-table-column>
<el-table-column label="所属产线" align="center" prop="productLineCode" v-if="columns[4].visible"/>
<el-table-column label="下级工位编号" align="center" prop="parentId" v-if="columns[13].visible"/>
<el-table-column label="下级工位名称" align="center" prop="stationName" v-if="columns[14].visible"/>
<el-table-column label="单位生产时间" align="center" prop="productionTime" v-if="columns[5].visible"/>
<el-table-column label="日产能" align="center" prop="capacityDay" v-if="columns[6].visible"/>
<el-table-column label="月产能" align="center" prop="capacityMonth" v-if="columns[7].visible"/>
<el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[8].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[9].visible"/>
<el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[10].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="更新人" align="center" prop="updatedBy" v-if="columns[11].visible"/>
<el-table-column label="更新时间" align="center" prop="updatedTime" width="180" v-if="columns[12].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</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-s-grid"
@click="findStation(scope.row)"
>下级工位</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['base:processStation:edit']"
>修改</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['base:processStation: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="工序编号" prop="processCode">
<el-input v-model="form.processCode" placeholder="请输入工序/工位编号" />
</el-form-item>
<el-form-item label="工序名称" prop="processName">
<el-input v-model="form.processName" placeholder="请输入工序/工位名称" />
</el-form-item>
<el-form-item label="所属产线">
<el-select v-model="form.productLineCode" placeholder="请输入所属产线">
<el-option
v-for="item in productLineList"
:key="item.productLineCode"
:label="item.productLineName"
:value="item.productLineCode"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="下级工位">
<el-select v-model="form.parentId" placeholder="请输入下级工位" multiple clearable>
<el-option
v-for="item in findStationList"
:key="item.productLineCode"
:label="item.productLineName"
:value="item.productLineCode"
></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="单位生产时间" prop="productionTime">-->
<!-- <el-input v-model="form.productionTime" placeholder="请输入单位生产时间" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="日产能" prop="capacityDay">-->
<!-- <el-input v-model="form.capacityDay" placeholder="请输入日产能" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="月产能" prop="capacityMonth">-->
<!-- <el-input v-model="form.capacityMonth" 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 { listProcessStation, getProcessStation, delProcessStation, addProcessStation, updateProcessStation } from "@/api/base/processStation";
import { findProductLineList } from "@/api/base/productLine";
export default {
name: "ProcessStation",
dicts: ['is_flag','process_type'],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
// /
processStationList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
processCode: null,
processName: null,
processType: 2,
productLineCode: null,
productionTime: null,
capacityDay: null,
capacityMonth: null,
isFlag: null,
createdBy: null,
createdTime: null,
updatedBy: null,
updatedTime: null,
parentId: null
},
//
form: {},
//
rules: {
},
columns: [
{ key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `工序/工位编号`, visible: true },
{ key: 2, label: `工序/工位名称`, visible: true },
{ key: 3, label: `类别`, visible: true },
{ key: 4, label: `所属产线`, visible: true },
{ key: 5, label: `单位生产时间`, visible: false },
{ key: 6, label: `日产能`, visible: false },
{ key: 7, label: `月产能`, visible: false },
{ key: 8, label: `启用标识`, visible: false },
{ key: 9, label: `创建人`, visible: false },
{ key: 10, label: `创建时间`, visible: false },
{ key: 11, label: `更新人`, visible: false },
{ key: 12, label: `更新时间`, visible: false },
{ key: 13, label: `工位编号`, visible: true },
{ key: 14, label: `工位名称`, visible: true },
],
// 线
productLineList: [],
//
findStationList: [],
};
},
created() {
if (!this.$route.params){
this.queryParams.productLineCode = this.$route.params && this.$route.params.productLineCode;
}
this.getList();
},
methods: {
/** 查询生产工序/工位信息列表 */
getList() {
this.loading = true;
listProcessStation(this.queryParams).then(response => {
this.processStationList = response.rows;
this.total = response.total;
this.loading = false;
});
findProductLineList({productLineType: 1}).then(response => {
this.productLineList = response.data;
});
findProductLineList({productLineType: 2}).then(response => {
this.findStationList = response.data;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
objId: null,
processCode: null,
processName: null,
processType: 2,
productLineCode: null,
productionTime: null,
capacityDay: null,
capacityMonth: null,
isFlag: 0,
createdBy: null,
createdTime: null,
updatedBy: null,
updatedTime: null,
parentId: null
};
this.queryParams.productLineCode = 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.objId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加生产工序/工位信息";
},
/** 查看下级工位 */
findStation: function(row) {
const processCode = row.processCode;
this.$router.push("/base/productProcess-station/index/" + processCode);
},
/** 返回按钮操作 */
handleClose() {
const obj = { path: "/base/productLine" };
this.$tab.closeOpenPage(obj);
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const objId = row.objId || this.ids
getProcessStation(objId).then(response => {
this.form = response.data;
if (this.form.parentId != null) {
this.form.parentId = this.form.parentId.split(',');
}
this.open = true;
this.title = "修改生产工序/工位信息";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.parentId != null){
this.form.parentId = this.form.parentId.join(',');
}
if (this.form.objId != null) {
updateProcessStation(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addProcessStation(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const objIds = row.objId || this.ids;
this.$modal.confirm('是否确认删除生产工序/工位信息编号为"' + objIds + '"的数据项?').then(function() {
return delProcessStation(objIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('base/processStation/export', {
...this.queryParams
}, `processStation_${new Date().getTime()}.xlsx`)
}
}
};
</script>

@ -84,7 +84,7 @@
<el-table-column label="班组编号" align="center" prop="teamCode" v-if="columns[1].visible"/>
<el-table-column label="班组名称" align="center" prop="teamName" v-if="columns[2].visible"/>
<el-table-column label="班组负责人" align="center" prop="teamHead" v-if="columns[3].visible"/>
<el-table-column label="所属产线" align="center" prop="productLineName" v-if="columns[4].visible"/>
<el-table-column label="所属产线/工位" align="center" prop="productLineName" v-if="columns[4].visible"/>
<el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[5].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
@ -132,7 +132,7 @@
<!-- 添加或修改班组信息对话框 -->
<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 ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="班组编号" prop="teamCode">
<el-input v-model="form.teamCode" placeholder="请输入班组编号" />
</el-form-item>
@ -142,8 +142,8 @@
<el-form-item label="班组负责人" prop="teamHead">
<el-input v-model="form.teamHead" placeholder="请输入班组负责人" />
</el-form-item>
<el-form-item label="所属产线">
<el-select v-model="form.productLineCode" placeholder="请选择所属产线">
<el-form-item label="所属产线/工位">
<el-select v-model="form.productLineCode" placeholder="请选择所属产线/工位">
<el-option
v-for="item in productLineList"
:key="item.productLineCode"
@ -221,7 +221,7 @@ export default {
{ key: 1, label: `班组编号`, visible: true },
{ key: 2, label: `班组名称`, visible: true },
{ key: 3, label: `班组负责人`, visible: true },
{ key: 4, label: `所属产线`, visible: true },
{ key: 4, label: `所属产线/工位`, visible: true },
{ key: 5, label: `启用标识`, visible: true },
{ key: 6, label: `创建人`, visible: false },
{ key: 7, label: `创建时间`, visible: false },

@ -1,10 +1,10 @@
<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="barCode">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
<el-form-item label="箱体码" prop="barCode">
<el-input
v-model="queryParams.barCode"
placeholder="请输入产品条码"
placeholder="请输入箱体码"
clearable
@keyup.enter.native="handleQuery"
/>
@ -108,7 +108,7 @@
<el-table v-loading="loading" :data="qualityInspectionList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
<el-table-column label="产品条码" align="center" prop="barCode" v-if="columns[1].visible"/>
<el-table-column label="箱体码" align="center" prop="barCode" v-if="columns[1].visible"/>
<el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[2].visible"/>
<el-table-column label="工序编号" align="center" prop="processCode" v-if="columns[3].visible"/>
<el-table-column label="检测项编号" align="center" prop="testItemCode" v-if="columns[4].visible"/>
@ -176,8 +176,8 @@
<!-- 添加或修改质检记录管理对话框 -->
<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="barCode">
<el-input v-model="form.barCode" placeholder="请输入产品条码" />
<el-form-item label="箱体码" prop="barCode">
<el-input v-model="form.barCode" placeholder="请输入箱体码" />
</el-form-item>
<el-form-item label="物料名称" prop="materialName">
<el-input v-model="form.materialName" placeholder="请输入物料名称" />
@ -318,7 +318,7 @@ export default {
},
columns: [
{ key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `产品条`, visible: true },
{ key: 1, label: `箱体`, visible: true },
{ key: 2, label: `物料名称`, visible: true },
{ key: 3, label: `工序编号`, visible: true },
{ key: 4, label: `检测项编号`, visible: true },

Loading…
Cancel
Save