Commit c8059fe3 authored by 沈翠玲's avatar 沈翠玲

增加模板类型

parent 98caacd3
...@@ -158,6 +158,16 @@ ...@@ -158,6 +158,16 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="12">
<el-form-item label="模板类型" prop="qcType">
<el-radio-group v-model="form.qcType">
<el-radio :label="0">IPOC</el-radio>
<el-radio :label="1">IQC</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="18"> <el-col :span="18">
<el-form-item label="检测种类" prop="qcTypesParam"> <el-form-item label="检测种类" prop="qcTypesParam">
...@@ -299,6 +309,7 @@ export default { ...@@ -299,6 +309,7 @@ export default {
templateCode: null, templateCode: null,
templateName: null, templateName: null,
qcTypesParam: [], qcTypesParam: [],
qcType: 0,
enableFlag: 'Y', enableFlag: 'Y',
remark: null, remark: null,
createBy: null, createBy: null,
......
...@@ -104,6 +104,11 @@ ...@@ -104,6 +104,11 @@
<el-table v-loading="loading" :data="templateProcessList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="templateProcessList" @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="qcType">
<template slot-scope="scope">
{{ scope.row.qcType !== null ? scope.row.qcType === 0 ? 'IPOC' : 'IQC' : '' }}
</template>
</el-table-column>
<el-table-column label="检测模板" align="center" prop="templateName"/> <el-table-column label="检测模板" align="center" prop="templateName"/>
<el-table-column label="物料类型名称" align="center" prop="itemTypeName"/> <el-table-column label="物料类型名称" align="center" prop="itemTypeName"/>
<el-table-column label="工序名称" align="center" prop="processName"/> <el-table-column label="工序名称" align="center" prop="processName"/>
...@@ -144,6 +149,12 @@ ...@@ -144,6 +149,12 @@
<!-- 添加或修改检测模板-工序对话框 --> <!-- 添加或修改检测模板-工序对话框 -->
<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="qcType">
<el-radio-group v-model="form.qcType">
<el-radio :label="0">IPOC</el-radio>
<el-radio :label="1">IQC</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="检测模板" prop="templateId"> <el-form-item label="检测模板" prop="templateId">
<el-input v-model="form.templateName" placeholder="请选择检测模板"> <el-input v-model="form.templateName" placeholder="请选择检测模板">
<el-button slot="append" @click="handleSelectTemplate" icon="el-icon-search"></el-button> <el-button slot="append" @click="handleSelectTemplate" icon="el-icon-search"></el-button>
...@@ -293,6 +304,7 @@ export default { ...@@ -293,6 +304,7 @@ export default {
templateName: null, templateName: null,
itemTypeId: null, itemTypeId: null,
itemTypeName: null, itemTypeName: null,
qcType: 0,
processId:null, processId:null,
processName: null, processName: null,
maxNum: null, maxNum: null,
...@@ -360,6 +372,7 @@ export default { ...@@ -360,6 +372,7 @@ export default {
id: null, id: null,
templateId: null, templateId: null,
templateName: null, templateName: null,
qcType: 0,
itemTypeId: null, itemTypeId: null,
itemTypeName: null, itemTypeName: null,
processId:null, processId:null,
...@@ -397,7 +410,7 @@ export default { ...@@ -397,7 +410,7 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加工序检测模板"; this.title = "添加IPQC/IQC检测模板";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
...@@ -406,7 +419,7 @@ export default { ...@@ -406,7 +419,7 @@ export default {
getTemplateProcess(id).then(response => { getTemplateProcess(id).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改工序检测模板"; this.title = "修改IPQC/IQC检测模板";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
......
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