Skip to content

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

打样申请、制作、批量申请、制作、生产方案、品版报价、生产工单共七个模块调整工装量具关联为产品基础表

parent 2c88bed7
Hide whitespace changes
Inline Side-by-side
Showing with 372 additions and 380 deletions
src/views/mes/dv/brandquotation/components/ProcessTool.vue
View file @ 36c81547
...@@ -21,13 +21,12 @@ ...@@ -21,13 +21,12 @@
</el-col> </el-col>
</el-row> </el-row>
<el-table :data="tableData"> <el-table :data="tableData">
<el-table-column label="编号" align="center" prop="toolCode" > <el-table-column label="编号" align="center" prop="itemCode" >
</el-table-column> </el-table-column>
<el-table-column label="名称" align="center" prop="toolName" :show-overflow-tooltip="true"> <el-table-column label="名称" align="center" prop="itemName" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column label="品牌" align="center" prop="brand" :show-overflow-tooltip="true"/> <el-table-column label="型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
<el-table-column label="型号" align="center" prop="spec" :show-overflow-tooltip="true"/> <el-table-column label="类型" align="center" prop="itemTypeName" />
<el-table-column label="类型" align="center" prop="toolTypeName" />
<el-table-column label="要求数量" align="center" prop="quantity" /> <el-table-column label="要求数量" align="center" prop="quantity" />
<el-table-column label="备注" prop="remark" align="center" /> <el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center" width="150"> <el-table-column label="操作" align="center" width="150">
...@@ -67,15 +66,24 @@ ...@@ -67,15 +66,24 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工装量具编码" prop="toolCode" > <el-form-item label="工装量具编码" prop="toolCode" >
<el-input v-model="form.toolCode" placeholder="请选择测项编码" <el-input v-model="form.itemCode" placeholder="请选择数据"
readonly> disabled>
<el-button <el-button
slot="append" slot="append"
icon="el-icon-search" icon="el-icon-search"
@click="$refs['TmToolSelectRef'].showFlag = true" @click="$refs['ItemSelectRef'].showFlag = true"
></el-button> ></el-button>
</el-input> </el-input>
<TmToolSelect ref="TmToolSelectRef" @onSelected="onTmToolSelect" /> <ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工装量具名称" prop="itemName">
<el-input
type="text"
v-model="form.itemName"
disabled
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -109,7 +117,7 @@ ...@@ -109,7 +117,7 @@
</template> </template>
<script> <script>
import TmToolSelect from "@/components/TmTool/index.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
export default { export default {
props: { props: {
process: { process: {
...@@ -117,16 +125,15 @@ ...@@ -117,16 +125,15 @@
default: () => ({}), default: () => ({}),
}, },
}, },
components: { TmToolSelect }, components: { ItemSelect },
dicts: ['mes_index_type'], dicts: ['mes_index_type'],
data() { data() {
return { return {
form: { form: {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec:"", itemTypeName:"",
toolTypeName:"",
remark: "", remark: "",
quantity: "", quantity: "",
toolId:"", toolId:"",
...@@ -183,10 +190,9 @@ ...@@ -183,10 +190,9 @@
}, },
/**新增 */ /**新增 */
configmSelect() { configmSelect() {
if (this.form.toolCode == null || this.form.toolCode == 0) { if (this.form.itemCode == null || this.form.itemCode.length == 0) {
return; return;
} }
console.log(this.process.processId);
this.tableData.unshift({ this.tableData.unshift({
...this.form, ...this.form,
processId: this.process.processId, processId: this.process.processId,
...@@ -223,24 +229,22 @@ ...@@ -223,24 +229,22 @@
/**重置表单 */ /**重置表单 */
resetForm() { resetForm() {
this.form = { this.form = {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec:"", itemTypeName:"",
toolTypeName:"",
toolId:"",
quantity: "",
remark: "", remark: "",
quantity: "",
toolId:"",
}; };
}, },
onTmToolSelect(row){ onItemSelect(row){
if (row != undefined && row != null) { if (row != undefined && row != null) {
this.form.toolCode = row.toolCode; this.form.itemCode = row.itemCode;
this.form.toolName = row.toolName; this.form.itemName = row.itemName;
this.form.brand = row.brand; this.form.specification = row.specification;
this.form.spec = row.spec; this.form.itemTypeName = row.itemTypeName;
this.form.toolTypeName = row.toolTypeName; this.form.toolId = row.itemId;
this.form.toolId = row.toolId;
} }
} }
}, },
......
src/views/mes/pro/productionMake/components/ProcessTool.vue
View file @ 36c81547
...@@ -21,13 +21,12 @@ ...@@ -21,13 +21,12 @@
</el-col> </el-col>
</el-row> </el-row>
<el-table :data="tableData"> <el-table :data="tableData">
<el-table-column label="编号" align="center" prop="toolCode" > <el-table-column label="编号" align="center" prop="itemCode" >
</el-table-column> </el-table-column>
<el-table-column label="名称" align="center" prop="toolName" :show-overflow-tooltip="true"> <el-table-column label="名称" align="center" prop="itemName" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column label="品牌" align="center" prop="brand" :show-overflow-tooltip="true"/> <el-table-column label="型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
<el-table-column label="型号" align="center" prop="spec" :show-overflow-tooltip="true"/> <el-table-column label="类型" align="center" prop="itemTypeName" />
<el-table-column label="类型" align="center" prop="toolTypeName" />
<el-table-column label="要求数量" align="center" prop="quantity" /> <el-table-column label="要求数量" align="center" prop="quantity" />
<el-table-column label="备注" prop="remark" align="center" /> <el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center" width="150"> <el-table-column label="操作" align="center" width="150">
...@@ -67,15 +66,24 @@ ...@@ -67,15 +66,24 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工装量具编码" prop="toolCode" > <el-form-item label="工装量具编码" prop="toolCode" >
<el-input v-model="form.toolCode" placeholder="请选择测项编码" <el-input v-model="form.itemCode" placeholder="请选择数据"
readonly> disabled>
<el-button <el-button
slot="append" slot="append"
icon="el-icon-search" icon="el-icon-search"
@click="$refs['TmToolSelectRef'].showFlag = true" @click="$refs['ItemSelectRef'].showFlag = true"
></el-button> ></el-button>
</el-input> </el-input>
<TmToolSelect ref="TmToolSelectRef" @onSelected="onTmToolSelect" /> <ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工装量具名称" prop="itemName">
<el-input
type="text"
v-model="form.itemName"
disabled
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -109,7 +117,7 @@ ...@@ -109,7 +117,7 @@
</template> </template>
<script> <script>
import TmToolSelect from "@/components/TmTool/index.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
export default { export default {
props: { props: {
process: { process: {
...@@ -117,16 +125,15 @@ ...@@ -117,16 +125,15 @@
default: () => ({}), default: () => ({}),
}, },
}, },
components: { TmToolSelect }, components: { ItemSelect },
dicts: ['mes_index_type'], dicts: ['mes_index_type'],
data() { data() {
return { return {
form: { form: {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec:"", itemTypeName:"",
toolTypeName:"",
remark: "", remark: "",
quantity: "", quantity: "",
toolId:"", toolId:"",
...@@ -183,7 +190,7 @@ ...@@ -183,7 +190,7 @@
}, },
/**新增 */ /**新增 */
configmSelect() { configmSelect() {
if (this.form.toolCode == null || this.form.toolCode == 0) { if (this.form.itemCode == null || this.form.itemCode.length == 0) {
return; return;
} }
this.tableData.unshift({ this.tableData.unshift({
...@@ -222,24 +229,22 @@ ...@@ -222,24 +229,22 @@
/**重置表单 */ /**重置表单 */
resetForm() { resetForm() {
this.form = { this.form = {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec:"", itemTypeName:"",
toolTypeName:"",
toolId:"",
quantity: "",
remark: "", remark: "",
quantity: "",
toolId:"",
}; };
}, },
onTmToolSelect(row){ onItemSelect(row){
if (row != undefined && row != null) { if (row != undefined && row != null) {
this.form.toolCode = row.toolCode; this.form.itemCode = row.itemCode;
this.form.toolName = row.toolName; this.form.itemName = row.itemName;
this.form.brand = row.brand; this.form.specification = row.specification;
this.form.spec = row.spec; this.form.itemTypeName = row.itemTypeName;
this.form.toolTypeName = row.toolTypeName; this.form.toolId = row.itemId;
this.form.toolId = row.toolId;
} }
} }
}, },
......
src/views/mes/pro/productionSolution/components/ProcessTool.vue
View file @ 36c81547
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
append-to-body append-to-body
title="设置工装量具" title="设置工装量具"
> >
<!-- <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"
...@@ -17,37 +17,18 @@ ...@@ -17,37 +17,18 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
>新增</el-button >新增</el-button
> >
</el-col> </el-col>
</el-row> --> </el-row>
<el-table :data="tableData"> <el-table :data="tableData">
<el-table-column label="编号" align="center" prop="toolCode" > <el-table-column label="编号" align="center" prop="itemCode" >
</el-table-column> </el-table-column>
<el-table-column label="名称" align="center" prop="toolName" :show-overflow-tooltip="true"> <el-table-column label="名称" align="center" prop="itemName" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column label="品牌" align="center" prop="brand" :show-overflow-tooltip="true"/> <el-table-column label="型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
<el-table-column label="型号" align="center" prop="spec" :show-overflow-tooltip="true"/> <el-table-column label="类型" align="center" prop="itemTypeName" />
<el-table-column label="类型" align="center" prop="toolTypeName" />
<el-table-column label="要求数量" align="center" prop="quantity" /> <el-table-column label="要求数量" align="center" prop="quantity" />
<el-table-column label="备注" prop="remark" align="center" /> <el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center" width="150">
<template slot-scope="{ row, $index }">
<el-button
type="text"
icon="el-icon-edit"
size="small"
@click="updateRow(row, $index)"
>修改</el-button
>
<el-button
type="text"
icon="el-icon-delete"
size="small"
@click="deleteRow($index)"
>删除</el-button
>
</template>
</el-table-column>
</el-table> </el-table>
<div slot="footer"> <div slot="footer">
...@@ -67,15 +48,24 @@ ...@@ -67,15 +48,24 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工装量具编码" prop="toolCode" > <el-form-item label="工装量具编码" prop="toolCode" >
<el-input v-model="form.toolCode" placeholder="请选择测项编码" <el-input v-model="form.itemCode" placeholder="请选择数据"
readonly> disabled>
<el-button <el-button
slot="append" slot="append"
icon="el-icon-search" icon="el-icon-search"
@click="$refs['TmToolSelectRef'].showFlag = true" @click="$refs['ItemSelectRef'].showFlag = true"
></el-button> ></el-button>
</el-input> </el-input>
<TmToolSelect ref="TmToolSelectRef" @onSelected="onTmToolSelect" /> <ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工装量具名称" prop="itemName">
<el-input
type="text"
v-model="form.itemName"
disabled
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -109,7 +99,7 @@ ...@@ -109,7 +99,7 @@
</template> </template>
<script> <script>
import TmToolSelect from "@/components/TmTool/index.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
export default { export default {
props: { props: {
process: { process: {
...@@ -117,16 +107,15 @@ ...@@ -117,16 +107,15 @@
default: () => ({}), default: () => ({}),
}, },
}, },
components: { TmToolSelect }, components: { ItemSelect },
dicts: ['mes_index_type'], dicts: ['mes_index_type'],
data() { data() {
return { return {
form: { form: {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec:"", itemTypeName:"",
toolTypeName:"",
remark: "", remark: "",
quantity: "", quantity: "",
toolId:"", toolId:"",
...@@ -183,7 +172,7 @@ ...@@ -183,7 +172,7 @@
}, },
/**新增 */ /**新增 */
configmSelect() { configmSelect() {
if (this.form.toolCode == null || this.form.toolCode == 0) { if (this.form.itemCode == null || this.form.itemCode.length == 0) {
return; return;
} }
this.tableData.unshift({ this.tableData.unshift({
...@@ -222,24 +211,22 @@ ...@@ -222,24 +211,22 @@
/**重置表单 */ /**重置表单 */
resetForm() { resetForm() {
this.form = { this.form = {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec:"", itemTypeName:"",
toolTypeName:"",
toolId:"",
quantity: "",
remark: "", remark: "",
quantity: "",
toolId:"",
}; };
}, },
onTmToolSelect(row){ onItemSelect(row){
if (row != undefined && row != null) { if (row != undefined && row != null) {
this.form.toolCode = row.toolCode; this.form.itemCode = row.itemCode;
this.form.toolName = row.toolName; this.form.itemName = row.itemName;
this.form.brand = row.brand; this.form.specification = row.specification;
this.form.spec = row.spec; this.form.itemTypeName = row.itemTypeName;
this.form.toolTypeName = row.toolTypeName; this.form.toolId = row.itemId;
this.form.toolId = row.toolId;
} }
} }
}, },
......
src/views/mes/pro/productiorequest/components/ProcessTool.vue
View file @ 36c81547
...@@ -21,13 +21,12 @@ ...@@ -21,13 +21,12 @@
</el-col> </el-col>
</el-row> </el-row>
<el-table :data="tableData"> <el-table :data="tableData">
<el-table-column label="编号" align="center" prop="toolCode" > <el-table-column label="编号" align="center" prop="itemCode" >
</el-table-column> </el-table-column>
<el-table-column label="名称" align="center" prop="toolName" :show-overflow-tooltip="true"> <el-table-column label="名称" align="center" prop="itemName" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column label="品牌" align="center" prop="brand" :show-overflow-tooltip="true"/> <el-table-column label="型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
<el-table-column label="型号" align="center" prop="spec" :show-overflow-tooltip="true"/> <el-table-column label="类型" align="center" prop="itemTypeName" />
<el-table-column label="类型" align="center" prop="toolTypeName" />
<el-table-column label="要求数量" align="center" prop="quantity" /> <el-table-column label="要求数量" align="center" prop="quantity" />
<el-table-column label="备注" prop="remark" align="center" /> <el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center" width="150"> <el-table-column label="操作" align="center" width="150">
...@@ -67,15 +66,24 @@ ...@@ -67,15 +66,24 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工装量具编码" prop="toolCode" > <el-form-item label="工装量具编码" prop="toolCode" >
<el-input v-model="form.toolCode" placeholder="请选择测项编码" <el-input v-model="form.itemCode" placeholder="请选择数据"
readonly> disabled>
<el-button <el-button
slot="append" slot="append"
icon="el-icon-search" icon="el-icon-search"
@click="$refs['TmToolSelectRef'].showFlag = true" @click="$refs['ItemSelectRef'].showFlag = true"
></el-button> ></el-button>
</el-input> </el-input>
<TmToolSelect ref="TmToolSelectRef" @onSelected="onTmToolSelect" /> <ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工装量具名称" prop="itemName">
<el-input
type="text"
v-model="form.itemName"
disabled
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -109,7 +117,7 @@ ...@@ -109,7 +117,7 @@
</template> </template>
<script> <script>
import TmToolSelect from "@/components/TmTool/index.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
export default { export default {
props: { props: {
process: { process: {
...@@ -117,16 +125,15 @@ ...@@ -117,16 +125,15 @@
default: () => ({}), default: () => ({}),
}, },
}, },
components: { TmToolSelect }, components: { ItemSelect },
dicts: ['mes_index_type'], dicts: ['mes_index_type'],
data() { data() {
return { return {
form: { form: {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec:"", itemTypeName:"",
toolTypeName:"",
remark: "", remark: "",
quantity: "", quantity: "",
toolId:"", toolId:"",
...@@ -183,7 +190,7 @@ ...@@ -183,7 +190,7 @@
}, },
/**新增 */ /**新增 */
configmSelect() { configmSelect() {
if (this.form.toolCode == null || this.form.toolCode == 0) { if (this.form.itemCode == null || this.form.itemCode.length == 0) {
return; return;
} }
this.tableData.unshift({ this.tableData.unshift({
...@@ -222,24 +229,22 @@ ...@@ -222,24 +229,22 @@
/**重置表单 */ /**重置表单 */
resetForm() { resetForm() {
this.form = { this.form = {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec:"", itemTypeName:"",
toolTypeName:"",
toolId:"",
quantity: "",
remark: "", remark: "",
quantity: "",
toolId:"",
}; };
}, },
onTmToolSelect(row){ onItemSelect(row){
if (row != undefined && row != null) { if (row != undefined && row != null) {
this.form.toolCode = row.toolCode; this.form.itemCode = row.itemCode;
this.form.toolName = row.toolName; this.form.itemName = row.itemName;
this.form.brand = row.brand; this.form.specification = row.specification;
this.form.spec = row.spec; this.form.itemTypeName = row.itemTypeName;
this.form.toolTypeName = row.toolTypeName; this.form.toolId = row.itemId;
this.form.toolId = row.toolId;
} }
} }
}, },
......
src/views/mes/pro/prototypeMake/components/ProcessTool.vue
View file @ 36c81547
...@@ -21,13 +21,12 @@ ...@@ -21,13 +21,12 @@
</el-col> </el-col>
</el-row> </el-row>
<el-table :data="tableData"> <el-table :data="tableData">
<el-table-column label="编号" align="center" prop="toolCode" > <el-table-column label="编号" align="center" prop="itemCode" >
</el-table-column> </el-table-column>
<el-table-column label="名称" align="center" prop="toolName" :show-overflow-tooltip="true"> <el-table-column label="名称" align="center" prop="itemName" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column label="品牌" align="center" prop="brand" :show-overflow-tooltip="true"/> <el-table-column label="型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
<el-table-column label="型号" align="center" prop="spec" :show-overflow-tooltip="true"/> <el-table-column label="类型" align="center" prop="itemTypeName" />
<el-table-column label="类型" align="center" prop="toolTypeName" />
<el-table-column label="要求数量" align="center" prop="quantity" /> <el-table-column label="要求数量" align="center" prop="quantity" />
<el-table-column label="备注" prop="remark" align="center" /> <el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center" width="150"> <el-table-column label="操作" align="center" width="150">
...@@ -67,15 +66,24 @@ ...@@ -67,15 +66,24 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工装量具编码" prop="toolCode" > <el-form-item label="工装量具编码" prop="toolCode" >
<el-input v-model="form.toolCode" placeholder="请选择测项编码" <el-input v-model="form.itemCode" placeholder="请选择数据"
readonly> disabled>
<el-button <el-button
slot="append" slot="append"
icon="el-icon-search" icon="el-icon-search"
@click="$refs['TmToolSelectRef'].showFlag = true" @click="$refs['ItemSelectRef'].showFlag = true"
></el-button> ></el-button>
</el-input> </el-input>
<TmToolSelect ref="TmToolSelectRef" @onSelected="onTmToolSelect" /> <ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工装量具名称" prop="itemName">
<el-input
type="text"
v-model="form.itemName"
disabled
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -109,7 +117,7 @@ ...@@ -109,7 +117,7 @@
</template> </template>
<script> <script>
import TmToolSelect from "@/components/TmTool/index.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
export default { export default {
props: { props: {
process: { process: {
...@@ -117,16 +125,15 @@ ...@@ -117,16 +125,15 @@
default: () => ({}), default: () => ({}),
}, },
}, },
components: { TmToolSelect }, components: { ItemSelect },
dicts: ['mes_index_type'], dicts: ['mes_index_type'],
data() { data() {
return { return {
form: { form: {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec:"", itemTypeName:"",
toolTypeName:"",
remark: "", remark: "",
quantity: "", quantity: "",
toolId:"", toolId:"",
...@@ -183,7 +190,7 @@ ...@@ -183,7 +190,7 @@
}, },
/**新增 */ /**新增 */
configmSelect() { configmSelect() {
if (this.form.toolCode == null || this.form.toolCode == 0) { if (this.form.itemCode == null || this.form.itemCode.length == 0) {
return; return;
} }
this.tableData.unshift({ this.tableData.unshift({
...@@ -222,24 +229,22 @@ ...@@ -222,24 +229,22 @@
/**重置表单 */ /**重置表单 */
resetForm() { resetForm() {
this.form = { this.form = {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec:"", itemTypeName:"",
toolTypeName:"",
toolId:"",
quantity: "",
remark: "", remark: "",
quantity: "",
toolId:"",
}; };
}, },
onTmToolSelect(row){ onItemSelect(row){
if (row != undefined && row != null) { if (row != undefined && row != null) {
this.form.toolCode = row.toolCode; this.form.itemCode = row.itemCode;
this.form.toolName = row.toolName; this.form.itemName = row.itemName;
this.form.brand = row.brand; this.form.specification = row.specification;
this.form.spec = row.spec; this.form.itemTypeName = row.itemTypeName;
this.form.toolTypeName = row.toolTypeName; this.form.toolId = row.itemId;
this.form.toolId = row.toolId;
} }
} }
}, },
......
src/views/mes/pro/workorder/components/ProcessTool.vue
View file @ 36c81547
...@@ -16,33 +16,17 @@ ...@@ -16,33 +16,17 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
>新增</el-button >新增</el-button
> >
</el-col> </el-col>
</el-row> </el-row>
<el-table :data="tableData"> <el-table :data="tableData">
<el-table-column label="编号" align="center" prop="toolCode"> <el-table-column label="编号" align="center" prop="itemCode" >
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="名称" align="center" prop="itemName" :show-overflow-tooltip="true">
label="名称"
align="center"
prop="toolName"
:show-overflow-tooltip="true"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
label="品牌" <el-table-column label="类型" align="center" prop="itemTypeName" />
align="center"
prop="brand"
:show-overflow-tooltip="true"
/>
<el-table-column
label="型号"
align="center"
prop="spec"
:show-overflow-tooltip="true"
/>
<el-table-column label="类型" align="center" prop="toolTypeName" />
<el-table-column label="要求数量" align="center" prop="quantity" /> <el-table-column label="要求数量" align="center" prop="quantity" />
<el-table-column label="备注" prop="remark" align="center" /> <el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center" width="150"> <el-table-column label="操作" align="center" width="150">
...@@ -52,14 +36,14 @@ ...@@ -52,14 +36,14 @@
icon="el-icon-edit" icon="el-icon-edit"
size="small" size="small"
@click="updateRow(row, $index)" @click="updateRow(row, $index)"
>修改</el-button >修改</el-button
> >
<el-button <el-button
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
size="small" size="small"
@click="deleteRow($index)" @click="deleteRow($index)"
>删除</el-button >删除</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
...@@ -67,7 +51,7 @@ ...@@ -67,7 +51,7 @@
<div slot="footer"> <div slot="footer">
<el-button type="primary" size="small" @click="cancleConnect" <el-button type="primary" size="small" @click="cancleConnect"
>关闭</el-button >关闭</el-button
> >
</div> </div>
</el-dialog> </el-dialog>
...@@ -81,22 +65,25 @@ ...@@ -81,22 +65,25 @@
<el-form ref="form" :model="form" label-width="120px"> <el-form ref="form" :model="form" label-width="120px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工装量具编码" prop="toolCode"> <el-form-item label="工装量具编码" prop="toolCode" >
<el-input <el-input v-model="form.itemCode" placeholder="请选择数据"
v-model="form.toolName" disabled>
placeholder="请选择测项编码"
readonly
>
<el-button <el-button
slot="append" slot="append"
icon="el-icon-search" icon="el-icon-search"
@click="$refs['TmToolSelectRef'].showFlag = true" @click="$refs['ItemSelectRef'].showFlag = true"
></el-button> ></el-button>
</el-input> </el-input>
<TmToolSelect <ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
ref="TmToolSelectRef" </el-form-item>
@onSelected="onTmToolSelect" </el-col>
/> <el-col :span="12">
<el-form-item label="工装量具名称" prop="itemName">
<el-input
type="text"
v-model="form.itemName"
disabled
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -112,21 +99,17 @@ ...@@ -112,21 +99,17 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input <el-input v-model="form.remark" type="textarea" :rows="3"></el-input>
v-model="form.remark"
type="textarea"
:rows="3"
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer"> <div slot="footer">
<el-button type="primary" size="small" @click="addOrEditubmit" <el-button type="primary" size="small" @click="addOrEditubmit"
>确认</el-button >确认</el-button
> >
<el-button size="small" @click="editConnectVisible = false" <el-button size="small" @click="editConnectVisible = false"
>取消</el-button >取消</el-button
> >
</div> </div>
</el-dialog> </el-dialog>
...@@ -134,144 +117,142 @@ ...@@ -134,144 +117,142 @@
</template> </template>
<script> <script>
import TmToolSelect from "@/components/TmTool/index.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
export default { export default {
props: { props: {
process: { process: {
type: Object, type: Object,
default: () => ({}), default: () => ({}),
},
},
components: { TmToolSelect },
dicts: ["mes_index_type"],
data() {
return {
form: {
toolCode: "",
toolName: "",
brand: "",
spec: "",
toolTypeName: "",
remark: "",
quantity: "",
toolId: "",
}, },
currentRowIdx: undefined,
tableData: [],
selectedItemId: undefined,
selectedRows: null,
showFlag: false,
optType: null,
showProcessProd: false,
editConnectVisible: false,
};
},
computed: {
title() {
return "设置" + this.process.itemName + "工装量具";
},
},
watch: {
process: {
handler(val) {
this.tableData = val.toolList;
},
deep: true,
},
},
methods: {
handleRowChange(row) {
if (row) {
this.selectedRows = row;
}
},
handleRowDbClick(row) {
if (row) {
this.selectedRows = row;
this.tableData.unshift(this.selectedRows);
this.showFlag = false;
}
},
/**新增按钮 */
handleAdd() {
this.resetForm();
this.optType = "add";
this.editConnectVisible = true;
},
/**编辑 */
updateRow(row, idx) {
this.resetForm();
Object.assign(this.form, row);
this.currentRowIdx = idx;
this.optType = "edit";
this.editConnectVisible = true;
},
/**新增 */
configmSelect() {
if (this.form.toolCode == null || this.form.toolCode == 0) {
return;
}
this.tableData.unshift({
...this.form,
processId: this.process.processId,
});
this.editConnectVisible = false;
}, },
/** 提交编辑关联信息 */ components: { ItemSelect },
submitEditConnect() { dicts: ['mes_index_type'],
this.tableData.splice(this.currentRowIdx, 1, { data() {
...this.form, return {
}); form: {
this.editConnectVisible = false; itemCode: "",
}, itemName: "",
addOrEditubmit() { specification:"",
if (this.optType == "add") { itemTypeName:"",
this.configmSelect(); remark: "",
} else { quantity: "",
this.submitEditConnect(); toolId:"",
} },
}, currentRowIdx: undefined,
deleteRow(index) { tableData: [],
this.tableData.splice(index, 1); selectedItemId: undefined,
}, selectedRows: null,
cancleConnect() { showFlag: false,
this.$emit("updateTool", this.tableData); optType:null,
this.showProcessProd = false; showProcessProd: false,
editConnectVisible: false,
};
}, },
beforeClose(done) { computed: {
// 更新父组件的processItemList title() {
this.$emit("updateTool", this.tableData); return "设置" + this.process.itemName + "工装量具";
done(); },
}, },
/**重置表单 */ watch: {
resetForm() { process: {
this.form = { handler(val) {
toolCode: "", this.tableData = val.toolList;
toolName: "", },
brand: "", deep: true,
spec: "", },
toolTypeName: "",
toolId: "",
quantity: "",
remark: "",
};
}, },
onTmToolSelect(row) { methods: {
if (row != undefined && row != null) { handleRowChange(row) {
this.form.toolCode = row.toolCode; if (row) {
this.form.toolName = row.toolName; this.selectedRows = row;
this.form.brand = row.brand; }
this.form.spec = row.spec; },
this.form.toolTypeName = row.toolTypeName; handleRowDbClick(row) {
this.form.toolId = row.toolId; if (row) {
this.selectedRows = row;
this.tableData.unshift(this.selectedRows);
this.showFlag = false;
}
},
/**新增按钮 */
handleAdd() {
this.resetForm();
this.optType='add';
this.editConnectVisible = true;
},
/**编辑 */
updateRow(row, idx) {
this.resetForm();
Object.assign(this.form, row);
this.currentRowIdx = idx;
this.optType='edit';
this.editConnectVisible = true;
},
/**新增 */
configmSelect() {
if (this.form.itemCode == null || this.form.itemCode.length == 0) {
return;
}
this.tableData.unshift({
...this.form,
processId: this.process.processId,
});
this.editConnectVisible = false;
},
/** 提交编辑关联信息 */
submitEditConnect() {
this.tableData.splice(this.currentRowIdx, 1, {
...this.form,
});
this.editConnectVisible = false;
},
addOrEditubmit(){
if(this.optType=='add'){
this.configmSelect();
}else{
this.submitEditConnect();
}
},
deleteRow(index) {
this.tableData.splice(index, 1);
},
cancleConnect() {
this.$emit("updateTool", this.tableData);
this.showProcessProd = false;
},
beforeClose(done) {
// 更新父组件的processItemList
this.$emit("updateTool", this.tableData);
done();
},
/**重置表单 */
resetForm() {
this.form = {
itemCode: "",
itemName: "",
specification:"",
itemTypeName:"",
remark: "",
quantity: "",
toolId:"",
};
},
onItemSelect(row){
if (row != undefined && row != null) {
this.form.itemCode = row.itemCode;
this.form.itemName = row.itemName;
this.form.specification = row.specification;
this.form.itemTypeName = row.itemTypeName;
this.form.toolId = row.itemId;
}
} }
}, },
}, };
};
</script> </script>
<style> <style>
.process-prod { .process-prod {
padding: 0 20px; padding: 0 20px;
} }
</style> </style>
src/views/mes/proofing/components/ProcessTool.vue
View file @ 36c81547
...@@ -21,13 +21,12 @@ ...@@ -21,13 +21,12 @@
</el-col> </el-col>
</el-row> </el-row>
<el-table :data="tableData"> <el-table :data="tableData">
<el-table-column label="编号" align="center" prop="toolCode" > <el-table-column label="编号" align="center" prop="itemCode" >
</el-table-column> </el-table-column>
<el-table-column label="名称" align="center" prop="toolName" :show-overflow-tooltip="true"> <el-table-column label="名称" align="center" prop="itemName" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column label="品牌" align="center" prop="brand" :show-overflow-tooltip="true"/> <el-table-column label="型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
<el-table-column label="型号" align="center" prop="spec" :show-overflow-tooltip="true"/> <el-table-column label="类型" align="center" prop="itemTypeName" />
<el-table-column label="类型" align="center" prop="toolTypeName" />
<el-table-column label="要求数量" align="center" prop="quantity" /> <el-table-column label="要求数量" align="center" prop="quantity" />
<el-table-column label="备注" prop="remark" align="center" /> <el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center" width="150"> <el-table-column label="操作" align="center" width="150">
...@@ -67,15 +66,24 @@ ...@@ -67,15 +66,24 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工装量具编码" prop="toolCode" > <el-form-item label="工装量具编码" prop="toolCode" >
<el-input v-model="form.toolCode" placeholder="请选择测项编码" <el-input v-model="form.itemCode" placeholder="请选择数据"
readonly> disabled>
<el-button <el-button
slot="append" slot="append"
icon="el-icon-search" icon="el-icon-search"
@click="$refs['TmToolSelectRef'].showFlag = true" @click="$refs['ItemSelectRef'].showFlag = true"
></el-button> ></el-button>
</el-input> </el-input>
<TmToolSelect ref="TmToolSelectRef" @onSelected="onTmToolSelect" /> <ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工装量具名称" prop="itemName">
<el-input
type="text"
v-model="form.itemName"
disabled
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -109,7 +117,7 @@ ...@@ -109,7 +117,7 @@
</template> </template>
<script> <script>
import TmToolSelect from "@/components/TmTool/index.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
export default { export default {
props: { props: {
process: { process: {
...@@ -117,16 +125,15 @@ ...@@ -117,16 +125,15 @@
default: () => ({}), default: () => ({}),
}, },
}, },
components: { TmToolSelect }, components: { ItemSelect },
dicts: ['mes_index_type'], dicts: ['mes_index_type'],
data() { data() {
return { return {
form: { form: {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec:"", itemTypeName:"",
toolTypeName:"",
remark: "", remark: "",
quantity: "", quantity: "",
toolId:"", toolId:"",
...@@ -183,7 +190,7 @@ ...@@ -183,7 +190,7 @@
}, },
/**新增 */ /**新增 */
configmSelect() { configmSelect() {
if (this.form.toolCode == null || this.form.toolCode == 0) { if (this.form.itemCode == null || this.form.itemCode.length == 0) {
return; return;
} }
this.tableData.unshift({ this.tableData.unshift({
...@@ -222,24 +229,22 @@ ...@@ -222,24 +229,22 @@
/**重置表单 */ /**重置表单 */
resetForm() { resetForm() {
this.form = { this.form = {
toolCode: "", itemCode: "",
toolName: "", itemName: "",
brand: "", specification:"",
spec:"", itemTypeName:"",
toolTypeName:"",
toolId:"",
quantity: "",
remark: "", remark: "",
quantity: "",
toolId:"",
}; };
}, },
onTmToolSelect(row){ onItemSelect(row){
if (row != undefined && row != null) { if (row != undefined && row != null) {
this.form.toolCode = row.toolCode; this.form.itemCode = row.itemCode;
this.form.toolName = row.toolName; this.form.itemName = row.itemName;
this.form.brand = row.brand; this.form.specification = row.specification;
this.form.spec = row.spec; this.form.itemTypeName = row.itemTypeName;
this.form.toolTypeName = row.toolTypeName; this.form.toolId = row.itemId;
this.form.toolId = row.toolId;
} }
} }
}, },
......
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