update - add质检工位/缺陷

master
yinq 10 months ago
parent e0f2d1055a
commit 685ffcc834

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询质检工位/缺陷维护列表
export function listStationDefectRelation(query) {
return request({
url: '/base/stationDefectRelation/list',
method: 'get',
params: query
})
}
// 查询质检工位/缺陷维护详细
export function getStationDefectRelation(objId) {
return request({
url: '/base/stationDefectRelation/' + objId,
method: 'get'
})
}
// 新增质检工位/缺陷维护
export function addStationDefectRelation(data) {
return request({
url: '/base/stationDefectRelation',
method: 'post',
data: data
})
}
// 修改质检工位/缺陷维护
export function updateStationDefectRelation(data) {
return request({
url: '/base/stationDefectRelation',
method: 'put',
data: data
})
}
// 删除质检工位/缺陷维护
export function delStationDefectRelation(objId) {
return request({
url: '/base/stationDefectRelation/' + objId,
method: 'delete'
})
}

@ -21,10 +21,10 @@
<!-- />--> <!-- />-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="工序名称" prop="processName"> <el-form-item label="生产工序名称" prop="processName">
<el-input <el-input
v-model="queryParams.processName" v-model="queryParams.processName"
placeholder="请输入工序名称" placeholder="请输入生产工序名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@ -93,8 +93,8 @@
<el-table v-loading="loading" :data="processStationList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="processStationList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <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="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="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="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="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="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="parentId" v-if="columns[13].visible"/>
@ -156,11 +156,11 @@
<!-- 添加或修改生产工序/工位信息对话框 --> <!-- 添加或修改生产工序/工位信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <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 ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="工序编号" prop="processCode"> <el-form-item label="生产工序编号" prop="processCode">
<el-input v-model="form.processCode" placeholder="请输入工序/工位编号" /> <el-input v-model="form.processCode" placeholder="请输入生产工序编号" />
</el-form-item> </el-form-item>
<el-form-item label="工序名称" prop="processName"> <el-form-item label="生产工序名称" prop="processName">
<el-input v-model="form.processName" placeholder="请输入工序/工位名称" /> <el-input v-model="form.processName" placeholder="请输入生产工序名称" />
</el-form-item> </el-form-item>
<el-form-item label="所属产线"> <el-form-item label="所属产线">
<el-select v-model="form.productLineCode" placeholder="请输入所属产线"> <el-select v-model="form.productLineCode" placeholder="请输入所属产线">
@ -251,8 +251,8 @@ export default {
}, },
columns: [ columns: [
{ key: 0, label: `主键标识`, visible: false }, { key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `工序/工位编号`, visible: true }, { key: 1, label: `生产工序/工位编号`, visible: true },
{ key: 2, label: `工序/工位名称`, visible: true }, { key: 2, label: `生产工序/工位名称`, visible: true },
{ key: 3, label: `类别`, visible: false }, { key: 3, label: `类别`, visible: false },
{ key: 4, label: `所属产线`, visible: true }, { key: 4, label: `所属产线`, visible: true },
{ key: 5, label: `单位生产时间`, visible: true }, { key: 5, label: `单位生产时间`, visible: true },

@ -0,0 +1,403 @@
<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="qualityDefectName">
<el-input
v-model="queryParams.qualityDefectName"
placeholder="请输入质量缺陷描述"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="缺陷大类" prop="materialCategories">-->
<!-- <el-select v-model="queryParams.materialCategories" placeholder="请选择缺陷大类" clearable>-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.defect_categories"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="缺陷小类" prop="materialSubclass">
<el-select v-model="queryParams.materialSubclass" placeholder="请选择缺陷大类" clearable>
<el-option
v-for="dict in dict.type.defect_subclass"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="工厂编号" prop="plantCode">-->
<!-- <el-input-->
<!-- v-model="queryParams.plantCode"-->
<!-- placeholder="请输入工厂编号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="启用标识" prop="isFlag">-->
<!-- <el-select v-model="queryParams.isFlag" placeholder="请选择启用标识" clearable>-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.is_flag"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.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="['base:qualityInspectionItem: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:qualityInspectionItem: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:qualityInspectionItem: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:qualityInspectionItem:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="qualityInspectionItemList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="质量缺陷编码" align="center" prop="qualityDefectCode" v-if="columns[1].visible">
</el-table-column>
<el-table-column label="质量缺陷名称" align="center" prop="qualityDefectName" v-if="columns[2].visible"/>
<el-table-column label="缺陷大类" align="center" prop="materialCategories" v-if="columns[4].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.defect_categories" :value="scope.row.materialCategories"/>
</template>
</el-table-column>
<el-table-column label="缺陷小类" align="center" prop="materialSubclass" v-if="columns[5].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.defect_subclass" :value="scope.row.materialSubclass"/>
</template>
</el-table-column>
<!-- <el-table-column label="所属工位" align="center" prop="stationName" v-if="columns[6].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-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['base:qualityInspectionItem:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['base:qualityInspectionItem: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="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="质量缺陷编码" prop="qualityDefectCode">
<el-input v-model="form.qualityDefectCode" placeholder="请输入质量缺陷编码" />
</el-form-item>
<el-form-item label="质量缺陷名称" prop="qualityDefectName">
<el-input v-model="form.qualityDefectName" placeholder="请输入质量缺陷名称" />
</el-form-item>
<el-form-item label="缺陷大类" prop="materialCategories">
<el-radio-group v-model="form.materialCategories">
<el-radio
v-for="dict in dict.type.defect_categories"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="缺陷小类" prop="materialSubclass">
<el-radio-group v-model="form.materialSubclass">
<el-radio
v-for="dict in dict.type.defect_subclass"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<!-- <el-form-item label="工厂编号" prop="plantCode">-->
<!-- <el-input v-model="form.plantCode" placeholder="请输入工厂编号" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="所属工位">-->
<!-- <el-select v-model="form.stationCode" placeholder="请输入所属工位">-->
<!-- <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="isFlag">
<el-radio-group v-model="form.isFlag">
<el-radio
v-for="dict in dict.type.is_flag"
:key="dict.value"
:label="parseInt(dict.value)"
>{{dict.label}}</el-radio>
</el-radio-group>
</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 { listQualityInspectionItem, getQualityInspectionItem, delQualityInspectionItem, addQualityInspectionItem, updateQualityInspectionItem } from "@/api/base/qualityInspectionItem";
import { findProductLineList } from '@//api/base/productLine'
export default {
name: "QualityInspectionItem",
dicts: ['is_flag','defect_categories','defect_subclass'],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
qualityInspectionItemList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
qualityDefectCode: null,
qualityDefectName: null,
parentId: null,
materialCategories: null,
materialSubclass: null,
plantCode: null,
isFlag: null,
createdBy: null,
createdTime: null,
updatedBy: null,
updatedTime: null
},
//
form: {},
//
rules: {
},
columns: [
{ key: 0, label: `主键标识`, visible: true },
{ key: 1, label: `质量缺陷编码`, visible: true },
{ key: 2, label: `质量缺陷名称`, visible: true },
{ key: 3, label: `父级编号`, visible: true },
{ key: 4, label: `缺陷大类`, visible: true },
{ key: 5, label: `缺陷小类`, visible: true },
{ key: 6, label: `工厂编号`, visible: true },
{ key: 7, label: `备注`, visible: true },
{ key: 8, label: `启用标识`, visible: false },
{ key: 9, label: `创建人`, visible: false },
{ key: 10, label: `创建时间`, visible: true },
{ key: 11, label: `更新人`, visible: false },
{ key: 12, label: `更新时间`, visible: false },
],
//
findStationList: []
};
},
created() {
findProductLineList({productLineType: 2}).then(response => {
this.findStationList = response.data;
});
this.getList();
},
methods: {
/** 查询质量缺陷信息维护列表 */
getList() {
this.loading = true;
listQualityInspectionItem(this.queryParams).then(response => {
this.qualityInspectionItemList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
objId: null,
qualityDefectCode: null,
qualityDefectName: null,
parentId: null,
materialCategories: '1',
materialSubclass: '1',
plantCode: null,
remark: null,
isFlag: 0,
createdBy: null,
createdTime: null,
updatedBy: null,
updatedTime: 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 = "添加质量缺陷信息维护";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const objId = row.objId || this.ids
getQualityInspectionItem(objId).then(response => {
console.log(response.data)
this.form = response.data;
this.open = true;
this.title = "修改质量缺陷信息维护";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.objId != null) {
updateQualityInspectionItem(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addQualityInspectionItem(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 delQualityInspectionItem(objIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('base/qualityInspectionItem/export', {
...this.queryParams
}, `qualityInspectionItem_${new Date().getTime()}.xlsx`)
}
}
};
</script>

@ -21,10 +21,10 @@
<!-- />--> <!-- />-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="工序名称" prop="processName"> <el-form-item label="质检工序名称" prop="processName">
<el-input <el-input
v-model="queryParams.processName" v-model="queryParams.processName"
placeholder="请输入工序名称" placeholder="请输入质检工序名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@ -78,31 +78,31 @@
v-hasPermi="['base:processStation:export']" v-hasPermi="['base:processStation:export']"
>导出</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"-->
plain <!-- plain-->
icon="el-icon-close" <!-- icon="el-icon-close"-->
size="mini" <!-- size="mini"-->
@click="handleClose" <!-- @click="handleClose"-->
>关闭</el-button> <!-- >关闭</el-button>-->
</el-col> <!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="processStationList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="processStationList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <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="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="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="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="processType" v-if="columns[3].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.process_type" :value="scope.row.processType"/> <dict-tag :options="dict.type.process_type" :value="scope.row.processType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="所属产线" align="center" prop="productLineCode" v-if="columns[4].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="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="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="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="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="capacityMonth" v-if="columns[7].visible"/>
@ -125,12 +125,12 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" 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-s-grid" <!-- icon="el-icon-s-grid"-->
@click="findStation(scope.row)" <!-- @click="findStation(scope.row)"-->
>下级工位</el-button> <!-- >质检工位</el-button>-->
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@ -157,14 +157,14 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改生产工序/工位信息对话框 --> <!-- 添加或修改生产质检工序/工位信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <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 ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="工序编号" prop="processCode"> <el-form-item label="质检工序编号" prop="processCode">
<el-input v-model="form.processCode" placeholder="请输入工序/工位编号" /> <el-input v-model="form.processCode" placeholder="请输入质检工序/工位编号" />
</el-form-item> </el-form-item>
<el-form-item label="工序名称" prop="processName"> <el-form-item label="质检工序名称" prop="processName">
<el-input v-model="form.processName" placeholder="请输入工序/工位名称" /> <el-input v-model="form.processName" placeholder="请输入质检工序/工位名称" />
</el-form-item> </el-form-item>
<el-form-item label="所属产线"> <el-form-item label="所属产线">
<el-select v-model="form.productLineCode" placeholder="请输入所属产线"> <el-select v-model="form.productLineCode" placeholder="请输入所属产线">
@ -176,8 +176,8 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="下级工位"> <el-form-item label="质检工位">
<el-select v-model="form.parentId" placeholder="请输入下级工位" multiple clearable> <el-select v-model="form.parentId" placeholder="请输入质检工位" multiple clearable>
<el-option <el-option
v-for="item in findStationList" v-for="item in findStationList"
:key="item.productLineCode" :key="item.productLineCode"
@ -224,7 +224,7 @@ export default {
showSearch: true, showSearch: true,
// //
total: 0, total: 0,
// / // /
processStationList: [], processStationList: [],
// //
title: "", title: "",
@ -255,8 +255,8 @@ export default {
}, },
columns: [ columns: [
{ key: 0, label: `主键标识`, visible: false }, { key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `工序/工位编号`, visible: true }, { key: 1, label: `质检工序/工位编号`, visible: true },
{ key: 2, label: `工序/工位名称`, visible: true }, { key: 2, label: `质检工序/工位名称`, visible: true },
{ key: 3, label: `类别`, visible: true }, { key: 3, label: `类别`, visible: true },
{ key: 4, label: `所属产线`, visible: true }, { key: 4, label: `所属产线`, visible: true },
{ key: 5, label: `单位生产时间`, visible: false }, { key: 5, label: `单位生产时间`, visible: false },
@ -283,7 +283,7 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
/** 查询生产工序/工位信息列表 */ /** 查询生产质检工序/工位信息列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listProcessStation(this.queryParams).then(response => { listProcessStation(this.queryParams).then(response => {
@ -344,9 +344,9 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加生产工序/工位信息"; this.title = "添加质检工序/工位信息";
}, },
/** 查看下级工位 */ /** 查看质检工位 */
findStation: function(row) { findStation: function(row) {
const processCode = row.processCode; const processCode = row.processCode;
this.$router.push("/base/productProcess-station/index/" + processCode); this.$router.push("/base/productProcess-station/index/" + processCode);
@ -366,7 +366,7 @@ export default {
this.form.parentId = this.form.parentId.split(','); this.form.parentId = this.form.parentId.split(',');
} }
this.open = true; this.open = true;
this.title = "修改生产工序/工位信息"; this.title = "修改质检工序/工位信息";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
@ -395,7 +395,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const objIds = row.objId || this.ids; const objIds = row.objId || this.ids;
this.$modal.confirm('是否确认删除生产工序/工位信息编号为"' + objIds + '"的数据项?').then(function() { this.$modal.confirm('是否确认删除质检工序/工位信息编号为"' + objIds + '"的数据项?').then(function() {
return delProcessStation(objIds); return delProcessStation(objIds);
}).then(() => { }).then(() => {
this.getList(); this.getList();

@ -71,14 +71,14 @@
<el-table-column label="质检工位名称" align="center" prop="stationName" v-if="columns[2].visible"/> <el-table-column label="质检工位名称" align="center" prop="stationName" v-if="columns[2].visible"/>
<el-table-column label="缺陷编号" align="center" prop="defectCode" v-if="columns[3].visible"/> <el-table-column label="缺陷编号" align="center" prop="defectCode" v-if="columns[3].visible"/>
<el-table-column label="缺陷名称" align="center" prop="defectName" v-if="columns[4].visible"/> <el-table-column label="缺陷名称" align="center" prop="defectName" v-if="columns[4].visible"/>
<el-table-column label="物料大类" align="center" prop="materialCategories" v-if="columns[11].visible"> <el-table-column label="缺陷大类" align="center" prop="materialCategories" v-if="columns[11].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.material_categories" :value="scope.row.materialCategories"/> <dict-tag :options="dict.type.defect_categories" :value="scope.row.materialCategories"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料小类" align="center" prop="materialSubclass" v-if="columns[12].visible"> <el-table-column label="缺陷小类" align="center" prop="materialSubclass" v-if="columns[12].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.material_subclass" :value="scope.row.materialSubclass"/> <dict-tag :options="dict.type.defect_subclass" :value="scope.row.materialSubclass"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[6].visible"/> <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[6].visible"/>
@ -196,7 +196,7 @@ import { getDefectList } from '@//api/base/qualityInspectionItem'
export default { export default {
name: "StationDefectRelation", name: "StationDefectRelation",
dicts: ['material_categories','material_subclass'], dicts: ['defect_categories','defect_subclass'],
data() { data() {
return { return {
// //
@ -249,8 +249,8 @@ export default {
{ key: 8, label: `创建时间`, visible: false }, { key: 8, label: `创建时间`, visible: false },
{ key: 9, label: `更新人`, visible: false }, { key: 9, label: `更新人`, visible: false },
{ key: 10, label: `更新时间`, visible: false }, { key: 10, label: `更新时间`, visible: false },
{ key: 11, label: `物料大类`, visible: true }, { key: 11, label: `缺陷大类`, visible: true },
{ key: 12, label: `物料小类`, visible: true }, { key: 12, label: `缺陷小类`, visible: true },
], ],
productLineList: [], productLineList: [],
defectList: [] defectList: []
@ -316,6 +316,7 @@ export default {
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.form.stationCode = this.queryParams.stationCode;
this.open = true; this.open = true;
this.title = "添加质检工位/缺陷维护"; this.title = "添加质检工位/缺陷维护";
}, },

@ -138,7 +138,7 @@
type="text" type="text"
icon="el-icon-d-arrow-right" icon="el-icon-d-arrow-right"
@click="findSpaceInfo(scope.row)" @click="findSpaceInfo(scope.row)"
>所属货道</el-button> >查看货道</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"

@ -35,29 +35,29 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="primary" <!-- type="primary"-->
plain <!-- plain-->
icon="el-icon-plus" <!-- icon="el-icon-plus"-->
size="mini" <!-- size="mini"-->
@click="handleAdd" <!-- @click="handleAdd"-->
v-hasPermi="['report:electricalInspection:add']" <!-- v-hasPermi="['report:electricalInspection: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-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
size="mini" <!-- size="mini"-->
:disabled="single" <!-- :disabled="single"-->
@click="handleUpdate" <!-- @click="handleUpdate"-->
v-hasPermi="['report:electricalInspection:edit']" <!-- v-hasPermi="['report:electricalInspection:edit']"-->
>修改 <!-- >修改-->
</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"

Loading…
Cancel
Save